2259 files changed, 72128 insertions, 304481 deletions

diff --git a/.cvsignore b/.cvsignore
index a72211d03f..52a5620133 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,14 +3,8 @@
 *.rej
 *.sav
 *~
-.*.list
-.*.time
 .ccmalloc
 .ppack
-.ext
-.git
-.svn
-.pc
 COPYING.LIB
 ChangeLog.pre-alpha
 ChangeLog.pre1_1
@@ -28,20 +22,32 @@ config.h.in
 config.log
 config.status
 configure
+foo.rb
 libruby.so.*
 miniruby
+miniruby.elhash
+miniruby.elhash2
+miniruby.orig2
+miniruby.plhash
+miniruby.plhash2
+modex.rb
 newdate.rb
 newver.rb
 parse.c
-patches
+parse.y.try
+pitest.rb
 ppack
 preview
 rbconfig.rb
+rename2.h
 repack
 riscos
 rubicon
 ruby
 ruby-man.rd.gz
+rubyunit
+st.c.power
+this that
 tmp
 web
 y.output
diff --git a/.document b/.document
deleted file mode 100644
index 230c50e387..0000000000
--- a/.document
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/COPYING b/COPYING
index 9043404a83..870a5f22d6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 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:
+(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
diff --git a/ChangeLog b/ChangeLog
index 019925701b..ca22d797b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18484 +1,3 @@
-Thu Jul 10 18:50:48 2008  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk (SPEC_GIT_BASE): update RubySpec GIT URL.
-
-Thu Jul 10 18:46:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_extname): fix for file name with spaces.
-	  [ruby-talk:307404]
-
-Thu Jul 10 18:42:37 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb (PercentScanner#scan): fix %% line bug. [ruby-core:17491]
-
-	* test/erb/test_erb.rb (test_percent): ditto.
-
-Thu Jul 10 18:40:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/net/ftp.rb (Net::FTP#sendport): use divmod.  [ruby-core:17557]
-
-Thu Jul 10 18:36:53 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ruby.c: Mac OS X needs origargc times of '\0' in
-	  origargv. [ruby-dev:35308]
-
-Thu Jul 10 13:53:08 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (POSFIXABLE): use FIXNUM_MAX+1 instead of
-	  FIXNUM_MAX to make it possible to convert to double accurately.
-	  It assumes FLT_RADIX is 2.
-	  fix RubyForge bug #14102.
-	  backported from 1.9.
-
-Mon Jul  7 16:21:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
-	  'localhost.localdomain'.  [ruby-dev:35333]
-
-	* lib/net/smtp.rb (Net::SMTP::SMTP.start): ditto.
-
-Mon Jul  7 15:02:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_longjmp): duplicate the thrown exception to set backtrace
-	  if it was frozen.  clear all raised flags.
-
-	* eval.c (stack_check): leave clearing flag to rb_longjmp.
-
-	* eval.c (rb_thread_set_raised, rb_thread_reset_raised): use generic
-	  flags.
-
-	* eval.c (Init_Proc), gc.c (Init_GC): freeze preallocated special exceptions.
-
-	* gc.c (rb_memerror): use thread raised flag instead of static flag,
-	  and raise nomem_error without backtrace if failed to make backtrace.
-	  [ruby-dev:34724]
-
-	* gc.c (ruby_xmalloc): increase malloc_increase only if malloc
-	  succeeds.  failed malloc size can be huge.  it may increase
-	  malloc_limit too big which cause less GC and memory full.
-	  (ruby_xrealloc): ditto.
-
-Mon Jul  7 12:23:05 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: avoid creating Ruby object during
-	  GC. thanks to arton <artonx AT yahoo.co.jp>. [ruby-dev:35313]
-
-	* ext/win32ole/tests: add test_win32ole_event.rb, remove
-	  testOLEEVENT.rb
-
-	* ext/win32ole/tests/testWIN32OLE.rb(test_convert_bignum):
-	  fix test.
-
-Mon Jul  7 12:23:05 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* gc.c: add rb_during_gc(). based on a patch from arton <artonx AT
-	  yahoo.co.jp> at [ruby-dev:35313].   
-
-	* intern.h: ditto.
-
-Thu Jul  3 20:13:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
-	  public methods only.  [ruby-core:17283]
-
-	* object.c (convert_type): ditto.
-
-	* lib/singleton.rb (Singleton#_dump): conversion method should be
-	  public.
-
-Wed Jul  2 19:06:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
-	  double quotes are allowed.  [ruby-list:45140]
-
-Wed Jul  2 19:03:37 2008  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (num_coerce): call rb_Float(x) first.  don't depend on
-	  evaluation order of function arguments.
-
-Wed Jul  2 18:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syslog/syslog.c (syslog_write): syslog operations should be
-	  protected from $SAFE level 4.  a patch from Keita Yamaguchi
-	  <keita.yamaguchi at gmail.com>.
-
-	* ext/syslog/syslog.c (mSyslog_close): ditto.
-
-	* ext/syslog/syslog.c (mSyslog_set_mask): ditto.
-
-Wed Jul  2 18:26:20 2008  Tanaka Akira  <akr@fsij.org>
-
-	* math.c (domain_check): fix preprocess condition.
-
-Wed Jul  2 18:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/tmpdir.rb (@@systmpdir): prior LOCAL_APPDATA if possible, and
-	  should be clean.  based on a patch from arton <artonx AT
-	  yahoo.co.jp> at [ruby-dev:35269]
-
-Wed Jul  2 18:16:19 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (date2time_str): fix the overflow in
-	  some situation. [ruby-bugs-20793]
-
-Tue Jul  1 15:11:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_fill): check if beg is too big.
-
-Mon Jun 30 20:35:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_buf_cat): check for self concatenation.
-
-Sun Jun 29 21:39:54 2008  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (rb_obj_respond_to): use RTEST to test the result of
-	  respond_to? method.
-
-Sun Jun 29 21:20:17 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* array.c (rb_ary_fill): (compatibility) do not raise
-	  ArgumentError on negative length.  This behaviour shall change
-	  in a future release.
-
-Sun Jun 29 20:08:11 2008  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (time_timeval): fix rounding negative float.
-
-Sun Jun 29 19:19:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
-	  $0.  [ruby-dev:35261]
-
-	* lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
-
-Sun Jun 29 19:19:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (set_arg0, ruby_prog_init): freeze $0.  a patch from Keita
-	  Yamaguchi <keita.yamaguchi at gmail.com>.
-
-Sun Jun 29 18:33:33 2008  Tanaka Akira  <akr@fsij.org>
-
-	* process.c: include sys/resource.h if HAVE_SYS_RESOURCE_H is defined.
-	  pointed by TOYOFUKU Chikanobu.  [ruby-dev:35258]
-
-Sun Jun 29 18:26:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_f_trace_var): should not be allowed at safe level 4.  
-	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
-
-	* eval.c (rb_call0): wrong condition to check insecure method.
-	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
-
-Sun Jun 29 18:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_fill): not depend on unspecified behavior at integer
-	  overflow.  reported by Vincenzo Iozzo <snagg AT openssl.it>.
-
-Sun Jun 29 18:22:06 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(ole_invoke): fix memory leak.
-	  [ruby-bugs-20792]
-
-Sun Jun 29 18:19:11 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (PUSH_FRAME, PUSH_CLASS): Add volatile to avoid a
-	  possible optimization bug on OS X/PPC.  This at least makes
-	  build with gcc -O1 and `make test' pass.
-
-Sun Jun 29 17:24:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
-	  magic comment.
-
-Sun Jun 29 17:22:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
-	  IO#readlines do not affect $_.  [ruby-core:17277]
-
-Sun Jun 29 17:19:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_readline, strio_each)
-	  (strio_readlines): set lastline.  [ruby-core:17257]
-
-Sun Jun 29 17:15:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ossl.h: include winsock.h if USE_WINSOCK2 is not defined.
-	  a patch from arton <artonx at yahoo.co.jp> in [ruby-dev:35078]
-
-Sun Jun 29 17:09:48 2008  wanabe  <s.wanabe@gmail.com>
-
-	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
-	  decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]
-
-Sat Jun 28 19:23:40 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* class.c (clone_method): use rb_copy_node_scope.
-	  fixed [ruby-list:45102]
-	  fixed [ruby-core:17393]
-
-Sat Jun 28 18:49:50 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* class.c: revert to r15855.
-
-Fri Jun 20 18:25:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_buf_append): should infect.
-
-Fri Jun 20 16:33:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
-	  behavior at integer overflow.
-
-	* string.c (str_buf_cat): ditto.
-
-Wed Jun 18 22:24:46 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* array.c (ary_new, rb_ary_initialize, rb_ary_store,
-	  rb_ary_aplice, rb_ary_times): integer overflows should be
-	  checked. based on patches from Drew Yao <ayao at apple.com>
-	  fixed CVE-2008-2726
-
-	* string.c (rb_str_buf_append): fixed unsafe use of alloca,
-	  which led memory corruption. based on a patch from Drew Yao
-	  <ayao at apple.com> fixed CVE-2008-2726
-
-	* sprintf.c (rb_str_format): backported from trunk.
-
-	* intern.h: ditto.
-
-Tue Jun 17 15:09:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (file_expand_path): no need to expand root path which has no
-	  short file name.  [ruby-dev:35095]
-
-Sun Jun 15 19:27:40 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in: Fix $LOAD_PATH.  Properly expand vendor_ruby
-	  directories; submitted by Takahiro Kambe <taca at
-	  back-street.net> in [ruby-dev:35099].
-
-Mon Jun  9 17:56:30 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set#delete_if): Call to_a.
-	  (SortedSet#delete_if, TC_SortedSet#test_sortedset): Use super to
-	  yield elements in sorted order; [ruby-core:17144] by Arthur
-	  Schreiber.
-	  (SortedSet#each, SortedSet#each, TC_Set#test_each)
-	  (TC_SortedSet#test_sortedset): Return self; [ruby-dev:35002] by
-	  Arthur Schreiber.
-
-Mon Jun  9 03:28:05 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
-	  initialize_copy; [ruby-list:45016], [ruby-list:45018].
-
-Mon Jun  9 03:26:03 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: Mention new constants.
-
-Mon Jun  9 03:24:18 2008  Tanaka Akira  <akr@fsij.org>
-
-	* hash.c (hash_i): make Hash#hash order insensitive.
-
-Mon Jun  9 03:22:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as
-	  SITE_DIR.  a patch from Richard Brown <rbrown AT exherbo.org> in
-	  [ruby-core:17129].
-
-Mon Jun  9 03:21:20 2008  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (os_obj_of): assure to not free the scanning heap.
-
-Mon Jun  9 03:20:12 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int.
-	  fixed [ruby-dev:34979]
-
-Fri Jun  6 21:16:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (COMMON_HEADERS): include ws2tcpip.h.
-
-	* ext/socket/addrinfo.h (addrinfo, getaddrinfo, getnameinfo,
-	  freehostent, freeaddrinfo): undef before define because these are
-	  macros in some versions of Windows SDK.
-
-	* win32/setup.mak: maybe commit miss.
-
-Fri Jun  6 19:34:22 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* mkconfig.rb: hide build path from rbconfig.rb.
-
-	* util.c (ruby_strtod, dtoa): initialize more variables for error
-	  handling.
-
-	* io.c (rscheck), marshal.c (w_nbyte, w_bytes, w_unique),
-	  (path2class, path2module): constified.
-
-	* pack.c (pack_unpack), process.c (rb_syswait): suppress warnings.
-
-	* suppress warnings on cygwin, mingw and mswin.
-
-Fri Jun  6 19:23:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (file_expand_path): fix for non-existent files and SFN of
-	  symlinks.  [ruby-talk:303736]
-
-Fri Jun  6 18:25:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/iconv: Tests fixed.
-
-Fri Jun  6 17:04:56 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]
-
-	* lib/time.rb (Time.xmlschema): don't use float.  fix
-	  http://rubyforge.org/tracker/index.php?func=detail&group_id=426&atid=1698&aid=20504
-
-	* object.c (rb_obj_alloc): RDoc updated.  a patch from Gaston
-	  Ramos <ramos.gaston at gmail.com> in [ruby-core:17073].
-
-	* lib/rdoc.rb: massive spelling correction patch from Evan Farrar
-	  <evanfarrar at gmail.com> in [ruby-doc:1382] applied.
-
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
-	  Add a null check for ssl; submitted by akira yamada
-	  in [ruby-dev:34950].
-
-	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if
-	  SSL_OP_NO_TICKET is present; submitted by akira yamada
-	  in [ruby-dev:34944].
-
-	* test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a
-	  workaround for the case where OpenSSL is configured with
-	  --enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
-
-Fri Jun  6 16:58:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_iconv): fix for length argument and now
-	  allows range.  [ruby-core:17092] [ruby-core:17115]
-
-Wed Jun  4 17:22:30 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* NEWS: Fix typos and move misplaced entries.
-	  NEWS: Somehow optflags and warnflags were not actually included
-	  in this release.
-
-Tue Jun  3 19:33:22 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (enumerator_init_copy): Take care of
-	  initialize_copy as well as initialize.
-
-	* test/ruby/test_enumerator.rb: Pull in the test suite for
-	  enumerator from trunk.
-
-Tue Jun  3 12:51:57 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (enumerator_allocate, enumerator_ptr): Properly
-	  detect if the object is initialized and raise error when
-	  appropriate.
-	  (enumerator_initialize): Fix a typo in rdoc. [ruby-core:17052]
-
-Tue Jun  3 10:16:40 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
-	  where tokens are not yilelded one by one.
-	  (ERB::Compiler::TrimScanner#explicit_trim_line): Fix without-
-	  strscan problems. [ruby_core:17028].
-
-	* test/erb/test_erb.rb (TestERBCore#_test_01)
-	  (TestERBCore#test_02_safe_04): The expected value should come
-	  first for assert_equal().
-	  (TestERBCoreWOStrScan): Add test class for without-strscan.
-
-Mon Jun  2 19:47:16 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/delegate.rb (DelegateClass, Delegator#respond_to?):
-	  respond_to? must take optional second argument.  This was a
-	  latent bug exposed by a recent internal change of marshal.c to
-	  call respond_to? with a second argument; submitted by Jeremy
-	  Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
-
-Sat May 31 23:53:35 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* .: Release as Ruby 1.8.7.
-
-Sat May 31 23:33:34 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* README, README.ja: Add a note about default C flags.
-
-Sat May 31 22:11:15 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* version.c (ruby_description, ruby_copyright): backported from
-	  1.9. bug#19002, [ruby-dev:34883]
-
-	* error.c (report_bug): uses ruby_description.
-
-Sat May 31 20:56:04 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_delete_if): should return enumerator if no block
-	  is given.  [ruby-dev:34901]
-
-Sat May 31 18:28:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* suppress warnings with -Wwrite-string.
-
-Sat May 31 15:58:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, configure.in (warnflags): defaulted to -Wall
-	  -Wno-parentheses with gcc.  [ruby-dev:34810]
-
-Fri May 30 05:28:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enum.c (count_i, count_iter_i, count_all_i): add prototypes for VC.
-
-Fri May 30 04:32:07 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c (count_i, count_iter_i): Sync with trunk.
-	  enum.c (enum_count, count_all_i, Init_Enumerable),
-	  array.c (rb_ary_count): Sync with trunk.  If no argument or
-	  block is given, count the number of all elements.
-
-Fri May 30 03:12:18 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand):
-	  Int should be enough here.
-
-Fri May 30 02:35:00 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand),
-	  ext/openssl/ossl_pkey_dh.c (ossl_dh_s_generate)
-	  (ossl_dh_initialize),
-	  ext/openssl/ossl_pkey_dsa.c (ossl_dsa_s_generate),
-	  ext/openssl/ossl_rand.c (ossl_rand_bytes)
-	  (ossl_rand_pseudo_bytes, ossl_rand_egd_bytes),
-	  ext/openssl/ossl_x509store.c (ossl_x509stctx_set_error): Do not
-	  use FIX2INT() without checking the value type.  Use NUM2INT()
-	  instead; found by akr in [ruby-dev:34890].
-
-Thu May 29 20:07:45 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in, win32/Makefile.sub, mkconfig.rb, instruby.rb,
-	  ruby.c, lib/mkmf.rb, README.EXT, README.EXT.ja: Backport the
-	  vendor_ruby directory support.
-
-Thu May 29 17:52:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6
-	  as WIN32.  [ruby-core:16984]
-
-Wed May 28 17:54:29 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* string.c (rb_str_start_with): Remove an unused variable.
-	  (rb_str_upto_m): Fix a prototype.
-
-Wed May 28 17:48:28 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* range.c (range_step): Fix brokenness when a non-integer numeric
-	  value is specified as step. [rubyspec]
-	  (range_step): Make use of String#step internally if a string (or
-	  string-alike) range is given.
-
-	* string.c (rb_str_upto_m, Init_String): Add an optional second
-	  argument to specify if the last value should be included.
-
-Wed May 28 16:53:39 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_slice_bang): Call rb_ary_modify_check() at the
-	  beginning. [rubyspec]
-
-Wed May 28 16:12:44 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
-	  Set the HTTP status code to 302 if a Location header field is
-	  present and the status code is not valid as a client
-	  redirection.  cf. RFC 3875 6.2.3, 6.2.4.
-
-Wed May 28 15:18:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/singleton.rb (SingletonClassMethods): _load should be public.
-
-Wed May 28 12:52:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
-	  private methods too.  [ruby-dev:34671]
-
-	* object.c (convert_type): ditto.
-
-Tue May 27 23:26:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (rb_bug): description from rb_bug() should include
-	  patchlevel.  [ruby-dev:34826]
-
-Tue May 27 20:19:22 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_slice_bang): Return an empty array instead of
-	  nil when pos is valid and len is adjusted from a valid value to
-	  zero; caught by RubySpec.
-
-Tue May 27 19:45:20 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* numeric.c (flo_divmod): Revert the behavior change; do not
-	  suppress an exception when div is NaN or Inf. [ruby-dev:34857]
-
-Tue May 27 19:24:40 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c (enum_to_a): Pass arguments through to #each().
-	  (enum_sort): Follow the enum_to_a signature change.
-	  (enum_reverse_each): Add #reverse_each().
-
-Tue May 27 18:54:02 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/stringio/stringio.c (strio_each_char, Init_stringio): Add
-	  StringIO#{each_char,chars}.
-
-Tue May 27 17:59:34 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/stringio/stringio.c (strio_each): Return an enumerator if no
-	  block is given.
-	  (strio_each_byte): Return an enumerator if no block is given,
-	  and return self if one is given as the rdoc says.
-
-	* io.c (rb_io_each_byte): Fix rdoc.  IO#each_byte returns self,
-	  not nil.
-
-Tue May 27 16:02:58 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_mod_module_exec, Init_eval): Add
-	  Module#{module_exec,class_exec}.
-
-Tue May 27 15:36:37 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* io.c (rb_io_each_char, argf_each_char, Init_IO):
-	  Add {IO#,ARGF.}{each_char,chars}.
-
-Tue May 27 13:46:52 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/stringio/stringio.c (Init_stringio): Define
-	  StringIO#{getbyte,readbyte}.
-
-Tue May 27 13:38:51 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* io.c (Init_IO): Define {IO#,ARGF.}{getbyte,readbyte}.
-
-Tue May 27 13:26:15 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/stringio/stringio.c (Init_stringio): Define #bytes and
-	  #lines.
-
-Tue May 27 13:20:35 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* io.c: (rb_io_lines, rb_io_bytes, Init_IO): Define
-	  IO#{lines,bytes} and ARGF.{lines,bytes}.
-
-Tue May 27 12:13:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (BUFCHECK): wrong condition. [ruby-core:16921]
-
-	* file.c (file_expand_buf): shouldn't use buflen for length of string.
-
-Mon May 26 18:24:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (BUFCHECK): no resize if enough room.
-
-	* file.c (file_expand_path): use BUFCHECK.
-
-Mon May 26 16:46:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (ntfs_tail): filename which starts with '.' is valid.
-
-	* file.c (file_expand_path): cygwin symlink support.
-
-Mon May 26 12:16:43 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* .: Release as Ruby 1.8.7-preview4.
-
-Mon May 26 12:12:26 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* marshal.c (dump_ensure, load_ensure): should return values.
-
-	* eval.c (yield_under, yield_under_i, yield_args_under_i)
-	  (specific_eval, rb_obj_instance_exec, Init_eval): Implement
-	  Object#instance_exec(), a 1.9 feature.
-
-Mon May 26 11:53:21 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_yield_0, proc_invoke, proc_arity): allow passing a
-	  block to a Proc.  [ruby-dev:23533]; by nobu; backported from
-	  1.9.  This implementation in current shape is known to be
-	  buggy/broken, especially with nested block invocation.  Take
-	  this as an experimental feature.
-
-	* parse.y (block_par, block_var): ditto.
-
-Mon May 26 08:00:52 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* marshal.c (r_object0, Init_marshal): Fix the garbled s_call
-	  definition; fixes [ruby-dev:34843].
-
-Mon May 26 03:16:20 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* hash.c (rb_hash_default): Fix rdoc.
-	  (rb_hash_each, env_each_value, env_each_pair): Return an
-	  enumerator if no block is given.
-	  (rb_hash_update): Update rdoc.
-	  (envix): Conditionalize the definition itself.
-	  (rb_f_getenv, env_fetch, env_keys, env_values, env_values_at)
-	  (env_select, env_inspect, env_to_a, env_empty_p, env_has_key)
-	  (env_has_value, env_index, env_indexes, env_to_hash, env_shift)
-	  (env_update): Require secure level 4.
-	  (env_each_value, env_each_i): Delay variable initialization.
-	  (env_each_key, env_each_value, env_reject_bang)
-	  (env_clear, env_replace): Omit duplicated secure level check.
-	  (env_has_value): Do to_str conversion.
-
-Sun May 25 19:48:12 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* hash.c (env_delete_if): Return an enumerator if no block is
-	  given.
-	  (env_each_key): Delay a variable initialization after
-	  RETURN_ENUMERATOR().
-
-Sun May 25 05:07:19 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_slice_bang): Be consistent with Array#slice()
-	  and String#slice!().  Just return nil when a negative length or
-	  out of boundary index is given instead of raising an exception
-	  via internal functions.
-	  (rb_ary_slice_bang): should not use rb_ary_subseq() which shares
-	  internal pointer.  splice modifies the receiver right after
-	  subseq.  [ruby-dev:34005]
-	  (rb_ary_slice_bang): should adjust length before making
-	  sub-array.
-
-	* enumerator.c (Init_Enumerator): Override
-	  Enumerable::Enumerator#each_with_index with #with_index.
-
-Sun May 25 03:13:09 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (Init_Thread): Initialize recursive_key.
-
-Sun May 25 02:45:49 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* error.c (syserr_eqq): Use en.
-
-Sat May 24 22:32:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): should clear errno before calling
-	  strtod(3).  [ruby-dev:34834]
-
-Sat May 24 22:27:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (marshal_load): should initialize arg.data used for
-	  reentrant check.  [ruby-dev:34837]
-
-Sat May 24 00:34:59 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/rational.rb (Rational#to_i): fix rdoc.  Rational(-7,4).to_i
-	  should be -1.
-
-Fri May 23 20:22:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (reentrant_check): check reentrance via callcc.
-	  [ruby-dev:34802]
-
-Fri May 23 16:46:28 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (proc_call): Remove an unused static function.
-
-Fri May 23 13:46:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (cflags): commit miss.
-
-Fri May 23 09:52:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
-	  [ruby-core:16642]
-
-	* ext/extmk.rb: load purelib.rb only when not cross compiling.
-
-Fri May 23 08:47:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (syserr_eqq): === should be able to handle delegated
-	  objects as well.
-
-Fri May 23 04:22:19 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak.
-
-	* ext/tk/lib/tk.rb: avoid trouble when finalize TclTkIp.
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/*: help to fix troubles when
-	  use Ttk widgets on old Tk scripts.
-
-	* ext/tk/sample/*: update and add demo scripts. some of them are
-	  introduction about new features of Tcl/Tk8.5.
-
-Fri May 23 03:48:10 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* class.c (clone_method): Just use ruby_cref as cref.
-
-Fri May 23 01:03:23 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* class.c (rb_singleton_class_clone): Pass Qnil, not 0.
-
-Fri May 23 00:51:48 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* class.c (clone_method): Totally revamp the previous fix which
-	  was incorrect.
-	  (rb_mod_init_copy): Ditto.
-	  (singleton_class_clone_int): Ditto.
-
-Fri May 23 00:48:10 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_copy_node_scope), node.h: Rename from copy_node_scope
-	  and export.
-
-Thu May 22 21:24:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (top_local_setup): fixed memory leak bug based on a
-	  patch from Roger Pack <rogerpack2005 at gmail.com> in
-	  [ruby-core:16610].
-
-Thu May 22 14:20:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (flatten): check if reentered.  [ruby-dev:34798]
-
-Thu May 22 08:28:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (flatten): free memo hash table before raising exception.
-	  [ruby-dev:34789]
-
-Thu May 22 06:30:10 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* array.c (flatten): fix memory leak.
-
-Thu May 22 05:45:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* proc.c (proc_dup): should copy safe_level from src proc
-	  properly.  a patch from Keita Yamaguchi
-	  <keita.yamaguchi at gmail.com>
-
-Wed May 21 23:31:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_get_method_body, rb_alias, rb_eval): should not cache
-	  uninitialized value, since search_method doesn't set origin if the
-	  method wasn't found.
-
-	* eval.c (search_method, remove_method, error_print, rb_alias)
-	  (rb_eval, rb_rescue2, search_required, Init_eval, rb_thread_create),
-	  gc.c (rb_source_filename, Init_stack), io.c (rb_io_getline),
-	  parse.y (rb_id2name, rb_parser_free): suppress warnings.
-
-Wed May 21 12:34:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_delete): rdoc fix based on a patch from Gaston Ramos
-	  <ramos.gaston AT gmail.com>.  [ruby-core:16825]
-
-Tue May 20 13:15:46 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* file.c (lchmod_internal): Remove a compiler warning.
-
-Mon May 19 18:22:35 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): Fix the type
-	  of md; pointed out by Takahiro Kambe <taca at back-street.net>
-	  in [ruby-dev:34748].
-
-Mon May 19 14:20:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.
-
-Mon May 19 13:29:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (rb_f_system): set last_status when status == -1 because
-	  there is no path to set it on win32. this patch is derived from
-	  [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com>
-
-Mon May 19 13:01:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk ({MSPEC,RUBYSPEC}_GIT_URL): moved from Makefine.in.
-
-	* {win32,bcc32}/Makefile.sub (update-rubyspec): added.
-
-Mon May 19 11:53:45 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted
-	  prototype change in openssl bundled with newer OpenBSD.
-	  a patch from Takahiro Kambe <taca at back-street.net> in
-	  [ruby-dev:34691].
-
-Mon May 19 06:36:37 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* .: Release as Ruby 1.8.7-preview3.
-
-Sun May 18 22:26:51 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservlet/filehandler.rb: should normalize path
-	  name in path_info to prevent script disclosure vulnerability on
-	  DOSISH filesystems. (fix: CVE-2008-1891)
-	  Note: NTFS/FAT filesystem should not be published by the platforms
-	  other than Windows. Pathname interpretation (including short
-	  filename) is less than perfect.
-
-	* lib/webrick/httpservlet/abstract.rb
-	  (WEBrick::HTTPServlet::AbstracServlet#redirect_to_directory_uri):
-	  should escape the value of Location: header.
-
-	* lib/webrick/httpservlet/cgi_runner.rb: accept interpreter
-	  command line arguments.
-
-Sat May 17 23:53:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (file_expand_path): fix for short file name on Cygwin.
-
-Sat May 17 11:29:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_extname): first dot is not an extension name.
-
-Sat May 17 10:18:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_search): need to free allocated buffer in re_register.
-
-Fri May 16 17:01:44 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (test-rubyspec): added.
-
-Fri May 16 16:22:40 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: sometimes freeze when receive Interrupt signal.
-
-Fri May 16 14:54:56 2008  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in (update-rubyspec): move rubyspec to srcdir. 
-	  (test-rubyspec): ditto.
-
-Fri May 16 14:25:22 2008  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in (test-rubyspec): use RUNRUBY.  suggested by nobu.
-
-Fri May 16 13:01:43 2008  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in (update-rubyspec): new target to download rubyspec.
-	  (test-rubyspec): new target to run rubyspec.  this doesn't work
-	  before install.
-
-Fri May 16 08:15:52 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: fix memory (object) leak bug.
-
-	* ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb:
-	  bug fix.
-
-Thu May 15 17:00:22 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* string.c (Init_String): Define #bytesize as an alias for #size
-	  for compatibility with 1.9.
-
-Thu May 15 15:33:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (file_expand_path): support for alternative data stream
-	  and ignored trailing garbages of NTFS.
-
-	* file.c (rb_file_s_basename): ditto.
-
-	* file.c (rb_file_s_extname): ditto.
-
-Wed May 14 19:24:59 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_count): Override Enumerable#count for better
-	  performance.
-	  (rb_ary_nitems): Undo the backport.  Use #count {} instead.
-
-	* enumerator.c (enumerator_iter_i): Remove an unused function.
-	  (enumerator_with_index, enumerator_each): Remove unused
-	  variables.
-
-Wed May 14 17:15:11 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/tk/tkutil/extronf.rb: check stdndup() because it's not standard
-	  function of C.
-
-	* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): use malloc() and
-	  strncpy() instead of strndup() if not available.
-
-Wed May 14 09:52:02 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. 
-	  Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still
-	  not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. 
-	  :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; 
-	  those are attributes of event object). It means that Ruby/Tk accepts
-	  not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but 
-	  also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". 
-	  It is potentially incompatible, when user passes symbols to the
-	  arguments of the callback block (the block receives the symbols as
-	  strings). I think that is very rare case (probably, used by Ruby/Tk
-	  experts only). When causes such trouble, please give strings instead
-	  of such symbol parameters (e.g. call Symbol#to_s method).
-
-	* ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, 
-	  ext/tk/lib/tkextlib/blt/treeview.rb, 
-	  ext/tk/lib/tkextlib/winico/winico.rb: ditto.
-
-	* ext/tk/tkutil/tkutil.c: strings are available on subst_tables on 
-	  TkUtil::CallbackSubst class (it is useful on Ruby 1.9). 
-
-	* ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/spinner.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/entryfield.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/calendar.rb, 
-	  ext/tk/lib/tkextlib/blt/dragdrop.rb, 
-	  ext/tk/lib/tkextlib/tkDND/tkdnd.rb, 
-	  ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, 
-	  ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became 
-	  unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c.
-
-Tue May 13 15:10:50 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c: Update rdoc.
-	  (enumerator_initialize): Discourage the use.
-	  (enum_each_slice, enum_each_cons, enumerator_each)
-	  (enumerator_with_index): Add a note about a call without a block.
-
-	* NEWS: Intentionally omit enum_slice and enum_cons, which are
-	  removed in 1.9.
-
-Tue May 13 07:56:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cat): fixed buffer overrun reported by
-	  Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746]
-
-Mon May 12 13:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}.  "defined?(a||=1)"
-	  should not operate assignment.  [ruby-dev:34645]
-
-Mon May 12 12:59:23 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to
-	  an invalid value.
-
-	* ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom.
-
-Mon May 12 12:36:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_select): backport from trunk.
-	  [ruby-talk:300743]
-
-Mon May 12 12:33:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (RUBYLIB, RUBYOPT): clear.
-
-Mon May 12 10:41:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (SimpleDelegator::dup): removed needless argument.
-	  [ruby-list:44910]
-
-	* lib/delegate.rb (clone, dup): keep relationship with the target
-	  object.
-
-Sun May 11 23:19:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (all_iter_i, any_iter_i): reduced duplicated code.
-
-Sun May 11 17:57:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (MINIRUBY): should not include extension library path.
-
-Sun May 11 10:36:10 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* eval.c (method_name, method_owner): New methods; backported
-	  from 1.9. (UnboundMethod#name, UnboundMethod#owner)
-
-Sun May 11 02:48:13 2008    <nagai@orca16.orcabay.ddo.jp>
-
-	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: fail to do pack/grid 
-	  without options.
-
-	* ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.
-
-Sat May 10 18:19:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_each_line): RDoc updated.  [ruby-dev:34586]
-
-Sat May 10 13:17:56 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported
-	  parameter patterns of configure method.
-
-Sat May 10 09:16:13 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): backported from 1.9.  a patch from Satoshi
-	  Nakagawa <psychs at limechat.net> in [ruby-dev:34625]. 
-	  fixed: [ruby-dev:34623]
-
-Fri May  9 23:33:25 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot
-	  pass the given block to methods of Tk::Wm module.
-
-	* ext/tk/lib/tk/grid.rb: lack of module-method definitions.
-
-	* ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions.
-
-	* ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) 
-	  characters for headings.
-
-	* ext/tk/tcltklib.c: maybe a little more stable about @encoding value 
-	  of TclTkIp object.
-
-Wed May  7 08:46:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_s_def): to_str should be called only once.
-	  [ruby-core:16647]
-
-Wed May  7 00:54:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.
-	  a patch from Kouya <kouyataifu4 at gmail.com> in
-	  [ruby-reference-manual:762].
-
-Sun May  4 09:35:51 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* sample/erb/erb4html.rb (ERB4Html) : add example of ERB#set_eoutvar.
-	  ERB4Html is an auto-quote ERB.
-
-Sat May  3 22:52:48 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
-	  ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. 
-	  add Tk::Tile.themes and Tk::Tile.set_theme(theme).
-
-Fri May  2 14:52:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el: move fontifying code from hook.  a patch from
-	  Phil Hagelberg <phil at hagelb.org> in [ruby-core:16636].
-
-Fri May  2 13:47:51 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (match_select): restore previous behavior of MatchData#select.
-	  RDoc updated as well, mentioning the plan to remove this method
-	  in the future.  [ruby-dev:34556]
-
-Fri May  2 13:04:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dbm/dbm.c (Init_dbm): defines DBM::VERSION even when
-	  DB_VERSION_STRING is not available.  [ruby-dev:34569]
-
-Thu May  1 23:57:06 2008  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	Merged 16257 from trunk.
-
-	* lib/net/telnet.rb:  This patch from Brian Candler adds a FailEOF mode which
-	  can be activated to have net/telnet raise EOFError exceptions when the 
-	  remote connection is closed.  The default behavior remains unchanged though.
-
-Thu May  1 23:43:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (range_step): check if step can be converted to an integer.
-	  [ruby-dev:34558]
-
-	* range.c (range_step): allow float step bigger than zero but less
-	  than one.  [ruby-dev:34557]
-
-Wed Apr 30 20:22:40 2008  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	Merged 16241 from trunk.
-
-	* lib/net/telnet.rb:  Fixing a bug where line endings would not be properly
-	  escaped when the two character ending was broken up into separate TCP
-	  packets.  Issue reported and patched by Brian Candler.
-
-Wed Apr 30 17:47:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_search): use local variable.  a patch from wanabe
-	  <s.wanabe AT gmail.com> in [ruby-dev:34537].  [ruby-dev:34492]
-
-Sat Apr 26 19:40:34 2008  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* class.c (struct clone_method_data): Add cref.
-	  (clone_method): Properly handle NODE_BMETHOD and NODE_DMETHOD.
-	  (rb_singleton_class_clone, singleton_class_clone_int): Set a
-	  proper value to klass and propagate cref. [ruby-core:16238]
-
-	* eval.c (rb_block_dup, rb_method_dup), intern.h: Add duplicator
-	  methods for use from class.c#clone_method().
-
-Fri Apr 25 15:46:37 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/scrollbar.rb, ext/tk/lib/tk/scale.rb:
-	  improve unknonw-option check when create a widget. 
-
-	* ext/tk/lib/tkextlib/blt/unix_dnd.rb, ext/tk/lib/tkextlib/blt/ted.rb,
-	  ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix on 'cget'.
-
-	* ext/tk/lib/tk/menuspec.rb: option check will fail when 
-	  TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__ is true.
-
-	* ext/tk/lib/tk/palette.rb: bug fix.
-
-Fri Apr 25 12:37:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (flatten): returns an instance of same class.
-	  [ruby-core:16554]
-
-Thu Apr 24 23:47:50 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/net/pop.rb: backported from 1.9. bug#19003
-
-	* ext/openssl/lib/openssl/ssl.rb: set_params; backported from 1.9.
-	  bug#19552, [ruby-dev:34402]
-
-	* ext/openssl/ossl_ssl.c: ditto.
-
-	* test/openssl/test_ssl.rb: ditto.
-
-Thu Apr 24 17:06:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (THREAD_SAVE_CONTEXT): remove unnecessary
-	  FLUSH_REGISTER_WINDOWS before calling setjmp().  [ruby-core:16285]
-
-Thu Apr 24 14:15:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln.c (dln_find_1): prior files with extensions to files sans
-	  extensions.  [ruby-core:16517]
-
-Wed Apr 23 15:39:31 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (bind_eval): Add Binding#eval, a shorthand method for
-	  eval(str, binding, ..); backported from 1.9.
-
-Wed Apr 23 15:28:52 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create): failed
-	  notice moved from comment to assertion message. [ruby-dev:29127]
-
-Wed Apr 23 14:00:05 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb (create_makefile): Add a missing dependency on the
-	  target directory for each .rb file.  This will hopefully fix
-	  parallel make (-jN).  Tested on FreeBSD.
-
-Wed Apr 23 11:49:54 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set#each, SortedSet#each, TC_Set#test_each): Return
-	  an enumerator if no block is given.
-
-Wed Apr 23 00:42:49 2008  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (error_print): show full stack grace except SystemStackError.
-	  backport from 1.9.  [ruby-dev:31014]
-
-Wed Apr 23 00:18:45 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): Improve
-	  tests of Symbol#to_proc.
-
-Tue Apr 22 22:43:05 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_proc_new, YIELD_FUNC_LAMBDA): Add a new nd_state
-	  YIELD_FUNC_LAMBDA which avoids automatic `avalue' conversion for
-	  arguments.  This fixes a bug where [1,[2,3]].map(&:object_id)
-	  fails.
-
-	* intern.h, object.c: Hide rb_proc_new() from intern.h.  It should
-	  not be considered an official API function yet.
-
-Tue Apr 22 21:24:32 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_proc_new): Turn the BLOCK_LAMBDA flag on.
-
-	* object.c (sym_to_proc), test/ruby/test_symbol.rb: Add back
-	  Symbol#to_proc, now that it passes the tests.
-
-Tue Apr 22 19:35:03 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (enumerator_initialize): Remove an undocumented
-	  feature (passing a block to the constructor) that's broken.
-	  This is not what I intended.
-
-Tue Apr 22 17:49:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): should protect temporary string from
-	  GC.   [ruby-dev:34480]
-
-Tue Apr 22 17:12:05 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_search): string might be NULL.  [ruby-core:16478]
-
-Tue Apr 22 16:44:00 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* object.c (rb_obj_tap): Correct documentation; pointed out by
-	  okkez in [ruby-dev:34472].
-
-Tue Apr 22 10:05:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (eaccess): workaround for recent msvcrt's behavior.
-	  [ruby-core:16460]
-
-Mon Apr 21 16:06:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enumerator_init): preserve the method name in ID.
-
-	* enumerator.c (enumerator_each): need not to call rb_to_id().
-
-	* enumerator.c (enumerator_with_index): ditto.
-
-Mon Apr 21 17:19:52 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_f_method_name): New gloval function: __method__;
-	  backported from matzruby / 1.9.
-
-	* eval.c (rb_frame_this_func), intern.h: New internal function.
-
-	* intern.h (RETURN_ENUMERATOR): Use rb_frame_this_func() instead
-	  of rb_frame_last_func(), to accommodate the behavior to that of
-	  1.9.
-
-Mon Apr 21 15:54:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile::_close): check @data before modifying
-	  it; backported from 1.9.  [ruby-dev:34094]
-
-	* lib/tempfile.rb (Tempfile::close): clear @data and @tmpname.
-
-Mon Apr 21 10:17:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c: should include <errno.h> to refer errno.
-
-Mon Apr 21 10:02:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* hash.c (recursive_hash): prototype.
-
-Mon Apr 21 10:00:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (rb_strftime): check errno to detect strftime(3)'s error.
-	  this is workaround for recent version of MSVCRT.
-	  [ruby-dev:34456]
-
-Sun Apr 20 21:10:04 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* .: Release as Ruby 1.8.7-preview2.
-
-Sun Apr 20 21:02:06 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c: Resolve the method every time an enumeration
-	  method is run, not once when the enumerator is initialized as it
-	  was before, so that method_missing() and method (re)definition
-	  afterwards are both in effect; pointed out in: [ruby-core:16441]
-
-Sun Apr 20 17:59:25 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* object.c, NEWS, test/ruby/test_symbol.rb: Revert Symbol#to_proc
-	  since it does not pass the tests.
-
-Sun Apr 20 14:29:35 2008  Technorama Ltd.  <oss-ruby@technorama.net>
-
-	* ext/openssl/ossl_ssl.c: initialize session class.
-
-Sat Apr 19 20:54:42 2008  akira yamada  <akira@arika.org>
-
-	* lib/uri/ftp.rb, lib/uri/generic.rb, test/uri/test_common.rb,
-	  test/uri/test_ftp.rb, test/uri/test_generic.rb: backported from 1.9.
-	  [ruby-dev:31318]
-
-Sat Apr 19 20:35:02 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/yaml/baseemitter.rb, lib/yaml/encoding.rb: performance
-	  tuning around String#gsub.
-
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
-
-	* lib/yaml/store.rb (YAML::load): modified to support empty
-	  database.
-
-	* lib/yaml/store.rb (YAML::Store::marshal_dump_supports_canonical_option?):
-	  add a method to support faster PStore.
-
-Sat Apr 19 20:16:52 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit;
-	  merged from 1.9.
-
-	* lib/yaml.rb (quick_emit): use combination of object_id and hash to
-	  identify repeated object references, since GC will reuse memory of
-	  objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698];
-	  merged from 1.9.
-
-Sat Apr 19 20:05:39 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_equal, rb_ary_eql, rb_ary_hash, rb_ary_cmp):
-	  Make Array#eql?, #hash, #== and #<=> use rb_exec_recursive() and
-	  handle recursive data properly.
-
-	* hash.c (hash_equal, rb_hash_hash): Make Hash#eql?, #hash and #==
-	  use rb_exec_recursive() and handle recursive data properly.
-
-Sat Apr 19 19:26:09 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* intern.h, eval.c (rb_exec_recursive): New internal function to
-	  help perform recursive operation; backported from 1.9.
-
-Sat Apr 19 18:42:04 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* intern.h, hash.c (rb_hash_lookup): New internal function to
-	  check if a key exists in a hash, ignoring #default; backported
-	  from 1.9.
-
-Fri Apr 18 18:56:57 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syck/rubyext.c (syck_genericresolver_node_import): should
-	  not set instance variable "@kind" before initializing it.
-	  [ruby-dev:32677]
-
-	* ext/syck/rubyext.c (syck_resolver_initialize,
-	  syck_resolver_detect_implicit, syck_emitter_emit): remove unused
-	  variables.
-
-Fri Apr 18 18:54:57 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syck/rubyext.c: Node#value defined twice.
-
-	* lib/yaml/: several method redefinitions causing warnings.
-
-Fri Apr 18 16:36:16 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/rexml/node.rb (REXML::Node::indent): should initialize rv
-	  variable.  a patch from Tadayoshi Funaba <tadf AT dotrb.org> in 
-	  [ruby-dev:32783].
-
-Fri Apr 18 16:01:37 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/rexml: Merge fixes since 1.8.6 made solely on the ruby_1_8_6
-	  branch.
-
-Wed Apr 16 06:11:49 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_event):
-	  Fix tests to reflect the following changes: r15833, r15759.
-
-Wed Apr 16 05:03:48 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* .: Release as Ruby 1.8.7-preview1.
-
-Wed Apr 16 02:09:14 2008  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/xmlrpc/client.rb: fix cookie handling. [ruby-dev:34403]
-
-	* test/xmlrpc/test_cookie.rb: add a test for the above fix.
-
-Tue Apr 15 23:48:28 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* version.h: Branch off ruby_1_8_7 from ruby_1_8 in preparation
-	  for the forthcoming 1.8.7 release.
-
-Tue Apr 15 23:40:39 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syck/rubyext.c (rb_syck_mktime): Avoid buffer overflow.
-
-Tue Apr 15 20:32:03 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (match_inspect): backported from 1.9.
-
-Tue Apr 15 19:03:28 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* eval.c (method_receiver, method_name, method_owner): New
-	  methods; backported from 1.9. bug#19007
-
-Tue Apr 15 18:39:14 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/uri.rb, lib/uri/ldaps.rb: added LDAPS
-	  scheme; backported from 1.9. bug#19015, [ruby-dev:31896]
-
-Tue Apr 15 17:45:43 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/net/smtp.rb: backported from 1.9. bug#19003
-
-Tue Apr 15 17:06:12 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): add tests.
-
-Tue Apr 15 16:58:55 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/menuspec.rb: option check will fail when 
-	  TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__ is true.
-
-	* ext/tk/lib/tk/palette.rb: bug fix.
-
-Tue Apr 15 16:47:48 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* signal.c, gc.c: New methods: GC.stress, GC.stress=;
-	  backported from 1.9. a patch from Tadashi Saito
-	  in [ruby-dev:34394] and bug#19000
-
-Tue Apr 15 12:35:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* rubyio.h (rb_io_t): renamed from OpenFile.
-
-	* ruby.h (struct RHash), file.c, gc.c, io.c, ext/dl/dl.c,
-	  ext/io/wait/wait.c, ext/pty/pty.c, ext/readline/readline.c,
-	  ext/socket/socket.c: ditto.
-
-	* win32/win32.h: removed workaround for OpenFile.
-
-Tue Apr 15 00:15:29 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/text.rb: typo. call a wrong method.
-
-	* ext/tk/lib/tk/itemconfig.rb: ditto.
-
-	* ext/tk/sample/ttk_wrapper.rb: bug fix.
-
-	* ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode.
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: 
-	  support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options.
-
-	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. 
-
-	* ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add.
-
-	* ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the 
-	  procedure which called at end of the timer.
-
-Mon Apr 14 19:54:21 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_flatten, rb_ary_flatten_bang): Take an optional
-	  argument that determines the level of recursion to flatten;
-	  backported from 1.9.
-
-	* array.c (rb_ary_shuffle_bang, rb_ary_shuffle, rb_ary_choice,
-	  rb_ary_cycle, rb_ary_permutation, rb_ary_combination,
-	  rb_ary_product, rb_ary_take, rb_ary_take_while, rb_ary_drop,
-	  rb_ary_drop_while): New methods: Array#shuffle, #shuffle!,
-	  #choice, #cycle, #permutation, #combination, #product, #take,
-	  #take_while, #drop, #drop_while; backported from 1.9.
-
-Mon Apr 14 19:52:35 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ruby.h: New macro: RB_GC_GUARD().
-
-Mon Apr 14 19:49:35 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* random.c (rb_genrand_int32, rb_genrand_real), intern.h: Export.
-
-	* string.c (rb_str_tmp_new), intern.h: New function.
-
-Mon Apr 14 19:18:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enum.c (inject_i, inject_op_i): prototype.
-
-Mon Apr 14 19:10:47 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c New methods: Enumerable#take, #take_while, #drop and
-	  #drop_while; backported from 1.9.
-
-Mon Apr 14 18:50:15 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c: New methods: Enumerable#one?, #none?, #minmax, #min_by,
-	  #max_by, #minmax_by and #cycle; backported from 1.9.
-
-	* enum.c (enum_find_index): Add support for find_index(obj);
-	  [ruby-dev:34313]; backported from 1.9.
-
-	* enum.c (enum_inject): Add support for Enumerable#inject(:binop);
-	  backported from 1.9.
-
-	* enum.c: Alias Enumerable#reject to #inject; backported from 1.9.
-
-Mon Apr 14 18:14:19 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c (enum_find, enum_reject): Return an enumerator if no
-	  block is given; backported from 1.9.
-
-	* io.c (rb_io_each_line, rb_io_each_byte, rb_io_s_foreach,
-	  argf_each_line, argf_each_byte): Ditto.
-
-	* string.c (str_gsub): Ditto.
-
-Mon Apr 14 18:10:05 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enum.c (find_index_i, find_index_iter_i): add prototype for VC.
-
-Mon Apr 14 17:55:30 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_collect_bang, rb_ary_select): Return an
-	  enumerator if no block is given; backported from 1.9.
-
-	* dir.c (dir_each, dir_foreach): Ditto.
-
-	* enum.c (enum_partition, enum_sort_by): Ditto.
-
-	* gc.c (os_each_obj): Ditto.
-
-	* hash.c (rb_hash_delete_if, rb_hash_reject_bang, rb_hash_select,
-	  rb_hash_each_value, rb_hash_each_key, rb_hash_each_pair,
-	  env_each_key, env_each_value, env_each, env_each_pair,
-	  env_reject_bang, env_delete_if, env_select): Ditto.
-
-	* numeric.c (num_step, int_upto, int_downto, int_dotimes): Ditto.
-
-Mon Apr 14 16:42:53 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ruby.h (rb_block_call_func): Fix prototype.
-
-	* enumerator.c (enumerator_iter_i, enumerator_each_i): Ditto.
-
-Mon Apr 14 15:49:05 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c (enum_count, enum_find_index): New methods:
-	  Enumerable#count and #find_index; backported from 1.9.
-
-Mon Apr 14 14:16:08 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enumerator.c (enumerator_mark, enumerator_iter_i, enumerator_each_i,
-	  enumerator_allocate): add prototype.
-
-	* enumerator.c (enumerator_each_i): declare unused two arguments.
-
-Mon Apr 14 13:58:32 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* string.c (rb_str_each_char): New methods: String#chars and
-	  #each_char; backported from 1.9.
-
-Mon Apr 14 13:42:20 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* string.c (rb_str_each_line, rb_str_each_byte): Reflect
-	  enumerator integration.  #lines and #bytes are now aliases to
-	  #each_line and #each_byte, respectively.
-
-Mon Apr 14 13:19:36 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* range.c (range_each, range_step): Return an enumerator if no
-	  block is given; backported from 1.9.
-
-	* struct.c (rb_struct_each, rb_struct_each_pair): Ditto.
-
-Mon Apr 14 13:07:59 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* string.c (rb_str_partition, rb_str_rpartition,
-	  rb_str_start_with, rb_str_end_with): New methods:
-	  String#partition, #rpartition, #start_with? and #end_with?;
-	  backported from 1.9.  These methods are $KCODE aware unlike
-	  #index, #rindex and #include?.
-
-Sun Apr 13 15:55:52 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* object.c (sym_to_proc): new method Symbol#to_proc; backported
-	  from 1.9. bug#19012
-
-Fri Apr 11 19:14:30 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* object.c (rb_obj_tap): new method Object#tap; backported from
-	  1.9. bug#19008
-
-Fri Apr 11 18:58:09 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* process.c: new method Process.exec; backported from 1.9. bug#19006
-
-Fri Apr 11 12:43:56 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
-	  ext/tk/sample/tkextlib/tile/demo.rb: previous patch is not complete.
-
-Fri Apr 11 10:22:54 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tile.rb:
-	  __define_LoadImages_proc_for_compatibility__! do nothing when the 
-	  Tcl command exists.
-
-	* ext/tk/lib/tkextlib/tile/style.rb:
-	  __define_wrapper_proc_for_compatibility__! do nothing when the Tcl
-	  command exists.
-
-	* ext/tk/sample/tkextlib/tile/demo.rb: don't create 'step' theme if 
-	  it already exists.
-
-Fri Apr 11 08:05:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_object): add volatile to avoid potential GC bug.  a
-	  patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
-	  in [ruby-dev:34311].
-
-Thu Apr 10 20:29:13 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* misc/rdebug.el, misc/README: Remove rdebug.el as per request
-	  from the maintainer and mention the ruby-debug project at
-	  RubyForge in README; bug#19043.
-
-Thu Apr 10 20:08:37 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c (enum_first, enum_group_by): New methods:
-	  Enumerable#first and #group_by; backported from 1.9.
-
-Thu Apr 10 19:49:10 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (rb_eStopIteration), eval.c (rb_f_loop), ruby.h:
-	  Add a new exception class StopIteration, which breaks Kernel#loop
-	  iteration when raised; backported from 1.9.
-
-	* enumerator.c (enumerator_next, enumerator_rewind): Implement
-	  #next and #rewind using the "generator" library.
-
-	* lib/generator.rb: Implement Enumerable::Enumerator#next and
-	  #rewind.
-
-Thu Apr 10 19:29:48 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_first, rb_ary_last): Return a shared array when
-	  possible.
-
-	* array.c (rb_ary_pop, rb_ary_pop_m, rb_ary_shift, rb_ary_shift_m):
-	  Array#pop and Array#shift can take an optional argument
-	  specifying the number of elements to remove and return;
-	  backported from 1.9.
-
-Thu Apr 10 14:00:44 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::DNS#each_address): backport from 1.9 for
-	  CNAME.  [ruby-dev:34200]
-
-Thu Apr 10 01:42:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enum.c (iterate_method): add prototype to avoid warning on VC++.
-
-Wed Apr  9 23:12:41 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
-
-	* ext/tk/tcltklib.c: avoid error on a shared object.
-
-	* ext/tk/extconf.rb: support --with-tcltkversion
-
-	* ext/tk/README.tcltklib: add document about --with-tcltkversion
-
-	* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, 
-	  ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, 
-	  ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: 
-	  bug fix.
-
-Wed Apr  9 21:54:45 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_pop): Do not reallocate too often; backported
-	  from 1.9.
-
-Wed Apr  9 21:13:05 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_each, rb_ary_each_index, rb_ary_reverse_each,
-	  rb_ary_reject, rb_ary_reject_bang): Array#each, #each_index,
-	  #reverse_each, #reject, #reject! and #delete_if return an
-	  enumerator if no block is given; backported from 1.9.
-
-Wed Apr  9 20:47:16 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_index, rb_ary_index): Array#index and #rindex
-	  can take a block instead of an argument; backported from 1.9.
-
-Wed Apr  9 19:58:31 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c, inits.c (rb_call_inits), ruby.h, intern.h,
-	  ext/enumerator, common.mk (OBJS, enumerator.$(OBJEXT)): Make the
-	  enumerator module built-in.
-
-	* enumerator.c: New method: Enumerable::Enumerator#with_index.
-
-	* enum.c (enum_each_with_index): Enumerable#each_with_index now
-	  returns an enumerator instead of raising an exception if no
-	  block is given.  Enumerable#enum_with_index, formerly defined in
-	  the enumerator module, is kept as an alias to each_with_index
-	  for backward compatibility.
-
-Wed Apr  9 19:43:51 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_obj_method, rb_proc_call), intern.h: Export.
-
-Tue Apr  8 11:11:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (EXEC_TAG): remove unnecessary FLUSH_REGISTER_WINDOWS for
-	  better performance on SPARC.  [ruby-core:16159]
-
-Tue Apr  8 10:49:54 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_quote): should always copy the quoting string.
-	  [ruby-core:16235]
-
-Mon Apr  7 21:35:08 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_nitems): Backport Array#nitems with a block;
-	  suggested by Bertram Scharpf <lists@bertram-scharpf.de> in
-	  [ruby-talk:134083].
-
-Sun Apr  6 09:45:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dir_tell): check if closed.  [ruby-core:16223]
-
-Sat Apr  5 10:05:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_check_to_integer): backported for range_step.
-
-Fri Apr  4 05:57:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
-	  @n_bytes as well.  [ruby-core:16144]
-
-Fri Apr  4 02:17:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_step): should not round step into integer if
-	  begin and end are numeric.  [ruby-core:15990]
-
-Tue Apr  1 14:43:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: get rid of empty expansion.
-
-	* {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
-
-Tue Apr  1 11:36:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: _setjmp is available but _longjmp is not on mingw.
-
-Tue Apr  1 03:20:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_SETJMP, RUBY_LONGJMP, RUBY_JMP_BUF): prefers
-	  _setjmp over setjmp and sigsetjmp.  [ruby-core:16023]
-	  __builtin_setjmp cannot handle a variable.
-
-	* configure.in (--with-setjmp-type): new option to override the
-	  default rule in the above.
-
-	* eval_intern.h (ruby_setjmp, ruby_longjmp), gc.c (rb_setjmp),
-	  vm_core.h (rb_jmpbuf_t): use RUBY_SETJMP, RUBY_LONGJMP and
-	  RUBY_JMP_BUF.
-
-Tue Apr  1 01:55:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/resolv.rb (Resolv::Config.default_config_hash): requires
-	  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]
-
-Mon Mar 31 14:51:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_div): Bignum#div should return integer for
-	  floating number operand.
-
-Sun Mar 30 07:00:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet.
-
-Sat Mar 29 14:18:41 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.
-
-	* ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets' 
-	  instate/state/identify method to avoid the conflict with standard
-	  widget options. Those methods are renamed to ttk_instate/ttk_state/
-	  ttk_identify (tile_instate/tile_state/tile_identify are available 
-	  too). Although I don't recommend, if you realy need old methods, 
-	  please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before 
-	  "require 'tkextlib/tile'".
-
-	* ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!"
-	  is obsolete. It outputs warning. To control default widget set, 
-	  use "Tk.default_widget_set = :Ttk".
-
-	* ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and 
-	  __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind 
-	  as module methods of TkConfigMethod. It may help users to wrap old 
-	  Ruby/Tk scripts (use standard widgets) to force to use Ttk widgets.
-	  Ttk widgets don't have some options of standard widgets which are 
-	  control the view of widgets. When set ignore-mode true, configure 
-	  method tries to ignoure such unknown options with no exception. 
-	  Of course, it may raise other troubles on the GUI design. 
-	  So, those are a little danger methods. 
-
-	* ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ 
-	  method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method 
-	  are defind as module methods of TkItemConfigMethod as the same 
-	  purpose as TkConfigMethod's ones.
-
-	* ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for 
-	  wrapping old Ruby/Tk scripts (which use standard widgets) to use 
-	  Ttk (Tile) widgets as default.
-
-	* ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state 
-	  method instead of instate/state method.
-
-	* ext/tk/lib/tk/root, ext/tk/lib/tk/namespace.rb,
-	  ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's  
-	  are replaced to "instance_exec(self)".
-
-	* ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not 
-	  a character code on Ruby1.9).
-
-	* ext/tk/lib/tk/variable.rb: support new style of operation argument 
-	  on Tcl/Tk's 'trace' command for variables. 
-
-	* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix
-
-	* ext/tk/sammple/demos-jp/textpeer.rb, 
-	  ext/tk/sammple/demos-en/textpeer.rb: new widget demo.
-
-	* ext/tk/tcltklib.c: decrase SEGV troubles (probably)
-
-	* ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9
-
-	* ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably)
-
-	* ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command 
-	  to make Tcl/Tk theme sources (based on different version of Tile 
-	  extension) available. 
-	  (Tk::Tile::__define_LoadImages_proc_for_comaptibility__)
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames
-	  (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets 
-	  as toplevel widgets.
-
-	* ext/tk/lib/tkextlib/tile/style.rb: ditto.
-	  (Tk::Tile::Style.__define_wrapper_proc_for_compatibility__)
-
-	* ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get 
-	  properties as a hash. metrics_hash method returns a boolean value 
-	  for 'fixed' option. But metrics method returns numeric value 
-	  (0 or 1) for 'fixed' option, because of backward compatibility. 
-
-	* ext/tk/lib/tk/timer.rb: somtimes fail to set callback procedure.
-
-	* ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep 
-	  doesn't block the eventloop. It will be better to use the method 
-	  in event callbacks.
-
-	* ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep.
-
-Sat Mar 29 04:08:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (clone_method): should copy cref as well.
-	  [ruby-core:15833]
-
-Mon Mar 24 20:07:42 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_eval): Call trace hook for if expression after the
-	  condition has been evaluated, not before; submitted by Rocky
-	  Bernstein in #18722.
-
-Mon Mar 24 19:44:53 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* parse.y (yycompile): Always prepare a new array for each file's
-	  SCRIPT_LINES__ storage, instead of appending source lines every
-	  time a file is re-loaded; submitted by Rocky Bernstein in
-	  #18517.
-
-Mon Mar 24 10:25:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: sitearch should use target_cpu.  [ruby-core:15986]
-
-Mon Mar 24 01:24:24 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb (result): use proc instead of Thread. [ruby-dev:33692]
-
-Fri Mar 21 21:26:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
-	  [ruby-dev:29945], [ruby-dev:34095]
-
-	* lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased
-	  name too for cygwin.  [ruby-dev:29945]
-
-	* lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.
-
-Fri Mar 21 21:10:00 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/ipaddr.rb: Say that I am the current maintainer.
-
-	* lib/set.rb: Ditto.
-
-	* lib/shellwords.rb: Ditto.
-
-	* ext/syslog/syslog.txt: Ditto.
-
-Fri Mar 21 09:24:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (open_for_install): write block result and rewrite only
-	  if changed from existing file.
-
-Wed Mar 19 21:01:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
-	  is not needed.  [ruby-dev:32640]
-
-Wed Mar 19 20:25:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (Init_Dir): define inspect method.  [ruby-core:15960]
-
-Wed Mar 19 14:59:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-style.el (ruby-style-{case,label}-indent): fix for labels
-	  inside blocks in switch and function top level.
-
-Wed Mar 19 14:36:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_cstr_to_inum): treat successive underscores as
-	  nondigit.  [ruby-dev:34089]
-
-Wed Mar 19 00:01:23 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb (ERB::Compiler): Make some minor code optimization.
-
-Mon Mar 17 17:11:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode): should use `run-mode-hooks' instead
-	  of calling `run-hooks' directly to run the mode hook.  patch from
-	  Chiyuan Zhang <pluskid AT gmail.com> in [ruby-core:15915]
-
-Mon Mar 17 16:41:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: unset GREP_OPTIONS.  [ruby-core:15918]
-
-Fri Mar 14 16:59:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_LIB_PREFIX): fix for prefix.
-
-Fri Mar 14 16:35:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::Cookie::initialize): performance patch from
-	  Makoto Kuwata <kwa@kuwata-lab.com> in [ruby-dev:34048].
-
-Fri Mar 14 15:49:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_LIB_PREFIX): use libdir.
-
-Fri Mar 14 10:12:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor
-	  directives.
-
-Thu Mar 13 00:37:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_call0): yields the last executed node line number at
-	  return event.  [ruby-core:15855]
-
-Wed Mar 12 02:12:20 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/delegate.rb: check $@ to avoid NoMethodError.
-
-Tue Mar 11 19:48:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_coerce): try conversion before type check.
-	  [ruby-core:15838]
-
-Tue Mar 11 17:03:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator#initialize, DelegateClass): skip correct
-	  backtrace.  [ruby-dev:34019]
-
-Tue Mar 11 16:43:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_cmdvector): terminate shrunken command line.
-
-Tue Mar 11 12:39:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (clean-local): removes MINOBJS.
-
-Sat Mar  8 18:50:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (isdirsep): backslash is valid path separator on cygwin too.
-
-Fri Mar  7 19:56:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: rdoc added.  [ruby-Patches-9762]
-
-Thu Mar  6 15:10:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32}/Makefile.sub (RUNRUBY): use $(PROGRAM) instead of
-	  ruby$(EXEEXT).
-	  suggested by KIMURA Koichi <kimura.koichi at canon.co.jp>.
-	  [ruby-dev:34000]
-
-Thu Mar  6 12:15:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (opt_block_param): command can start just after block param
-	  definition.  [ruby-list:44479]
-
-Thu Mar  6 00:34:11 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb: update RDoc. Thanks Makoto Kuwata [ruby-dev:33702]
-
-Mon Mar  3 23:28:34 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservlet/filehandler.rb: should normalize path
-	  separators in path_info to prevent directory traversal attacks
-	  on DOSISH platforms.
-	  reported by Digital Security Research Group [DSECRG-08-026].
-
-	* lib/webrick/httpservlet/filehandler.rb: pathnames which have
-	  not to be published should be checked case-insensitively.
-
-Mon Mar  3 16:14:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_any_hash): shrinks all results in Fixnum range.
-	  [ruby-core:15713]
-
-Sat Mar  1 02:35:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (big2str_find_n1): check integer overflow.
-
-Tue Feb 26 16:06:00 2008  Technorama Ltd.  <oss-ruby@technorama.net>
-
-	* ext/openssl/ossl_pkey_{ec,dh,dsa,rsa}.c: Remove useless warnings.
-
-	* ext/openssl/ossl_asn1.c: Simplify code.
-
-	* ext/openssl/ossl_ssl_session.c Fix compiler warnings.
-	  Undefine #id if SSL_SESSION_get_id is not supported.
-
-Tue Feb 26 15:43:42 2008  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (tokadd_escape): refactored.  [ruby-core:15657]
-
-Mon Feb 25 17:30:29 2008  Technorama Ltd.  <oss-ruby@technorama.net>
-
-	* ext/openssl/digest.c ext/openssl/lib/openssl/digest.rb:
-	  Commit patch #9280 from Akinori MUSHA.
-	  Simplify the OpenSSL::Digest class and make use of the
-	  existing Digest framework.
-	  Enhance performance.
-
-Mon Feb 25 13:40:03 2008  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (Init_process): share bignum objects for RLIM_INFINITY,
-	  RLIM_SAVED_MAX and RLIM_SAVED_CUR if they are equal.
-
-Sun Feb 24 23:29:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, {bcc,win}32/Makefile.sub (clean-local): remove
-	  intermediate files.
-
-Sun Feb 24 03:52:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (valid_filename): use O_EXCL to get rid of clobbering
-	  existing files in race conditions.
-
-Fri Feb 22 19:50:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (BIGZEROP): fix for longer Bignum zeros.  [ruby-Bugs-17454]
-
-Fri Feb 22 16:09:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_lshift, rb_big_rshift, rb_big_aref): removed excess
-	  arguments.
-
-Thu Feb 21 00:01:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RPATHFLAG): -R option of HP-UX ld is not for runtime
-	  load path.  [ruby-list:44600]
-
-Wed Feb 20 23:55:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_map_errno): exported.
-
-Wed Feb 20 13:08:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (parse_args): added --dir-mode, --script-mode and
-	  --cmd-type options.  [ruby-dev:33816]
-
-	* instruby.rb (parse_args): added bin-arch and bin-comm to install
-	  type, for compiled files and script files.
-
-	* instruby.rb (parse_args): deal with make style command line macros,
-	  and count as long syle options if prefixed with INSTALL_.
-
-	* instruby.rb (makedirs): use $dir_mode.  [ruby-dev:33805]
-
-	* instruby.rb (open_for_install): set file mode, which is now
-	  permission mode instead of access mode.
-
-	* instruby.rb (bin-comm): installs scripts with replacing shebang
-	  lines.
-
-Tue Feb 19 18:34:32 2008  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed.  [ruby-dev:33857]
-
-Tue Feb 19 14:27:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_event): prevent polling.  based on
-	  a patch from error errorsson in [ruby-Bugs-17675].
-
-Tue Feb 19 12:08:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (yycompile): clear ruby_eval_tree_begin if parse failed.
-
-Mon Feb 18 16:23:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (yycompile): clear ruby_eval_tree_begin too before parse.
-
-Mon Feb 18 10:17:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
-	  [ruby-Bugs-17940]
-
-Fri Feb 15 20:37:06 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/rational.rb (floor, ceil, truncate, round): do not use
-	  definitions of Numeric.
-
-	* lib/rational.rb (to_i): should returns truncated self.
-
-	* lib/complex.rb (numerator): requires
-	  Integer#{numerator,denominator}.
-
-	* lib/complex.rb (quo): do not use definition of Numeric.
-
-	* lib/complex.rb (div, divmod, floor, ceil, truncate, round):
-	  undef'ed.
-
-Fri Feb 15 15:23:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_convert): check upper bound.  a patch from
-	  Daniel Luz at [ruby-Bugs-17910].
-
-Fri Feb 15 02:42:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ftruncate): check if available.
-
-	* file.c (rb_file_truncate): check if ftruncate instead of truncate.
-
-Fri Feb 15 02:40:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (sigsetmask): check when signal semantics is not POSIX.
-
-	* signal.c (USE_TRAP_MASK): set true if sigprocmask or sigsetmask is
-	  available.
-
-Thu Feb 14 17:44:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dl/ptr.c (dlmem_each_i): typo fixed.  a patch from IKOMA
-	  Yoshiki <ikoma AT mb.i-chubu.ne.jp> in [ruby-dev:33776].
-
-Thu Feb 14 16:02:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_utime): inhibits with secure level 2 or higher.
-
-Thu Feb 14 01:43:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/timeout.rb (Timeout::timeout): made sensitive to location on the
-	  stack.  [ruby-core:15458]
-
-Thu Feb 14 00:49:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (INSTRUBY_ARGS): pass mode to install.  [ruby-dev:33766]
-
-	* instruby.rb (parse_args): added --data-mode and --prog-mode options.
-
-Tue Feb 12 11:33:26 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/erb/test_erb.rb(TestERBCore): import from erb-2.0.4.
-
-	* test/erb/hello.erb: ditto
-
-Mon Feb 11 17:25:21 2008  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::VERSION), test/rss/test_version.rb, NEWS:
-	  0.2.3 -> 0.2.4.
-
-	* lib/rss/maker.rb, lib/rss/maker/, test/rss/test_maker_2.0.rb:
-	  fixed a bug that RSS::Maker.make("0.9")'s item doesn't make some
-	  elements if description is missed.
-	  Reported by Michael Auzenne. Thanks!!!
-
-	* lib/rss/maker/0.9.rb, test/rss/test_maker_0.9.rb:
-	  RSS::Maker.make("0.9") generates RSS 0.92 not RSS 0.91.
-
-Mon Feb 11 16:57:00 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ChangeLog: format-time-string under C locale. [ruby-dev:33261]
-
-Mon Feb 11 16:31:47 2008  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
-
-	* gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
-	  Submitted by Sylvain Joyeux [ruby-core:12099].
-
-	* ext/dl/ptr.c: do not use LONG2NUM() inside dlptr_free().
-	  Slightly modified fix bassed on a patch by Sylvain Joyeux
-	  [ruby-core:12099] [ ruby-bugs-11859 ] [ ruby-bugs-11882 ]
-	  [ ruby-patches-13151 ].
-
-Mon Feb 11 00:22:55 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/benchmark.rb (Job::Benchmark#item): fix typo.
-
-Sat Feb  9 23:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/bigdecimal/extconf.rb: simplified the condition.
-
-Sat Feb  9 17:51:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use strtod() for more
-	  precision.  [ruby-talk:290296]
-
-	* ext/bigdecimal/bigdecimal.c (BASE_FIG): made constant.
-
-	* ext/bigdecimal/extconf.rb: ditto.  [ruby-dev:33658]
-
-Sat Feb  9 00:44:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/irb.rb (IRB::Irb::eval_input): rescues Interrupt and other than
-	  SystemExit and SignalException.  [ruby-core:15359]
-
-Fri Feb  8 15:09:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (xsystem): expand macros like as make.
-
-Tue Feb  5 11:14:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (INSTALL_DIRS, install_dirs): added BINDIR.
-
-	* lib/mkmf.rb (install_files): rejects files matching to
-	  $NONINSTALLFILES.
-
-	* lib/mkmf.rb (init_mkmf): defaults $NONINSTALLFILES to backup and
-	  temporary filse.
-
-Mon Feb  4 16:44:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (darwin): NSIG is not defined if _XOPEN_SOURCE > 500L.
-	  [ruby-dev:33584]
-
-Sat Feb  2 20:06:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/benchmark.rb (Benchmark::realtime): make Benchmark#realtime
-	  a bit faster.  a patch from Alexander Dymo <dymo AT ukrpost.ua> in
-	  [ruby-core:15337].
-
-Sat Feb  2 09:53:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (darwin): disabled fat-binary support which confuses
-	  configure much, since ``universal'' implies hidden cross-compiling.
-	  TODO: ruby and libruby.bundle might be possible to bound with `lipo'
-	  after builds for each archs.  Anyway, config.h and rbconfig.rb must
-	  be separated definitely at least.
-
-Fri Feb  1 21:42:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (darwin): _XOPEN_SOURCE is necessary to make ucontext_t
-	  consistent with the library implementation of MacOS X 10.5.
-	  [ruby-dev:33461]
-
-	* configure.in (darwin): ucontext on PowerPC MacOS X 10.5 is broken.
-
-Thu Jan 31 08:31:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (ext/extmk.rb, instruby.rb): inlined $(MAKE) so that can
-	  be executed even with -n.
-
-Thu Jan 31 07:00:19 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb (bin_for_find): should find a symbol by
-	  Symbol class.
-
-	* test/rinda/test_rinda.rb (test_symbol_tuple): ditto.
-
-Wed Jan 30 22:07:58 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: refined deprecated methods.
-
-Wed Jan 30 22:06:54 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* bignum.c (rb_cstr_to_inum): '0_2' is a valid representation.
-
-Tue Jan 29 22:40:12 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* range.c (step_i): rb_funcall receives VALUE as an argument.
-
-Tue Jan 29 11:53:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: rm largefile.h.
-
-Mon Jan 28 01:21:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_open_file): should check NUL in path.
-	  <http://www.rubyist.net/~matz/20080125.html#c01>.
-
-	* io.c (rb_io_s_popen): ditto.
-
-	* io.c (rb_io_reopen): ditto.
-
-	* io.c (next_argv): ditto.
-
-	* io.c (rb_io_s_foreach): ditto.
-
-	* io.c (rb_io_s_readlines): ditto.
-
-	* io.c (rb_io_s_read): ditto.
-
-Fri Jan 25 22:33:38 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* math.c: fix comment.  [ruby-dev:33276]
-
-Fri Jan 25 10:31:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* */*.bat: set svn:mime-type to text/batch.
-
-Thu Jan 24 19:36:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic::inspect): use Kernel#to_s instead
-	  object_id with printf.  [ruby-dev:33347]
-
-Tue Jan 22 11:22:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
-	  a space will be inserted on the top of the line.
-
-	* win32/Makefile.sub (MKFILES): stop make process if Makefile is
-	  updated.
-
-Mon Jan 21 17:34:41 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* io.c (rb_io_mode_flags, rb_io_mode_modenum): Ignore encoding
-	  options for forward compatibility.
-
-Mon Jan 21 12:50:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin.
-
-Sat Jan 19 11:21:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (sigsetjmp): check if available.
-
-	* eval.c, gc.c (setjmp): do not use _setjmp if sigsetjmp is available.
-
-Sat Jan 19 11:10:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: Remove wrong assumptions about Cygwin.  a patch from
-	  Corinna Vinschen in [ruby-Bugs-17018].
-
-Thu Jan 17 21:06:01 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (Date::Infinity#<=>): didn't work.  A patch from
-	  Dirkjan Bussink <d.bussink AT gmail.com> [ruby-core:15098].
-	  This is a bug obviously.  However it didn't affect the library's
-	  functions.
-
-	* lib/date.rb, lib/date/format.rb: some trivial changes.
-
-Tue Jan 15 15:09:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/setup.mak: strip out empty lines from CPP output.
-
-Tue Jan 15 03:41:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (eval): check if backtrace is empty.  [ruby-core:15040]
-
-Tue Jan 15 01:28:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk: simplified dummy objects dependencies.
-
-Mon Jan 14 16:12:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/shellwords.rb: scape should be an alias to shellescape.  a
-	  patch from Masahiro Kawato <m-kawato AT mwb.biglobe.ne.jp> in
-	  [ruby-dev:33060].
-
-Mon Jan 14 09:32:40 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/time.rb: do not reference Time directly from the inside of
-	  definitions. [ruby-dev:33059]
-
-Sat Jan 12 18:27:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_define_alloc_func, rb_undef_alloc_func): should
-	  define/undef on a signleton class.  [ruby-core:09959]
-
-Sat Jan 12 12:04:14 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb, lib/date/format.rb: tuning for performance.
-
-Fri Jan 11 12:35:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: moved broken syscall checks from process.c etc.
-
-	* defines.h (WORDS_BIGENDIAN): honor __BIG_ENDIAN__ than the result of
-	  configure.
-
-	* dln.c: use dlopen on Mac OS X 10.3 or later.  backport from trunk.
-
-	* lib/rdoc/options.rb (check_diagram): more precise check, darwin
-	  is not Windows but minwg is on it.
-
-Thu Jan 10 10:53:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_open_osfhandle): reverted to old definition.
-	  [ ruby-Bugs-16948 ]
-
-Tue Jan  8 20:02:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win{32,ce}/Makefile.sub: merged.
-
-Sun Jan  6 09:39:02 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb, lib/date/format.rb: introduced some constants
-	  (for internal use).
-
-	* sample/cal.rb: trivial adjustments.
-
-Fri Jan  4 23:08:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_arg): use converted object.  [ruby-core:14759]
-
-Fri Jan  4 01:20:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32.h: only VC6 needs extern "C++" for math.h.  [ruby-talk:285660]
-
-Thu Jan  3 11:28:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]
-
-Wed Jan  2 10:18:56 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* sample/time.rb: use Process.times instead of Time.times.
-
-Wed Jan  2 09:18:11 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* sample/goodfriday.rb: examples for date are enough.  retired.
-
-Wed Jan  2 09:06:55 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* sample/cal.rb: just updated with the newest version.
-
-Mon Dec 31 06:50:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
-	  compiling.
-
-	* configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
-	  moved.
-
-Sun Dec 30 22:48:37 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (_valid_time?): I'm not sure to recommend such an
-	  expression.  but anyway it is acceptable now.  [ruby-core:14580]
-
-Fri Dec 28 16:36:33 2007  NARUSE, Yui  <naruse@airemix.com>
-
-       * lib/resolv.rb (Resolv::DNS#each_address): now returns IPv6 address.
-
-Fri Dec 28 13:21:32 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.2 -> 0.2.3.
-
-	* lib/rss/parser.rb, test/rss/test_parser.rb: supported "-" in tag name.
-	  Reported by Ray Chen. Thanks.
-
-Thu Dec 27 23:56:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* mkconfig.rb: should not use the libraries under the source directory
-	  at cross compiling.
-
-Thu Dec 27 11:02:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h, string.c (rb_str_set_len): added for upgrading path from
-	  1.8 to 1.9. [ruby-dev:32807]
-
-	* string.c (rb_str_lines, rb_str_bytes): ditto.
-
-Thu Dec 27 10:47:32 2007  Technorama Ltd.  <oss-ruby@technorama.net>
-
-	* ext/openssl/ossl_ssl.c: Only show a warning if the default
-	  DH callback is actually used.
-
-	* ext/openssl/ossl_rand.c: New method: random_add().
-
-Wed Dec 26 22:27:45 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of
-	  Resolv::DNS::Label::Str.
-
-	* lib/resolv.rb (Resolv::DNS::MessageEncoder#put_label): String#string
-	  is not defined, so replace to_s.
-
-	* lib/resolv.rb (Resolv::IPv6#to_name): ip6.int is obsoleted by
-	  int.arpa.
-
-Mon Dec 24 16:18:57 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/ri_options.rb:  Fix ri --help listing of gem ri paths.
-	  Merge of r14567 and r14569 from trunk.
-
-	* lib/rdoc/ri/ri_paths.rb:  Fix duplication of ri data for multiple
-	  gems.  Merge of r14567 from trunk
-
-Mon Dec 24 12:35:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win{32,ce}/Makefile.sub (MFLAGS): defaulted to -l.
-
-Mon Dec 24 11:56:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not
-	  set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS.
-
-Sat Dec 22 14:49:46 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: don't freeze nil even if 1.8 will not be aware of
-	  the issue. [ruby-dev:32677]
-
-Wed Dec 19 13:57:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
-	  arguments.  [ruby-dev:32631]
-
-Wed Dec 19 12:01:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]
-
-Wed Dec 19 10:52:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_cstr_to_inum): an underscore succeeding after octal
-	  prefix is allowed.  [ruby-core:14139]
-
-Mon Dec 17 13:43:15 2007  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (stack_end_address): use local variable address instead of
-	  __builtin_frame_address(0) to avoid SEGV on SunOS 5.11 on x86 with
-	  gcc (GCC) 3.4.3 (csl-sol210-3_4-20050802).
-	  stack_end_address returned a frame address of garbage_collect
-	  since stack_end_address doesn't create its own frame.
-	  So a VALUE stored in a callee saved register, %edi, pushed into
-	  the stack at the beginning of garbage_collect was not marked.
-
-Mon Dec 17 12:21:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (RUNRUBY): added RUNRUBYOPT.
-
-Fri Dec 14 12:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
-	  and its type.
-
-	* configure.in (timezone, altzone): check for recent cygwin.
-
-	* missing/strftime.c (strftime): fix for timezone.  [ruby-dev:32536]
-
-	* lib/mkmf.rb (try_var): should fail for functions.
-
-	* ext/readline/extconf.rb: should use have_func for functions instead
-	  of have_var.
-
-Tue Dec 11 00:04:05 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_slice_bang): If an invalid negative index (<
-	  -size) is given, do not raise an exception but return nil just
-	  like slice() does.
-
-	* test/ruby/test_array.rb (TestArray::test_slice,
-	  TestArray::test_slice!): Pull in test cases from trunk.
-
-Mon Dec 10 21:47:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (str_transcode): allow non-registered encodings.
-	  [ruby-dev:32520]
-
-Mon Dec 10 21:00:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_slice_bang): should return nil if position out
-	  of range.  a patch from Akinori MUSHA <knu AT iDaemons.org>.
-	  [ruby-dev:32518]
-
-Mon Dec 10 18:28:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/uri/common.rb (URI::REGEXP::PATTERN): typo in REG_NAME
-	  regular expression.  a patch from Ueda Satoshi
-	  <s-ueda AT livedoor.jp>.  [ruby-dev:32514]
-
-Sun Dec  9 12:39:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi.rb (read_multipart): exclude blanks from header values.
-	  [ruby-list:44327]
-
-Wed Dec  5 23:38:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (range_each): followed step_i change.
-
-Wed Dec  5 18:08:45 2007  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_odd_p): new method Integer#odd?.
-	  (int_even_p): new method Integer#even?.
-	  (int_pred): new method Integer#pred.
-	  (fix_odd_p): new method Fixnum#odd?.
-	  (fix_even_p): new method Fixnum#even?.
-
-Wed Dec  5 15:15:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (step_i, range_step): support non-fixnum steps.
-	  [ruby-talk:282100]
-
-Tue Dec  4 11:23:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing
-	  preceeding 0s.  [ruby-core:13873]
-
-Sun Dec  2 22:43:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (error_print): put newline unless multiple line message ends
-	  with a newline.  [ruby-dev:32429]
-
-Sun Dec  2 15:49:20 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.1 -> 0.2.2.
-
-	* lib/rss/maker/itunes.rb: fixed new_itunes_category.
-	* lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because
-	  of consistency.
-
-	* test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed
-	  needless UTF-8 characters.
-
-Sun Dec  2 01:12:15 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	Merged 14070 from trunk.
-
-	* lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
-	  pressing control-c in the controlling terminal or sending SIGTERM stops
-	  the XML-RPC server.
-
-Sat Dec  1 15:13:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/resolv.rb: documentation update.  backported from 1.9.
-	  [ruby-core:13273]
-
-Sat Dec  1 03:30:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (newline_node): set line from outermost node before removing
-	  NODE_BEGIN.  [ruby-dev:32406]
-
-Fri Nov 30 21:53:28 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1.
-
-	* lib/rss/content.rb, lib/rss/content/1.0.rb,
-	  lib/rss/content/2.0.rb, lib/rss/maker/content.rb,
-	  test/rss/rss-testcase.rb, test/rss/test_content.rb,
-	  test/rss/test_maker_content.rb: supported content:encoded with RSS
-	  2.0.
-	  Suggested by Sam Lown. Thanks.
-
-	* NEWS: added the above changes.
-
-Thu Nov 29 16:59:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt): remove unnecessary NODE_BEGIN.  [ruby-core:13814]
-
-Wed Nov 28 14:43:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to
-	  get rid of mixing $LDFLAGS and $ARCH_FLAG.
-
-	* lib/mkmf.rb (configuration): ditto.
-
-	* lib/mkmf.rb (create_makefile): support for extensions which has no
-	  shared object.
-
-Wed Nov 28 09:51:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big2str0): do not clobber space for sign.
-
-	* sprintf.c (remove_sign_bits): extends sign bit first.
-
-Wed Nov 21 01:04:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (nil_plus): remove unused function.  [ruby-core:13737]
-
-Sun Nov 18 14:03:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_alias): do not call hook functions until initialization
-	  finishes.  [ruby-talk:279538]
-
-Sun Nov 18 09:09:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
-
-Sat Nov 17 13:58:11 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100]
-
-Fri Nov 16 17:41:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (Document-class): moved the simplest example to
-	  the top.
-
-	* ext/iconv/iconv.c (iconv_s_iconv): Document-method: needs class
-	  prefix for class method.  [ruby-core:13542]
-
-	* ext/iconv/iconv.c (iconv_iconv): also instance method needs to be
-	  qualified.
-
-Fri Nov 16 11:16:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/yaml/rubytypes.rb (String#is_binary_data?): use Integer#fdiv.
-
-Thu Nov 15 19:50:46 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/curses/extconf.rb: check macro if cannot find func.
-	  [ruby-list:44224]
-
-Thu Nov 15 12:19:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session::FileStore::restore): use
-	  lockfile for exclusive locks.  a patch from <tommy AT tmtm.org>.
-	  [ruby-dev:32296]
-
-Wed Nov 14 01:52:59 2007  Tanaka Akira  <akr@fsij.org>
-
-	* missing/isinf.c (isinf): don't define if the macro is defined.
-
-Wed Nov 14 01:34:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (round): fallback definition.
-
-	* numeric.c (flo_divmod, flo_round): use round() always.
-	  [ruby-dev:32269]
-
-Tue Nov 13 22:02:23 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: remove Thread.exclusive.
-
-	* lib/drb/extservm.rb: ditto.
-
-Tue Nov 13 16:33:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flodivmod): work around for infinity.
-
-	* numeric.c (flo_divmod): work around for platforms have no round().
-	  [ruby-dev:32247]
-
-Tue Nov 13 13:58:51 2007  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (numeric.c): Integer#ord implemented.  [ruby-dev:32206]
-
-Tue Nov 13 02:57:04 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
-
-	* numeric.c (flo_divmod): round to the nearest integer.
-	  [ ruby-Bugs-14540 ]
-
-Mon Nov 12 16:52:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): rdoc about srcprefix.  a patch from
-	  Daniel Berger <djberg96 AT gmail.com> in [ruby-core:13378].
-
-Mon Nov 12 13:53:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): handle stringified
-	  symbols properly using ruby-forward-string.
-
-Mon Nov 12 12:38:31 2007  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in (lex.c): don't remove lex.c at first.
-
-Fri Nov  9 07:26:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* random.c: update MT URL.[ruby-core:13305].
-
-Wed Nov  7 03:32:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
-	  nkf conversion.  a patch from <moonwolf AT moonwolf.com>.
-	  [ruby-dev:32183]
-
-Mon Nov  5 05:17:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
-	  option with very long argument.  a patch from Kobayashi Noritada
-	  <nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179].
-
-Mon Nov  5 01:20:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (call_args): remove "parenthesize argument(s) for future
-	  version" warning.  when I added this warning, I had a plan to
-	  reimplement the parser that is simpler than the current one.
-	  since we abandoned the plan, warning no longer required.
-
-Fri Nov  2 00:13:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_assoc): check and convert inner arrays (assocs)
-	  using #to_ary.
-
-	* hash.c (rb_hash_s_create): check and convert argument hash
-	  using #to_hash.
-
-	* hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of
-	  hash conversion.
-
-Thu Nov  1 23:47:43 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (DRbTCPSocket): Improving with multiple network
-	  interface.
-
-	* test/drb/drbtest.rb: ditto.
-
-Fri Oct 26 17:14:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_pow): returns 1.0 for 0**0.0.
-
-	* numeric.c (fix_pow): returns infinity for 0**-1.  [ruby-dev:32084]
-
-Wed Oct 25 07:18:09 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	Merged 13781 from trunk.
-
-	* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
-	  addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
-
-Wed Oct 25 06:46:21 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	Merged 13779 from trunk.
-
-	* lib/net/telnet.rb (Net::Telnet#login): Making the password prompt
-	  pattern case insensitive. [ruby-Bugs-10746]
-
-Thu Oct 25 14:19:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_tell, rb_io_seek): check errno too.  [ruby-dev:32093]
-
-Wed Oct 25 08:03:53 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	Merged 13767, 13768, 13769, and 13770 from trunk.
-
-	* lib/xmlrpc/parser.rb (XMLRPC::Convert::dateTime): Fixing a bug that
-	  caused time zone conversion to fail for some ISO 8601 date formats.
-	  [ruby-Bugs-12677]
-
-	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
-	  the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
-
-	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
-	  message for Content-Type check failures. [ruby-core:12163]
-
-	* lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
-	  Making Content-Type checks case insensitive. [ruby-Bugs-3367]
-
-Sun Oct 21 21:16:43 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss.rb, lib/rss/, test/rss/, sample/rss/: merged from trunk.
-	- 0.1.6 -> 2.0.0.
-	- fixed image module URI. Thanks to Dmitry Borodaenko.
-	- supported Atom.
-	- supported ITunes module.
-	- supported Slash module.
-
-	* NEWS: added an entry for RSS Parser.
-
-Thu Oct 18 10:57:06 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ruby.h (RCLASS_IV_TBL): defined.
-	  (RCLASS_M_TBL): ditto.
-	  (RCLASS_SUPER): ditto.
-	  (RMODULE_IV_TBL): ditto.
-	  (RMODULE_M_TBL): ditto.
-	  (RMODULE_SUPER): ditto.
-
-Mon Oct 15 22:08:55 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* NEWS: Merge some of the sub-sections, as the differences were
-	  unclear.
-
-Mon Oct 15 21:57:07 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* NEWS: Mention ipaddr enhancements.
-
-	* lib/ipaddr.rb (in_addr, in6_addr, addr_mask): Make some minor
-	  code optimization.
-
-	* lib/ipaddr.rb (<=>): Implement IPAddr#<=> and make IPAddr
-	  comparable.
-
-	* lib/ipaddr.rb (succ): Implement IPAddr#succ.  You can now create
-	  a range between two IPAddr's, which (Range) object is
-	  enumerable.
-
-	* lib/ipaddr.rb (to_range): A new method to create a Range object
-	  for the (network) address.
-
-	* lib/ipaddr.rb (coerce_other): Support type coercion and make &,
-	  |, == and include? accept a string or an integer instead of an
-	  IPAddr object as the argument.
-
-	* lib/ipaddr.rb (initialize): Give better error messages.
-
-	* lib/ipaddr.rb: Improve documentation.
-
-Mon Oct 15 21:24:25 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* NEWS: Mention shellwords and tempfile enhancements.
-
-	* NEWS: Move the entry about Tk::X_Scrollable to a better section.
-
-Mon Oct 15 17:28:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/buffering.rb (read, readpartial): revert
-	  r12496. handling EOF is a little differnt in ruby 1.8 and ruby 1.9.
-	  [ruby-dev:31979]
-
-Mon Oct 15 11:45:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (r_bytes0): refined length check.  [ruby-dev:32059]
-
-Mon Oct 15 09:58:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (r_bytes0): check if source has enough data.
-	  [ruby-dev:32054]
-
-Mon Oct 15 01:15:09 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/socket.c (s_accept_nonblock): make accepted fd
-	  nonblocking.  [ruby-talk:274079]
-
-Sun Oct 14 04:08:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (AC_SYS_LARGEFILE): keep results also in command
-	  options, to vail out of mismatch.  [ruby-list:44114]
-
-	* mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.
-
-Sun Oct 14 03:55:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/mkexports.rb: deal with __fastcall name decorations.
-	  [ruby-list:44111]
-
-Sat Oct 13 09:02:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {bcc,win}32/mkexports.rb: explicit data.  [ruby-list:44108]
-
-Sat Oct 13 00:35:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): typo
-	  fixed.  [ruby-list:44099]
-
-Fri Oct 12 11:22:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (match_values_at): make #select to be alias to #values_at
-	  to adapt RDoc description.  [ruby-core:12588]
-
-Thu Oct 11 14:32:46 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's
-	  bug. [ruby-core:12584]
-
-Wed Oct 10 23:34:45 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/securerandom.rb: new file.  [ruby-dev:31928]
-
-	* lib/cgi/session.rb (create_new_id): use securerandom if available.
-
-Tue Oct  9 01:01:55 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_s_union_m): Regexp.union accepts single
-	  argument which is an array of patterns.  [ruby-list:44084]
-
-Mon Oct  8 20:06:23 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/net/http.rb, lib/open-uri.rb: remove
-	  Net::HTTP#enable_post_connection_check.  [ruby-dev:31960]
-
-	* lib/net/imap.rb: hostname should be verified against server's
-	  indentity as persented in the server's certificate. [ruby-dev:31960]
-
-	* ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
-
-Sat Oct  6 23:14:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_to_i): update RDoc since base can be any value
-	  between 2 and 36.  [ruby-talk:272879]
-
-Fri Oct  5 15:44:50 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/shellwords.rb: Add shellescape() and shelljoin().
-
-	* lib/shellwords.rb: Rename shellwords() to shellsplit() and make
-	  the former an alias to the latter.
-
-	* lib/shellwords.rb: Add escape(), split(), join() as class
-	  methods, which are aliases to their respective long names
-	  prefixed with `shell'.
-
-	* lib/shellwords.rb: Add String#shellescape(), String#shellsplit()
-	  and Array#shelljoin() for convenience.
-
-Fri Oct  5 15:40:04 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/tempfile.rb (Tempfile::make_tmpname): Allow to specify a
-	  suffix for a temporary file name.
-
-	* lib/tempfile.rb (Tempfile::make_tmpname): Make temporary file
-	  names less predictable by including a random string.
-	  [inspired by: akr]
-
-Tue Oct  2 21:20:14 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (make_cmdvector): adjust escaped successive
-	  double-quote handling. (merge from trunk)
-
-Tue Oct  2 20:35:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (init_env): initialize HOME and USER environment
-	  variables unless set. [ruby-core:12328] (merge from trunk)
-
-	* win32/win32.c (NtInitialize, getlogin): ditto.
-
-	* configure.in, win32/Makefile.sub (LIBS): need to link shell32
-	  library for SH* functions on mswin32 and mingw32.
-
-Mon Oct  1 12:50:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
-	  [ruby-dev:31911]
-
-Wed Sep 26 23:54:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake), lib/mkmf.rb (configuration): top_srcdir
-	  should not prefixed with DESTDIR.
-
-Wed Sep 26 08:36:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
-	  objects.  [ruby-Bugs-14228]
-
-Wed Sep 26 05:12:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (yyerror): limit error message length.  [ruby-dev:31848]
-
-	* regex.c (re_mbc_startpos): separated from re_adjust_startpos.
-
-Tue Sep 25 13:47:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (remove_method): should not remove undef place holder.
-	  [ruby-dev:31817]
-
-Mon Sep 24 16:52:11 2007  Urabe Shyouhei  <shyouhei@ruby-lang.org>
-
-	* lib/net/http.rb: fix typo.
-
-Sun Sep 23 21:57:25 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/net/http.rb: an SSL verification (the server hostname should
-	  be matched with its certificate's commonName) is added.
-	  this verification can be skipped by
-	  "Net::HTTP#enable_post_connection_check=(false)".
-	  suggested by Chris Clark <cclark at isecpartners.com>
-
-	* lib/net/open-uri.rb: use Net::HTTP#enable_post_connection_check to
-	  perform SSL post connection check.
-
-	* ext/openssl/lib/openssl/ssl.c
-	  (OpenSSL::SSL::SSLSocket#post_connection_check): refine error message.
-
-Sun Sep 23 09:05:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (os_obj_of, os_each_obj): hide objects to be finalized.
-	  [ruby-dev:31810]
-
-Sun Sep 23 08:58:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_method.ci (rb_attr): should not use alloca for unknowen size
-	  input.  [ruby-dev:31816]
-
-	* parse.y (rb_intern_str): prevent str from optimization.
-
-Sun Sep 23 05:42:35 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* lib/rdoc/options.rb (Options::check_diagram): dot -V output
-	  changed. [ ruby-Bugs-11978 ], Thanks Florian Frank.
-
-Sat Sep 22 06:02:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::List::summarize): use each_line if
-	  defined rather than each.  [ruby-Patches-14096]
-
-Sat Sep 22 05:19:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_init): separate from strio_initialize
-	  to share with strio_reopen properly.  [ruby-Bugs-13919]
-
-Fri Sep 21 15:46:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (struct rb_exec_arg): proc should be a VALUE.
-
-	* process.c (rb_f_exec): suppress a warning.
-
-Fri Sep 21 03:05:35 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 Sep 20 17:24:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_detach_process): cast for the platforms where size of
-	  pointer differs from size of int.
-
-	* process.c (rb_f_exec, rb_f_system): should not exceptions after
-	  fork.  [ruby-core:08262]
-
-Fri Sep 14 00:34:25 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/extservm.rb (invoke_service): use Thread.exclusive instead of
-	  Thread.critical
-
-Wed Sep 12 23:12:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (proc_options): -W should be allowed in RUBYOPT
-	  environment variable.  [ruby-core:12118]
-
-Mon Sep 10 01:05:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
-
-Sun Sep  9 09:14:45 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (_strptime): now also attaches an element
-	  which denotes leftover substring if exists.
-
-Sat Sep  8 10:22:20 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_s_members): should raise TypeError instead
-	  of call rb_bug().  [ruby-dev:31709]
-
-	* marshal.c (r_object0): no nil check require any more.
-
-Sat Sep  8 09:38:19 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (str[fp]time): now check specifications more
-	  strictly.
-
-Fri Sep  7 05:36:19 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/rinda/test_rinda.rb (MockClock): correct synchronous problems
-	  of the MultiThreading. [ruby-dev:31692]
-
-Wed Sep  5 22:02:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_subseq): need integer overflow check.
-	  [ruby-dev:31736]
-
-	* array.c (rb_ary_splice): ditto.  [ruby-dev:31737]
-
-	* array.c (rb_ary_fill): ditto.  [ruby-dev:31738]
-
-	* string.c (rb_str_splice): integer overflow for length.
-	  [ruby-dev:31739]
-
-Sun Sep  2 00:48:15 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (_parse): improved parsing of ordinal dates.
-
-	* lib/date/format.rb (_parse): use named character classes in some
-	  regular expressions.
-
-Sat Sep  1 08:13:36 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE#ole_activex_initialize.
-
-Thu Aug 30 13:13:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_const, have_const): check for a const is defined.
-	  [ruby-core:04422]
-
-Thu Aug 30 13:10:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (group_member): check if presents.
-
-	* configure.in (XCFLAGS): add _GNU_SOURCE on linux.
-
-	* file.c (group_member): use system routine if available.
-
-Thu Aug 30 08:24:18 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ruby.h (RHASH_TBL): defined for compatibility to 1.9.
-	* (RHASH_ITER_LEV): ditto.
-	* (RHASH_IFNONE): ditto.
-	* (RHASH_SIZE): ditto.
-	* (RHASH_EMPTY_P): ditto.
-
-Wed Aug 29 13:05:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/defines.h (flush_register_windows): call "ta 0x03"
-	  even on Linux/Sparc.  [ruby-dev:31674]
-
-Tue Aug 28 23:26:12 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_type_progid, reg_enum_key,
-	  reg_get_val, ole_wc2mb): fix the bug. Thanks, arton.
-	  [ruby-dev:31576]
-
-Mon Aug 27 19:10:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/etc/etc.c (etc_getlogin): update documentation to note
-	  security issue.  [ruby-Bugs-11821]
-
-Tue Aug 21 21:09:48 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tmpdir.rb (Dir.mktmpdir): make directory suffix specifiable.
-
-Tue Aug 21 13:57:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (st_foreach_func, rb_foreach_func): typedefed.
-
-Mon Aug 20 17:25:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (mnew): should preserve noex as safe_level.
-
-	* eval.c (rb_call0): tighten security check condition..
-
-Sat Aug 18 21:32:20 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tmpdir.rb (Dir.mktmpdir): new method.
-	  [ruby-dev:31462]
-
-Sat Aug 18 17:44:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tcltklib.c (Init_tcltklib): use rb_set_end_proc().
-
-Sat Aug 18 15:59:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (detach_process_watcher): should not pass the pointer
-	  to an auto variable to the thread to be created.  pointed and
-	  fix by KUBO Takehiro <kubo at jiubao.org>  [ruby-dev:30618]
-
-Sat Aug 18 12:24:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep
-	  comment lines first.
-
-Thu Aug 16 20:40:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bigtrunc): RBIGNUM(x)->len may be zero.  out of bound
-	  access.  [ruby-dev:31404]
-
-Thu Aug 16 16:46:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (aix): enable shared by default.
-
-	* configure.in (aix): for 64bit-mode AIX.  [ruby-dev:31401]
-	  + use CC for LDSHARED if non-gcc,
-	  + moved -G option from *LDFLAGS to LDSHARED,
-	  + set -brtl only in XLDFLAGS.
-
-Thu Aug 16 13:06:08 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (big_lshift): make shift offset long type.
-	  (big_rshift): ditto.
-	  (rb_big_lshift): ditto.
-	  (big_rshift): ditto.
-	  [ruby-dev:31434]
-
-Thu Aug 16 04:09:19 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb (Rinda::TupleSpace#start_keeper): improve
-	  keeper thread.
-
-Wed Aug 15 13:50:10 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.
-
-Sat Aug 11 07:34:10 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb: reverted some wrongly erased "o" options
-	  (pointed out by nobu).
-
-Tue Aug  7 14:58:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/pty/pty.c (establishShell): handshaking before close slave
-	  device.  [ruby-talk:263410]
-
-	* ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): constified.
-
-	* ext/pty/pty.c (SlaveName): removed static buffer.
-
-	* ext/pty/expect_sample.rb: support for autologin.
-
-Tue Aug  7 12:45:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ac_cv_func_isinf): set yes also on OpenSolaris.
-	  [ruby-Bugs-12859]
-
-Mon Aug  6 17:36:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rexml/encodings/{ISO-8859-15,CP-1252}.rb: fixed invalid syntax.
-
-Fri Aug  3 11:05: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.
-
-Fri Aug  3 07:09:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: more verbose message.  [ruby-Bugs-12766]
-
-	* lib/mkmf.rb (have_type): suppress a warning with -Wall.
-
-	* lib/mkmf.rb (find_type): new method.
-
-Thu Aug  2 13:46:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): should not check positional number as
-	  width.  [ruby-core:11838]
-
-Mon Jul 30 11:16:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_aref): check for Bignum index range.
-	  [ruby-dev:31271]
-
-Sat Jul 28 09:35:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/digest/lib/digest.rb (Digest::self.const_missing): avoid
-	  infinite recursive const_missing call.  [ruby-talk:262193]
-
-Thu Jul 26 13:57:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln.c (load_1, dln_find_1): constified.
-
-	* dln.c (conv_to_posix_path): removed.
-
-	* ruby.c (usage): constified.
-
-	* 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.
-
-Sun Jul 22 16:07:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h (is_ruby_native_thread): removed since declared as an int
-	  function in ruby.h already.
-
-Sun Jul 22 14:33:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_rename): deleted code to get rid of a bug of
-	  old Cygwin.
-
-	* file.c (rb_file_truncate): added prototype of GetLastError()
-	  on cygwin.  [ruby-dev:31239]
-
-	* intern.h (is_ruby_native_thread): prototype.
-
-	* missing/strftime.c (strftime): fix printf format and actual
-	  arguments.
-
-	* ext/Win32API/Win32API.c (Win32API_initialize): ditto.
-
-	* ext/tk/tcltklib.c (ip_finalize): ditto.
-
-	* ext/dl/ptr.c (rb_dlptr_inspect): ditto.  [ruby-dev:31268]
-
-	* ext/dl/sym.c (rb_dlsym_inspect): ditto.
-
-	* ext/socket/getnameinfo.c: include stdio.h always.
-
-	* ext/win32ole/win32ole.c (ole_hresult2msg, folevariable_name,
-	  folevariable_ole_type, folevariable_ole_type_detail,
-	  folevariable_value, folemethod_visible): missing return value.
-
-Sat Jul 21 17:48:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
-	  only if extconf.h is created.
-
-	* bcc32/{Makefile.sub,configure.bat,setup.mak: configure_args
-	  support.
-
-	* bcc32/setup.mak: check runtime version.
-
-	* win32/win32.c (rb_w32_open_osfhandle): prototype has changed
-	  in bcc 5.82.
-
-	* {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic.
-
-	* win32/resource.rb: include patchlevel number.
-
-Sat Jul 21 12:06:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
-
-Sat Jul 21 01:53:17 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (Date._parse): completes calendar week based year.
-
-	* lib/date/format.rb (Date._parse): detects year of ordinal date in
-	  extended format.
-
-Fri Jul 20 15:22:51 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]
-
-Thu Jul 19 19:24:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (get_backtrace): check the result more.
-	  [ruby-dev:31261] [ruby-bugs-12398]
-
-Thu Jul 19 14:38:45 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 Jul 18 16:57:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_pow): refine overflow check.  [ruby-dev:31242]
-
-Wed Jul 18 08:47:09 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]
-
-Tue Jul 17 00:50:53 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.
-
-Mon Jul 16 23:07:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/base64.rb (Base64::b64encode): should not specify /o option
-	  for regular expression.  [ruby-dev:31221]
-
-Mon Jul 16 18:29:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_rindex_m): accept string-like object convertible
-	  with #to_str method, as well as rb_str_index_m.  [ruby-core:11692]
-
-Mon Jul 16 05:45:53 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]
-
-Mon Jul 16 00:26:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_pow): removed invariant variable.  [ruby-dev:31236]
-
-Sun Jul 15 23:59:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_neg): SIGNED_VALUE isn't in 1.8.
-
-Sun Jul 15 22:24:49 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]
-
-Sun Jul 15 21:07:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (bigtrunc): do not empty Bignum.  [ruby-dev:31229]
-
-Sun Jul 15 19:05:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_cstr_to_inum): check leading non-digits.
-	  [ruby-core:11691]
-
-Sun Jul 15 04:42:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (get2comp): do nothing for empty Bignum.  [ruby-dev:31225]
-
-Sat Jul 14 14:04:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (sort_by_cmp): check if reentered.  [ruby-dev:24291]
-
-Sat Jul 14 12:44:14 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/openssl/test_pkcs7.rb: reverted the previous patch.  it should
-	  be as it was to check interface compatibility.  sorry for bothering
-	  with this.
-
-Sat Jul 14 12:16:17 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/openssl/test_pkcs7.rb: follow the library change.  applied a
-	  patch from <zn at mbf.nifty.com> [ruby-dev:31214].
-	  NOTE: r12496 imports the latest openssl libs from trunk to ruby_1_8
-	  though its's not ChangeLog-ed.  maintainer should aware that.
-
-Sat Jul 14 02:51:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_pow): 0**2 should not raise floating point
-	  exception.  [ruby-dev:31216]
-
-Sat Jul 14 02:25:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (int_pow): wrong overflow detection.  [ruby-dev:31213]
-
-	* numeric.c (int_pow): wrong overflow detection.  [ruby-dev:31215]
-
-Fri Jul 13 16:10:00 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb (URI::Generic#find_proxy): use ENV.to_hash to access
-	  http_proxy environment variable to avoid case insensitive
-	  environment search.
-
-Fri Jul 13 15:02:15 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]
-
-Fri Jul 13 10:10:46 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.
-
-Thu Jul 12 17:03:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* struct.c (rb_struct_init_copy): disallow changing the size.
-	  [ruby-dev:31168]
-
-Wed Jul 11 23:38:14 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* random.c: documentation fix.  srand(0) initializes PRNG with '0',
-	  not with random_seed.
-
-Tue Jul 10 14:50:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.
-
-Fri Jul  6 15:22:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_interrupt): suppress a gcc's officious warning.
-
-Thu Jul  5 16:44:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (int_pow): fix previous nubu's commit.
-
-	* test/ruby/test_fixnum.rb: new test.
-
-Thu Jul  5 15:56:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (int_pow): even number multiplication never be negative.
-
-Mon Jul  2 14:34:43 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]
-
-Sat Jun 30 16:05:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_initialize): should call rb_ary_modify() first.
-	  [ruby-core:11562]
-
-Sat Jun 30 00:17:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (yylex): return non-valid token for an invalid
-	  instance/class variable name.  a patch from Yusuke ENDOH
-	  <mame AT tsg.ne.jp>.  [ruby-dev:31095]
-
-Fri Jun 29 11:23:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (dsym): return non-null NODE even if yyerror().  based on a
-	  patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:31085]
-
-Tue Jun 26 16:35:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
-	  clash.
-
-	* process.c (proc_exec_v, rb_proc_exec): preserve errno.
-
-Sat Jun 23 00:37:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_select): remove unnecessary varargs for
-	  rb_hash_select.  a patch from Daniel Berger
-	  <Daniel.Berger at qwest.com>.   [ruby-core:11527]
-
-	* hash.c: ditto.
-
-Mon Jun 18 08:47:54 2007  Technorama Ltd.  <oss-ruby@technorama.net>
-
-	* ext/openssl/{extconf.rb,ossl_ssl_session.c}:
-	  Fix ruby-Bugs-11513.
-
-	* ext/openssl/ossl_pkey_ec.c
-	  New methods EC::Point.[eql,make_affine!,invert!,on_curve?,infinity?]
-	  By default output the same key form as the openssl command.
-
-	* ext/openssl/ossl_rand.c
-	  New method Random.status?
-
-Mon Jun 18 13:54:36 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]
-
-Mon Jun 18 01:14:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_path2class): get rid of dangling pointer caused by
-	  optimized out value.
-
-	* variable.c (rb_global_entry, rb_f_untrace_var, rb_alias_variable,
-	  rb_generic_ivar_table, generic_ivar_get, generic_ivar_set,
-	  generic_ivar_defined, generic_ivar_remove, rb_mark_generic_ivar,
-	  rb_free_generic_ivar, rb_copy_generic_ivar,
-	  rb_obj_instance_variables): suppress warnings.
-
-Fri Jun 15 22:33:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (realclean): separate local and ext.
-
-	* ext/extmk.rb: not remove unrelated directories.
-
-Fri Jun 15 17:01: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].
-
-Thu Jun 14 17:09:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser): handle more
-	  extensions.  [ruby-dev:30972]
-
-Wed Jun 13 06:05:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (darwin): prohibit loading extension libraries to
-	  miniruby.
-
-Wed Jun 13 05:47:58 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]
-
-Tue Jun 12 14:53:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (Logging.quiet, Logging.message): added quiet flag and
-	  use it.  [ruby-core:10909]
-
-	* lib/mkmf.rb (find_header): use header names in the message.
-
-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]
-
-Thu Jun  7 19:02:48 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/pp.rb: call original "method" method instead of redefined one.
-
-Mon Jun  4 11:11:12 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)
-
-Thu May 31 17:27:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/benchmark.rb (Benchmark::Job::item): avoid modifying the
-	  argument unintentionally.  [ruby-talk:253676]
-
-Thu May 31 02:12:32 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb (Rinda::TupleBag): create index on tuple bag
-	  by first column.
-
-Wed May 30 13:27:40 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
-	  responses for some FTP servers. (backported from HEAD)
-
-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.
-
-Mon May 28 02:54:05 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb (Rinda::TupleBag#delete): use rindex and
-	  delete_at instead of delete for little improvement.
-
-Sat May 26 00:05:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
-	  skip tests for exitstatus and termsig on the platforms where
-	  signals not supported.
-
-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]
-
-Sat May 19 10:29:18 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (Date._parse): detects some OFX dates
-	  (Of course not fully).
-
-Fri May 18 23:07:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_first): call rb_ary_subseq() instead of pushing
-	  values by itself.  [ruby-talk:252062]
-
-	* array.c (rb_ary_first): add negative length check.
-
-Fri May 18 17:10:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (move_to_next_entry): loc also must move forward.
-	  [ruby-talk:251987]
-
-Fri May 18 03:02:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/mkexports.rb: preserve prefixed underscores for WINAPI
-	  symbols.
-
-	* wince/mkconfig_wce.rb, wince/mkexports.rb: obsolete.
-
-Thu May 17 17:03:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-style.el (ruby-style-label-indent): for yacc rules.
-
-Tue May 15 14:54:07 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.
-
-Mon May 14 13:28:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/thread/thread.c (wait_list): supress a warning.
-
-Thu May 10 15:21:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_s_conv): rdoc fix.
-
-Thu May 10 10:14:14 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  9 12:28:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (Init_Bignum), numeric.c (Init_Numeric): added fdiv as
-	  aliases of quo.  [ruby-dev:30771]
-
-Wed May  9 11:55:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_quo): now calculate in integer.  [ruby-dev:30753]
-
-Wed May  9 11:51:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_pow): reduce multiplying for even number.
-
-	* bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
-
-	* bignum.c (rb_big_pow): improvement by calculating from MSB and using
-	  factorization.  <http://yowaken.dip.jp/tdiary/20070426.html#p01>
-
-	* numeric.c (int_pow): calculate power in Fixnum as possible.
-	  [ruby-dev:30726]
-
-Tue May  8 23:42:51 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (Date._parse): revised treatment of
-	  hyphened/separatorless dates.
-
-	* lib/date/format.rb: some trivial adjustments.
-
-Tue May  8 20:25:05 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb: reverted.
-
-Sat May  5 16:26:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/date/format.rb (Format::Bag#method_missing): get rid of
-	  modifying orginal argument.  [ruby-core:11090]
-
-Mon Apr 30 01:17:51 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb (TupleSpace#create_entry, TupleBag#push,
-	  delete): extract method, and rename parameter.
-
-Fri Apr 27 02:00:17 2007  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* signal.c: Fixed backwards compatibility for 'raise Interrupt'.
-
-	* lib/yaml/tag.rb: Running rdoc over the 1.8.6 tree skips
-	  Module. Patch from James Britt
-
-Thu Apr 26 13:54:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-style.el: new file.  C/C++ style for ruby source code.
-
-Wed Apr 25 19:49:16 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/socket.c (unix_send_io, unix_recv_io): use CMSG_DATA to
-	  align file descriptor appropriately.
-
-Tue Apr 24 09:33:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR.
-	  [ruby-talk:248288]
-
-Mon Apr 23 22:14:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb ($ruby): add extout directory to include path.
-	  [ruby-core:11003]
-
-	* 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.
-
-Fri Apr 20 16:05:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
-	  it is done by libpathflag in mkmf.rb.
-
-Fri Apr 20 12:27:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb: fix to override conv proc.
-
-Fri Apr 20 12:17:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ruby_cleanup): inversed the order of errinfos.
-
-Thu Apr 19 14:53:32 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 Apr 18 10:41:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_strtod): exponent is radix 10.  [ruby-talk:248272]
-
-Wed Apr 18 02:30:24 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]
-
-Tue Apr 17 16:46:46 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.
-
-Mon Apr 16 22:56:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/pty/expect_sample.rb: avoid symbolic link representation for
-	  expect.  a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
-	  [ruby-dev:30714]
-
-Mon Apr 16 22:51:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sample: replace TRUE, FALSE with true, false respectively.
-	  a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
-	  [ruby-dev:30713]
-
-Mon Apr 16 17:08:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (make_switch): do not clobber converter if pattern
-	  has no convert method.  reported by sheepman in [ruby-dev:30709].
-
-Mon Apr 16 16:49:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_seek): consistent behavior with
-	  IO#seek.  patch by sheepman in [ruby-dev:30710].
-
-Mon Apr 16 16:34:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): should set command_start after block
-	  starting "do"s and braces.  [ruby-core:10916]
-
-Sun Apr 15 09:19:57 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb: added some zone names.
-
-	* lib/date/format.rb (_parse): now interprets doted numerical
-	  dates as a big endian (except dd.mm.yyyy).
-
-Tue Apr 10 17:37:36 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().
-
-Mon Apr  9 09:30:44 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (disconnect): call shutdown for
-	  SSLSocket. Thanks, Technorama Ltd.
-
-Thu Apr  5 00:42:48 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]
-
-Wed Apr  4 17:09:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (pipe_open): refined the message of NotImplementedError.
-	  [ruby-dev:30685]
-
-Wed Apr  4 10:18:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (pipe_open): raise NotImplementedError for command "-" on
-	  platforms where fork(2) is not available.  [ruby-dev:30681]
-
-Tue Apr  3 15:45:41 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.
-
-Sat Mar 24 01:54:03 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.
-
-Thu Mar 22 23:13:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_provided): check for extension library if SOEXT is
-	  explicitly given.  [ruby-dev:30657]
-
-Thu Mar 22 10:29:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_bignum.rb (test_to_s): add tests for Bignum#to_s.
-
-Wed Mar 21 17:04:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big2str0): round up for the most significant digit.
-	  [ruby-core:10686]
-
-Wed Mar 21 07:21:24 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 22:54:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_extended): erroneous check condition when dump
-	  method is defined.  [ruby-core:10646]
-
-Tue Mar 20 15:37:24 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* distruby.rb: Add zip generation.
-
-Tue Mar 20 11:28:41 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/matrix.rb (Matrix::inverse_from): adding partial pivoting to
-	  the Gauss-Jordan algorithm, making it stable.  a patch from
-	  Peter Vanbroekhoven.  [ruby-core:10641]
-
-Mon Mar 19 11:39:29 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
-
-Sun Mar 18 04:23:52 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* NEWS: Add a note about the new `date' library defining
-	  Time#to_date and Time#to_datetime private methods.
-
-	* NEWS: Inform that the old `thread' library is considered to be
-	  stable.
-
-	* NEWS: Sort library entries in alphabetical order.
-
-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 09:25:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (clear-installed-list): separated from install-prereq.
-
-Tue Mar 13 06:38:43 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* NEWS: Reword and improve entries.
-
-Tue Mar 13 06:03:46 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* stable version 1.8.6 released from the ruby_1_8_6 branch.
-
-Tue Mar 13 03:24:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* runruby.rb: added --pure (turned on by default) and --debugger
-	  options.
-
-Tue Mar 13 02:50:28 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:05:17 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.
-
-Mon Mar 12 00:59:19 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* 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 18:57:50 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:45:51 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 12:09:37 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:08:46 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.
-
-Tue Mar  6 18:58:37 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/shell/process-controller.rb: fix thread synchronization
-	  problem for [ruby-dev:30477].
-
-Tue Mar  6 18:44:26 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* 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.
-
-Tue Mar  6 18:24:19 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* time.c (time_to_s): Back out the format changes; discussed
-	  in [ruby-dev:30495].
-
-Tue Mar  6 11:53:25 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/irbtkw.rbw: fails to exit process.
-
-Mon Mar  5 20:14:49 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:38:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_stat_s_utime): fixed a commit miss for the platforms
-	  where utimes() does not exist.
-
-	* lib/fileutils.rb (touch): ditto.
-
-Sun Mar  4 14:46:56 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* util.c (push_element): should return a int value.
-
-Sun Mar  4 01:05:57 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 23:01:07 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mv): could not move a directory between
-	  different filesystems. [ruby-dev:30411]
-
-Sat Mar  3 22:57:11 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (touch): last commit causes error if :mtime
-	  option was not given.
-
-Sat Mar  3 22:37:02 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]
-
-Sat Mar  3 21:17:35 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:05:31 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:53:11 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* NEWS: Add a note for String#intern.
-
-Sat Mar  3 16:23:13 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:07:02 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]
-
-Thu Mar  1 21:38:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
-	  empty.  [ruby-dev:30455]
-
-Thu Mar  1 08:55:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* 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.
-
-Thu Mar  1 03:30:21 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.
-
-Thu Mar  1 02:05:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* mkconfig.rb (patchlevel): read from version.h.
-
-Thu Mar  1 00:09:39 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]
-
-Wed Feb 28 21:15:00 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
-
-	* missing/flock.c: workaround for MinGW.
-
-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]
-
-Wed Feb 28 18:59:57 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* NEWS: Add NEWS, a document file to keep user visible feature
-	  changes between releases.
-
-Wed Feb 28 18:35:50 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* 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]
-
-Wed Feb 28 18:34:48 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* 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]
-
-Wed Feb 28 18:31:32 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0.  This is way too old
-	  NEWS.
-
-Wed Feb 28 01:22:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
-	  target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
-
-Wed Feb 28 00:08:11 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
-
-	* mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
-
-	* common.mk: new target dist
-
-	* distruby.rb: new file
-
-Tue Feb 27 22:18:45 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* 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].
-
-Tue Feb 27 21:36:47 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
-
-Tue Feb 27 21:33:04 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (ac_cv_func_setrlimit): workaround for djgpp.
-
-Tue Feb 27 19:38:52 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/base64.rb (Base64::b64encode): Fix documentation; submitted
-	  by David Symonds <dsymonds@gmail.com> in [ruby-core:10432].
-
-Tue Feb 27 19:36:57 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* 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.
-
-Tue Feb 27 03:40:09 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* 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.
-
-Mon Feb 26 15:18:23 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/thread/thread.c: Use xmalloc()/xfree() instead of
-	  malloc()/free(); pointed out by shugo in [ruby-dev:30412].
-
-Sun Feb 25 23:02:55 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* 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:47:43 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 10:42:01 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]
-
-Fri Feb 23 15:10:46 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* 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 14:19:40 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.
-
-Fri Feb 23 13:02:17 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:43:17 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:22:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.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]
-
-Mon Feb 19 17:14:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.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]
-
-Sun Feb 18 19:35:21 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb: updated based on date2 4.0.3.
-
-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 20:26:30 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/uri/ftp.rb: Revert the previous change pending discussion.
-
-Thu Feb 15 18:08:17 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* dir.c (glob_helper): Fix the function declaration.
-
-Thu Feb 15 17:13:32 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* version.h: Welcome to the post-1.8.6 world.  Radical changes are
-	  inhibited in the ruby_1_8 branch until the 1.8.6 final release
-	  goes out of the door.
-
-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.
@@ -18615,7 +134,7 @@ Tue Dec 23 22:47:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* 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>
+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.
@@ -18639,7 +158,7 @@ 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>
+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]
 
@@ -19442,7 +961,7 @@ Tue Dec  2 21:31:42 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/runner.rb: exit with the test result.
 
-Tue Dec  2 20:18:48 2003  Eric Sunshine  <sunshine@sunshineco.com>
+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.
@@ -19505,7 +1024,7 @@ Mon Dec  1 14:17:49 2003  Minero Aoki  <aamine@loveruby.net>
 	* 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>
+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).
@@ -19589,7 +1108,7 @@ Fri Nov 28 19:37:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* 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>
+Fri Nov 28 17:59:20 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* test/ruby/test_env.rb: add tests for ENV.
 
@@ -19675,7 +1194,7 @@ Wed Nov 26 00:55:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* 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>
+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]
@@ -19816,7 +1335,7 @@ 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>
+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'.
@@ -19839,12 +1358,12 @@ Sat Nov 22 22:48:46 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: add native thread check
 
-Sat Nov 22 18:49:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+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>
+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.
@@ -19953,7 +1472,7 @@ Wed Nov 19 14:32:08 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (cannot_overwrite_file?): add wince.
 
-Wed Nov 19 11:04:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+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.
@@ -20068,7 +1587,7 @@ 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>
+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.
@@ -20241,8 +1760,7 @@ 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>
-
+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.
 
@@ -20345,7 +1863,7 @@ 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>
+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.
 
@@ -20366,7 +1884,7 @@ Wed Nov  5 08:39:51 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* 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>
+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.
@@ -20472,7 +1990,7 @@ Fri Oct 31 12:55:24 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.
 
-Fri Oct 31 01:38:14 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+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)
@@ -20531,7 +2049,7 @@ 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>
+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]
@@ -20560,7 +2078,7 @@ 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>
+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.
@@ -20592,7 +2110,7 @@ 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>
+Tue Oct 28 15:20:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/tcltklib/tcltklib.c (VwaitVarProc, ip_rbVwaitObjCmd,
 	  WaitVariableProc, WaitVisibilityProc, WaitWindowProc,
@@ -20674,7 +2192,7 @@ 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>
+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.
@@ -20727,15 +2245,10 @@ Mon Oct 20 11:00:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* 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>
+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.
@@ -20781,7 +2294,7 @@ Fri Oct 17 22:16:42 2003  Akinori MUSHA  <knu@iDaemons.org>
 	* 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>
+Fri Oct 17 11:15:22 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* test/ruby/test_range.rb: added.
 
@@ -20848,7 +2361,7 @@ 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>
+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]
@@ -20861,7 +2374,7 @@ Wed Oct 15 11:23:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  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>
+Wed Oct 15 09:30:34 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/enumerator/enumerator.c (enumerator_each): avoid VC++ warning.
 
@@ -21128,92 +2641,6 @@ Thu Oct  9 06:43:33 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* 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.
@@ -21547,7 +2974,7 @@ Fri Oct  3 16:13:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* 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>
+Fri Oct  3 13:02:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
 
 	* lib/test/unit.rb: refactored to use optparse.
 
@@ -21570,7 +2997,7 @@ 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>
+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.
@@ -21666,7 +3093,7 @@ Thu Oct  2 11:17:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
 
 	* lib/test/unit/collector/objectspace.rb: ditto.
 
-Thu Oct  2 03:25:01 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Oct  2 03:25:01 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* eval.c (rb_thread_raise): prototype; avoid VC++ warning.
 
@@ -21719,35 +3146,6 @@ Thu Oct  2 00:21:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	* 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.
@@ -21779,11 +3177,11 @@ 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>
+Wed Oct 01 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>
+Wed Oct 01 10:08:42 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
 
 	* wince/setup.mak: add sigmarionIII SDK support.
 
@@ -21793,7 +3191,7 @@ Wed Oct  1 10:08:42 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
 
 	* wince/mkconfig_wce.rb: camouflage RUBY_PLATFORM for compiling ext.
 
-Wed Oct  1 08:02:52 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+Wed Oct 01 08:02:52 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
 
 	* wince/time_wce.c (time): add zero check.
 
@@ -21911,20 +3309,6 @@ Sat Sep 27 09:44:18 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* 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
@@ -21940,7 +3324,7 @@ Sat Sep 27 03:32:37 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  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>
+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 *.
@@ -21965,7 +3349,7 @@ 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>
+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.
@@ -21973,7 +3357,7 @@ Thu Sep 25 17:48:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
 	* 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>
+Thu Sep 25 09:00:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
 
 	* lib/ostruct.rb: Added OpenStruct#==.
 
@@ -22056,7 +3440,7 @@ Sat Sep 20 11:49:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/logger/test_logger.rb: new file.
 
-Fri Sep 19 11:39:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Fri Sep 19 11:39:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
 
 	* test/testunit/*: Added.
 
@@ -22197,7 +3581,7 @@ Mon Sep 15 19:02:52 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/csv/mac.csv: added.  Sample CR separated CSV file.
 
-Fri Sep 12 22:41:48 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+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]
 
@@ -22221,7 +3605,7 @@ Fri Sep 12 12:09:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bignum.c (rb_big_xor): ditto.
 
-Fri Sep 12 07:06:14 2003  David Black  <dblack@superlink.net>
+Fri Sep 11 22:06:14 2003   David Black <dblack@superlink.net>
 
 	* lib/scanf.rb: Took out useless @matched_item variable; some small
 	  refactoring.
@@ -22246,11 +3630,97 @@ Wed Sep 10 22:47:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* 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>
+Wed Sep 10 22:41:54 2003  Tietew <tietew@tietew.net>
 
 	* eval.c (win32_get_exception_list): avoid VC7 warning.
 	  [ruby-win32:577]
 
+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().
+
 Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (struct tag): dst should be VALUE.
@@ -22264,7 +3734,7 @@ 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>
+Tue Sep 9 02:41:35 2003 Michal Rokos <m.rokos@sh.cvut.cz>
 
 	* ext/openssl/ossl_config.c: Refine compatibility.
 
@@ -22334,7 +3804,7 @@ 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>
+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]
@@ -22353,7 +3823,7 @@ Sat Sep  6 17:40:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509ext.c (X509::Extension#critical=): new method.
 
-Sat Sep  6 01:23:22 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+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.
 
@@ -22634,12 +4104,12 @@ Sat Aug 30 03:58:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_yield_0): stop TAG_RETURN/TAG_BREAK escaping.
 
-Fri Aug 29 22:35:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+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>
+Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* process.c: bug fix
 
@@ -22714,7 +4184,7 @@ 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>
+Wed Aug 27 05:10:15 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* win32/win32.c (map_errno): support winsock error.
 
@@ -22763,7 +4233,7 @@ 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>
+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]
 
@@ -22788,7 +4258,7 @@ Fri Aug 22 17:07:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_scan): use rb_yield_splat().
 
-Fri Aug 22 06:13:22 2003  why the lucky stiff  <why@ruby-lang.org>
+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
@@ -22805,7 +4275,7 @@ 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>
+Tue Aug 21 00:13:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c: Int. overflow bug in multiplication
 	  fixed, and VpNmlz() speed up.
@@ -22976,7 +4446,7 @@ 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>
+Fri Aug 15 01:34:23 2003 Michal Rokos <m.rokos@sh.cvut.cz>
 
 	* ext/openssl/ossl_pkey.c: move generate_cb here
 
@@ -23008,7 +4478,7 @@ Thu Aug 14 20:03:34 2003  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 	* ext/win32ole/win32ole.c (ole_initialize): stop calling
 	  OleUninitialize at exit.
 
-Thu Aug 14 11:27:37 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+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]
@@ -23047,7 +4517,7 @@ 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>
+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)
@@ -23080,7 +4550,6 @@ Tue Aug 12 02:48:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* 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>.
@@ -23168,7 +4637,7 @@ Thu Aug  7 04:19:15 2003  Akinori MUSHA  <knu@iDaemons.org>
 	  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>
+Wed 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.
@@ -23207,7 +4676,7 @@ 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>
+Wed Aug  6 04:58:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/Setup*: add io/wait and openssl.
 
@@ -23281,10 +4750,9 @@ For the changes before 1.8.0, see doc/ChangeLog-1.8.0
 Local variables:
 add-log-time-format: (lambda ()
   (let* ((time (current-time))
-	 (system-time-locale "C")
 	 (diff (+ (cadr time) 32400))
 	 (lo (% diff 65536))
-	 (hi (+ (car time) (/ 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
diff --git a/LEGAL b/LEGAL
index 908eb270f5..dce7c1acbf 100644
--- a/LEGAL
+++ b/LEGAL
@@ -134,12 +134,14 @@ st.[ch]:
 x68/*:
 missing/alloca.c:
 missing/dup2.c:
+missing/erf.c:
 missing/finite.c:
 missing/hypot.c:
 missing/isinf.c:
 missing/isnan.c:
 missing/memcmp.c:
 missing/memmove.c:
+missing/mkdir.c:
 missing/strcasecmp.c:
 missing/strchr.c:
 missing/streror.c:
@@ -184,8 +186,6 @@ missing/strtoul.c:
     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
@@ -205,7 +205,11 @@ missing/vsnprintf.c:
     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
+    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
+         California, Berkeley and its contributors.
+    4. 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.
 
@@ -305,20 +309,17 @@ ext/digest/sha2/sha2hl.c:
     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:
+ext/nkf/nkf1.7/nkf.c:
 
-  These files are under the following license.  So to speak, it is
+  This file is 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,
+       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.
+       You don't have to ask before copying or publishing.
        THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
 
 ext/socket/addrinfo.h:
diff --git a/MANIFEST b/MANIFEST
new file mode 100644
index 0000000000..bdb0afa74e
--- /dev/null
+++ b/MANIFEST
@@ -0,0 +1,864 @@
+COPYING
+COPYING.ja
+ChangeLog
+GPL
+LEGAL
+LGPL
+MANIFEST
+Makefile.in
+README
+README.EXT
+README.EXT.ja
+README.ja
+ToDo
+array.c
+bignum.c
+class.c
+compar.c
+config.guess
+config.sub
+configure
+configure.in
+defines.h
+dir.c
+dln.c
+dln.h
+dmyext.c
+enum.c
+env.h
+error.c
+eval.c
+file.c
+gc.c
+hash.c
+inits.c
+install-sh
+instruby.rb
+intern.h
+io.c
+keywords
+lex.c
+main.c
+marshal.c
+math.c
+mdoc2man.rb
+missing.h
+mkconfig.rb
+node.h
+numeric.c
+object.c
+pack.c
+parse.c
+parse.y
+prec.c
+process.c
+random.c
+range.c
+re.c
+re.h
+regex.c
+regex.h
+ruby.1
+ruby.c
+ruby.h
+rubyio.h
+rubysig.h
+rubytest.rb
+signal.c
+sprintf.c
+st.c
+st.h
+string.c
+struct.c
+time.c
+util.c
+util.h
+variable.c
+version.c
+version.h
+bcc32/Makefile.sub
+bcc32/README.bcc32
+bcc32/configure.bat
+bcc32/mkexports.rb
+bcc32/setup.mak
+bin/erb
+bin/irb
+bin/rdoc
+bin/ri
+bin/testrb
+cygwin/GNUmakefile.in
+djgpp/GNUmakefile.in
+djgpp/README.djgpp
+djgpp/config.hin
+djgpp/config.sed
+djgpp/configure.bat
+djgpp/mkver.sed
+doc/ChangeLog-1.8.0
+doc/NEWS
+doc/forwardable.rd
+doc/forwardable.rd.ja
+doc/irb/irb-tools.rd.ja
+doc/irb/irb.rd
+doc/irb/irb.rd.ja
+doc/shell.rd
+doc/shell.rd.ja
+ext/Setup
+ext/Setup.atheos
+ext/Setup.dj
+ext/Setup.emx
+ext/Setup.nt
+ext/Setup.x68
+ext/extmk.rb
+lib/English.rb
+lib/Env.rb
+lib/README
+lib/abbrev.rb
+lib/base64.rb
+lib/benchmark.rb
+lib/cgi-lib.rb
+lib/cgi.rb
+lib/cgi/session.rb
+lib/cgi/session/pstore.rb
+lib/complex.rb
+lib/csv.rb
+lib/date.rb
+lib/date/format.rb
+lib/date2.rb
+lib/debug.rb
+lib/delegate.rb
+lib/drb.rb
+lib/drb/acl.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/ssl.rb
+lib/drb/timeridconv.rb
+lib/drb/unix.rb
+lib/e2mmap.rb
+lib/erb.rb
+lib/eregex.rb
+lib/fileutils.rb
+lib/finalize.rb
+lib/find.rb
+lib/forwardable.rb
+lib/ftools.rb
+lib/generator.rb
+lib/getoptlong.rb
+lib/getopts.rb
+lib/gserver.rb
+lib/importenv.rb
+lib/ipaddr.rb
+lib/irb.rb
+lib/irb/cmd/chws.rb
+lib/irb/cmd/fork.rb
+lib/irb/cmd/load.rb
+lib/irb/cmd/nop.rb
+lib/irb/cmd/pushws.rb
+lib/irb/cmd/subirb.rb
+lib/irb/completion.rb
+lib/irb/context.rb
+lib/irb/ext/change-ws.rb
+lib/irb/ext/history.rb
+lib/irb/ext/loader.rb
+lib/irb/ext/math-mode.rb
+lib/irb/ext/multi-irb.rb
+lib/irb/ext/tracer.rb
+lib/irb/ext/use-loader.rb
+lib/irb/ext/workspaces.rb
+lib/irb/extend-command.rb
+lib/irb/frame.rb
+lib/irb/help.rb
+lib/irb/init.rb
+lib/irb/input-method.rb
+lib/irb/lc/error.rb
+lib/irb/lc/help-message
+lib/irb/lc/ja/error.rb
+lib/irb/lc/ja/help-message
+lib/irb/locale.rb
+lib/irb/ruby-lex.rb
+lib/irb/ruby-token.rb
+lib/irb/slex.rb
+lib/irb/version.rb
+lib/irb/workspace.rb
+lib/irb/ws-for-case-2.rb
+lib/irb/xmp.rb
+lib/jcode.rb
+lib/logger.rb
+lib/mailread.rb
+lib/mathn.rb
+lib/matrix.rb
+lib/mkmf.rb
+lib/monitor.rb
+lib/mutex_m.rb
+lib/net/ftp.rb
+lib/net/http.rb
+lib/net/imap.rb
+lib/net/pop.rb
+lib/net/protocol.rb
+lib/net/smtp.rb
+lib/net/telnet.rb
+lib/observer.rb
+lib/open-uri.rb
+lib/open3.rb
+lib/optparse.rb
+lib/optparse/date.rb
+lib/optparse/shellwords.rb
+lib/optparse/time.rb
+lib/optparse/uri.rb
+lib/optparse/version.rb
+lib/ostruct.rb
+lib/parsearg.rb
+lib/parsedate.rb
+lib/pathname.rb
+lib/ping.rb
+lib/pp.rb
+lib/prettyprint.rb
+lib/profile.rb
+lib/profiler.rb
+lib/pstore.rb
+lib/racc/parser.rb
+lib/rational.rb
+lib/rdoc/README
+lib/rdoc/code_objects.rb
+lib/rdoc/diagram.rb
+lib/rdoc/dot/dot.rb
+lib/rdoc/generators/chm_generator.rb
+lib/rdoc/generators/html_generator.rb
+lib/rdoc/generators/ri_generator.rb
+lib/rdoc/generators/template/chm/chm.rb
+lib/rdoc/generators/template/html/hefss.rb
+lib/rdoc/generators/template/html/html.rb
+lib/rdoc/generators/template/html/kilmer.rb
+lib/rdoc/generators/template/html/old_html.rb
+lib/rdoc/generators/template/xml/rdf.rb
+lib/rdoc/generators/template/xml/xml.rb
+lib/rdoc/generators/xml_generator.rb
+lib/rdoc/markup/sample/rdoc2latex.rb
+lib/rdoc/markup/sample/sample.rb
+lib/rdoc/markup/simple_markup.rb
+lib/rdoc/markup/simple_markup/fragments.rb
+lib/rdoc/markup/simple_markup/inline.rb
+lib/rdoc/markup/simple_markup/lines.rb
+lib/rdoc/markup/simple_markup/preprocess.rb
+lib/rdoc/markup/simple_markup/to_flow.rb
+lib/rdoc/markup/simple_markup/to_html.rb
+lib/rdoc/markup/simple_markup/to_latex.rb
+lib/rdoc/markup/test/AllTests.rb
+lib/rdoc/markup/test/TestInline.rb
+lib/rdoc/markup/test/TestParse.rb
+lib/rdoc/options.rb
+lib/rdoc/parsers/parse_c.rb
+lib/rdoc/parsers/parse_f95.rb
+lib/rdoc/parsers/parse_rb.rb
+lib/rdoc/parsers/parse_simple.rb
+lib/rdoc/parsers/parserfactory.rb
+lib/rdoc/rdoc.rb
+lib/rdoc/ri/ri_cache.rb
+lib/rdoc/ri/ri_descriptions.rb
+lib/rdoc/ri/ri_formatter.rb
+lib/rdoc/ri/ri_options.rb
+lib/rdoc/ri/ri_paths.rb
+lib/rdoc/ri/ri_reader.rb
+lib/rdoc/ri/ri_util.rb
+lib/rdoc/ri/ri_writer.rb
+lib/rdoc/template.rb
+lib/rdoc/tokenstream.rb
+lib/readbytes.rb
+lib/resolv-replace.rb
+lib/resolv.rb
+lib/rexml/attlistdecl.rb
+lib/rexml/attribute.rb
+lib/rexml/cdata.rb
+lib/rexml/child.rb
+lib/rexml/comment.rb
+lib/rexml/doctype.rb
+lib/rexml/document.rb
+lib/rexml/dtd/attlistdecl.rb
+lib/rexml/dtd/dtd.rb
+lib/rexml/dtd/elementdecl.rb
+lib/rexml/dtd/entitydecl.rb
+lib/rexml/dtd/notationdecl.rb
+lib/rexml/element.rb
+lib/rexml/encoding.rb
+lib/rexml/encodings/EUC-JP.rb
+lib/rexml/encodings/ICONV.rb
+lib/rexml/encodings/ISO-8859-1.rb
+lib/rexml/encodings/SHIFT-JIS.rb
+lib/rexml/encodings/SHIFT_JIS.rb
+lib/rexml/encodings/UNILE.rb
+lib/rexml/encodings/US-ASCII.rb
+lib/rexml/encodings/UTF-16.rb
+lib/rexml/encodings/UTF-8.rb
+lib/rexml/entity.rb
+lib/rexml/functions.rb
+lib/rexml/instruction.rb
+lib/rexml/light/node.rb
+lib/rexml/namespace.rb
+lib/rexml/node.rb
+lib/rexml/output.rb
+lib/rexml/parent.rb
+lib/rexml/parseexception.rb
+lib/rexml/parsers/baseparser.rb
+lib/rexml/parsers/lightparser.rb
+lib/rexml/parsers/pullparser.rb
+lib/rexml/parsers/sax2parser.rb
+lib/rexml/parsers/streamparser.rb
+lib/rexml/parsers/ultralightparser.rb
+lib/rexml/parsers/xpathparser.rb
+lib/rexml/quickpath.rb
+lib/rexml/rexml.rb
+lib/rexml/sax2listener.rb
+lib/rexml/source.rb
+lib/rexml/streamlistener.rb
+lib/rexml/text.rb
+lib/rexml/xmldecl.rb
+lib/rexml/xmltokens.rb
+lib/rexml/xpath.rb
+lib/rexml/xpath_parser.rb
+lib/rinda/rinda.rb
+lib/rinda/ring.rb
+lib/rinda/tuplespace.rb
+lib/rubyunit.rb
+lib/runit/assert.rb
+lib/runit/cui/testrunner.rb
+lib/runit/error.rb
+lib/runit/testcase.rb
+lib/runit/testresult.rb
+lib/runit/testsuite.rb
+lib/runit/topublic.rb
+lib/scanf.rb
+lib/set.rb
+lib/shell.rb
+lib/shell/builtin-command.rb
+lib/shell/command-processor.rb
+lib/shell/error.rb
+lib/shell/filter.rb
+lib/shell/process-controller.rb
+lib/shell/system-command.rb
+lib/shell/version.rb
+lib/shellwords.rb
+lib/singleton.rb
+lib/soap/baseData.rb
+lib/soap/element.rb
+lib/soap/encodingstyle/aspDotNetHandler.rb
+lib/soap/encodingstyle/handler.rb
+lib/soap/encodingstyle/literalHandler.rb
+lib/soap/encodingstyle/soapHandler.rb
+lib/soap/generator.rb
+lib/soap/mapping.rb
+lib/soap/mapping/factory.rb
+lib/soap/mapping/mapping.rb
+lib/soap/mapping/registry.rb
+lib/soap/mapping/rubytypeFactory.rb
+lib/soap/mapping/typeMap.rb
+lib/soap/mapping/wsdlRegistry.rb
+lib/soap/marshal.rb
+lib/soap/netHttpClient.rb
+lib/soap/parser.rb
+lib/soap/processor.rb
+lib/soap/property.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/rpc.rb
+lib/soap/rpc/soaplet.rb
+lib/soap/rpc/standaloneServer.rb
+lib/soap/soap.rb
+lib/soap/streamHandler.rb
+lib/soap/wsdlDriver.rb
+lib/sync.rb
+lib/tempfile.rb
+lib/test/unit.rb
+lib/test/unit/assertionfailederror.rb
+lib/test/unit/assertions.rb
+lib/test/unit/autorunner.rb
+lib/test/unit/collector.rb
+lib/test/unit/collector/dir.rb
+lib/test/unit/collector/objectspace.rb
+lib/test/unit/error.rb
+lib/test/unit/failure.rb
+lib/test/unit/testcase.rb
+lib/test/unit/testresult.rb
+lib/test/unit/testsuite.rb
+lib/test/unit/ui/console/testrunner.rb
+lib/test/unit/ui/fox/testrunner.rb
+lib/test/unit/ui/gtk/testrunner.rb
+lib/test/unit/ui/gtk2/testrunner.rb
+lib/test/unit/ui/testrunnermediator.rb
+lib/test/unit/ui/testrunnerutilities.rb
+lib/test/unit/ui/tk/testrunner.rb
+lib/test/unit/util/backtracefilter.rb
+lib/test/unit/util/observable.rb
+lib/test/unit/util/procwrapper.rb
+lib/thread.rb
+lib/thwait.rb
+lib/time.rb
+lib/timeout.rb
+lib/tmpdir.rb
+lib/tracer.rb
+lib/tsort.rb
+lib/un.rb
+lib/uri.rb
+lib/uri/common.rb
+lib/uri/ftp.rb
+lib/uri/generic.rb
+lib/uri/http.rb
+lib/uri/https.rb
+lib/uri/ldap.rb
+lib/uri/mailto.rb
+lib/weakref.rb
+lib/webrick.rb
+lib/webrick/accesslog.rb
+lib/webrick/cgi.rb
+lib/webrick/compat.rb
+lib/webrick/config.rb
+lib/webrick/cookie.rb
+lib/webrick/htmlutils.rb
+lib/webrick/httpauth.rb
+lib/webrick/httpauth/authenticator.rb
+lib/webrick/httpauth/basicauth.rb
+lib/webrick/httpauth/digestauth.rb
+lib/webrick/httpauth/htdigest.rb
+lib/webrick/httpauth/htgroup.rb
+lib/webrick/httpauth/htpasswd.rb
+lib/webrick/httpauth/userdb.rb
+lib/webrick/httpproxy.rb
+lib/webrick/httprequest.rb
+lib/webrick/httpresponse.rb
+lib/webrick/https.rb
+lib/webrick/httpserver.rb
+lib/webrick/httpservlet.rb
+lib/webrick/httpservlet/abstract.rb
+lib/webrick/httpservlet/cgi_runner.rb
+lib/webrick/httpservlet/cgihandler.rb
+lib/webrick/httpservlet/erbhandler.rb
+lib/webrick/httpservlet/filehandler.rb
+lib/webrick/httpservlet/prochandler.rb
+lib/webrick/httpstatus.rb
+lib/webrick/httputils.rb
+lib/webrick/httpversion.rb
+lib/webrick/log.rb
+lib/webrick/server.rb
+lib/webrick/ssl.rb
+lib/webrick/utils.rb
+lib/webrick/version.rb
+lib/wsdl/binding.rb
+lib/wsdl/data.rb
+lib/wsdl/definitions.rb
+lib/wsdl/documentation.rb
+lib/wsdl/import.rb
+lib/wsdl/importer.rb
+lib/wsdl/info.rb
+lib/wsdl/message.rb
+lib/wsdl/operation.rb
+lib/wsdl/operationBinding.rb
+lib/wsdl/param.rb
+lib/wsdl/parser.rb
+lib/wsdl/part.rb
+lib/wsdl/port.rb
+lib/wsdl/portType.rb
+lib/wsdl/service.rb
+lib/wsdl/soap/address.rb
+lib/wsdl/soap/binding.rb
+lib/wsdl/soap/body.rb
+lib/wsdl/soap/complexType.rb
+lib/wsdl/soap/data.rb
+lib/wsdl/soap/definitions.rb
+lib/wsdl/soap/fault.rb
+lib/wsdl/soap/header.rb
+lib/wsdl/soap/headerfault.rb
+lib/wsdl/soap/operation.rb
+lib/wsdl/types.rb
+lib/wsdl/wsdl.rb
+lib/wsdl/xmlSchema/all.rb
+lib/wsdl/xmlSchema/any.rb
+lib/wsdl/xmlSchema/attribute.rb
+lib/wsdl/xmlSchema/choice.rb
+lib/wsdl/xmlSchema/complexContent.rb
+lib/wsdl/xmlSchema/complexType.rb
+lib/wsdl/xmlSchema/content.rb
+lib/wsdl/xmlSchema/data.rb
+lib/wsdl/xmlSchema/element.rb
+lib/wsdl/xmlSchema/import.rb
+lib/wsdl/xmlSchema/parser.rb
+lib/wsdl/xmlSchema/schema.rb
+lib/wsdl/xmlSchema/sequence.rb
+lib/wsdl/xmlSchema/unique.rb
+lib/xmlrpc/base64.rb
+lib/xmlrpc/client.rb
+lib/xmlrpc/config.rb
+lib/xmlrpc/create.rb
+lib/xmlrpc/datetime.rb
+lib/xmlrpc/httpserver.rb
+lib/xmlrpc/marshal.rb
+lib/xmlrpc/parser.rb
+lib/xmlrpc/server.rb
+lib/xmlrpc/utils.rb
+lib/xsd/charset.rb
+lib/xsd/datatypes.rb
+lib/xsd/datatypes1999.rb
+lib/xsd/iconvcharset.rb
+lib/xsd/namedelements.rb
+lib/xsd/ns.rb
+lib/xsd/qname.rb
+lib/xsd/xmlparser.rb
+lib/xsd/xmlparser/parser.rb
+lib/xsd/xmlparser/rexmlparser.rb
+lib/xsd/xmlparser/xmlparser.rb
+lib/xsd/xmlparser/xmlscanner.rb
+lib/yaml.rb
+lib/yaml/baseemitter.rb
+lib/yaml/basenode.rb
+lib/yaml/constants.rb
+lib/yaml/dbm.rb
+lib/yaml/emitter.rb
+lib/yaml/encoding.rb
+lib/yaml/error.rb
+lib/yaml/loader.rb
+lib/yaml/rubytypes.rb
+lib/yaml/store.rb
+lib/yaml/stream.rb
+lib/yaml/stringio.rb
+lib/yaml/syck.rb
+lib/yaml/types.rb
+lib/yaml/yamlnode.rb
+lib/yaml/ypath.rb
+misc/README
+misc/inf-ruby.el
+misc/ruby-mode.el
+misc/rubydb2x.el
+misc/rubydb3x.el
+missing/acosh.c
+missing/alloca.c
+missing/crypt.c
+missing/dup2.c
+missing/erf.c
+missing/file.h
+missing/fileblocks.c
+missing/finite.c
+missing/flock.c
+missing/hypot.c
+missing/isinf.c
+missing/isnan.c
+missing/memcmp.c
+missing/memmove.c
+missing/mkdir.c
+missing/os2.c
+missing/strcasecmp.c
+missing/strchr.c
+missing/strerror.c
+missing/strftime.c
+missing/strncasecmp.c
+missing/strstr.c
+missing/strtod.c
+missing/strtol.c
+missing/strtoul.c
+missing/vsnprintf.c
+missing/x68.c
+sample/README
+sample/biorhythm.rb
+sample/cal.rb
+sample/cbreak.rb
+sample/clnt.rb
+sample/dbmtest.rb
+sample/dir.rb
+sample/dualstack-fetch.rb
+sample/dualstack-httpd.rb
+sample/eval.rb
+sample/export.rb
+sample/exyacc.rb
+sample/fact.rb
+sample/fib.awk
+sample/fib.pl
+sample/fib.py
+sample/fib.rb
+sample/fib.scm
+sample/freq.rb
+sample/from.rb
+sample/fullpath.rb
+sample/getopts.test
+sample/goodfriday.rb
+sample/less.rb
+sample/list.rb
+sample/list2.rb
+sample/list3.rb
+sample/logger/app.rb
+sample/logger/log.rb
+sample/logger/shifting.rb
+sample/mine.rb
+sample/mkproto.rb
+sample/mpart.rb
+sample/mrshtest.rb
+sample/observ.rb
+sample/occur.pl
+sample/occur.rb
+sample/occur2.rb
+sample/openssl/c_rehash.rb
+sample/openssl/cert2text.rb
+sample/openssl/cert_store_view.rb
+sample/openssl/certstore.rb
+sample/openssl/cipher.rb
+sample/openssl/crlstore.rb
+sample/openssl/echo_cli.rb
+sample/openssl/echo_svr.rb
+sample/openssl/gen_csr.rb
+sample/openssl/smime_read.rb
+sample/openssl/smime_write.rb
+sample/openssl/wget.rb
+sample/optparse/opttest.rb
+sample/philos.rb
+sample/pi.rb
+sample/rcs.awk
+sample/rcs.dat
+sample/rcs.rb
+sample/regx.rb
+sample/sieve.rb
+sample/soap/babelfish.rb
+sample/soap/calc/calc.rb
+sample/soap/calc/calc2.rb
+sample/soap/calc/client.rb
+sample/soap/calc/client2.rb
+sample/soap/calc/httpd.rb
+sample/soap/calc/server.cgi
+sample/soap/calc/server.rb
+sample/soap/calc/server2.rb
+sample/soap/digraph.rb
+sample/soap/exchange/client.rb
+sample/soap/exchange/exchange.rb
+sample/soap/exchange/httpd.rb
+sample/soap/exchange/server.cgi
+sample/soap/exchange/server.rb
+sample/soap/helloworld/hw_c.rb
+sample/soap/helloworld/hw_s.rb
+sample/soap/icd/IICD.rb
+sample/soap/icd/icd.rb
+sample/soap/raa/iRAA.rb
+sample/soap/raa/soap4r.rb
+sample/soap/sampleStruct/client.rb
+sample/soap/sampleStruct/httpd.rb
+sample/soap/sampleStruct/iSampleStruct.rb
+sample/soap/sampleStruct/sampleStruct.rb
+sample/soap/sampleStruct/server.cgi
+sample/soap/sampleStruct/server.rb
+sample/svr.rb
+sample/test.rb
+sample/testunit/adder.rb
+sample/testunit/subtracter.rb
+sample/testunit/tc_adder.rb
+sample/testunit/tc_subtracter.rb
+sample/testunit/ts_examples.rb
+sample/time.rb
+sample/trojan.rb
+sample/tsvr.rb
+sample/uumerge.rb
+sample/wsdl/amazon/AmazonSearch.rb
+sample/wsdl/amazon/AmazonSearchDriver.rb
+sample/wsdl/amazon/sampleClient.rb
+sample/wsdl/amazon/wsdlDriver.rb
+sample/wsdl/googleSearch/GoogleSearch.rb
+sample/wsdl/googleSearch/GoogleSearchDriver.rb
+sample/wsdl/googleSearch/README
+sample/wsdl/googleSearch/httpd.rb
+sample/wsdl/googleSearch/sampleClient.rb
+sample/wsdl/googleSearch/sjissearch.sh
+sample/wsdl/googleSearch/wsdlDriver.rb
+sample/wsdl/raa/raa.wsdl
+sample/wsdl/raa/soap4r.rb
+test/csv/bom.csv
+test/csv/mac.csv
+test/csv/test_csv.rb
+test/digest/test_digest.rb
+test/drb/drbtest.rb
+test/drb/test_acl.rb
+test/drb/test_drb.rb
+test/drb/test_drbssl.rb
+test/drb/test_drbunix.rb
+test/drb/ut_array.rb
+test/drb/ut_array_drbssl.rb
+test/drb/ut_array_drbunix.rb
+test/drb/ut_drb.rb
+test/drb/ut_drb_drbssl.rb
+test/drb/ut_drb_drbunix.rb
+test/drb/ut_eval.rb
+test/drb/ut_large.rb
+test/drb/ut_port.rb
+test/drb/ut_safe1.rb
+test/drb/ut_timerholder.rb
+test/fileutils/fileasserts.rb
+test/fileutils/test_fileutils.rb
+test/fileutils/test_nowrite.rb
+test/logger/test_logger.rb
+test/monitor/test_monitor.rb
+test/optparse/test_noarg.rb
+test/optparse/test_optarg.rb
+test/optparse/test_optparse.rb
+test/optparse/test_placearg.rb
+test/optparse/test_reqarg.rb
+test/ostruct/test_ostruct.rb
+test/ruby/beginmainend.rb
+test/ruby/endblockwarn.rb
+test/ruby/envutil.rb
+test/ruby/test_alias.rb
+test/ruby/test_array.rb
+test/ruby/test_assignment.rb
+test/ruby/test_beginendblock.rb
+test/ruby/test_bignum.rb
+test/ruby/test_call.rb
+test/ruby/test_case.rb
+test/ruby/test_clone.rb
+test/ruby/test_condition.rb
+test/ruby/test_const.rb
+test/ruby/test_defined.rb
+test/ruby/test_env.rb
+test/ruby/test_eval.rb
+test/ruby/test_exception.rb
+test/ruby/test_file.rb
+test/ruby/test_float.rb
+test/ruby/test_gc.rb
+test/ruby/test_hash.rb
+test/ruby/test_ifunless.rb
+test/ruby/test_iterator.rb
+test/ruby/test_marshal.rb
+test/ruby/test_math.rb
+test/ruby/test_pack.rb
+test/ruby/test_path.rb
+test/ruby/test_pipe.rb
+test/ruby/test_proc.rb
+test/ruby/test_range.rb
+test/ruby/test_signal.rb
+test/ruby/test_stringchar.rb
+test/ruby/test_struct.rb
+test/ruby/test_system.rb
+test/ruby/test_trace.rb
+test/ruby/test_variable.rb
+test/ruby/test_whileuntil.rb
+test/ruby/ut_eof.rb
+test/runner.rb
+test/soap/calc/calc.rb
+test/soap/calc/calc2.rb
+test/soap/calc/server.cgi
+test/soap/calc/server.rb
+test/soap/calc/server2.rb
+test/soap/calc/test_calc.rb
+test/soap/calc/test_calc2.rb
+test/soap/calc/test_calc_cgi.rb
+test/soap/helloworld/hw_s.rb
+test/soap/helloworld/test_helloworld.rb
+test/soap/marshal/cmarshal.rb
+test/soap/marshal/test_digraph.rb
+test/soap/marshal/test_marshal.rb
+test/soap/marshal/test_struct.rb
+test/soap/test_basetype.rb
+test/soap/test_property.rb
+test/soap/test_soapelement.rb
+test/soap/test_streamhandler.rb
+test/stringio/test_stringio.rb
+test/strscan/test_stringscanner.rb
+test/testunit/collector/test_dir.rb
+test/testunit/collector/test_objectspace.rb
+test/testunit/runit/test_assert.rb
+test/testunit/runit/test_testcase.rb
+test/testunit/runit/test_testresult.rb
+test/testunit/runit/test_testsuite.rb
+test/testunit/test_assertions.rb
+test/testunit/test_error.rb
+test/testunit/test_failure.rb
+test/testunit/test_testcase.rb
+test/testunit/test_testresult.rb
+test/testunit/test_testsuite.rb
+test/testunit/util/test_backtracefilter.rb
+test/testunit/util/test_observable.rb
+test/testunit/util/test_procwrapper.rb
+test/uri/test_common.rb
+test/uri/test_ftp.rb
+test/uri/test_generic.rb
+test/uri/test_http.rb
+test/uri/test_ldap.rb
+test/uri/test_mailto.rb
+test/wsdl/axisArray/axisArray.wsdl
+test/wsdl/axisArray/itemList.rb
+test/wsdl/axisArray/test_axisarray.rb
+test/wsdl/datetime/DatetimeService.rb
+test/wsdl/datetime/datetime.rb
+test/wsdl/datetime/datetime.wsdl
+test/wsdl/datetime/datetimeServant.rb
+test/wsdl/datetime/test_datetime.rb
+test/wsdl/emptycomplextype.wsdl
+test/wsdl/map/map.wsdl
+test/wsdl/map/map.xml
+test/wsdl/map/test_map.rb
+test/wsdl/raa/RAA.rb
+test/wsdl/raa/RAAServant.rb
+test/wsdl/raa/RAAService.rb
+test/wsdl/raa/README.txt
+test/wsdl/raa/raa.wsdl
+test/wsdl/raa/test_raa.rb
+test/wsdl/test_emptycomplextype.rb
+test/wsdl/test_fault.rb
+test/xsd/noencoding.xml
+test/xsd/test_noencoding.rb
+test/xsd/test_xmlschemaparser.rb
+test/xsd/test_xsd.rb
+test/xsd/xmlschema.xml
+test/yaml/test_yaml.rb
+vms/config.h_in
+vms/vms.h
+win32/Makefile.sub
+win32/README.win32
+win32/configure.bat
+win32/dir.h
+win32/mkexports.rb
+win32/resource.rb
+win32/setup.mak
+win32/win32.c
+win32/win32.h
+win32/winmain.c
+wince/Makefile.sub
+wince/README.wince
+wince/assert.c
+wince/assert.h
+wince/configure.bat
+wince/direct.c
+wince/direct.h
+wince/errno.c
+wince/errno.h
+wince/fcntl.h
+wince/io.h
+wince/io_wce.c
+wince/mkconfig_wce.rb
+wince/mkexports.rb
+wince/process.h
+wince/process_wce.c
+wince/resource.rb
+wince/setup.mak
+wince/signal.h
+wince/signal_wce.c
+wince/stddef.h
+wince/stdio.c
+wince/stdlib.c
+wince/string_wce.c
+wince/sys/stat.c
+wince/sys/stat.h
+wince/sys/timeb.c
+wince/sys/timeb.h
+wince/sys/types.h
+wince/sys/utime.c
+wince/sys/utime.h
+wince/time.h
+wince/time_wce.c
+wince/varargs.h
+wince/wince.c
+wince/wince.h
+wince/wincemain.c
+wince/wincon.h
+wince/winsock2.c
+x68/_dtos18.c
+x68/_round.c
+x68/fconvert.c
+x68/select.c
diff --git a/Makefile.in b/Makefile.in
index a37bcf65fb..1a9179dda1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,4 @@
 SHELL = /bin/sh
-NULLCMD = :
 
 #### Start of system configuration section. ####
 
@@ -11,7 +10,6 @@ YACC = @YACC@
 PURIFY =
 AUTOCONF = autoconf
 @SET_MAKE@
-MKFILES = @MAKEFILES@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -19,25 +17,11 @@ 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@
-cflags = @cflags@
-optflags = @optflags@
-debugflags = @debugflags@
 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = 
@@ -49,15 +33,13 @@ 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@ $(RUNRUBYOPT) --
+MINIRUBY = @MINIRUBY@
 
 #### End of system configuration section. ####
 
@@ -73,56 +55,129 @@ LIBRUBYARG    = @LIBRUBYARG@
 LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 
-PREP          = @PREP@
-ARCHFILE      = @ARCHFILE@
+PREP          = @PREP@ @ARCHFILE@
 SETUP         =
 EXTSTATIC     = @EXTSTATIC@
 
-RM            = rm -f
-NM            = @NM@
-AR            = @AR@
-ARFLAGS       = rcu
-RANLIB        = @RANLIB@
-AS            = @AS@
-ASFLAGS       = @ASFLAGS@
+EXTOBJS	      = 
+DLDOBJS	      = $(DMYEXT)
+DMYEXT	      = dmyext.@OBJEXT@
+
+MAINOBJ	      = main.@OBJEXT@
+
+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)
 
-OBJEXT        = @OBJEXT@
 MANTYPE	      = @MANTYPE@
 
-INSTALLED_LIST= .installed.list
-#### End of variables
+SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
+		--make="$(MAKE)" \
+		--mflags="$(MFLAGS)" \
+		--make-flags="$(MAKEFLAGS)"
 
-all:
+all:		@MAKEFILES@ miniruby$(EXEEXT) rbconfig.rb $(LIBRUBY)
+		@$(MINIRUBY) $(srcdir)/ext/extmk.rb --extstatic="$(EXTSTATIC)" $(SCRIPT_ARGS)
 
-.DEFAULT: all
+miniruby$(EXEEXT):	config.status $(LIBRUBY_A) $(MAINOBJ) $(DMYEXT)
+		@rm -f $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(MAINLIBS) $(MAINOBJ) $(DMYEXT) $(LIBRUBY_A) $(LIBS) -o $@
 
-# 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)$@
+$(PROGRAM):     $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) $(SETUP) miniruby$(EXEEXT)
+		@rm -f $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
 # 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)$@
+$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
+		@rm -f $@
+		@AR@ rcu $@ $(OBJS) $(DMYEXT)
+		@-@RANLIB@ $@ 2> /dev/null || true
+
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) miniruby$(EXEEXT) $(PREP)
+		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) -o $@
 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
 
-fake.rb:	Makefile
+ruby.imp:	$(LIBRUBY_A)
+		@@NM@ -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+# $(MINIRUBY) $< $@
+
+install:	rbconfig.rb
+		$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
+		$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) install
+
+what-where no-install:	rbconfig.rb
+		$(MINIRUBY) $(srcdir)/instruby.rb -n $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
+		$(MINIRUBY) $(srcdir)/ext/extmk.rb -n $(SCRIPT_ARGS) install
+
+clean-ext:
+		@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) clean 2> /dev/null || true
+
+clean-local:
+		@rm -f $(OBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY_ALIASES)
+		@rm -f ext/extinit.c ext/extinit.@OBJEXT@ dmyext.@OBJEXT@
+		@rm -f $(PROGRAM) miniruby$(EXEEXT)
+
+clean: clean-ext clean-local
+
+distclean-ext:
+		@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) distclean 2> /dev/null || true
+
+distclean-local: clean-local
+		@rm -f @MAKEFILES@ config.h rbconfig.rb
+		@rm -f ext/config.cache config.cache config.log config.status
+		@rm -f *~ core *.core gmon.out y.tab.c y.output ruby.imp
+
+distclean: distclean-ext distclean-local
+
+realclean: 	distclean
+		@rm -f parse.c
+		@rm -f lex.c
+
+test:		miniruby$(EXEEXT) rbconfig.rb $(PROGRAM) PHONY
+		@./miniruby$(EXEEXT) $(srcdir)/rubytest.rb
+
+rbconfig.rb:	miniruby$(EXEEXT) $(srcdir)/mkconfig.rb config.status $(PREP)
+		@$(MINIRUBY) $(srcdir)/mkconfig.rb rbconfig.rb
+
+fake.rb:	miniruby$(EXEEXT) Makefile
 		@echo ' \
 		class Object; \
 		  CROSS_COMPILING = RUBY_PLATFORM; \
@@ -141,7 +196,13 @@ fake.rb:	Makefile
 
 Makefile:	$(srcdir)/Makefile.in
 
-$(MKFILES): config.status $(srcdir)/common.mk
+.PRECIOUS:	@MAKEFILES@
+
+.PHONY:		test
+
+PHONY:
+
+@MAKEFILES@: config.status
 		MAKE=$(MAKE) $(SHELL) ./config.status
 		@{ \
 		    echo "all:; -@rm -f conftest.mk"; \
@@ -157,46 +218,157 @@ config.status:	$(srcdir)/configure
 $(srcdir)/configure: $(srcdir)/configure.in
 		cd $(srcdir) && $(AUTOCONF)
 
+.c.@OBJEXT@:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
 lex.c: keywords
-	( gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && mv $@.tmp $@ ) || \
-	if test -f $@; then \
-	  touch $@ && echo $@ touched.; \
-	else \
-	  cp $(srcdir)/lex.c $@ && echo $@ copied.; \
-	fi
+	@-rm -f $@
+	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 $<
+ext/extinit.@OBJEXT@: ext/extinit.c $(SETUP)
+	$(CC) $(CFLAGS) $(CPPFLAGS) @OUTFLAG@$@ -c ext/extinit.c
+
+acosh.@OBJEXT@: $(srcdir)/missing/acosh.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/acosh.c
+
+alloca.@OBJEXT@: $(srcdir)/missing/alloca.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/alloca.c
+
+crypt.@OBJEXT@: $(srcdir)/missing/crypt.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/crypt.c
+
+dup2.@OBJEXT@: $(srcdir)/missing/dup2.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/dup2.c
+
+fileblocks.@OBJEXT@: $(srcdir)/missing/fileblocks.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/fileblocks.c
+
+finite.@OBJEXT@: $(srcdir)/missing/finite.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/finite.c
+
+flock.@OBJEXT@: $(srcdir)/missing/flock.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/flock.c
+
+isinf.@OBJEXT@: $(srcdir)/missing/isinf.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isinf.c
+
+isnan.@OBJEXT@: $(srcdir)/missing/isnan.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isnan.c
+
+fnmatch.@OBJEXT@: $(srcdir)/missing/fnmatch.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/fnmatch.c
 
-.s.@OBJEXT@:
-	$(AS) $(ASFLAGS) -o $@ $<
+memcmp.@OBJEXT@: $(srcdir)/missing/memcmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memcmp.c
 
-clean-local::
-	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
+memmove.@OBJEXT@: $(srcdir)/missing/memmove.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memmove.c
 
-distclean-local::
-	@$(RM) ext/config.cache $(RBCONFIG)
+mkdir.@OBJEXT@: $(srcdir)/missing/mkdir.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/mkdir.c
 
-ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c
+vsnprintf.@OBJEXT@: $(srcdir)/missing/vsnprintf.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/vsnprintf.c
 
-update-rubyspec: 
-	if [ -d $(srcdir)/rubyspec ]; then \
-	  cd $(srcdir)/rubyspec/mspec; \
-	  git pull; \
-	  cd ../spec/rubyspec; \
-	  git pull; \
-	else \
-	  git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \
-	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec; \
-	fi
+strcasecmp.@OBJEXT@: $(srcdir)/missing/strcasecmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strcasecmp.c
 
-test-rubyspec:
-	@if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
-	$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+strncasecmp.@OBJEXT@: $(srcdir)/missing/strncasecmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strncasecmp.c
 
+strchr.@OBJEXT@: $(srcdir)/missing/strchr.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strchr.c
+
+strerror.@OBJEXT@: $(srcdir)/missing/strerror.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strerror.c
+
+strftime.@OBJEXT@: $(srcdir)/missing/strftime.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strftime.c
+
+strstr.@OBJEXT@: $(srcdir)/missing/strstr.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strstr.c
+
+strtol.@OBJEXT@: $(srcdir)/missing/strtol.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtol.c
+
+strtoul.@OBJEXT@: $(srcdir)/missing/strtoul.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtoul.c
+
+x68.@OBJEXT@: $(srcdir)/missing/x68.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/x68.c
+
+os2.@OBJEXT@: $(srcdir)/missing/os2.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/os2.c
+
+dl_os2.@OBJEXT@: $(srcdir)/missing/dl_os2.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/dl_os2.c
+
+win32.@OBJEXT@: $(srcdir)/win32/win32.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -I$(srcdir)/win32 -c $(srcdir)/win32/win32.c
+
+# Prevent GNU make v3 from overflowing arg limit on SysV.
+.NOEXPORT:
+###
+array.@OBJEXT@: array.c ruby.h config.h defines.h intern.h missing.h \
+  util.h st.h
+bignum.@OBJEXT@: bignum.c ruby.h config.h defines.h intern.h missing.h
+class.@OBJEXT@: class.c ruby.h config.h defines.h intern.h missing.h \
+  rubysig.h node.h st.h
+compar.@OBJEXT@: compar.c ruby.h config.h defines.h intern.h missing.h
+dir.@OBJEXT@: dir.c ruby.h config.h defines.h intern.h missing.h util.h
+dln.@OBJEXT@: dln.c ruby.h config.h defines.h intern.h missing.h dln.h
+dmyext.@OBJEXT@: dmyext.c
+enum.@OBJEXT@: enum.c ruby.h config.h defines.h intern.h missing.h node.h \
+  util.h
+error.@OBJEXT@: error.c ruby.h config.h defines.h intern.h missing.h \
+  env.h version.h st.h
+eval.@OBJEXT@: eval.c ruby.h config.h defines.h intern.h missing.h node.h \
+  env.h util.h rubysig.h st.h dln.h
+file.@OBJEXT@: file.c ruby.h config.h defines.h intern.h missing.h \
+  rubyio.h rubysig.h util.h dln.h
+gc.@OBJEXT@: gc.c ruby.h config.h defines.h intern.h missing.h rubysig.h \
+  st.h node.h env.h re.h regex.h
+hash.@OBJEXT@: hash.c ruby.h config.h defines.h intern.h missing.h st.h \
+  util.h rubysig.h
+inits.@OBJEXT@: inits.c ruby.h config.h defines.h intern.h missing.h
+io.@OBJEXT@: io.c ruby.h config.h defines.h intern.h missing.h rubyio.h \
+  rubysig.h env.h util.h
+main.@OBJEXT@: main.c ruby.h config.h defines.h intern.h missing.h
+marshal.@OBJEXT@: marshal.c ruby.h config.h defines.h intern.h missing.h \
+  rubyio.h st.h util.h
+math.@OBJEXT@: math.c ruby.h config.h defines.h intern.h missing.h
+numeric.@OBJEXT@: numeric.c ruby.h config.h defines.h intern.h missing.h
+object.@OBJEXT@: object.c ruby.h config.h defines.h intern.h missing.h \
+  st.h util.h
+pack.@OBJEXT@: pack.c ruby.h config.h defines.h intern.h missing.h
+parse.@OBJEXT@: parse.c ruby.h config.h defines.h intern.h missing.h \
+  env.h node.h st.h regex.h util.h lex.c
+prec.@OBJEXT@: prec.c ruby.h config.h defines.h intern.h missing.h
+process.@OBJEXT@: process.c ruby.h config.h defines.h intern.h missing.h \
+  rubysig.h st.h
+random.@OBJEXT@: random.c ruby.h config.h defines.h intern.h missing.h
+range.@OBJEXT@: range.c ruby.h config.h defines.h intern.h missing.h
+re.@OBJEXT@: re.c ruby.h config.h defines.h intern.h missing.h re.h \
+  regex.h
+regex.@OBJEXT@: regex.c config.h regex.h
+ruby.@OBJEXT@: ruby.c ruby.h config.h defines.h intern.h missing.h dln.h \
+  node.h util.h
+signal.@OBJEXT@: signal.c ruby.h config.h defines.h intern.h missing.h \
+  rubysig.h
+sprintf.@OBJEXT@: sprintf.c ruby.h config.h defines.h intern.h missing.h
+st.@OBJEXT@: st.c config.h st.h
+string.@OBJEXT@: string.c ruby.h config.h defines.h intern.h missing.h \
+  re.h regex.h version.h
+struct.@OBJEXT@: struct.c ruby.h config.h defines.h intern.h missing.h
+time.@OBJEXT@: time.c ruby.h config.h defines.h intern.h missing.h
+util.@OBJEXT@: util.c ruby.h config.h defines.h intern.h missing.h util.h
+variable.@OBJEXT@: variable.c ruby.h config.h defines.h intern.h \
+  missing.h env.h node.h st.h util.h
+version.@OBJEXT@: version.c ruby.h config.h defines.h intern.h missing.h \
+  version.h
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 61373187e5..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,629 +0,0 @@
-= NEWS
-
-This document is a list of user visible feature changes made between
-releases except for 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 since the 1.8.6 release
-
-=== Configuration changes
-
-* vendor_ruby directory
-
-  A new library directory named `vendor_ruby' is introduced in
-  addition to `site_ruby'.  The idea is to separate libraries
-  installed by the package system (`vendor') from manually (`site')
-  installed libraries preventing the former from getting overwritten
-  by the latter, while preserving the user option to override vendor
-  libraries with site libraries. (`site_ruby' takes precedence over
-  `vendor_ruby')
-
-  If you are a package maintainer, make each library package configure
-  the library passing the `--vendor' option to `extconf.rb' so that
-  the library files will get installed under `vendor_ruby'.
-
-  You can change the directory locations using configure options such
-  as `--with-sitedir=DIR' and `--with-vendordir=DIR'.
-
-=== Global constants
-
-* new constants
-
-  * RUBY_COPYRIGHT
-  * RUBY_DESCRIPTION
-
-=== Library updates (outstanding ones only)
-
-* new library
-
-  * securerandom
-
-* builtin classes
-
-  * Array#flatten
-  * Array#flatten!
-
-    Takes an optional argument that determines the level of recursion
-    to flatten.
-
-  * Array#eql?
-  * Array#hash
-  * Array#==
-  * Array#<=>
-
-    Handle recursive data properly.
-
-  * Array#index
-  * Array#rindex
-
-    Take a block instead of an argument.
-
-  * Array#collect!
-  * Array#map!
-  * Array#each
-  * Array#each_index
-  * Array#reverse_each
-  * Array#reject
-  * Array#reject!
-  * Array#delete_if
-
-    Return an enumerator if no block is given.
-
-    Note that #map and #collect still return an array unlike Ruby 1.9
-    to keep compatibility.
-
-  * Array#pop
-  * Array#shift
-
-    Take an optional argument specifying the number of elements to
-    remove.
-
-  * Array#choice
-  * Array#combination
-  * Array#cycle
-  * Array#drop
-  * Array#drop_while
-  * Array#permutation
-  * Array#product
-  * Array#shuffle
-  * Array#shuffle!
-  * Array#take,
-  * Array#take_while
-
-    New methods.
-
-  * Binding#eval
-
-    New method.
-
-  * Dir#each
-  * Dir#foreach
-
-    Return an enumerator if no block is given.
-
-  * Enumerable::Enumerator
-
-    New class for various enumeration defined by the enumerator library.
-
-  * Enumerable#each_slice
-  * Enumerable#each_cons
-  * Object#to_enum
-  * Object#enum_for
-
-    New methods for various enumeration defined by the enumerator library.
-
-  * Enumerable#count
-  * Enumerable#cycle
-  * Enumerable#drop
-  * Enumerable#drop_while
-  * Enumerable#find_index
-  * Enumerable#first
-  * Enumerable#group_by
-  * Enumerable#max_by
-  * Enumerable#min_by
-  * Enumerable#minmax
-  * Enumerable#minmax_by
-  * Enumerable#none?
-  * Enumerable#one?
-  * Enumerable#take
-  * Enumerable#take_while
-
-    New methods.
-
-  * Enumerable#find
-  * Enumerable#find_all
-  * Enumerable#partition
-  * Enumerable#reject
-  * Enumerable#select
-  * Enumerable#sort_by
-
-    Return an enumerator if no block is given.
-
-    Note that #map and #collect still return an array unlike Ruby 1.9
-    to keep compatibility.
-
-  * Enumerable#inject
-
-    Accepts a binary operator instead of a block.
-
-  * Enumerable#reduce
-
-    New alias to #inject.
-
-  * Hash#eql?
-  * Hash#hash
-  * Hash#==
-
-    Handle recursive data properly.
-
-  * Hash#delete_if
-  * Hash#each
-  * Hash#each_key
-  * Hash#each_pair
-  * Hash#each_value
-  * Hash#reject!
-  * Hash#select
-  * ENV.delete_if
-  * ENV.each
-  * ENV.each_key
-  * ENV.each_pair
-  * ENV.each_value
-  * ENV.reject!
-  * ENV.select
-
-    Return an enumerator if no block is given.
-
-  * GC.stress
-  * GC.stress=
-
-    New methods.
-
-  * Integer#ord
-  * Integer#odd?
-  * Integer#even?
-  * Integer#pred
-
-    New methods.
-
-  * Integer#downto
-  * Integer#times
-  * Integer#upto
-
-    Return an enumerator if no block is given.
-
-  * IO#each
-  * IO#each_line
-  * IO#each_byte
-  * IO.foreach
-  * ARGF.each
-  * ARGF.each_line
-  * ARGF.each_byte
-
-    Return an enumerator if no block is given.
-
-  * IO#bytes
-  * IO#chars
-  * IO#each_char
-  * IO#getbyte
-  * IO#lines
-  * IO#readbyte
-  * ARGF.bytes
-  * ARGF.chars
-  * ARGF.each_char
-  * ARGF.getbyte
-  * ARGF.lines
-  * ARGF.readbyte
-
-    New methods. 
-
-  * Method#name
-  * Method#owner
-  * Method#receiver
-  * UnboundMethod#name
-  * UnboundMethod#owner
-
-    New methods.
-
-  * Module#class_exec
-  * Module#module_exec
-
-    New methods.
-
-  * Numeric#step
-
-    Return an enumerator if no block is given.
-
-  * Object#instance_exec
-  * Object#tap
-
-    New methods.
-
-  * ObjectSpace.each_object
-
-    Return an enumerator if no block is given.
-
-  * Process.exec implemented.
-
-  * Range#each
-  * Range#step
-
-    Return an enumerator if no block is given.
-
-  * Regexp.union accepts an array of patterns.
-
-  * String#bytesize
-
-    New method, returning the size in bytes. (alias length and size)
-
-  * String#chars
-  * String#each_char
-  * String#partition
-  * String#rpartition
-  * String#start_with?
-  * String#end_with?
-
-    New methods.  These are $KCODE aware unlike #index, #rindex and
-    #include?.
-
-  * String#each_byte
-  * String#each
-  * String#each_line
-  * String#gsub(pattern)
-
-    Return an enumerator if no block is given.
-
-  * String#upto
-
-    An optional second argument is added to specify if the last value
-    should be included.
-
-  * StopIteration
-
-    New exception class that causes Kernel#loop to stop iteration when
-    raised.
-
-  * Struct#each
-  * Struct#each_pair
-
-    Return an enumerator if no block is given.
-
-  * Symbol#to_proc
-
-    New method.
-
-  * __method__
-
-    New global function that returns the name of the current method as
-    a Symbol.
-
-* enumerator
-
-  * Enumerator is now a built-in module.  The #next and #rewind
-    methods are implemented using the "generator" library.  Use with
-    care and be aware of the performance loss.
-
-* ipaddr
-
-  * New methods
-    * IPAddr#<=>
-    * IPAddr#succ
-
-      IPAddr objects are now comparable and enumerable having these
-      methods.  This also means that it is possible to have a Range
-      object between two IPAddr objects.
-
-    * IPAddr#to_range
-
-      A new method to create a Range object for the (network) address.
-
-  * Type coercion support
-    * IPAddr#&
-    * IPAddr#|
-    * IPAddr#==
-    * IPAddr#include?
-
-      These methods now accept a string or an integer instead of an
-      IPAddr object as the argument.
-
-* net/smtp
-
-  * Support SSL/TLS.
-
-* openssl
-
-  * New classes
-    * OpenSSL::PKey::EC
-    * OpenSSL::PKey::EC::Group
-    * OpenSSL::PKey::EC::Point
-    * OpenSSL::PKey::PKCS5
-    * OpenSSL::SSL::Session
-
-  * Documentation!
-
-  * Various new methods (see documentation).
-
-  * Remove redundant module namespace in Cipher, Digest, PKCS7, PKCS12.
-    Compatibility classes are provided which will be removed in Ruby 1.9.
-
-* shellwords
-
-  * Add methods for escaping shell-unsafe characters:
-    * Shellwords.join
-    * Shellwords.escape
-    * Array#shelljoin
-    * String#shellescape
-
-  * Add shorthand methods:
-    * Shellwords.split (alias shellwords)
-    * String#shellsplit
-
-* stringio
-
-  * StringIO#getbyte
-  * StringIO#readbyte
-
-    New methods. (aliases for compatibility with 1.9)
-
-  * StringIO#each_char
-  * StringIO#chars
-
-    New methods.
-
-  * StringIO#each
-  * StringIO#each_line
-  * StringIO#each_byte
-
-    Return an enumerator if no block is given.
-
-* tempfile
-
-  * Tempfile.open and Tempfile.new now accept a suffix for the
-    temporary file to be created.  To specify a suffix, pass an array
-    of [basename, suffix] as the first argument.
-
-      Tempfile.open(['image', 'jpg']) { |tempfile| ... }
-
-* tmpdir
-
-  * New method:
-
-    * Dir.mktmpdir
-
-* uri
-
-  * added LDAPS scheme.
-  * Change for RFC3986:
-    * FTP
-      * URI('ftp://example.com/foo').path #=> 'foo'
-      * URI('ftp://example.com/%2Ffoo').path #=> '/foo'
-      * URI::FTP.build([nil, 'example.com', nil, '/foo', 'i').to_s #=> 'ftp://example.com/%2Ffoo;type=i'
-    * URI merge
-      * URI('http://a/b/c/d;p?q').merge('?y') == URI('http://a/b/c/d;p?y')
-      * URI('http://a/b/c/d;p?q').merge('/./g') == URI('http://a/g')
-      * URI('http://a/b/c/d;p?q').merge('/../g') == URI('http://a/g')
-      * URI('http://a/b/c/d;p?q').merge('../../../g') == URI('http://a/g')
-      * URI('http://a/b/c/d;p?q').merge('../../../../g') == URI('http://a/g')
-
-* rss
-
-  * 0.1.6 -> 0.2.4
-
-  * Fix image module URI
-
-  * Atom support
-
-  * ITunes module support
-
-  * Slash module support
-
-  * content:encoded with RSS 2.0 support
-
-=== Interpreter Implementation
-
-* passing a block to a Proc [experimental]
-
-  This implementation in current shape is known to be buggy/broken,
-  especially with nested block invocation.  Take this as an
-  experimental feature.
-
-* stack trace
-
-  On non-SystemStackError exception, full stack trace is shown.
-
-=== Compatibility issues (excluding feature bug fixes)
-
-* String#slice! had some unintentional bugs and they have been fixed
-  because either they disagreed with documentation or their respective
-  behavior of #slice.  Unfortunately, this causes some
-  incompatibilities in the following (somewhat rare) cases.
-
-  * #slice! no longer expands the array when an out-of-boundary value
-    is given.
-
-      # Ruby 1.8.6
-      a = [1,2]
-      a.slice!(4,0)   #=> nil
-      a               #=> [1,2,nil,nil]
-
-      # Ruby 1.8.7
-      a = [1,2]
-      a.slice!(4,0)   #=> nil
-      a               #=> [1,2]
-
-  * #slice! no longer raises an exception but returns nil when a
-    negative length or out-of-boundary negative position is given.
-
-      # Ruby 1.8.6
-      a = [1,2]
-      a.slice!(1,-1)  #=> (raises IndexError)
-      a.slice!(-5,1)  #=> (raises IndexError)
-
-      # Ruby 1.8.7
-      a = [1,2]
-      a.slice!(1,-1)  #=> nil
-      a.slice!(-5,1)  #=> nil
-
-* String#to_i, String#hex and String#oct no longer accept a sequence
-  of underscores (`__') as part of a number.
-
-    # Ruby 1.8.6
-    '1__0'.to_i     #=> 10
-    '1__0'.to_i(2)  #=> 2  # 0b10
-    '1__0'.oct      #=> 8  # 010
-    '1__0'.hex      #=> 16 # 0x10
-
-    # Ruby 1.8.7
-    '1__0'.to_i     #=> 1
-    '1__0'.to_i(2)  #=> 1
-    '1__0'.oct      #=> 1
-    '1__0'.hex      #=> 1
-
-  The old behavior was inconsistent with Ruby syntax and considered as
-  a bug.
-
-* date
-
-  * Date.parse
-
-    '##.##.##' (where each '#' is a digit) is now taken as 'YY.MM.DD'
-    instead of 'MM.DD.YY'.  While the change may confuse you, you can
-    always use Date.strptime() when you know what you are dealing
-    with.
-
-* stringio
-
-  * StringIO#each_byte
-
-    The return value changed from nil to self.  This is what the
-    document says and the same as each_line() does.
-
-* tempfile
-
-  * The file name format has changed.  No dots are included by default
-    in temporary file names any more.  See above for how to specify a
-    suffix.
-
-* uri
-
-  * See above for details.
-
-== Changes since the 1.8.5 release
-
-=== New platforms/build tools support
-
-* IA64 HP-UX
-
-* Visual C++ 8 SP1
-
-* autoconf 2.6x
-
-=== Global constants
-
-* RUBY_PATCHLEVEL
-
-  New constant since 1.8.5-p1.
-
-=== Library updates (outstanding ones only)
-
-* 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.
-
-* date
-
-  * Updated based on date2 4.0.3.
-
-* digest
-
-  * New internal APIs for C and Ruby.
-
-  * Support for autoloading.
-
-      require 'digest'
-
-      # autoloads digest/md5
-      md = Digest::MD5.digest("string")
-
-  * 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
-
-* nkf
-
-  * Updated based on nkf as of 2007-01-28.
-
-* thread
-
-  * Replaced with much faster mutex implementation in C.  The former
-    implementation, which is slow but considered to be stable, is
-    available with a configure option `--disable-fastthread'.
-
-* tk
-
-  * 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.
-
-* 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.
-
-* date
-
-  * Time#to_date and Time#to_datetime are added as private methods.
-    They cause name conflict error in ActiveSupport 1.4.1 and prior,
-    which comes with Rails 1.2.2 and prior.  Updating ActiveSupport
-    and/or Rails to the latest versions fixes the problem.
-
-* digest
-
-  * The constructor does no longer take an initial string to feed.
-    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")
-
-* fileutils
-
-  * A minor implementation change breaks Rake <=0.7.1.
-    Updating Rake to 0.7.2 or higher fixes the problem.
-
-* 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.
diff --git a/README b/README
index 1b79781367..bde22dff78 100644
--- a/README
+++ b/README
@@ -22,24 +22,16 @@ Perl).  It is simple, straight-forward, and extensible.
 
 * How to get Ruby
 
-The Ruby distribution files can be found in the following FTP site:
+The Ruby distribution can be found on:
 
   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:
+You can get it by anonymous CVS.  How to check out is:
 
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
-
-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/
+  $ cvs -d :pserver:anonymous@cvs.ruby-lang.org:/src login
+  (Logging in to anonymous@cvs.ruby-lang.org)
+  CVS password: anonymous
+  $ cvs -z4 -d :pserver:anonymous@cvs.ruby-lang.org:/src checkout ruby
 
 
 * Ruby home-page
@@ -70,11 +62,7 @@ This is what you need to do to compile and install Ruby:
 
   2. Run ./configure, which will generate config.h and Makefile.
 
-     Some C compiler flags may be added by default depending on your
-     environment.  Specify optflags=.. and warnflags=.. as necessary
-     to override them.
-
-  3. Edit defines.h if you need.  Usually this step will not be needed.
+  3. Edit defines.h if you need.  Probably this step will not need.
 
   4. Remove comment mark(#) before the module names from ext/Setup (or
      add module names if not present), if you want to link modules
diff --git a/README.EXT b/README.EXT
index 637b19d25b..3a37db4e11 100644
--- a/README.EXT
+++ b/README.EXT
@@ -8,8 +8,8 @@ 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.
+Data in Ruby are represented by C type `VALUE'.  Each VALUE data has
+its data-type.
 
 To retrieve C data from a VALUE, you need to:
 
@@ -91,31 +91,31 @@ 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
+some machines), which can be convert 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.
+be used to retrieve the double float value in 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.
+To get char* from a VALUE, version 1.7 recommend to use new macros
+StringValue() and StringValuePtr().  StringValue(var) replaces var's
+value to 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
+requires to take only lvalue as their argument, to change the value
+of var in the replacement. 
 
-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.
+In version 1.6 or earlier, STR2CSTR() was used to do same thing
+but now it is obsoleted in version 1.7 because of STR2CSTR() has
+a risk of dangling pointer problem in 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
+for T_ARRAY etc. The VALUE of the type which has 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
+For example, `RSTRING(size)->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.
@@ -205,7 +205,7 @@ interpreter. Some (not all) of the useful functions are listed below:
   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.
+    array.  They may dump core if other types given.
 
 2. Extending Ruby with C
 
@@ -244,7 +244,7 @@ To define methods or singleton methods, use these functions:
 			          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.
+which must be less than 17.  But I believe you don't need that much. :-)
 
 If `argc' is negative, it specifies the calling sequence, not number of
 the arguments.  
@@ -272,7 +272,7 @@ private methods:
 
 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:
+defined in Math module.  It can be call in the form like:
 
   Math.sqrt(4)
 
@@ -291,19 +291,10 @@ 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,
+To define alias to 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:
@@ -321,7 +312,7 @@ 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:
+evaluate the string as Ruby program.  This function will do the job.
 
   VALUE rb_eval_string(const char *str)
 
@@ -330,30 +321,17 @@ 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:
+You can invoke methods directly, without parsing the string.  First I
+need to explain about symbols (whose data type is ID).  ID is the
+integer number to represent Ruby's identifiers such as variable names.
+It can be accessed from Ruby in the form:
 
  :Identifier
 
-You can get the ID value from a string within C code by using
+You can get the symbol 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
@@ -434,7 +412,7 @@ 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
+3.3 Encapsulate C data into Ruby object
 
 To wrap and objectify a C pointer as a Ruby object (so called
 DATA), use Data_Wrap_Struct().
@@ -482,11 +460,19 @@ directory in the Ruby's source tree.
 
 Make a directory for the extension library under ext directory.
 
-(2) design the library
+(2) create MANIFEST file
+
+  % cd ext/dbm
+  % touch MANIFEST
+
+There should be MANIFEST file in the directory for the extension
+library.  Make an empty file for now.
+
+(3) design the library
 
 You need to design the library features, before making it.
 
-(3) write C code.
+(4) 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
@@ -614,12 +600,13 @@ are not exported to the Ruby world.  You need to protect them by
 
   void rb_global_variable(VALUE *var)
 
-(4) prepare extconf.rb
+(5) prepare extconf.rb
 
 If the file named extconf.rb exists, it will be executed to generate
-Makefile.
+Makefile.  If not, the compilation scheme will try to generate Makefile
+anyway.
 
-extconf.rb is the file for checking compilation conditions etc.  You
+extconf.rb is the file for check compilation conditions etc.  You
 need to put
 
   require 'mkmf'
@@ -634,59 +621,57 @@ various conditions.
 
 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)
+  $CFLAGS: included in CFLAGS make variable (such as -I)
   $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
+``create_makefile''.  The Makefile will not generated, compilation will
 not be done.
 
-(5) prepare depend (optional)
+(6) 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.
+It's no harm.  Prepare it.
 
-(6) generate Makefile
+(7) put file names into MANIFEST (optional)
 
-Try generating the Makefile by:
+  % find * -type f -print > MANIFEST
+  % vi MANIFEST
 
-  ruby extconf.rb
+Append file names into MANIFEST.  The compilation scheme requires
+MANIFEST only to exist, but it's better to take this step in order
+to distinguish which files are required.
 
-If the library should be installed under vendor_ruby directory
-instead of site_ruby directory, use --vendor option as follows.
+(8) generate Makefile
 
-  ruby extconf.rb --vendor
+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
+(9) 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.
+put extension library under the ext directory of the ruby source tree.
 
-(8) debug
+(9) 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
+statically by the adding 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
+(10) 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.
@@ -804,9 +789,7 @@ NUM2INT(value)
 INT2NUM(i)
 NUM2DBL(value)
 rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
+STR2CSTR(value)
 rb_str_new2(s)
 
 ** defining class/module
@@ -824,7 +807,7 @@ namespace.
 
 Defines a new Ruby module.
 
- VALUE rb_define_module_under(VALUE module, const char *name)
+ VALUE rb_define_module_under(VALUE module, const char *name, VALUE super)
 
 Defines a new Ruby module under the module's namespace.
 
@@ -848,15 +831,15 @@ 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.
+rb_define_variable(), except 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:
+referred.  The setter function is called when the value is set to the
+variable.  The prototype for getter/setter functions are:
 
 	VALUE getter(ID id)
 	void setter(VALUE val, ID id)
@@ -1016,7 +999,7 @@ 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
+** Initialize and Starts the Interpreter
 
 The embedding API functions are below (not needed for extension libraries):
 
@@ -1036,41 +1019,10 @@ Starts execution of the interpreter.
 
 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.
@@ -1087,61 +1039,20 @@ 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])
 
@@ -1151,12 +1062,6 @@ 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
diff --git a/README.EXT.ja b/README.EXT.ja
index 73425c2cdb..f49083e60e 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -331,17 +331,6 @@ private¥á¥½¥Ã¥É¤È¤Ï´Ø¿ô·Á¼°¤Ç¤·¤«¸Æ¤Ó½Ð¤¹¤³¤È¤Î½ÐÍè¤Ê¤¤¥á¥½¥Ã
 
   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 Äê¿ôÄêµÁ
 
 ³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤¬É¬ÍפÊÄê¿ô¤Ï¤¢¤é¤«¤¸¤áÄêµÁ¤·¤Æ¤ª¤¤¤¿Êý¤¬Îɤ¤
@@ -380,8 +369,7 @@ C¤«¤éʸ»úÎó¤ò·Ðͳ¤»¤º¤ËRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤â¤Ç¤­¤Þ
 ¤¹¡¥¤½¤ÎÁ°¤Ë¡¤Ruby¥¤¥ó¥¿¥×¥ê¥¿Æâ¤Ç¥á¥½¥Ã¥É¤äÊÑ¿ô̾¤ò»ØÄꤹ¤ë
 »þ¤Ë»È¤ï¤ì¤Æ¤¤¤ëID¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡¥
 
-ID¤È¤ÏÊÑ¿ô̾¡¤¥á¥½¥Ã¥É̾¤òɽ¤¹À°¿ô¤Ç¤¹¡¥Ruby¤Ç¤ÏID¤ËÂбþ¤¹¤ë
-¥ª¥Ö¥¸¥§¥¯¥È¤È¤·¤Æ¥·¥ó¥Ü¥ë(Symbol)¤¬¤¢¤ê¡¤
+ID¤È¤ÏÊÑ¿ô̾¡¤¥á¥½¥Ã¥É̾¤òɽ¤¹À°¿ô¤Ç¤¹¡¥Ruby¤ÎÃæ¤Ç¤Ï
 
  :¼±ÊÌ»Ò
 
@@ -394,14 +382,6 @@ ID¤È¤ÏÊÑ¿ô̾¡¤¥á¥½¥Ã¥É̾¤òɽ¤¹À°¿ô¤Ç¤¹¡¥Ruby¤Ç¤ÏID¤ËÂбþ¤¹¤ë
 
   rb_to_id(VALUE symbol)
 
-ID¤«¤é¥·¥ó¥Ü¥ë¤òÆÀ¤ë¤¿¤á¤Ë¤Ï°Ê²¼¤Î¥Þ¥¯¥í¤ò»È¤¤¤Þ¤¹¡¥
-
-  VALUE ID2SYM(ID id)
-
-¥·¥ó¥Ü¥ë¤«¤éID¤òÆÀ¤ë¤¿¤á¤Ë¤Ï°Ê²¼¤Î¥Þ¥¯¥í¤ò»È¤¤¤Þ¤¹¡¥
-
-  ID SYM2ID(VALUE symbol)
-
 2.2.3 C¤«¤éRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹
 
 C¤«¤éʸ»úÎó¤ò·Ðͳ¤»¤º¤ËRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤¿¤á¤Ë¤Ï°Ê²¼
@@ -562,14 +542,28 @@ Ruby 1.1¤«¤é¤ÏǤ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¥À¥¤¥Ê¥ß¥Ã¥¯¥é¥¤¥Ö¥é¥ê¤òºî
 ¥é¥¤¥Ö¥é¥êÍѤΥǥ£¥ì¥¯¥È¥ê¤òºî¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥Ì¾Á°¤ÏŬÅö¤Ë
 Áª¤ó¤Ç¹½¤¤¤Þ¤»¤ó¡¥
 
-(2) À߷פ¹¤ë
+(2) MANIFEST¥Õ¥¡¥¤¥ë¤òºî¤ë
+
+  % cd ext/dbm
+  % touch MANIFEST
+
+³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Ë¤ÏMANIFEST¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬
+ɬÍפʤΤǡ¤¤È¤ê¤¢¤¨¤º¶õ¤Î¥Õ¥¡¥¤¥ë¤òºî¤Ã¤Æ¤ª¤­¤Þ¤¹¡¥¸å¤Ç¤³¤Î
+¥Õ¥¡¥¤¥ë¤Ë¤ÏɬÍפʥե¡¥¤¥ë°ìÍ÷¤¬Æþ¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡¥
+
+MANIFEST¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤Ï¡¤ÀÅŪ¥ê¥ó¥¯¤Îmake¤Î»þ¤Ë¥Ç¥£¥ì¥¯¥È¥ê
+¤¬³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ò´Þ¤ó¤Ç¤¤¤ë¤«¤É¤¦¤«È½Äꤹ¤ë¤¿¤á¤Ë»È¤ï¤ì¤ì¤Æ
+¤¤¤Þ¤¹¡¥¥À¥¤¥Ê¥ß¥Ã¥¯¥é¥¤¥Ö¥é¥ê¤òºî¤ë¾ì¹ç¤Ë¤Ïɬ¤º¤·¤âɬÍפǤÏ
+¤¢¤ê¤Þ¤»¤ó¡¥
+
+(3) À߷פ¹¤ë
 
 ¤Þ¤¢¡¤ÅöÁ³¤Ê¤ó¤Ç¤¹¤±¤É¡¤¤É¤¦¤¤¤¦µ¡Ç½¤ò¼Â¸½¤¹¤ë¤«¤É¤¦¤«¤Þ¤ºÀß
 ·×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥¤É¤ó¤Ê¥¯¥é¥¹¤ò¤Ä¤¯¤ë¤«¡¤¤½¤Î¥¯¥é¥¹¤Ë¤Ï
 ¤É¤ó¤Ê¥á¥½¥Ã¥É¤¬¤¢¤ë¤«¡¤¥¯¥é¥¹¤¬Ä󶡤¹¤ëÄê¿ô¤Ê¤É¤Ë¤Ä¤¤¤ÆÀß·×
 ¤·¤Þ¤¹¡¥
 
-(3) C¥³¡¼¥É¤ò½ñ¤¯
+(4) C¥³¡¼¥É¤ò½ñ¤¯
 
 ³ÈÄ¥¥é¥¤¥Ö¥é¥êËÜÂΤȤʤëC¸À¸ì¤Î¥½¡¼¥¹¤ò½ñ¤­¤Þ¤¹¡¥C¸À¸ì¤Î¥½¡¼
 ¥¹¤¬¤Ò¤È¤Ä¤Î»þ¤Ë¤Ï¡Ö¥é¥¤¥Ö¥é¥ê̾.c¡×¤òÁª¤Ö¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡¥C
@@ -712,7 +706,7 @@ C¤ÎÂç°èÊÑ¿ô¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤Ã¤ÆRuby¥¤¥ó¥¿¥×¥ê¥¿¤ËÊÑ¿ô¤Î¸ºß
 
   void rb_global_variable(VALUE *var)
 
-(4) extconf.rb¤òÍÑ°Õ¤¹¤ë
+(5) extconf.rb¤òÍÑ°Õ¤¹¤ë
 
 Makefile¤òºî¤ë¾ì¹ç¤Î¿÷·¿¤Ë¤Ê¤ëextconf.rb¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºî¤ê
 ¤Þ¤¹¡¥extconf.rb¤Ï¥é¥¤¥Ö¥é¥ê¤Î¥³¥ó¥Ñ¥¤¥ë¤ËɬÍפʾò·ï¤Î¥Á¥§¥Ã
@@ -730,20 +724,14 @@ Makefile¤òºî¤ë¾ì¹ç¤Î¿÷·¿¤Ë¤Ê¤ëextconf.rb¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºî¤ê
 
 °Ê²¼¤ÎÊÑ¿ô¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥
 
-  $CFLAGS: ¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-O¤Ê¤É)
-  $CPPFLAGS: ¥×¥ê¥×¥í¥»¥Ã¥µ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-I¤ä-D¤Ê¤É)
+  $CFLAGS: ¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-I¤Ê¤É)
   $LDFLAGS: ¥ê¥ó¥¯»þ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-L¤Ê¤É)
-  $objs: ¥ê¥ó¥¯¤µ¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È
-
-¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤Ï¡¢Ä̾ï¤Ï¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·
-¤Æ¼«Æ°Åª¤ËÀ¸À®¤µ¤ì¤Þ¤¹¤¬¡¢make¤ÎÅÓÃæ¤Ç¥½¡¼¥¹¤òÀ¸À®¤¹¤ë¤è¤¦¤Ê
-¾ì¹ç¤ÏÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 
 ¥é¥¤¥Ö¥é¥ê¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ò·ï¤¬Â·¤ï¤º¡¤¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥³¥ó
 ¥Ñ¥¤¥ë¤·¤Ê¤¤»þ¤Ë¤Ïcreate_makefile¤ò¸Æ¤Ð¤Ê¤±¤ì¤ÐMakefile¤ÏÀ¸
 À®¤µ¤ì¤º¡¤¥³¥ó¥Ñ¥¤¥ë¤â¹Ô¤ï¤ì¤Þ¤»¤ó¡¥
 
-(5) depend¤òÍÑ°Õ¤¹¤ë
+(6) depend¤òÍÑ°Õ¤¹¤ë
 
 ¤â¤·¡¤¥Ç¥£¥ì¥¯¥È¥ê¤Ëdepend¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ì¤Ð¡¤
 Makefile¤¬°Í¸´Ø·¸¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤ì¤Þ¤¹¡¥
@@ -752,7 +740,18 @@ Makefile¤¬°Í¸´Ø·¸¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤ì¤Þ¤¹¡¥
 
 ¤Ê¤É¤Çºî¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡¥¤¢¤Ã¤Æ»¤Ï̵¤¤¤Ç¤·¤ç¤¦¡¥
 
-(6) Makefile¤òÀ¸À®¤¹¤ë
+(7) MANIFEST¥Õ¥¡¥¤¥ë¤Ë¥Õ¥¡¥¤¥ë̾¤òÆþ¤ì¤ë
+
+  % find * -type f -print > MANIFEST
+  % vi MANIFEST
+
+*.o, *~¤Ê¤ÉÉÔɬÍפʥե¡¥¤¥ë°Ê³°¤ÏMANIFEST¤ËÄɲ䷤Ƥª¤­¤Þ¤¹¡¥
+make»þ¤Ë¤ÏMANIFEST¤ÎÆâÍƤϻ²¾È¤·¤Þ¤»¤ó¤Î¤Ç¡¤¶õ¤Î¤Þ¤Þ¤Ç¤âÌäÂê
+¤Ïµ¯¤­¤Þ¤»¤ó¤¬¡¤¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¤Î»þ¤Ë»²¾È¤¹¤ë¤³¤È¤¬¤¢¤ë¤Î¤È¡¤
+ɬÍפʥե¡¥¤¥ë¤ò¶èÊ̤Ǥ­¤ë¤Î¤Ç¡¤ÍÑ°Õ¤·¤Æ¤ª¤¤¤¿Êý¤¬Îɤ¤¤Ç¤·¤ç
+¤¦¡¥
+
+(8) Makefile¤òÀ¸À®¤¹¤ë
 
 Makefile¤ò¼ÂºÝ¤ËÀ¸À®¤¹¤ë¤¿¤á¤Ë¤Ï
 
@@ -765,16 +764,10 @@ Makefile¤ò¼ÂºÝ¤ËÀ¸À®¤¹¤ë¤¿¤á¤Ë¤Ï
 
 ¤È¤·¤Æ¤¯¤À¤µ¤¤¡¥
 
-site_ruby ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤¯¡¢
-vendor_ruby ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï
-°Ê²¼¤Î¤è¤¦¤Ë --vendor ¥ª¥×¥·¥ç¥ó¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡¥
-
-  ruby extconf.rb --vendor
-
 ¥Ç¥£¥ì¥¯¥È¥ê¤òext°Ê²¼¤ËÍÑ°Õ¤·¤¿¾ì¹ç¤Ë¤ÏRubyÁ´ÂΤÎmake¤Î»þ¤Ë
 ¼«Æ°Åª¤ËMakefile¤¬À¸À®¤µ¤ì¤Þ¤¹¤Î¤Ç¡¤¤³¤Î¥¹¥Æ¥Ã¥×¤ÏÉÔÍפǤ¹¡¥
 
-(7) make¤¹¤ë
+(9) make¤¹¤ë
 
 ưŪ¥ê¥ó¥¯¥é¥¤¥Ö¥é¥ê¤òÀ¸À®¤¹¤ë¾ì¹ç¤Ë¤Ï¤½¤Î¾ì¤Çmake¤·¤Æ¤¯¤À¤µ
 ¤¤¡¥É¬ÍפǤ¢¤ì¤Ð make install ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡¥
@@ -792,13 +785,13 @@ extconf.rb¤ò½ñ¤­´¹¤¨¤ë¤Ê¤É¤·¤ÆMakefile¤ÎºÆÀ¸À®¤¬É¬Íפʻþ¤Ï¤Þ
 ¤òºî¤ê¡¤¤½¤³¤Ë ³ÈÄ¥»Ò .rb ¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤Æ¤ª¤±¤ÐƱ»þ¤Ë¥¤¥ó
 ¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡¥
 
-(8) ¥Ç¥Ð¥Ã¥°
+(10) ¥Ç¥Ð¥Ã¥°
 
 ¤Þ¤¢¡¤¥Ç¥Ð¥Ã¥°¤·¤Ê¤¤¤ÈÆ°¤«¤Ê¤¤¤Ç¤·¤ç¤¦¤Í¡¥ext/Setup¤Ë¥Ç¥£¥ì
 ¥¯¥È¥ê̾¤ò½ñ¤¯¤ÈÀÅŪ¤Ë¥ê¥ó¥¯¤¹¤ë¤Î¤Ç¥Ç¥Ð¥Ã¥¬¤¬»È¤¨¤ë¤è¤¦¤Ë¤Ê
 ¤ê¤Þ¤¹¡¥¤½¤Îʬ¥³¥ó¥Ñ¥¤¥ë¤¬ÃÙ¤¯¤Ê¤ê¤Þ¤¹¤±¤É¡¥
 
-(9) ¤Ç¤­¤¢¤¬¤ê
+(11) ¤Ç¤­¤¢¤¬¤ê
 
 ¸å¤Ï¤³¤Ã¤½¤ê»È¤¦¤Ê¤ê¡¤¹­¤¯¸ø³«¤¹¤ë¤Ê¤ê¡¤Çä¤ë¤Ê¤ê¡¤¤´¼«Í³¤Ë¤ª
 »È¤¤¤¯¤À¤µ¤¤¡¥Ruby¤Îºî¼Ô¤Ï³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë´Ø¤·¤Æ°ìÀڤθ¢Íø¤ò
@@ -923,9 +916,7 @@ NUM2INT(value)
 INT2NUM(i)
 NUM2DBL(value)
 rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
+STR2CSTR(value)
 rb_str_new2(s)
 
 ** ¥¯¥é¥¹/¥â¥¸¥å¡¼¥ëÄêµÁ
@@ -943,7 +934,7 @@ VALUE rb_define_module(const char *name)
 
   ¿·¤·¤¤Ruby¥â¥¸¥å¡¼¥ë¤òÄêµÁ¤¹¤ë¡¥
 
-VALUE rb_define_module_under(VALUE module, const char *name)
+VALUE rb_define_module_under(VALUE module, const char *name, VALUE super)
 
   ¿·¤·¤¤Ruby¥â¥¸¥å¡¼¥ë¤òÄêµÁ¤·¡¤module¤ÎÄê¿ô¤È¤·¤ÆÄêµÁ¤¹¤ë¡¥
 
@@ -1157,12 +1148,6 @@ Appendix C. extconf.rb¤Ç»È¤¨¤ë´Ø¿ô¤¿¤Á
 extconf.rb¤ÎÃæ¤Ç¤ÏÍøÍѲÄǽ¤Ê¥³¥ó¥Ñ¥¤¥ë¾ò·ï¥Á¥§¥Ã¥¯¤Î´Ø¿ô¤Ï°Ê
 ²¼¤ÎÄ̤ê¤Ç¤¢¤ë¡¥
 
-have_macro(macro, headers)
-
-  ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ¥Þ¥¯¥ímacro¤¬ÄêµÁ¤µ
-  ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¥Á¥§¥Ã¥¯¤¹¤ë¡¥¥Þ¥¯¥í¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë»þtrue
-  ¤òÊÖ¤¹¡¥
-
 have_library(lib, func)
 
   ´Ø¿ôfunc¤òÄêµÁ¤·¤Æ¤¤¤ë¥é¥¤¥Ö¥é¥êlib¤Î¸ºß¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡¥
@@ -1180,67 +1165,21 @@ have_func(func, header)
   ¤ë»þ¤Ë¤ÏÀè¤Ë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])
 
@@ -1251,12 +1190,6 @@ dir_config(target[, default_include, default_lib])
   ¤ÈÅù²Á¤Ç¤¢¤ë¡¥Äɲ䵤줿 include ¥Ç¥£¥ì¥¯¥È¥ê¤È lib ¥Ç¥£¥ì¥¯¥È¥ê¤Î
   ÇÛÎó¤òÊÖ¤¹¡¥ ([include_dir, lib_dir])
 
-pkg_config(pkg)
-
-  pkg-config¥³¥Þ¥ó¥É¤«¤é¥Ñ¥Ã¥±¡¼¥¸pkg¤Î¾ðÊó¤òÆÀ¤ë¡¥ 
-  pkg-config¤Î¼ÂºÝ¤Î¥³¥Þ¥ó¥É̾¤Ï¡¤--with-pkg-config¥³¥Þ¥ó¥É
-  ¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ç»ØÄê²Äǽ¡¥
-
 /*
  * Local variables:
  * fill-column: 60
diff --git a/README.ja b/README.ja
index 71ce4ee12c..fc502dd440 100644
--- a/README.ja
+++ b/README.ja
@@ -26,25 +26,18 @@ Ruby¤Ï¥Æ¥­¥¹¥È½èÍý´Ø·¸¤ÎǽÎϤʤɤËÍ¥¤ì¡¤Perl¤ÈƱ¤¸¤¯¤é¤¤¶¯ÎÏ
 
 * Æþ¼êË¡
 
-** FTP¤Ç
+** ftp¤Ç
 
 °Ê²¼¤Î¾ì½ê¤Ë¤ª¤¤¤Æ¤¢¤ê¤Þ¤¹¡¥
 
   ftp://ftp.ruby-lang.org/pub/ruby/
 
-** Subversion¤Ç
+** CVS¤Ç
 
-ËÜ¥Ö¥é¥ó¥Á¤ÎRuby¤ÎºÇ¿·¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¼èÆÀ¤Ç¤­¤Þ¤¹¡¥
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
-
-³«È¯Àèü¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¼èÆÀ¤Ç¤­¤Þ¤¹¡¥
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-¾¤Ë³«È¯Ãæ¤Î¥Ö¥é¥ó¥Á¤Î°ìÍ÷¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¸«¤é¤ì¤Þ¤¹¡¥
-
-  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+  $ cvs -d :pserver:anonymous@cvs.ruby-lang.org:/src login
+  (Logging in to anonymous@cvs.ruby-lang.org)
+  CVS password: anonymous
+  $ cvs -z4 -d :pserver:anonymous@cvs.ruby-lang.org:src checkout ruby
 
 
 * ¥Û¡¼¥à¥Ú¡¼¥¸
@@ -92,10 +85,6 @@ Ruby³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Ë¤Ä¤¤¤ÆÏ䷹礦ruby-ext¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤È
 
   2. configure¤ò¼Â¹Ô¤·¤ÆMakefile¤Ê¤É¤òÀ¸À®¤¹¤ë
 
-     ´Ä¶­¤Ë¤è¤Ã¤Æ¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎC¥³¥ó¥Ñ¥¤¥éÍÑ¥ª¥×¥·¥ç¥ó¤¬ÉÕ¤­
-     ¤Þ¤¹¡¥configure¥ª¥×¥·¥ç¥ó¤Ç optflags=.. warnflags=.. Åù
-     ¤Ç¾å½ñ¤­¤Ç¤­¤Þ¤¹¡¥
-
   3. (ɬÍפʤé¤Ð)defines.h¤òÊÔ½¸¤¹¤ë
 
      ¿ʬ¡¤É¬Í×̵¤¤¤È»×¤¤¤Þ¤¹¡¥
diff --git a/array.c b/array.c
index 7e8c12b683..caf9dc2401 100644
--- a/array.c
+++ b/array.c
@@ -20,7 +20,6 @@ VALUE rb_cArray;
 static ID id_cmp;
 
 #define ARY_DEFAULT_SIZE 16
-#define ARY_MAX_SIZE (LONG_MAX / sizeof(VALUE))
 
 void
 rb_mem_clear(mem, size)
@@ -32,7 +31,7 @@ rb_mem_clear(mem, size)
     }
 }
 
-static inline void
+static void
 memfill(mem, size, val)
     register VALUE *mem;
     register long size;
@@ -51,7 +50,7 @@ rb_ary_modify_check(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");
+	rb_raise(rb_eTypeError, "can't modify array during iteration");
     if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
 }
@@ -71,7 +70,6 @@ rb_ary_modify(ary)
 	RARRAY(ary)->ptr = ptr;
     }
 }
-
 VALUE
 rb_ary_freeze(ary)
     VALUE ary;
@@ -79,14 +77,6 @@ rb_ary_freeze(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;
@@ -121,7 +111,7 @@ ary_new(klass, len)
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative array size (or size too big)");
     }
-    if (len > ARY_MAX_SIZE) {
+    if (len > 0 && len * sizeof(VALUE) <= len) {
 	rb_raise(rb_eArgError, "array size too big");
     }
     if (len == 0) len++;
@@ -189,34 +179,11 @@ rb_ary_new4(n, elts)
     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;
 }
 
-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;
-    }
-}
-
 VALUE
 rb_assoc_new(car, cdr)
     VALUE car, cdr;
@@ -247,42 +214,42 @@ rb_check_array_type(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.
+/* 
+ * call-seq:
+ *       Array.new(size=0, obj=nil)
+ *       Array.new(array)
+ *       Array.new(size) {|i| ...}
+
+ * 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")
+ *   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
+ *   # 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
+ *   # here multiple copies are created
+ *   a = Array.new(2) { Hash.new }
+ *   a[0]['cat'] = 'feline'
+ *   a
  * 
- *     squares = Array.new(5) {|i| i*i}
- *     squares
+ *   squares = Array.new(5) {|i| i*i}
+ *   squares
  * 
- *     copy = Array.new(squares)
+ *   copy = Array.new(squares)
  */
 
 static VALUE
@@ -315,7 +282,7 @@ rb_ary_initialize(argc, argv, ary)
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative array size");
     }
-    if (len > ARY_MAX_SIZE) {
+    if (len > 0 && len * (long)sizeof(VALUE) <= len) {
 	rb_raise(rb_eArgError, "array size too big");
     }
     if (len > RARRAY(ary)->aux.capa) {
@@ -329,7 +296,7 @@ rb_ary_initialize(argc, argv, ary)
 	    rb_warn("block supersedes default value argument");
 	}
 	for (i=0; i<len; i++) {
-	    rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
+	    RARRAY(ary)->ptr[i] = rb_yield(LONG2NUM(i));
 	    RARRAY(ary)->len = i + 1;
 	}
     }
@@ -358,6 +325,9 @@ rb_ary_s_create(argc, argv, klass)
 {
     VALUE ary = ary_alloc(klass);
 
+    if (argc < 0) {
+	rb_raise(rb_eArgError, "negative number of arguments");
+    }
     if (argc > 0) {
 	RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
 	MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
@@ -373,6 +343,7 @@ rb_ary_store(ary, idx, val)
     long idx;
     VALUE val;
 {
+    rb_ary_modify(ary);
     if (idx < 0) {
 	idx += RARRAY(ary)->len;
 	if (idx < 0) {
@@ -380,21 +351,17 @@ rb_ary_store(ary, idx, val)
 		    idx - RARRAY(ary)->len);
 	}
     }
-    else if (idx >= ARY_MAX_SIZE) {
-	rb_raise(rb_eIndexError, "index %ld too big", idx);
-    }
 
-    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;
 	}
-	if (new_capa >= ARY_MAX_SIZE - idx) {
-	    new_capa = (ARY_MAX_SIZE - idx) / 2;
-	}
 	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;
     }
@@ -409,57 +376,13 @@ rb_ary_store(ary, idx, val)
     RARRAY(ary)->ptr[idx] = val;
 }
 
-static VALUE
-ary_shared_array(klass, ary)
-    VALUE klass;
-    VALUE ary;
-{
-    VALUE val = ary_alloc(klass);
-
-    ary_make_shared(ary);
-    RARRAY(val)->ptr = RARRAY(ary)->ptr;
-    RARRAY(val)->len = RARRAY(ary)->len;
-    RARRAY(val)->aux.shared = RARRAY(ary)->aux.shared;
-    FL_SET(val, ELTS_SHARED);
-    return val;
-}
-
-static VALUE
-ary_shared_first(argc, argv, ary, last)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-    int last;
-{
-    VALUE nv, result;
-    long n;
-    long offset = 0;
-
-    rb_scan_args(argc, argv, "1", &nv);
-    n = NUM2LONG(nv);
-    if (n > RARRAY(ary)->len) {
-	n = RARRAY(ary)->len;
-    }
-    else if (n < 0) {
-	rb_raise(rb_eArgError, "negative array size");
-    }
-    if (last) {
-	offset = RARRAY(ary)->len - n;
-    }
-    result = ary_shared_array(rb_cArray, ary);
-    RARRAY(result)->ptr += offset;
-    RARRAY(result)->len = n;
-
-    return result;
-}
-
-/*
- *  call-seq:
- *     array << obj            -> array
+/* 
+ * 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.
+ *   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 ] ]
@@ -476,12 +399,12 @@ rb_ary_push(ary, item)
 }
 
 /* 
- *  call-seq:
- *     array.push(obj, ... )   -> array
+ * 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.
+ *   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")  
@@ -500,6 +423,18 @@ rb_ary_push_m(argc, argv, ary)
     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;
@@ -507,7 +442,7 @@ rb_ary_pop(ary)
     rb_ary_modify_check(ary);
     if (RARRAY(ary)->len == 0) return Qnil;
     if (!FL_TEST(ary, ELTS_SHARED) &&
-	    RARRAY(ary)->len * 3 < RARRAY(ary)->aux.capa &&
+	    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);
@@ -515,112 +450,49 @@ rb_ary_pop(ary)
     return RARRAY(ary)->ptr[--RARRAY(ary)->len];
 }
 
-/*
- *  call-seq:
- *     array.pop    -> obj or nil
- *     array.pop(n) -> array
- *  
- *  Removes the last element from <i>self</i> and returns it, or
- *  <code>nil</code> if the array is empty.
- *
- *  If a number _n_ is given, returns an array of the last n elements
- *  (or less) just like <code>array.slice!(-n, n)</code> does.
- *     
- *     a = [ "a", "b", "c", "d" ]
- *     a.pop     #=> "d"
- *     a.pop(2)  #=> ["b", "c"]
- *     a         #=> ["a"]
- */
-
-static VALUE
-rb_ary_pop_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    VALUE result;
-
-    if (argc == 0) {
-	return rb_ary_pop(ary);
-    }
-
-    rb_ary_modify_check(ary);
-    result = ary_shared_first(argc, argv, ary, Qtrue);
-    RARRAY(ary)->len -= RARRAY(result)->len;
-    return result;
-}
-
-VALUE
-rb_ary_shift(ary)
+static void
+ary_make_shared(ary)
     VALUE ary;
 {
-    VALUE top;
-
-    rb_ary_modify_check(ary);
-    if (RARRAY(ary)->len == 0) return Qnil;
-    top = RARRAY(ary)->ptr[0];
     if (!FL_TEST(ary, ELTS_SHARED)) {
-        if (RARRAY(ary)->len < ARY_DEFAULT_SIZE) {
-            MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+1, VALUE, RARRAY(ary)->len-1);
-	    RARRAY(ary)->len--;
-            return top;
-        }
-        RARRAY(ary)->ptr[0] = Qnil;
-	ary_make_shared(ary);
-    }
-    RARRAY(ary)->ptr++;		/* shift ptr */
-    RARRAY(ary)->len--;
+	NEWOBJ(shared, struct RArray);
+	OBJSETUP(shared, rb_cArray, T_ARRAY);
 
-    return top;
+	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);
+    }
 }
 
 /*
  *  call-seq:
- *     array.shift    -> obj or nil
- *     array.shift(n) -> array
+ *     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.
- *
- *  If a number _n_ is given, returns an array of the first n elements
- *  (or less) just like <code>array.slice!(0, n)</code> does.
  *     
  *     args = [ "-m", "-q", "filename" ]
- *     args.shift     #=> "-m"
- *     args           #=> ["-q", "filename"]
- *
- *     args = [ "-m", "-q", "filename" ]
- *     args.shift(2)  #=> ["-m", "-q"]
- *     args           #=> ["filename"]
+ *     args.shift   #=> "-m"
+ *     args         #=> ["-q", "filename"]
  */
 
-static VALUE
-rb_ary_shift_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
+VALUE
+rb_ary_shift(ary)
     VALUE ary;
 {
-    VALUE result;
-    long n;
-
-    if (argc == 0) {
-	return rb_ary_shift(ary);
-    }
+    VALUE top;
 
     rb_ary_modify_check(ary);
-    result = ary_shared_first(argc, argv, ary, Qfalse);
-    n = RARRAY(result)->len;
-    if (FL_TEST(ary, ELTS_SHARED)) {
-	RARRAY(ary)->ptr += n;
-	RARRAY(ary)->len -= n;
-	}
-    else {
-	MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+n, VALUE, RARRAY(ary)->len-n);
-	RARRAY(ary)->len -= n;
-    }
+    if (RARRAY(ary)->len == 0) return Qnil;
+    top = RARRAY(ary)->ptr[0];
+    ary_make_shared(ary);
+    RARRAY(ary)->ptr++;		/* shift ptr */
+    RARRAY(ary)->len--;
 
-    return result;
+    return top;
 }
 
 VALUE
@@ -648,7 +520,7 @@ rb_ary_unshift(ary, item)
 
 /*
  *  call-seq:
- *     array.unshift(obj, ...)  -> array
+ *     array.unshift(obj, ...)  => array
  *  
  *  Prepends objects to the front of <i>array</i>.
  *  other elements up one.
@@ -666,6 +538,9 @@ rb_ary_unshift_m(argc, argv, ary)
 {
     long len = RARRAY(ary)->len;
 
+    if (argc < 0) {
+	rb_raise(rb_eArgError, "negative number of arguments");
+    }
     if (argc == 0) return ary;
 
     /* make rooms by setting the last item */
@@ -678,28 +553,21 @@ rb_ary_unshift_m(argc, argv, ary)
     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 (RARRAY(ary)->len == 0) return Qnil;
+
     if (offset < 0) {
 	offset += RARRAY(ary)->len;
     }
-    return rb_ary_elt(ary, offset);
+    if (offset < 0 || RARRAY(ary)->len <= offset) {
+	return Qnil;
+    }
+
+    return RARRAY(ary)->ptr[offset];
 }
 
 static VALUE
@@ -707,13 +575,12 @@ rb_ary_subseq(ary, beg, len)
     VALUE ary;
     long beg, len;
 {
-    VALUE klass, ary2, shared;
-    VALUE *ptr;
+    VALUE klass, ary2;
 
     if (beg > RARRAY(ary)->len) return Qnil;
     if (beg < 0 || len < 0) return Qnil;
 
-    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+    if (beg + len > RARRAY(ary)->len) {
 	len = RARRAY(ary)->len - beg;
 	if (len < 0)
 	    len = 0;
@@ -721,33 +588,34 @@ rb_ary_subseq(ary, beg, len)
     klass = rb_obj_class(ary);
     if (len == 0) return ary_new(klass, 0);
 
-    shared = ary_make_shared(ary);
-    ptr = RARRAY(ary)->ptr;
+    ary_make_shared(ary);
     ary2 = ary_alloc(klass);
-    RARRAY(ary2)->ptr = ptr + beg;
+    RARRAY(ary2)->ptr = RARRAY(ary)->ptr + beg;
     RARRAY(ary2)->len = len;
-    RARRAY(ary2)->aux.shared = shared;
+    RARRAY(ary2)->aux.shared = RARRAY(ary)->aux.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
+ * call-seq:
+ *       array[int]                  => obj      or nil
+ *       array[start, length]        => an_array or nil
+ *       array[range]                => an_array or nil
+ *       array.slice(int)            => 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.
+ * Element Reference---Returns the element at index _int_,
+ * or returns a subarray starting at index _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 any indices
+ * are out of range unless the index equals the array size and a
+ * _length_ or _range_ parameter is given, in which case an
+ * empty array is returned.
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a[2] +  a[0] + a[1]    #=> "cab"
@@ -808,14 +676,14 @@ rb_ary_aref(argc, argv, ary)
 }
 
 /* 
- *  call-seq:
- *     array.at(index)   ->   obj  or nil
+ * call-seq:
+ *      array.at(int)   #=>   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.)
+ *   Returns the element at index int. A
+ *   negative index counts from the end of _self_.  Returns +nil+
+ *   if the index is out of range. See also Array.[].
+ *   (Array.at is slightly faster than Array.[], as it
+ *   does not accept ranges and so on.)
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.at(0)     #=> "a"
@@ -831,17 +699,13 @@ rb_ary_at(ary, 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.
- *
+ *     array.first   =>   obj or nil
+ *  
+ *  Returns the first element of the array. If the array is empty,
+ *  returns <code>nil</code>.
+ *     
  *     a = [ "q", "r", "s", "t" ]
- *     a.first    #=> "q"
- *     a.first(1) #=> ["q"]
- *     a.first(3) #=> ["q", "r", "s"]
+ *     a.first   #=> "q"
  */
 
 static VALUE
@@ -855,14 +719,24 @@ rb_ary_first(argc, argv, ary)
 	return RARRAY(ary)->ptr[0];
     }
     else {
-	return ary_shared_first(argc, argv, ary, Qfalse);
+	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
+ *     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>.
@@ -881,15 +755,25 @@ rb_ary_last(argc, argv, ary)
 	return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
     }
     else {
-	return ary_shared_first(argc, argv, ary, Qtrue);
+	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
+ *     array.fetch(index)                => obj
+ *     array.fetch(index, default )      => obj
+ *     array.fetch(index) {|i| block }   => obj
  *  
  *  Tries to return the element at position <i>index</i>. If the index
  *  lies outside the array, the first form throws an
@@ -937,41 +821,24 @@ rb_ary_fetch(argc, argv, ary)
 
 /*
  *  call-seq:
- *     array.index(obj)           ->  int or nil
- *     array.index {|item| block} ->  int or nil
+ *     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>. If a block is given instead of an
- *  argument, returns first object for which <em>block</em> is true.
- *  Returns <code>nil</code> if no match is found.
+ *  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
- *     a.index{|x|x=="b"}  #=> 1
- *
- *  This is an alias of <code>#find_index</code>.
+ *     a.index("b")   #=> 1
+ *     a.index("z")   #=> nil
  */
 
 static VALUE
-rb_ary_index(argc, argv, ary)
-    int argc;
-    VALUE *argv;
+rb_ary_index(ary, val)
     VALUE ary;
-{
     VALUE val;
+{
     long i;
 
-    if (argc  == 0) {
-	RETURN_ENUMERATOR(ary, 0, 0);
-	for (i=0; i<RARRAY(ary)->len; i++) {
-	    if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
-		return LONG2NUM(i);
-	    }
-	}
-	return Qnil;
-    }
-    rb_scan_args(argc, argv, "01", &val);
     for (i=0; i<RARRAY(ary)->len; i++) {
 	if (rb_equal(RARRAY(ary)->ptr[i], val))
 	    return LONG2NUM(i);
@@ -981,56 +848,37 @@ rb_ary_index(argc, argv, ary)
 
 /*
  *  call-seq:
- *     array.rindex(obj)    ->  int or nil
+ *     array.rindex(obj)    =>  int or nil
  *  
- *  Returns the index of the last object in <i>array</i>
- *  <code>==</code> to <i>obj</i>. If a block is given instead of an
- *  argument, returns first object for which <em>block</em> is
- *  true. Returns <code>nil</code> if no match is found.
+ *  Returns the index of the last object in <i>arr</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
- *     a.rindex{|x|x=="b"}  #=> 3
+ *     a.rindex("b")   #=> 3
+ *     a.rindex("z")   #=> nil
  */
 
 static VALUE
-rb_ary_rindex(argc, argv, ary)
-    int argc;
-    VALUE *argv;
+rb_ary_rindex(ary, val)
     VALUE ary;
-{
     VALUE val;
+{
     long i = RARRAY(ary)->len;
 
-    if (argc == 0) {
-	RETURN_ENUMERATOR(ary, 0, 0);
-	while (i--) {
-	    if (RTEST(rb_yield(RARRAY(ary)->ptr[i])))
-		return LONG2NUM(i);
-	    if (i > RARRAY(ary)->len) {
-		i = RARRAY(ary)->len;
-	    }
-	}
-	return Qnil;
-    }
-    rb_scan_args(argc, argv, "01", &val);
     while (i--) {
 	if (rb_equal(RARRAY(ary)->ptr[i], val))
 	    return LONG2NUM(i);
-	if (i > RARRAY(ary)->len) {
-	    i = RARRAY(ary)->len;
-	}
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     array.indexes( i1, i2, ... iN )   -> an_array
- *     array.indices( i1, i2, ... iN )   -> an_array
+ *     array.indexes( i1, i2, ... iN )   => an_array
+ *     array.indices( i1, i2, ... iN )   => an_array
  *  
- *  Deprecated; use <code>Array#values_at</code>.
+ *  Deprecated; use <code>Array#select</code>.
  */
 
 static VALUE
@@ -1065,7 +913,7 @@ rb_ary_to_ary(obj)
 }
 
 static void
-rb_ary_splice(ary, beg, len, rpl)
+rb_ary_update(ary, beg, len, rpl)
     VALUE ary;
     long beg, len;
     VALUE rpl;
@@ -1080,10 +928,11 @@ rb_ary_splice(ary, beg, len, rpl)
 	    rb_raise(rb_eIndexError, "index %ld out of array", beg);
 	}
     }
-    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+    if (beg + len > RARRAY(ary)->len) {
 	len = RARRAY(ary)->len - beg;
     }
 
+    rb_ary_modify(ary);
     if (NIL_P(rpl)) {
 	rlen = 0;
     }
@@ -1091,12 +940,8 @@ rb_ary_splice(ary, beg, len, rpl)
 	rpl = rb_ary_to_ary(rpl);
 	rlen = RARRAY(rpl)->len;
     }
-    rb_ary_modify(ary);
 
     if (beg >= RARRAY(ary)->len) {
-	if (beg > ARY_MAX_SIZE - rlen) {
-	    rb_raise(rb_eIndexError, "index %ld too big", beg);
-	}
 	len = beg + rlen;
 	if (len >= RARRAY(ary)->aux.capa) {
 	    REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
@@ -1133,31 +978,31 @@ rb_ary_splice(ary, beg, len, rpl)
 }
 
 /* 
- *  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
+ * call-seq:
+ *    array[int] = obj                  =>  obj
+ *    array[start, length] = an_array   =>  an_array
+ *    array[range] = an_array           =>  an_array
  *
- *  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>.
+ *   Element Assignment---Sets the element at index _int_,
+ *   or replaces a subarray starting at index _start_ and
+ *   continuing for _length_ elements, or replaces a subarray
+ *   specified by _range_.  If _int_ is greater than
+ *   the current capacity of the array, the array grows
+ *   automatically. A negative _int_ will count backward
+ *   from the end of the array. Inserts elements if _length_ is
+ *   zero. If _an_array is +nil+, deletes elements from _self_.
+ *   An +IndexError+ is raised if a
+ *   negative index points past the beginning of the array. See also
+ *   Array.push, and Array.unshift.
  * 
  *     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"]
+ *     a[4] = "4";                
+ *     a[0, 3] = [ 'a', 'b', 'c' ]
+ *     a[1..2] = [ 1, 2 ];        
+ *     a[0, 2] = "?";             
+ *     a[0..2] = "A";             
+ *     a[-1]   = "Z";              
+ *     a[1..-1] = nil;             
  */
 
 static VALUE
@@ -1175,7 +1020,7 @@ rb_ary_aset(argc, argv, ary)
 	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]);
+	rb_ary_update(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
 	return argv[2];
     }
     if (argc != 2) {
@@ -1190,7 +1035,7 @@ rb_ary_aset(argc, argv, ary)
     }
     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]);
+	rb_ary_update(ary, beg, len, argv[1]);
 	return argv[1];
     }
 
@@ -1202,7 +1047,7 @@ fixnum:
 
 /*
  *  call-seq:
- *     array.insert(index, obj...)  -> array
+ *     array.insert(index, obj...)  => array
  *  
  *  Inserts the given values before the element with the given index
  *  (which may be negative).
@@ -1220,7 +1065,6 @@ rb_ary_insert(argc, argv, ary)
 {
     long pos;
 
-    if (argc == 1) return ary;
     if (argc < 1) {
 	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
     }
@@ -1228,16 +1072,18 @@ rb_ary_insert(argc, argv, ary)
     if (pos == -1) {
 	pos = RARRAY(ary)->len;
     }
-    if (pos < 0) {
+    else if (pos < 0) {
 	pos++;
     }
-    rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
+
+    if (argc == 1) return ary;
+    rb_ary_update(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.each {|item| block }   ->   array
+ *     array.each {|item| block }   =>   array
  *  
  *  Calls <i>block</i> once for each element in <i>self</i>, passing that
  *  element as a parameter.
@@ -1256,7 +1102,6 @@ rb_ary_each(ary)
 {
     long i;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
     for (i=0; i<RARRAY(ary)->len; i++) {
 	rb_yield(RARRAY(ary)->ptr[i]);
     }
@@ -1265,7 +1110,7 @@ rb_ary_each(ary)
 
 /*
  *  call-seq:
- *     array.each_index {|index| block }  ->  array
+ *     array.each_index {|index| block }  =>  array
  *  
  *  Same as <code>Array#each</code>, but passes the index of the element
  *  instead of the element itself.
@@ -1284,7 +1129,6 @@ rb_ary_each_index(ary)
 {
     long i;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
     for (i=0; i<RARRAY(ary)->len; i++) {
 	rb_yield(LONG2NUM(i));
     }
@@ -1310,10 +1154,8 @@ static VALUE
 rb_ary_reverse_each(ary)
     VALUE ary;
 {
-    long len;
+    long len = RARRAY(ary)->len;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
-    len = RARRAY(ary)->len;
     while (len--) {
 	rb_yield(RARRAY(ary)->ptr[len]);
 	if (RARRAY(ary)->len < len) {
@@ -1341,7 +1183,7 @@ rb_ary_length(ary)
 
 /*
  *  call-seq:
- *     array.empty?   -> true or false
+ *     array.empty?   => true or false
  *  
  *  Returns <code>true</code> if <i>self</i> array contains no elements.
  *     
@@ -1431,7 +1273,7 @@ rb_ary_join(ary, sep)
 
 /*
  *  call-seq:
- *     array.join(sep=$,)    -> str
+ *     array.join(sep=$,)    => str
  *  
  *  Returns a string created by converting each element of the array to
  *  a string, separated by <i>sep</i>.
@@ -1575,13 +1417,6 @@ inspect_ary(ary)
     return str;
 }
 
-/*
- *  call-seq:
- *     array.inspect  -> string
- *
- *  Create a printable version of <i>array</i>.
- */
-
 static VALUE
 rb_ary_inspect(ary)
     VALUE ary;
@@ -1593,7 +1428,7 @@ rb_ary_inspect(ary)
 
 /*
  *  call-seq:
- *     array.to_a     -> array
+ *     array.to_a -> array
  *  
  *  Returns _self_. If called on a subclass of Array, converts
  *  the receiver to an Array object.
@@ -1648,7 +1483,7 @@ rb_ary_reverse(ary)
 
 /*
  *  call-seq:
- *     array.reverse!   -> array 
+ *     array.reverse!   => array 
  *  
  *  Reverses _self_ in place.
  *     
@@ -1681,69 +1516,40 @@ rb_ary_reverse_m(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)
+sort_1(a, b)
     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;
+    return rb_cmpint(retval, *a, *b);
 }
 
 static int
-sort_2(ap, bp, data)
+sort_2(ap, bp)
     VALUE *ap, *bp;
-    struct ary_sort_data *data;
 {
     VALUE retval;
-    VALUE a = *ap, b = *bp;
-    int n;
+    long a = (long)*ap, b = (long)*bp;
 
     if (FIXNUM_P(a) && FIXNUM_P(b)) {
-	if ((long)a > (long)b) return 1;
-	if ((long)a < (long)b) return -1;
+	if (a > b) return 1;
+	if (a < b) return -1;
 	return 0;
     }
-    if (TYPE(a) == T_STRING) {
-	if (TYPE(b) == T_STRING) return rb_str_cmp(a, b);
+    if (TYPE(a) == T_STRING && 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;
+    return rb_cmpint(retval, a, b);
 }
 
 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);
+	  rb_block_given_p()?sort_1:sort_2);
     return ary;
 }
 
@@ -1755,10 +1561,11 @@ sort_unlock(ary)
     return ary;
 }
 
+VALUE
 /*
  *  call-seq:
- *     array.sort!                   -> array
- *     array.sort! {| a,b | block }  -> array 
+ *     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
@@ -1771,7 +1578,6 @@ sort_unlock(ary)
  *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
  */
 
-VALUE
 rb_ary_sort_bang(ary)
     VALUE ary;
 {
@@ -1785,8 +1591,8 @@ rb_ary_sort_bang(ary)
 
 /*
  *  call-seq:
- *     array.sort                   -> an_array 
- *     array.sort {| a,b | block }  -> an_array 
+ *     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
@@ -1810,12 +1616,12 @@ rb_ary_sort(ary)
 
 /*
  *  call-seq:
- *     array.collect {|item| block }  -> an_array
- *     array.map     {|item| block }  -> an_array
+ *     array.collect {|obj| block }  -> an_array
+ *     array.map     {|obj| 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>.
+ *  See also Enumerable#collect</code>.
  *     
  *     a = [ "a", "b", "c", "d" ]
  *     a.collect {|x| x + "!" }   #=> ["a!", "b!", "c!", "d!"]
@@ -1841,13 +1647,13 @@ rb_ary_collect(ary)
 }
 
 /* 
- *  call-seq:
- *     array.collect! {|item| block }   ->   array
- *     array.map!     {|item| block }   ->   array
+ * call-seq:
+ *    array.collect! {|obj} ...}   =>   array
+ *    array.map!     {|obj} ...}   =>   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>.
+ *   Invokes the block once for each element of _self_self, replacing the
+ *   element with the value returned by _block_.
+ *   See also Enumerable.collect.
  *   
  *     a = [ "a", "b", "c", "d" ]
  *     a.collect! {|x| x + "!" }
@@ -1860,10 +1666,9 @@ rb_ary_collect_bang(ary)
 {
     long i;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
     rb_ary_modify(ary);
     for (i = 0; i < RARRAY(ary)->len; i++) {
-	rb_ary_store(ary, i, rb_yield(RARRAY(ary)->ptr[i]));
+	RARRAY(ary)->ptr[i] = rb_yield(RARRAY(ary)->ptr[i]);
     }
     return ary;
 }
@@ -1902,19 +1707,18 @@ rb_values_at(obj, olen, argc, argv, func)
 }
 
 /* 
- *  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>.
+ * 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>.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)
+ *      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
@@ -1928,28 +1732,35 @@ rb_ary_values_at(argc, argv, ary)
 
 /*
  *  call-seq:
- *     array.select {|item| block } -> an_array
+ *     array.select {|i| block } -> an_array
  *  
- *  Invokes the block passing in successive elements from <i>array</i>,
+ *  Invokes the block passing in successive elements from <i>arr</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(1, 3, 5)               #=> ["b", "d", "f"]
+ *     a.select(1, 3, 5, 7)            #=> ["b", "d", "f", nil]
+ *     a.select(-1, -3, -5, -7)        #=> ["f", "d", "b", nil]
  *     a.select {|v| v =~ /[aeiou]/}   #=> ["a", "e"]
  */
 
 static VALUE
-rb_ary_select(ary)
+rb_ary_select(argc, argv, ary)
+    int argc;
+    VALUE *argv;
     VALUE ary;
 {
     VALUE result;
     long i;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    if (argc > 0) {
+	rb_raise(rb_eArgError, "wrong number arguments (%d for 0)", argc);
+    }
     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));
+	    rb_ary_push(result, RARRAY(ary)->ptr[i]);
 	}
     }
     return result;
@@ -1957,8 +1768,8 @@ rb_ary_select(ary)
 
 /*
  *  call-seq:
- *     array.delete(obj)            -> obj or nil 
- *     array.delete(obj) { block }  -> obj or nil
+ *     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
@@ -1979,12 +1790,11 @@ rb_ary_delete(ary, item)
 {
     long i1, i2;
 
+    rb_ary_modify(ary);
     for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
-	VALUE e = RARRAY(ary)->ptr[i1];
-
-	if (rb_equal(e, item)) continue;
+	if (rb_equal(RARRAY(ary)->ptr[i1], item)) continue;
 	if (i1 != i2) {
-	    rb_ary_store(ary, i2, e);
+	    RARRAY(ary)->ptr[i2] = RARRAY(ary)->ptr[i1];
 	}
 	i2++;
     }
@@ -1995,14 +1805,11 @@ rb_ary_delete(ary, 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)->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;
-	}
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, i2 * 2);
+	RARRAY(ary)->aux.capa = i2 * 2;
     }
 
     return item;
@@ -2016,13 +1823,13 @@ rb_ary_delete_at(ary, pos)
     long i, len = RARRAY(ary)->len;
     VALUE del;
 
+    rb_ary_modify(ary);
     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];
@@ -2055,9 +1862,9 @@ rb_ary_delete_at_m(ary, pos)
 
 /*
  *  call-seq:
- *     array.slice!(index)         -> obj or nil
- *     array.slice!(start, length) -> sub_array or nil
- *     array.slice!(range)         -> sub_array or nil 
+ *     array.slice!(int)           => 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
@@ -2085,42 +1892,23 @@ rb_ary_slice_bang(argc, argv, ary)
     VALUE ary;
 {
     VALUE arg1, arg2;
-    long pos, len, orig_len;
+    long pos, len;
 
-    rb_ary_modify_check(ary);
+    rb_ary_modify(ary);
     if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
 	pos = NUM2LONG(arg1);
 	len = NUM2LONG(arg2);
       delete_pos_len:
-	if (len < 0) return Qnil;
-	orig_len = RARRAY_LEN(ary);
 	if (pos < 0) {
-	    pos += orig_len;
-	    if (pos < 0) return Qnil;
-	}
-	else if (orig_len < pos) return Qnil;
-	if (orig_len < pos + len) {
-	    len = orig_len - pos;
+	    pos = RARRAY(ary)->len + pos;
 	}
-	if (len == 0) return rb_ary_new2(0);
-	arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos);
-	RBASIC(arg2)->klass = rb_obj_class(ary);
-	rb_ary_splice(ary, pos, len, Qnil);	/* Qundef in 1.9 */
+	arg2 = rb_ary_subseq(ary, pos, len);
+	rb_ary_update(ary, pos, len, Qnil);	/* Qnil/rb_ary_new2(0) */
 	return arg2;
     }
 
-    if (!FIXNUM_P(arg1)) {
-	switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) {
-	  case Qtrue:
-	    /* valid range */
-	    goto delete_pos_len;
-	  case Qnil:
-	    /* invalid range */
-	    return Qnil;
-	  default:
-	    /* not a range */
-	    break;
-	}
+    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));
@@ -2128,7 +1916,7 @@ rb_ary_slice_bang(argc, argv, ary)
 
 /*
  *  call-seq:
- *     array.reject! {|item| block }  -> array or nil
+ *     array.reject! {| | block }  -> array or nil
  *  
  *  Equivalent to <code>Array#delete_if</code>, deleting elements from
  *  _self_ for which the block evaluates to true, but returns
@@ -2142,26 +1930,23 @@ rb_ary_reject_bang(ary)
 {
     long i1, i2;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
     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 (RTEST(rb_yield(RARRAY(ary)->ptr[i1]))) continue;
 	if (i1 != i2) {
-	    rb_ary_store(ary, i2, v);
+	    RARRAY(ary)->ptr[i2] = RARRAY(ary)->ptr[i1];
 	}
 	i2++;
     }
     if (RARRAY(ary)->len == i2) return Qnil;
-    if (i2 < RARRAY(ary)->len)
-	RARRAY(ary)->len = i2;
+    RARRAY(ary)->len = i2;
 
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.reject {|item| block }  -> an_array
+ *     arr.reject {|item| block }  -> an_array
  *  
  *  Returns a new array containing the items in _self_
  *  for which the block is not true.
@@ -2171,7 +1956,6 @@ static VALUE
 rb_ary_reject(ary)
     VALUE ary;
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
     ary = rb_ary_dup(ary);
     rb_ary_reject_bang(ary);
     return ary;
@@ -2192,7 +1976,6 @@ static VALUE
 rb_ary_delete_if(ary)
     VALUE ary;
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
     rb_ary_reject_bang(ary);
     return ary;
 }
@@ -2204,9 +1987,9 @@ rb_ary_delete_if(ary)
  *  
  *  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
+ *  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>,
+ *  the size of any arguemnt 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.
@@ -2236,9 +2019,9 @@ rb_ary_zip(argc, argv, ary)
 	for (i=0; i<RARRAY(ary)->len; i++) {
 	    VALUE tmp = rb_ary_new2(argc+1);
 
-	    rb_ary_push(tmp, rb_ary_elt(ary, i));
+	    rb_ary_push(tmp, rb_ary_entry(ary, i));
 	    for (j=0; j<argc; j++) {
-		rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+		rb_ary_push(tmp, rb_ary_entry(argv[j], i));
 	    }
 	    rb_yield(tmp);
 	}
@@ -2249,9 +2032,9 @@ rb_ary_zip(argc, argv, ary)
     for (i=0; i<len; i++) {
 	VALUE tmp = rb_ary_new2(argc+1);
 
-	rb_ary_push(tmp, rb_ary_elt(ary, i));
+	rb_ary_push(tmp, rb_ary_entry(ary, i));
 	for (j=0; j<argc; j++) {
-	    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+	    rb_ary_push(tmp, rb_ary_entry(argv[j], i));
 	}
 	rb_ary_push(result, tmp);
     }
@@ -2279,7 +2062,7 @@ rb_ary_transpose(ary)
     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));
+	tmp = to_ary(RARRAY(ary)->ptr[i]);
 	if (elen < 0) {		/* first element */
 	    elen = RARRAY(tmp)->len;
 	    result = rb_ary_new2(elen);
@@ -2288,11 +2071,11 @@ rb_ary_transpose(ary)
 	    }
 	}
 	else if (elen != RARRAY(tmp)->len) {
-	    rb_raise(rb_eIndexError, "element size differs (%d should be %d)",
+	    rb_raise(rb_eIndexError, "element size differ (%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));
+	    rb_ary_store(RARRAY(result)->ptr[j], i, RARRAY(tmp)->ptr[j]);
 	}
     }
     return result;
@@ -2300,7 +2083,7 @@ rb_ary_transpose(ary)
 
 /*
  *  call-seq:
- *     array.replace(other_array)  -> array
+ *     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.
@@ -2314,27 +2097,24 @@ 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);
+    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;
+    RARRAY(copy)->aux.shared = RARRAY(orig)->aux.shared;
     FL_SET(copy, ELTS_SHARED);
 
     return copy;
 }
 
 /* 
- *  call-seq:
- *     array.clear    ->  array
- *
- *  Removes all elements from _self_.
+ * call-seq:
+ *     array.clear    =>  array
+ *   Removes all elements from _self_.
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.clear    #=> [ ]
@@ -2355,17 +2135,17 @@ rb_ary_clear(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
+ *     array.fill(obj) -> array
+ *     array.fill(obj, start [, length])          => array
+ *     array.fill(obj, range )                    => array
+ *     array.fill {|i| block }                    => array
+ *     array.fill(start [, length] ) {|i| block } => array
+ *     array.fill(range) {|i| 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
+ *  <code>nil</code> is equivalent to <i>arr</i>.length. 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.
  *     
@@ -2384,7 +2164,7 @@ rb_ary_fill(argc, argv, ary)
     VALUE ary;
 {
     VALUE item, arg1, arg2;
-    long beg = 0, end = 0, len = 0;
+    long beg, end, len;
     VALUE *p, *pend;
     int block_p = Qfalse;
 
@@ -2416,19 +2196,15 @@ rb_ary_fill(argc, argv, ary)
 	break;
     }
     rb_ary_modify(ary);
-    if (len < 0) {
-        return ary;
-    }
-    if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) {
-	rb_raise(rb_eArgError, "argument too big");
-    }
     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);
+	if (beg > RARRAY(ary)->len) {
+	    rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
+	}
 	RARRAY(ary)->len = end;
     }
 
@@ -2436,7 +2212,7 @@ rb_ary_fill(argc, argv, ary)
 	VALUE v;
 	long i;
 
-	for (i=beg; i<end; i++) {
+	for (i=beg; i<RARRAY(ary)->len; i++) {
 	    v = rb_yield(LONG2NUM(i));
 	    if (i>=RARRAY(ary)->len) break;
 	    RARRAY(ary)->ptr[i] = v;
@@ -2453,11 +2229,11 @@ rb_ary_fill(argc, argv, ary)
 }
 
 /* 
- *  call-seq:
- *     array + other_array   -> an_array
+ * call-seq:
+ *    array + other_array   => an_array
  *
- *  Concatenation---Returns a new array built by concatenating the
- *  two arrays together to produce a third 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 ]
  */
@@ -2479,8 +2255,8 @@ rb_ary_plus(x, y)
 }
 
 /* 
- *  call-seq:
- *     array.concat(other_array)   ->  array
+ * call-seq:
+ *   self.concat(other_array)   =>  array
  *
  *  Appends the elements in other_array to _self_.
  *  
@@ -2494,24 +2270,23 @@ rb_ary_concat(x, y)
 {
     y = to_ary(y);
     if (RARRAY(y)->len > 0) {
-	rb_ary_splice(x, RARRAY(x)->len, 0, y);
+	rb_ary_update(x, RARRAY(x)->len, 0, y);
     }
     return x;
 }
 
 
 /* 
- *  call-seq:
- *     array * int     ->    an_array
- *     array * str     ->    a_string
+ * 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_.
+ *   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"
  *
  */
 
@@ -2528,11 +2303,11 @@ rb_ary_times(ary, times)
     }
 
     len = NUM2LONG(times);
-    if (len == 0) return ary_new(rb_obj_class(ary), 0);
+    if (len == 0) return rb_ary_new2(0);
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative argument");
     }
-    if (ARY_MAX_SIZE/len < RARRAY(ary)->len) {
+    if (LONG_MAX/len < RARRAY(ary)->len) {
 	rb_raise(rb_eArgError, "argument too big");
     }
     len *= RARRAY(ary)->len;
@@ -2549,16 +2324,16 @@ rb_ary_times(ary, times)
 }
 
 /* 
- *  call-seq:
- *     array.assoc(obj)   ->  an_array  or  nil
+ *   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>.
+ *   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 assoc}iated array,
+ *   or +nil+ if no match is found.
+ *   See also Array.rassoc.
  *
  *     s1 = [ "colors", "red", "blue", "green" ]
  *     s2 = [ "letters", "a", "b", "c" ]
@@ -2572,14 +2347,17 @@ VALUE
 rb_ary_assoc(ary, key)
     VALUE ary, key;
 {
-    long i;
-    VALUE v;
+    VALUE *p, *pend;
 
-    for (i = 0; i < RARRAY(ary)->len; ++i) {
-	v = rb_check_array_type(RARRAY(ary)->ptr[i]);
-	if (!NIL_P(v) && RARRAY(v)->len > 0 &&
-	    rb_equal(RARRAY(v)->ptr[0], key))
-	    return v;
+    p = RARRAY(ary)->ptr;
+    pend = p + RARRAY(ary)->len;
+    
+    while (p < pend) {
+	if (TYPE(*p) == T_ARRAY &&
+		RARRAY(*p)->len > 0 &&
+		rb_equal(RARRAY(*p)->ptr[0], key))
+	    return *p;
+	p++;
     }
     return Qnil;
 }
@@ -2602,42 +2380,28 @@ 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;
-}
+    VALUE *p, *pend;
 
-static VALUE recursive_equal _((VALUE, VALUE, int));
-static VALUE
-recursive_equal(ary1, ary2, recur)
-    VALUE ary1, ary2;
-    int recur;
-{
-    long i;
+    p = RARRAY(ary)->ptr;
+    pend = p + RARRAY(ary)->len;
 
-    if (recur) 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;
+    while (p < pend) {
+	if (TYPE(*p) == T_ARRAY
+	    && RARRAY(*p)->len > 1
+	    && rb_equal(RARRAY(*p)->ptr[1], value))
+	    return *p;
+	p++;
     }
-    return Qtrue;
+    return Qnil;
 }
 
 /* 
- *  call-seq:
- *     array == other_array   ->   bool
+ * 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.
+ *   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
@@ -2649,6 +2413,8 @@ 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"))) {
@@ -2657,57 +2423,36 @@ rb_ary_equal(ary1, ary2)
 	return rb_equal(ary2, ary1);
     }
     if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
-    return rb_exec_recursive(recursive_equal, ary1, ary2);
-}
-
-static VALUE recursive_eql _((VALUE, VALUE, int));
-static VALUE
-recursive_eql(ary1, ary2, recur)
-    VALUE ary1, ary2;
-    int recur;
-{
-    long i;
-
-    if (recur) return Qfalse;
     for (i=0; i<RARRAY(ary1)->len; i++) {
-	if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+	if (!rb_equal(RARRAY(ary1)->ptr[i], RARRAY(ary2)->ptr[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;
-    return rb_exec_recursive(recursive_eql, ary1, ary2);
+    for (i=0; i<RARRAY(ary1)->len; i++) {
+	if (!rb_eql(RARRAY(ary1)->ptr[i], RARRAY(ary2)->ptr[i]))
+	    return Qfalse;
+    }
+    return Qtrue;
 }
 
-static VALUE recursive_hash _((VALUE, VALUE, int));
 static VALUE
-recursive_hash(ary, dummy, recur)
+rb_ary_hash(ary)
     VALUE ary;
-    VALUE dummy;
-    int recur;
 {
     long i, h;
     VALUE n;
 
-    if (recur) {
-	return LONG2FIX(0);
-    }
-
     h = RARRAY(ary)->len;
     for (i=0; i<RARRAY(ary)->len; i++) {
 	h = (h << 1) | (h<0 ? 1 : 0);
@@ -2719,22 +2464,7 @@ recursive_hash(ary, dummy, recur)
 
 /*
  *  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;
-{
-    return rb_exec_recursive(recursive_hash, ary, 0);
-}
-
-/*
- *  call-seq:
- *     array.include?(obj)   -> true or false
+ *     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>),
@@ -2761,43 +2491,20 @@ rb_ary_includes(ary, item)
 }
 
 
-static VALUE recursive_cmp _((VALUE, VALUE, int));
-static VALUE
-recursive_cmp(ary1, ary2, recur)
-    VALUE ary1;
-    VALUE ary2;
-    int recur;
-{
-    long i, len;
-
-    if (recur) return Qnil;
-    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;
-	}
-    }
-    return Qundef;
-}
-
 /* 
- *  call-seq:
- *     array <=> other_array   ->  -1, 0, +1
+ * 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.
+ *   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 Array.<=> 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
@@ -2808,13 +2515,19 @@ VALUE
 rb_ary_cmp(ary1, ary2)
     VALUE ary1, ary2;
 {
-    long len;
-    VALUE v;
+    long i, len;
 
     ary2 = to_ary(ary2);
-    if (ary1 == ary2) return INT2FIX(0);
-    v = rb_exec_recursive(recursive_cmp, ary1, ary2);
-    if (v != Qundef) return v;
+    len = RARRAY(ary1)->len;
+    if (len > RARRAY(ary2)->len) {
+	len = RARRAY(ary2)->len;
+    }
+    for (i=0; i<len; i++) {
+	VALUE v = rb_funcall(RARRAY(ary1)->ptr[i], id_cmp, 1, RARRAY(ary2)->ptr[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);
@@ -2840,13 +2553,13 @@ ary_make_hash(ary1, ary2)
 }
 
 /* 
- *  call-seq:
- *     array - other_array    -> an_array
+ * 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.)
+ *   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 ]
  */
@@ -2855,8 +2568,7 @@ static VALUE
 rb_ary_diff(ary1, ary2)
     VALUE ary1, ary2;
 {
-    VALUE ary3;
-    volatile VALUE hash;
+    VALUE ary3, hash;
     long i;
 
     hash = ary_make_hash(to_ary(ary2), 0);
@@ -2864,19 +2576,19 @@ rb_ary_diff(ary1, ary2)
 
     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));
+	rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
     }
     return ary3;
 }
 
 /* 
- *  call-seq:
- *     array & other_array
+ * call-seq:
+ *   array & other_array
  *
- *  Set Intersection---Returns a new array
- *  containing elements common to the two arrays, with no duplicates.
+ *   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 ]
+ *      [ 1, 1, 3, 5 ] & [ 1, 2, 3 ]   #=> [ 1, 3 ]
  */
 
 
@@ -2884,7 +2596,7 @@ static VALUE
 rb_ary_and(ary1, ary2)
     VALUE ary1, ary2;
 {
-    VALUE hash, ary3, v, vv;
+    VALUE hash, ary3;
     long i;
 
     ary2 = to_ary(ary2);
@@ -2893,9 +2605,9 @@ rb_ary_and(ary1, ary2)
     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);
+	VALUE v = RARRAY(ary1)->ptr[i];
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
+	    rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
 	}
     }
 
@@ -2903,13 +2615,13 @@ rb_ary_and(ary1, ary2)
 }
 
 /* 
- *  call-seq:
- *     array | other_array     ->  an_array
+ * 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" ] | [ "c", "d", "a" ]
  *            #=> [ "a", "b", "c", "d" ]
  */
 
@@ -2918,7 +2630,7 @@ rb_ary_or(ary1, ary2)
     VALUE ary1, ary2;
 {
     VALUE hash, ary3;
-    VALUE v, vv;
+    VALUE v;
     long i;
 
     ary2 = to_ary(ary2);
@@ -2926,15 +2638,15 @@ rb_ary_or(ary1, ary2)
     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);
+	v = RARRAY(ary1)->ptr[i];
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
+	    rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
 	}
     }
     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);
+	v = RARRAY(ary2)->ptr[i];
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
+	    rb_ary_push(ary3, RARRAY(ary2)->ptr[i]);
 	}
     }
     return ary3;
@@ -2942,7 +2654,7 @@ rb_ary_or(ary1, ary2)
 
 /*
  *  call-seq:
- *     array.uniq! -> array or nil
+ *     array.uniq! => array or nil
  *  
  *  Removes duplicate elements from _self_.
  *  Returns <code>nil</code> if no changes are made (that is, no
@@ -2958,28 +2670,33 @@ static VALUE
 rb_ary_uniq_bang(ary)
     VALUE ary;
 {
-    VALUE hash, v, vv;
-    long i, j;
+    VALUE hash;
+    VALUE *p, *q, *end;
+
+    rb_ary_modify(ary); 
 
     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);
+    p = q = RARRAY(ary)->ptr;
+    end = p + RARRAY(ary)->len;
+    while (p < end) {
+	VALUE v = *p;
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
+	    *q++ = *p;
 	}
+	p++;
     }
-    RARRAY(ary)->len = j;
+    RARRAY(ary)->len = (q - RARRAY(ary)->ptr);
 
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.uniq   -> an_array
+ *     array.uniq   => an_array
  *  
  *  Returns a new array by removing duplicate values in <i>self</i>.
  *     
@@ -2997,12 +2714,11 @@ rb_ary_uniq(ary)
 }
 
 /* 
- *  call-seq:
- *     array.compact!    ->   array  or  nil
+ * call-seq:
+ *      array.compact!    =>   array  or  nil
  *
  *  Removes +nil+ elements from array.
- *  Returns +nil+ if no changes were made.
- *
+ *  Returns +niL+ if no changes were made.
  *     [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
  *     [ "a", "b", "c" ].compact!           #=> nil
  */
@@ -3030,13 +2746,13 @@ rb_ary_compact_bang(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.compact     ->  an_array
- *
- *  Returns a copy of _self_ with all +nil+ elements removed.
+/* 
+ * call-seq:
+ *    array.compact     =>  an_array
  *
- *     [ "a", nil, "b", nil, "c", nil ].compact
+ * Returns a copy of _self_ with all +nil+ elements removed.
+ *   
+ *      [ "a", nil, "b", nil, "c", nil ].compact
  *                       #=> [ "a", "b", "c" ]
  */
 
@@ -3054,7 +2770,6 @@ rb_ary_compact(ary)
  *     array.nitems -> int
  *  
  *  Returns the number of non-<code>nil</code> elements in _self_.
- *
  *  May be zero.
  *     
  *     [ 1, nil, 3, nil, 5 ].nitems   #=> 3
@@ -3067,692 +2782,107 @@ rb_ary_nitems(ary)
     long n = 0;
     VALUE *p, *pend;
 
-    for (p = RARRAY(ary)->ptr, pend = p + RARRAY(ary)->len; p < pend; p++) {
+    p = RARRAY(ary)->ptr;
+    pend = p + RARRAY(ary)->len;
+
+    while (p < pend) {
 	if (!NIL_P(*p)) n++;
+	p++;
     }
     return LONG2NUM(n);
 }
 
-/*
- *  call-seq:
- *     array.count      -> int
- *     array.count(obj) -> int
- *     array.count { |item| block }  -> int
- *  
- *  Returns the number of elements.  If an argument is given, counts
- *  the number of elements which equals to <i>obj</i>.  If a block is
- *  given, counts the number of elements yielding a true value.
- *
- *     ary = [1, 2, 4, 2]
- *     ary.count             # => 4
- *     ary.count(2)          # => 2
- *     ary.count{|x|x%2==0}  # => 3
- *
- */
-
-static VALUE
-rb_ary_count(argc, argv, ary)
-    int argc;
-    VALUE *argv;
+static long
+flatten(ary, idx, ary2, memo)
     VALUE ary;
+    long idx;
+    VALUE ary2, memo;
 {
-    long n = 0;
-
-    if (argc == 0) {
-	VALUE *p, *pend;
-
-	if (!rb_block_given_p())
-	    return LONG2NUM(RARRAY_LEN(ary));
-
-	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
-	    if (RTEST(rb_yield(*p))) n++;
-	}
-    }
-    else {
-	VALUE obj, *p, *pend;
+    VALUE id;
+    long i = idx;
+    long n, lim = idx + RARRAY(ary2)->len;
 
-	rb_scan_args(argc, argv, "1", &obj);
-	if (rb_block_given_p()) {
-	    rb_warn("given block not used");
-	}
-	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
-	    if (rb_equal(*p, obj)) n++;
-	}
+    id = rb_obj_id(ary2);
+    if (rb_ary_includes(memo, id)) {
+	rb_raise(rb_eArgError, "tried to flatten recursive array");
     }
-
-    return LONG2NUM(n);
-}
-
-static VALUE
-flatten(ary, level, modified)
-    VALUE ary;
-    int level;
-    int *modified;
-{
-    long i = 0;
-    VALUE stack, result, tmp, elt;
-    st_table *memo;
-    st_data_t id;
-
-    stack = ary_new(0, ARY_DEFAULT_SIZE);
-    result = ary_new(0, RARRAY_LEN(ary));
-    memo = st_init_numtable();
-    st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
-    *modified = 0;
-
-    while (1) {
-	while (i < RARRAY(ary)->len) {
-	    elt = RARRAY(ary)->ptr[i++];
-	    tmp = rb_check_array_type(elt);
-	    if (RBASIC(result)->klass) {
-		rb_raise(rb_eRuntimeError, "flatten reentered");
-	    }
-	    if (NIL_P(tmp) || (level >= 0 && RARRAY(stack)->len / 2 >= level)) {
-		rb_ary_push(result, elt);
-	    }
-	    else {
-		*modified = 1;
-		id = (st_data_t)tmp;
-		if (st_lookup(memo, id, 0)) {
-		    st_free_table(memo);
-		    rb_raise(rb_eArgError, "tried to flatten recursive array");
-		}
-		st_insert(memo, id, (st_data_t)Qtrue);
-		rb_ary_push(stack, ary);
-		rb_ary_push(stack, LONG2NUM(i));
-		ary = tmp;
-		i = 0;
-	    }
+    rb_ary_push(memo, id);
+    rb_ary_update(ary, idx, 1, ary2);
+    while (i < lim) {
+	if (TYPE(RARRAY(ary)->ptr[i]) == T_ARRAY) {
+	    n = flatten(ary, i, RARRAY(ary)->ptr[i], memo);
+	    i += n; lim += n;
 	}
-	if (RARRAY(stack)->len == 0) {
-	    break;
-	}
-	id = (st_data_t)ary;
-	st_delete(memo, &id, 0);
-	tmp = rb_ary_pop(stack);
-	i = NUM2LONG(tmp);
-	ary = rb_ary_pop(stack);
+	i++;
     }
+    rb_ary_pop(memo);
 
-    st_free_table(memo);
-
-    RBASIC(result)->klass = rb_class_of(ary);
-    return result;
+    return lim - idx - 1;	/* returns number of increased items */
 }
 
 /*
  *  call-seq:
- *     array.flatten! -> array or nil
- *     array.flatten!(level) -> array or nil
+ *     arr.flatten! -> arr or nil
  *  
  *  Flattens _self_ in place.
  *  Returns <code>nil</code> if no modifications were made (i.e.,
- *  <i>array</i> contains no subarrays.)  If the optional <i>level</i>
- *  argument determines the level of recursion to flatten.
+ *  <i>arr</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]
- *     a = [ 1, 2, [3, [4, 5] ] ]
- *     a.flatten!(1) #=> [1, 2, 3, [4, 5]]
  */
 
 static VALUE
-rb_ary_flatten_bang(argc, argv, ary)
-    int argc;
-    VALUE *argv;
+rb_ary_flatten_bang(ary)
     VALUE ary;
 {
-    int mod = 0, level = -1;
-    VALUE result, lv;
+    long i = 0;
+    int mod = 0;
+    VALUE memo = Qnil;
 
-    rb_scan_args(argc, argv, "01", &lv);
-    if (!NIL_P(lv)) level = NUM2INT(lv);
-    if (level == 0) return ary;
+    rb_ary_modify(ary);
+    while (i<RARRAY(ary)->len) {
+	VALUE ary2 = RARRAY(ary)->ptr[i];
 
-    result = flatten(ary, level, &mod);
+	if (TYPE(ary2) == T_ARRAY) {
+	    if (NIL_P(memo)) {
+		memo = rb_ary_new();
+	    }
+	    i += flatten(ary, i, ary2, memo);
+	    mod = 1;
+	}
+	i++;
+    }
     if (mod == 0) return Qnil;
-    rb_ary_replace(ary, result);
-
     return ary;
 }
 
 /*
  *  call-seq:
  *     array.flatten -> an_array
- *     array.flatten(level) -> 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.  If the optional
- *  <i>level</i> argument determines the level of recursion to flatten.
+ *  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]
- *     a = [ 1, 2, [3, [4, 5] ] ]
- *     a.flatten(1)              #=> [1, 2, 3, [4, 5]]
- */
-
-static VALUE
-rb_ary_flatten(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    int mod = 0, level = -1;
-    VALUE result, lv;
-
-    rb_scan_args(argc, argv, "01", &lv);
-    if (!NIL_P(lv)) level = NUM2INT(lv);
-    if (level == 0) return ary;
-
-    result = flatten(ary, level, &mod);
-    if (OBJ_TAINTED(ary)) OBJ_TAINT(result);
-
-    return result;
-}
-
-/*
- *  call-seq:
- *     array.shuffle!        -> array or nil
- *  
- *  Shuffles elements in _self_ in place.
+ *     a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10
  */
 
-
 static VALUE
-rb_ary_shuffle_bang(ary)
+rb_ary_flatten(ary)
     VALUE ary;
 {
-    long i = RARRAY(ary)->len;
-
-    rb_ary_modify(ary);
-    while (i) {
-	long j = rb_genrand_real()*i;
-	VALUE tmp = RARRAY(ary)->ptr[--i];
-	RARRAY(ary)->ptr[i] = RARRAY(ary)->ptr[j];
-	RARRAY(ary)->ptr[j] = tmp;
-    }
-    return ary;
-}
-
-
-/*
- *  call-seq:
- *     array.shuffle -> an_array
- *  
- *  Returns a new array with elements of this array shuffled.
- *     
- *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
- *     a.shuffle                 #=> [2, 3, 1]
- */
-
-static VALUE
-rb_ary_shuffle(VALUE ary)
-{
     ary = rb_ary_dup(ary);
-    rb_ary_shuffle_bang(ary);
+    rb_ary_flatten_bang(ary);
     return ary;
 }
 
 
-/*
- *  call-seq:
- *     array.choice        -> obj
- *  
- *  Choose a random element from an array.
- */
-
-
-static VALUE
-rb_ary_choice(ary)
-    VALUE ary;
-{
-    long i, j;
-
-    i = RARRAY(ary)->len;
-    if (i == 0) return Qnil;
-    j = rb_genrand_real()*i;
-    return RARRAY(ary)->ptr[j];
-}
-
-
-/*
- *  call-seq:
- *     ary.cycle {|obj| block }
- *     ary.cycle(n) {|obj| block }
- *  
- *  Calls <i>block</i> for each element repeatedly _n_ times or
- *  forever if none or nil is given.  If a non-positive number is
- *  given or the array is empty, does nothing.  Returns nil if the
- *  loop has finished without getting interrupted.
- *     
- *     a = ["a", "b", "c"]
- *     a.cycle {|x| puts x }  # print, a, b, c, a, b, c,.. forever.
- *     a.cycle(2) {|x| puts x }  # print, a, b, c, a, b, c.
- *     
- */
-
-static VALUE
-rb_ary_cycle(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    long n, i;
-    VALUE nv = Qnil;
-
-    rb_scan_args(argc, argv, "01", &nv);
-
-    RETURN_ENUMERATOR(ary, argc, argv);
-    if (NIL_P(nv)) {
-        n = -1;
-    }
-    else {
-        n = NUM2LONG(nv);
-        if (n <= 0) return Qnil;
-    }
-
-    while (RARRAY(ary)->len > 0 && (n < 0 || 0 < n--)) {
-        for (i=0; i<RARRAY(ary)->len; i++) {
-            rb_yield(RARRAY(ary)->ptr[i]);
-        }
-    }
-    return Qnil;
-}
-
-#define tmpbuf(n, size) rb_str_tmp_new((n)*(size))
-
-/*
- * Recursively compute permutations of r elements of the set [0..n-1].
- * When we have a complete permutation of array indexes, copy the values
- * at those indexes into a new array and yield that array. 
- *
- * n: the size of the set 
- * r: the number of elements in each permutation
- * p: the array (of size r) that we're filling in
- * index: what index we're filling in now
- * used: an array of booleans: whether a given index is already used
- * values: the Ruby array that holds the actual values to permute
- */
-static void
-permute0(n, r, p, index, used, values)
-    long n, r, *p, index;
-    int *used;
-    VALUE values;
-{
-    long i,j;
-    for (i = 0; i < n; i++) {
-	if (used[i] == 0) {
-	    p[index] = i;
-	    if (index < r-1) {             /* if not done yet */
-		used[i] = 1;               /* mark index used */
-		permute0(n, r, p, index+1, /* recurse */
-			 used, values);  
-		used[i] = 0;               /* index unused */
-	    }
-	    else {
-		/* We have a complete permutation of array indexes */
-		/* Build a ruby array of the corresponding values */
-		/* And yield it to the associated block */
-		VALUE result = rb_ary_new2(r);
-		VALUE *result_array = RARRAY(result)->ptr;
-		const VALUE *values_array = RARRAY(values)->ptr;
-
-		for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
-		RARRAY(result)->len = r;
-		rb_yield(result);
-	    }
-	}
-    }
-}
-
-/*
- *  call-seq:
- *     ary.permutation { |p| block }          -> array
- *     ary.permutation                        -> enumerator
- *     ary.permutation(n) { |p| block }       -> array
- *     ary.permutation(n)                     -> enumerator
- *  
- * When invoked with a block, yield all permutations of length <i>n</i>
- * of the elements of <i>ary</i>, then return the array itself.
- * If <i>n</i> is not specified, yield all permutations of all elements.
- * The implementation makes no guarantees about the order in which 
- * the permutations are yielded.
- *
- * When invoked without a block, return an enumerator object instead.
- * 
- * Examples:
- *
- *     a = [1, 2, 3]
- *     a.permutation.to_a     #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- *     a.permutation(1).to_a  #=> [[1],[2],[3]]
- *     a.permutation(2).to_a  #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
- *     a.permutation(3).to_a  #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- *     a.permutation(0).to_a  #=> [[]] # one permutation of length 0
- *     a.permutation(4).to_a  #=> []   # no permutations of length 4
- */
-
-static VALUE
-rb_ary_permutation(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    VALUE num;
-    long r, n, i;
-
-    n = RARRAY(ary)->len;                  /* Array length */
-    RETURN_ENUMERATOR(ary, argc, argv);   /* Return enumerator if no block */
-    rb_scan_args(argc, argv, "01", &num);
-    r = NIL_P(num) ? n : NUM2LONG(num);   /* Permutation size from argument */
-
-    if (r < 0 || n < r) { 
-	/* no permutations: yield nothing */
-    }
-    else if (r == 0) { /* exactly one permutation: the zero-length array */
-	rb_yield(rb_ary_new2(0));
-    }
-    else if (r == 1) { /* this is a special, easy case */
-	for (i = 0; i < RARRAY(ary)->len; i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY(ary)->ptr[i]));
-	}
-    }
-    else {             /* this is the general case */
-	volatile VALUE t0 = tmpbuf(n,sizeof(long));
-	long *p = (long*)RSTRING(t0)->ptr;
-	volatile VALUE t1 = tmpbuf(n,sizeof(int));
-	int *used = (int*)RSTRING(t1)->ptr;
-	VALUE ary0 = ary_make_shared(ary); /* private defensive copy of ary */
-
-	for (i = 0; i < n; i++) used[i] = 0; /* initialize array */
-
-	permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */
-	RB_GC_GUARD(t0);
-	RB_GC_GUARD(t1);
-    }
-    return ary;
-}
-
-static long
-combi_len(n, k)
-    long n, k;
-{
-    long i, val = 1;
-
-    if (k*2 > n) k = n-k;
-    if (k == 0) return 1;
-    if (k < 0) return 0;
-    val = 1;
-    for (i=1; i <= k; i++,n--) {
-	long m = val;
-	val *= n;
-	if (val < m) {
-	    rb_raise(rb_eRangeError, "too big for combination");
-	}
-	val /= i;
-    }
-    return val;
-}
-
-/*
- *  call-seq:
- *     ary.combination(n) { |c| block }    -> ary
- *     ary.combination(n)                  -> enumerator
- *  
- * When invoked with a block, yields all combinations of length <i>n</i> 
- * of elements from <i>ary</i> and then returns <i>ary</i> itself.
- * The implementation makes no guarantees about the order in which 
- * the combinations are yielded.
- *
- * When invoked without a block, returns an enumerator object instead.
- *     
- * Examples:
- *
- *     a = [1, 2, 3, 4]
- *     a.combination(1).to_a  #=> [[1],[2],[3],[4]]
- *     a.combination(2).to_a  #=> [[1,2],[1,3],[1,4],[2,3],[2,4],[3,4]]
- *     a.combination(3).to_a  #=> [[1,2,3],[1,2,4],[1,3,4],[2,3,4]]
- *     a.combination(4).to_a  #=> [[1,2,3,4]]
- *     a.combination(0).to_a  #=> [[]] # one combination of length 0
- *     a.combination(5).to_a  #=> []   # no combinations of length 5
- *     
- */
-
-static VALUE
-rb_ary_combination(ary, num)
-    VALUE ary;
-    VALUE num;
-{
-    long n, i, len;
-
-    n = NUM2LONG(num);
-    RETURN_ENUMERATOR(ary, 1, &num);
-    len = RARRAY(ary)->len;
-    if (n < 0 || len < n) {
-	/* yield nothing */
-    }
-    else if (n == 0) {
-	rb_yield(rb_ary_new2(0));
-    }
-    else if (n == 1) {
-	for (i = 0; i < len; i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY(ary)->ptr[i]));
-	}
-    }
-    else {
-	volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
-	long *stack = (long*)RSTRING(t0)->ptr;
-	long nlen = combi_len(len, n);
-	volatile VALUE cc = rb_ary_new2(n);
-	VALUE *chosen = RARRAY(cc)->ptr;
-	long lev = 0;
-
-	RBASIC(cc)->klass = 0;
-	MEMZERO(stack, long, n);
-	stack[0] = -1;
-	for (i = 0; i < nlen; i++) {
-	    chosen[lev] = RARRAY(ary)->ptr[stack[lev+1]];
-	    for (lev++; lev < n; lev++) {
-		chosen[lev] = RARRAY(ary)->ptr[stack[lev+1] = stack[lev]+1];
-	    }
-	    rb_yield(rb_ary_new4(n, chosen));
-	    do {
-		stack[lev--]++;
-	    } while (lev && (stack[lev+1]+n == len+lev+1));
-	}
-    }
-    return ary;
-}
-
-/*
- *  call-seq:
- *     ary.product(other_ary, ...)
- *  
- *  Returns an array of all combinations of elements from all arrays.
- *  The length of the returned array is the product of the length
- *  of ary and the argument arrays
- *     
- *     [1,2,3].product([4,5])     # => [[1,4],[1,5],[2,4],[2,5],[3,4],[3,5]]
- *     [1,2].product([1,2])       # => [[1,1],[1,2],[2,1],[2,2]]
- *     [1,2].product([3,4],[5,6]) # => [[1,3,5],[1,3,6],[1,4,5],[1,4,6],
- *                                #     [2,3,5],[2,3,6],[2,4,5],[2,4,6]]
- *     [1,2].product()            # => [[1],[2]]
- *     [1,2].product([])          # => []
- */
-
-static VALUE
-rb_ary_product(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    int n = argc+1;    /* How many arrays we're operating on */
-    volatile VALUE t0 = tmpbuf(n, sizeof(VALUE));
-    volatile VALUE t1 = tmpbuf(n, sizeof(int));
-    VALUE *arrays = (VALUE*)RSTRING(t0)->ptr; /* The arrays we're computing the product of */
-    int *counters = (int*)RSTRING(t1)->ptr; /* The current position in each one */
-    VALUE result;      /* The array we'll be returning */
-    long i,j;
-    long resultlen = 1;
-
-    RBASIC(t0)->klass = 0;
-    RBASIC(t1)->klass = 0;
-
-    /* initialize the arrays of arrays */
-    arrays[0] = ary;
-    for (i = 1; i < n; i++) arrays[i] = to_ary(argv[i-1]);
-    
-    /* initialize the counters for the arrays */
-    for (i = 0; i < n; i++) counters[i] = 0;
-
-    /* Compute the length of the result array; return [] if any is empty */
-    for (i = 0; i < n; i++) {
-	long k = RARRAY(arrays[i])->len, l = resultlen;
-	if (k == 0) return rb_ary_new2(0);
-	resultlen *= k;
-	if (resultlen < k || resultlen < l || resultlen / k != l) {
-	    rb_raise(rb_eRangeError, "too big to product");
-	}
-    }
-
-    /* Otherwise, allocate and fill in an array of results */
-    result = rb_ary_new2(resultlen);
-    for (i = 0; i < resultlen; i++) {
-	int m;
-	/* fill in one subarray */
-	VALUE subarray = rb_ary_new2(n);
-	for (j = 0; j < n; j++) {
-	    rb_ary_push(subarray, rb_ary_entry(arrays[j], counters[j]));
-	}
-
-	/* put it on the result array */
-	rb_ary_push(result, subarray);
-
-	/*
-	 * Increment the last counter.  If it overflows, reset to 0
-	 * and increment the one before it.
-	 */
-	m = n-1;
-	counters[m]++;
-	while (m > 0 && counters[m] == RARRAY(arrays[m])->len) {
-	    counters[m] = 0;
-	    m--;
-	    counters[m]++;
-	}
-    }
-
-    return result;
-}
-
-/*
- *  call-seq:
- *     ary.take(n)               => array
- *  
- *  Returns first n elements from <i>ary</i>.
- *     
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.take(3)             # => [1, 2, 3]
- *     
- */
-
-static VALUE
-rb_ary_take(obj, n)
-    VALUE obj;
-    VALUE n;
-{
-    long len = NUM2LONG(n);
-    if (len < 0) {
-	rb_raise(rb_eArgError, "attempt to take negative size");
-    }
-
-    return rb_ary_subseq(obj, 0, len);
-}
-
-/*
- *  call-seq:
- *     ary.take_while {|arr| block }   => array
- *  
- *  Passes elements to the block until the block returns nil or false,
- *  then stops iterating and returns an array of all prior elements.
- *     
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.take_while {|i| i < 3 }   # => [1, 2]
- *     
- */
-
-static VALUE
-rb_ary_take_while(ary)
-    VALUE ary;
-{
-    long i;
-
-    RETURN_ENUMERATOR(ary, 0, 0);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	if (!RTEST(rb_yield(RARRAY(ary)->ptr[i]))) break;
-    }
-    return rb_ary_take(ary, LONG2FIX(i));
-}
-
-/*
- *  call-seq:
- *     ary.drop(n)               => array
- *  
- *  Drops first n elements from <i>ary</i>, and returns rest elements
- *  in an array.
- *     
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.drop(3)             # => [4, 5, 0]
- *     
- */
-
-static VALUE
-rb_ary_drop(ary, n)
-    VALUE ary;
-    VALUE n;
-{
-    VALUE result;
-    long pos = NUM2LONG(n);
-    if (pos < 0) {
-	rb_raise(rb_eArgError, "attempt to drop negative size");
-    }
-
-    result = rb_ary_subseq(ary, pos, RARRAY(ary)->len);
-    if (result == Qnil) result = rb_ary_new();
-    return result;
-}
-
-/*
- *  call-seq:
- *     ary.drop_while {|arr| block }   => array
- *  
- *  Drops elements up to, but not including, the first element for
- *  which the block returns nil or false and returns an array
- *  containing the remaining elements.
- *     
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.drop_while {|i| i < 3 }   # => [3, 4, 5, 0]
- *     
- */
-
-static VALUE
-rb_ary_drop_while(ary)
-    VALUE ary;
-{
-    long i;
-
-    RETURN_ENUMERATOR(ary, 0, 0);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	if (!RTEST(rb_yield(RARRAY(ary)->ptr[i]))) break;
-    }
-    return rb_ary_drop(ary, LONG2FIX(i));
-}
-
-
-
 /* 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 
@@ -3790,8 +2920,8 @@ Init_Array()
     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_m, -1);
-    rb_define_method(rb_cArray, "shift", rb_ary_shift_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);
@@ -3800,9 +2930,8 @@ Init_Array()
     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, "find_index", rb_ary_index, -1);
-    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, "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);
@@ -3814,7 +2943,7 @@ Init_Array()
     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, "select", rb_ary_select, -1);
     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);
@@ -3846,22 +2975,9 @@ Init_Array()
     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, -1);
-    rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, -1);
+    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);
-    rb_define_method(rb_cArray, "count", rb_ary_count, -1);
-    rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, 0);
-    rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, 0);
-    rb_define_method(rb_cArray, "choice", rb_ary_choice, 0);
-    rb_define_method(rb_cArray, "cycle", rb_ary_cycle, -1);
-    rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1);
-    rb_define_method(rb_cArray, "combination", rb_ary_combination, 1);
-    rb_define_method(rb_cArray, "product", rb_ary_product, -1);
-
-    rb_define_method(rb_cArray, "take", rb_ary_take, 1);
-    rb_define_method(rb_cArray, "take_while", rb_ary_take_while, 0);
-    rb_define_method(rb_cArray, "drop", rb_ary_drop, 1);
-    rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
 
     id_cmp = rb_intern("<=>");
     inspect_key = rb_intern("__inspect_key__");
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 713b5c69df..537dc14e94 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -1,15 +1,10 @@
 # -*- makefile -*-
 
 SHELL = $(COMSPEC)
-MKFILES = Makefile
 
 #### Start of system configuration section. ####
-!ifndef OS
 OS = bccwin32
-!endif
-!if !defined(RT)
-!error RT not defined.  Retry from configure pass.
-!endif
+RT = $(OS)
 
 ## variables may be overridden by $(compile_dir)/Makefile
 !ifndef srcdir
@@ -61,7 +56,6 @@ AR = tlib
 
 PURIFY =
 AUTOCONF = autoconf
-RM = $(srcdir:/=\)\win32\rm.bat
 
 !if !defined(PROCESSOR_ARCHITECTURE)
 PROCESSOR_ARCHITECTURE = x86
@@ -97,28 +91,14 @@ exec_prefix = $(prefix)
 !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
+!ifndef DESTDIR
+DESTDIR = $(prefix)
 !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
+CFLAGS = -q $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w-
+!endif
+!ifndef CPPFLAGS
+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)missing
 !endif
 !ifndef LDFLAGS
 LDFLAGS = -S:$(STACK)
@@ -129,19 +109,16 @@ RFLAGS = $(iconinc)
 !ifndef EXTLIBS
 EXTLIBS =
 !endif
-!ifndef MEMLIB
-MEMLIB =
-!endif
-LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
+LIBS = cw32.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
+XCFLAGS = -DRUBY_EXPORT
 
-ARFLAGS = /a /p32
+ARFLAGS = /a
 LD = ilink32 -q -Gn
 LDSHARED  = $(LD)
 XLDFLAGS  = -Tpe c0x32.obj
@@ -157,8 +134,7 @@ EXEEXT = .exe
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
 RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
-RUNRUBY = .\$(PROGRAM) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+MINIRUBY = .\miniruby$(EXEEXT)
 
 ORGLIBPATH = $(LIB)
 
@@ -169,147 +145,160 @@ 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
+!ifndef EXTOBJS
+EXTOBJS       = dmyext.obj
+!endif
+
+MAINOBJ       = main.obj
+WINMAINOBJ    = winmain.obj
+
+OBJS          = array.obj \
+		bignum.obj \
+		class.obj \
+		compar.obj \
+		dir.obj \
+		dln.obj \
+		enum.obj \
+		error.obj \
+		eval.obj \
+		file.obj \
+		gc.obj \
+		hash.obj \
+		inits.obj \
+		io.obj \
+		marshal.obj \
+		math.obj \
+		numeric.obj \
+		object.obj \
+		pack.obj \
+		parse.obj \
+		prec.obj \
+		process.obj \
+		random.obj \
+		range.obj \
+		re.obj \
+		regex.obj \
+		ruby.obj \
+		signal.obj \
+		sprintf.obj \
+		st.obj \
+		string.obj \
+		struct.obj \
+		time.obj \
+		util.obj \
+		variable.obj \
+		version.obj \
+		$(MISSING)
+
+SCRIPT_ARGS   =	"--dest-dir=$(DESTDIR)" \
+		"--make=$(MAKE)" \
+		"--mflags=$(MFLAGS)" \
+		"--make-flags=$(MAKEFLAGS)"
+
+all:		miniruby$(EXEEXT) rbconfig.rb \
+		$(LIBRUBY) $(MISCLIBS)
+		.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb --extstatic=$(EXTSTATIC) $(SCRIPT_ARGS)
 
 ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
+lib: $(LIBRUBY)
+dll: $(LIBRUBY_SO)
 
-!include $(srcdir)/common.mk
-
-$(MKFILES): $(srcdir)/bcc32/Makefile.sub $(srcdir)/bcc32/configure.bat $(srcdir)/bcc32/setup.mak
-	$(COMSPEC) /C $(srcdir:/=\)\bcc32\configure.bat $(configure_args)
-	@echo $(MKFILES) should be updated, re-run $(MAKE).
-	@$(MAKE) > nul -q -f &&|
-PHONY: nul
-	@exit
-|
-
-CONFIG_H = ./.config.h.time
-
-config: config.status
+config: config.h 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
+config.h:
+	@echo Creating $(@:.\=)
+	@type > $@ &&|
 \#define HAVE_PROTOTYPES 1
-\#define TOKEN_PASTE(x,y) x\#\#y
 \#define HAVE_STDARG_PROTOTYPES 1
+/* \#define HAVE_ATTR_NORETURN 1 */
 \#define NORETURN(x) x
-\#define RUBY_EXTERN extern __declspec(dllimport)
-\#define HAVE_DECL_SYS_NERR 1
+\#define TOKEN_PASTE(x,y) x\#\#y
+\#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_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_MEMORY_H 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 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_VSNPRINTF 1
-\#define HAVE_ISNAN 1
-\#define HAVE_FINITE 1
-\#define HAVE_HYPOT 1
+\#define vfork fork
 \#define HAVE_FMOD 1
+/* \#define HAVE_RANDOM 1    */
 \#define HAVE_WAITPID 1
-\#define HAVE_FSYNC 1
 \#define HAVE_GETCWD 1
+\#define HAVE_FSYNC 1
+/* \#define HAVE_TRUNCATE 1  */
 \#define HAVE_CHSIZE 1
 \#define HAVE_TIMES 1
-\#define HAVE_FCNTL 1
-\#define HAVE_LINK 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 HAVE_COSH 1
 \#define HAVE_SINH 1
 \#define HAVE_TANH 1
-\#define RSHIFT(x,y) ((x)>>(int)y)
+
+\#define NEED_IO_SEEK_BETWEEN_RW 1
+\#define RSHIFT(x,y) ((x)>>y)
 \#define FILE_COUNT level
 \#define FILE_READPTR curp
-\#define RUBY_SETJMP(env) _setjmp(env)
-\#define RUBY_LONGJMP(env,val) longjmp(env,val)
-\#define RUBY_JMP_BUF jmp_buf
-\#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_VENDOR_LIB "/lib/ruby/vendor_ruby"
-\#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_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)"
-\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+
+\#define SIZEOF_INT     4
+\#define SIZEOF_SHORT   2
+\#define SIZEOF_LONG    4
+\#define SIZEOF___INT64 8
+\#define SIZEOF_VOIDP   4
+\#define SIZEOF_FLOAT   4
+\#define SIZEOF_DOUBLE  8
+
+\#define HAVE_DECL_SYS_NERR 1
+\#define HAVE_ISNAN         1
+\#define HAVE_FINITE        1
+\#define HAVE_MEMMOVE       1
+\#define HAVE_MKDIR         1
+\#define HAVE_STRCASECMP    1
+\#define HAVE_STRNCASECMP   1
+\#define HAVE_STRCHR        1
+\#define HAVE_STRERROR      1
+\#define HAVE_STRFTIME      1
+\#define HAVE_STRSTR        1
+\#define HAVE_STRTOD        1
+\#define HAVE_STRTOUL       1
+\#define HAVE_GETCWD        1
 |
-	@exit > $@
 
-config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
+config.status: Makefile $(srcdir)bcc32/Makefile.sub
 	@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
@@ -353,8 +342,7 @@ s,@RANLIB@,,;t t
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS) ,;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
-s,@CP@,copy > nul,;t t
+s,@SET_MAKE@,$(SET_MAKE),;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
@@ -368,16 +356,12 @@ 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@,,;t t
 s,@LIBRUBY_LDSHARED@,$$(LDSHARED),;t t
 s,@LIBRUBY_DLDFLAGS@,-Gi $$(DLDFLAGS),;t t
 s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
@@ -394,34 +378,32 @@ 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,@OUTFLAG@,-o,;t t
 s,@CPPOUTFILE@,,;t t
-s,@LIBPATHFLAG@, -L"%s",;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 WIN32,;t t
+s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$@, nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t
+s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
+s,@COMPILE_CXX@,$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
+s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: .%s.%s:,;t t
+s,@COMMON_LIBS@,m,;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,@vendordir@,$${prefix}/lib/ruby/vendor_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):
+miniruby$(EXEEXT):	$(LIBRUBY_A) $(MAINOBJ) dmyext.obj
 		@echo $(LIBS)
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS),$@,nul,$(LIBRUBY_A) $(LIBS)
+		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) dmyext.obj,$@,nul,$(LIBRUBY_A) $(LIBS)
 
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
@@ -429,121 +411,187 @@ $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(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)
+$(LIBRUBY_A):	$(OBJS) dmyext.obj
 		@-if exist $@ del $@
-		$(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
+		$(AR) $(ARFLAGS) "$@" $(OBJS) dmyext.obj
 
 # $(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)
+$(LIBRUBY_SO) $(LIBRUBY): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
+		@echo $(EXTOBJS)
+		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
+
+$(RUBYDEF):	$(LIBRUBY_A) miniruby$(EXEEXT)
+		$(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ $(LIBRUBY_A)
+
+install:	rbconfig.rb
+		$(MINIRUBY) $(srcdir)instruby.rb $(SCRIPT_ARGS)
+		$(MINIRUBY) $(srcdir)ext/extmk.rb $(SCRIPT_ARGS) install
+
+what-where no-install:	rbconfig.rb
+		$(MINIRUBY) $(srcdir)instruby.rb -n $(SCRIPT_ARGS)
+		$(MINIRUBY) $(srcdir)ext/extmk.rb -n $(SCRIPT_ARGS) install
+
+clean:		clean-ext clean-local
+
+clean-local:
+		@if exist $(LIBRUBY_A) del $(LIBRUBY_A)
+		@if exist $(MAINOBJ) del $(MAINOBJ)
+		@if exist rbconfig.rb del rbconfig.rb
+		@if exist ext\extinit.c del ext\extinit.c
+		@if exist ext\extinit.obj del ext\extinit.obj
+		@if exist ext\vc*.pdb del ext\vc*.pdb
+		@if exist *.obj del *.obj
+		@if exist *.res del *.res
+		@if exist *.tds del *.tds
+		@if exist *.il? del *.il?
+
+clean-ext:
+		@-$(MINIRUBY) $(srcdir)ext/extmk.rb $(SCRIPT_ARGS) clean
+
+distclean:	distclean-ext distclean-local
+
+distclean-local:	clean-local
+		@if exist Makefile del Makefile
+		@if exist config.h del config.h
+		@if exist ext\config.cache del ext\config.cache
+		@if exist config.cache del config.cache
+		@if exist config.log del config.log
+		@if exist config.status del config.status
+		@if exist *~ del *~
+		@if exist *.bak del *.bak
+		@if exist *.stackdump del *.stackdump
+		@if exist *.core del *.core
+		@if exist gmon.out del gmon.out
+		@if exist y.tab.c del y.tab.c
+		@if exist y.output del y.output
+		@if exist *.map del *.map
+		@if exist *.pdb del *.pdb
+		@if exist *.ilk del *.ilk
+		@if exist *.exp del *.exp
+		@if exist $(RUBYDEF) del $(RUBYDEF)
+		@if exist $(RUBY_INSTALL_NAME).rc del $(RUBY_INSTALL_NAME).rc
+		@if exist $(RUBYW_INSTALL_NAME).rc del $(RUBYW_INSTALL_NAME).rc
+		@if exist $(RUBY_SO_NAME).rc del $(RUBY_SO_NAME).rc
+		@if exist $(PROGRAM) del $(PROGRAM)
+		@if exist $(WPROGRAM) del $(WPROGRAM)
+		@if exist $(LIBRUBY_SO) del $(LIBRUBY_SO)
+		@if exist $(LIBRUBY) del $(LIBRUBY)
+		@if exist ext\nul if not exist ext\* rmdir ext
+		@if exist miniruby$(EXEEXT) del miniruby$(EXEEXT)
+
+distclean-ext:
+		@-$(MINIRUBY) $(srcdir)ext/extmk.rb $(SCRIPT_ARGS) distclean
+
+realclean:	distclean
+		@if exist parse.c del parse.c
+		@if exist lex.c del lex.c
+
+test:		miniruby$(EXEEXT) NUL
+		@$(MINIRUBY) $(srcdir)rubytest.rb
+
+rbconfig.rb:	miniruby$(EXEEXT) config.status
+		@$(MINIRUBY) $(srcdir)mkconfig.rb -srcdir=$(srcdir) \
+			-install_name=$(RUBY_INSTALL_NAME) \
+			-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
 $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
-		@$(MINIRUBY) $(srcdir)/win32/resource.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) $(WINMAINOBJ) 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
-		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
-
-distclean-local::
-		@$(RM) ext\config.cache $(RBCONFIG:/=\)
-		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
-
-update-rubyspec:
-	@echo SPEC_EXISTS=0 > $@.mk
-	@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
-	@type >> $@.mk &&|
-$()update-rubyspec:
-$()	@del $@.mk
-$()!if $$(SPEC_EXISTS)
-$()	cd $(srcdir:/=\)\rubyspec\mspec
-$()	git pull
-$()	cd ..\spec\rubyspec
-$()	git pull
-$()!else
-$()	git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec
-$()	git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec
-$()!endif
-|
-	@$(MAKE) -$(MAKEFLAGS)$(MFLAGS) -f $@.mk
-
-test-rubyspec:
-	@echo SPEC_EXISTS=0 > $@.mk
-	@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
-	@type >> $@.mk &&|
-$()test-rubyspec:
-$()!if $$(SPEC_EXISTS)
-$()	$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
-$()!else
-$()	@echo No rubyspec here.  put rubyspec to srcdir first.
-$()	@cd $(srcdir:/=\)\rubyspec
-$()!endif
-|
-	@$(MAKE) -$(MAKEFLAGS) -f $@.mk
+			. $(icondirs) $(srcdir)win32
+
+#config.status:	$(srcdir)configure
+#		$(SHELL) .config.status --recheck
+
+.path.c = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
+.path.h = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
+.path.y = $(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
+
+parse.c: parse.y
 
 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
+acosh.obj: acosh.c win32.h
+alloca.obj: alloca.c win32.h
+crypt.obj: crypt.c win32.h
+dup2.obj: dup2.c win32.h
+erf.obj: erf.c win32.h
+finite.obj: finite.c win32.h
+flock.obj: flock.c win32.h
+memcmp.obj: memcmp.c win32.h
+memmove.obj: memmove.c win32.h
+mkdir.obj: mkdir.c win32.h
+vsnprintf.obj: vsnprintf.c win32.h
+strcasecmp.obj: strcasecmp.c win32.h
+strncasecmp.obj: strncasecmp.c win32.h
+strchr.obj: strchr.c win32.h
+strdup.obj: strdup.c win32.h
+strerror.obj: strerror.c win32.h
+strftime.obj: strftime.c win32.h
+strstr.obj: strstr.c win32.h
+strtod.obj: strtod.c win32.h
+strtol.obj: strtol.c win32.h
+strtoul.obj: strtoul.c win32.h
+nt.obj: nt.c win32.h
+x68.obj: x68.c win32.h
+os2.obj: os2.c win32.h
+dl_os2.obj: dl_os2.c win32.h
+
+# when I use -I., there is confliction at "OpenFile" 
+# so, set . into environment varible "include"
+win32.obj: win32.c win32.h
+
+###
+array.obj: array.c ruby.h config.h defines.h intern.h missing.h util.h st.h win32.h
+bignum.obj: bignum.c ruby.h config.h defines.h intern.h missing.h win32.h
+class.obj: class.c ruby.h config.h defines.h intern.h missing.h rubysig.h node.h st.h win32.h
+compar.obj: compar.c ruby.h config.h defines.h intern.h missing.h win32.h
+dir.obj: dir.c ruby.h config.h defines.h intern.h missing.h util.h win32.h
+dln.obj: dln.c ruby.h config.h defines.h intern.h missing.h dln.h win32.h
+dmyext.obj: dmyext.c
+enum.obj: enum.c ruby.h config.h defines.h intern.h missing.h node.h util.h win32.h
+error.obj: error.c ruby.h config.h defines.h intern.h missing.h env.h version.h st.h win32.h
+eval.obj: eval.c ruby.h config.h defines.h intern.h missing.h node.h env.h util.h rubysig.h st.h dln.h win32.h
+file.obj: file.c ruby.h config.h defines.h intern.h missing.h rubyio.h rubysig.h util.h dln.h win32.h
+gc.obj: gc.c ruby.h config.h defines.h intern.h missing.h rubysig.h st.h node.h env.h re.h regex.h win32.h
+hash.obj: hash.c ruby.h config.h defines.h intern.h missing.h st.h util.h rubysig.h win32.h
+inits.obj: inits.c ruby.h config.h defines.h intern.h missing.h win32.h
+io.obj: io.c ruby.h config.h defines.h intern.h missing.h rubyio.h rubysig.h env.h util.h win32.h
+main.obj: main.c ruby.h config.h defines.h intern.h missing.h win32.h
+marshal.obj: marshal.c ruby.h config.h defines.h intern.h missing.h rubyio.h st.h util.h win32.h
+math.obj: math.c ruby.h config.h defines.h intern.h missing.h win32.h
+numeric.obj: numeric.c ruby.h config.h defines.h intern.h missing.h win32.h
+object.obj: object.c ruby.h config.h defines.h intern.h missing.h st.h util.h win32.h
+pack.obj: pack.c ruby.h config.h defines.h intern.h missing.h win32.h
+parse.obj: parse.c ruby.h config.h defines.h intern.h missing.h env.h node.h st.h regex.h util.h lex.c win32.h
+prec.obj: prec.c ruby.h config.h defines.h intern.h missing.h win32.h
+process.obj: process.c ruby.h config.h defines.h intern.h missing.h rubysig.h st.h win32.h
+random.obj: random.c ruby.h config.h defines.h intern.h missing.h win32.h
+range.obj: range.c ruby.h config.h defines.h intern.h missing.h win32.h
+re.obj: re.c ruby.h config.h defines.h intern.h missing.h re.h regex.h win32.h
+regex.obj: regex.c config.h regex.h win32.h
+ruby.obj: ruby.c ruby.h config.h defines.h intern.h missing.h dln.h node.h util.h win32.h
+signal.obj: signal.c ruby.h config.h defines.h intern.h missing.h rubysig.h win32.h
+sprintf.obj: sprintf.c ruby.h config.h defines.h intern.h missing.h win32.h
+st.obj: st.c config.h st.h
+string.obj: string.c ruby.h config.h defines.h intern.h missing.h re.h regex.h version.h win32.h
+struct.obj: struct.c ruby.h config.h defines.h intern.h missing.h win32.h
+time.obj: time.c ruby.h config.h defines.h intern.h missing.h win32.h
+util.obj: util.c ruby.h config.h defines.h intern.h missing.h util.h win32.h
+variable.obj: variable.c ruby.h config.h defines.h intern.h missing.h env.h node.h st.h util.h win32.h
+version.obj: version.c ruby.h config.h defines.h intern.h missing.h version.h win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
index c27a1261f1..a699d34a4e 100644
--- a/bcc32/README.bcc32
+++ b/bcc32/README.bcc32
@@ -6,26 +6,18 @@
 
 (1) Borland C++ 5.0 or later.
 
-(2) Please set environment variable (({PATH}))
+(2) If you want to run `((%make clean%))' or `((%make distclean%))'
+    properly, you must install UNIX compatible `((%rm%))' command on
+    your ((|PATH|)).
+
+(3) Please set environment variable (({INCLUDE})), (({LIB})), (({PATH}))
     to run required commands properly from the command line.
 
     Note: building ruby requires following commands.
      * make
-     * bcc32
+     * bcc
      * 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
+     * ilink
 
 == How to compile and install
 
@@ -56,10 +48,6 @@
     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
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 95575cbc60..449b6e25b5 100755..100644
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -6,147 +6,27 @@
 echo> ~tmp~.mak ####

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

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

-echo>> ~tmp~.mak 	@del ~setup~.mak

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

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

-if exist pathlist.tmp del pathlist.tmp

-if exist confargs.mk del confargs.mk

+echo>> ~tmp~.mak 	bcc32dir="$(@D)" \

 :loop

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

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

-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" == "RUBY_SUFFIX" goto :suffix

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

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

-if "%1" == "RUBY_INSTALL_NAME" goto :installname

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

-if "%1" == "RUBY_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" == "EXTOUT" goto :extout

-if "%1" == "--path" goto :path

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

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

-  echo>>confargs.tmp 	%1 \

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

   shift

 goto :loop

 :srcdir

-  echo>> ~tmp~.mak 	-Dsrcdir=%2 \

-  echo>>confargs.tmp 	--srcdir=%2 \

-  shift

-  shift

-goto :loop

-:prefix

-  echo>> ~tmp~.mak 	-Dprefix=%2 \

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:suffix

-  echo>>confargs.mk !ifndef RUBY_SUFFIX

-  echo>>confargs.mk RUBY_SUFFIX = %2

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:installname

-  echo>>confargs.mk !ifndef RUBY_INSTALL_NAME

-  echo>>confargs.mk RUBY_INSTALL_NAME = %2

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:soname

-  echo>>confargs.mk !ifndef RUBY_SO_NAME

-  echo>>confargs.mk RUBY_SO_NAME = %2

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1=%2 \

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

   shift

   shift

 goto :loop

 :target

-  echo>> ~tmp~.mak 	%2 \

-  echo>>confargs.tmp 	--target=%2 \

-  shift

-  shift

-goto :loop

-:extstatic

-  echo>>confargs.mk !ifndef EXTSTATIC

-  echo>>confargs.mk EXTSTATIC = static

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1 \

-  shift

-goto :loop

-:enable-rdoc

-  echo>>confargs.mk !ifndef RDOCTARGET

-  echo>>confargs.mk RDOCTARGET = install-doc

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1 \

-  shift

-goto :loop

-:disable-rdoc

-  echo>>confargs.mk !ifndef RDOCTARGET

-  echo>>confargs.mk RDOCTARGET = install-nodoc

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1 \

-  shift

-goto :loop

-:extout

-  echo>>confargs.mk !ifndef EXTOUT

-  echo>>confargs.mk EXTOUT = %2

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:path

-  echo>>pathlist.tmp %2;\

-  echo>>confargs.tmp 	%1=%2 \

+  echo>> ~tmp~.mak 	%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   --disable-install-doc   install rdoc indexes during install

-  del *.tmp

-  del ~tmp~.mak

-goto :exit

 :end

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

-if not exist confargs.tmp goto :noconfargs

-    echo>>confargs.mk configure_args = \

-    type>>confargs.mk confargs.tmp

-    echo.>>confargs.mk

-    echo>>confargs.mk ####

-:noconfargs

-if not exist pathlist.tmp goto :nopathlist

-    echo>>confargs.mk pathlist = \

-    type>>confargs.mk pathlist.tmp

-    echo.>>confargs.mk

-    echo>>confargs.mk ####

-    echo>>confargs.mk PATH = $(pathlist:;=/bin;)$(PATH)

-    echo>>confargs.mk INCLUDE = $(pathlist:;=/include;)

-    echo>>confargs.mk LIB = $(pathlist:;=/lib;)

-:nopathlist

-if exist confargs.mk copy confargs.mk ~setup~.mak > nul

-type>>~setup~.mak ~tmp~.mak

-del *.tmp > nul

-del ~tmp~.mak > nul

-make -s -f ~setup~.mak

-:exit

+make -s -f ~tmp~.mak

diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
index dc523e2541..e34b441e2f 100755..100644
--- a/bcc32/mkexports.rb
+++ b/bcc32/mkexports.rb
@@ -1,7 +1,5 @@
 #!./miniruby -s
 
-$name = $library = $description = nil
-
 SYM = {}
 STDIN.reopen(open("nul"))
 ARGV.each do |obj|
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 483292ed51..c81eaf2020 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -1,20 +1,18 @@
 # -*- makefile -*-
 
 !if "$(srcdir)" != ""
-bcc32dir = $(srcdir)/bcc32
+bcc32dir = $(srcdir)bcc32/
 !elseif "$(bcc32dir)" == "bcc32/"
-srcdir = .
+srcdir = ./
 !elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)"
-srcdir = $(bcc32dir:/bcc32/=)
+srcdir = $(bcc32dir:/bcc32/=/)
 !else
-srcdir = $(bcc32dir)/..
-!endif
-!ifndef prefix
-prefix = /usr
+srcdir = $(bcc32dir)../
 !endif
+
 OS = bccwin32
 RT = $(OS)
-BANG = !
+INCLUDE = !include
 APPEND = echo>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
@@ -30,134 +28,62 @@ i586-$(OS): -prologue- -i586- -epilogue-
 i686-$(OS): -prologue- -i686- -epilogue-
 alpha-$(OS): -prologue- -alpha- -epilogue-
 
--prologue-: -basic-vars- -version- -system-vars-
-
--basic-vars-: nul
+-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
 |
-!if exist(confargs.mk)
-	@type confargs.mk >> $(MAKEFILE)
-	@del confargs.mk
-!endif
-
--system-vars-: -runtime- -bormm-
-
--bormm-: nul
-	@-ilink32 -q -Gn -x usebormm.lib > nul
-	@-if exist usebormm.tds $(APPEND) MEMLIB = usebormm.lib
-	@if exist usebormm.* del usebormm.*
-
--osname-: nul
-	@echo OS =  >>$(MAKEFILE)
-
--runtime-: nul
-	type > conftest.c &&|
-\#include <stdio.h>
-int main(){printf("");return 0;}
-|
-	bcc32 conftest.c cw32i.lib > nul
-	tdump conftest.exe < nul > conftest.i
-	grep "^Imports from CC" conftest.i > conftest.c
-	cpp32 -P- -DFile=\# -DImports=RTNAME -Dfrom== conftest.c > nul
-	$(MAKE) > nul -DBANG=$(BANG) -f &&|
--runtime-: nul
-$(BANG)include conftest.i
-RT = $$(RTNAME:.DLL=)
-OS = $$(RT:CC32=)
--runtime-:
-	del conftest.*
-$(BANG)if "$$(OS)" == "50"
-	echo OS = bccwin32 >> $(MAKEFILE)
-$(BANG)else
-	echo OS = bccwin32_$$(OS) >> $(MAKEFILE)
-$(BANG)endif
-|
-	@echo RT = $$(OS) >> $(MAKEFILE)
-
--version-: nul
 	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
 \#include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR
 TEENY = RUBY_VERSION_TEENY
-
-BORLANDC = __BORLANDC__
 |
-	@$(MAKE) > nul -DBANG=$(BANG) -f &&,
--version-: nul
-$(BANG)include $(MAKEFILE)
-$(BANG)include $(MAKEFILE).i
--version-:
+	@type $(MAKEFILE).i >> $(MAKEFILE)
 	@del $(MAKEFILE).i
-	@type >> $(MAKEFILE) &&|
-MAJOR = $$(MAJOR)
-MINOR = $$(MINOR)
-TEENY = $$(TEENY)
-BORLANDC = $$(BORLANDC)
-|
-,
 
 -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)\"
+\# prefix = /usr
+\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w-
+\# 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
+$(INCLUDE) $$(srcdir)bcc32/Makefile.sub
 |
 	@echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/bignum.c b/bignum.c
index be287032ce..5089bff950 100644
--- a/bignum.c
+++ b/bignum.c
@@ -13,7 +13,6 @@
 #include "ruby.h"
 
 #include <math.h>
-#include <float.h>
 #include <ctype.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
@@ -37,31 +36,17 @@ VALUE rb_cBignum;
 #define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
 #define BDIGMAX ((BDIGIT)-1)
 
-#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || \
-		     (BDIGITS(x)[0] == 0 && \
-		      (RBIGNUM(x)->len == 1 || bigzero_p(x))))
-
-static int bigzero_p(VALUE);
-static int
-bigzero_p(x)
-    VALUE x;
-{
-    long i;
-    for (i = 0; i < RBIGNUM(x)->len; ++i) {
-	if (BDIGITS(x)[i]) return 0;
-    }
-    return 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;
+    char sign;
 {
     NEWOBJ(big, struct RBignum);
     OBJSETUP(big, klass, T_BIGNUM);
-    big->sign = sign?1:0;
+    big->sign = sign;
     big->len = len;
     big->digits = ALLOC_N(BDIGIT, len);
 
@@ -80,16 +65,15 @@ rb_big_clone(x)
     return z;
 }
 
-/* modify a bignum by 2's complement */
 static void
-get2comp(x)
+get2comp(x, carry)		/* get 2's complement */
     VALUE x;
+    int carry;
 {
     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 {
@@ -97,10 +81,11 @@ get2comp(x)
 	ds[i++] = BIGLO(num);
 	num = BIGDN(num);
     } while (i < RBIGNUM(x)->len);
-    if (num != 0) {
+    if (!carry) return;
+    if ((ds[RBIGNUM(x)->len-1] & (1<<(BITSPERDIG-1))) == 0) {
 	REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
 	ds = BDIGITS(x);
-	ds[RBIGNUM(x)->len-1] = RBIGNUM(x)->sign ? ~0 : 1;
+	ds[RBIGNUM(x)->len-1] = ~0;
     }
 }
 
@@ -108,56 +93,36 @@ void
 rb_big_2comp(x)			/* get 2's complement */
     VALUE x;
 {
-    get2comp(x);
+    get2comp(x, Qtrue);
 }
 
 static VALUE
-bigtrunc(x)
+bignorm(x)
     VALUE x;
 {
-    long len = RBIGNUM(x)->len;
-    BDIGIT *ds = BDIGITS(x);
+    if (!FIXNUM_P(x)) {
+	long len = RBIGNUM(x)->len;
+	BDIGIT *ds = BDIGITS(x);
 
-    if (len == 0) return x;
-    while (--len && !ds[len]);
-    RBIGNUM(x)->len = ++len;
-    return x;
-}
-
-static VALUE
-bigfixize(x)
-    VALUE x;
-{
-    long len = RBIGNUM(x)->len;
-    BDIGIT *ds = BDIGITS(x);
+	while (len-- && !ds[len]) ;
+	RBIGNUM(x)->len = ++len;
 
-    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);
+	if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
+	    long num = 0;
+	    while (len--) {
+		num = BIGUP(num) + ds[len];
 	    }
-	    else {
-		if (NEGFIXABLE(-(long)num)) return LONG2FIX(-(long)num);
+	    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(x)
-    VALUE x;
-{
-    if (!FIXNUM_P(x) && TYPE(x) == T_BIGNUM) {
-	x = bigfixize(bigtrunc(x));
-    }
-    return x;
-}
-
 VALUE
 rb_big_norm(x)
     VALUE x;
@@ -238,8 +203,6 @@ rb_quad_pack(buf, val)
 	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--) {
@@ -309,9 +272,7 @@ rb_quad_pack(buf, 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'");
-    }
+    if (len > QUAD_SIZE) len = QUAD_SIZE;
     memcpy(buf, (char*)BDIGITS(val), len);
     if (!RBIGNUM(val)->sign) {
 	len = QUAD_SIZE;
@@ -364,13 +325,6 @@ rb_cstr_to_inum(str, base, badcheck)
     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);
@@ -462,21 +416,8 @@ rb_cstr_to_inum(str, base, badcheck)
 	break;
     }
     if (*str == '0') {		/* squeeze preceeding 0s */
-	int us = 0;
-	while ((c = *++str) == '0' || c == '_') {
-	    if (c == '_') {
-		if (++us >= 2)
-		    break;
-	    } else
-		us = 0;
-	}
-	if (!(c = *str) || ISSPACE(c)) --str;
-    }
-    c = *str;
-    c = conv_digit(c);
-    if (c < 0 || c >= base) {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
+	while (*++str == '0');
+	--str;
     }
     len *= strlen(str)*sizeof(char);
 
@@ -510,16 +451,24 @@ rb_cstr_to_inum(str, base, badcheck)
     z = bignew(len, sign);
     zds = BDIGITS(z);
     for (i=len;i--;) zds[i]=0;
-    while ((c = *str++) != 0) {
+    while (c = *str++) {
 	if (c == '_') {
-	    if (nondigit) {
-		if (badcheck) goto bad;
-		break;
+	    if (badcheck) {
+		if (nondigit) goto bad;
+		nondigit = c;
 	    }
-	    nondigit = c;
 	    continue;
 	}
-	else if ((c = conv_digit(c)) < 0) {
+	else if (isdigit(c)) {
+	    c -= '0';
+	}
+	else if (islower(c)) {
+	    c -= 'a' - 10;
+	}
+	else if (isupper(c)) {
+	    c -= 'A' - 10;
+	}
+	else {
 	    break;
 	}
 	if (c >= base) break;
@@ -578,7 +527,7 @@ rb_str_to_inum(str, base, badcheck)
 	    s = p;
 	}
     }
-    return rb_cstr_to_inum(s, base, badcheck);
+    return rb_cstr_to_inum(s, base, badcheck); 
 }
 
 #if HAVE_LONG_LONG
@@ -640,7 +589,7 @@ rb_ll2inum(n)
 }
 
 #endif  /* HAVE_LONG_LONG */
-
+ 
 VALUE
 rb_cstr2inum(str, base)
     const char *str;
@@ -659,16 +608,15 @@ rb_str2inum(str, base)
 
 const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 VALUE
-rb_big2str0(x, base, trim)
+rb_big2str(x, base)
     VALUE x;
     int base;
-    int trim;
 {
     volatile VALUE t;
     BDIGIT *ds;
     long i, j, hbase;
     VALUE ss;
-    char *s;
+    char *s, c;
 
     if (FIXNUM_P(x)) {
 	return rb_fix2str(x, base);
@@ -677,37 +625,34 @@ rb_big2str0(x, base, trim)
     if (BIGZEROP(x)) {
 	return rb_str_new2("0");
     }
-    if (i >= LONG_MAX/SIZEOF_BDIGITS/CHAR_BIT) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
-    }
     j = SIZEOF_BDIGITS*CHAR_BIT*i;
     switch (base) {
       case 2: break;
       case 3:
-	j = j * 53L / 84 + 1;
+	j = j * 647L / 1024;
 	break;
       case 4: case 5: case 6: case 7:
-	j = (j + 1) / 2;
+	j /= 2;
 	break;
       case 8: case 9:
-	j = (j + 2) / 3;
+	j /= 3;
 	break;
       case 10: case 11: case 12: case 13: case 14: case 15:
-	j = j * 28L / 93 + 1;
+	j = j * 241L / 800;
 	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;
+	j /= 4;
 	break;
       case 32: case 33: case 34: case 35: case 36:
-	j = (j + 4) / 5;
+	j /= 5;
 	break;
       default:
 	rb_raise(rb_eArgError, "illegal radix %d", base);
 	break;
     }
-    j++;			/* space for sign */
+    j += 2;
 
     hbase = base * base;
 #if SIZEOF_BDIGITS > 2
@@ -716,11 +661,11 @@ rb_big2str0(x, base, trim)
 
     t = rb_big_clone(x);
     ds = BDIGITS(t);
-    ss = rb_str_new(0, j+1);
+    ss = rb_str_new(0, j);
     s = RSTRING(ss)->ptr;
 
     s[0] = RBIGNUM(x)->sign ? '+' : '-';
-    while (i && j > 1) {
+    while (i && j) {
 	long k = i;
 	BDIGIT_DBL num = 0;
 
@@ -729,43 +674,30 @@ rb_big2str0(x, base, trim)
 	    ds[k] = (BDIGIT)(num / hbase);
 	    num %= hbase;
 	}
-	if (trim && ds[i-1] == 0) i--;
+	if (ds[i-1] == 0) i--;
 	k = SIZEOF_BDIGITS;
 	while (k--) {
-	    s[--j] = ruby_digitmap[num % base];
+	    c = (char)(num % base);
+	    s[--j] = ruby_digitmap[(int)c];
 	    num /= base;
-	    if (!trim && j <= 1) break;
-	    if (trim && i == 0 && num == 0) break;
+	    if (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;
-    }
+    while (s[j] == '0') j++;
+    RSTRING(ss)->len -= RBIGNUM(x)->sign?j:j-1;
+    memmove(RBIGNUM(x)->sign?s:s+1, s+j, RSTRING(ss)->len);
     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"
@@ -809,17 +741,6 @@ big2ulong(x, type)
 }
 
 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;
 {
@@ -838,10 +759,10 @@ long
 rb_big2long(x)
     VALUE x;
 {
-    unsigned long num = big2ulong(x, "long");
+    unsigned long num = big2ulong(x, "int");
 
     if ((long)num < 0 && (RBIGNUM(x)->sign || (long)num != LONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
+	rb_raise(rb_eRangeError, "bignum too big to convert into `int'");
     }
     if (!RBIGNUM(x)->sign) return -(long)num;
     return num;
@@ -935,8 +856,8 @@ rb_dbl2big(d)
     return bignorm(dbl2big(d));
 }
 
-static double
-big2dbl(x)
+double
+rb_big2dbl(x)
     VALUE x;
 {
     double d = 0.0;
@@ -946,30 +867,21 @@ big2dbl(x)
     while (i--) {
 	d = ds[i] + BIGRAD*d;
     }
-    if (!RBIGNUM(x)->sign) d = -d;
-    return d;
-}
-
-double
-rb_big2dbl(x)
-    VALUE x;
-{
-    double d = big2dbl(x);
-
     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
@@ -982,11 +894,11 @@ rb_big_to_f(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
@@ -1027,11 +939,11 @@ rb_big_cmp(x, y)
 /*
  *  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
  */
 
@@ -1046,14 +958,10 @@ rb_big_eq(x, y)
       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;
-	}
+	if (rb_big2dbl(x) == RFLOAT(y)->value)
+	    return Qtrue;
+	else
+	    return Qfalse;
       default:
 	return rb_equal(y, x);
     }
@@ -1066,11 +974,11 @@ rb_big_eq(x, y)
 /*
  *  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
  */
 
@@ -1111,7 +1019,7 @@ rb_big_uminus(x)
  * 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"
  */
 
@@ -1120,16 +1028,13 @@ rb_big_neg(x)
     VALUE x;
 {
     VALUE z = rb_big_clone(x);
-    long i;
-    BDIGIT *ds;
+    long i = RBIGNUM(x)->len;
+    BDIGIT *ds = BDIGITS(z);
 
-    if (!RBIGNUM(x)->sign) get2comp(z);
-    ds = BDIGITS(z);
-    i = RBIGNUM(x)->len;
-    if (!i) return INT2FIX(~0);
+    if (!RBIGNUM(x)->sign) get2comp(z, Qtrue);
     while (i--) ds[i] = ~ds[i];
+    if (RBIGNUM(x)->sign) get2comp(z, Qfalse);
     RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
-    if (RBIGNUM(x)->sign) get2comp(z);
 
     return bignorm(z);
 }
@@ -1142,7 +1047,7 @@ bigsub(x, y)
     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 */
@@ -1160,14 +1065,14 @@ bigsub(x, y)
 	}
     }
 
-    z = bignew(RBIGNUM(x)->len, z==0);
+    z = bignew(RBIGNUM(x)->len, (z == 0)?1:0);
     zds = BDIGITS(z);
 
-    for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) {
+    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);
@@ -1177,14 +1082,14 @@ bigsub(x, y)
 	zds[i] = BDIGITS(x)[i];
 	i++;
     }
-
+    
     return z;
 }
 
 static VALUE
 bigadd(x, y, sign)
     VALUE x, y;
-    int sign;
+    char sign;
 {
     VALUE z;
     BDIGIT_DBL num;
@@ -1278,8 +1183,15 @@ rb_big_minus(x, y)
     }
 }
 
+/*
+ *  call-seq:
+ *     big * other  => Numeric
+ *
+ *  Multiplies big and other, returning the result.
+ */
+
 VALUE
-rb_big_mul0(x, y)
+rb_big_mul(x, y)
     VALUE x, y;
 {
     long i, j;
@@ -1308,7 +1220,7 @@ rb_big_mul0(x, y)
     zds = BDIGITS(z);
     while (j--) zds[j] = 0;
     for (i = 0; i < RBIGNUM(x)->len; i++) {
-	BDIGIT_DBL dd = BDIGITS(x)[i];
+	BDIGIT_DBL dd = BDIGITS(x)[i]; 
 	if (dd == 0) continue;
 	n = 0;
 	for (j = 0; j < RBIGNUM(y)->len; j++) {
@@ -1322,21 +1234,7 @@ rb_big_mul0(x, y)
 	}
     }
 
-    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));
+    return bignorm(z);
 }
 
 static void
@@ -1385,7 +1283,7 @@ bigdivrem(x, y, divp, modp)
 
     dd = 0;
     q = yds[ny-1];
-    while ((q & (1U<<(BITSPERDIG-1))) == 0) {
+    while ((q & (1<<(BITSPERDIG-1))) == 0) {
 	q <<= 1;
 	dd++;
     }
@@ -1509,6 +1407,9 @@ rb_big_div(x, y)
       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);
     }
@@ -1551,9 +1452,9 @@ rb_big_modulo(x, y)
 /*
  *  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
  */
@@ -1579,47 +1480,12 @@ rb_big_remainder(x, y)
     return bignorm(z);
 }
 
-static int
-bdigbitsize(BDIGIT x)
-{
-    int size = 1;
-    int nb = BITSPERDIG / 2;
-    BDIGIT bits = (~0 << nb);
-
-    if (!x) return 0;
-    while (x > 1) {
-	if (x & bits) {
-	    size += nb;
-	    x >>= nb;
-	}
-	x &= ~bits;
-	nb /= 2;
-	bits >>= nb;
-    }
-
-    return size;
-}
-
-static VALUE big_lshift _((VALUE, unsigned long));
-static VALUE big_rshift _((VALUE, unsigned long));
-
-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)
@@ -1646,51 +1512,22 @@ rb_big_divmod(x, y)
 /*
  *  call-seq:
  *     big.quo(numeric) -> float
- *     big.fdiv(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 = big2dbl(x);
+    double dx = rb_big2dbl(x);
     double dy;
 
-    if (isinf(dx)) {
-#define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
-	VALUE z;
-	int ex, ey;
-
-	ex = (RBIGNUM(bigtrunc(x))->len - 1) * BITSPERDIG;
-	ex += bdigbitsize(BDIGITS(x)[RBIGNUM(x)->len - 1]);
-	ex -= 2 * DBL_BIGDIG * BITSPERDIG;
-	if (ex) x = big_shift(x, ex);
-
-	switch (TYPE(y)) {
-	  case T_FIXNUM:
-	    y = rb_int2big(FIX2LONG(y));
-	  case T_BIGNUM: {
-	    ey = (RBIGNUM(bigtrunc(y))->len - 1) * BITSPERDIG;
-	    ey += bdigbitsize(BDIGITS(y)[RBIGNUM(y)->len - 1]);
-	    ey -= DBL_BIGDIG * BITSPERDIG;
-	    if (ey) y = big_shift(y, ey);
-	  bignum:
-	    bigdivrem(x, y, &z, 0);
-	    return rb_float_new(ldexp(big2dbl(z), ex - ey));
-	  }
-	  case T_FLOAT:
-	    y = dbl2big(ldexp(frexp(RFLOAT(y)->value, &ey), DBL_MANT_DIG));
-	    ey -= DBL_MANT_DIG;
-	    goto bignum;
-	}
-    }
     switch (TYPE(y)) {
       case T_FIXNUM:
 	dy = (double)FIX2LONG(y);
@@ -1710,50 +1547,6 @@ rb_big_quo(x, y)
     return rb_float_new(dx / dy);
 }
 
-static VALUE
-bigsqr(x)
-    VALUE x;
-{
-    long len = RBIGNUM(x)->len, k = len / 2, i;
-    VALUE a, b, a2, z;
-    BDIGIT_DBL num;
-
-    if (len < 4000 / BITSPERDIG) {
-	return rb_big_mul0(x, x);
-    }
-
-    a = bignew(len - k, 1);
-    MEMCPY(BDIGITS(a), BDIGITS(x) + k, BDIGIT, len - k);
-    b = bignew(k, 1);
-    MEMCPY(BDIGITS(b), BDIGITS(x), BDIGIT, k);
-
-    a2 = bigtrunc(bigsqr(a));
-    z = bigsqr(b);
-    REALLOC_N(RBIGNUM(z)->digits, BDIGIT, (len = 2 * k + RBIGNUM(a2)->len) + 1);
-    while (RBIGNUM(z)->len < 2 * k) BDIGITS(z)[RBIGNUM(z)->len++] = 0;
-    MEMCPY(BDIGITS(z) + 2 * k, BDIGITS(a2), BDIGIT, RBIGNUM(a2)->len);
-    RBIGNUM(z)->len = len;
-    a2 = bigtrunc(rb_big_mul0(a, b));
-    len = RBIGNUM(a2)->len;
-    for (i = 0, num = 0; i < len; i++) {
-	num += (BDIGIT_DBL)BDIGITS(z)[i + k] + ((BDIGIT_DBL)BDIGITS(a2)[i] << 1);
-	BDIGITS(z)[i + k] = BIGLO(num);
-	num = BIGDN(num);
-    }
-    if (num) {
-	len = RBIGNUM(z)->len;
-	for (i += k; i < len && num; ++i) {
-	    num += (BDIGIT_DBL)BDIGITS(z)[i];
-	    BDIGITS(z)[i] = BIGLO(num);
-	    num = BIGDN(num);
-	}
-	if (num) {
-	    BDIGITS(z)[RBIGNUM(z)->len++] = BIGLO(num);
-	}
-    }
-    return bigtrunc(z);
-}
-
 /*
  *  call-seq:
  *     big ** exponent   #=> numeric
@@ -1773,7 +1566,7 @@ rb_big_pow(x, y)
 {
     double d;
     long yy;
-
+    
     if (y == INT2FIX(0)) return INT2FIX(1);
     switch (TYPE(y)) {
       case T_FLOAT:
@@ -1786,23 +1579,18 @@ rb_big_pow(x, y)
 	break;
 
       case T_FIXNUM:
-	yy = FIX2LONG(y);
+	yy = NUM2LONG(y);
 	if (yy > 0) {
-	    VALUE z = 0;
-	    long mask;
-	    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 (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
-		if (z) z = bigtrunc(bigsqr(z));
-		if (yy & mask) {
-		    z = z ? bigtrunc(rb_big_mul0(z, x)) : x;
+	    VALUE z = x;
+
+	    for (;;) {
+		yy -= 1;
+		if (yy == 0) break;
+		while (yy % 2 == 0) {
+		    yy /= 2;
+		    x = rb_big_mul(x, x);
 		}
+		z = rb_big_mul(z, x);
 	    }
 	    return bignorm(z);
 	}
@@ -1823,26 +1611,25 @@ rb_big_pow(x, y)
  */
 
 VALUE
-rb_big_and(xx, yy)
-    VALUE xx, yy;
+rb_big_and(x, y)
+    VALUE x, y;
 {
-    volatile VALUE x, y, z;
+    VALUE z;
     BDIGIT *ds1, *ds2, *zds;
     long i, l1, l2;
     char sign;
 
-    x = xx;
-    y = rb_to_int(yy);
+    y = rb_to_int(y);
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
     if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
-	get2comp(y);
+	get2comp(y, Qtrue);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1867,7 +1654,7 @@ rb_big_and(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?0:ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
     return bignorm(z);
 }
 
@@ -1879,26 +1666,26 @@ rb_big_and(xx, yy)
  */
 
 VALUE
-rb_big_or(xx, yy)
-    VALUE xx, yy;
+rb_big_or(x, y)
+    VALUE x, y;
 {
-    volatile VALUE x, y, z;
+    VALUE z;
     BDIGIT *ds1, *ds2, *zds;
     long i, l1, l2;
     char sign;
 
-    x = xx;
-    y = rb_to_int(yy);
+    y = rb_to_int(y);
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
+
     if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
-	get2comp(y);
+	get2comp(y, Qtrue);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1923,7 +1710,7 @@ rb_big_or(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:(BIGRAD-1);
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
 
     return bignorm(z);
 }
@@ -1936,27 +1723,26 @@ rb_big_or(xx, yy)
  */
 
 VALUE
-rb_big_xor(xx, yy)
-    VALUE xx, yy;
+rb_big_xor(x, y)
+    VALUE x, y;
 {
-    volatile VALUE x, y;
     VALUE z;
     BDIGIT *ds1, *ds2, *zds;
     long i, l1, l2;
     char sign;
 
-    x = xx;
-    y = rb_to_int(yy);
+    y = rb_to_int(y);
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
+
     if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
-	get2comp(y);
+	get2comp(y, Qtrue);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1983,20 +1769,12 @@ rb_big_xor(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:~ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
 
     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;
-}
+static VALUE rb_big_rshift _((VALUE,VALUE));
 
 /*
  * call-seq:
@@ -2009,46 +1787,15 @@ VALUE
 rb_big_lshift(x, y)
     VALUE x, y;
 {
-    long shift;
-    int neg = 0;
-
-    for (;;) {
-	if (FIXNUM_P(y)) {
-	    shift = FIX2LONG(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");
-	    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 long shift;
-{
     BDIGIT *xds, *zds;
-    long s1 = shift/BITSPERDIG;
+    int shift = NUM2INT(y);
+    int s1 = shift/BITSPERDIG;
     int s2 = shift%BITSPERDIG;
     VALUE z;
     BDIGIT_DBL num = 0;
     long len, i;
 
+    if (shift < 0) return rb_big_rshift(x, INT2FIX(-shift));
     len = RBIGNUM(x)->len;
     z = bignew(len+s1+1, RBIGNUM(x)->sign);
     zds = BDIGITS(z);
@@ -2072,52 +1819,19 @@ big_lshift(x, shift)
  * Shifts big right _numeric_ positions (left if _numeric_ is negative).
  */
 
-VALUE
+static VALUE
 rb_big_rshift(x, y)
     VALUE x, y;
 {
-    long shift;
-    int neg = 0;
-
-    for (;;) {
-	if (FIXNUM_P(y)) {
-	    shift = FIX2LONG(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");
-	    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 long shift;
-{
     BDIGIT *xds, *zds;
+    int shift = NUM2INT(y);
     long s1 = shift/BITSPERDIG;
-    int s2 = shift%BITSPERDIG;
+    long s2 = shift%BITSPERDIG;
     VALUE z;
     BDIGIT_DBL num = 0;
     long i, j;
-    volatile VALUE save_x;
+
+    if (shift < 0) return rb_big_lshift(x, INT2FIX(-shift));
 
     if (s1 > RBIGNUM(x)->len) {
 	if (RBIGNUM(x)->sign)
@@ -2126,15 +1840,11 @@ big_rshift(x, shift)
 	    return INT2FIX(-1);
     }
     if (!RBIGNUM(x)->sign) {
-	save_x = x = rb_big_clone(x);
-	get2comp(x);
+	x = rb_big_clone(x);
+	get2comp(x, Qtrue);
     }
     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;
@@ -2146,7 +1856,7 @@ big_rshift(x, shift)
 	num = BIGUP(xds[i]);
     }
     if (!RBIGNUM(x)->sign) {
-	get2comp(z);
+	get2comp(z, Qfalse);
     }
     return bignorm(z);
 }
@@ -2154,20 +1864,20 @@ big_rshift(x, shift)
 /*
  *  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
@@ -2175,50 +1885,33 @@ rb_big_aref(x, y)
     VALUE x, y;
 {
     BDIGIT *xds;
-    BDIGIT_DBL num;
-    unsigned long shift;
-    long i, s1, s2;
+    int shift;
+    long s1, s2;
 
     if (TYPE(y) == T_BIGNUM) {
-	if (!RBIGNUM(y)->sign)
+	if (!RBIGNUM(y)->sign || RBIGNUM(x)->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");
-    }
-    else {
-	i = NUM2LONG(y);
-	if (i < 0) return INT2FIX(0);
-	shift = (VALUE)i;
+	return INT2FIX(1);
     }
+    shift = NUM2INT(y);
+    if (shift < 0) return INT2FIX(0);
     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);
-	}
+	if (s1 >= RBIGNUM(x)->len) return INT2FIX(1);
+	x = rb_big_clone(x);
+	get2comp(x, Qtrue);
     }
     else {
-	num = BDIGITS(x)[s1];
+	if (s1 >= RBIGNUM(x)->len) return INT2FIX(0);
     }
-    if (num & ((BDIGIT_DBL)1<<s2))
+    xds = BDIGITS(x);
+    if (xds[s1] & (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;
@@ -2244,11 +1937,8 @@ rb_big_coerce(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_raise(rb_eTypeError, "Can't coerce %s to Bignum",
 		 rb_obj_classname(y));
     }
     /* not reached */
@@ -2258,9 +1948,9 @@ rb_big_coerce(x, y)
 /*
  *  call-seq:
  *     big.abs -> aBignum
- *
+ *  
  *  Returns the absolute value of <i>big</i>.
- *
+ *     
  *     -1234567890987654321.abs   #=> 1234567890987654321
  */
 
@@ -2287,22 +1977,20 @@ rb_big_rand(max, rand_buf)
 	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;
+    return rb_big_modulo((VALUE)v, max);
 }
 
 /*
  *  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
@@ -2322,15 +2010,15 @@ rb_big_size(big)
  *  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
@@ -2351,7 +2039,6 @@ Init_Bignum()
     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, "fdiv", 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);
diff --git a/bin/erb b/bin/erb
index a6fcd5370c..2459d2562e 100755
--- a/bin/erb
+++ b/bin/erb
@@ -12,13 +12,13 @@ class ERB
       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}"
+	return arg if $1 == '-'
+	raise 'unknown switch "-"' if $2.index('-')
+	self.unshift "-#{$2}" if $2.size > 0
+	"-#{$1}"
       else
-        self.unshift arg
-        nil
+	self.unshift arg
+	nil
       end
     end
     
@@ -30,13 +30,13 @@ class ERB
       return trim_mode if disable_percent
       case trim_mode
       when 0
-        return '%'
+	return '%'
       when 1
-        return '%>'
+	return '%>'
       when 2
-        return '%<>'
+	return '%<>'
       when '-'
-        return '%-'
+	return '%-'
       end
     end
     module_function :trim_mode_opt
@@ -45,91 +45,89 @@ class 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
+	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'			# sacurity 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
+  -d               set $DBEUG 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 "%"
+  -P               disregard the lin which starts in "%" 
 EOU
-        exit 1
+	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
+	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)
+	erb.run(TOPLEVEL_BINDING.taint)
       end
     end
     module_function :run
diff --git a/bin/irb b/bin/irb
index f277bc4b69..309da52161 100644
--- a/bin/irb
+++ b/bin/irb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 #   irb.rb - intaractive ruby
-#   	$Release Version: 0.9.5 $
+#   	$Release Version: 0.7.3 $
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 
 require "irb"
diff --git a/bin/ri b/bin/ri
index fb3e00eda3..4567c66d46 100755
--- a/bin/ri
+++ b/bin/ri
@@ -12,38 +12,266 @@
 #
 # 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_paths'
+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'
+
+######################################################################
+
+def display_usage
+  RI::Options::OptionList.usage(short_form=true)
+#  File.open(__FILE__) do |f|
+#    f.gets
+#    puts $1 while (f.gets =~ /^# ?(.*)/)
+#  end
+#  exit
+end
+
+
+######################################################################
+
+class  RiDisplay
+
+  def initialize
+    @options = RI::Options.instance
+    @options.parse
+    paths = RI::Paths::PATH
+    if paths.empty?
+      $stderr.puts "No ri documentation found in:"
+      [ RI::Paths::SYSDIR, RI::Paths::SITEDIR, RI::Paths::HOMEDIR].each do |d|
+        $stderr.puts "     #{d}"
+      end
+      $stderr.puts "\nWas rdoc run to create documentation?"
+      exit 1                   
+    end
+    @ri_reader = RI::RiReader.new(RI::RiCache.new(paths))
+    @formatter = @options.formatter.new(@options, "     ")
+  end    
+  
+  
+  ######################################################################
+
+  def setup_pager
+    require 'tempfile'
+
+    @save_stdout = STDOUT.clone
+    STDOUT.reopen(Tempfile.new("ri_"))
+  end
+
+  ######################################################################
+
+  def page_output
+    path = STDOUT.path
+    STDOUT.reopen(@save_stdout)
+    @save_stdout = nil
+    paged = false
+    for pager in [ ENV['PAGER'], "less", "more <", 'pager' ].compact.uniq
+      if system("#{pager} #{path}")
+        paged = true
+        break
+      end
+    end
+    if !paged
+      @options.use_stdout = true
+      puts File.read(path)
+    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 {|p| @formatter.wrap(p) }
+  end
+
+  ######################################################################
+  
+  def display_flow(flow)
+    if !flow || flow.empty?
+      @formatter.wrap("(no description...)")
+    else
+      @formatter.display_flow(flow)
+    end
+  end
 
-require 'rdoc/ri/ri_driver'
+######################################################################
+
+def display_method_info(method_entry)
+  method = @ri_reader.get_method(method_entry)
+  @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
+
+######################################################################
+
+def display_class_info(class_entry)
+  klass = @ri_reader.get_class(class_entry)
+  @formatter.draw_line(klass.display_name + ": " + klass.full_name)
+  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
+
+######################################################################
+
+# 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
+    display_method_info(methods[0])
+  else
+    entries = methods.find_all {|m| m.name == requested_method_name}
+    if entries.size == 1
+      display_method_info(entries[0])
+    else
+      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
+end
+
+######################################################################
+
+def report_class_stuff(requested_class_name, namespaces)
+  if namespaces.size == 1
+    display_class_info(namespaces[0])
+  else 
+    entries = namespaces.find_all {|m| m.name == requested_class_name}
+    if entries.size == 1
+      display_class_info(entries[0])
+    else
+      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
+end
 
 ######################################################################
 
-ri = RiDriver.new
-ri.process_args
 
+def display_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
+
+  setup_pager unless @options.use_stdout
+  
+  begin
+    if desc.method_name.nil?
+      report_class_stuff(desc.class_names.join('::'), 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
+
+    page_output unless @options.use_stdout
+  ensure
+    STDOUT.reopen(@save_stdout) if @save_stdout
+  end
+    
+end
+end
+
+######################################################################
+
+if ARGV.size.zero?
+  display_usage
+else
+  ri = RiDisplay.new
+  begin
+    ARGV.each do |arg|
+      ri.display_info_for(arg)
+    end
+  rescue RiError => e
+    $stderr.puts(e.message)
+    exit(1)
+  end
+end
diff --git a/class.c b/class.c
index 096c7fbdf1..35b2c985ae 100644
--- a/class.c
+++ b/class.c
@@ -48,35 +48,23 @@ rb_class_new(super)
     return rb_class_boot(super);
 }
 
-struct clone_method_data {
-    st_table *tbl;
-    VALUE klass;
-};
-
 static int
-clone_method(mid, body, data)
+clone_method(mid, body, tbl)
     ID mid;
     NODE *body;
-    struct clone_method_data *data;
+    st_table *tbl;
 {
-    NODE *fbody = body->nd_body;
-
-    if (fbody && nd_type(fbody) == NODE_SCOPE) {
-	fbody = rb_copy_node_scope(fbody, ruby_cref);
-    }
-    st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex));
+    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 = RBASIC(orig)->klass;
-	RBASIC(clone)->klass = rb_singleton_class_clone(clone);
+	RBASIC(clone)->klass = rb_singleton_class_clone(orig);
     }
     RCLASS(clone)->super = RCLASS(orig)->super;
     if (RCLASS(orig)->iv_tbl) {
@@ -89,18 +77,14 @@ rb_mod_init_copy(clone, orig)
 	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
     }
     if (RCLASS(orig)->m_tbl) {
-	struct clone_method_data data;
-
-	data.tbl = RCLASS(clone)->m_tbl = st_init_numtable();
-	data.klass = (VALUE)clone;
-
-	st_foreach(RCLASS(orig)->m_tbl, clone_method, (st_data_t)&data);
+	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;
@@ -108,9 +92,6 @@ rb_class_init_copy(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);
 }
 
@@ -140,22 +121,9 @@ rb_singleton_class_clone(obj)
 	if (RCLASS(klass)->iv_tbl) {
 	    clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
 	}
-	{
-	    struct clone_method_data data;
-
-	    data.tbl = clone->m_tbl = st_init_numtable();
-	    switch (TYPE(obj)) {
-	      case T_CLASS:
-	      case T_MODULE:
-		data.klass = obj;
-		break;
-	      default:
-		data.klass = 0;
-		break;
-	    }
-
-	    st_foreach(RCLASS(klass)->m_tbl, clone_method, (st_data_t)&data);
-	}
+	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;
@@ -207,6 +175,7 @@ rb_define_class_id(id, super)
 
     if (!super) super = rb_cObject;
     klass = rb_class_new(super);
+    rb_name_class(klass, id);
     rb_make_metaclass(klass, RBASIC(super)->klass);
 
     return klass;
@@ -257,7 +226,6 @@ rb_define_class(name, super)
     }
     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);
 
@@ -406,6 +374,9 @@ rb_include_module(klass, module)
 	rb_secure(4);
     }
     
+    if (NIL_P(module)) return;
+    if (klass == module) return;
+
     if (TYPE(module) != T_MODULE) {
 	Check_Type(module, T_MODULE);
     }
@@ -441,23 +412,6 @@ rb_include_module(klass, module)
     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;
@@ -473,25 +427,6 @@ rb_mod_included_modules(mod)
     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;
@@ -508,22 +443,6 @@ rb_mod_include_p(mod, mod2)
     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;
@@ -657,33 +576,6 @@ class_instance_method_list(argc, argv, mod, func)
     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;
@@ -693,15 +585,6 @@ rb_class_instance_methods(argc, argv, 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;
@@ -711,23 +594,6 @@ rb_class_protected_instance_methods(argc, argv, 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;
@@ -737,15 +603,6 @@ rb_class_private_instance_methods(argc, argv, 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;
@@ -755,38 +612,6 @@ rb_class_public_instance_methods(argc, argv, 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;
@@ -1046,7 +871,7 @@ rb_scan_args(argc, argv, fmt, va_alist)
     }
 
     if (argc > i) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, i);
+	rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)", argc, i);
     }
 
     return argc;
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 50ec183ebd..0000000000
--- a/common.mk
+++ /dev/null
@@ -1,467 +0,0 @@
-bin: $(PROGRAM) $(WPROGRAM)
-lib: $(LIBRUBY)
-dll: $(LIBRUBY_SO)
-
-RUBYLIB       = -
-RUBYOPT       = -
-
-SPEC_GIT_BASE = git://github.com/rubyspec
-MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
-RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
-
-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) \
-		enumerator.$(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)" \
-		--mflags="$(MFLAGS)" \
-		--make-flags="$(MAKEFLAGS)"
-EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) --
-INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
-		--data-mode=$(INSTALL_DATA_MODE) \
-		--prog-mode=$(INSTALL_PROG_MODE) \
-		--installed-list $(INSTALLED_LIST)
-INSTALL_PROG_MODE = 0755
-INSTALL_DATA_MODE = 0644
-
-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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
-loadpath: $(PREP)
-	$(MINIRUBY) -e 'p $$:'
-
-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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(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 --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
-post-no-install-doc::
-	@$(NULLCMD)
-
-CLEAR_INSTALLED_LIST = clear-installed-list
-
-install-prereq: $(CLEAR_INSTALLED_LIST)
-
-clear-installed-list:
-	@exit > $(INSTALLED_LIST)
-
-clean: clean-ext clean-local
-clean-local::
-	@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
-	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-	@$(RM) y.tab.c y.output
-clean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(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 $(PREP)
-distclean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) distclean
-
-realclean:: realclean-ext realclean-local
-realclean-local:: distclean-local
-	@$(RM) parse.c lex.c
-realclean-ext::
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) realclean
-
-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) -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 dln.$(OBJEXT)
-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
-enumerator.$(OBJEXT): {$(VPATH)}enumerator.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.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/config.guess b/config.guess
index dd1688b7b5..844739cdaf 100644
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-06-11'
+timestamp='2003-01-10'
 
 # 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
@@ -106,7 +106,6 @@ 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" ;
@@ -179,26 +178,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	        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}
+	echo "${machine}-${os}"
 	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -206,15 +189,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     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 ;;
@@ -245,70 +222,73 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *: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}
+    *:MicroBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
 	exit 0 ;;
     alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
+	if test $UNAME_RELEASE = "V4.0"; then
 		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.
+	fi
 	# 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
+	eval $set_cc_for_build
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.globl main
+	.align 4
+	.ent main
+main:
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
+	.end main
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
+	if test "$?" = 0 ; then
+		case `$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+			3-1307)
+				UNAME_MACHINE="alphaev7"
+				;;
+		esac
+	fi
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -331,9 +311,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *: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;;
@@ -351,9 +328,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     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 ;;
@@ -426,9 +400,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:*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 ;;
@@ -764,7 +735,7 @@ EOF
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	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'`
@@ -772,11 +743,6 @@ EOF
         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 ;;
@@ -798,10 +764,7 @@ EOF
 	#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}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -812,8 +775,8 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:3*)
+	echo i586-pc-interix3
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -834,30 +797,19 @@ EOF
 	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
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -876,7 +828,7 @@ EOF
 	#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
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -895,13 +847,13 @@ EOF
 	#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
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux" && exit 0
 	;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux
 	exit 0 ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux
 	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -914,34 +866,31 @@ EOF
 	  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}
+	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux${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 ;;
+	  PA7*) echo hppa1.1-unknown-linux;;
+	  PA8*) echo hppa2.0-unknown-linux;;
+	  *)    echo hppa-unknown-linux;;
 	esac
 	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux
 	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
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo x86_64-unknown-linux
 	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -956,47 +905,20 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		echo "${UNAME_MACHINE}-pc-linux-aout"
 		exit 0 ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		echo "${UNAME_MACHINE}-pc-linux-coff"
 		exit 0 ;;
 	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# Either a pre-BFD a.out linker (linux-oldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		echo "${UNAME_MACHINE}-pc-linux-oldld"
 		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*:*)
@@ -1024,9 +946,6 @@ EOF
     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 ;;
@@ -1096,9 +1015,9 @@ EOF
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
 	exit 0 ;;
-    M68*:*:R3V[5678]*:*)
+    M68*:*:R3V[567]*:*)
 	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)
+    3[34]??:*: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)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1200,7 +1119,7 @@ EOF
 	    *86) UNAME_PROCESSOR=i686 ;;
 	    powerpc) UNAME_PROCESSOR=powerpc ;;
 	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	echo ${UNAME_PROCESSOR}-apple-darwin
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
@@ -1213,7 +1132,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1254,12 +1173,6 @@ EOF
     *: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
diff --git a/config.sub b/config.sub
index 506d3ab77f..d2c7af03c5 100644
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-06-11'
+timestamp='2003-01-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,8 +118,7 @@ esac
 # 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*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -229,14 +228,13 @@ case $basic_machine in
 	| 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 \
+	| clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
+	| ip2k \
 	| m32r | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
@@ -249,7 +247,6 @@ case $basic_machine in
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@@ -260,11 +257,11 @@ case $basic_machine in
 	| 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 \
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -299,7 +296,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
 	| clipper-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -307,7 +304,7 @@ case $basic_machine in
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
+	| ip2k-* \
 	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
@@ -322,7 +319,6 @@ case $basic_machine in
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
@@ -333,13 +329,11 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh3e-* | 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-* \
+	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -377,12 +371,6 @@ case $basic_machine in
 		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
@@ -747,10 +735,6 @@ case $basic_machine in
 		basic_machine=or32-unknown
 		os=-coff
 		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -782,24 +766,18 @@ case $basic_machine in
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2)
 		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-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -858,10 +836,6 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -869,9 +843,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -946,16 +917,12 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
+        tic4x | c4x*)
+		basic_machine=tic4x-unknown
 		os=-coff
 		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
 		os=-coff
 		;;
 	tx39)
@@ -971,10 +938,6 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1064,7 +1027,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
 		basic_machine=sh-unknown
 		;;
 	sh64)
@@ -1143,19 +1106,19 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -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* \
+	      | -mingw32* | -linux-gnu* | -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*)
+	      | -powermax* | -dnix* | -microbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1179,9 +1142,6 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
 	-linux*)
 		os=-linux
 		;;
@@ -1194,9 +1154,6 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1218,9 +1175,6 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1243,9 +1197,6 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1276,12 +1227,6 @@ case $os in
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-none)
 		;;
 	*)
@@ -1313,9 +1258,6 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1494,15 +1436,9 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
diff --git a/configure.in b/configure.in
index 2a849cb979..456f653c9e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT()
 
-AC_PREREQ(2.58)
+AC_PREREQ(2.50)
 
-AC_DEFUN([RUBY_MINGW32],
+AC_DEFUN(RUBY_MINGW32,
 [case "$host_os" in
 cygwin*)
 AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
@@ -17,7 +17,7 @@ test "$rb_cv_mingw32" = yes && target_os="mingw32"
   ;;
 esac])
 
-AC_DEFUN([RUBY_CPPOUTFILE],
+AC_DEFUN(RUBY_CPPOUTFILE,
 [AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
 [cppflags=$CPPFLAGS
 CPPFLAGS='-o conftest.i'
@@ -33,7 +33,7 @@ elif test -n "$rb_cv_cppoutfile"; then
 fi
 AC_SUBST(CPPOUTFILE)])
 
-AC_DEFUN([RUBY_PROG_GNU_LD],
+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
@@ -44,20 +44,10 @@ fi
 GNU_LD=$rb_cv_prog_gnu_ld
 AC_SUBST(GNU_LD)])
 
-unset GREP_OPTIONS
 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]*\)"'`
-if test "$MAJOR" = ""; then
-  AC_MSG_ERROR(could not determine MAJOR number from version.h)
-fi
-if test "$MINOR" = ""; then
-  AC_MSG_ERROR(could not determine MINOR number from version.h)
-fi
-if test "$TEENY" = ""; then
-  AC_MSG_ERROR(could not determine TEENY number from version.h)
-fi
 AC_SUBST(MAJOR)
 AC_SUBST(MINOR)
 AC_SUBST(TEENY)
@@ -82,10 +72,7 @@ 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.
 
-ifelse(currently,disabled, [
 dnl checks for fat-binary
 AC_ARG_ENABLE(fat-binary,
        [  --enable-fat-binary=ARCHS
@@ -139,7 +126,6 @@ if test "$fat_binary" != no; then
     done
     AC_DEFINE(NEXT_FAT_BINARY)
 fi
-], [fat_binary=no])
 
 case $target_cpu in
   i?86) frame_address=yes;;
@@ -161,11 +147,6 @@ if test x"${build}" != x"${host}"; then
 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
@@ -186,38 +167,12 @@ 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*)
@@ -231,27 +186,13 @@ 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
-mv confdefs.h confdefs1.h
-: > confdefs.h
 AC_SYS_LARGEFILE
-mv confdefs.h largefile.h
-mv confdefs1.h confdefs.h
-cat largefile.h >> confdefs.h
 
 AC_CHECK_TYPES([long long, off_t])
 
@@ -264,12 +205,6 @@ 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);],
@@ -308,53 +243,16 @@ 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_CACHE_CHECK([for noreturn], rb_cv_noreturn,
+[rb_cv_noreturn=no
+for mac in "x __attribute__ ((noreturn))" "__declspec(noreturn) x" x; do
   AC_TRY_COMPILE(
-    [extern $mac void conftest(void);],
-    [rb_cv_ruby_extern="extern $mac"; break])
+    [#define NORETURN(x) $mac
+NORETURN(void exit(int x));],
+    [],
+    [rb_cv_noreturn="$mac"; break])
 done])
-test "x$rb_cv_ruby_extern" = xno || AC_DEFINE_UNQUOTED(RUBY_EXTERN, $rb_cv_ruby_extern)
-
-XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
+AC_DEFINE_UNQUOTED([NORETURN(x)], $rb_cv_noreturn)
 
 dnl Check whether we need to define sys_nerr locally
 AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
@@ -372,45 +270,24 @@ 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"
-		CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE"
-		AC_TRY_CPP([#include <AvailabilityMacros.h>
-		    #if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
-		    #error pre OS X 10.4
-		    [!<===== pre OS X 10.4 =====>]
-		    #endif
-		    ],
-		    [
-		    test "x$target_cpu" = xppc && ac_cv_header_ucontext_h=no
-		    ],
-		    [
-		    AC_DEFINE(BROKEN_SETREUID, 1)
-		    AC_DEFINE(BROKEN_SETREGID, 1)
-		    ])
-		;;
+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*)	;;
-mingw*)		if test "$with_winsock2" = yes; then
-		  LIBS="-lws2_32 $LIBS"
-		else
-		  LIBS="-lwsock32 $LIBS"
-		fi
-		LIBS="-lshell32 $LIBS"
+beos*)		;;
+cygwin*)	rb_cv_have_daylight=no
+		ac_cv_var_tzname=no
+		ac_cv_func__setjmp=no
+		ac_cv_func_setitimer=no
+		;;
+mingw*)		LIBS="-lwsock32 $LIBS"
 		ac_cv_header_a_out_h=no
 		ac_cv_header_pwd_h=no
 		ac_cv_header_utime_h=no
@@ -418,7 +295,6 @@ mingw*)		if test "$with_winsock2" = yes; then
 		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
@@ -429,29 +305,15 @@ mingw*)		if test "$with_winsock2" = yes; then
 		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_DEFINE(BROKEN_SETREUID, 1)
-		AC_DEFINE(BROKEN_SETREGID, 1)
-                ac_cv_sizeof_rlim_t=8;;
 freebsd*)	LIBS="-lm $LIBS"
 		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
 		  rb_cv_lib_xpg4_needed,
@@ -480,22 +342,13 @@ freebsd*)	LIBS="-lm $LIBS"
 			   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
+			if test ; 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)
@@ -513,30 +366,14 @@ 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\
+AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.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_UID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_ST_BLKSIZE
 AC_STRUCT_ST_BLOCKS
@@ -545,83 +382,21 @@ 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_ALLOCA
 AC_FUNC_MEMCMP
 AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(ftello)
-AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
+AC_REPLACE_FUNCS(dup2 memmove mkdir 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 ftruncate 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\
-	      group_member dlopen sigprocmask\
-	      sigaction sigsetjmp _setjmp _longjmp setsid telldir seekdir fchmod\
-	      mktime timegm gettimeofday\
-	      cosh sinh tanh round setuid setgid setenv unsetenv)
-
-AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
-[AC_TRY_LINK([@%:@include <setjmp.h>
-    jmp_buf jb; void t(v) int v; {__builtin_longjmp(jb, v);}],
-    [__builtin_setjmp(jb);],
-    [ac_cv_func___builtin_setjmp=yes],
-    [ac_cv_func___builtin_setjmp=no])
-])
-
-test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
-
-AC_MSG_CHECKING(for setjmp type)
-AC_ARG_WITH(setjmp-type, 
-	[  --with-setjmp-type      select setjmp type], [
-	case $withval in
-	__builtin_setjmp) setjmp_prefix=__builtin_;;
-	_setjmp) setjmp_prefix=_;;
-	sigsetjmp) setjmp_prefix=sig;;
-	setjmp) setjmp_prefix=;;
-	'') unset setjmp_prefix;;
-	*)   AC_MSG_ERROR(invalid setjmp type: $withval);;
-	esac], [unset setjmp_prefix])
-if test ${setjmp_prefix+set}; then
-    if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp = no; then
-	AC_MSG_ERROR(${setjmp_prefix}setjmp is not available)
-    fi
-elif test "$ac_cv_func___builtin_setjmp" = yes; then
-    setjmp_prefix=__builtin_
-elif test "$ac_cv_func__setjmp" = yes; then
-    setjmp_prefix=_
-elif test "$ac_cv_func_sigsetjmp" = yes; then
-    case $target_os in
-    solaris*|cygwin*)
-	setjmp_prefix=;;
-    *)
-	setjmp_prefix=sig;;
-    esac
-else
-    setjmp_prefix=
-fi
-if test x$setjmp_prefix = xsig; then
-    setjmp_sigmask=yes
-else
-    unset setjmp_sigmask
-fi
-AC_MSG_RESULT(${setjmp_prefix}setjmp)
-AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp(env${setjmp_sigmask+,0})])
-AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp(env,val)])
-AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
-
+AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd\
+	      truncate chsize times utimes fcntl lockf lstat symlink readlink\
+	      setitimer setruid seteuid setreuid setresuid setproctitle\
+	      setrgid setegid setregid setresgid issetugid pause lchown lchmod\
+	      getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
+	      getpriority getrlimit dlopen sigprocmask sigaction _setjmp\
+	      setsid telldir seekdir fchmod mktime timegm cosh sinh tanh\
+	      setuid setgid)
 AC_ARG_ENABLE(setreuid,
        [  --enable-setreuid       use setreuid()/setregid() according to need even if obsolete.],
        [use_setreuid=$enableval])
@@ -647,50 +422,6 @@ AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
 if test "$rb_cv_have_daylight" = yes; then
   AC_DEFINE(HAVE_DAYLIGHT)
 fi
-AC_DEFUN([RUBY_CHECK_VARTYPE], [dnl
-AC_CACHE_CHECK([for external $1], rb_cv_var_$1,
-  [rb_cv_var_$1=no
-  AC_TRY_COMPILE([
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 1
-#endif
-$2
-;
-const volatile void *volatile t;],
-    [t = &(&$1)[0];],
-    [for t in $3; do
-      AC_TRY_COMPILE([
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 1
-#endif
-$2
-;
-extern $t $1;
-const volatile void *volatile t;],
-        [t = &(&$1)[0];],
-        [rb_cv_var_$1=$t; break])
-    done])])
-if test "[$rb_cv_var_]$1" != no; then
-  AC_DEFINE([HAVE_VAR_]m4_toupper($1))
-  AC_DEFINE_UNQUOTED([TYPEOF_VAR_]m4_toupper($1), $rb_cv_var_$1)
-fi])
-RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
-RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
-if test "$rb_cv_var_timezone" = no; then
-  AC_CHECK_FUNCS(timezone)
-  if test "$ac_cv_func_timezone" = yes; then
-    AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
-      [AC_TRY_COMPILE([@%:@include <time.h>],
-	[(void)timezone(0, 0);],
-	[rb_cv_func_timezone_void=no],
-	[rb_cv_func_timezone_void=yes])]
-    )
-    if test $rb_cv_func_timezone_void = yes; then
-      AC_DEFINE(TIMEZONE_VOID)
-    fi
-  fi
-fi
-
 AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
   [AC_TRY_RUN([
 #include <time.h>
@@ -732,7 +463,6 @@ fi
 if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
    AC_DEFINE(POSIX_SIGNAL)
 else
-  AC_CHECK_FUNCS(sigsetmask)
   AC_CACHE_CHECK(for BSD signal semantics, rb_cv_bsd_signal,
     [AC_TRY_RUN([
 #include <stdio.h>
@@ -755,7 +485,7 @@ main()
 ],
 	rb_cv_bsd_signal=yes,
 	rb_cv_bsd_signal=no,
-	rb_cv_bsd_signal=$ac_cv_func_sigsetmask)])
+	rb_cv_bsd_signal=no)])
   if test "$rb_cv_bsd_signal" = yes; then
     AC_DEFINE(BSD_SIGNAL)
   fi
@@ -770,21 +500,6 @@ 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
@@ -869,7 +584,7 @@ else
   fi
 fi
 
-AC_DEFUN([RUBY_CHECK_IO_NEED],
+AC_DEFUN(RUBY_CHECK_IO_NEED,
 [AC_CACHE_CHECK(whether need to [$1], [$2],
     [AC_TRY_RUN([
 #include <stdio.h>
@@ -944,22 +659,6 @@ 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;;
@@ -985,41 +684,47 @@ int main()
 ], 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
+if test "$enable_pthread" = "yes"; then
+   AC_CHECK_LIB(pthread, pthread_kill, 
+                rb_with_pthread=yes, rb_with_pthread=no)
+   if test "$rb_with_pthread" = "yes"; then
+      LIBS="-lpthread $LIBS"
+      AC_DEFINE(_REENTRANT)
+      AC_DEFINE(_THREAD_SAFE)
+      AC_DEFINE(HAVE_LIBPTHREAD)
+   else
+      AC_CHECK_LIB(pthreads, pthread_kill, 
+                   rb_with_pthread=yes, rb_with_pthread=no)
+      if test "$rb_with_pthread" = "yes"; then
+         LIBS="-lpthreads $LIBS"
+	 AC_DEFINE(_REENTRANT)
+	 AC_DEFINE(_THREAD_SAFE)
+	 AC_DEFINE(HAVE_LIBPTHREAD)
+      else
+         AC_CHECK_LIB(c, pthread_kill, 
+                      rb_with_pthread=yes, rb_with_pthread=no)
+         if test "$rb_with_pthread" = "yes"; then
+            AC_DEFINE(_REENTRANT)
+	    AC_DEFINE(_THREAD_SAFE)
+	    AC_DEFINE(HAVE_LIBPTHREAD)
+         else
+	    AC_CHECK_LIB(c_r, pthread_kill, 
+                         rb_with_pthread=yes, rb_with_pthread=no)
+	    if test "$rb_with_pthread" = "yes"; then
+	       AC_DEFINE(_REENTRANT)
+	       AC_DEFINE(_THREAD_SAFE)
+	       AC_DEFINE(HAVE_LIBPTHREAD)
+	       MAINLIBS="-pthread $MAINLIBS"
+	    else
+	       AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
+	    fi
+         fi
+      fi
+   fi
+   AC_CHECK_FUNC(nanosleep)
+   if test "$ac_cv_func_nanosleep" = "no"; then
+       AC_CHECK_LIB(rt, nanosleep, AC_DEFINE(HAVE_NANOSLEEP))
+   fi
 fi
 
 dnl default value for $KANJI
@@ -1071,12 +776,21 @@ if test "$rb_cv_binary_elf" = yes; then
 fi
 
 case "$target_os" in
-linux* | gnu* | k*bsd*-gnu | bsdi*)
+linux*)
     if test "$rb_cv_binary_elf" = no; then
 	with_dln_a_out=yes
+	target_os=${target_os}-a_out
     else
 	LDFLAGS="$LDFLAGS -rdynamic"
     fi;;
+netbsd*|openbsd*)
+    if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
+    then
+	netbsd_elf=yes
+    else
+	netbsd_elf=no
+    fi
+    ;;
 esac
 LIBEXT=a
 
@@ -1103,7 +817,13 @@ if test "$with_dln_a_out" != yes; then
     openstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
     rhapsody*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
     darwin*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
+    human*)	;;
+    bsdi*)	;;
+    beos*)	;;
+    cygwin*)	;;
+    mingw*)	;;
+    aix*)	;;
+    netbsd*) CCDLFLAGS="$CCDLFLAGS -fPIC";;
     *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
     esac
   else
@@ -1116,28 +836,16 @@ if test "$with_dln_a_out" != yes; then
     esac
   fi
 
-
-  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
-
   case "$target_os" in
 	hpux*)		DLDFLAGS="$DLDFLAGS -E"
 			: ${LDSHARED='ld -b'}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			: ${LIBPATHENV=SHLIB_PATH}
-			if test "$rb_cv_prog_gnu_ld" = no; then
-			    RPATHFLAG=' +b %1$-s'
-			fi
 			rb_cv_dlopen=yes;;
 	solaris*) 	if test "$GCC" = yes; then
-                          : ${LDSHARED='$(CC) -shared'}
+			   : ${LDSHARED='$(CC) -Wl,-G'}
 			   if test "$rb_cv_prog_gnu_ld" = yes; then
 	 		       LDFLAGS="$LDFLAGS -Wl,-E"
+			       LDSHARED="$LDSHARED -shared"
 			   fi
 			else
 			   : ${LDSHARED='ld -G'}
@@ -1155,21 +863,12 @@ if test "$with_dln_a_out" != yes; then
 			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"
+	linux*) 	: ${LDSHARED="$CC -shared"}
 			rb_cv_dlopen=yes ;;
-	freebsd*|dragonfly*)       : ${LDSHARED="$CC -shared"}
+	gnu*)   	: ${LDSHARED="$CC -shared"}
+			rb_cv_dlopen=yes
+			LDFLAGS="$LDFLAGS -rdynamic" ;;
+	freebsd*)       : ${LDSHARED="$CC -shared"}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -rdynamic"
 			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
@@ -1177,11 +876,25 @@ if test "$with_dln_a_out" != yes; then
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
 			fi
 			rb_cv_dlopen=yes ;;
+	netbsd*)	: ${LDSHARED='${CC} -shared'}
+			if test "$rb_cv_binary_elf" = yes; then
+			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+			    LIBPATHFLAG=' -L%1$-s'
+			    RPATHFLAG=' -Wl,-R%1$-s'
+			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 ;;
+	bsdi3*) 	case "$CC" in
+			*shlicc*)	: ${LDSHARED="$CC -r"}
+					rb_cv_dlopen=yes ;;
+			esac ;;
+	bsdi*)		: ${LDSHARED="ld -shared"}
+			LDFLAGS="$LDFLAGS "'-rdynamic -Wl,-rpath,$(libdir)/ruby/$(MAJOR).$(MINOR)/i386-bsdi4.0'
+			rb_cv_dlopen=yes ;;
 	nextstep*)	: ${LDSHARED='cc -r -nostdlib'}
 			LDFLAGS="$LDFLAGS -u libsys_s"
 			rb_cv_dlopen=yes ;;
@@ -1193,21 +906,14 @@ if test "$with_dln_a_out" != yes; then
 			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='$(CC)'}
-			fi
-			LDSHARED="$LDSHARED ${linker_flag}-G"
-			DLDFLAGS='-eInit_$(TARGET)'
-			XLDFLAGS="${linker_flag}-bE:ruby.imp ${linker_flag}-brtl"
-                        : ${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 ;;
+	aix*)		: ${LDSHARED='/usr/ccs/bin/ld'}
+			XLDFLAGS="$XLDFLAGS -Wl,-bE:ruby.imp"
+			DLDFLAGS="$DLDFLAGS "'-brtl -eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 -lc'
+			: LDFLAGS="$LDFLAGS -brtl"
+			: ${ARCHFILE="ruby.imp"}
+			rb_cv_dlopen=yes ;;
+
 	human*)		: ${DLDFLAGS=''}
 			: ${LDSHARED=''}
 			: ${LDFLAGS=''}
@@ -1223,7 +929,6 @@ if test "$with_dln_a_out" != yes; then
 			    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'}
@@ -1231,8 +936,7 @@ if test "$with_dln_a_out" != yes; then
 			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=""}
+			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-import,--export-all"
 			rb_cv_dlopen=yes ;;
 	hiuxmpp)	: ${LDSHARED='ld -r'} ;;
 	atheos*) 	: ${LDSHARED="$CC -shared"}
@@ -1246,8 +950,6 @@ 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
@@ -1275,24 +977,30 @@ if test "$dln_a_out_works" = yes; then
     STATIC=-Bstatic
   fi
   DLEXT=so
+  AC_DEFINE(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;;
+    hpux*)	DLEXT=sl
+	 	AC_DEFINE(DLEXT, ".sl");;
+    nextstep*)	DLEXT=bundle
+	 	AC_DEFINE(DLEXT, ".bundle");;
+    openstep*)	DLEXT=bundle
+	 	AC_DEFINE(DLEXT, ".bundle");;
+    rhapsody*)	DLEXT=bundle
+	 	AC_DEFINE(DLEXT, ".bundle");;
+    darwin*)	DLEXT=bundle
+	 	AC_DEFINE(DLEXT, ".bundle");;
+    os2-emx*)	DLEXT=dll
+	 	AC_DEFINE(DLEXT, ".dll");;
+    cygwin*|mingw*)	DLEXT=so
+	 	AC_DEFINE(DLEXT, ".so")
+		DLEXT2=dll
+	 	AC_DEFINE(DLEXT2, ".dll");;
+    *)		DLEXT=so
+    		AC_DEFINE(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
@@ -1302,7 +1010,9 @@ else
 fi
 
 case "$target_os" in
-  linux* | gnu* | k*bsd*-gnu)
+  linux*)
+	STRIP='strip -S -x';;
+  gnu*)
 	STRIP='strip -S -x';;
   nextstep*)
 	STRIP='strip -A -n';;
@@ -1328,7 +1038,7 @@ case "$target_os" in
   human*)
     AC_CHECK_LIB(signal, _harderr)
     AC_CHECK_LIB(hmem, hmemset)
-    AC_CHECK_FUNCS(select)
+    AC_CHECK_FUNCS(select gettimeofday)
     AC_CACHE_CHECK(whether PD libc _dtos18 fail to convert big number,
 		   rb_cv_missing__dtos18,
     [AC_TRY_RUN(
@@ -1399,17 +1109,12 @@ 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) -I$(srcdir)/lib'
-  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
-  PREP='miniruby$(EXEEXT)'
-  RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
+  MINIRUBY='./miniruby$(EXEEXT)'
+  PREP=''
 fi
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
-AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
 
 FIRSTMAKEFILE=""
 LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
@@ -1450,11 +1155,15 @@ if test "$enable_shared" = 'yes'; then
     sunos4*)
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;
-    linux* | gnu* | k*bsd*-gnu | atheos*)
+    linux*)
+	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'
+	;;
+    gnu*)
 	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*)
+    freebsd*)
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
 	if test "$rb_cv_binary_elf" != "yes" ; then
@@ -1466,6 +1175,7 @@ if test "$enable_shared" = 'yes'; then
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
+	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
 	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
@@ -1477,12 +1187,6 @@ if test "$enable_shared" = 'yes'; then
 	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*)
@@ -1491,8 +1195,14 @@ if test "$enable_shared" = 'yes'; then
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
 	;;
     aix*)
-	LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS"
-	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
+	if test "$GCC" = yes; then
+	    LIBRUBY_LDSHARED='$(CC) -shared'
+	    LIBRUBY_DLDFLAGS='-Wl,-bE:ruby.imp'
+	else
+	    LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
+	    LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry'
+	fi
+	LIBRUBYARG_SHARED='-L${libdir} -Wl,lib$(RUBY_SO_NAME).so'
 	SOLIBS='-lm -lc'
 	;;
     beos*)
@@ -1508,34 +1218,18 @@ if test "$enable_shared" = 'yes'; then
 	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)'
+    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'
 	;;
     *)
 	;;
   esac
 fi
-if test "$enable_rpath" = yes; then
-    LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
-fi
-
-LDFLAGS="-L. $LDFLAGS"
+XLDFLAGS="$XLDFLAGS -L."
 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
-    linux*)
-	XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
-	;;
     netbsd*)
     	CFLAGS="$CFLAGS -pipe"
 	;;
@@ -1555,7 +1249,6 @@ case "$target_os" in
 	;;
     darwin*)
     	CFLAGS="$CFLAGS -pipe -fno-common"
-	MINIOBJS=dmydln.o
 	;;
     os2-emx)
     	CFLAGS="$CFLAGS -DOS2 -Zmts"
@@ -1578,7 +1271,7 @@ case "$target_os" in
 	  rm -f /tmp/main.o
 	  CFLAGS="$CFLAGS -std"
 	fi
-	;;
+		;;
     beos*)
 	case "$target_cpu" in
 	powerpc*)
@@ -1593,19 +1286,21 @@ case "$target_os" in
 		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}
+	    RUBY_SO_NAME=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_MACROS="WIN32_LEAN_AND_MEAN="
 	    COMMON_HEADERS="windows.h winsock.h"
 	    ;;
 	esac
+	XCFLAGS="$XCFLAGS"
 	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
 	LIBRUBY_ALIASES=''
 	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
@@ -1615,7 +1310,6 @@ case "$target_os" in
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
-	MINIOBJS=dmydln.o
 	;;
     hpux*)
 	case "$YACC" in
@@ -1624,7 +1318,6 @@ case "$target_os" in
 	    YACC="$YACC -Nl40000 -Nm40000"
 	    ;;
 	esac
-	MINIOBJS=dmydln.o
 	;;
     *)
 	;;
@@ -1634,13 +1327,6 @@ case "$build_os" in
   *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
 esac
 
-CPPFLAGS="$CPPFLAGS "'$(DEFS)'
-test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}'
-test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
-AC_SUBST(cppflags, [])dnl
-AC_SUBST(cflags, ['${optflags} ${debugflags}'])dnl
-AC_SUBST(optflags)dnl
-AC_SUBST(debugflags)dnl
 AC_SUBST(XCFLAGS)dnl
 AC_SUBST(XLDFLAGS)dnl
 AC_SUBST(LIBRUBY_LDSHARED)
@@ -1664,7 +1350,6 @@ 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`"
@@ -1685,53 +1370,37 @@ case "$target_os" in
     rubyw_install_name="$RUBYW_INSTALL_NAME"
     ;;
 esac
-RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
-
-AC_ARG_WITH(sitedir,
-	    [  --with-sitedir=DIR      site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
-            [sitedir=$withval],
-            [sitedir='${libdir}/ruby/site_ruby'])
-SITE_DIR=`eval echo \\"${sitedir}\\"`
-
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
-    RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-    RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
+    RUBY_LIB_PREFIX="/lib/ruby"
     ;;
   *)
-    RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-    RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
+    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
     ;;
 esac
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
-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_ARG_WITH(vendordir,
-	    [  --with-vendordir=DIR    vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]],
-            [vendordir=$withval],
-            [vendordir='${libdir}/ruby/vendor_ruby'])
-VENDOR_DIR=`eval echo \\"${vendordir}\\"`
+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_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-    ;;
+    RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
+    RUBY_SITE_LIB_PATH="$SITE_DIR";;
   *)
-    RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-    ;;
+    RUBY_SITE_LIB_PATH="$SITE_DIR";;
 esac
-RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
+RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
 
-AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
-AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
+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
-AC_SUBST(vendordir)dnl
 
 configure_args=$ac_configure_args
 AC_SUBST(configure_args)dnl
@@ -1744,8 +1413,6 @@ if test "$fat_binary" != no ; then
 
     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
                  "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-    AC_DEFINE_UNQUOTED(RUBY_VENDOR_THIN_ARCHLIB,
-                 "${RUBY_VENDOR_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
 else
     arch="${target_cpu}-${target_os}"
@@ -1753,13 +1420,12 @@ else
 fi
 
 case "$target_os" in
-  mingw*) sitearch="$target_cpu-$rb_cv_msvcrt" ;;
+  mingw*) sitearch="i386-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_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, "${RUBY_VENDOR_LIB_PATH2}/${sitearch}")
 
 AC_ARG_WITH(search-path,
 		[  --with-search-path=DIR specify the additional search path],
@@ -1796,15 +1462,7 @@ else
   echo "creating config.h"
   tr -d '\015' < confdefs.h > config.h
 fi
-tr -d '\015' < largefile.h > confdefs.h
-rm largefile.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])
+: > confdefs.h
+
+AC_CONFIG_FILES([$FIRSTMAKEFILE Makefile])
 AC_OUTPUT
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 03208df11c..da9efaab47 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,14 +1,11 @@
 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)
@@ -27,10 +24,6 @@ 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@
@@ -38,7 +31,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 %.res.@OBJEXT@: %.rc
 	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RCFILES): $(RBCONFIG)
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc: rbconfig.rb
 	@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
 	  -so_name=$(DLL_BASE_NAME) \
@@ -51,7 +44,7 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
 $(RUBY_EXP): $(LIBRUBY_A)
-	$(DLLWRAP) \
+	@DLLWRAP@ --target=@target_os@ --driver-name=$(CC) \
 	  --output-exp=$(RUBY_EXP) \
 	  --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
 	$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
@@ -70,9 +63,3 @@ cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
 	@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/defines.h b/defines.h
index f39097fea4..af5f3bba02 100644
--- a/defines.h
+++ b/defines.h
@@ -82,10 +82,6 @@ void xfree _((void*));
 # 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
@@ -102,100 +98,41 @@ void xfree _((void*));
 #endif
 #endif
 
-#if defined(__NeXT__) || defined(__APPLE__)
-/* 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
-#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
+#define S_IXGRP 0000010         /* execute/search permission, group */
+#define S_IXOTH 0000001         /* execute/search permission, other */
 #ifndef __APPLE__
-/* NextStep, OpenStep (but not Rhapsody) */
-#ifndef GETPGRP_VOID
+#define S_IXUSR _S_IXUSR        /* execute/search permission, owner */
 #define GETPGRP_VOID 1
-#endif
-#ifndef WNOHANG
 #define WNOHANG 01
-#endif
-#ifndef WUNTRACED
 #define WUNTRACED 02
-#endif
-#ifndef X_OK
 #define X_OK 1
+typedef int pid_t;
+/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may
+   result in a different endian. */
+#undef WORDS_BIGENDIAN
+#ifdef __BIG_ENDIAN__
+#define WORDS_BIGENDIAN
+#endif
 #endif
-#endif /* __APPLE__ */
 #endif /* NeXT */
 
+#ifdef __CYGWIN__
+#undef _WIN32
+#endif
 #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 */
+#include "vms/vms.h"
 #endif
 
-#ifdef RUBY_EXPORT
 #undef RUBY_EXTERN
+#if defined _WIN32 && !defined __GNUC__
+# ifndef RUBY_EXPORT
+#  define RUBY_EXTERN extern __declspec(dllimport)
+# endif
 #endif
 
 #ifndef RUBY_EXTERN
@@ -206,11 +143,6 @@ void xfree _((void*));
 #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)
@@ -221,19 +153,17 @@ flush_register_windows(void)
 #endif
 # if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
 	("flushw")
-# else
+# 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
+#endif 
 
 #if defined(DOSISH)
 #define PATH_SEP ";"
@@ -254,18 +184,6 @@ void rb_ia64_flushrs(void);
 #define ENV_IGNORECASE
 #endif
 
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH || defined __VMS
-#   define CASEFOLD_FILESYSTEM 1
-# else
-#   define CASEFOLD_FILESYSTEM 0
-# endif
-#endif
-
-#ifndef DLEXT_MAXLEN
-#define DLEXT_MAXLEN 4
-#endif
-
 #ifndef RUBY_PLATFORM
 #define RUBY_PLATFORM "unknown-unknown"
 #endif
diff --git a/dir.c b/dir.c
index c2c3f9452f..07dd806ba7 100644
--- a/dir.c
+++ b/dir.c
@@ -63,287 +63,166 @@ char *strchr _((char*,char));
 
 #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
+#ifndef HAVE_LSTAT
+#define lstat(path,st) stat(path,st)
 #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? */
+#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
 
-    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 */
-	}
-    }
+#if defined DOSISH
+#define isdirsep(c) ((c) == '/' || (c) == '\\')
+#else
+#define isdirsep(c) ((c) == '/')
 #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 */
+range(pat, test, flags)
+    char *pat;
+    char test;
     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++;
-    }
+    int not, ok = 0;
+    int nocase = flags & FNM_CASEFOLD;
+    int escape = !(flags & FNM_NOESCAPE);
 
-    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;
+    not = *pat == '!' || *pat == '^';
+    if (not)
+	pat++;
+
+    test = downcase(test);
+
+    while (*pat) {
+	int cstart, cend;
+	cstart = cend = *pat++;
+	if (cstart == ']')
+	    return ok == not ? 0 : pat;
+        else if (escape && cstart == '\\')
+	    cstart = cend = *pat++;
+	if (*pat == '-' && pat[1] != ']') {
+	    if (escape && pat[1] == '\\')
+		pat++;
+	    cend = pat[1];
+	    if (!cend)
+		return 0;
+	    pat += 2;
 	}
-	else
-	    if (!ok && Compare(t1, s) == 0)
-		ok = 1;
+	if (downcase(cstart) <= test && test <= downcase(cend))
+	    ok = 1;
     }
-
-    return ok == not ? NULL : (char *)p + 1;
+    return 0;
 }
 
-/* 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);
-
+#define ISDIRSEP(c) (pathname && isdirsep(c))
+#define PERIOD(s) (period && *(s) == '.' && \
+		  ((s) == string || ISDIRSEP((s)[-1])))
 static int
-fnmatch_helper(pcur, scur, flags)
-    const char **pcur; /* pattern */
-    const char **scur; /* string */
+fnmatch(pat, string, flags)
+    const char *pat;
+    const char *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;
+    int c;
+    int test;
+    const char *s = string;
+    int escape = !(flags & FNM_NOESCAPE);
+    int pathname = flags & FNM_PATHNAME;
+    int period = !(flags & FNM_DOTMATCH);
+    int nocase = flags & FNM_CASEFOLD;
 
-    const char *p = *pcur;
-    const char *s = *scur;
+    while (c = *pat++) {
+	switch (c) {
+	case '?':
+	    if (!*s || ISDIRSEP(*s) || PERIOD(s))
+		return FNM_NOMATCH;
+	    s++;
+	    break;
+	case '*':
+	    while ((c = *pat++) == '*')
+		;
 
-    if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
-	RETURN(FNM_NOMATCH);
+	    if (PERIOD(s))
+		return FNM_NOMATCH;
 
-    while (1) {
-	switch (*p) {
-	  case '*':
-	    do { p++; } while (*p == '*');
-	    if (ISEND(UNESCAPE(p))) {
-		p = UNESCAPE(p);
-		RETURN(0);
+	    if (!c) {
+		if (pathname && *rb_path_next(s))
+		    return FNM_NOMATCH;
+		else
+		    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)) != 0) {
-		p = t;
-		Inc(s);
-		continue;
+	    else if (ISDIRSEP(c)) {
+		s = rb_path_next(s);
+		if (*s) {
+                    s++;
+		    break;
+                }
+		return FNM_NOMATCH;
 	    }
-	    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)
+	    test = escape && c == '\\' ? *pat : c;
+	    test = downcase(test);
+	    pat--;
+	    while (*s) {
+		if ((c == '[' || downcase(*s) == test) &&
+		    !fnmatch(pat, s, flags | FNM_DOTMATCH))
 		    return 0;
-	    }
-	    /* failed : try next recursion */
-	    if (ptmp && stmp && !(period && *stmp == '.')) {
-		while (*stmp && *stmp != '/') Inc(stmp);
-		if (*stmp) {
-		    p = ptmp;
-		    stmp++;
-		    s = stmp;
-		    continue;
-		}
+		else if (ISDIRSEP(*s))
+		    break;
+		s++;
 	    }
 	    return FNM_NOMATCH;
+      
+	case '[':
+	    if (!*s || ISDIRSEP(*s) || PERIOD(s))
+		return FNM_NOMATCH;
+	    pat = range(pat, *s, flags);
+	    if (!pat)
+		return FNM_NOMATCH;
+	    s++;
+	    break;
+
+	case '\\':
+	    if (escape
+#if defined DOSISH
+		&& *pat && strchr("*?[\\", *pat)
+#endif
+		) {
+		c = *pat;
+		if (!c)
+		    c = '\\';
+		else
+		    pat++;
+	    }
+	    /* FALLTHROUGH */
+
+	default:
+#if defined DOSISH
+	    if (ISDIRSEP(c) && isdirsep(*s))
+		;
+	    else
+#endif
+	    if(downcase(c) != downcase(*s))
+		return FNM_NOMATCH;
+	    s++;
+	    break;
 	}
     }
-    else
-	return fnmatch_helper(&p, &s, flags);
+    return !*s ? 0 : FNM_NOMATCH;
 }
 
 VALUE rb_cDir;
@@ -357,11 +236,7 @@ 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);
+    if (dir && dir->dir) closedir(dir->dir);
 }
 
 static VALUE dir_close _((VALUE));
@@ -424,7 +299,6 @@ dir_initialize(dir, dirname)
  *  the block, and <code>Dir::open</code> returns the value of the
  *  block.
  */
-
 static VALUE
 dir_s_open(klass, dirname)
     VALUE klass, dirname;
@@ -446,46 +320,13 @@ 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;
-
-    Data_Get_Struct(dir, struct dir_data, dirp);
-    if (dirp->path) {
-	const 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.
@@ -499,7 +340,7 @@ dir_path(dir)
 {
     struct dir_data *dirp;
 
-    Data_Get_Struct(dir, struct dir_data, dirp);
+    GetDIR(dir, dirp);
     if (!dirp->path) return Qnil;
     return rb_str_new2(dirp->path);
 }
@@ -562,9 +403,7 @@ dir_each(dir)
     struct dir_data *dirp;
     struct dirent *dp;
 
-    RETURN_ENUMERATOR(dir, 0, 0);
     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();
@@ -620,11 +459,10 @@ 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);
+    GetDIR(dir, dirp);
+    seekdir(dirp->dir, NUM2INT(pos));
     return dir;
 #else
     rb_notimplement();
@@ -670,9 +508,6 @@ dir_rewind(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;
@@ -703,42 +538,24 @@ dir_close(dir)
 
 static void
 dir_chdir(path)
-    VALUE path;
+    const char *path;
 {
-    if (chdir(RSTRING(path)->ptr) < 0)
-	rb_sys_fail(RSTRING(path)->ptr);
+    if (chdir(path) < 0)
+	rb_sys_fail(path);
 }
 
 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;
+chdir_restore(path)
+    char *path;
 {
-    if (args->done) {
-	chdir_blocking--;
-	if (chdir_blocking == 0)
-	    chdir_thread = Qnil;
-	dir_chdir(args->old_path);
-    }
+    chdir_blocking--;
+    if (chdir_blocking == 0)
+	chdir_thread = Qnil;
+    dir_chdir(path);
+    free(path);
     return Qnil;
 }
 
@@ -788,18 +605,19 @@ dir_s_chdir(argc, argv, obj)
     VALUE obj;
 {
     VALUE path = Qnil;
+    char *dist = "";
 
     rb_secure(2);
     if (rb_scan_args(argc, argv, "01", &path) == 1) {
 	SafeStringValue(path);
+	dist = RSTRING(path)->ptr;
     }
     else {
-	const char *dist = getenv("HOME");
+	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) {
@@ -808,15 +626,14 @@ dir_s_chdir(argc, argv, obj)
     }
 
     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);
+	chdir_blocking++;
+	if (chdir_thread == Qnil)
+	    chdir_thread = rb_thread_current();
+	dir_chdir(dist);
+	return rb_ensure(rb_yield, path, chdir_restore, (VALUE)cwd);
     }
-    dir_chdir(path);
+    dir_chdir(dist);
 
     return INT2FIX(0);
 }
@@ -918,8 +735,13 @@ dir_s_mkdir(argc, argv, obj)
     }
 
     check_dirname(&path);
+#ifndef _WIN32
     if (mkdir(RSTRING(path)->ptr, mode) == -1)
 	rb_sys_fail(RSTRING(path)->ptr);
+#else
+    if (mkdir(RSTRING(path)->ptr) == -1)
+	rb_sys_fail(RSTRING(path)->ptr);
+#endif
 
     return INT2FIX(0);
 }
@@ -944,259 +766,93 @@ dir_s_rmdir(obj, dir)
     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;
+has_magic(s, send, flags)
+     char *s, *send;
+     int flags;
 {
-    const int escape = !(flags & FNM_NOESCAPE);
-    const int nocase = flags & FNM_CASEFOLD;
-
-    register const char *p = s;
+    register char *p = s;
     register char c;
+    int open = 0;
+    int escape = !(flags & FNM_NOESCAPE);
 
-    while ((c = *p++) != 0) {
+    while ((c = *p++) != '\0') {
 	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;
+	  case '*':
+	    return Qtrue;
 
-    while ((c = *p++) != 0) {
-	switch (c) {
-	  case '[':
-	    open = 1;
-	    continue;
+	  case '[':	/* Only accept an open brace if there is a close */
+	    open++;	/* brace to match it.  Bracket expressions must be */
+	    continue;	/* complete, according to Posix.2 */
 	  case ']':
-	    open = 0;
-	    continue;
-
-	  case '/':
-	    if (!open)
-		return (char *)p-1;
+	    if (open)
+		return Qtrue;
 	    continue;
 
 	  case '\\':
-	    if (escape && !(c = *p++))
-		return (char *)p-1;
-	    continue;
+	    if (escape && *p++ == '\0')
+		return Qfalse;
 	}
 
-	p = Next(p-1);
+	if (send && p >= send) break;
     }
-
-    return (char *)p-1;
+    return Qfalse;
 }
 
-/* Remove escaping backslashes */
-static void
-remove_backslashes(p)
-    char *p;
+static char*
+extract_path(p, pend)
+    char *p, *pend;
 {
-    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);
+    char *alloc;
+    int len;
+
+    len = pend - p;
+    alloc = ALLOC_N(char, len+1);
+    memcpy(alloc, p, len);
+    if (len > 1 && pend[-1] == '/'
+#if defined DOSISH_DRIVE_LETTER
+    && pend[-2] != ':'
+#endif
+    ) {
+	alloc[len-1] = 0;
+    }
+    else {
+	alloc[len] = 0;
     }
 
-    while (*p++);
-
-    if (t != s)
-	memmove(t, s, p - s); /* move '\0' too */
+    return alloc;
 }
 
-/* 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)
+static char*
+extract_elem(path)
+    char *path;
 {
-    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;
-    }
+    char *pend;
 
-    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;
+    pend = strchr(path, '/');
+    if (!pend) pend = path + strlen(path);
 
-    return list;
+    return extract_path(path, pend);
 }
 
 static void
-glob_free_pattern(struct glob_pattern *list)
+remove_backslashes(p)
+    char *p;
 {
-    while (list) {
-	struct glob_pattern *tmp = list;
-	list = list->next;
-	if (tmp->str)
-	    free(tmp->str);
-	free(tmp);
-    }
-}
+    char *pend = p + strlen(p);
+    char *t = p;
 
-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++;
+    while (p < pend) {
+	if (*p == '\\') {
+	    if (++p == pend) break;
+	}
+	*t++ = *p++;
     }
-    strcpy(buf+len, name);
-    return buf;
+    *t = '\0';
 }
 
-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
@@ -1214,516 +870,370 @@ 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_call_func(func, path, arg)
+    void (*func) _((const char*, VALUE));
+    const char *path;
+    VALUE arg;
+{
+    int status;
+    struct glob_args args;
 
-static int glob_helper _((const char *, int, enum answer, enum answer, struct glob_pattern **, struct glob_pattern **, int, ruby_glob_func *, VALUE));
+    args.func = func;
+    args.c = path;
+    args.v = arg;
+
+    rb_protect(glob_func_caller, (VALUE)&args, &status);
+    return status;
+}
 
 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;
+glob_helper(path, sub, flags, func, arg)
+    char *path;
+    char *sub;
     int flags;
-    ruby_glob_func *func;
+    void (*func) _((const char*, VALUE));
     VALUE arg;
 {
     struct stat st;
+    char *p, *m;
     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;
+    p = sub ? sub : path;
+    if (!has_magic(p, 0, flags)) {
+#if defined DOSISH
+	remove_backslashes(path);
+#else
+	if (!(flags & FNM_NOESCAPE)) remove_backslashes(p);
+#endif
+	if (lstat(path, &st) == 0) {
+	    status = glob_call_func(func, path, arg);
+	    if (status) return status;
 	}
-	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");
+	else if (errno != ENOENT) {
+	    /* In case stat error is other than ENOENT and
+	       we may want to know what is wrong. */
+	    rb_sys_warning(path);
 	}
+	return 0;
     }
 
-    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;
+    while (p && !status) {
+	if (*p == '/') p++;
+	m = strchr(p, '/');
+	if (has_magic(p, m, flags)) {
+	    char *dir, *base, *magic, *buf;
+	    DIR *dirp;
+	    struct dirent *dp;
+	    int recursive = 0;
+
+	    struct d_link {
+		char *path;
+		struct d_link *next;
+	    } *tmp, *link, **tail = &link;
+
+	    base = extract_path(path, p);
+	    if (path == p) dir = ".";
+	    else dir = base;
+
+	    magic = extract_elem(p);
+	    if (stat(dir, &st) < 0) {
+	        if (errno != ENOENT) rb_sys_warning(dir);
+	        free(base);
+	        free(magic);
+	        break;
 	    }
-	}
-	if (match_dir && isdir == UNKNOWN) {
-	    if (do_stat(path, &st, flags) == 0) {
-		exist = YES;
-		isdir = S_ISDIR(st.st_mode) ? YES : NO;
+	    if (S_ISDIR(st.st_mode)) {
+		if (m && strcmp(magic, "**") == 0) {
+		    int n = strlen(base);
+		    recursive = 1;
+		    buf = ALLOC_N(char, n+strlen(m)+3);
+		    sprintf(buf, "%s%s", base, *base ? m : m+1);
+		    status = glob_helper(buf, buf+n, flags, func, arg);
+		    free(buf);
+		    if (status) goto finalize;
+		}
+		dirp = opendir(dir);
+		if (dirp == NULL) {
+		    rb_sys_warning(dir);
+		    free(base);
+		    free(magic);
+		    break;
+		}
 	    }
 	    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;
+		free(base);
+		free(magic);
 		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;
+
+#if defined DOSISH_DRIVE_LETTER
+#define BASE (*base && !((isdirsep(*base) && !base[1]) || (base[1] == ':' && isdirsep(base[2]) && !base[3])))
 #else
-		new_isdir = dp->d_isdir ? (!dp->d_isrep ? YES : UNKNOWN) : NO;
+#define BASE (*base && !(isdirsep(*base) && !base[1]))
 #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 */
+	    for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
+		if (recursive) {
+		    if (strcmp(".", dp->d_name) == 0 || strcmp("..", dp->d_name) == 0)
+			continue;
+		    buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+strlen(m)+6);
+		    sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name);
+		    if (lstat(buf, &st) < 0) {
+			if (errno != ENOENT) rb_sys_warning(buf);
+			free(buf);
+			continue;
+		    }
+		    if (S_ISDIR(st.st_mode)) {
+			char *t = buf+strlen(buf);
+		        strcpy(t, "/**");
+			strcpy(t+3, m);
+			status = glob_helper(buf, t, flags, func, arg);
+			free(buf);
+			if (status) break;
+			continue;
+		    }
+		    free(buf);
+		    continue;
 		}
-		if (p->type == PLAIN || p->type == MAGICAL) {
-		    if (fnmatch(p->str, dp->d_name, flags) == 0)
-			*new_end++ = p->next;
+		if (fnmatch(magic, dp->d_name, flags) == 0) {
+		    buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2);
+		    sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name);
+		    if (!m) {
+			status = glob_call_func(func, buf, arg);
+			free(buf);
+			if (status) break;
+			continue;
+		    }
+		    tmp = ALLOC(struct d_link);
+		    tmp->path = buf;
+		    *tail = tmp;
+		    tail = &tmp->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;
+	    closedir(dirp);
+	  finalize:
+	    *tail = 0;
+	    free(base);
+	    free(magic);
+	    if (link) {
+		while (link) {
+		    if (status == 0) {
+			if (stat(link->path, &st) == 0) {
+			    if (S_ISDIR(st.st_mode)) {
+				int len = strlen(link->path);
+				int mlen = strlen(m);
+				char *t = ALLOC_N(char, len+mlen+1);
+
+				sprintf(t, "%s%s", link->path, m);
+				status = glob_helper(t, t+len, flags, func, arg);
+				free(t);
+			    }
+			}
+			else {
+			    rb_sys_warning(link->path);
+			}
 		    }
+		    tmp = link;
+		    link = link->next;
+		    free(tmp->path);
+		    free(tmp);
 		}
-
-		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;
+		break;
 	    }
 	}
-
-	free(copy_beg);
+	p = m;
     }
-
     return status;
 }
 
-static int
-ruby_glob0(path, flags, func, arg)
-    const char *path;
+static void
+rb_glob2(path, flags, func, arg)
+    char *path;
     int flags;
-    ruby_glob_func *func;
+    void (*func) _((const char*, VALUE));
     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 status = glob_helper(path, 0, flags, func, arg);
+    if (status) rb_jump_tag(status);
 }
 
-int
-ruby_glob(path, flags, func, arg)
-    const char *path;
-    int flags;
-    ruby_glob_func *func;
+void
+rb_glob(path, func, arg)
+    char *path;
+    void (*func) _((const char*, VALUE));
     VALUE arg;
 {
-    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg);
+    rb_glob2(path, 0, func, arg);
 }
 
-static int rb_glob_caller _((const char *, VALUE));
-
-static int
-rb_glob_caller(path, a)
-    const char *path;
-    VALUE a;
+void
+rb_globi(path, func, arg)
+    char *path;
+    void (*func) _((const char*, VALUE));
+    VALUE arg;
 {
-    int status;
-    struct glob_args *args = (struct glob_args *)a;
-
-    args->c = path;
-    rb_protect(glob_func_caller, a, &status);
-    return status;
+    rb_glob2(path, FNM_CASEFOLD, func, arg);
 }
 
-static int
-rb_glob2(path, flags, func, arg)
+static void
+push_pattern(path, ary)
     const char *path;
-    int flags;
-    void (*func) _((const char *, VALUE));
-    VALUE arg;
+    VALUE ary;
 {
-    struct glob_args args;
+    VALUE str = rb_tainted_str_new2(path);
 
-    args.func = func;
-    args.v = arg;
-
-    if (flags & FNM_SYSCASE) {
-	rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
+    if (ary) {
+	rb_ary_push(ary, str);
+    }
+    else {
+	rb_yield(str);
     }
-
-    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;
+push_globs(ary, s, flags)
     VALUE ary;
+    char *s;
+    int flags;
 {
-    rb_ary_push(ary, rb_tainted_str_new2(path));
+    rb_glob2(s, flags, push_pattern, ary);
 }
 
-int
-ruby_brace_expand(str, flags, func, arg)
-    const char *str;
+static void
+push_braces(ary, s, flags)
+    VALUE ary;
+    char *s;
     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;
+    char *buf;
+    char *p, *t, *b;
+    char *lbrace, *rbrace;
+    int nest = 0;
 
+    p = s;
+    lbrace = rbrace = 0;
     while (*p) {
-	if (*p == '{' && nest++ == 0) {
+	if (*p == '{') {
 	    lbrace = p;
+	    break;
 	}
-	if (*p == '}' && --nest <= 0) {
+	p++;
+    }
+    while (*p) {
+	if (*p == '{') nest++;
+	if (*p == '}' && --nest == 0) {
 	    rbrace = p;
 	    break;
 	}
-	if (*p == '\\' && escape) {
-	    if (!*++p) break;
-	}
-	Inc(p);
+	p++;
     }
 
     if (lbrace && rbrace) {
-	char *buf = GLOB_ALLOC_N(char, strlen(s) + 1);
-	long shift;
-
-	if (!buf) return -1;
+	int len = strlen(s);
+	buf = xmalloc(len + 1);
 	memcpy(buf, s, lbrace-s);
-	shift = (lbrace-s);
+	b = buf + (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);
+	while (*p != '}') {
+	    t = p + 1;
+	    for (p = t; *p!='}' && *p!=','; p++) {
+		/* skip inner braces */
+		if (*p == '{') while (*p!='}') 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;
+	    memcpy(b, t, p-t);
+	    strcpy(b+(p-t), rbrace+1);
+	    push_braces(ary, buf, flags);
 	}
 	free(buf);
     }
-    else if (!lbrace && !rbrace) {
-	status = (*func)(s, arg);
+    else {
+	push_globs(ary, s, flags);
     }
-
-    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);
-}
+#define isdelim(c) ((c)=='\0')
 
 static VALUE
-rb_push_glob(str, flags) /* '\0' is delimiter */
+rb_push_glob(str, flags)
     VALUE str;
     int flags;
 {
-    long offset = 0;
+    char *p, *pend;
+    char *buf;
+    char *t;
+    int nest, maxnest;
+    int noescape = flags & FNM_NOESCAPE;
     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;
-}
+    if (rb_block_given_p())
+	ary = 0;
+    else
+	ary = rb_ary_new();
 
-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);
+    SafeStringValue(str);
+    buf = xmalloc(RSTRING(str)->len + 1);
+
+    p = RSTRING(str)->ptr;
+    pend = p + RSTRING(str)->len;
+
+    while (p < pend) {
+	t = buf;
+	nest = maxnest = 0;
+	while (p < pend && isdelim(*p)) p++;
+	while (p < pend && !isdelim(*p)) {
+	    if (*p == '{') nest++, maxnest++;
+	    if (*p == '}') nest--;
+	    if (!noescape && *p == '\\') {
+		*t++ = *p++;
+		if (p == pend) break;
+	    }
+	    *t++ = *p++;
+	}
+	*t = '\0';
+	if (maxnest == 0) {
+	    push_globs(ary, buf, flags);
+	}
+	else if (nest == 0) {
+	    push_braces(ary, buf, flags);
+	}
+	/* else unmatched braces */
     }
+    free(buf);
 
     return ary;
 }
 
 /*
  *  call-seq:
- *     Dir[ array ]                 => array
- *     Dir[ string [, string ...] ] => array
+ *     Dir[ 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>.
+ *  <em>dir</em>.<code>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);
- }
+dir_s_aref(obj, str)
+    VALUE obj, str;
+{
+    return rb_push_glob(str, 0);
+}
 
 /*
  *  call-seq:
- *     Dir.glob( pattern, [flags] ) => array
- *     Dir.glob( pattern, [flags] ) {| filename | block }  => nil
+ *     Dir.glob( string, [flags] ) => array
+ *     Dir.glob( string, [flags] ) {| filename | block }  => false
  *
- *  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.
+ *  Returns the filenames found by expanding the pattern given in
+ *  <i>string</i>, 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
+ *  details of file name matching and the meaning of the <i>flags</i>
+ *  parameter.
  *
  *     Dir["config.?"]                     #=> ["config.h"]
  *     Dir.glob("config.?")                #=> ["config.h"]
@@ -1733,19 +1243,6 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *     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)
@@ -1753,7 +1250,7 @@ dir_s_glob(argc, argv, obj)
     VALUE *argv;
     VALUE obj;
 {
-    VALUE str, rflags, ary;
+    VALUE str, rflags;
     int flags;
 
     if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2)
@@ -1761,37 +1258,9 @@ dir_s_glob(argc, argv, obj)
     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;
+    return rb_push_glob(str, flags);
 }
 
-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
@@ -1815,8 +1284,7 @@ dir_foreach(io, dirname)
 {
     VALUE dir;
 
-    RETURN_ENUMERATOR(io, 1, &dirname);
-    dir = dir_open_dir(dirname);
+    dir = rb_funcall(rb_cDir, rb_intern("open"), 1, dirname);
     rb_ensure(dir_each, dir, dir_close, dir);
     return Qnil;
 }
@@ -1838,7 +1306,7 @@ dir_entries(io, dirname)
 {
     VALUE dir;
 
-    dir = dir_open_dir(dirname);
+    dir = rb_funcall(rb_cDir, rb_intern("open"), 1, dirname);
     return rb_ensure(rb_Array, dir, dir_close, dir);
 }
 
@@ -1852,76 +1320,34 @@ dir_entries(io, dirname)
  *  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
+ *  <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>.
  *
- *     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
+ *     File.fnmatch('cat',       'cat')        #=> true
+ *     File.fnmatch('cat',       'category')   #=> false
+ *     File.fnmatch('c{at,ub}s', 'cats')       #=> false
+ *     File.fnmatch('c{at,ub}s', 'cubs')       #=> false
+ *     File.fnmatch('c{at,ub}s', 'cat')        #=> false
  *
- *     pattern = '*' '/' '*'
- *     File.fnmatch(pattern, 'dave/.profile', File::FNM_PATHNAME)  #=> false
- *     File.fnmatch(pattern, 'dave/.profile', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
+ *     File.fnmatch('c?t',    'cat')                       #=> true
+ *     File.fnmatch('c\?t',   'cat')                       #=> false
+ *     File.fnmatch('c??t',   'cat')                       #=> false
+ *     File.fnmatch('c*',     'cats')                      #=> true
+ *     File.fnmatch('c/ * FIXME * /t', 'c/a/b/c/t')                 #=> true
+ *     File.fnmatch('c*t',    'cat')                       #=> true
+ *     File.fnmatch('c\at',   'cat')                       #=> true
+ *     File.fnmatch('c\at',   'cat', File::FNM_NOESCAPE)   #=> false
+ *     File.fnmatch('a?b',    'a/b')                       #=> true
+ *     File.fnmatch('a?b',    'a/b', File::FNM_PATHNAME)   #=> false
  *
- *     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
+ *     File.fnmatch('*',   '.profile')                            #=> false
+ *     File.fnmatch('*',   '.profile', File::FNM_DOTMATCH)        #=> true
+ *     File.fnmatch('*',   'dave/.profile')                       #=> true
+ *     File.fnmatch('*',   'dave/.profile', File::FNM_DOTMATCH)   #=> true
+ *     File.fnmatch('*',   'dave/.profile', File::FNM_PATHNAME)   #=> false
+ *     File.fnmatch('* / FIXME *', 'dave/.profile', File::FNM_PATHNAME)   #=> false
+ *     STRICT = File::FNM_PATHNAME | File::FNM_DOTMATCH
+ *     File.fnmatch('* / FIXME *', 'dave/.profile', STRICT)               #=> true
  */
 static VALUE
 file_s_fnmatch(argc, argv, obj)
@@ -1972,7 +1398,6 @@ Init_Dir()
 
     rb_define_method(rb_cDir,"initialize", dir_initialize, 1);
     rb_define_method(rb_cDir,"path", dir_path, 0);
-    rb_define_method(rb_cDir,"inspect", dir_inspect, 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);
@@ -1992,7 +1417,7 @@ Init_Dir()
     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_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);
@@ -2001,5 +1426,4 @@ Init_Dir()
     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/distruby.rb b/distruby.rb
deleted file mode 100644
index 613da0eb9c..0000000000
--- a/distruby.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!./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/djgpp/configure.bat b/djgpp/configure.bat
index e6a5d79d4a..e6a5d79d4a 100755..100644
--- a/djgpp/configure.bat
+++ b/djgpp/configure.bat
diff --git a/dln.c b/dln.c
index 5ba25b6415..1dd80c2fe6 100644
--- a/dln.c
+++ b/dln.c
@@ -27,6 +27,10 @@
 char *dln_argv0;
 #endif
 
+#ifdef _AIX
+#pragma alloca
+#endif
+
 #if defined(HAVE_ALLOCA_H)
 #include <alloca.h>
 #endif
@@ -81,28 +85,19 @@ char *getenv();
 # include "macruby_private.h"
 #endif
 
-#if defined(__APPLE__) && defined(__MACH__)   /* Mac OS X */
-# if defined(HAVE_DLOPEN)
-   /* Mac OS X with dlopen (10.3 or later) */
-#  define MACOSX_DLOPEN
-# else
-#  define MACOSX_DYLD
-# endif
-#endif
-
 #ifdef __BEOS__
 # include <image.h>
 #endif
 
-#ifndef NO_DLN_LOAD
+int eaccess();
 
-#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(MACOSX_DYLD) && !defined(_UNICOSMP)
+#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(MACOSX_DYLD)
+# 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"
@@ -165,7 +160,7 @@ 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_ENOINIT	1202	/* No inititalizer given */
 #define DLN_EUNDEF	1203	/* Undefine symbol remains */
 #define DLN_ENOTLIB	1204	/* Not a library file */
 #define DLN_EBADLIB	1205	/* Malformed library file */
@@ -400,7 +395,7 @@ dln_init(prog)
 	if (c != '!') goto err_noexec;
 
 	p = buf;
-	/* skip forwarding spaces */
+	/* skip forwading spaces */
 	while (read(fd, &c, 1) == 1) {
 	    if (c == '\n') goto err_noexec;
 	    if (c != '\t' && c != ' ') {
@@ -645,7 +640,7 @@ load_1(fd, disp, need_init)
     long disp;
     const char *need_init;
 {
-    static const char *libc = LIBC_NAME;
+    static char *libc = LIBC_NAME;
     struct exec hdr;
     struct relocation_info *reloc = NULL;
     long block = 0;
@@ -965,9 +960,8 @@ load_lib(lib)
     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);
+	char *p = alloca(strlen(lib) + 4);
+	sprintf(p, "lib%s.a", lib+2);
 	lib = p;
     }
 
@@ -1121,7 +1115,7 @@ dln_sym(name)
 #endif /* USE_DLN_A_OUT */
 
 #ifdef USE_DLN_DLOPEN
-# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
+# ifdef __NetBSD__
 #  include <nlist.h>
 #  include <link.h>
 # else
@@ -1150,7 +1144,7 @@ dln_sym(name)
 #endif
 #endif
 #else
-#ifdef MACOSX_DYLD
+#ifdef __APPLE__
 #include <mach-o/dyld.h>
 #endif
 #endif
@@ -1178,7 +1172,7 @@ dln_strerror()
       case DLN_ECONFL:
 	return "Symbol name conflict";
       case DLN_ENOINIT:
-	return "No initializer given";
+	return "No inititalizer given";
       case DLN_EUNDEF:
 	return "Unresolved symbols";
       case DLN_ENOTLIB:
@@ -1239,7 +1233,7 @@ aix_loaderror(const char *pathname)
 	{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_ALIGN,		"text allignment in file is wrong."},
 	{L_ERROR_SYSTEM,	"System error:"},
 	{L_ERROR_ERRNO,		NULL}
     };
@@ -1267,29 +1261,10 @@ aix_loaderror(const char *pathname)
 }
 #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))
@@ -1343,9 +1318,6 @@ dln_load(file)
 #ifndef RTLD_LAZY
 # define RTLD_LAZY 1
 #endif
-#ifdef __INTERIX
-# undef RTLD_GLOBAL
-#endif
 #ifndef RTLD_GLOBAL
 # define RTLD_GLOBAL 0
 #endif
@@ -1412,7 +1384,7 @@ dln_load(file)
     }
 #endif /* _AIX */
 
-#if defined(NeXT) || defined(MACOSX_DYLD)
+#if defined(NeXT) || defined(__APPLE__)
 #define DLN_DEFINED
 /*----------------------------------------------------
    By SHIROYAMA Takayuki Psi@fortune.nest.or.jp
@@ -1536,7 +1508,7 @@ dln_load(file)
     }
 #endif /* __BEOS__*/
 
-#ifdef __MACOS__   /* Mac OS 9 or before */
+#ifdef __MACOS__
 # define DLN_DEFINED
     {
       OSErr err;
@@ -1586,16 +1558,9 @@ dln_load(file)
 #if defined(__VMS)
 #define DLN_DEFINED
     {
-	long status;
-	void (*init_fct)();
+	void *handle, (*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,'/'))
@@ -1603,35 +1568,19 @@ dln_load(file)
 	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) {
+	if ((handle = (void*)dlopen(fname, 0)) == NULL) {
 	    error = dln_strerror();
 	    goto failed;
-	} else if (!$VMS_STATUS_SUCCESS(status)) {
+	}
+
+	if ((init_fct = (void (*)())dlsym(handle, buf)) == NULL) {
 	    error = DLN_ERROR();
+	    dlclose(handle);
 	    goto failed;
 	}
-
 	/* Call the init code */
 	(*init_fct)();
-
-	return 1;
+	return handle;
     }
 #endif /* __VMS */
 
@@ -1645,8 +1594,6 @@ dln_load(file)
   failed:
     rb_loaderror("%s - %s", error, file);
 #endif
-
-#endif /* NO_DLN_LOAD */
     return 0;			/* dummy return */
 }
 
@@ -1685,35 +1632,63 @@ dln_find_file(fname, path)
 #endif
 }
 
+#if defined(__CYGWIN32__)
+const char *
+conv_to_posix_path(win32, posix, len)
+    char *win32;
+    char *posix;
+    int len;
+{
+    char *first = win32;
+    char *p = win32;
+    char *dst = posix;
+
+    for (p = win32; *p; p++)
+	if (*p == ';') {
+	    *p = 0;
+	    cygwin32_conv_to_posix_path(first, posix);
+	    posix += strlen(posix);
+	    *posix++ = ':';
+	    first = p + 1;
+	    *p = ';';
+	}
+    if (len < strlen(first))
+	fprintf(stderr, "PATH length too long: %s\n", first);
+    else
+	cygwin32_conv_to_posix_path(first, posix);
+    return dst;
+}
+#endif
+
 static char fbuf[MAXPATHLEN];
 
 static char *
 dln_find_1(fname, path, exe_flag)
-    const char *fname;
-    const char *path;
+    char *fname;
+    char *path;
     int exe_flag;		/* non 0 if looking for executable. */
 {
-    register const char *dp;
-    register const char *ep;
+    register char *dp;
+    register char *ep;
     register char *bp;
     struct stat st;
 #ifdef __MACOS__
     const char* mac_fullpath;
 #endif
 
-    if (!fname) return (char *)fname;
-    if (fname[0] == '/') return (char *)fname;
+    if (!fname) return fname;
+    if (fname[0] == '/') return fname;
     if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0)
-      return (char *)fname;
-    if (exe_flag && strchr(fname, '/')) return (char *)fname;
+      return fname;
+    if (exe_flag && strchr(fname, '/')) return fname;
 #ifdef DOSISH
-    if (fname[0] == '\\') return (char *)fname;
+    if (fname[0] == '\\') return fname;
 # ifdef DOSISH_DRIVE_LETTER
-    if (strlen(fname) > 2 && fname[1] == ':') return (char *)fname;
+    if (strlen(fname) > 2 && fname[1] == ':') return fname;
 # endif
     if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0)
-      return (char *)fname;
-    if (exe_flag && strchr(fname, '\\')) return (char *)fname;
+      return fname;
+    if (exe_flag && strchr(fname, '\\')) return fname;
 #endif
 
     for (dp = path;; dp = ++ep) {
@@ -1781,9 +1756,26 @@ dln_find_1(fname, path, exe_flag)
 	}
 	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[][5] = {
+	    static const char *extension[] = {
 #if defined(MSDOS)
 		".com", ".exe", ".bat",
 #if defined(DJGPP)
@@ -1796,10 +1788,11 @@ dln_find_1(fname, path, exe_flag)
 		".r", ".R", ".x", ".X", ".bat", ".BAT",
 /* __human68k__ */
 #endif
+		(char *) NULL
 	    };
 	    int j;
 
-	    for (j = 0; j < sizeof(extension) / sizeof(extension[0]); 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);
@@ -1816,28 +1809,9 @@ dln_find_1(fname, path, exe_flag)
 
 #endif
 	    }
-	    goto next;
 	}
 #endif /* MSDOS or _WIN32 or __human68k__ or __EMX__ */
 
-#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
-
       next:
 	/* if not, and no other alternatives, life is bleak */
 	if (*ep == '\0') {
@@ -1847,24 +1821,3 @@ dln_find_1(fname, path, exe_flag)
 	/* 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/dmydln.c b/dmydln.c
deleted file mode 100644
index 09ea06806c..0000000000
--- a/dmydln.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NO_DLN_LOAD 1
-#include "dln.c"
diff --git a/doc/NEWS-1.8.0 b/doc/NEWS
index b4445fa59f..b4445fa59f 100644
--- a/doc/NEWS-1.8.0
+++ b/doc/NEWS
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 338dcc644e..bf8ac5d517 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -1,8 +1,8 @@
 irb -- interactive ruby
-				$Release Version: 0.9.5 $
+				$Release Version: 0.9 $
 			   	$Revision$
 			   	$Date$
-			   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 =begin
 = irb¤È¤Ï?
 
@@ -112,7 +112,6 @@ irbµ¯Æ°»þ¤Ë``~/.irbrc''¤òÆɤ߹þ¤ß¤Þ¤¹. ¤â¤·Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï,
 
    IRB.conf[:PROMPT][:MY_PROMPT] = { # ¥×¥í¥ó¥×¥È¥â¡¼¥É¤Î̾Á°
      :PROMPT_I => nil,		  # Ä̾ï¤Î¥×¥í¥ó¥×¥È
-     :PROMPT_N => nil,		  # ·Ñ³¹Ô¤Î¥×¥í¥ó¥×¥È
      :PROMPT_S => nil,		  # ʸ»úÎó¤Ê¤É¤Î·Ñ³¹Ô¤Î¥×¥í¥ó¥×¥È
      :PROMPT_C => nil,		  # ¼°¤¬·Ñ³¤·¤Æ¤¤¤ë»þ¤Î¥×¥í¥ó¥×¥È
      :RETURN => "    ==>%s\n"	  # ¥ê¥¿¡¼¥ó»þ¤Î¥×¥í¥ó¥×¥È
@@ -127,7 +126,7 @@ OK¤Ç¤¹.
 
   IRB.conf[:PROMPT_MODE] = :MY_PROMPT
 
-PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C¤Ï, ¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ØÄꤷ¤Þ¤¹.
+PROMPT_I, PROMPT_S, PROMPT_C¤Ï, ¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ØÄꤷ¤Þ¤¹.
 
   %N	µ¯Æ°¤·¤Æ¤¤¤ë¥³¥Þ¥ó¥É̾¤¬½ÐÎϤµ¤ì¤ë.
   %m	main¥ª¥Ö¥¸¥§¥¯¥È(self)¤¬to_s¤Ç½ÐÎϤµ¤ì¤ë.
@@ -142,7 +141,6 @@ PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C¤Ï, ¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ØÄꤷ¤Þ¤¹.
 
   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"
diff --git a/enum.c b/enum.c
index df35c2fe03..28f28cbd5f 100644
--- a/enum.c
+++ b/enum.c
@@ -15,43 +15,7 @@
 #include "util.h"
 
 VALUE rb_mEnumerable;
-static ID id_each, id_eqq, id_cmp, id_size;
-
-struct iter_method_arg {
-    VALUE obj;
-    ID mid;
-    int argc;
-    VALUE *argv;
-};
-
-static VALUE iterate_method _((VALUE obj));
-static VALUE
-iterate_method(obj)
-    VALUE obj;
-{
-    struct iter_method_arg *arg;
-
-    arg = (struct iter_method_arg *)obj;
-    return rb_funcall2(arg->obj, arg->mid, arg->argc, arg->argv);
-}
-
-VALUE
-rb_block_call(obj, mid, argc, argv, bl_proc, data2)
-    VALUE obj;
-    ID mid;
-    int argc;
-    VALUE *argv;
-    VALUE (*bl_proc) (ANYARGS);
-    VALUE data2;
-{
-    struct iter_method_arg arg;
-
-    arg.obj = obj;
-    arg.mid = mid;
-    arg.argc = argc;
-    arg.argv = argv;
-    return rb_iterate(iterate_method, (VALUE)&arg, bl_proc, data2);
-}
+static ID id_each, id_eqq, id_cmp;
 
 VALUE
 rb_each(obj)
@@ -84,18 +48,18 @@ grep_iter_i(i, arg)
  *  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
@@ -109,106 +73,18 @@ enum_grep(obj, pat)
     arg[1] = ary;
 
     rb_iterate(rb_each, obj, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
-
+    
     return ary;
 }
 
-static VALUE count_i _((VALUE, VALUE));
-static VALUE
-count_i(i, memop)
-    VALUE i, memop;
-{
-    VALUE *memo = (VALUE*)memop;
-
-    if (rb_equal(i, memo[1])) {
-	memo[0]++;
-    }
-    return Qnil;
-}
-
-static VALUE count_iter_i _((VALUE, VALUE));
-static VALUE
-count_iter_i(i, memop)
-    VALUE i, memop;
-{
-    VALUE *memo = (VALUE*)memop;
-
-    if (RTEST(rb_yield(i))) {
-	memo[0]++;
-    }
-    return Qnil;
-}
-
-static VALUE count_all_i _((VALUE, VALUE));
-static VALUE
-count_all_i(i, memop)
-    VALUE i, memop;
-{
-    VALUE *memo = (VALUE*)memop;
-
-    memo[0]++;
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.count                   => int
- *     enum.count(item)             => int
- *     enum.count {| obj | block }  => int
- *
- *  Returns the number of items in <i>enum</i>, where #size is called
- *  if it responds to it, otherwise the items are counted through
- *  enumeration.  If an argument is given, counts the number of items
- *  in <i>enum</i>, for which equals to <i>item</i>.  If a block is
- *  given, counts the number of elements yielding a true value.
- *
- *     ary = [1, 2, 4, 2]
- *     ary.count             # => 4
- *     ary.count(2)          # => 2
- *     ary.count{|x|x%2==0}  # => 3
- *
- */
-
-static VALUE
-enum_count(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE memo[2];	/* [count, condition value] */
-    rb_block_call_func *func;
-
-    if (argc == 0) {
-	if (rb_block_given_p()) {
-	    func = count_iter_i;
-	}
-	else {
-	    if (rb_respond_to(obj, id_size)) {
-		return rb_funcall(obj, id_size, 0, 0);
-	    }
-	    func = count_all_i;
-	}
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &memo[1]);
-	if (rb_block_given_p()) {
-	    rb_warn("given block not used");
-	}
-        func = count_i;
-    }
-
-    memo[0] = 0;
-    rb_block_call(obj, id_each, 0, 0, func, (VALUE)&memo);
-    return INT2NUM(memo[0]);
-}
-
 static VALUE
 find_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (RTEST(rb_yield(i))) {
-	*memo = i;
+	memo->u2.value = Qtrue;
+	memo->u1.value = i;
 	rb_iter_break();
     }
     return Qnil;
@@ -216,17 +92,16 @@ find_i(i, memo)
 
 /*
  *  call-seq:
- *     enum.detect(ifnone = nil) {| obj | block }  => obj or nil
- *     enum.find(ifnone = nil)   {| obj | block }  => obj or nil
- *
+ *     enum.detect {| obj | block }  => obj or nil
+ *     enum.find   {| 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>
- *
+ *  first for which <em>block</em> is not <code>false</code>. Returns
+ *  <code>nil</code> if no object matches.
+ *     
  *     (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
@@ -235,96 +110,23 @@ enum_find(argc, argv, obj)
     VALUE* argv;
     VALUE obj;
 {
-    VALUE memo = Qundef;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, Qfalse, 0);
     VALUE if_none;
 
     rb_scan_args(argc, argv, "01", &if_none);
-    RETURN_ENUMERATOR(obj, argc, argv);
-    rb_iterate(rb_each, obj, find_i, (VALUE)&memo);
-    if (memo != Qundef) {
-	return memo;
+    rb_iterate(rb_each, obj, find_i, (VALUE)memo);
+    if (memo->u2.value) {
+	VALUE result = memo->u1.value;
+	rb_gc_force_recycle((VALUE)memo);
+	return result;
     }
+    rb_gc_force_recycle((VALUE)memo);
     if (!NIL_P(if_none)) {
 	return rb_funcall(if_none, rb_intern("call"), 0, 0);
     }
     return Qnil;
 }
 
-static VALUE find_index_i _((VALUE, VALUE));
-static VALUE
-find_index_i(i, memop)
-    VALUE i;
-    VALUE memop;
-{
-    VALUE *memo = (VALUE*)memop;
-
-    if (rb_equal(i, memo[2])) {
-	memo[0] = UINT2NUM(memo[1]);
-	rb_iter_break();
-    }
-    memo[1]++;
-    return Qnil;
-}
-
-static VALUE find_index_iter_i _((VALUE, VALUE));
-static VALUE
-find_index_iter_i(i, memop)
-    VALUE i;
-    VALUE memop;
-{
-    VALUE *memo = (VALUE*)memop;
-
-    if (RTEST(rb_yield(i))) {
-	memo[0] = UINT2NUM(memo[1]);
-	rb_iter_break();
-    }
-    memo[1]++;
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.find_index(value)            => int or nil
- *     enum.find_index {| obj | block }  => int or nil
- *
- *  Compares each entry in <i>enum</i> with <em>value</em> or passes
- *  to <em>block</em>.  Returns the index for the first for which the
- *  evaluated value is non-false.  If no object matches, returns
- *  <code>nil</code>
- *
- *     (1..10).find_index  {|i| i % 5 == 0 and i % 7 == 0 }   #=> nil
- *     (1..100).find_index {|i| i % 5 == 0 and i % 7 == 0 }   #=> 34
- *     (1..100).find_index(50)                                #=> 49
- *
- */
-
-static VALUE
-enum_find_index(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE memo[3];	/* [return value, current index, condition value] */
-    rb_block_call_func *func;
-
-    if (argc == 0) {
-        RETURN_ENUMERATOR(obj, 0, 0);
-        func = find_index_iter_i;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &memo[2]);
-	if (rb_block_given_p()) {
-	    rb_warn("given block not used");
-	}
-        func = find_index_i;
-    }
-
-    memo[0] = Qnil;
-    memo[1] = 0;
-    rb_block_call(obj, id_each, 0, 0, func, (VALUE)memo);
-    return memo[0];
-}
-
 static VALUE
 find_all_i(i, ary)
     VALUE i, ary;
@@ -339,13 +141,13 @@ find_all_i(i, ary)
  *  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
@@ -353,8 +155,7 @@ enum_find_all(obj)
     VALUE obj;
 {
     VALUE ary = rb_ary_new();
-
-    RETURN_ENUMERATOR(obj, 0, 0);
+    
     rb_iterate(rb_each, obj, find_all_i, ary);
 
     return ary;
@@ -373,12 +174,12 @@ reject_i(i, ary)
 /*
  *  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
@@ -386,8 +187,7 @@ enum_reject(obj)
     VALUE obj;
 {
     VALUE ary = rb_ary_new();
-
-    RETURN_ENUMERATOR(obj, 0, 0);
+    
     rb_iterate(rb_each, obj, reject_i, ary);
 
     return ary;
@@ -398,7 +198,7 @@ collect_i(i, ary)
     VALUE i, ary;
 {
     rb_ary_push(ary, rb_yield(i));
-
+    
     return Qnil;
 }
 
@@ -407,7 +207,7 @@ collect_all(i, ary)
     VALUE i, ary;
 {
     rb_ary_push(ary, i);
-
+    
     return Qnil;
 }
 
@@ -415,13 +215,13 @@ collect_all(i, ary)
  *  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
@@ -429,7 +229,7 @@ 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;
@@ -439,135 +239,87 @@ enum_collect(obj)
  *  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(argc, argv, obj)
-    int argc;
-    VALUE *argv;
+enum_to_a(obj)
     VALUE obj;
 {
     VALUE ary = rb_ary_new();
-
-    rb_block_call(obj, id_each, argc, argv, collect_all, ary);
+    
+    rb_iterate(rb_each, obj, collect_all, ary);
 
     return ary;
 }
 
-static VALUE inject_i _((VALUE, VALUE));
 static VALUE
-inject_i(i, p)
+inject_i(i, memo)
     VALUE i;
-    VALUE p;
-{
-    VALUE *memo = (VALUE *)p;
-    if (memo[0] == Qundef) {
-	memo[0] = i;
-    }
-    else {
-	memo[0] = rb_yield_values(2, memo[0], i);
-    }
-    return Qnil;
-}
-
-static VALUE inject_op_i _((VALUE, VALUE));
-static VALUE
-inject_op_i(i, p)
-    VALUE i;
-    VALUE p;
+    NODE *memo;
 {
-    VALUE *memo = (VALUE *)p;
-
-    if (memo[0] == Qundef) {
-	memo[0] = i;
+    if (memo->u2.value) {
+        memo->u2.value = Qfalse;
+        memo->u1.value = i;
     }
     else {
-	memo[0] = rb_funcall(memo[0], (ID)memo[1], 1, i);
+        memo->u1.value = rb_yield_values(2, memo->u1.value, i);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.inject(initial, sym) => obj
- *     enum.inject(sym)          => obj
  *     enum.inject(initial) {| memo, obj | block }  => obj
  *     enum.inject          {| memo, obj | block }  => obj
- *
- *     enum.reduce(initial, sym) => obj
- *     enum.reduce(sym)          => obj
- *     enum.reduce(initial) {| memo, obj | block }  => obj
- *     enum.reduce          {| memo, obj | block }  => obj
- *
- *  Combines all elements of <i>enum</i> by applying a binary
- *  operation, specified by a block or a symbol that names a
- *  method or operator.
- *
- *  If you specify a block, then for each element in <i>enum<i>
- *  the block is passed an accumulator value (<i>memo</i>) and the element.
- *  If you specify a symbol instead, then each element in the collection
- *  will be passed to the named method of <i>memo</i>.
- *  In either case, the result becomes the new value for <i>memo</i>.
- *  At the end of the iteration, the final value of <i>memo</i> is the
- *  return value fo the method.
- *
- *  If you do not explicitly specify an <i>initial</i> value for <i>memo</i>,
- *  then uses the first element of collection is used as the initial value
- *  of <i>memo</i>.
- *
- *  Examples:
- *
+ *  
+ *  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).reduce(:+)                            #=> 45
- *     # Same using a block and inject
- *     (5..10).inject {|sum, n| sum + n }            #=> 45
+ *     (5..10).inject {|sum, n| sum + n }              #=> 45
  *     # Multiply some numbers
- *     (5..10).reduce(1, :*)                         #=> 151200
- *     # Same using a block
- *     (5..10).inject(1) {|product, n| product * n } #=> 151200
+ *     (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"
- *
+ *     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;
-    VALUE obj;
+    VALUE *argv, obj;
 {
-    VALUE memo[2];
-    rb_block_call_func *iter = inject_i;
-
-    switch (rb_scan_args(argc, argv, "02", &memo[0], &memo[1])) {
-      case 0:
-	memo[0] = Qundef;
-	break;
-      case 1:
-	if (rb_block_given_p()) {
-	    break;
-	}
-	memo[1] = (VALUE)rb_to_id(memo[0]);
-	memo[0] = Qundef;
-	iter = inject_op_i;
-	break;
-      case 2:
-	if (rb_block_given_p()) {
-	    rb_warning("given block not used");
-	}
-	memo[1] = (VALUE)rb_to_id(memo[1]);
-	iter = inject_op_i;
-	break;
+    NODE *memo;
+    VALUE n;
+
+    if (rb_scan_args(argc, argv, "01", &n) == 1) {
+        memo = rb_node_newnode(NODE_MEMO, n, Qfalse, 0);
+    }
+    else {
+        memo = rb_node_newnode(NODE_MEMO, Qnil, Qtrue, 0);
     }
-    rb_block_call(obj, id_each, 0, 0, iter, (VALUE)memo);
-    if (memo[0] == Qundef) return Qnil;
-    return memo[0];
+    rb_iterate(rb_each, obj, inject_i, (VALUE)memo);
+    n = memo->u1.value;
+    rb_gc_force_recycle((VALUE)memo);
+    return n;
 }
 
 static VALUE
@@ -586,13 +338,13 @@ partition_i(i, ary)
 /*
  *  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
@@ -601,8 +353,6 @@ enum_partition(obj)
 {
     VALUE ary[2];
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     ary[0] = rb_ary_new();
     ary[1] = rb_ary_new();
     rb_iterate(rb_each, obj, partition_i, (VALUE)ary);
@@ -610,111 +360,11 @@ enum_partition(obj)
     return rb_assoc_new(ary[0], ary[1]);
 }
 
-static VALUE
-group_by_i(i, hash)
-    VALUE i;
-    VALUE hash;
-{
-    VALUE group = rb_yield(i);
-    VALUE values;
-
-    values = rb_hash_aref(hash, group);
-    if (NIL_P(values)) {
-	values = rb_ary_new3(1, i);
-	rb_hash_aset(hash, group, values);
-    }
-    else {
-	rb_ary_push(values, i);
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.group_by {| obj | block }  => a_hash
- *
- *  Returns a hash, which keys are evaluated result from the
- *  block, and values are arrays of elements in <i>enum</i>
- *  corresponding to the key.
- *
- *     (1..6).group_by {|i| i%3}   #=> {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
- *
- */
-
-static VALUE
-enum_group_by(obj)
-    VALUE obj;
-{
-    VALUE hash;
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-
-    hash = rb_hash_new();
-    rb_block_call(obj, id_each, 0, 0, group_by_i, hash);
-
-    return hash;
-}
-
-static VALUE
-first_i(i, ary)
-    VALUE i;
-    VALUE *ary;
-{
-    if (NIL_P(ary[0])) {
-	ary[1] = i;
-	rb_iter_break();
-    }
-    else {
-	long n = NUM2LONG(ary[0]);
-
-	if (n <= 0) {
-	    rb_iter_break();
-	}
-	rb_ary_push(ary[1], i);
-	n--;
-	ary[0] = INT2NUM(n);
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.first      -> obj or nil
- *     enum.first(n)   -> an_array
- *
- *  Returns the first element, or the first +n+ elements, of the enumerable.
- *  If the enumerable is empty, the first form returns <code>nil</code>, and the
- *  second form returns an empty array.
- *
- */
-
-static VALUE
-enum_first(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE n, ary[2];
-
-    if (argc == 0) {
-	ary[0] = ary[1] = Qnil;
-    }
-    else {
-	rb_scan_args(argc, argv, "01", &n);
-	ary[0] = n;
-	ary[1] = rb_ary_new2(NUM2LONG(n));
-    }
-    rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)ary);
-
-    return 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
@@ -722,7 +372,7 @@ enum_first(argc, argv, obj)
  *  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]
  */
@@ -731,90 +381,81 @@ static VALUE
 enum_sort(obj)
     VALUE obj;
 {
-    return rb_ary_sort(enum_to_a(0, 0, obj));
+    return rb_ary_sort(enum_to_a(obj));
 }
 
 static VALUE
 sort_by_i(i, ary)
     VALUE i, ary;
 {
-    VALUE v;
-    NODE *memo;
+    VALUE v, e;
 
     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);
+    e = rb_assoc_new(v, i);
+    rb_ary_push(ary, e);
     return Qnil;
 }
 
 static int
-sort_by_cmp(aa, bb, data)
-    NODE **aa, **bb;
-    void *data;
+sort_by_cmp(a, b)
+    VALUE *a, *b;
 {
-    VALUE a = aa[0]->u1.value;
-    VALUE b = bb[0]->u1.value;
-    VALUE ary = (VALUE)data;
+    VALUE retval;
 
-    if (RBASIC(ary)->klass) {
-	rb_raise(rb_eRuntimeError, "sort_by reentered");
-    }
-    return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
+    retval = rb_funcall(RARRAY(*a)->ptr[0], id_cmp, 1, RARRAY(*b)->ptr[0]);
+    return rb_cmpint(retval, *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
@@ -822,14 +463,14 @@ sort_by_cmp(aa, bb, data)
  *  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"]
  */
@@ -841,238 +482,148 @@ enum_sort_by(obj)
     VALUE ary;
     long i;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     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, (void *)ary);
-    }
-    if (RBASIC(ary)->klass) {
-	rb_raise(rb_eRuntimeError, "sort_by reentered");
+	qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp);
     }
     for (i=0; i<RARRAY(ary)->len; i++) {
-	RARRAY(ary)->ptr[i] = RNODE(RARRAY(ary)->ptr[i])->u2.value;
+	VALUE e = RARRAY(ary)->ptr[i];
+	RARRAY(ary)->ptr[i] = RARRAY(e)->ptr[1];
     }
-    RBASIC(ary)->klass = rb_cArray;
     return ary;
 }
 
 static VALUE
-all_i(i, memo)
+all_iter_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
-    if (!RTEST(i)) {
-	*memo = Qfalse;
+    if (!RTEST(rb_yield(i))) {
+	memo->u1.value = Qfalse;
 	rb_iter_break();
     }
     return Qnil;
 }
 
 static VALUE
-all_iter_i(i, memo)
+all_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
-    return all_i(rb_yield(i), memo);
+    if (!RTEST(i)) {
+	memo->u1.value = 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;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)&result);
+    memo->u1.value = Qtrue;
+    rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)memo);
+    result = memo->u1.value;
+    rb_gc_force_recycle((VALUE)memo);
     return result;
 }
 
 static VALUE
-any_i(i, memo)
+any_iter_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
-    if (RTEST(i)) {
-	*memo = Qtrue;
+    if (RTEST(rb_yield(i))) {
+	memo->u1.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
 }
 
 static VALUE
-any_iter_i(i, memo)
+any_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
-    return any_i(rb_yield(i), memo);
+    if (RTEST(i)) {
+	memo->u1.value = 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
+ *  that <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
-one_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    if (RTEST(i)) {
-	if (*memo == Qundef) {
-	    *memo = Qtrue;
-	}
-	else if (*memo == Qtrue) {
-	    *memo = Qfalse;
-	    rb_iter_break();
-	}
-    }
-    return Qnil;
-}
-
-static VALUE
-one_iter_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    return one_i(rb_yield(i), memo);
-}
-
-/*
- *  call-seq:
- *     enum.one? [{|obj| block }]   => true or false
- *
- *  Passes each element of the collection to the given block. The method
- *  returns <code>true</code> if the block returns <code>true</code>
- *  exactly once. If the block is not given, <code>one?</code> will return
- *  <code>true</code> only if exactly one of the collection members is
- *  true.
- *
- *     %w{ant bear cat}.one? {|word| word.length == 4}   #=> true
- *     %w{ant bear cat}.one? {|word| word.length > 4}    #=> false
- *     %w{ant bear cat}.one? {|word| word.length < 4}    #=> false
- *     [ nil, true, 99 ].one?                            #=> false
- *     [ nil, true, false ].one?                         #=> true
- *
- */
-
-static VALUE
-enum_one(obj)
-    VALUE obj;
-{
-    VALUE result = Qundef;
-
-    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? one_iter_i : one_i, (VALUE)&result);
-    if (result == Qundef) return Qfalse;
-    return result;
-}
-
-static VALUE
-none_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    if (RTEST(i)) {
-	*memo = Qfalse;
-	rb_iter_break();
-    }
-    return Qnil;
-}
-
-static VALUE
-none_iter_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    return none_i(rb_yield(i), memo);
-}
-
-/*
- *  call-seq:
- *     enum.none? [{|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>true</code>
- *  for all elements. If the block is not given, <code>none?</code> will return
- *  <code>true</code> only if none of the collection members is true.
- *
- *     %w{ant bear cat}.none? {|word| word.length == 5}  #=> true
- *     %w{ant bear cat}.none? {|word| word.length >= 4}  #=> false
- *     [].none?                                          #=> true
- *     [nil].none?                                       #=> true
- *     [nil,false].none?                                 #=> true
- */
-static VALUE
-enum_none(obj)
-    VALUE obj;
-{
-    VALUE result = Qtrue;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? none_iter_i : none_i, (VALUE)&result);
+    memo->u1.value = Qfalse;
+    rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)memo);
+    result = memo->u1.value;
+    rb_gc_force_recycle((VALUE)memo);
     return result;
 }
 
 static VALUE
 min_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_funcall(i, id_cmp, 1, *memo);
-	if (rb_cmpint(cmp, i, *memo) < 0) {
-	    *memo = i;
+	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -1081,17 +632,17 @@ min_i(i, memo)
 static VALUE
 min_ii(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_yield_values(2, i, *memo);
-	if (rb_cmpint(cmp, i, *memo) < 0) {
-	    *memo = i;
+	cmp = rb_yield_values(2, i, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -1102,24 +653,26 @@ min_ii(i, memo)
  *  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"
+ *     a.max {|a,b| a.length <=> b.length }   #=> "dog"
  */
 
 static VALUE
 enum_min(obj)
     VALUE obj;
 {
-    VALUE result = Qundef;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result);
-    if (result == Qundef) return Qnil;
+    rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)memo);
+    result = memo->u1.value;
+    rb_gc_force_recycle((VALUE)memo);
     return result;
 }
 
@@ -1127,11 +680,11 @@ enum_min(obj)
  *  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"
@@ -1140,17 +693,17 @@ enum_min(obj)
 static VALUE
 max_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_funcall(i, id_cmp, 1, *memo);
-	if (rb_cmpint(cmp, i, *memo) > 0) {
-	    *memo = i;
+	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -1159,288 +712,42 @@ max_i(i, memo)
 static VALUE
 max_ii(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_yield_values(2, i, *memo);
-	if (rb_cmpint(cmp, i, *memo) > 0) {
-	    *memo = i;
+	cmp = rb_yield_values(2, i, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
+	    memo->u1.value = 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;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result);
-    if (result == Qundef) return Qnil;
+    rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)memo);
+    result = memo->u1.value;
+    rb_gc_force_recycle((VALUE)memo);
     return result;
 }
 
 static VALUE
-minmax_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    int n;
-
-    if (memo[0] == Qundef) {
-	memo[0] = i;
-	memo[1] = i;
-    }
-    else {
-	n = rb_cmpint(rb_funcall(i, id_cmp, 1, memo[0]), i, memo[0]);
-	if (n < 0) {
-	    memo[0] = i;
-	}
-	n = rb_cmpint(rb_funcall(i, id_cmp, 1, memo[1]), i, memo[1]);
-	if (n > 0) {
-	    memo[1] = i;
-	}
-    }
-    return Qnil;
-}
-
-static VALUE
-minmax_ii(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    int n;
-
-    if (memo[0] == Qundef) {
-	memo[0] = i;
-	memo[1] = i;
-    }
-    else {
-	VALUE ary = memo[2];
-
-	RARRAY(ary)->ptr[0] = i;
-	RARRAY(ary)->ptr[1] = memo[0];
-	n = rb_cmpint(rb_yield(ary), i, memo[0]);
-	if (n < 0) {
-	    memo[0] = i;
-	}
-	RARRAY(ary)->ptr[0] = i;
-	RARRAY(ary)->ptr[1] = memo[1];
-	n = rb_cmpint(rb_yield(ary), i, memo[1]);
-	if (n > 0) {
-	    memo[1] = i;
-	}
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.minmax                   => [min,max]
- *     enum.minmax {|a,b| block }    => [min,max]
- *
- *  Returns two elements array which contains the minimum and the
- *  maximum value in the enumerable.  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.minmax                                  #=> ["albatross", "horse"]
- *     a.minmax {|a,b| a.length <=> b.length }   #=> ["dog", "albatross"]
- */
-
-static VALUE
-enum_minmax(obj)
-    VALUE obj;
-{
-    VALUE result[3];
-    VALUE ary = rb_ary_new3(2, Qnil, Qnil);
-
-    result[0] = Qundef;
-    if (rb_block_given_p()) {
-	result[2] = ary;
-	rb_block_call(obj, id_each, 0, 0, minmax_ii, (VALUE)result);
-    }
-    else {
-	rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)result);
-    }
-    if (result[0] != Qundef) {
-        RARRAY(ary)->ptr[0] = result[0];
-        RARRAY(ary)->ptr[1] = result[1];
-    }
-    return ary;
-}
-
-static VALUE
-min_by_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    VALUE v;
-
-    v = rb_yield(i);
-    if (memo[0] == Qundef) {
-	memo[0] = v;
-	memo[1] = i;
-    }
-    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[0]), v, memo[0]) < 0) {
-	memo[0] = v;
-	memo[1] = i;
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.min_by {| obj| block }   => obj
- *
- *  Returns the object in <i>enum</i> that gives the minimum
- *  value from the given block.
- *
- *     a = %w(albatross dog horse)
- *     a.min_by {|x| x.length }   #=> "dog"
- */
-
-static VALUE
-enum_min_by(obj)
-    VALUE obj;
-{
-    VALUE memo[2];
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-
-    memo[0] = Qundef;
-    memo[1] = Qnil;
-    rb_block_call(obj, id_each, 0, 0, min_by_i, (VALUE)memo);
-    return memo[1];
-}
-
-static VALUE
-max_by_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    VALUE v;
-
-    v = rb_yield(i);
-    if (memo[0] == Qundef) {
-	memo[0] = v;
-	memo[1] = i;
-    }
-    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[0]), v, memo[0]) > 0) {
-	memo[0] = v;
-	memo[1] = i;
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.max_by {| obj| block }   => obj
- *
- *  Returns the object in <i>enum</i> that gives the maximum
- *  value from the given block.
- *
- *     a = %w(albatross dog horse)
- *     a.max_by {|x| x.length }   #=> "albatross"
- */
-
-static VALUE
-enum_max_by(obj)
-    VALUE obj;
-{
-    VALUE memo[2];
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-
-    memo[0] = Qundef;
-    memo[1] = Qnil;
-    rb_block_call(obj, id_each, 0, 0, max_by_i, (VALUE)memo);
-    return memo[1];
-}
-
-static VALUE
-minmax_by_i(i, memo)
-    VALUE i;
-    VALUE *memo;
-{
-    VALUE v;
-
-    v = rb_yield(i);
-    if (memo[0] == Qundef) {
-	memo[0] = v;
-	memo[1] = v;
-	memo[2] = i;
-	memo[3] = i;
-    }
-    else {
-	if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[0]), v, memo[0]) < 0) {
-	    memo[0] = v;
-	    memo[2] = i;
-	}
-	if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[1]), v, memo[1]) > 0) {
-	    memo[1] = v;
-	    memo[3] = i;
-	}
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.minmax_by {| obj| block }   => [min, max]
- *
- *  Returns two elements array array containing the objects in
- *  <i>enum</i> that gives the minimum and maximum values respectively
- *  from the given block.
- *
- *     a = %w(albatross dog horse)
- *     a.minmax_by {|x| x.length }   #=> ["dog", "albatross"]
- */
-
-static VALUE
-enum_minmax_by(obj)
-    VALUE obj;
-{
-    VALUE memo[4];
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-
-    memo[0] = Qundef;
-    memo[1] = Qundef;
-    memo[2] = Qnil;
-    memo[3] = Qnil;
-    rb_block_call(obj, id_each, 0, 0, minmax_by_i, (VALUE)memo);
-    return rb_assoc_new(memo[2], memo[3]);
-}
-
-static VALUE
 member_i(item, memo)
     VALUE item;
-    VALUE *memo;
+    NODE *memo;
 {
-    if (rb_equal(item, memo[0])) {
-	memo[1] = Qtrue;
+    if (rb_equal(item, memo->u1.value)) {
+	memo->u2.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
@@ -1450,98 +757,72 @@ member_i(item, memo)
  *  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];
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, val, Qfalse, 0);
 
-    memo[0] = val;
-    memo[1] = Qfalse;
     rb_iterate(rb_each, obj, member_i, (VALUE)memo);
-    return memo[1];
+    result = memo->u2.value;
+    rb_gc_force_recycle((VALUE)memo);
+    return result;
 }
 
 static VALUE
 each_with_index_i(val, memo)
     VALUE val;
-    VALUE *memo;
+    NODE *memo;
 {
-    rb_yield_values(2, val, INT2FIX(*memo));
-    ++*memo;
+    rb_yield_values(2, val, INT2FIX(memo->u3.cnt));
+    memo->u3.cnt++;
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.each_with_index {|obj, i| block }  -> enum
- *
+ *     enum.each_with_index {|obj, i| block }  -> nil
+ *  
  *  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;
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-
-    memo = 0;
-    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)&memo);
-    return obj;
-}
-
-/*
- *  call-seq:
- *     enum.reverse_each {|item| block } 
- *  
- *  Traverses <i>enum</i> in reverse order.
- */
-
-static VALUE
-enum_reverse_each(int argc, VALUE *argv, VALUE obj)
-{
-    VALUE ary;
-    long i;
-
-    RETURN_ENUMERATOR(obj, argc, argv);
-
-    ary = enum_to_a(argc, argv, obj);
-
-    for (i = RARRAY_LEN(ary); --i >= 0; ) {
-	rb_yield(RARRAY_PTR(ary)[i]);
-    }
+    NODE *memo = rb_node_newnode(NODE_MEMO, 0, 0, 0);
 
+    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)memo);
+    rb_gc_force_recycle((VALUE)memo);
     return obj;
 }
 
-
 static VALUE
 zip_i(val, memo)
     VALUE val;
-    VALUE *memo;
+    NODE *memo;
 {
-    VALUE result = memo[0];
-    VALUE args = memo[1];
-    int idx = memo[2]++;
+    VALUE result = memo->u1.value;
+    VALUE args = memo->u2.value;
+    int idx = memo->u3.cnt++;
     VALUE tmp;
     int i;
 
@@ -1563,23 +844,23 @@ zip_i(val, memo)
  *  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>,
+ *  the size of any arguemnt 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
@@ -1590,241 +871,18 @@ enum_zip(argc, argv, obj)
 {
     int i;
     VALUE result;
-    VALUE memo[3];
+    NODE *memo;
 
     for (i=0; i<argc; i++) {
-	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
+	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_ary");
     }
     result = rb_block_given_p() ? Qnil : rb_ary_new();
-    memo[0] = result;
-    memo[1] = rb_ary_new4(argc, argv);
-    memo[2] = 0;
+    memo = rb_node_newnode(NODE_MEMO, result, rb_ary_new4(argc, argv), 0);
     rb_iterate(rb_each, obj, zip_i, (VALUE)memo);
 
     return result;
 }
 
-static VALUE
-take_i(i, arg)
-    VALUE i;
-    VALUE *arg;
-{
-    if (arg[1]-- == 0) rb_iter_break();
-    rb_ary_push(arg[0], i);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.take(n)               => array
- *
- *  Returns first n elements from <i>enum</i>.
- *
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.take(3)             # => [1, 2, 3]
- *
- */
-
-static VALUE
-enum_take(obj, n)
-    VALUE obj;
-    VALUE n;
-{
-    VALUE args[2];
-    long len = NUM2LONG(n);
-
-    if (len < 0) {
-	rb_raise(rb_eArgError, "attempt to take negative size");
-    }
-
-    args[1] = len;
-    args[0] = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)args);
-    return args[0];
-}
-
-
-static VALUE
-take_while_i(i, ary)
-    VALUE i;
-    VALUE *ary;
-{
-    if (!RTEST(rb_yield(i))) rb_iter_break();
-    rb_ary_push(*ary, i);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.take_while {|arr| block }   => array
- *
- *  Passes elements to the block until the block returns nil or false,
- *  then stops iterating and returns an array of all prior elements.
- *
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.take_while {|i| i < 3 }   # => [1, 2]
- *
- */
-
-static VALUE
-enum_take_while(obj)
-    VALUE obj;
-{
-    VALUE ary;
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-    ary = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, take_while_i, (VALUE)&ary);
-    return ary;
-}
-
-static VALUE
-drop_i(i, arg)
-    VALUE i;
-    VALUE *arg;
-{
-    if (arg[1] == 0) {
-	rb_ary_push(arg[0], i);
-    }
-    else {
-	arg[1]--;
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.drop(n)               => array
- *
- *  Drops first n elements from <i>enum</i>, and returns rest elements
- *  in an array.
- *
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.drop(3)             # => [4, 5, 0]
- *
- */
-
-static VALUE
-enum_drop(obj, n)
-    VALUE obj;
-    VALUE n;
-{
-    VALUE args[2];
-    long len = NUM2LONG(n);
-
-    if (len < 0) {
-	rb_raise(rb_eArgError, "attempt to drop negative size");
-    }
-
-    args[1] = len;
-    args[0] = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, drop_i, (VALUE)args);
-    return args[0];
-}
-
-
-static VALUE
-drop_while_i(i, args)
-    VALUE i;
-    VALUE *args;
-{
-    if (!args[1] && !RTEST(rb_yield(i))) {
-	args[1] = Qtrue;
-    }
-    if (args[1]) {
-	rb_ary_push(args[0], i);
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.drop_while {|arr| block }   => array
- *
- *  Drops elements up to, but not including, the first element for
- *  which the block returns nil or false and returns an array
- *  containing the remaining elements.
- *
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.drop_while {|i| i < 3 }   # => [3, 4, 5, 0]
- *
- */
-
-static VALUE
-enum_drop_while(obj)
-    VALUE obj;
-{
-    VALUE args[2];
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-    args[0] = rb_ary_new();
-    args[1] = Qfalse;
-    rb_block_call(obj, id_each, 0, 0, drop_while_i, (VALUE)args);
-    return args[0];
-}
-
-static VALUE
-cycle_i(i, ary)
-    VALUE i;
-    VALUE ary;
-{
-    rb_ary_push(ary, i);
-    rb_yield(i);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.cycle {|obj| block }
- *     enum.cycle(n) {|obj| block }
- *
- *  Calls <i>block</i> for each element of <i>enum</i> repeatedly _n_
- *  times or forever if none or nil is given.  If a non-positive
- *  number is given or the collection is empty, does nothing.  Returns
- *  nil if the loop has finished without getting interrupted.
- *
- *  Enumerable#cycle saves elements in an internal array so changes
- *  to <i>enum</i> after the first pass have no effect.
- *
- *     a = ["a", "b", "c"]
- *     a.cycle {|x| puts x }  # print, a, b, c, a, b, c,.. forever.
- *     a.cycle(2) {|x| puts x }  # print, a, b, c, a, b, c.
- *
- */
-
-static VALUE
-enum_cycle(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE ary;
-    VALUE nv = Qnil;
-    long n, i, len;
-
-    rb_scan_args(argc, argv, "01", &nv);
-
-    RETURN_ENUMERATOR(obj, argc, argv);
-    if (NIL_P(nv)) {
-        n = -1;
-    }
-    else {
-        n = NUM2LONG(nv);
-        if (n <= 0) return Qnil;
-    }
-    ary = rb_ary_new();
-    RBASIC(ary)->klass = 0;
-    rb_block_call(obj, id_each, 0, 0, cycle_i, ary);
-    len = RARRAY(ary)->len;
-    if (len == 0) return Qnil;
-    while (n < 0 || 0 < --n) {
-        for (i=0; i<len; i++) {
-            rb_yield(RARRAY(ary)->ptr[i]);
-        }
-    }
-    return Qnil;		/* not reached */
-}
-
 /*
  *  The <code>Enumerable</code> mixin provides collection classes with
  *  several traversal and searching methods, and with the ability to
@@ -1841,51 +899,32 @@ Init_Enumerable()
 {
     rb_mEnumerable = rb_define_module("Enumerable");
 
-    rb_define_method(rb_mEnumerable, "to_a", enum_to_a, -1);
-    rb_define_method(rb_mEnumerable, "entries", enum_to_a, -1);
-
-    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, "count", enum_count, -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_index", enum_find_index, -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, "reduce", enum_inject, -1);
-    rb_define_method(rb_mEnumerable, "partition", enum_partition, 0);
-    rb_define_method(rb_mEnumerable, "group_by", enum_group_by, 0);
-    rb_define_method(rb_mEnumerable, "first", enum_first, -1);
-    rb_define_method(rb_mEnumerable, "all?", enum_all, 0);
-    rb_define_method(rb_mEnumerable, "any?", enum_any, 0);
-    rb_define_method(rb_mEnumerable, "one?", enum_one, 0);
-    rb_define_method(rb_mEnumerable, "none?", enum_none, 0);
-    rb_define_method(rb_mEnumerable, "min", enum_min, 0);
-    rb_define_method(rb_mEnumerable, "max", enum_max, 0);
-    rb_define_method(rb_mEnumerable, "minmax", enum_minmax, 0);
-    rb_define_method(rb_mEnumerable, "min_by", enum_min_by, 0);
-    rb_define_method(rb_mEnumerable, "max_by", enum_max_by, 0);
-    rb_define_method(rb_mEnumerable, "minmax_by", enum_minmax_by, 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, "enum_with_index", enum_each_with_index, 0);
-    rb_define_method(rb_mEnumerable, "reverse_each", enum_reverse_each, -1);
+    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);
-    rb_define_method(rb_mEnumerable, "take", enum_take, 1);
-    rb_define_method(rb_mEnumerable, "take_while", enum_take_while, 0);
-    rb_define_method(rb_mEnumerable, "drop", enum_drop, 1);
-    rb_define_method(rb_mEnumerable, "drop_while", enum_drop_while, 0);
-    rb_define_method(rb_mEnumerable, "cycle", enum_cycle, -1);
 
     id_eqq  = rb_intern("===");
     id_each = rb_intern("each");
     id_cmp  = rb_intern("<=>");
-    id_size = rb_intern("size");
 }
 
diff --git a/enumerator.c b/enumerator.c
deleted file mode 100644
index f95d931b62..0000000000
--- a/enumerator.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/************************************************
-
-  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"
-
-/*
- * Document-class: Enumerable::Enumerator
- *
- * A class which provides a method `each' to be used as an Enumerable
- * object.
- */
-VALUE rb_cEnumerator;
-static VALUE sym_each;
-
-VALUE rb_eStopIteration;
-
-struct enumerator {
-    VALUE obj;
-    ID    meth;
-    VALUE proc;
-    VALUE args;
-    rb_block_call_func *iter;
-};
-
-static void enumerator_mark _((void *));
-static void
-enumerator_mark(p)
-    void *p;
-{
-    struct enumerator *ptr = p;
-    rb_gc_mark(ptr->obj);
-    rb_gc_mark(ptr->args);
-}
-
-static struct enumerator *
-enumerator_ptr(obj)
-    VALUE obj;
-{
-    struct enumerator *ptr;
-
-    Data_Get_Struct(obj, struct enumerator, ptr);
-    if (RDATA(obj)->dmark != enumerator_mark) {
-	rb_raise(rb_eTypeError,
-		 "wrong argument type %s (expected Enumerable::Enumerator)",
-		 rb_obj_classname(obj));
-    }
-    if (!ptr || ptr->obj == Qundef) {
-	rb_raise(rb_eArgError, "uninitialized enumerator");
-    }
-    return ptr;
-}
-
-/*
- *  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(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE meth = sym_each;
-
-    if (argc > 0) {
-	--argc;
-	meth = *argv++;
-    }
-    return rb_enumeratorize(obj, meth, argc, argv);
-}
-
-static VALUE
-each_slice_i(val, memo)
-    VALUE val;
-    VALUE *memo;
-{
-    VALUE ary = memo[0];
-    VALUE v = Qnil;
-    long size = (long)memo[1];
-
-    rb_ary_push(ary, val);
-
-    if (RARRAY_LEN(ary) == size) {
-	v = rb_yield(ary);
-	memo[0] = rb_ary_new2(size);
-    }
-
-    return v;
-}
-
-/*
- *  call-seq:
- *    e.each_slice(n) {...}
- *    e.each_slice(n)
- *
- *  Iterates the given block for each slice of <n> elements.  If no
- *  block is given, returns an enumerator.
- *
- *  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);
-    VALUE args[2], ary;
-
-    if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
-    RETURN_ENUMERATOR(obj, 1, &n);
-    args[0] = rb_ary_new2(size);
-    args[1] = (VALUE)size;
-
-    rb_block_call(obj, SYM2ID(sym_each), 0, 0, each_slice_i, (VALUE)args);
-
-    ary = args[0];
-    if (RARRAY_LEN(ary) > 0) rb_yield(ary);
-
-    return Qnil;
-}
-
-static VALUE
-each_cons_i(val, memo)
-    VALUE val;
-    VALUE *memo;
-{
-    VALUE ary = memo[0];
-    VALUE v = Qnil;
-    long size = (long)memo[1];
-
-    if (RARRAY_LEN(ary) == size) {
-	rb_ary_shift(ary);
-    }
-    rb_ary_push(ary, val);
-    if (RARRAY_LEN(ary) == size) {
-	v = rb_yield(rb_ary_dup(ary));
-    }
-    return v;
-}
-
-/*
- *  call-seq:
- *    each_cons(n) {...}
- *    each_cons(n)
- *
- *  Iterates the given block for each array of consecutive <n>
- *  elements.  If no block is given, returns an enumerator.a
- *
- *  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);
-    VALUE args[2];
-
-    if (size <= 0) rb_raise(rb_eArgError, "invalid size");
-    RETURN_ENUMERATOR(obj, 1, &n);
-    args[0] = rb_ary_new2(size);
-    args[1] = (VALUE)size;
-
-    rb_block_call(obj, SYM2ID(sym_each), 0, 0, each_cons_i, (VALUE)args);
-
-    return Qnil;
-}
-
-static VALUE enumerator_allocate _((VALUE));
-static VALUE
-enumerator_allocate(klass)
-    VALUE klass;
-{
-    struct enumerator *ptr;
-    VALUE enum_obj;
-
-    enum_obj = Data_Make_Struct(klass, struct enumerator,
-				enumerator_mark, -1, ptr);
-    ptr->obj = Qundef;
-
-    return enum_obj;
-}
-
-static VALUE enumerator_each_i _((VALUE, VALUE));
-static VALUE
-enumerator_each_i(v, enum_obj)
-    VALUE v;
-    VALUE enum_obj;
-{
-    return rb_yield(v);
-}
-
-static VALUE
-enumerator_init(enum_obj, obj, meth, argc, argv)
-    VALUE enum_obj;
-    VALUE obj;
-    VALUE meth;
-    int argc;
-    VALUE *argv;
-{
-    struct enumerator *ptr;
-
-    Data_Get_Struct(enum_obj, struct enumerator, ptr);
-
-    if (!ptr) {
-	rb_raise(rb_eArgError, "unallocated enumerator");
-    }
-
-    ptr->obj  = obj;
-    ptr->meth = rb_to_id(meth);
-    ptr->iter = enumerator_each_i;
-    if (argc) ptr->args = rb_ary_new4(argc, argv);
-
-    return enum_obj;
-}
-
-/*
- *  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.
- *
- *  Use of this method is discouraged.  Use Kernel#enum_for() instead.
- */
-static VALUE
-enumerator_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE recv, meth = sym_each;
-
-    if (argc == 0)
-	rb_raise(rb_eArgError, "wrong number of argument (0 for 1)");
-    recv = *argv++;
-    if (--argc) {
-	meth = *argv++;
-	--argc;
-    }
-    return enumerator_init(obj, recv, meth, argc, argv);
-}
-
-/* :nodoc: */
-static VALUE
-enumerator_init_copy(obj, orig)
-    VALUE obj;
-    VALUE orig;
-{
-    struct enumerator *ptr0, *ptr1;
-
-    ptr0 = enumerator_ptr(orig);
-
-    Data_Get_Struct(obj, struct enumerator, ptr1);
-
-    if (!ptr1) {
-	rb_raise(rb_eArgError, "unallocated enumerator");
-    }
-
-    ptr1->obj  = ptr0->obj;
-    ptr1->meth = ptr0->meth;
-    ptr1->iter = ptr0->iter;
-    ptr1->args = ptr0->args;
-
-    return obj;
-}
-
-VALUE
-rb_enumeratorize(obj, meth, argc, argv)
-    VALUE obj;
-    VALUE meth;
-    int argc;
-    VALUE *argv;
-{
-    return enumerator_init(enumerator_allocate(rb_cEnumerator), obj, meth, argc, argv);
-}
-
-/*
- *  call-seq:
- *    enum.each {...}
- *
- *  Iterates the given block using the object and the method specified
- *  in the first place.  If no block is given, returns self.
- *
- */
-static VALUE
-enumerator_each(obj)
-    VALUE obj;
-{
-    struct enumerator *e;
-    int argc = 0;
-    VALUE *argv = 0;
-
-    if (!rb_block_given_p()) return obj;
-    e = enumerator_ptr(obj);
-    if (e->args) {
-	argc = RARRAY_LEN(e->args);
-	argv = RARRAY_PTR(e->args);
-    }
-    return rb_block_call(e->obj, e->meth, argc, argv, e->iter, (VALUE)e);
-}
-
-static VALUE
-enumerator_with_index_i(val, memo)
-    VALUE val;
-    VALUE *memo;
-{
-    val = rb_yield_values(2, val, INT2FIX(*memo));
-    ++*memo;
-    return val;
-}
-
-/*
- *  call-seq:
- *    e.with_index {|(*args), idx| ... }
- *    e.with_index
- *
- *  Iterates the given block for each elements with an index, which
- *  start from 0.  If no block is given, returns an enumerator.
- *
- */
-static VALUE
-enumerator_with_index(obj)
-    VALUE obj;
-{
-    struct enumerator *e = enumerator_ptr(obj);
-    VALUE memo = 0;
-    int argc = 0;
-    VALUE *argv = 0;
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-    if (e->args) {
-	argc = RARRAY_LEN(e->args);
-	argv = RARRAY_PTR(e->args);
-    }
-    return rb_block_call(e->obj, e->meth, argc, argv,
-			 enumerator_with_index_i, (VALUE)&memo);
-}
-
-/*
- * call-seq:
- *   e.next   => object
- *
- * Returns the next object in the enumerator, and move the internal
- * position forward.  When the position reached at the end, internal
- * position is rewinded then StopIteration is raised.
- *
- * Note that enumeration sequence by next method does not affect other
- * non-external enumeration methods, unless underlying iteration
- * methods itself has side-effect, e.g. IO#each_line.
- *
- * Caution: Calling this method causes the "generator" library to be
- * loaded.
- */
-
-static VALUE
-enumerator_next(obj)
-    VALUE obj;
-{
-    rb_require("generator");
-    return rb_funcall(obj, rb_intern("next"), 0, 0);
-}
-
-/*
- * call-seq:
- *   e.rewind   => e
- *
- * Rewinds the enumeration sequence by the next method.
- */
-
-static VALUE
-enumerator_rewind(obj)
-    VALUE obj;
-{
-    rb_require("generator");
-    return rb_funcall(obj, rb_intern("rewind"), 0, 0);
-}
-
-void
-Init_Enumerator()
-{
-    rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1);
-    rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1);
-
-    rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1);
-    rb_define_method(rb_mEnumerable, "enum_slice", enum_each_slice, 1);
-    rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
-    rb_define_method(rb_mEnumerable, "enum_cons", enum_each_cons, 1);
-
-    rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "Enumerator", rb_cObject);
-    rb_include_module(rb_cEnumerator, rb_mEnumerable);
-
-    rb_define_alloc_func(rb_cEnumerator, enumerator_allocate);
-    rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
-    rb_define_method(rb_cEnumerator, "initialize_copy", enumerator_init_copy, 1);
-    rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
-    rb_define_method(rb_cEnumerator, "each_with_index", enumerator_with_index, 0);
-    rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0);
-    rb_define_method(rb_cEnumerator, "next", enumerator_next, 0);
-    rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0);
-
-    rb_eStopIteration   = rb_define_class("StopIteration", rb_eIndexError);
-
-    sym_each	 	= ID2SYM(rb_intern("each"));
-
-    rb_provide("enumerator.so");	/* for backward compatibility */
-}
diff --git a/env.h b/env.h
index c50103f71e..c47c01d9db 100644
--- a/env.h
+++ b/env.h
@@ -16,6 +16,7 @@
 extern struct FRAME {
     VALUE self;
     int argc;
+    VALUE *argv;
     ID last_func;
     ID orig_func;
     VALUE last_class;
@@ -29,8 +30,8 @@ extern struct FRAME {
 
 void rb_gc_mark_frame _((struct FRAME *));
 
-#define FRAME_DMETH  1
-#define FRAME_FUNC   2
+#define FRAME_ALLOCA 0
+#define FRAME_MALLOC 1
 
 extern struct SCOPE {
     struct RBasic super;
@@ -43,7 +44,6 @@ extern struct SCOPE {
 #define SCOPE_MALLOC  1
 #define SCOPE_NOSTACK 2
 #define SCOPE_DONT_RECYCLE 4
-#define SCOPE_CLONE   8
 
 extern int ruby_in_eval;
 
diff --git a/error.c b/error.c
index c6d7e6e107..3f48c85c6a 100644
--- a/error.c
+++ b/error.c
@@ -12,6 +12,7 @@
 
 #include "ruby.h"
 #include "env.h"
+#include "version.h"
 #include "st.h"
 
 #include <stdio.h>
@@ -22,14 +23,6 @@
 #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_description;
 
 int ruby_nerrs;
 
@@ -169,14 +162,6 @@ rb_warning(fmt, va_alist)
     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;
@@ -208,7 +193,8 @@ rb_bug(fmt, va_alist)
 	va_init_list(args, fmt);
 	vfprintf(out, fmt, args);
 	va_end(args);
-	fprintf(out, "\n%s\n\n", ruby_description);
+	fprintf(out, "\nruby %s (%s) [%s]\n\n",
+		RUBY_VERSION, RUBY_RELEASE_DATE, RUBY_PLATFORM);
     }
     abort();
 }
@@ -257,7 +243,7 @@ rb_check_type(x, t)
     if (TYPE(x) != t) {
 	while (type->type >= 0) {
 	    if (type->type == t) {
-		const char *etype;
+		char *etype;
 
 		if (NIL_P(x)) {
 		    etype = "nil";
@@ -265,9 +251,6 @@ rb_check_type(x, t)
 		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;
 		}
@@ -302,7 +285,6 @@ VALUE rb_eNoMethodError;
 VALUE rb_eSecurityError;
 VALUE rb_eNotImpError;
 VALUE rb_eNoMemError;
-VALUE rb_cNameErrorMesg;
 
 VALUE rb_eScriptError;
 VALUE rb_eSyntaxError;
@@ -352,7 +334,10 @@ exc_initialize(argc, argv, exc)
 {
     VALUE arg;
 
-    rb_scan_args(argc, argv, "01", &arg);
+    if (rb_scan_args(argc, argv, "01", &arg) == 1) {
+	VALUE mesg = arg;
+	StringValue(mesg);	/* ensure mesg can be converted to String */
+    }
     rb_iv_set(exc, "mesg", arg);
     rb_iv_set(exc, "bt", Qnil);
 
@@ -360,8 +345,6 @@ exc_initialize(argc, argv, exc)
 }
 
 /*
- *  Document-method: exception
- *
  *  call-seq:
  *     exc.exception(string) -> an_exception or exc
  *  
@@ -402,7 +385,7 @@ exc_to_s(exc)
 {
     VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
 
-    if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
+    if (NIL_P(mesg)) return rb_class_path(CLASS_OF(exc));
     if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
     return mesg;
 }
@@ -441,11 +424,11 @@ exc_inspect(exc)
     klass = CLASS_OF(exc);
     exc = rb_obj_as_string(exc);
     if (RSTRING(exc)->len == 0) {
-	return rb_str_dup(rb_class_name(klass));
+	return rb_str_dup(rb_class_path(klass));
     }
 
     str = rb_str_buf_new2("#<");
-    klass = rb_class_name(klass);
+    klass = rb_class_path(klass);
     rb_str_buf_append(str, klass);
     rb_str_buf_cat(str, ": ", 2);
     rb_str_buf_append(str, exc);
@@ -487,18 +470,18 @@ static VALUE
 exc_backtrace(exc)
     VALUE exc;
 {
-    static ID bt;
+    ID bt = rb_intern("bt");
 
-    if (!bt) bt = rb_intern("bt");
-    return rb_attr_get(exc, bt);
+    if (!rb_ivar_defined(exc, bt)) return Qnil;
+    return rb_ivar_get(exc, bt);
 }
 
-VALUE
-rb_check_backtrace(bt)
+static VALUE
+check_backtrace(bt)
     VALUE bt;
 {
     long i;
-    static const char err[] = "backtrace must be Array of String";
+    static char *err = "backtrace must be Array of String";
 
     if (!NIL_P(bt)) {
 	int t = TYPE(bt);
@@ -518,7 +501,7 @@ rb_check_backtrace(bt)
 
 /*
  *  call-seq:
- *     exc.set_backtrace(array)   =>  array
+ *     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
@@ -531,40 +514,25 @@ exc_set_backtrace(exc, bt)
     VALUE exc;
     VALUE bt;
 {
-    return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
+    return rb_iv_set(exc, "bt", 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);
+    VALUE status = INT2NUM(0);
     if (argc > 0 && FIXNUM_P(argv[0])) {
 	status = *argv++;
 	--argc;
     }
-    rb_call_super(argc, argv);
+    exc_initialize(argc, argv, exc);
     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;
@@ -572,24 +540,6 @@ exit_status(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, ...)
@@ -614,15 +564,6 @@ rb_name_error(id, fmt, va_alist)
     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;
@@ -632,18 +573,11 @@ name_err_initialize(argc, argv, self)
     VALUE name;
 
     name = (argc > 1) ? argv[--argc] : Qnil;
-    rb_call_super(argc, argv);
+    exc_initialize(argc, argv, self);
     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;
@@ -651,38 +585,6 @@ name_err_name(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;
@@ -695,90 +597,6 @@ nometh_err_initialize(argc, argv, self)
     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 {
-	const 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;
@@ -861,17 +679,6 @@ get_syserr(n)
     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;
@@ -881,7 +688,8 @@ syserr_initialize(argc, argv, self)
 #if !defined(_WIN32) && !defined(__VMS)
     char *strerror();
 #endif
-    const char *err;
+    char *err;
+    char *buf;
     VALUE mesg, error;
     VALUE klass = rb_obj_class(self);
 
@@ -900,36 +708,24 @@ syserr_initialize(argc, argv, self)
     }
     else {
 	rb_scan_args(argc, argv, "01", &mesg);
-	error = rb_const_get(klass, rb_intern("Errno"));
+	error = rb_const_get_at(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));
+	StringValue(mesg);
+	buf = ALLOCA_N(char, strlen(err)+RSTRING(mesg)->len+4);
+	sprintf(buf, "%s - %.*s", err, (int)RSTRING(mesg)->len, RSTRING(mesg)->ptr);
+	mesg = rb_str_new2(buf);
     }
     else {
 	mesg = rb_str_new2(err);
     }
-    rb_call_super(1, &mesg);
+    exc_initialize(1, &mesg, self);
     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;
@@ -937,30 +733,23 @@ syserr_errno(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;
-    ID en = rb_intern("errno");
 
-    if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) {
-	if (!rb_respond_to(exc, en)) return Qfalse;
-    }
-    else if (self == rb_eSystemCallError) return Qtrue;
+    if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) return Qfalse;
+    if (self == rb_eSystemCallError) return Qtrue;
 
-    num = rb_attr_get(exc, en);
+    num = rb_attr_get(exc, rb_intern("errno"));
     if (NIL_P(num)) {
-	num = rb_funcall(exc, en, 0, 0);
+	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))
@@ -995,7 +784,6 @@ Init_Exception()
     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);
@@ -1009,12 +797,6 @@ Init_Exception()
     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);
@@ -1080,7 +862,7 @@ void
 rb_notimplement()
 {
     rb_raise(rb_eNotImpError,
-	     "%s() function is unimplemented on this machine",
+	     "The %s() function is unimplemented on this machine",
 	     rb_id2name(ruby_frame->last_func));
 }
 
@@ -1108,6 +890,7 @@ void
 rb_sys_fail(mesg)
     const char *mesg;
 {
+    extern int errno;
     int n = errno;
     VALUE arg;
 
@@ -1148,14 +931,14 @@ rb_sys_warning(fmt, va_alist)
 
 void
 rb_load_fail(path)
-    const char *path;
+    char *path;
 {
     rb_loaderror("%s -- %s", strerror(errno), path);
 }
 
 void
 rb_error_frozen(what)
-    const char *what;
+    char *what;
 {
     rb_raise(rb_eTypeError, "can't modify frozen %s", what);
 }
diff --git a/eval.c b/eval.c
index 698e04971c..839c0c0dd3 100644
--- a/eval.c
+++ b/eval.c
@@ -29,6 +29,12 @@
 #endif
 
 #include <stdio.h>
+#if defined(HAVE_UCONTEXT_H) && (defined(__ia64__) || defined(HAVE_NATIVETHREAD)) && !defined(__stub_getcontext)
+#include <ucontext.h>
+#define USE_CONTEXT
+#else
+#include <setjmp.h>
+#endif
 
 #include "st.h"
 #include "dln.h"
@@ -48,7 +54,9 @@
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
-#  ifndef _AIX
+#  ifdef _AIX
+ #pragma alloca
+#  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca ();
 #   endif
@@ -80,12 +88,14 @@ char *strrchr _((const char*,const char));
 #include "macruby_private.h"
 #endif
 
-#ifdef __VMS
-#include "vmsruby_private.h"
-#endif
-
 #ifdef USE_CONTEXT
+typedef struct {
+    ucontext_t context;
+    volatile int status;
+} rb_jmpbuf_t[1];
 
+#undef longjmp
+#undef setjmp
 NORETURN(static void rb_jump_context(rb_jmpbuf_t, int));
 static inline void
 rb_jump_context(env, val)
@@ -96,109 +106,16 @@ rb_jump_context(env, 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)
+#define longjmp(env, val) rb_jump_context(env, val)
+#define setjmp(j) ((j)->status = 0, getcontext(&(j)->context), (j)->status)
 #else
-#  define ruby_setjmp(just_before_setjmp, env) \
-     ((just_before_setjmp), RUBY_SETJMP(env))
-#  define ruby_longjmp(env,val) RUBY_LONGJMP(env,val)
-#  ifdef __CYGWIN__
-int _setjmp(), _longjmp();
-#  endif
+typedef jmp_buf rb_jmpbuf_t;
+#ifndef setjmp
+#ifdef HAVE__SETJMP
+#define setjmp(env) _setjmp(env)
+#define longjmp(env,val) _longjmp(env,val)
+#endif
+#endif
 #endif
 
 #include <sys/types.h>
@@ -216,20 +133,17 @@ int _setjmp(), _longjmp();
 #include <sys/stat.h>
 
 VALUE rb_cProc;
-VALUE rb_cBinding;
+static 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 rb_cMethod;
 static VALUE method_call _((int, VALUE*, VALUE));
-VALUE rb_cUnboundMethod;
+static 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
@@ -240,8 +154,6 @@ static int scope_vmode;
 #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:
@@ -357,8 +269,7 @@ rb_clear_cache_for_undef(klass, id)
     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) {
+	if (ent->origin == klass && ent->mid == id) {
 	    ent->mid = 0;
 	}
 	ent++;
@@ -399,12 +310,7 @@ rb_clear_cache_by_class(klass)
 
 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)
+static ID __id__, __send__;
 
 void
 rb_add_method(klass, mid, node, noex)
@@ -432,7 +338,7 @@ rb_add_method(klass, mid, node, noex)
     }
     if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
     rb_clear_cache_by_id(mid);
-    body = NEW_METHOD(node, NOEX_WITH_SAFE(noex));
+    body = NEW_METHOD(node, 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)) {
@@ -450,8 +356,7 @@ rb_define_alloc_func(klass, func)
     VALUE (*func) _((VALUE));
 {
     Check_Type(klass, T_CLASS);
-    rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0),
-		  NOEX_PRIVATE);
+    rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0), NOEX_PRIVATE);
 }
 
 void
@@ -459,7 +364,7 @@ rb_undef_alloc_func(klass)
     VALUE klass;
 {
     Check_Type(klass, T_CLASS);
-    rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, 0, NOEX_UNDEF);
+    rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, 0, NOEX_UNDEF);
 }
 
 static NODE*
@@ -467,16 +372,16 @@ search_method(klass, id, origin)
     VALUE klass, *origin;
     ID id;
 {
-    st_data_t body;
+    NODE *body;
 
     if (!klass) return 0;
-    while (!st_lookup(RCLASS(klass)->m_tbl, id, &body)) {
+    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 (NODE *)body;
+    return body;
 }
 
 static NODE*
@@ -487,7 +392,7 @@ rb_get_method_body(klassp, idp, noexp)
 {
     ID id = *idp;
     VALUE klass = *klassp;
-    VALUE origin = 0;
+    VALUE origin;
     NODE * volatile body;
     struct cache_entry *ent;
 
@@ -505,6 +410,7 @@ rb_get_method_body(klassp, idp, noexp)
 
     if (ruby_running) {
 	/* store in cache */
+	if (BUILTIN_TYPE(origin) == T_ICLASS) origin = RBASIC(origin)->klass;
 	ent = cache + EXPR1(klass, id);
 	ent->klass  = klass;
 	ent->noex   = body->nd_noex;
@@ -555,8 +461,7 @@ remove_method(klass, mid)
     VALUE klass;
     ID mid;
 {
-    st_data_t data;
-    NODE *body = 0;
+    NODE *body;
 
     if (klass == rb_cObject) {
 	rb_secure(4);
@@ -568,14 +473,8 @@ remove_method(klass, mid)
     if (mid == __id__ || mid == __send__ || mid == init) {
 	rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
     }
-    if (st_lookup(RCLASS(klass)->m_tbl, mid, &data)) {
-	body = (NODE *)data;
-	if (!body || !body->nd_body) body = 0;
-	else {
-	    st_delete(RCLASS(klass)->m_tbl, &mid, &data);
-	}
-    }
-    if (!body) {
+    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));
     }
@@ -596,14 +495,6 @@ rb_remove_method(klass, 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;
@@ -634,7 +525,7 @@ rb_enable_super(klass, name)
     VALUE klass;
     const char *name;
 {
-    rb_warn("rb_enable_super() is obsolete");
+    rb_warning("rb_enable_super() is obsolete");
 }
 
 static void
@@ -701,7 +592,6 @@ rb_attr(klass, id, read, write, ex)
     char *buf;
     ID attriv;
     int noex;
-    size_t len;
 
     if (!ex) noex = NOEX_PUBLIC;
     else {
@@ -719,22 +609,20 @@ rb_attr(klass, id, read, write, ex)
 	}
     }
 
-    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);
+    buf = ALLOCA_N(char,strlen(name)+2);
+    sprintf(buf, "@%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);
+	sprintf(buf, "%s=", name);
+	id = rb_intern(buf);
+	rb_add_method(klass, id, NEW_ATTRSET(attriv), noex);
     }
 }
 
@@ -745,8 +633,8 @@ extern NODE *ruby_eval_tree_begin;
 extern NODE *ruby_eval_tree;
 extern int ruby_nerrs;
 
-VALUE rb_eLocalJumpError;
-VALUE rb_eSysStackError;
+static VALUE rb_eLocalJumpError;
+static VALUE rb_eSysStackError;
 
 extern VALUE ruby_top_self;
 
@@ -758,13 +646,14 @@ static struct SCOPE *top_scope;
 static unsigned long frame_unique = 0;
 
 #define PUSH_FRAME() do {		\
-    volatile struct FRAME _frame;	\
+    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.argv = 0;			\
+    _frame.flags = FRAME_ALLOCA;	\
     _frame.uniq = frame_unique++;	\
     ruby_frame = &_frame
 
@@ -784,7 +673,6 @@ struct BLOCK {
     int iter;
     int vmode;
     int flags;
-    int uniq;
     struct RVarmap *dyna_vars;
     VALUE orig_thread;
     VALUE wrapper;
@@ -797,12 +685,11 @@ struct BLOCK {
 #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.var = v;			\
+    _block.body = b;			\
     _block.self = self;			\
     _block.frame = *ruby_frame;		\
     _block.klass = ruby_class;		\
@@ -817,10 +704,6 @@ static unsigned long block_unique = 1;
     _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() \
@@ -834,17 +717,15 @@ struct RVarmap *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); \
+   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;
@@ -983,7 +864,6 @@ 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;			\
@@ -1004,7 +884,6 @@ struct tag {
     struct SCOPE *scope;
     VALUE dst;
     struct tag *prev;
-    int blkid;
 };
 static struct tag *prot_tag;
 
@@ -1017,22 +896,21 @@ static struct tag *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 PROT_ITER   INT2FIX(1)	/* 3 */
+#define PROT_CALL   INT2FIX(2)	/* 5 */
+#define PROT_PCALL  INT2FIX(3)	/* 7 */
 
-#define EXEC_TAG()    ruby_setjmp(((void)0), prot_tag->buf)
+#define EXEC_TAG()    (FLUSH_REGISTER_WINDOWS, setjmp(prot_tag->buf))
 
 #define JUMP_TAG(st) do {		\
     ruby_frame = prot_tag->frame;	\
     ruby_iter = prot_tag->iter;		\
-    ruby_longjmp(prot_tag->buf,(st));	\
+    longjmp(prot_tag->buf,(st));	\
 } while (0)
 
 #define POP_TAG()			\
@@ -1055,14 +933,14 @@ VALUE ruby_class;
 static VALUE ruby_wrapper;	/* security wrapper */
 
 #define PUSH_CLASS(c) do {		\
-    volatile VALUE _class = ruby_class;	\
+    VALUE _class = ruby_class;		\
     ruby_class = (c)
 
 #define POP_CLASS() ruby_class = _class; \
 } while (0)
 
-NODE *ruby_cref = 0;
-NODE *ruby_top_cref;
+static NODE *ruby_cref = 0;
+static NODE *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
 
@@ -1078,24 +956,22 @@ NODE *ruby_top_cref;
     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
-
+typedef struct thread * rb_thread_t;
+static rb_thread_t curr_thread = 0;
+static rb_thread_t main_thread;
 static void scope_dup _((struct SCOPE *));
 
 #define POP_SCOPE() 			\
     if (ruby_scope->flags & SCOPE_DONT_RECYCLE) {\
-	if (_old) scope_dup(_old);	\
+       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) {	\
+            ruby_scope != top_scope) {	\
 	    rb_gc_force_recycle((VALUE)ruby_scope);\
-	}				\
+        }				\
     }					\
     ruby_scope->flags |= SCOPE_NOSTACK;	\
     ruby_scope = _old;			\
@@ -1103,50 +979,25 @@ static void scope_dup _((struct SCOPE *));
 } while (0)
 
 static VALUE rb_eval _((VALUE,NODE*));
-static VALUE eval _((VALUE,VALUE,VALUE,const char*,int));
-static NODE *compile _((VALUE, const char*, int));
+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_PROC_CALL  1
+#define YIELD_PUBLIC_DEF 2
 #define YIELD_FUNC_AVALUE 1
 #define YIELD_FUNC_SVALUE 2
-#define YIELD_FUNC_LAMBDA 3
 
-static VALUE rb_call _((VALUE,VALUE,ID,int,const VALUE*,int,VALUE));
+static VALUE rb_call _((VALUE,VALUE,ID,int,const VALUE*,int));
 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));
+static void call_trace_func _((char*,NODE*,VALUE,ID,VALUE));
 
 #if 0
 #define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
@@ -1159,7 +1010,7 @@ void
 ruby_set_current_source()
 {
     if (ruby_current_node) {
-	ruby_sourcefile = ruby_current_node->nd_file;
+        ruby_sourcefile = ruby_current_node->nd_file;
 	ruby_sourceline = nd_line(ruby_current_node);
     }
 }
@@ -1192,7 +1043,7 @@ error_pos()
     if (ruby_sourcefile) {
 	if (ruby_frame->last_func) {
 	    warn_printf("%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline,
-			rb_id2name(ruby_frame->orig_func));
+			rb_id2name(ruby_frame->last_func));
 	}
 	else if (ruby_sourceline == 0) {
 	    warn_printf("%s", ruby_sourcefile);
@@ -1203,16 +1054,12 @@ error_pos()
     }
 }
 
-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);
+    return rb_funcall(info, rb_intern("backtrace"), 0);
 }
 
 static void
@@ -1227,7 +1074,7 @@ error_print()
 {
     VALUE errat = Qnil;		/* OK */
     volatile VALUE eclass, e;
-    const char *einfo;
+    char *einfo;
     long elen;
 
     if (NIL_P(ruby_errinfo)) return;
@@ -1261,8 +1108,7 @@ error_print()
 
     eclass = CLASS_OF(ruby_errinfo);
     if (EXEC_TAG() == 0) {
-  	e = rb_funcall(ruby_errinfo, rb_intern("message"), 0, 0);
- 	StringValue(e);
+	e = rb_obj_as_string(ruby_errinfo);
 	einfo = RSTRING(e)->ptr;
 	elen = RSTRING(e)->len;
     }
@@ -1277,18 +1123,17 @@ error_print()
     else {
 	VALUE epath;
 
-	epath = rb_class_name(eclass);
+	epath = rb_class_path(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)) != 0) {
+	    if (tail = memchr(einfo, '\n', elen)) {
 		len = tail - einfo;
 		tail++;		/* skip newline */
 	    }
@@ -1299,9 +1144,8 @@ error_print()
 		warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
 		warn_print(")\n");
 	    }
-	    if (tail && elen>len+1) {
+	    if (tail) {
 		warn_print2(tail, elen-len-1);
-		if (einfo[elen-1] != '\n') warn_print2("\n", 1);
 	    }
 	}
     }
@@ -1309,7 +1153,6 @@ error_print()
     if (!NIL_P(errat)) {
 	long i;
 	struct RArray *ep = RARRAY(errat);
-        int truncate = eclass == rb_eSysStackError;
 
 #define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
 #define TRACE_HEAD 8
@@ -1320,7 +1163,7 @@ error_print()
 	    if (TYPE(ep->ptr[i]) == T_STRING) {
 		warn_printf("\tfrom %s\n", RSTRING(ep->ptr[i])->ptr);
 	    }
-	    if (truncate && i == TRACE_HEAD && ep->len > TRACE_MAX) {
+	    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;
@@ -1339,7 +1182,7 @@ extern char **environ;
 char **rb_origenviron;
 
 void rb_call_inits _((void));
-void Init_stack _((VALUE*));
+void Init_stack _((void*));
 void Init_heap _((void));
 void Init_ext _((void));
 
@@ -1349,15 +1192,6 @@ 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
@@ -1398,13 +1232,11 @@ ruby_init()
 	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;
+	top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
+	ruby_cref = 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;
@@ -1416,7 +1248,6 @@ ruby_init()
     }
     POP_SCOPE();
     ruby_scope = top_scope;
-    top_scope->flags &= ~SCOPE_NOSTACK;
     ruby_running = 1;
 }
 
@@ -1441,28 +1272,19 @@ int ruby_in_eval;
 static void rb_thread_cleanup _((void));
 static void rb_thread_wait_other_threads _((void));
 
-static int thread_no_ensure _((void));
+static int thread_set_raised();
+static int thread_reset_raised();
 
 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;
-    rb_thread_t th = curr_thread;
 
-    if (rb_thread_set_raised(th))
-	return EXIT_FAILURE;
+    if (thread_set_raised()) return EXIT_FAILURE;
     switch (ex & TAG_MASK) {
       case 0:
 	status = EXIT_SUCCESS;
@@ -1502,10 +1324,8 @@ error_handle(ex)
       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 */
+	    VALUE st = rb_iv_get(ruby_errinfo, "status");
+	    status = NUM2INT(st);
 	}
 	else {
 	    error_print();
@@ -1515,7 +1335,7 @@ error_handle(ex)
 	rb_bug("Unknown longjmp status %d", ex);
 	break;
     }
-    rb_thread_reset_raised(th);
+    thread_reset_raised();
     return status;
 }
 
@@ -1555,7 +1375,6 @@ ruby_finalize_0()
 static void
 ruby_finalize_1()
 {
-    signal(SIGINT, SIG_DFL);
     ruby_errinfo = 0;
     rb_gc_call_finalizer_at_exit();
     trace_func = 0;
@@ -1574,14 +1393,12 @@ ruby_cleanup(ex)
     int ex;
 {
     int state;
-    volatile VALUE errs[2];
-    int nerr;
+    volatile VALUE err = ruby_errinfo;
 
-    errs[1] = ruby_errinfo;
     ruby_safe_level = 0;
-    Init_stack((void *)&state);
+    Init_stack((void*)&state);
     ruby_finalize_0();
-    errs[0] = ruby_errinfo;
+    if (ruby_errinfo) err = ruby_errinfo;
     PUSH_TAG(PROT_NONE);
     PUSH_ITER(ITER_NOT);
     if ((state = EXEC_TAG()) == 0) {
@@ -1592,47 +1409,25 @@ ruby_cleanup(ex)
 	ex = state;
     }
     POP_ITER();
-    ruby_errinfo = errs[1];
+    ruby_errinfo = err;
     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
+    ruby_finalize_1();
+    if (err && rb_obj_is_kind_of(err, rb_eSystemExit)) {
+	VALUE st = rb_iv_get(err, "status");
+	return NUM2INT(st);
     }
-#endif
-
     return ex;
 }
 
-static int
-ruby_exec_internal()
+int
+ruby_exec()
 {
     int state;
+    volatile NODE *tmp;
 
+    Init_stack((void*)&tmp);
     PUSH_TAG(PROT_NONE);
     PUSH_ITER(ITER_NOT);
     /* default visibility is private at toplevel */
@@ -1652,15 +1447,6 @@ ruby_stop(ex)
     exit(ruby_cleanup(ex));
 }
 
-int
-ruby_exec()
-{
-    volatile NODE *tmp;
-
-    Init_stack((void*)&tmp);
-    return ruby_exec_internal();
-}
-
 void
 ruby_run()
 {
@@ -1712,7 +1498,22 @@ rb_eval_string_protect(str, state)
     const char *str;
     int *state;
 {
-    return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state);
+    VALUE result = Qnil;	/* OK */
+    int status;
+
+    PUSH_TAG(PROT_NONE);
+    if ((status = EXEC_TAG()) == 0) {
+	result = rb_eval_string(str);
+    }
+    POP_TAG();
+    if (state) {
+	*state = status;
+    }
+    if (status != 0) {
+	return Qnil;
+    }
+
+    return result;
 }
 
 VALUE
@@ -1730,6 +1531,7 @@ rb_eval_string_wrap(str, state)
     rb_extend_object(ruby_top_self, ruby_wrapper);
     PUSH_FRAME();
     ruby_frame->last_func = 0;
+    ruby_frame->orig_func = 0;
     ruby_frame->last_class = 0;
     ruby_frame->self = self;
     PUSH_CREF(ruby_wrapper);
@@ -1751,7 +1553,6 @@ rb_eval_string_wrap(str, state)
     return val;
 }
 
-NORETURN(static void localjump_error(const char*, VALUE, int));
 static void
 localjump_error(mesg, value, reason)
     const char *mesg;
@@ -1780,12 +1581,6 @@ localjump_error(mesg, value, reason)
     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;
@@ -1793,14 +1588,6 @@ localjump_xvalue(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;
@@ -1808,14 +1595,15 @@ localjump_reason(exc)
     return rb_iv_get(exc, "@reason");
 }
 
-NORETURN(static void jump_tag_but_local_jump _((int,VALUE)));
+NORETURN(static void jump_tag_but_local_jump _((int)));
 static void
-jump_tag_but_local_jump(state, val)
+jump_tag_but_local_jump(state)
     int state;
-    VALUE val;
 {
+    VALUE val;
 
-    if (val == Qundef) val = prot_tag->retval;
+    if (prot_tag) val = prot_tag->retval;
+    else          val = Qnil;
     switch (state) {
       case 0:
 	break;
@@ -1841,29 +1629,19 @@ jump_tag_but_local_jump(state, val)
 }
 
 VALUE
-rb_eval_cmd(cmd, arg, level)
+rb_eval_cmd(cmd, arg, tcheck)
     VALUE cmd, arg;
-    int level;
+    int tcheck;
 {
     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();
+	val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
 	POP_ITER();
-	if (state) JUMP_TAG(state);
 	return val;
     }
 
@@ -1871,24 +1649,58 @@ rb_eval_cmd(cmd, arg, level)
     ruby_scope = top_scope;
     PUSH_FRAME();
     ruby_frame->last_func = 0;
+    ruby_frame->orig_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;
+    if (tcheck && OBJ_TAINTED(cmd)) {
+	ruby_safe_level = 4;
+    }
 
     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);
+       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);
+    jump_tag_but_local_jump(state);
+    return val;
+}
+
+static VALUE
+superclass(self, node)
+    VALUE self;
+    NODE *node;
+{
+    VALUE val = Qnil;		/* OK */
+    int state;
+
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	val = rb_eval(self, node);
+    }
+    POP_TAG();
+    if (state) {
+	switch (nd_type(node)) {
+	  case NODE_COLON2:
+	    rb_raise(rb_eTypeError, "undefined superclass `%s'",
+		     rb_id2name(node->nd_mid));
+	  case NODE_CONST:
+	    rb_raise(rb_eTypeError, "undefined superclass `%s'",
+		     rb_id2name(node->nd_vid));
+	  default:
+	    break;
+	}
+	JUMP_TAG(state);
+    }
+    rb_check_inheritable(val);
+
     return val;
 }
 
@@ -1906,13 +1718,12 @@ ev_const_defined(cref, id, self)
     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;
+	if (NIL_P(klass)) return rb_const_defined(CLASS_OF(self), id);
+	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;
     }
@@ -1931,19 +1742,17 @@ ev_const_get(cref, id, self)
     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;
+	if (NIL_P(klass)) return rb_const_get(CLASS_OF(self), id);
+	while (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
+	    if (result == Qundef) {
+		rb_autoload_load(klass, id);
+		continue;
 	    }
+	    return result;
 	}
 	cbase = cbase->nd_next;
     }
-    return rb_const_get(NIL_P(cref->nd_clss) ? CLASS_OF(self): cref->nd_clss, id);
+    return rb_const_get(cref->nd_clss, id);
 }
 
 static VALUE
@@ -1951,33 +1760,15 @@ cvar_cbase()
 {
     NODE *cref = ruby_cref;
 
-    while (cref && cref->nd_next && (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON))) {
+    while (cref && cref->nd_next && 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()
 {
@@ -1994,20 +1785,6 @@ rb_mod_nesting()
     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()
 {
@@ -2031,7 +1808,7 @@ void
 rb_frozen_class_p(klass)
     VALUE klass;
 {
-    const char *desc = "something(?!)";
+    char *desc = "something(?!)";
 
     if (OBJ_FROZEN(klass)) {
 	if (FL_TEST(klass, FL_SINGLETON))
@@ -2069,7 +1846,7 @@ rb_undef(klass, id)
     }
     body = search_method(klass, id, &origin);
     if (!body || !body->nd_body) {
-	const char *s0 = " class";
+	char *s0 = " class";
 	VALUE c = klass;
 
 	if (FL_TEST(c, FL_SINGLETON)) {
@@ -2098,49 +1875,6 @@ rb_undef(klass, 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;
@@ -2160,10 +1894,9 @@ rb_alias(klass, name, def)
     VALUE klass;
     ID name, def;
 {
-    VALUE origin = 0;
-    NODE *orig, *body, *node;
+    VALUE origin;
+    NODE *orig, *body;
     VALUE singleton = 0;
-    st_data_t data;
 
     rb_frozen_class_p(klass);
     if (name == def) return;
@@ -2191,18 +1924,8 @@ rb_alias(klass, name, def)
     }
 
     rb_clear_cache_by_id(name);
-    if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, &data)) {
-	node = (NODE *)data;
-	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 (!ruby_running) return;
-
+      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex));
     if (singleton) {
 	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
     }
@@ -2211,28 +1934,6 @@ rb_alias(klass, name, def)
     }
 }
 
-/*
- *  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;
@@ -2241,8 +1942,8 @@ rb_mod_alias_method(mod, newname, oldname)
     return mod;
 }
 
-NODE *
-rb_copy_node_scope(node, rval)
+static NODE*
+copy_node_scope(node, rval)
     NODE *node;
     NODE *rval;
 {
@@ -2261,56 +1962,54 @@ rb_copy_node_scope(node, rval)
 #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),	\
+    (tmp__protect_tmp = rb_node_newnode(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 {\
+#define SETUP_ARGS0(anode,alen) 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;\
+	argc=alen;\
+        if (argc > 0) {\
+            int i;\
 	    n = anode;\
-	    argv = TMP_ALLOC(argc+extra);\
+	    argv = TMP_ALLOC(argc);\
 	    for (i=0;i<argc;i++) {\
 		argv[i] = rb_eval(self,n->nd_head);\
 		n=n->nd_next;\
 	    }\
-	}\
-	else {\
+        }\
+        else {\
 	    argc = 0;\
 	    argv = 0;\
-	}\
+        }\
     }\
     else {\
-	VALUE args = rb_eval(self,n);\
+        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);\
+        argc = RARRAY(args)->len;\
+	argv = ALLOCA_N(VALUE, argc);\
 	MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);\
     }\
 } while (0)
 
-#define SETUP_ARGS(anode) SETUP_ARGS0(anode,0)
+#define SETUP_ARGS(anode) SETUP_ARGS0(anode, anode->nd_alen)
 
 #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;\
+    if (tmp_iter == ITER_PRE) {\
+	ruby_block = ruby_block->outer;\
+        tmp_iter = ITER_NOT;\
     }\
     PUSH_ITER(tmp_iter)
 
@@ -2321,9 +2020,9 @@ rb_copy_node_scope(node, rval)
 
 #define MATCH_DATA *rb_svar(node->nd_cnt)
 
-static const char* is_defined _((VALUE, NODE*, char*));
+static char* is_defined _((VALUE, NODE*, char*));
 
-static const char*
+static char*
 arg_defined(self, node, buf, type)
     VALUE self;
     NODE *node;
@@ -2336,13 +2035,13 @@ arg_defined(self, node, buf, type)
     if (!node) return type;	/* no args */
     if (nd_type(node) == NODE_ARRAY) {
 	argc=node->nd_alen;
-	if (argc > 0) {
+        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;
@@ -2350,7 +2049,19 @@ arg_defined(self, node, buf, type)
     return type;
 }
 
-static const char*
+static VALUE
+search_iclass(self, klass)
+    VALUE self, klass;
+{
+    VALUE k = CLASS_OF(self);
+
+    while (k && !(BUILTIN_TYPE(k) == T_ICLASS && RBASIC(k)->klass == klass)) {
+	k = RCLASS(k)->super;
+    }
+    return k;
+}
+
+static char*
 is_defined(self, node, buf)
     VALUE self;
     NODE *node;			/* OK */
@@ -2364,9 +2075,13 @@ is_defined(self, node, buf)
     switch (nd_type(node)) {
       case NODE_SUPER:
       case NODE_ZSUPER:
-	if (ruby_frame->last_func == 0) return 0;
+	if (ruby_frame->orig_func == 0) return 0;
 	else if (ruby_frame->last_class == 0) return 0;
 	val = ruby_frame->last_class;
+	if (BUILTIN_TYPE(val) == T_MODULE) {
+	    val = search_iclass(self, val);
+	    if (!val) return 0;
+	}
 	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");
@@ -2443,14 +2158,11 @@ is_defined(self, node, buf)
       case NODE_ATTRSET:
       case NODE_OP_ASGN1:
       case NODE_OP_ASGN2:
-      case NODE_OP_ASGN_OR:
-      case NODE_OP_ASGN_AND:
       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:
@@ -2563,141 +2275,23 @@ rb_obj_is_proc(proc)
     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 const 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";
-    }
+    return trace_func = trace;
 }
 
 static void
 call_trace_func(event, node, self, id, klass)
-    rb_event_t event;
+    char *event;
     NODE *node;
     VALUE self;
     ID id;
@@ -2707,8 +2301,6 @@ call_trace_func(event, node, self, id, klass)
     struct FRAME *prev;
     NODE *node_save;
     VALUE srcfile;
-    const char *event_name;
-    rb_thread_t th = curr_thread;
 
     if (!trace_func) return;
     if (tracing) return;
@@ -2736,15 +2328,14 @@ call_trace_func(event, node, self, id, klass)
 	    klass = RBASIC(klass)->klass;
 	}
 	else if (FL_TEST(klass, FL_SINGLETON)) {
-	    klass = rb_iv_get(klass, "__attached__");
+	    klass = self;
 	}
     }
     PUSH_TAG(PROT_NONE);
-    raised = rb_thread_reset_raised(th);
+    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),
+	proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event),
 					    srcfile,
 					    INT2FIX(ruby_sourceline),
 					    id?ID2SYM(id):Qnil,
@@ -2752,7 +2343,7 @@ call_trace_func(event, node, self, id, klass)
 					    klass),
 		    Qundef, 0);
     }
-    if (raised) rb_thread_set_raised(th);
+    if (raised) thread_set_raised();
     POP_TAG();
     POP_FRAME();
 
@@ -2802,7 +2393,7 @@ svalue_to_avalue(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 v;
 	}
 	return rb_ary_new3(1, v);
     }
@@ -2914,26 +2505,7 @@ class_prefix(self, cpath)
   }\
 } 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);
-    }
-}
+NORETURN(static void localjump_destination _((int, VALUE)));
 
 static VALUE
 rb_eval(self, n)
@@ -2944,7 +2516,6 @@ rb_eval(self, n)
     NODE * volatile node = n;
     int state;
     volatile VALUE result = Qnil;
-    st_data_t data;
 
 #define RETURN(v) do { \
     result = (v); \
@@ -2992,7 +2563,7 @@ rb_eval(self, n)
 
 	/* 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) {
@@ -3006,7 +2577,7 @@ rb_eval(self, n)
 
 	/* node for speed-up(top-level loop for -n/-p) */
       case NODE_OPT_N:
-	PUSH_TAG(PROT_LOOP);
+	PUSH_TAG(PROT_ITER);
 	switch (state = EXEC_TAG()) {
 	  case 0:
 	  opt_n_next:
@@ -3044,16 +2615,15 @@ rb_eval(self, n)
 	RETURN(Qfalse);
 
       case NODE_IF:
-	if (RTEST(rb_eval(self, node->nd_cond))) {
-	    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
+	if (trace_func) {
+	    call_trace_func("line", node, self,
 			    ruby_frame->last_func,
 			    ruby_frame->last_class);
+	}
+	if (RTEST(rb_eval(self, node->nd_cond))) {
 	    node = node->nd_body;
 	}
 	else {
-	    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
-			    ruby_frame->last_func,
-			    ruby_frame->last_class);
 	    node = node->nd_else;
 	}
 	goto again;
@@ -3065,9 +2635,11 @@ rb_eval(self, n)
 	    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 (trace_func) {
+		    call_trace_func("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;
@@ -3106,9 +2678,11 @@ rb_eval(self, n)
 		}
 		tag = node->nd_head;
 		while (tag) {
-		    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
-				    ruby_frame->last_func,
-				    ruby_frame->last_class);
+		    if (trace_func) {
+			call_trace_func("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;
@@ -3135,7 +2709,7 @@ rb_eval(self, n)
 	RETURN(Qnil);
 
       case NODE_WHILE:
-	PUSH_TAG(PROT_LOOP);
+	PUSH_TAG(PROT_ITER);
 	result = Qnil;
 	switch (state = EXEC_TAG()) {
 	  case 0:
@@ -3170,7 +2744,7 @@ rb_eval(self, n)
 	RETURN(result);
 
       case NODE_UNTIL:
-	PUSH_TAG(PROT_LOOP);
+	PUSH_TAG(PROT_ITER);
 	result = Qnil;
 	switch (state = EXEC_TAG()) {
 	  case 0:
@@ -3211,7 +2785,7 @@ rb_eval(self, n)
       case NODE_ITER:
       case NODE_FOR:
 	{
-	    PUSH_TAG(PROT_LOOP);
+	    PUSH_TAG(PROT_ITER);
 	    PUSH_BLOCK(node->nd_var, node->nd_body);
 
 	    state = EXEC_TAG();
@@ -3230,7 +2804,7 @@ rb_eval(self, n)
 		    END_CALLARGS;
 		    ruby_current_node = node;
 		    SET_CURRENT_SOURCE();
-		    result = rb_call(CLASS_OF(recv),recv,each,0,0,0,self);
+		    result = rb_call(CLASS_OF(recv),recv,each,0,0,0);
 		}
 		POP_ITER();
 	    }
@@ -3254,12 +2828,13 @@ rb_eval(self, n)
 	break;
 
       case NODE_BREAK:
-	break_jump(rb_eval(self, node->nd_stts));
+	localjump_destination(TAG_BREAK, rb_eval(self, node->nd_stts));
 	break;
 
       case NODE_NEXT:
 	CHECK_INTS;
-	next_jump(rb_eval(self, node->nd_stts));
+	return_value(rb_eval(self, node->nd_stts));
+	JUMP_TAG(TAG_NEXT);
 	break;
 
       case NODE_REDO:
@@ -3298,7 +2873,7 @@ rb_eval(self, n)
 	break;
 
       case NODE_RESCUE:
-	{
+        {
 	    volatile VALUE e_info = ruby_errinfo;
 	    volatile int rescuing = 0;
 
@@ -3341,6 +2916,7 @@ rb_eval(self, n)
 	    POP_TAG();
 	    if (state != TAG_RAISE) ruby_errinfo = e_info;
 	    if (state) {
+		if (state == TAG_NEXT) prot_tag->retval = result;
 		JUMP_TAG(state);
 	    }
 	    /* no exception raised */
@@ -3348,7 +2924,7 @@ rb_eval(self, n)
 		goto again;
 	    }
 	}
-	break;
+        break;
 
       case NODE_ENSURE:
 	PUSH_TAG(PROT_NONE);
@@ -3356,7 +2932,7 @@ rb_eval(self, n)
 	    result = rb_eval(self, node->nd_head);
 	}
 	POP_TAG();
-	if (node->nd_ensr && !thread_no_ensure()) {
+	if (node->nd_ensr) {
 	    VALUE retval = prot_tag->retval; /* save retval */
 	    VALUE errinfo = ruby_errinfo;
 
@@ -3386,11 +2962,19 @@ rb_eval(self, n)
 
       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);
-	}	
+	result = rb_range_new(rb_eval(self, node->nd_beg),
+			      rb_eval(self, node->nd_end),
+			      nd_type(node) == NODE_DOT3);
+	if (node->nd_state) break;
+	if (nd_type(node->nd_beg) == NODE_LIT && FIXNUM_P(node->nd_beg->nd_lit) &&
+	    nd_type(node->nd_end) == NODE_LIT && FIXNUM_P(node->nd_end->nd_lit))
+	{
+	    nd_set_type(node, NODE_LIT);
+	    node->nd_lit = result;
+	}
+	else {
+	    node->nd_state = 1;
+	}
 	break;
 
       case NODE_FLIP2:		/* like AWK */
@@ -3433,7 +3017,7 @@ rb_eval(self, n)
 	break;
 
       case NODE_RETURN:
-	return_jump(rb_eval(self, node->nd_stts));
+	localjump_destination(TAG_RETURN, rb_eval(self, node->nd_stts));
 	break;
 
       case NODE_ARGSCAT:
@@ -3471,7 +3055,7 @@ rb_eval(self, n)
 
 	    ruby_current_node = node;
 	    SET_CURRENT_SOURCE();
-	    rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,scope,self);
+	    rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,scope);
 	    result = argv[argc-1];
 	}
 	break;
@@ -3489,7 +3073,7 @@ rb_eval(self, n)
 
 	    ruby_current_node = node;
 	    SET_CURRENT_SOURCE();
-	    result = rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,0,self);
+	    result = rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,0);
 	}
 	break;
 
@@ -3504,13 +3088,13 @@ rb_eval(self, n)
 
 	    ruby_current_node = node;
 	    SET_CURRENT_SOURCE();
-	    result = rb_call(CLASS_OF(self),self,node->nd_mid,argc,argv,1,self);
+	    result = rb_call(CLASS_OF(self),self,node->nd_mid,argc,argv,1);
 	}
 	break;
 
       case NODE_VCALL:
 	SET_CURRENT_SOURCE();
-	result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,2,self);
+	result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,2);
 	break;
 
       case NODE_SUPER:
@@ -3520,7 +3104,7 @@ rb_eval(self, n)
 	    TMP_PROTECT;
 
 	    if (ruby_frame->last_class == 0) {
-		if (ruby_frame->last_func) {
+		if (ruby_frame->orig_func) {
 		    rb_name_error(ruby_frame->last_func,
 				  "superclass method `%s' disabled",
 				  rb_id2name(ruby_frame->orig_func));
@@ -3531,21 +3115,7 @@ rb_eval(self, n)
 	    }
 	    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;
-		}
+		argv = ruby_frame->argv;
 	    }
 	    else {
 		BEGIN_CALLARGS;
@@ -3563,13 +3133,14 @@ rb_eval(self, n)
 	{
 	    struct FRAME frame;
 	    NODE *saved_cref = 0;
+	    int jump_chain = Qfalse;
 
 	    frame = *ruby_frame;
 	    frame.tmp = ruby_frame;
 	    ruby_frame = &frame;
 
 	    PUSH_SCOPE();
-	    PUSH_TAG(PROT_NONE);
+	    PUSH_TAG(PROT_PCALL);
 	    if (node->nd_rval) {
 		saved_cref = ruby_cref;
 		ruby_cref = (NODE*)node->nd_rval;
@@ -3588,41 +3159,52 @@ rb_eval(self, n)
 	    if ((state = EXEC_TAG()) == 0) {
 		result = rb_eval(self, node->nd_next);
 	    }
+	    else if (TAG_DST()) {
+		result = prot_tag->retval;
+		jump_chain = Qtrue;
+	    }
 	    POP_TAG();
 	    POP_SCOPE();
 	    ruby_frame = frame.tmp;
 	    if (saved_cref)
 		ruby_cref = saved_cref;
-	    if (state) JUMP_TAG(state);
+	    switch (state) {
+	      case 0:
+		break;
+	      case TAG_RETURN:
+	      case TAG_BREAK:
+		localjump_destination(state, result);
+	      default:
+		JUMP_TAG(state);
+	    }
 	}
 	break;
 
       case NODE_OP_ASGN1:
 	{
 	    int argc; VALUE *argv; /* used in SETUP_ARGS */
-	    VALUE recv, val, tmp;
+	    VALUE recv, val;
 	    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);
+	    SETUP_ARGS0(node->nd_args->nd_next, node->nd_args->nd_alen - 1);
+	    val = rb_funcall2(recv, aref, argc-1, argv);
 	    switch (node->nd_mid) {
 	    case 0: /* OR */
-	      if (RTEST(val)) RETURN(val);
-	      val = rb_eval(self, rval);
-	      break;
+		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;
+		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);
+		val = rb_funcall(val, node->nd_mid, 1, rb_eval(self, rval));
 	    }
-	    argv[argc] = val;
-	    rb_funcall2(recv, aset, argc+1, argv);
+	    argv[argc-1] = val;
+	    rb_funcall2(recv, aset, argc, argv);
 	    result = val;
 	}
 	break;
@@ -3630,22 +3212,22 @@ rb_eval(self, n)
       case NODE_OP_ASGN2:
 	{
 	    ID id = node->nd_next->nd_vid;
-	    VALUE recv, val, tmp;
+	    VALUE recv, val;
 
 	    recv = rb_eval(self, node->nd_recv);
-	    val = rb_funcall3(recv, id, 0, 0);
+	    val = rb_funcall(recv, id, 0);
 	    switch (node->nd_next->nd_mid) {
 	    case 0: /* OR */
-	      if (RTEST(val)) RETURN(val);
-	      val = rb_eval(self, node->nd_value);
-	      break;
+		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;
+		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);
+		val = rb_funcall(val, node->nd_next->nd_mid, 1,
+				 rb_eval(self, node->nd_value));
 	    }
 
 	    rb_funcall2(recv, node->nd_next->nd_aid, 1, &val);
@@ -3704,6 +3286,9 @@ rb_eval(self, n)
 	    rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result);
 	}
 	else {
+	    if (NIL_P(ruby_cbase)) {
+		rb_raise(rb_eTypeError, "no class/module to define constant");
+	    }
 	    rb_const_set(ruby_cbase, node->nd_vid, result);
 	}
 	break;
@@ -3894,9 +3479,6 @@ rb_eval(self, n)
 		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;
@@ -3911,17 +3493,24 @@ rb_eval(self, n)
 	break;
 
       case NODE_XSTR:
-	result = rb_funcall(self, '`', 1, rb_str_new3(node->nd_lit));
+	result = rb_funcall(self, '`', 1, node->nd_lit);
 	break;
 
       case NODE_LIT:
 	result = node->nd_lit;
 	break;
 
+      case NODE_ATTRSET:
+	if (ruby_frame->argc != 1)
+	    rb_raise(rb_eArgError, "wrong number of arguments(%d for 1)",
+		     ruby_frame->argc);
+	result = rb_ivar_set(self, node->nd_vid, ruby_frame->argv[0]);
+	break;
+
       case NODE_DEFN:
 	if (node->nd_defn) {
 	    NODE *body,  *defn;
-	    VALUE origin = 0;
+	    VALUE origin;
 	    int noex;
 
 	    if (NIL_P(ruby_class)) {
@@ -3955,7 +3544,7 @@ rb_eval(self, n)
 		noex |= NOEX_NOSUPER;
 	    }
 
-	    defn = rb_copy_node_scope(node->nd_defn, ruby_cref);
+	    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),
@@ -3983,8 +3572,7 @@ rb_eval(self, n)
 
 	    if (OBJ_FROZEN(recv)) rb_error_frozen("object");
 	    klass = rb_singleton_class(recv);
-	    if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, &data)) {
-		body = (NODE *)data;
+	    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");
 		}
@@ -3992,7 +3580,7 @@ rb_eval(self, n)
 		    rb_warning("redefine %s", rb_id2name(node->nd_mid));
 		}
 	    }
-	    defn = rb_copy_node_scope(node->nd_defn, ruby_cref);
+	    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;
@@ -4003,7 +3591,7 @@ rb_eval(self, n)
 	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)));
+	rb_undef(ruby_class, node->nd_mid);
 	result = Qnil;
 	break;
 
@@ -4011,13 +3599,12 @@ rb_eval(self, n)
 	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)));
+	rb_alias(ruby_class, node->nd_new, node->nd_old);
 	result = Qnil;
 	break;
 
       case NODE_VALIAS:
-	rb_alias_variable(node->u1.id, node->u2.id);
+	rb_alias_variable(node->nd_new, node->nd_old);
 	result = Qnil;
 	break;
 
@@ -4027,20 +3614,18 @@ rb_eval(self, n)
 	    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);
+		super = superclass(self, node->nd_super);
 	    }
 	    else {
 		super = 0;
 	    }
 
+	    cbase = class_prefix(self, node->nd_cpath);
+	    cname = node->nd_cpath->nd_mid;
 	    if (rb_const_defined_at(cbase, cname)) {
 		klass = rb_const_get_at(cbase, cname);
 		if (TYPE(klass) != T_CLASS) {
@@ -4050,8 +3635,7 @@ rb_eval(self, n)
 		if (super) {
 		    tmp = rb_class_real(RCLASS(klass)->super);
 		    if (tmp != super) {
-			rb_raise(rb_eTypeError, "superclass mismatch for class %s",
-				 rb_id2name(cname));
+			goto override_class;
 		    }
 		    super = 0;
 		}
@@ -4060,6 +3644,7 @@ rb_eval(self, n)
 		}
 	    }
 	    else {
+	      override_class:
 		if (!super) super = rb_cObject;
 		klass = rb_define_class_id(cname, super);
 		rb_set_class_path(klass, cbase, rb_id2name(cname));
@@ -4136,7 +3721,7 @@ rb_eval(self, n)
       case NODE_DEFINED:
 	{
 	    char buf[20];
-	    const char *desc = is_defined(self, node->nd_head, buf);
+	    char *desc = is_defined(self, node->nd_head, buf);
 
 	    if (desc) result = rb_str_new2(desc);
 	    else result = Qnil;
@@ -4144,14 +3729,16 @@ rb_eval(self, n)
 	break;
 
       case NODE_NEWLINE:
-	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self, 
-			ruby_frame->last_func,
-			ruby_frame->last_class);
+	if (trace_func) {
+	    call_trace_func("line", node, self,
+			    ruby_frame->last_func,
+			    ruby_frame->last_class);
+	}
 	node = node->nd_next;
 	goto again;
 
       default:
-	unknown_node(node);
+	rb_bug("unknown node type %d", nd_type(node));
     }
   finish:
     CHECK_INTS;
@@ -4197,8 +3784,9 @@ module_setup(module, n)
     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);
+	if (trace_func) {
+	    call_trace_func("class", n, ruby_cbase, ruby_frame->last_func, ruby_frame->last_class);
+	}
 	result = rb_eval(ruby_cbase, node->nd_next);
     }
     POP_TAG();
@@ -4208,54 +3796,27 @@ module_setup(module, n)
     POP_CLASS();
 
     ruby_frame = frame.tmp;
-    EXEC_EVENT_HOOK(RUBY_EVENT_END, n, 0,
-		    ruby_frame->last_func, ruby_frame->last_class);
+    if (trace_func) {
+	call_trace_func("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 RTEST(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);
+    if (rb_method_boundp(CLASS_OF(obj), id, 0)) {
+	return Qtrue;
+    }
+    return 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)
+rb_obj_respond_to(argc, argv, obj)
     int argc;
     VALUE *argv;
     VALUE obj;
@@ -4271,32 +3832,6 @@ obj_respond_to(argc, argv, obj)
     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;
@@ -4306,32 +3841,6 @@ rb_mod_method_defined(mod, mid)
 
 #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;
@@ -4346,32 +3855,6 @@ rb_mod_public_method_defined(mod, mid)
     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;
@@ -4386,32 +3869,6 @@ rb_mod_private_method_defined(mod, mid)
     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;
@@ -4426,15 +3883,16 @@ rb_mod_protected_method_defined(mod, mid)
     return Qfalse;
 }
 
-NORETURN(static VALUE terminate_process _((int, VALUE)));
+NORETURN(static VALUE terminate_process _((int, const char *, long)));
 static VALUE
-terminate_process(status, mesg)
+terminate_process(status, mesg, mlen)
     int status;
-    VALUE mesg;
+    const char *mesg;
+    long mlen;
 {
     VALUE args[2];
     args[0] = INT2NUM(status);
-    args[1] = mesg;
+    args[1] = rb_str_new(mesg, mlen);
 
     rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
 }
@@ -4444,51 +3902,12 @@ rb_exit(status)
     int status;
 {
     if (prot_tag) {
-	terminate_process(status, rb_str_new("exit", 4));
+	terminate_process(status, "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;
@@ -4508,9 +3927,6 @@ rb_f_exit(argc, argv)
 	    break;
 	  default:
 	    istatus = NUM2INT(status);
-#if EXIT_SUCCESS != 0
-	    if (istatus == 0) istatus = EXIT_SUCCESS;
-#endif
 	    break;
 	}
     }
@@ -4521,18 +3937,6 @@ rb_f_exit(argc, argv)
     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;
@@ -4549,9 +3953,9 @@ rb_f_abort(argc, argv)
 	VALUE mesg;
 
 	rb_scan_args(argc, argv, "1", &mesg);
-	StringValue(mesg);
-	rb_io_puts(1, &mesg, rb_stderr);
-	terminate_process(EXIT_FAILURE, mesg);
+	StringValue(argv[0]);
+	rb_io_puts(argc, argv, rb_stderr);
+	terminate_process(EXIT_FAILURE, RSTRING(argv[0])->ptr, RSTRING(argv[0])->len);
     }
     return Qnil;		/* not reached */
 }
@@ -4559,7 +3963,7 @@ rb_f_abort(argc, argv)
 void
 rb_iter_break()
 {
-    break_jump(Qnil);
+    localjump_destination(TAG_BREAK, Qnil);
 }
 
 NORETURN(static void rb_longjmp _((int, VALUE)));
@@ -4571,9 +3975,8 @@ rb_longjmp(tag, mesg)
     VALUE mesg;
 {
     VALUE at;
-    rb_thread_t th = curr_thread;
 
-    if (rb_thread_set_raised(th)) {
+    if (thread_set_raised()) {
 	ruby_errinfo = exception_error;
 	JUMP_TAG(TAG_FATAL);
     }
@@ -4587,9 +3990,6 @@ rb_longjmp(tag, mesg)
 	at = get_backtrace(mesg);
 	if (NIL_P(at)) {
 	    at = make_backtrace();
-	    if (OBJ_FROZEN(mesg)) {
-		mesg = rb_obj_dup(mesg);
-	    }
 	    set_backtrace(mesg, at);
 	}
     }
@@ -4615,14 +4015,14 @@ rb_longjmp(tag, mesg)
 	    ruby_errinfo = mesg;
 	}
 	else if (status) {
-	    rb_thread_reset_raised(th);
+	    thread_reset_raised();
 	    JUMP_TAG(status);
 	}
     }
 
     rb_trap_restore_mask();
-    if (tag != TAG_FATAL) {
-	EXEC_EVENT_HOOK(RUBY_EVENT_RAISE, ruby_current_node,
+    if (trace_func && tag != TAG_FATAL) {
+	call_trace_func("raise", ruby_current_node,
 			ruby_frame->self,
 			ruby_frame->last_func,
 			ruby_frame->last_class);
@@ -4630,20 +4030,11 @@ rb_longjmp(tag, mesg)
     if (!prot_tag) {
 	error_print();
     }
-    rb_thread_raised_clear(th);
+    thread_reset_raised();
     JUMP_TAG(tag);
 }
 
 void
-rb_exc_jump(mesg)
-    VALUE mesg;
-{
-    rb_thread_raised_clear(rb_curr_thread);
-    ruby_errinfo = mesg;
-    JUMP_TAG(TAG_RAISE);
-}
-
-void
 rb_exc_raise(mesg)
     VALUE mesg;
 {
@@ -4660,48 +4051,14 @@ rb_exc_fatal(mesg)
 void
 rb_interrupt()
 {
-    static const char fmt[1] = {'\0'};
-    rb_raise(rb_eInterrupt, fmt);
+    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;
@@ -4737,17 +4094,9 @@ rb_make_exception(argc, argv)
     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]);
+	set_backtrace(mesg, (argc>2)?argv[2]:Qnil);
     }
 
-    return mesg;
-}
-
-static void
-rb_raise_jump(mesg)
-    VALUE mesg;
-{
     if (ruby_frame != top_frame) {
 	PUSH_FRAME();		/* fake frame */
 	*ruby_frame = *_frame.prev->prev;
@@ -4755,6 +4104,8 @@ rb_raise_jump(mesg)
 	POP_FRAME();
     }
     rb_longjmp(TAG_RAISE, mesg);
+
+    return Qnil;		/* not reached */
 }
 
 void
@@ -4778,28 +4129,6 @@ 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()
 {
@@ -4808,122 +4137,31 @@ rb_f_block_given_p()
     return Qfalse;
 }
 
-VALUE rb_eThreadError;
+static VALUE rb_eThreadError;
 
-NORETURN(static void proc_jump_error(int, VALUE));
 static void
-proc_jump_error(state, result)
+localjump_destination(state, retval)
     int state;
-    VALUE result;
-{
-    char mesg[32];
-    const 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;
+    VALUE tag = (state == TAG_BREAK) ? PROT_ITER : PROT_FUNC;
 
     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) {
+	if (tt->tag == PROT_PCALL || (tt->tag == PROT_THREAD && state == TAG_BREAK) ||
+	    (tt->tag == PROT_CALL || tt->tag == tag) && 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);
+	    JUMP_TAG(state);
 	}
+	if (tt->tag == PROT_FUNC && tt->frame->uniq == ruby_frame->uniq) break;
 	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;
+	    rb_raise(rb_eThreadError, "return jump can't across threads");
 	}
 	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);
-    }
+    jump_tag_but_local_jump(state);
 }
 
 static VALUE
@@ -4931,7 +4169,7 @@ rb_yield_0(val, self, klass, flags, avalue)
     VALUE val, self, klass;	/* OK */
     int flags, avalue;
 {
-    NODE *node, *var;
+    NODE *node;
     volatile VALUE result = Qnil;
     volatile VALUE old_cref;
     volatile VALUE old_wrapper;
@@ -4940,16 +4178,16 @@ rb_yield_0(val, self, klass, flags, avalue)
     int old_vmode;
     struct FRAME frame;
     NODE *cnode = ruby_current_node;
-    int lambda = flags & YIELD_LAMBDA_CALL;
     int state;
 
-    rb_need_block();
+    if (!rb_block_given_p()) {
+	localjump_error("no block given", Qnil, 0);
+    }
 
     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;
@@ -4973,35 +4211,27 @@ rb_yield_0(val, self, klass, flags, avalue)
 	self = block->self;
     }
     node = block->body;
-    var = block->var;
 
-    if (var) {
+    if (block->var) {
 	PUSH_TAG(PROT_NONE);
 	if ((state = EXEC_TAG()) == 0) {
-	    NODE *bvar = NULL;
-	  block_var:
-	    if (var == (NODE*)1) { /* no parameter || */
-		if (lambda && RARRAY(val)->len != 0) {
+	    if (block->var == (NODE*)1) { /* no parameter || */
+		if ((flags & YIELD_PROC_CALL) && RARRAY(val)->len != 0) {
 		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
 			     RARRAY(val)->len);
 		}
 	    }
-	    else if (var == (NODE*)2) {
+	    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 (!bvar && nd_type(var) == NODE_BLOCK_PASS) {
-		bvar = var->nd_body;
-		var = var->nd_args;
-		goto block_var;
-	    }
-	    else if (nd_type(var) == NODE_MASGN) {
+	    else if (nd_type(block->var) == NODE_MASGN) {
 		if (!avalue) {
-		    val = svalue_to_mrhs(val, var->nd_head);
+		    val = svalue_to_mrhs(val, block->var->nd_head);
 		}
-		massign(self, var, val, lambda);
+		massign(self, block->var, val, flags&YIELD_PROC_CALL);
 	    }
 	    else {
 		int len = 0;
@@ -5022,21 +4252,13 @@ rb_yield_0(val, self, klass, flags, avalue)
 		    val = Qnil;
 		  multi_values:
 		    {
-			ruby_current_node = var;
+			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, var, val, lambda);
-	    }
-	    if (bvar) {
-		VALUE blk;
-		if (flags & YIELD_PROC_CALL)
-		    blk = block->block_obj;
-		else
-		    blk = rb_block_proc();
-		assign(self, bvar, blk, 0);
+		assign(self, block->var, val, flags&YIELD_PROC_CALL);
 	    }
 	}
 	POP_TAG();
@@ -5049,22 +4271,16 @@ rb_yield_0(val, self, klass, flags, avalue)
     ruby_current_node = node;
 
     PUSH_ITER(block->iter);
-    PUSH_TAG(lambda ? PROT_NONE : PROT_YIELD);
+    PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
       redo:
 	if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) {
-	    switch (node->nd_state) {
-	      case YIELD_FUNC_LAMBDA:
-		if (!avalue) {
-		    val = rb_ary_new3(1, val);
-		}
-		break;
-	      case YIELD_FUNC_AVALUE:
+	    if (node->nd_state == YIELD_FUNC_AVALUE) {
 		if (!avalue) {
 		    val = svalue_to_avalue(val);
 		}
-		break;
-	      default:
+	    }
+	    else {
 		if (avalue) {
 		    val = avalue_to_svalue(val);
 		}
@@ -5084,18 +4300,8 @@ rb_yield_0(val, self, klass, flags, avalue)
 	    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 */
-	    }
+	    state = 0;
+	    result = prot_tag->retval;
 	    break;
 	  default:
 	    break;
@@ -5125,31 +4331,10 @@ rb_yield_0(val, self, klass, flags, avalue)
     ruby_cref = (NODE*)old_cref;
     ruby_wrapper = old_wrapper;
     if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
-	scope_dup(old_scope);
+       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;
-    }
+    if (state) JUMP_TAG(state);
     ruby_current_node = cnode;
     return result;
 }
@@ -5158,7 +4343,7 @@ VALUE
 rb_yield(val)
     VALUE val;
 {
-    return rb_yield_0(val, 0, 0, 0, Qfalse);
+    return rb_yield_0(val, 0, 0, Qfalse, Qfalse);
 }
 
 VALUE
@@ -5174,7 +4359,7 @@ rb_yield_values(n, va_alist)
     VALUE ary;
 
     if (n == 0) {
-	return rb_yield_0(Qundef, 0, 0, 0, Qfalse);
+	return rb_yield_0(Qundef, 0, 0, Qfalse, Qfalse);
     }
     ary = rb_ary_new2(n);
     va_init_list(args, n);
@@ -5182,7 +4367,7 @@ rb_yield_values(n, va_alist)
 	rb_ary_push(ary, va_arg(args, VALUE));
     }
     va_end(args);
-    return rb_yield_0(ary, 0, 0, 0, Qtrue);
+    return rb_yield_0(ary, 0, 0, Qfalse, Qtrue);
 }
 
 VALUE
@@ -5199,39 +4384,16 @@ rb_yield_splat(values)
 	    avalue = Qtrue;
 	}
     }
-    return rb_yield_0(values, 0, 0, 0, avalue);
+    return rb_yield_0(values, 0, 0, Qfalse, avalue);
 }
 
 static VALUE
-loop_i()
+rb_f_loop()
 {
     for (;;) {
-	rb_yield_0(Qundef, 0, 0, 0, Qfalse);
+	rb_yield_0(Qundef, 0, 0, Qfalse, Qfalse);
 	CHECK_INTS;
     }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     loop {|| block } 
- *  
- *  Repeatedly executes the block.
- *     
- *     loop do
- *       print "Input: "
- *       line = gets
- *       break if !line or line =~ /^qQ/
- *       # ...
- *     end
- *
- *  StopIteration raised in the block breaks the loop.
- */
-
-static VALUE
-rb_f_loop()
-{
-    rb_rescue2(loop_i, (VALUE)0, 0, 0, rb_eStopIteration, (VALUE)0);
     return Qnil;		/* dummy */
 }
 
@@ -5253,7 +4415,7 @@ massign(self, node, val, pcall)
     }
     if (pcall && list) goto arg_error;
     if (node->nd_args) {
-	if ((long)(node->nd_args) == -1) {
+	if (node->nd_args == (NODE*)-1) {
 	    /* no check for mere `*' */
 	}
 	else if (!list && i<len) {
@@ -5358,7 +4520,7 @@ assign(self, lhs, val, pcall)
 		/* attr set */
 		ruby_current_node = lhs;
 		SET_CURRENT_SOURCE();
-		rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, scope, self);
+		rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, scope);
 	    }
 	    else {
 		/* array set */
@@ -5369,7 +4531,7 @@ assign(self, lhs, val, pcall)
 		ruby_current_node = lhs;
 		SET_CURRENT_SOURCE();
 		rb_call(CLASS_OF(recv), recv, lhs->nd_mid,
-			RARRAY(args)->len, RARRAY(args)->ptr, scope, self);
+			RARRAY(args)->len, RARRAY(args)->ptr, scope);
 	    }
 	}
 	break;
@@ -5390,9 +4552,10 @@ rb_iterate(it_proc, data1, bl_proc, data2)
     NODE *node = NEW_IFUNC(bl_proc, data2);
     VALUE self = ruby_top_self;
 
-    PUSH_TAG(PROT_LOOP);
-    PUSH_BLOCK(0, node);
     PUSH_ITER(ITER_PRE);
+    PUSH_BLOCK(0, node);
+
+    PUSH_TAG(PROT_ITER);
     state = EXEC_TAG();
     if (state == 0) {
   iter_retry:
@@ -5406,9 +4569,9 @@ rb_iterate(it_proc, data1, bl_proc, data2)
 	state = 0;
 	goto iter_retry;
     }
-    POP_ITER();
-    POP_BLOCK();
     POP_TAG();
+    POP_BLOCK();
+    POP_ITER();
 
     switch (state) {
       case 0:
@@ -5458,25 +4621,19 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
     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:
+    if ((state = EXEC_TAG()) == 0) {
+      retry_entry:
 	result = (*b_proc)(data1);
-	break;
-      case TAG_RAISE:
-	if (handle) break;
-	handle = Qfalse;
+    }
+    else if (state == TAG_RAISE) {
+	int handle = Qfalse;
+	VALUE eclass;
+
 	va_init_list(args, data2);
-	while ((eclass = va_arg(args, VALUE)) != 0) {
+	while (eclass = va_arg(args, VALUE)) {
 	    if (rb_obj_is_kind_of(ruby_errinfo, eclass)) {
 		handle = Qtrue;
 		break;
@@ -5485,14 +4642,25 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
 	va_end(args);
 
 	if (handle) {
-	    state = 0;
 	    if (r_proc) {
-		result = (*r_proc)(data2, ruby_errinfo);
+		PUSH_TAG(PROT_NONE);
+		if ((state = EXEC_TAG()) == 0) {
+		    result = (*r_proc)(data2, ruby_errinfo);
+		}
+		POP_TAG();
+		if (state == TAG_RETRY) {
+		    state = 0;
+		    ruby_errinfo = Qnil;
+		    goto retry_entry;
+		}
 	    }
 	    else {
 		result = Qnil;
+		state = 0;
+	    }
+	    if (state == 0) {
+		ruby_errinfo = e_info;
 	    }
-	    ruby_errinfo = e_info;
 	}
     }
     POP_TAG();
@@ -5509,8 +4677,6 @@ rb_rescue(b_proc, data1, r_proc, 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));
@@ -5521,11 +4687,9 @@ rb_protect(proc, data, state)
     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;
@@ -5554,9 +4718,7 @@ rb_ensure(b_proc, data1, e_proc, data2)
     }
     POP_TAG();
     retval = prot_tag ? prot_tag->retval : Qnil;	/* save retval */
-    if (!thread_no_ensure()) {
-	(*e_proc)(data2);
-    }
+    (*e_proc)(data2);
     if (prot_tag) return_value(retval);
     if (state) JUMP_TAG(state);
     return result;
@@ -5588,14 +4750,21 @@ rb_with_disable_interrupt(proc, data)
     return result;
 }
 
-static void
+static inline void
 stack_check()
 {
-    rb_thread_t th = rb_curr_thread;
+    static int overflowing = 0;
 
-    if (!rb_thread_raised_p(th, RAISED_STACKOVERFLOW) && ruby_stack_check()) {
-	rb_thread_raised_set(th, RAISED_STACKOVERFLOW);
-	rb_exc_raise(sysstack_error);
+    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);
     }
 }
 
@@ -5606,35 +4775,57 @@ static int last_call_status;
 #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
+name_err_to_s(exc)
+    VALUE exc;
+{
+    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
+    ID id_recv = rb_intern("recv");
+
+    if (NIL_P(mesg)) return rb_class_path(CLASS_OF(exc));
+    if (rb_ivar_defined(exc, id_recv)) {
+	char buf[BUFSIZ];
+	char *desc = "";
+	volatile VALUE d = 0;
+	int noclass;
+	VALUE obj = rb_ivar_get(exc, id_recv);
+	int state;
+
+	switch (TYPE(obj)) {
+	  case T_NIL:
+	    desc = "nil";
+	    break;
+	  case T_TRUE:
+	    desc = "true";
+	    break;
+	  case T_FALSE:
+	    desc = "false";
+	    break;
+	  default:
+	    PUSH_TAG(PROT_NONE);
+	    if ((state = EXEC_TAG()) == 0) {
+		d = rb_inspect(obj);
+	    }
+	    POP_TAG();
+	    if (!d || RSTRING(d)->len > 65) {
+		d = rb_any_to_s(obj);
+	    }
+	    break;
+	}
+	if (d) {
+	    desc = RSTRING(d)->ptr;
+	}
+	noclass = (!desc || desc[0]=='#');
+	snprintf(buf, BUFSIZ, RSTRING(mesg)->ptr, desc,
+		 noclass ? "" : ":",
+		 noclass ? "" : rb_obj_classname(obj));
+	mesg = rb_str_new2(buf);
+	rb_iv_set(exc, "mesg", mesg);
+	st_delete(ROBJECT(exc)->iv_tbl, (st_data_t*)&id_recv, 0);
+    }
+    if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
+    return mesg;
+}
 
 static VALUE
 rb_method_missing(argc, argv, obj)
@@ -5644,7 +4835,7 @@ rb_method_missing(argc, argv, obj)
 {
     ID id;
     VALUE exc = rb_eNoMethodError;
-    const char *format = 0;
+    char *format = 0;
     NODE *cnode = ruby_current_node;
 
     if (argc == 0 || !SYMBOL_P(argv[0])) {
@@ -5656,34 +4847,36 @@ rb_method_missing(argc, argv, obj)
     id = SYM2ID(argv[0]);
 
     if (last_call_status & CSTAT_PRIV) {
-	format = "private method `%s' called for %s";
+	format = "private method `%s' called for %%s%%s%%s";
     }
     else if (last_call_status & CSTAT_PROT) {
-	format = "protected method `%s' called for %s";
+	format = "protected method `%s' called for %%s%%s%%s";
     }
     else if (last_call_status & CSTAT_VCALL) {
-	format = "undefined local variable or method `%s' for %s";
+	format = "undefined local variable or method `%s' for %%s%%s%%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";
+	format = "undefined method `%s' for %%s%%s%%s";
     }
 
     ruby_current_node = cnode;
     {
+	char buf[BUFSIZ];
 	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]);
+	snprintf(buf, BUFSIZ, format, rb_id2name(id));
+	args[n++] = rb_str_new2(buf);
 	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);
+	rb_iv_set(exc, "recv", obj);
 	ruby_frame = ruby_frame->prev; /* pop frame for "method_missing" */
 	rb_exc_raise(exc);
     }
@@ -5709,23 +4902,13 @@ method_missing(obj, id, argc, argv, call_status)
 	POP_FRAME();
     }
     else if (id == ID_ALLOCATOR) {
-	rb_raise(rb_eTypeError, "allocator undefined for %s", rb_class2name(obj));
+	rb_raise(rb_eNoMethodError, "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 = ALLOCA_N(VALUE, argc+1);
     nargv[0] = ID2SYM(id);
+    MEMCPY(nargv+1, argv, VALUE, argc);
+
     return rb_funcall2(obj, missing, argc+1, nargv);
 }
 
@@ -5737,7 +4920,7 @@ call_cfunc(func, recv, len, argc, argv)
     VALUE *argv;
 {
     if (len >= 0 && argc != len) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+	rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
 		 argc, len);
     }
 
@@ -5811,36 +4994,30 @@ call_cfunc(func, recv, len, argc, argv)
 		       argv[11], argv[12], argv[13], argv[14]);
 	break;
       default:
-	rb_raise(rb_eArgError, "too many arguments (%d)", len);
+	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)
+rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
     VALUE klass, recv;
     ID    id;
     ID    oid;
     int argc;			/* OK */
     VALUE *argv;		/* OK */
-    NODE * volatile body;
-    int flags;
+    NODE *body;			/* OK */
+    int nosuper;
 {
     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 && 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:
@@ -5852,29 +5029,16 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
     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->last_class = nosuper?0:klass;
     ruby_frame->self = recv;
     ruby_frame->argc = argc;
-    ruby_frame->flags = 0;
+    ruby_frame->argv = argv;
 
     switch (nd_type(body)) {
       case NODE_CFUNC:
@@ -5882,22 +5046,20 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    int len = body->nd_argc;
 
 	    if (len < -2) {
-		rb_bug("bad argc (%d) specified for `%s(%s)'",
+		rb_bug("bad argc(%d) specified for `%s(%s)'",
 		       len, rb_class2name(klass), rb_id2name(id));
 	    }
-	    if (event_hooks) {
+	    if (trace_func) {
 		int state;
 
-		EXEC_EVENT_HOOK(RUBY_EVENT_C_CALL, ruby_current_node,
-				recv, id, klass);
+		call_trace_func("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);
+		call_trace_func("c-return", ruby_current_node, recv, id, klass);
 		if (state) JUMP_TAG(state);
 	    }
 	    else {
@@ -5909,19 +5071,15 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	/* for attr get/set */
       case NODE_IVAR:
 	if (argc != 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	    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;
-
+	/* for re-scoped/renamed method */
       case NODE_ZSUPER:
-	result = rb_call_super(argc, argv);
+	result = rb_eval(recv, body);
 	break;
 
       case NODE_DMETHOD:
@@ -5929,16 +5087,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	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, ruby_current_node, recv, id, klass);
-	}
 	break;
 
       case NODE_SCOPE:
@@ -5948,6 +5097,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    NODE *saved_cref = 0;
 
 	    PUSH_SCOPE();
+
 	    if (body->nd_rval) {
 		saved_cref = ruby_cref;
 		ruby_cref = (NODE*)body->nd_rval;
@@ -5966,15 +5116,12 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    }
 	    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;
+		int i;
 
 		if (nd_type(body) == NODE_ARGS) {
 		    node = body;
@@ -5991,66 +5138,58 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 
 		    i = node->nd_cnt;
 		    if (i > argc) {
-			rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+			rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
 				 argc, i);
 		    }
-		    if (!node->nd_rest) {
+		    if (node->nd_rest == -1) {
+			int opt = i;
 			NODE *optnode = node->nd_opt;
 
-			nopt = i;
 			while (optnode) {
-			    nopt++;
+			    opt++;
 			    optnode = optnode->nd_next;
 			}
-			if (nopt < argc) {
-			    rb_raise(rb_eArgError,
-				     "wrong number of arguments (%d for %d)",
-				     argc, nopt);
+			if (opt < argc) {
+			    rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
+				     argc, opt);
 			}
+			ruby_frame->argc = opt;
+			ruby_frame->argv = local_vars+2;
 		    }
+
 		    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) {
+			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--;
 				opt = opt->nd_next;
-				++i;
+			    }
+			    if (opt) {
+				rb_eval(recv, opt);
 			    }
 			}
-		    }
-		    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);
+			local_vars = ruby_scope->local_vars;
+			if (node->nd_rest >= 0) {
+			    VALUE v;
+
+			    if (argc > 0)
+				v = rb_ary_new4(argc,argv);
+			    else
+				v = rb_ary_new2(0);
+			    ruby_scope->local_vars[node->nd_rest] = v;
 			}
-			assign(recv, node->nd_rest, v, 1);
 		    }
-		    ruby_frame->argc = i;
 		}
-		if (event_hooks) {
-		    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
+
+		if (trace_func) {
+		    call_trace_func("call", b2, recv, id, klass);
 		}
 		result = rb_eval(recv, body);
 	    }
@@ -6059,14 +5198,13 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 		state = 0;
 	    }
 	    POP_TAG();
-	    if (event_hooks) {
-		EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, ruby_current_node, recv, id, klass);
-	    }
 	    POP_VARS();
 	    POP_CLASS();
 	    POP_SCOPE();
 	    ruby_cref = saved_cref;
-	    if (safe >= 0) ruby_safe_level = safe;
+	    if (trace_func) {
+		call_trace_func("return", ruby_frame->prev->node, recv, id, klass);
+	    }
 	    switch (state) {
 	      case 0:
 		break;
@@ -6080,14 +5218,14 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 		if (rb_block_given_p()) JUMP_TAG(state);
 		/* fall through */
 	      default:
-		jump_tag_but_local_jump(state, result);
+		jump_tag_but_local_jump(state);
 		break;
 	    }
 	}
 	break;
 
       default:
-	unknown_node(body);
+	rb_bug("unknown node type %d", nd_type(body));
 	break;
     }
     POP_FRAME();
@@ -6096,13 +5234,12 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 }
 
 static VALUE
-rb_call(klass, recv, mid, argc, argv, scope, self)
+rb_call(klass, recv, mid, argc, argv, scope)
     VALUE klass, recv;
     ID    mid;
     int argc;			/* OK */
     const VALUE *argv;		/* OK */
     int scope;
-    VALUE self;
 {
     NODE  *body;		/* OK */
     int    noex;
@@ -6130,25 +5267,24 @@ rb_call(klass, recv, mid, argc, argv, scope, self)
 	return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
     }
 
-    if (mid != missing && scope == 0) {
+    if (mid != missing) {
 	/* receiver specified form for private method */
-	if (noex & NOEX_PRIVATE)
+	if ((noex & NOEX_PRIVATE) && scope == 0)
 	    return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
 
 	/* self must be kind of a specified form for protected method */
-	if (noex & NOEX_PROTECTED) {
+	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)))
+	    if (!rb_obj_is_kind_of(ruby_frame->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);
+    return rb_call0(klass, recv, mid, id, argc, argv, body, noex & NOEX_NOSUPER);
 }
 
 VALUE
@@ -6163,27 +5299,9 @@ rb_apply(recv, mid, args)
     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);
+    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1);
 }
 
-/*
- *  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;
@@ -6196,19 +5314,24 @@ rb_f_send(argc, argv, recv)
 
     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);
+    vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, 1);
     POP_ITER();
 
     return vid;
 }
 
-static VALUE
-vafuncall(recv, mid, n, ar)
+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_list *ar;
+    va_dcl
+#endif
 {
+    va_list ar;
     VALUE *argv;
 
     if (n > 0) {
@@ -6216,65 +5339,17 @@ vafuncall(recv, mid, n, ar)
 
 	argv = ALLOCA_N(VALUE, n);
 
+	va_init_list(ar, n);
 	for (i=0;i<n;i++) {
-	    argv[i] = va_arg(*ar, VALUE);
+	    argv[i] = va_arg(ar, VALUE);
 	}
-	va_end(*ar);
+	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);
-    }
+    return rb_call(CLASS_OF(recv), recv, mid, n, argv, 1);
 }
 
 VALUE
@@ -6284,7 +5359,7 @@ rb_funcall2(recv, mid, argc, argv)
     int argc;
     const VALUE *argv;
 {
-    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
+    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1);
 }
 
 VALUE
@@ -6294,7 +5369,7 @@ rb_funcall3(recv, mid, argc, argv)
     int argc;
     const VALUE *argv;
 {
-    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0, Qundef);
+    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0);
 }
 
 VALUE
@@ -6302,21 +5377,32 @@ rb_call_super(argc, argv)
     int argc;
     const VALUE *argv;
 {
-    VALUE result, self, klass;
+    VALUE result, self, klass, k;
 
     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));
+		      rb_id2name(ruby_frame->last_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);
+    if (BUILTIN_TYPE(klass) == T_MODULE) {
+	k = search_iclass(self, klass);
+	if (!k) {
+	    rb_raise(rb_eTypeError, "%s is not included in %s",
+		     rb_class2name(klass),
+		     rb_class2name(CLASS_OF(self)));
+	}
+	if (RCLASS(k)->super == 0) {
+	    rb_name_error(ruby_frame->last_func,
+			  "super: no superclass method `%s'",
+			  rb_id2name(ruby_frame->last_func));
+	}
+	klass = k;
     }
 
     PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
-    result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3, Qundef);
+    result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3);
     POP_ITER();
 
     return result;
@@ -6360,11 +5446,8 @@ backtrace(lev)
 	    }
 	}
     }
-    for (; frame && (n = frame->node); frame = frame->prev) {
+    while (frame && (n = frame->node)) {
 	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));
@@ -6373,36 +5456,12 @@ backtrace(lev)
 	    snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
 	}
 	rb_ary_push(ary, rb_str_new2(buf));
+	frame = frame->prev;
     }
 
     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;
@@ -6415,7 +5474,7 @@ rb_f_caller(argc, argv)
 
     if (NIL_P(level)) lev = 1;
     else lev = NUM2INT(level);
-    if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev);
+    if (lev < 0) rb_raise(rb_eArgError, "negative level(%d)", lev);
 
     return backtrace(lev);
 }
@@ -6444,16 +5503,10 @@ rb_frame_last_func()
     return ruby_frame->last_func;
 }
 
-ID
-rb_frame_this_func()
-{
-    return ruby_frame->orig_func;
-}
-
 static NODE*
 compile(src, file, line)
     VALUE src;
-    const char *file;
+    char *file;
     int line;
 {
     NODE *node;
@@ -6473,7 +5526,7 @@ compile(src, file, line)
 static VALUE
 eval(self, src, scope, file, line)
     VALUE self, src, scope;
-    const char *file;
+    char *file;
     int line;
 {
     struct BLOCK *data = NULL;
@@ -6487,7 +5540,6 @@ eval(self, src, scope, file, line)
     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)) {
@@ -6513,10 +5565,10 @@ eval(self, src, scope, file, line)
 	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 == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->body) {
+	    file = data->body->nd_file;
 	    if (!file) file = "__builtin__";
-	    line = nd_line(data->frame.node);
+	    line = nd_line(data->body);
 	}
 
 	self = data->self;
@@ -6532,7 +5584,7 @@ eval(self, src, scope, file, line)
 	file = ruby_sourcefile;
 	line = ruby_sourceline;
     }
-    PUSH_CLASS(data ? data->klass : ruby_class);
+    PUSH_CLASS(ruby_cbase);
     ruby_in_eval++;
     if (TYPE(ruby_class) == T_ICLASS) {
 	ruby_class = RBASIC(ruby_class)->klass;
@@ -6541,11 +5593,9 @@ eval(self, src, scope, file, line)
     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);
 	}
@@ -6587,18 +5637,14 @@ eval(self, src, scope, file, line)
     if (state) {
 	if (state == TAG_RAISE) {
 	    if (strcmp(file, "(eval)") == 0) {
-		VALUE mesg, errat, bt2;
+		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 &&
-		    (bt2 = backtrace(-2), RARRAY_LEN(bt2) > 0)) {
-		    if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
-			rb_str_update(mesg, 0, 0, rb_str_new2(": "));
-			rb_str_update(mesg, 0, 0, RARRAY_PTR(errat)[0]);
-		    }
-		    RARRAY_PTR(errat)[0] = RARRAY_PTR(bt2)[0];
+		mesg  = rb_attr_get(ruby_errinfo, rb_intern("mesg"));
+		if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
+		    rb_str_update(mesg, 0, 0, RARRAY(errat)->ptr[0]);
 		}
+		RARRAY(errat)->ptr[0] = RARRAY(backtrace(-2))->ptr[0];
 	    }
 	    rb_exc_raise(ruby_errinfo);
 	}
@@ -6608,25 +5654,6 @@ eval(self, src, scope, file, line)
     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;
@@ -6634,7 +5661,7 @@ rb_f_eval(argc, argv, self)
     VALUE self;
 {
     VALUE src, scope, vfile, vline;
-    const char *file = "(eval)";
+    char *file = "(eval)";
     int line = 1;
 
     rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
@@ -6648,13 +5675,12 @@ rb_f_eval(argc, argv, self)
 	SafeStringValue(src);
     }
     if (argc >= 3) {
-	StringValue(vfile);
+	file = StringValuePtr(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;
@@ -6681,15 +5707,14 @@ exec_under(func, under, cbase, 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;
+    ruby_frame->self = _frame.prev->self;
+    ruby_frame->last_func = _frame.prev->last_func;
+    ruby_frame->last_class = _frame.prev->last_class;
+    ruby_frame->argc = _frame.prev->argc;
+    ruby_frame->argv = _frame.prev->argv;
     if (cbase) {
 	PUSH_CREF(cbase);
     }
@@ -6714,11 +5739,6 @@ 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]);
 }
 
@@ -6751,28 +5771,12 @@ yield_under_i(self)
     return rb_yield_0(self, self, ruby_class, YIELD_PUBLIC_DEF, Qfalse);
 }
 
-static VALUE
-yield_args_under_i(vinfo)
-    VALUE vinfo;
-{
-    VALUE *info = (VALUE *)vinfo;
-
-    return rb_yield_0(info[0], info[1], ruby_class, YIELD_PUBLIC_DEF, Qtrue);
-}
-
 /* block eval under the class/module context */
 static VALUE
-yield_under(under, self, args)
-    VALUE under, self, args;
+yield_under(under, self)
+    VALUE under, self;
 {
-    if (args == Qundef) {
-	return exec_under(yield_under_i, under, 0, self);
-    }
-    else {
-	VALUE info[2] = { args, self };
-
-	return exec_under(yield_args_under_i, under, 0, (VALUE)info);
-    }
+    return exec_under(yield_under_i, under, 0, self);
 }
 
 static VALUE
@@ -6785,10 +5789,10 @@ specific_eval(argc, argv, klass, self)
 	if (argc > 0) {
 	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
 	}
-	return yield_under(klass, self, Qundef);
+	return yield_under(klass, self);
     }
     else {
-	const char *file = "(eval)";
+	char *file = "(eval)";
 	int   line = 1;
 
 	if (argc == 0) {
@@ -6806,38 +5810,15 @@ specific_eval(argc, argv, klass, self)
 			 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]);
 	    }
+	    if (argc > 2) line = NUM2INT(argv[2]);
 	}
 	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;
@@ -6846,74 +5827,16 @@ rb_obj_instance_eval(argc, argv, self)
 {
     VALUE klass;
 
-    if (SPECIAL_CONST_P(self)) {
+    if (rb_special_const_p(self)) {
 	klass = Qnil;
     }
     else {
 	klass = rb_singleton_class(self);
     }
-    return specific_eval(argc, argv, klass, self);
-}
 
-/*
- *  call-seq:
- *     obj.instance_exec(arg...) {|var...| block }                       => obj
- *
- *  Executes 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.  Arguments are passed as block parameters.
- *
- *     class KlassWithSecret
- *       def initialize
- *         @secret = 99
- *       end
- *     end
- *     k = KlassWithSecret.new
- *     k.instance_exec(5) {|x| @secret+x }   #=> 104
- */
-
-VALUE
-rb_obj_instance_exec(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 yield_under(klass, self, rb_ary_new4(argc, argv));
+    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;
@@ -6923,35 +5846,6 @@ rb_mod_module_eval(argc, argv, mod)
     return specific_eval(argc, argv, mod, mod);
 }
 
-/*
- *  call-seq:
- *     mod.module_exec(arg...) {|var...| block }       => obj
- *     mod.class_exec(arg...) {|var...| block }        => obj
- *
- *  Evaluates the given block in the context of the class/module.
- *  The method defined in the block will belong to the receiver.
- *
- *     class Thing
- *     end
- *     Thing.class_exec{
- *       def hello() "Hello there!" end
- *     }
- *     puts Thing.new.hello()
- *
- *  <em>produces:</em>
- *
- *     Hello there!
- */
-
-VALUE
-rb_mod_module_exec(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-{
-    return yield_under(mod, mod, rb_ary_new4(argc, argv));
-}
-
 VALUE rb_load_path;
 
 NORETURN(static void load_failed _((VALUE)));
@@ -6965,10 +5859,11 @@ rb_load(fname, wrap)
     int state;
     volatile int prohibit_int = rb_prohibit_interrupt;
     volatile ID last_func;
-    volatile VALUE wrapper = ruby_wrapper;
+    volatile VALUE wrapper = 0;
     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);
@@ -6976,7 +5871,6 @@ rb_load(fname, wrap)
     else {
 	SafeStringValue(fname);
     }
-    fname = rb_str_new4(fname);
     tmp = rb_find_file(fname);
     if (!tmp) {
 	load_failed(fname);
@@ -6986,7 +5880,7 @@ rb_load(fname, wrap)
     ruby_errinfo = Qnil;	/* ensure */
     PUSH_VARS();
     PUSH_CLASS(ruby_wrapper);
-    ruby_cref = ruby_top_cref;
+    ruby_cref = top_cref;
     if (!wrap) {
 	rb_secure(4);		/* should alter global state */
 	ruby_class = rb_cObject;
@@ -7053,7 +5947,7 @@ rb_load(fname, wrap)
 	ruby_nerrs = 0;
 	rb_exc_raise(ruby_errinfo);
     }
-    if (state) jump_tag_but_local_jump(state, Qundef);
+    if (state) jump_tag_but_local_jump(state);
     if (!NIL_P(ruby_errinfo))	/* exception during load */
 	rb_exc_raise(ruby_errinfo);
 }
@@ -7074,21 +5968,6 @@ rb_load_protect(fname, wrap, state)
     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;
@@ -7112,25 +5991,13 @@ static st_table *loading_tbl;
 #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
+static char *
 rb_feature_p(feature, ext, rb)
     const char *feature, *ext;
     int rb;
 {
     VALUE v;
-    const char *f, *e;
+    char *f, *e;
     long i, len, elen;
 
     if (ext) {
@@ -7141,65 +6008,38 @@ rb_feature_p(feature, ext, rb)
 	len = strlen(feature);
 	elen = 0;
     }
-    for (i = 0; i < RARRAY_LEN(rb_features); ++i) {
-	v = RARRAY_PTR(rb_features)[i];
+    for (i = 0; i < RARRAY(rb_features)->len; ++i) {
+	v = RARRAY(rb_features)->ptr[i];
 	f = StringValuePtr(v);
-	if (RSTRING_LEN(v) < len || strncmp(f, feature, len) != 0)
-	    continue;
+	if (strncmp(f, feature, len) != 0) continue;
 	if (!*(e = f + len)) {
 	    if (ext) continue;
-	    return 'u';
+	    return e;
 	}
 	if (*e != '.') continue;
 	if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) {
-	    return 's';
+	    return e;
 	}
 	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 e;
 	}
     }
     return 0;
 }
 
+static const char *const loadable_ext[] = {
+    ".rb", DLEXT,
+#ifdef DLEXT2
+    DLEXT2,
+#endif
+    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;
+    return rb_feature_p(feature, 0, Qfalse) ? Qtrue : Qfalse;
 }
 
 static void
@@ -7216,65 +6056,21 @@ rb_provide(feature)
     rb_provide_feature(rb_str_new2(feature));
 }
 
-static char *
-load_lock(ftptr)
-    const char *ftptr;
+static void
+load_wait(ftptr)
+    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;
-    }
+    if (!loading_tbl) return;
+    if (!st_lookup(loading_tbl, (st_data_t)ftptr, &th)) return;
+    if ((rb_thread_t)th == curr_thread) return;
     do {
-	if ((rb_thread_t)th == curr_thread) return 0;
 	CHECK_INTS;
+	rb_thread_schedule();
     } 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;
@@ -7288,23 +6084,21 @@ search_required(fname, featurep, path)
 {
     VALUE tmp;
     char *ext, *ftptr;
-    int type;
 
     *featurep = fname;
     *path = 0;
-    ext = strrchr(ftptr = RSTRING_PTR(fname), '.');
+    ext = strrchr(ftptr = RSTRING(fname)->ptr, '.');
     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';
+	    if (*path = rb_find_file(fname)) 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));
+	    tmp = rb_str_new(RSTRING(fname)->ptr, ext-RSTRING(fname)->ptr);
 	    *featurep = tmp;
 #ifdef DLEXT2
-	    OBJ_FREEZE(tmp);
 	    if (rb_find_file_ext(&tmp, loadable_ext+1)) {
 		*featurep = tmp;
 		*path = rb_find_file(tmp);
@@ -7312,38 +6106,41 @@ search_required(fname, featurep, path)
 	    }
 #else
 	    rb_str_cat2(tmp, DLEXT);
-	    OBJ_FREEZE(tmp);
-	    if ((*path = rb_find_file(tmp)) != 0) {
+	    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';
+	    if (*path = rb_find_file(fname)) return 's';
 	}
     }
+    if ((ext = rb_feature_p(ftptr, 0, Qfalse)) != 0) {
+	return strcmp(ext, ".rb") == 0 ? 'r' : 's';
+    }
     tmp = fname;
-    type = rb_find_file_ext(&tmp, loadable_ext);
-    *featurep = tmp;
-    switch (type) {
+    switch (rb_find_file_ext(&tmp, loadable_ext)) {
       case 0:
-	ftptr = RSTRING_PTR(tmp);
-	return rb_feature_p(ftptr, 0, Qfalse);
+	return 0;
+
+      case 1:
+	*featurep = tmp;
+	*path = rb_find_file(tmp);
+	return 'r';
 
       default:
-	ext = strrchr(ftptr = RSTRING(tmp)->ptr, '.');
-	if (rb_feature_p(ftptr, ext, !--type)) break;
+	*featurep = tmp;
 	*path = rb_find_file(tmp);
+	return 's';
     }
-    return type ? 's' : 'r';
 }
 
 static void
 load_failed(fname)
     VALUE fname;
 {
-    rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING(fname)->ptr);
+    rb_raise(rb_eLoadError, "No such file to load -- %s", RSTRING(fname)->ptr);
 }
 
 VALUE
@@ -7352,7 +6149,6 @@ rb_require_safe(fname, safe)
     int safe;
 {
     VALUE result = Qnil;
-    volatile VALUE errinfo = ruby_errinfo;
     int state;
     struct {
 	NODE *node;
@@ -7365,7 +6161,6 @@ rb_require_safe(fname, safe)
 	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;
@@ -7379,13 +6174,26 @@ rb_require_safe(fname, safe)
 	ruby_safe_level = safe;
 	found = search_required(fname, &feature, &path);
 	if (found) {
-	    if (!path || !(ftptr = load_lock(RSTRING_PTR(feature)))) {
+	    if (!path) {
+		load_wait(RSTRING(feature)->ptr);
 		result = Qfalse;
 	    }
 	    else {
 		ruby_safe_level = 0;
+		rb_provide_feature(feature);
 		switch (found) {
 		  case 'r':
+		    /* loading ruby library should be serialized. */
+		    if (!loading_tbl) {
+			loading_tbl = st_init_strtable();
+		    }
+		    /* partial state */
+		    ftptr = ruby_strdup(RSTRING(feature)->ptr);
+		    st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
+		    if (feature == fname && !OBJ_FROZEN(feature)) {
+			feature = rb_str_dup(feature);
+			OBJ_FREEZE(feature);
+		    }
 		    rb_load(path, 0);
 		    break;
 
@@ -7399,7 +6207,6 @@ rb_require_safe(fname, safe)
 		    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
 		    break;
 		}
-		rb_provide_feature(feature);
 		result = Qtrue;
 	    }
 	}
@@ -7410,12 +6217,16 @@ rb_require_safe(fname, safe)
     ruby_frame->last_func = saved.func;
     SCOPE_SET(saved.vmode);
     ruby_safe_level = saved.safe;
-    load_unlock(ftptr);
+    if (ftptr) {
+	if (st_delete(loading_tbl, (st_data_t *)&ftptr, 0)) { /* loading done */
+	    free(ftptr);
+	}
+    }
     if (state) JUMP_TAG(state);
     if (NIL_P(result)) {
 	load_failed(fname);
     }
-    ruby_errinfo = errinfo;
+    ruby_errinfo = Qnil;
 
     return result;
 }
@@ -7424,27 +6235,7 @@ 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);
-    }
+    return rb_require_safe(rb_str_new2(fname), ruby_safe_level);
 }
 
 static void
@@ -7472,16 +6263,6 @@ set_method_visibility(self, argc, argv, 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;
@@ -7498,16 +6279,6 @@ rb_mod_public(argc, argv, module)
     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;
@@ -7524,25 +6295,6 @@ rb_mod_protected(argc, argv, module)
     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;
@@ -7559,13 +6311,6 @@ rb_mod_private(argc, argv, module)
     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;
@@ -7576,22 +6321,6 @@ rb_mod_public_method(argc, argv, obj)
     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;
@@ -7602,16 +6331,6 @@ rb_mod_private_method(argc, argv, obj)
     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;
@@ -7628,42 +6347,6 @@ top_private(argc, 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;
@@ -7691,9 +6374,6 @@ rb_mod_modfunc(argc, argv, 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));
 	    }
@@ -7701,25 +6381,12 @@ rb_mod_modfunc(argc, argv, module)
 		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;
@@ -7737,13 +6404,6 @@ rb_mod_append_features(module, include)
     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;
@@ -7778,33 +6438,6 @@ rb_extend_object(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;
@@ -7813,31 +6446,6 @@ rb_mod_extend_object(mod, obj)
     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;
@@ -7847,7 +6455,7 @@ rb_obj_extend(argc, argv, obj)
     int i;
 
     if (argc == 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
+	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--) {
@@ -7857,15 +6465,6 @@ rb_obj_extend(argc, argv, 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;
@@ -7874,10 +6473,12 @@ top_include(argc, argv, 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);
+	rb_warn("main#include in the wrapped load is effective only for toplevel");
+	return rb_obj_extend(argc, argv, self);
+    }
+    else {
+	return rb_mod_include(argc, argv, rb_cObject);
     }
-    return rb_mod_include(argc, argv, rb_cObject);
 }
 
 VALUE rb_f_trace_var();
@@ -7914,19 +6515,6 @@ errat_setter(val, id, var)
     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()
 {
@@ -8033,27 +6621,6 @@ rb_f_END()
     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()
 {
@@ -8113,37 +6680,6 @@ rb_exec_end_proc()
     ruby_safe_level = safe;
 }
 
-/*
- *  call-seq:
- *     __method__         => symbol
- *  
- *  Returns the name of the current method as a Symbol.
- *  If called from inside of an aliased method it will return the original
- *  nonaliased name.
- *  If called outside of a method, it returns <code>nil</code>.
- *  
- *    def foo
- *      __method__
- *    end
- *    alias bar foo
- *    
- *    foo                # => :foo
- *    bar                # => :foo
- *
- */
-
-static VALUE
-rb_f_method_name()
-{
-    struct FRAME* prev = ruby_frame->prev;
-    if (prev && prev->orig_func) {
-	return ID2SYM(prev->orig_func);
-    }
-    else {
-	return Qnil;
-    }
-}
-
 void
 Init_eval()
 {
@@ -8165,11 +6701,11 @@ Init_eval()
     __id__ = rb_intern("__id__");
     __send__ = rb_intern("__send__");
 
-    rb_global_variable((void *)&top_scope);
-    rb_global_variable((void *)&ruby_eval_tree_begin);
+    rb_global_variable((VALUE*)&top_scope);
+    rb_global_variable((VALUE*)&ruby_eval_tree_begin);
 
-    rb_global_variable((void *)&ruby_eval_tree);
-    rb_global_variable((void *)&ruby_dyna_vars);
+    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);
@@ -8180,11 +6716,8 @@ Init_eval()
     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((void *)&basic_respond_to);
-    basic_respond_to = rb_method_node(rb_cObject, respond_to);
-    
+    rb_define_method(rb_mKernel, "respond_to?", rb_obj_respond_to, -1);
+
     rb_define_global_function("raise", rb_f_raise, -1);
     rb_define_global_function("fail", rb_f_raise, -1);
 
@@ -8197,15 +6730,12 @@ Init_eval()
 
     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("global_variables", rb_f_global_variables, 0);
     rb_define_global_function("local_variables", rb_f_local_variables, 0);
 
-    rb_define_global_function("__method__", rb_f_method_name, 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_method(rb_mKernel, "instance_exec", rb_obj_instance_exec, -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);
@@ -8221,9 +6751,7 @@ Init_eval()
     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, "module_exec", rb_mod_module_exec, -1);
     rb_define_method(rb_cModule, "class_eval", rb_mod_module_eval, -1);
-    rb_define_method(rb_cModule, "class_exec", rb_mod_module_exec, -1);
 
     rb_undef_method(rb_cClass, "module_function");
 
@@ -8241,8 +6769,8 @@ Init_eval()
 
     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("trace_var", rb_f_trace_var, -1);
+    rb_define_global_function("untrace_var", rb_f_untrace_var, -1);
 
     rb_define_global_function("set_trace_func", set_trace_func, 1);
     rb_global_variable(&trace_func);
@@ -8250,20 +6778,6 @@ Init_eval()
     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;
@@ -8277,19 +6791,6 @@ rb_mod_autoload(mod, sym, file)
     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;
@@ -8297,63 +6798,34 @@ rb_mod_autoload_p(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_load_path = rb_ary_new();
     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_readonly_variable("$\"", &rb_features);
 
     rb_define_global_function("load", rb_f_load, -1);
     rb_define_global_function("require", rb_f_require, 1);
@@ -8363,8 +6835,11 @@ Init_load()
     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();
+    rb_global_variable(&ruby_dln_librefs);
+
+    /* not really a right place */
+    rb_define_method(rb_eNameError, "to_s", name_err_to_s, 0);
 }
 
 static void
@@ -8406,27 +6881,23 @@ blk_mark(data)
 }
 
 static void
-frame_free(frame)
-    struct FRAME *frame;
+blk_free(data)
+    struct BLOCK *data;
 {
-    struct FRAME *tmp;
+    struct FRAME *frame;
+    void *tmp;
 
-    frame = frame->prev;
+    frame = data->frame.prev;
     while (frame) {
+	if (frame->argc > 0 && (frame->flags & FRAME_MALLOC))
+	    free(frame->argv);
 	tmp = frame;
 	frame = frame->prev;
 	free(tmp);
     }
-}
-
-static void
-blk_free(data)
-    struct BLOCK *data;
-{
-    void *tmp;
-
     while (data) {
-	frame_free(&data->frame);
+	if (data->frame.argc > 0)
+	    free(data->frame.argv);
 	tmp = data;
 	data = data->prev;
 	free(tmp);
@@ -8434,23 +6905,6 @@ blk_free(data)
 }
 
 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;
 {
@@ -8460,8 +6914,12 @@ blk_copy_prev(block)
     while (block->prev) {
 	tmp = ALLOC_N(struct BLOCK, 1);
 	MEMCPY(tmp, block->prev, struct BLOCK, 1);
+	if (tmp->frame.argc > 0) {
+	    tmp->frame.argv = ALLOC_N(VALUE, tmp->frame.argc);
+	    MEMCPY(tmp->frame.argv, block->prev->frame.argv, VALUE, tmp->frame.argc);
+	    tmp->frame.flags |= FRAME_MALLOC;
+	}
 	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;
@@ -8473,19 +6931,26 @@ blk_copy_prev(block)
     }
 }
 
-
 static void
-blk_dup(dup, orig)
-    struct BLOCK *dup, *orig;
+frame_dup(frame)
+    struct FRAME *frame;
 {
-    MEMCPY(dup, orig, struct BLOCK, 1);
-    frame_dup(&dup->frame);
+    VALUE *argv;
+    struct FRAME *tmp;
 
-    if (dup->iter) {
-	blk_copy_prev(dup);
-    }
-    else {
-	dup->prev = 0;
+    for (;;) {
+	if (frame->argc > 0) {
+	    argv = ALLOC_N(VALUE, frame->argc);
+	    MEMCPY(argv, frame->argv, VALUE, frame->argc);
+	    frame->argv = argv;
+	    frame->flags |= FRAME_MALLOC;
+	}
+	frame->tmp = 0;		/* should not preserve tmp */
+	if (!frame->prev) break;
+	tmp = ALLOC(struct FRAME);
+	*tmp = *frame->prev;
+	frame->prev = tmp;
+	frame = tmp;
     }
 }
 
@@ -8503,67 +6968,19 @@ proc_clone(self)
     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
- */
-
-#define PROC_TSHIFT (FL_USHIFT+1)
-#define PROC_TMASK  (FL_USER1|FL_USER2|FL_USER3)
-#define PROC_TMAX   (PROC_TMASK >> PROC_TSHIFT)
-
-static int proc_get_safe_level(VALUE);
-
-static VALUE
-proc_dup(self)
-    VALUE self;
-{
-    struct BLOCK *orig, *data;
-    VALUE bind;
-    int safe = proc_get_safe_level(self);
+    MEMCPY(data, orig, struct BLOCK, 1);
+    frame_dup(&data->frame);
 
-    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);
-    if (safe > PROC_TMAX) safe = PROC_TMAX;
-    FL_SET(bind, (safe << PROC_TSHIFT) & PROC_TMASK);
+    if (data->iter) {
+	blk_copy_prev(data);
+    }
+    else {
+	data->prev = 0;
+    }
 
     return bind;
 }
 
-VALUE
-rb_block_dup(self, klass, cref)
-    VALUE self, klass, cref;
-{
-    struct BLOCK *block;
-    VALUE obj = proc_dup(self);
-    Data_Get_Struct(obj, struct BLOCK, block);
-    block->klass = klass;
-    block->cref = NEW_NODE(nd_type(block->cref), cref, block->cref->u2.node,
-			   block->cref->u3.node);
-    return obj;
-}
-
-/*
- *  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;
@@ -8583,7 +7000,6 @@ rb_f_binding(self)
     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) {
@@ -8605,44 +7021,14 @@ rb_f_binding(self)
     return bind;
 }
 
-/*
- *  call-seq:
- *     binding.eval(string [, filename [,lineno]])  => obj
- *
- *  Evaluates the Ruby expression(s) in <em>string</em>, in the
- *  <em>binding</em>'s context.  If the optional <em>filename</em> and
- *  <em>lineno</em> parameters are present, they will be used when
- *  reporting syntax errors.
- *
- *     def getBinding(param)
- *       return binding
- *     end
- *     b = getBinding("hello")
- *     b.eval("param")   #=> "hello"
- */
-
-static VALUE
-bind_eval(argc, argv, bindval)
-    int argc;
-    VALUE *argv;
-    VALUE bindval;
-{
-    VALUE args[4];
-
-    rb_scan_args(argc, argv, "12", &args[0], &args[2], &args[3]);
-    args[1] = bindval;
-    return rb_f_eval(argc+1, args, Qnil /* self will be searched in eval */);
-}
-
-#define SAFE_LEVEL_MAX PROC_TMASK
+#define PROC_TSHIFT (FL_USHIFT+1)
+#define PROC_TMASK  (FL_USER1|FL_USER2|FL_USER3)
 
 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);
+    FL_SET(data, (ruby_safe_level << PROC_TSHIFT) & PROC_TMASK);
 }
 
 static int
@@ -8711,23 +7097,6 @@ proc_alloc(klass, proc)
     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;
@@ -8753,15 +7122,6 @@ rb_f_lambda()
     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()
 {
@@ -8791,81 +7151,74 @@ proc_invoke(proc, args, self, klass)
     struct BLOCK *data;
     volatile VALUE result = Qundef;
     int state;
+    volatile int orphan;
     volatile int safe = ruby_safe_level;
     volatile VALUE old_wrapper = ruby_wrapper;
+    struct RVarmap * volatile old_dvars = ruby_dyna_vars;
     volatile int pcall, avalue = Qtrue;
-    volatile VALUE tmp = args;
-    VALUE bvar = Qnil;
 
     if (rb_block_given_p() && ruby_frame->last_func) {
 	if (klass != ruby_frame->last_class)
 	    klass = rb_obj_class(proc);
-	bvar = rb_block_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;
+    orphan = block_orphan(data);
+    pcall = data->flags & BLOCK_LAMBDA ? YIELD_PROC_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;
-    _block.block_obj = bvar;
     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);
+    PUSH_TAG((pcall || orphan) ? PROT_PCALL : PROT_CALL);
     state = EXEC_TAG();
     if (state == 0) {
 	proc_set_safe_level(proc);
-	result = rb_yield_0(args, self, (self!=Qundef)?CLASS_OF(self):0,
-			    pcall | YIELD_PROC_CALL, avalue);
+	result = rb_yield_0(args, self, (self!=Qundef)?CLASS_OF(self):0, pcall, avalue);
     }
-    else if (TAG_DST()) {
+    else if (pcall || orphan || TAG_DST()) {
 	result = prot_tag->retval;
     }
     POP_TAG();
     POP_ITER();
     ruby_block = old_block;
     ruby_wrapper = old_wrapper;
-    POP_VARS();
+    ruby_dyna_vars = old_dvars;
     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);
+	if (pcall || orphan) {
+	    localjump_error("retry from proc-closure", Qnil, state);
 	}
+	/* fall through */
+      case TAG_BREAK:
       case TAG_RETURN:
+	if (pcall) break;
+	if (orphan) {		/* orphan block */
+	    char mesg[32];
+	    snprintf(mesg, sizeof mesg, "%s from proc-closure",
+		     state == TAG_BREAK ? "break" : "return");
+	    localjump_error(mesg, result, state);
+	}
 	if (result != Qundef) {
-	    if (pcall) break;
-	    return_jump(result);
+	    localjump_destination(state, result);
 	}
       default:
 	JUMP_TAG(state);
@@ -8873,42 +7226,8 @@ proc_invoke(proc, args, self, klass)
     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
- */
-
-VALUE
-rb_proc_call(proc, args)
+static VALUE
+proc_call(proc, args)
     VALUE proc, args;		/* OK */
 {
     return proc_invoke(proc, args, Qundef, 0);
@@ -8917,73 +7236,39 @@ rb_proc_call(proc, args)
 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 *var, *list;
+    NODE *list;
     int n;
 
     Data_Get_Struct(proc, struct BLOCK, data);
-    var = data->var;
-    if (var == 0) {
+    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 (var == (NODE*)1) return INT2FIX(0);
-    if (var == (NODE*)2) return INT2FIX(0);
-    if (nd_type(var) == NODE_BLOCK_ARG) {
-	var = var->nd_args;
-	if (var == (NODE*)1) return INT2FIX(0);
-	if (var == (NODE*)2) return INT2FIX(0);
-    }
-    switch (nd_type(var)) {
+    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 = var->nd_head;
+	list = data->var->nd_head;
 	n = 0;
 	while (list) {
 	    n++;
 	    list = list->nd_next;
 	}
-	if (var->nd_args) return INT2FIX(-n-1);
+	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;
@@ -8996,31 +7281,18 @@ proc_eq(self, other)
     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;
+    if (data->body == data2->body) return Qtrue;
+    return Qfalse;
 }
 
-/*
- * 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;
+proc_to_s(self, other)
+    VALUE self, other;
 {
     struct BLOCK *data;
     NODE *node;
-    const char *cname = rb_obj_classname(self);
-    const int w = (sizeof(VALUE) * CHAR_BIT) / 4;
+    char *cname = rb_obj_classname(self);
+    const int w = (SIZEOF_LONG * CHAR_BIT) / 4;
     long len = strlen(cname)+6+w; /* 6:tags 16:addr */
     VALUE str;
 
@@ -9028,14 +7300,12 @@ proc_to_s(self)
     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));
+	sprintf(RSTRING(str)->ptr, "#<%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);
+	sprintf(RSTRING(str)->ptr, "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
     }
     RSTRING(str)->len = strlen(RSTRING(str)->ptr);
     if (OBJ_TAINTED(self)) OBJ_TAINT(str);
@@ -9043,15 +7313,6 @@ proc_to_s(self)
     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;
@@ -9059,23 +7320,6 @@ proc_to_self(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;
@@ -9128,13 +7372,14 @@ block_pass(self, node)
 	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_safe_level >= 1 && OBJ_TAINTED(proc)) {
+	if (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);
+	PUSH_ITER(ITER_PRE);
 	result = rb_eval(self, node->nd_iter);
 	POP_ITER();
 	return result;
@@ -9147,13 +7392,12 @@ block_pass(self, node)
     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);
+    PUSH_TAG(PROT_ITER);
     state = EXEC_TAG();
     if (state == 0) {
       retry:
@@ -9180,7 +7424,7 @@ block_pass(self, node)
 	break;
       case TAG_RETURN:
 	if (orphan) {
-	    proc_jump_error(state, prot_tag->retval);
+	    localjump_error("return from proc-closure", prot_tag->retval, state);
 	}
       default:
 	JUMP_TAG(state);
@@ -9193,7 +7437,6 @@ struct METHOD {
     VALUE klass, rklass;
     VALUE recv;
     ID id, oid;
-    int safe_level;
     NODE *body;
 };
 
@@ -9241,46 +7484,11 @@ mnew(klass, obj, id, mklass)
     data->body = body;
     data->rklass = rklass;
     data->oid = oid;
-    data->safe_level = NOEX_WITH_SAFE(noex);
     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;
@@ -9302,15 +7510,6 @@ method_eq(method, other)
     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;
@@ -9331,86 +7530,7 @@ method_unbind(obj)
     return method;
 }
 
-/*
- *  call-seq:
- *     meth.receiver    => object
- *
- *  Returns the bound receiver of the method object.
- */
-
 static VALUE
-method_receiver(obj)
-    VALUE obj;
-{
-    struct METHOD *data;
-
-    Data_Get_Struct(obj, struct METHOD, data);
-    return data->recv;
-}
-
-/*
- *  call-seq:
- *     meth.name    => string
- *
- *  Returns the name of the method.
- */
-
-static VALUE
-method_name(obj)
-    VALUE obj;
-{
-    struct METHOD *data;
-
-    Data_Get_Struct(obj, struct METHOD, data);
-    return rb_str_new2(rb_id2name(data->oid));
-}
-
-/*
- *  call-seq:
- *     meth.owner    => class_or_module
- *
- *  Returns the class or module that defines the method.
- */
-
-static VALUE
-method_owner(obj)
-    VALUE obj;
-{
-    struct METHOD *data;
-
-    Data_Get_Struct(obj, struct METHOD, data);
-    return data->klass;
-}
-
-/*
- *  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"
- */
-
-VALUE
 rb_obj_method(obj, vid)
     VALUE obj;
     VALUE vid;
@@ -9418,38 +7538,6 @@ rb_obj_method(obj, 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;
@@ -9458,10 +7546,6 @@ rb_mod_method(mod, vid)
     return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod);
 }
 
-/*
- * MISSING: documentation
- */
-
 static VALUE
 method_clone(self)
     VALUE self;
@@ -9477,42 +7561,6 @@ method_clone(self)
     return clone;
 }
 
-VALUE
-rb_method_dup(self, klass, cref)
-    VALUE self;
-    VALUE klass;
-    VALUE cref;
-{
-    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);
-    *data = *orig;
-    data->rklass = klass;
-    if (data->body->nd_rval) {
-	NODE *tmp = NEW_NODE(nd_type(data->body->u2.node), cref,
-			     data->body->u2.node->u2.node,
-			     data->body->u2.node->u3.node);
-	data->body = NEW_NODE(nd_type(data->body), data->body->u1.node, tmp,
-			      data->body->u3.node);
-    }
-    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;
@@ -9521,136 +7569,46 @@ method_call(argc, argv, method)
 {
     VALUE result = Qnil;	/* OK */
     struct METHOD *data;
-    int safe;
+    int state;
+    volatile int safe = ruby_safe_level;
 
     Data_Get_Struct(method, struct METHOD, data);
     if (data->recv == Qundef) {
-	rb_raise(rb_eTypeError, "can't call unbound method; bind first");
+	rb_raise(rb_eTypeError, "you cannot call unbound method; bind first");
     }
-    if (OBJ_TAINTED(method)) {
-        safe = NOEX_WITH(data->safe_level, 4)|NOEX_TAINTED;
+    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    PUSH_TAG(PROT_NONE);
+    if (OBJ_TAINTED(method) && ruby_safe_level < 4) {
+	ruby_safe_level = 4;
     }
-    else {
-	safe = data->safe_level;
+    if ((state = EXEC_TAG()) == 0) {
+	result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,0);
     }
-    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_TAG();
     POP_ITER();
+    ruby_safe_level = safe;
+    if (state) JUMP_TAG(state);
     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 (data->rklass != CLASS_OF(recv)) {
 	if (FL_TEST(data->rklass, FL_SINGLETON)) {
-	    rb_raise(rb_eTypeError, "singleton method bound for a different object");
+	    rb_raise(rb_eTypeError, "singleton method called 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;
-	    }
+#if 0
+	if (FL_TEST(CLASS_OF(recv), FL_SINGLETON) &&
+	    st_lookup(RCLASS(CLASS_OF(recv))->m_tbl, data->oid, 0)) {
+	    rb_raise(rb_eTypeError, "method `%s' overridden", rb_id2name(data->oid));
 	}
-	else if (!rb_obj_is_kind_of(recv, data->rklass)) {
-	  not_instace:
+#endif
+	if(!rb_obj_is_kind_of(recv, data->rklass)) {
 	    rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
 		     rb_class2name(data->rklass));
 	}
@@ -9659,44 +7617,11 @@ umethod_bind(method, recv)
     method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
     *bound = *data;
     bound->recv = recv;
-    bound->rklass = rklass;
+    bound->rklass = CLASS_OF(recv);
 
     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;
@@ -9719,33 +7644,20 @@ method_arity(method)
       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:
+       return proc_arity(body->nd_cval);
+      default:
 	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)
+	if (body->nd_opt || body->nd_rest != -1)
 	    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;
@@ -9753,7 +7665,7 @@ method_inspect(method)
     struct METHOD *data;
     VALUE str;
     const char *s;
-    const char *sharp = "#";
+    char *sharp = "#";
 
     Data_Get_Struct(method, struct METHOD, data);
     str = rb_str_buf_new2("#<");
@@ -9815,12 +7727,9 @@ 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;
+    return method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
 }
 
 VALUE
@@ -9832,18 +7741,10 @@ rb_proc_new(func, val)
     VALUE proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, func, val);
 
     Data_Get_Struct(proc, struct BLOCK, data);
-    data->body->nd_state = YIELD_FUNC_LAMBDA;
-    data->flags |= BLOCK_LAMBDA;
+    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;
@@ -9872,43 +7773,6 @@ rb_obj_is_method(m)
     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;
@@ -9933,7 +7797,7 @@ rb_mod_define_method(argc, argv, mod)
 	}
     }
     else {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+	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));
@@ -9953,37 +7817,19 @@ rb_mod_define_method(argc, argv, mod)
 	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;
-	}
+    if (SCOPE_TEST(SCOPE_PRIVATE)) {
+	noex = NOEX_PRIVATE;
+    }
+    else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+	noex = NOEX_PROTECTED;
+    }
+    else {
+	noex = NOEX_PUBLIC;
     }
     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()
 {
@@ -9991,26 +7837,22 @@ Init_Proc()
     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");
-    OBJ_TAINT(exception_error);
-    OBJ_FREEZE(exception_error);
+    rb_global_variable(&exception_error);
 
     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);
-    OBJ_FREEZE(sysstack_error);
+    rb_global_variable(&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", rb_proc_call, -2);
+    rb_define_method(rb_cProc, "call", proc_call, -2);
     rb_define_method(rb_cProc, "arity", proc_arity, 0);
-    rb_define_method(rb_cProc, "[]", rb_proc_call, -2);
+    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);
@@ -10030,9 +7872,6 @@ Init_Proc()
     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, "receiver", method_receiver, 0);
-    rb_define_method(rb_cMethod, "name", method_name, 0);
-    rb_define_method(rb_cMethod, "owner", method_owner, 0);
     rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
     rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
 
@@ -10044,8 +7883,6 @@ Init_Proc()
     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, "name", method_name, 0);
-    rb_define_method(rb_cUnboundMethod, "owner", method_owner, 0);
     rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
     rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1);
 }
@@ -10092,11 +7929,22 @@ Init_Binding()
     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_method(rb_cBinding, "eval", bind_eval, -1);
     rb_define_global_function("binding", rb_f_binding, 0);
 }
 
+#ifdef __ia64__
+#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.
+ */
+#define __libc_ia64_register_backing_store_base (4ULL<<61)
+#else
+#pragma weak __libc_ia64_register_backing_store_base
+extern unsigned long __libc_ia64_register_backing_store_base;
+#endif
+#endif
+
 /* Windows SEH refers data on the stack. */
 #undef SAVE_WIN32_EXCEPTION_LIST
 #if defined _WIN32 || defined __CYGWIN__
@@ -10161,6 +8009,13 @@ VALUE rb_cThread;
 
 extern VALUE rb_last_status;
 
+enum thread_status {
+    THREAD_TO_KILL,
+    THREAD_RUNNABLE,
+    THREAD_STOPPED,
+    THREAD_KILLED,
+};
+
 #define WAIT_FD		(1<<0)
 #define WAIT_SELECT	(1<<1)
 #define WAIT_TIME	(1<<2)
@@ -10178,9 +8033,70 @@ extern VALUE rb_last_status;
 # endif
 #endif
 
+/* typedef struct thread * rb_thread_t; */
+
+struct thread {
+    struct thread *next, *prev;
+    rb_jmpbuf_t context;
+#ifdef SAVE_WIN32_EXCEPTION_LIST
+    DWORD win32_exception_list;
+#endif
+
+    VALUE result;
+
+    long   stk_len;
+    long   stk_max;
+    VALUE *stk_ptr;
+    VALUE *stk_pos;
+#ifdef __ia64__
+    VALUE *bstr_ptr;
+    long   bstr_len;
+#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 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;
+
+    st_table *locals;
+
+    VALUE thread;
+};
+
+#define THREAD_RAISED 0x200	 /* temporary flag */
 #define THREAD_TERMINATING 0x400 /* persistent flag */
-#define THREAD_NO_ENSURE   0x800 /* persistent flag */
-#define THREAD_FLAGS_MASK 0xfc00 /* mask for persistent flags */
+#define THREAD_FLAGS_MASK  0x400 /* 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)
@@ -10199,7 +8115,7 @@ struct thread_status_t {
 
     int safe;
 
-    enum rb_thread_status status;
+    enum thread_status status;
     int wait_for;
     int fd;
     fd_set readfds;
@@ -10232,68 +8148,46 @@ struct thread_status_t {
     (dst)->join = (src)->join,			\
     0)
 
-int
-rb_thread_set_raised(th)
-    rb_thread_t th;
+static int
+thread_set_raised()
 {
-    if (th->flags & RAISED_EXCEPTION) {
-	return 1;
-    }
-    th->flags |= RAISED_EXCEPTION;
+    if (curr_thread->flags & THREAD_RAISED) return 1;
+    curr_thread->flags |= THREAD_RAISED;
     return 0;
 }
 
-int
-rb_thread_reset_raised(th)
-    rb_thread_t th;
-{
-    if (!(th->flags & RAISED_EXCEPTION)) {
-	return 0;
-    }
-    th->flags &= ~RAISED_EXCEPTION;
-    return 1;
-}
-
 static int
-thread_no_ensure()
+thread_reset_raised()
 {
-    return ((curr_thread->flags & THREAD_NO_ENSURE) == THREAD_NO_ENSURE);
+    if (!(curr_thread->flags & THREAD_RAISED)) return 0;
+    curr_thread->flags &= ~THREAD_RAISED;
+    return 1;
 }
 
 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)
+rb_trap_eval(cmd, sig)
     VALUE cmd;
-    int sig, safe;
+    int sig;
 {
     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_TAG(PROT_NONE);
     PUSH_ITER(ITER_NOT);
-    val = rb_protect(run_trap_eval, (VALUE)&arg, &state);
+    if ((state = EXEC_TAG()) == 0) {
+	val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig)), 0);
+    }
     POP_ITER();
+    POP_TAG();
     THREAD_COPY_STATUS(&save, curr_thread);
 
     if (state) {
 	rb_trap_immediate = 0;
-	rb_thread_ready(curr_thread);
 	JUMP_TAG(state);
     }
 
@@ -10307,7 +8201,7 @@ rb_trap_eval(cmd, sig, safe)
 
 static const char *
 thread_status_name(status)
-    enum rb_thread_status status;
+    enum thread_status status;
 {
     switch (status) {
       case THREAD_RUNNABLE:
@@ -10329,7 +8223,6 @@ 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;
     }
@@ -10351,7 +8244,6 @@ safe_setter(val)
 	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;
 }
@@ -10367,6 +8259,26 @@ timeofday()
 
 #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))
+#ifdef C_ALLOCA
+# define MARK_FRAME_ADJ(f) rb_gc_mark_frame(f)
+#else
+# define MARK_FRAME_ADJ(f) mark_frame_adj(f, th)
+static void
+mark_frame_adj(frame, th)
+    struct FRAME *frame;
+    rb_thread_t th;
+{
+    if (frame->flags & FRAME_MALLOC) {
+	rb_gc_mark_locations(frame->argv, frame->argv+frame->argc);
+    }
+    else {
+	VALUE *start = ADJ(frame->argv);
+	rb_gc_mark_locations(start, start+frame->argc);
+    }
+    rb_gc_mark((VALUE)frame->node);
+}
+#endif
+
 static void
 thread_mark(th)
     rb_thread_t th;
@@ -10385,12 +8297,9 @@ thread_mark(th)
     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;
@@ -10401,22 +8310,22 @@ thread_mark(th)
 #if defined(THINK_C) || defined(__human68k__)
 	rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2);
 #endif
-#ifdef __ia64
+#ifdef __ia64__
 	if (th->bstr_ptr) {
-            rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len);
+	    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);
+	MARK_FRAME_ADJ(frame);
 	if (frame->tmp) {
 	    struct FRAME *tmp = frame->tmp;
 
 	    while (tmp && tmp != top_frame) {
 		tmp = ADJ(tmp);
-		rb_gc_mark_frame(tmp);
+		MARK_FRAME_ADJ(tmp);
 		tmp = tmp->prev;
 	    }
 	}
@@ -10425,21 +8334,11 @@ thread_mark(th)
     block = th->block;
     while (block) {
 	block = ADJ(block);
-	rb_gc_mark_frame(&block->frame);
+	MARK_FRAME_ADJ(&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()
 {
@@ -10449,38 +8348,9 @@ rb_gc_mark_threads()
     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;
-	}
+    FOREACH_THREAD(th) {
 	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);
+    } END_FOREACH(th);
 }
 
 static void
@@ -10489,7 +8359,7 @@ thread_free(th)
 {
     if (th->stk_ptr) free(th->stk_ptr);
     th->stk_ptr = 0;
-#ifdef __ia64
+#ifdef __ia64__
     if (th->bstr_ptr) free(th->bstr_ptr);
     th->bstr_ptr = 0;
 #endif
@@ -10514,10 +8384,12 @@ rb_thread_check(data)
 
 static VALUE rb_thread_raise _((int, VALUE*, rb_thread_t));
 
-static VALUE th_raise_exception;
+static int   th_raise_argc;
+static VALUE th_raise_argv[2];
 static NODE *th_raise_node;
 static VALUE th_cmd;
-static int   th_sig, th_safe;
+static int   th_sig;
+static char *th_signm;
 
 #define RESTORE_NORMAL		1
 #define RESTORE_FATAL		2
@@ -10528,9 +8400,6 @@ static int   th_sig, th_safe;
 #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)
@@ -10544,27 +8413,28 @@ rb_thread_save_context(th)
     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;
+	REALLOC_N(th->stk_ptr, VALUE, len);
 	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);
+#ifdef __ia64__
+    {
+	ucontext_t ctx;
+	VALUE *top, *bot;
+
+	getcontext(&ctx);
+	bot = (VALUE*)__libc_ia64_register_backing_store_base;
+#if defined(__FreeBSD__)
+	top = (VALUE*)ctx.uc_mcontext.mc_special.bspstore;
+#else
+	top = (VALUE*)ctx.uc_mcontext.sc_ar_bsp;
+#endif
+	th->bstr_len = top - bot;
+	REALLOC_N(th->bstr_ptr, VALUE, th->bstr_len);
+	MEMCPY(th->bstr_ptr, (VALUE*)__libc_ia64_register_backing_store_base, VALUE, th->bstr_len);
+    }
 #endif
 #ifdef SAVE_WIN32_EXCEPTION_LIST
     th->win32_exception_list = win32_get_exception_list();
@@ -10572,7 +8442,6 @@ rb_thread_save_context(th)
 
     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;
@@ -10594,10 +8463,6 @@ rb_thread_save_context(th)
     th->safe = ruby_safe_level;
 
     th->node = ruby_current_node;
-    if (ruby_sandbox_save != NULL)
-    {
-      ruby_sandbox_save(th);
-    }
 }
 
 static int
@@ -10615,23 +8480,21 @@ rb_thread_switch(n)
 	rb_interrupt();
 	break;
       case RESTORE_TRAP:
-	rb_trap_eval(th_cmd, th_sig, th_safe);
+	rb_trap_eval(th_cmd, th_sig);
 	break;
       case RESTORE_RAISE:
 	ruby_frame->last_func = 0;
 	ruby_current_node = th_raise_node;
-	rb_raise_jump(th_raise_exception);
+	rb_f_raise(th_raise_argc, th_raise_argv);
 	break;
       case RESTORE_SIGNAL:
-	rb_thread_signal_raise(th_sig);
+	rb_raise(rb_eSignal, "SIG%s", th_signm);
 	break;
       case RESTORE_EXIT:
-	ruby_errinfo = th_raise_exception;
+	ruby_errinfo = th_raise_argv[0];
 	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);
+	error_print();
+	terminate_process(EXIT_FAILURE, 0, 0);
 	break;
       case RESTORE_NORMAL:
       default:
@@ -10641,24 +8504,53 @@ rb_thread_switch(n)
 }
 
 #define THREAD_SAVE_CONTEXT(th) \
-    (rb_thread_switch(ruby_setjmp(rb_thread_save_context(th), (th)->context)))
+    (rb_thread_save_context(th),\
+     rb_thread_switch((FLUSH_REGISTER_WINDOWS, setjmp((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 *)));
+
+# if _MSC_VER >= 1300
+__declspec(noinline)
+# endif
+static void
+stack_extend(th, exit)
+    rb_thread_t th;
+    int exit;
+{
+    VALUE space[1024];
+
+    memset(space, 0, 1);	/* prevent array from optimization */
+    rb_thread_restore_context(th, exit);
+}
 
 static void
-rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
+rb_thread_restore_context(th, exit)
+    rb_thread_t th;
+    int exit;
 {
+    VALUE v;
     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);
+    if (!th->stk_ptr) rb_bug("unsaved context");
+
+#if STACK_GROW_DIRECTION < 0
+    if (&v > th->stk_pos) stack_extend(th, exit);
+#elif STACK_GROW_DIRECTION > 0
+    if (&v < th->stk_pos + th->stk_len) stack_extend(th, exit);
+#else
+    if (&v < rb_gc_stack_start) {
+	/* Stack grows downward */
+	if (&v > th->stk_pos) stack_extend(th, exit);
+    }
+    else {
+	/* Stack grows upward */
+	if (&v < th->stk_pos + th->stk_len) stack_extend(th, exit);
     }
+#endif
+
+    rb_trap_immediate = 0;	/* inhibit interrupts from here */
     ruby_frame = th->frame;
     ruby_scope = th->scope;
     ruby_class = th->klass;
@@ -10683,8 +8575,8 @@ rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
     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);
+#ifdef __ia64__
+    MEMCPY((VALUE*)__libc_ia64_register_backing_store_base, tmp->bstr_ptr, VALUE, tmp->bstr_len);
 #endif
 
     tval = rb_lastline_get();
@@ -10694,79 +8586,7 @@ rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
     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);
+    longjmp(tmp->context, ex);
 }
 
 static void
@@ -10834,7 +8654,8 @@ rb_thread_main_jump(err, tag)
     int tag;
 {
     curr_thread = main_thread;
-    th_raise_exception = err;
+    th_raise_argc = 1;
+    th_raise_argv[0] = err;
     th_raise_node = ruby_current_node;
     rb_thread_restore_context(main_thread, tag);
 }
@@ -11063,9 +8884,9 @@ rb_thread_schedule()
  		    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);
+                    intersect_fds(&readfds, &th->readfds, max);
+                    intersect_fds(&writefds, &th->writefds, max);
+                    intersect_fds(&exceptfds, &th->exceptfds, max);
 		}
 	    }
 	    END_FOREACH_FROM(curr, th);
@@ -11193,7 +9014,6 @@ rb_thread_fd_writable(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);
@@ -11216,16 +9036,13 @@ rb_thread_wait_for(time)
 	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) {
@@ -11234,7 +9051,7 @@ rb_thread_wait_for(time)
 #ifdef ERESTART
 		  case ERESTART:
 #endif
-		    break;
+		    return;
 		  default:
 		    rb_sys_fail("sleep");
 		}
@@ -11274,9 +9091,7 @@ rb_thread_select(max, read, write, except, timeout)
     fd_set *read, *write, *except;
     struct timeval *timeout;
 {
-#ifndef linux
     double limit;
-#endif
     int n;
 
     if (!read && !write && !except) {
@@ -11288,12 +9103,10 @@ rb_thread_select(max, read, write, except, 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 ||
@@ -11365,7 +9178,7 @@ rb_thread_join(th, limit)
     rb_thread_t th;
     double limit;
 {
-    enum rb_thread_status last_status = THREAD_RUNNABLE;
+    enum thread_status last_status = THREAD_RUNNABLE;
 
     if (rb_thread_critical) rb_thread_deadlock();
     if (!rb_thread_dead(th)) {
@@ -11388,7 +9201,7 @@ rb_thread_join(th, limit)
 	if (!rb_thread_dead(th)) return Qfalse;
     }
 
-    if (!NIL_P(th->errinfo) && (th->flags & RAISED_EXCEPTION)) {
+    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);
@@ -11403,47 +9216,6 @@ rb_thread_join(th, limit)
     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;
@@ -11461,59 +9233,18 @@ rb_thread_join_m(argc, argv, thread)
     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()
 {
@@ -11535,65 +9266,19 @@ rb_thread_list()
     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_raise(rb_eThreadError, "killed thread");
     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;
@@ -11604,84 +9289,25 @@ rb_thread_run(thread)
     return thread;
 }
 
-
-static void
-rb_kill_thread(th, flags)
-    rb_thread_t th;
-    int flags;
+VALUE
+rb_thread_kill(thread)
+    VALUE thread;
 {
+    rb_thread_t th = rb_thread_check(thread);
+
     if (th != curr_thread && th->safe < 4) {
 	rb_secure(4);
     }
     if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED)
-	return;
+	return thread;
     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;
@@ -11689,44 +9315,12 @@ rb_thread_s_kill(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()
 {
@@ -11734,30 +9328,10 @@ rb_thread_pass()
     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;
+    enum thread_status last_status = THREAD_RUNNABLE;
 
     rb_thread_critical = 0;
     if (curr_thread == curr_thread->next) {
@@ -11801,13 +9375,10 @@ rb_thread_sleep(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;
     }
@@ -11818,19 +9389,6 @@ rb_thread_sleep_forever()
     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;
@@ -11838,30 +9396,6 @@ rb_thread_priority(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;
@@ -11876,19 +9410,6 @@ rb_thread_priority_set(thread, prio)
     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;
@@ -11905,50 +9426,12 @@ rb_thread_safe_level(thread)
 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;
@@ -11958,16 +9441,6 @@ rb_thread_s_abort_exc_set(self, 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;
@@ -11975,16 +9448,6 @@ rb_thread_abort_exc(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;
@@ -11994,17 +9457,6 @@ rb_thread_abort_exc_set(thread, val)
     return val;
 }
 
-
-/*
- *  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;
@@ -12016,14 +9468,14 @@ rb_thread_group(thread)
     return group;
 }
 
-#ifdef __ia64
+#ifdef __ia64__
 # define IA64_INIT(x) x
 #else
 # define IA64_INIT(x)
 #endif
 
 #define THREAD_ALLOC(th) do {\
-    th = ALLOC(struct rb_thread);\
+    th = ALLOC(struct thread);\
 \
     th->next = 0;\
     th->prev = 0;\
@@ -12038,7 +9490,6 @@ rb_thread_group(thread)
     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);\
@@ -12063,12 +9514,6 @@ rb_thread_group(thread)
     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
@@ -12088,7 +9533,7 @@ rb_thread_alloc(klass)
     return th;
 }
 
-static int thread_init;
+static int thread_init = 0;
 
 #if defined(_THREAD_SAFE)
 static void
@@ -12107,11 +9552,6 @@ static void*
 thread_timer(dummy)
     void *dummy;
 {
-    sigset_t all_signals;
-
-    sigfillset(&all_signals);
-    pthread_sigmask(SIG_BLOCK, &all_signals, 0);
-
     for (;;) {
 #ifdef HAVE_NANOSLEEP
 	struct timespec req, rem;
@@ -12192,8 +9632,8 @@ rb_thread_start_0(fn, arg, th)
 {
     volatile rb_thread_t th_save = th;
     volatile VALUE thread = th->thread;
-    struct BLOCK *volatile saved_block = 0;
-    enum rb_thread_status status;
+    struct BLOCK *volatile saved_block = 0, *block;
+    enum thread_status status;
     int state;
 
     if (OBJ_FROZEN(curr_thread->thgroup)) {
@@ -12259,12 +9699,17 @@ rb_thread_start_0(fn, arg, th)
     if (th == main_thread) ruby_stop(state);
     rb_thread_remove(th);
 
-    if (saved_block) {
-	blk_free(saved_block);
+    for (block = saved_block; block;) {
+	struct BLOCK *tmp = block;
+
+	if (tmp->frame.argc > 0)
+	    free(tmp->frame.argv);
+	block = tmp->prev;
+	free((void*)tmp);
     }
 
     if (state && status != THREAD_TO_KILL && !NIL_P(ruby_errinfo)) {
-	th->flags |= RAISED_EXCEPTION;
+	th->flags |= THREAD_RAISED;
 	if (state == TAG_FATAL) {
 	    /* fatal error within this thread, need to stop whole script */
 	    main_thread->errinfo = ruby_errinfo;
@@ -12284,7 +9729,6 @@ rb_thread_start_0(fn, arg, th)
 	}
 	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 {
@@ -12301,7 +9745,7 @@ rb_thread_create(fn, arg)
     VALUE (*fn)();
     void *arg;
 {
-    Init_stack((void *)&arg);
+    Init_stack((VALUE*)&arg);
     return rb_thread_start_0(fn, arg, rb_thread_alloc(rb_cThread));
 }
 
@@ -12327,27 +9771,9 @@ rb_thread_yield(arg, th)
     rb_dvar_push('~', Qnil);
     ruby_block->dyna_vars = ruby_dyna_vars;
 
-    return rb_yield_0(arg, 0, 0, YIELD_LAMBDA_CALL, Qtrue);
+    return rb_yield_0(arg, 0, 0, Qtrue, 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;
@@ -12367,57 +9793,16 @@ rb_thread_s_new(argc, argv, 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);
+    return rb_thread_start_0(rb_thread_yield, args, rb_thread_check(thread));
 }
 
-
-/*
- *  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;
@@ -12428,18 +9813,6 @@ rb_thread_start(klass, args)
     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;
@@ -12451,30 +9824,6 @@ rb_thread_value(thread)
     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(thread)
     VALUE thread;
@@ -12482,7 +9831,7 @@ rb_thread_status(thread)
     rb_thread_t th = rb_thread_check(thread);
 
     if (rb_thread_dead(th)) {
-	if (!NIL_P(th->errinfo) && (th->flags & RAISED_EXCEPTION))
+	if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED))
 	    return Qnil;
 	return Qfalse;
     }
@@ -12490,20 +9839,7 @@ rb_thread_status(thread)
     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
+static VALUE
 rb_thread_alive_p(thread)
     VALUE thread;
 {
@@ -12513,19 +9849,6 @@ rb_thread_alive_p(thread)
     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;
@@ -12584,35 +9907,12 @@ rb_thread_cleanup()
 
 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;
@@ -12640,15 +9940,13 @@ rb_thread_interrupt()
 
 void
 rb_thread_signal_raise(sig)
-    int sig;
+    char *sig;
 {
+    if (sig == 0) return;	/* should not happen */
     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_raise(rb_eSignal, "SIG%s", sig);
     }
     rb_thread_ready(main_thread);
     if (!rb_thread_dead(curr_thread)) {
@@ -12656,21 +9954,17 @@ rb_thread_signal_raise(sig)
 	    return;
 	}
     }
-    th_sig = sig;
+    th_signm = sig;
     curr_thread = main_thread;
     rb_thread_restore_context(curr_thread, RESTORE_SIGNAL);
 }
 
 void
-rb_thread_trap_eval(cmd, sig, safe)
+rb_thread_trap_eval(cmd, sig)
     VALUE cmd;
-    int sig, safe;
+    int sig;
 {
     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;
@@ -12678,33 +9972,10 @@ rb_thread_trap_eval(cmd, sig, safe)
     }
     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;
@@ -12712,15 +9983,10 @@ rb_thread_raise(argc, argv, th)
     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);
+	rb_f_raise(argc, argv);
     }
 
     if (!rb_thread_dead(curr_thread)) {
@@ -12729,35 +9995,16 @@ rb_thread_raise(argc, argv, th)
 	}
     }
 
+    rb_scan_args(argc, argv, "11", &th_raise_argv[0], &th_raise_argv[1]);
     rb_thread_ready(th);
     curr_thread = th;
 
-    th_raise_exception = exc;
+    th_raise_argc = argc;
     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;
@@ -12792,28 +10039,6 @@ rb_thread_local_aref(thread, id)
     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;
@@ -12846,15 +10071,6 @@ rb_thread_local_aset(thread, 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;
@@ -12862,20 +10078,6 @@ rb_thread_aset(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;
@@ -12897,21 +10099,6 @@ thread_keys_i(key, value, ary)
     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;
@@ -12925,25 +10112,17 @@ rb_thread_keys(thread)
     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;
 {
-    const char *cname = rb_obj_classname(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);
+    str = rb_str_new(0, strlen(cname)+7+16+9+1); /* 7:tags 16:addr 9:status 1:nul */
+    sprintf(RSTRING(str)->ptr, "#<%s:0x%lx %s>", cname, thread, status);
     RSTRING(str)->len = strlen(RSTRING(str)->ptr);
     OBJ_INFECT(str, thread);
 
@@ -12958,6 +10137,7 @@ rb_thread_atfork()
     if (rb_thread_alone()) return;
     FOREACH_THREAD(th) {
 	if (th != curr_thread) {
+	    rb_warn("fork terminates thread at %s:%d", th->node->nd_file, nd_line(th->node));
 	    rb_thread_die(th);
 	}
     }
@@ -13015,7 +10195,7 @@ rb_thread_atfork()
  *     3:  15 16
  */
 
-VALUE rb_cCont;
+static VALUE rb_cCont;
 
 /*
  *  call-seq:
@@ -13049,12 +10229,12 @@ rb_callcc(self)
 	scope_dup(tag->scope);
     }
     th->thread = curr_thread->thread;
-    th->thgroup = cont_protect;
 
-    for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+    for (vars = th->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;
@@ -13091,9 +10271,6 @@ rb_cont_call(argc, argv, 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;
@@ -13115,19 +10292,6 @@ struct thgroup {
     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)
@@ -13143,17 +10307,6 @@ thgroup_s_alloc(klass)
     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;
@@ -13175,26 +10328,7 @@ thgroup_list(group)
     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
+VALUE
 thgroup_enclose(group)
     VALUE group;
 {
@@ -13206,15 +10340,6 @@ thgroup_enclose(group)
     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;
@@ -13226,33 +10351,6 @@ thgroup_enclosed_p(group)
     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;
@@ -13262,10 +10360,6 @@ thgroup_add(group, thread)
 
     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");
@@ -13290,125 +10384,11 @@ thgroup_add(group, thread)
     return group;
 }
 
-
-/* variables for recursive traversals */
-static ID recursive_key;
-
-static VALUE
-recursive_check(hash, obj)
-    VALUE hash;
-    VALUE obj;
-{
-    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
-	return Qfalse;
-    }
-    else {
-	VALUE list = rb_hash_aref(hash, ID2SYM(rb_frame_last_func()));
-
-	if (NIL_P(list) || TYPE(list) != T_HASH)
-	    return Qfalse;
-	if (NIL_P(rb_hash_lookup(list, obj)))
-	    return Qfalse;
-	return Qtrue;
-    }
-}
-
-static VALUE
-recursive_push(hash, obj)
-    VALUE hash;
-    VALUE obj;
-{
-    VALUE list, sym;
-
-    sym = ID2SYM(rb_frame_last_func());
-    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
-	hash = rb_hash_new();
-	rb_thread_local_aset(rb_thread_current(), recursive_key, hash);
-	list = Qnil;
-    }
-    else {
-	list = rb_hash_aref(hash, sym);
-    }
-    if (NIL_P(list) || TYPE(list) != T_HASH) {
-	list = rb_hash_new();
-	rb_hash_aset(hash, sym, list);
-    }
-    rb_hash_aset(list, obj, Qtrue);
-    return hash;
-}
-
-static void
-recursive_pop(hash, obj)
-    VALUE hash;
-    VALUE obj;
-{
-    VALUE list, sym;
-
-    sym = ID2SYM(rb_frame_last_func());
-    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
-	VALUE symname;
-	VALUE thrname;
-	symname = rb_inspect(sym);
-	thrname = rb_inspect(rb_thread_current());
-
-	rb_raise(rb_eTypeError, "invalid inspect_tbl hash for %s in %s",
-		 StringValuePtr(symname), StringValuePtr(thrname));
-    }
-    list = rb_hash_aref(hash, sym);
-    if (NIL_P(list) || TYPE(list) != T_HASH) {
-	VALUE symname = rb_inspect(sym);
-	VALUE thrname = rb_inspect(rb_thread_current());
-	rb_raise(rb_eTypeError, "invalid inspect_tbl list for %s in %s",
-		 StringValuePtr(symname), StringValuePtr(thrname));
-    }
-    rb_hash_delete(list, obj);
-}
-
-VALUE
-rb_exec_recursive(func, obj, arg)
-    VALUE (*func) _((VALUE, VALUE, int));
-    VALUE obj;
-    VALUE arg;
-{
-    VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key);
-    VALUE objid = rb_obj_id(obj);
-
-    if (recursive_check(hash, objid)) {
-	return (*func) (obj, arg, Qtrue);
-    }
-    else {
-	VALUE result = Qundef;
-	int state;
-
-	hash = recursive_push(hash, objid);
-	PUSH_TAG(PROT_NONE);
-	if ((state = EXEC_TAG()) == 0) {
-	    result = (*func) (obj, arg, Qfalse);
-	}
-	POP_TAG();
-	recursive_pop(hash, objid);
-	if (state)
-	    JUMP_TAG(state);
-	return result;
-    }
-}
-
-
-/*
- *  +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;
 
-    recursive_key = rb_intern("__recursive_key__");
     rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError);
     rb_cThread = rb_define_class("Thread", rb_cObject);
     rb_undef_alloc_func(rb_cThread);
@@ -13437,9 +10417,6 @@ Init_Thread()
     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, 0);
     rb_define_method(rb_cThread, "join", rb_thread_join_m, -1);
@@ -13468,7 +10445,6 @@ Init_Thread()
     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);
@@ -13476,46 +10452,15 @@ Init_Thread()
     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);
+    rb_global_variable(&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;
@@ -13526,7 +10471,7 @@ rb_f_catch(dmy, tag)
     tag = ID2SYM(rb_to_id(tag));
     PUSH_TAG(tag);
     if ((state = EXEC_TAG()) == 0) {
-	val = rb_yield_0(tag, 0, 0, 0, Qfalse);
+	val = rb_yield_0(tag, 0, 0, Qfalse, Qfalse);
     }
     else if (state == TAG_THROW && tag == prot_tag->dst) {
 	val = prot_tag->retval;
@@ -13554,18 +10499,6 @@ rb_catch(tag, func, 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;
diff --git a/ext/.document b/ext/.document
deleted file mode 100644
index ba8182593e..0000000000
--- a/ext/.document
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/ext/Setup b/ext/Setup
index d0d6317a5e..7b214abde3 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -28,7 +28,6 @@
 #syck
 #syslog
 #tcltklib
-#thread
 #tk
 #win32ole
 #zlib
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
index 6bda3a4cfb..9b1bdecb95 100644
--- a/ext/Setup.atheos
+++ b/ext/Setup.atheos
@@ -28,7 +28,6 @@ strscan
 syck
 syslog
 #tcltklib
-thread
 #tk
 #win32ole
 zlib
diff --git a/ext/Setup.dj b/ext/Setup.dj
index 4f94788886..f2ed3a4f16 100644
--- a/ext/Setup.dj
+++ b/ext/Setup.dj
@@ -28,7 +28,6 @@ strscan
 syck
 #syslog
 #tcltklib
-thread
 #tk
 #win32ole
 zlib
diff --git a/ext/Setup.emx b/ext/Setup.emx
index afc5923577..7ea04543c5 100644
--- a/ext/Setup.emx
+++ b/ext/Setup.emx
@@ -28,7 +28,6 @@ strscan
 #syck
 #syslog
 #tcltklib
-thread
 #tk
 #win32ole
 #zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index 9f8abf9b8d..7a330f801a 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -28,7 +28,6 @@ strscan
 syck
 #syslog
 #tcltklib
-thread
 #tk
 win32ole
 #zlib
diff --git a/ext/Setup.x68 b/ext/Setup.x68
index 0966e737e9..9b9563d941 100644
--- a/ext/Setup.x68
+++ b/ext/Setup.x68
@@ -28,7 +28,6 @@ strscan
 #syck
 #syslog
 #tcltklib
-thread
 #tk
 #win32ole
 #zlib
diff --git a/ext/Win32API/MANIFEST b/ext/Win32API/MANIFEST
new file mode 100644
index 0000000000..a4dcaa858e
--- /dev/null
+++ b/ext/Win32API/MANIFEST
@@ -0,0 +1,8 @@
+MANIFEST
+depend
+Win32API.c
+extconf.rb
+getch.rb
+point.rb
+lib/win32/registry.rb
+lib/win32/resolv.rb
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
index a4fd0396f0..776df56ecb 100644
--- a/ext/Win32API/Win32API.c
+++ b/ext/Win32API/Win32API.c
@@ -53,12 +53,12 @@ Win32API_initialize(self, dllname, proc, import, export)
     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);
+    rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, hdll));
+    hproc = 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);
+	hproc = GetProcAddress(hdll, RSTRING(str)->ptr);
 	if (!hproc)
 	    rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
 		RSTRING(proc)->ptr, RSTRING(str)->ptr);
@@ -108,7 +108,7 @@ Win32API_initialize(self, dllname, proc, import, export)
     }
 
     if (16 < RARRAY(a_import)->len) {
-	rb_raise(rb_eRuntimeError, "too many parameters: %ld\n", RARRAY(a_import)->len);
+	rb_raise(rb_eRuntimeError, "too many parameters: %d\n", RARRAY(a_import)->len);
     }
 
     rb_iv_set(self, "__import__", a_import);
@@ -137,9 +137,6 @@ Win32API_initialize(self, dllname, proc, import, export)
     return Qnil;
 }
 
-#ifdef _MSC_VER
-#pragma optimize("g", off)
-#endif
 static VALUE
 Win32API_Call(argc, argv, obj)
     int argc;
@@ -163,7 +160,7 @@ Win32API_Call(argc, argv, obj)
 
 
     if (items != nimport)
-	rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d",
+	rb_raise(rb_eRuntimeError, "Wrong number of parameters: expected %d, got %d.\n",
 	    nimport, items);
 
     for (i = 0; i < nimport; i++) {
diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb
index 865788556f..134a6e5b92 100644
--- a/ext/Win32API/extconf.rb
+++ b/ext/Win32API/extconf.rb
@@ -1,6 +1,5 @@
 require 'mkmf'
 
-dir_config("win32")
 if have_header("windows.h") and have_library("kernel32")
   create_makefile("Win32API")
 end
diff --git a/ext/Win32API/lib/win32/registry.rb b/ext/Win32API/lib/win32/registry.rb
index 9a2f3827b7..2671551a33 100644
--- a/ext/Win32API/lib/win32/registry.rb
+++ b/ext/Win32API/lib/win32/registry.rb
@@ -493,7 +493,7 @@ module Win32
     # utility functions
     #
     def self.expand_environ(str)
-      str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
+      str.gsub(/%([^%]+)%/) { ENV[$1] || $& }
     end
     
     @@type2name = { }
diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb
index 92336fac28..5a99d04d55 100644
--- a/ext/Win32API/lib/win32/resolv.rb
+++ b/ext/Win32API/lib/win32/resolv.rb
@@ -11,7 +11,7 @@ module Win32
     
     def self.get_hosts_path
       path = get_hosts_dir
-      path = File.expand_path('hosts', path)
+      path = File.join(path.gsub(/\\/, File::SEPARATOR), 'hosts')
       File.exist?(path) ? path : nil
     end
     
@@ -84,7 +84,7 @@ if info.unpack('V5')[4] == 2  # VER_PLATFORM_WIN32_NT
                   [ 'NameServer', 'DhcpNameServer' ].each do |key|
                     ns = regif.read_s(key)
                     unless ns.empty?
-                      nameserver.concat(ns.split(/[,\s]\s*/))
+                      nameserver.concat(ns.split(/\s+/))
                       break
                     end
                   end
@@ -141,7 +141,7 @@ else
               slist = reg.read_s("SearchList")
               search << domain unless domain.empty?
               search.concat(slist.split(/,\s*/))
-              nameserver.concat(ns.split(/[,\s]\s*/))
+              nameserver.concat(ns.split(/,\s*/))
             end
           end
         rescue Registry::Error
diff --git a/ext/bigdecimal/MANIFEST b/ext/bigdecimal/MANIFEST
new file mode 100644
index 0000000000..bb647c3414
--- /dev/null
+++ b/ext/bigdecimal/MANIFEST
@@ -0,0 +1,18 @@
+MANIFEST
+README
+bigdecimal.def
+bigdecimal.c
+bigdecimal.h
+depend
+extconf.rb
+bigdecimal_en.html
+bigdecimal_ja.html
+lib/bigdecimal/jacobian.rb
+lib/bigdecimal/newton.rb
+lib/bigdecimal/ludcmp.rb
+lib/bigdecimal/util.rb
+lib/bigdecimal/nlsolve.rb
+lib/bigdecimal/math.rb
+sample/linear.rb
+sample/nlsolve.rb
+sample/pi.rb
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 636c0907d6..6a9940d335 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -13,7 +13,6 @@
  *
  */
 
-#include "ruby.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,6 +20,7 @@
 #include <errno.h>
 #include <float.h>
 #include <math.h>
+#include "ruby.h"
 #include "math.h"
 #include "version.h"
  
@@ -41,123 +41,8 @@ VALUE rb_cBigDecimal;
  */
 #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.
+ *  **** BigDecimal version ****
  */
 static VALUE
 BigDecimal_version(VALUE self)
@@ -224,14 +109,14 @@ GetVpValue(VALUE v, int must)
 #ifdef ENABLE_NUMERIC_STRING
     case T_STRING:
         SafeStringValue(v);
-        return VpCreateRbObject(strlen(RSTRING_PTR(v)) + VpBaseFig() + 1,
-                                RSTRING_PTR(v));
+        return VpCreateRbObject(strlen(RSTRING(v)->ptr) + VpBaseFig() + 1,
+                                RSTRING(v)->ptr);
 #endif /* ENABLE_NUMERIC_STRING */
 
     case T_BIGNUM:
         bg = rb_big2str(v, 10);
-        return VpCreateRbObject(strlen(RSTRING_PTR(bg)) + VpBaseFig() + 1,
-                                RSTRING_PTR(bg));
+        return VpCreateRbObject(strlen(RSTRING(bg)->ptr) + VpBaseFig() + 1,
+                                RSTRING(bg)->ptr);
     default:
         goto SomeOneMayDoIt;
     }
@@ -240,35 +125,19 @@ SomeOneMayDoIt:
     if(must) {
         rb_raise(rb_eTypeError, "%s can't be coerced into BigDecimal",
                     rb_special_const_p(v)?
-                    RSTRING_PTR(rb_inspect(v)):
+                    RSTRING(rb_inspect(v))->ptr:
                     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)
 {
@@ -319,9 +188,6 @@ BigDecimal_dump(int argc, VALUE *argv, VALUE self)
     return rb_str_new2(psz);
 }
 
-/*
- * Internal method used to provide marshalling support. See the Marshal module.
- */
 static VALUE
 BigDecimal_load(VALUE self, VALUE str)
 {
@@ -332,59 +198,21 @@ BigDecimal_load(VALUE self, VALUE str)
     unsigned long m=0;
 
     SafeStringValue(str);
-    pch = (unsigned char *)RSTRING_PTR(str);
+    pch = RSTRING(str)->ptr;
     /* 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");
+            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));
+    GUARD_OBJ(pv,VpNewRbClass(m,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)
 {
@@ -402,7 +230,7 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
         fo = VpGetException();
         if(val==Qnil) return INT2FIX(fo);
         if(val!=Qfalse && val!=Qtrue) {
-            rb_raise(rb_eTypeError, "second argument must be true or false");
+            rb_raise(rb_eTypeError, "The second argument must be true or false.");
             return Qnil; /* Not reached */
         }
         if(f&VP_EXCEPTION_INFINITY) {
@@ -422,13 +250,13 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
         if(val==Qnil) return INT2FIX(fo);
         Check_Type(val, T_FIXNUM);
         if(!VpIsRoundMode(FIX2INT(val))) {
-            rb_raise(rb_eTypeError, "invalid rounding mode");
+            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");
+    rb_raise(rb_eTypeError, "The first argument for BigDecimal#mode is invalid.");
     return Qnil;
 }
 
@@ -474,14 +302,14 @@ VpNewRbClass(U_LONG mx, char *str, VALUE klass)
 }
 
 VP_EXPORT Real *
-VpCreateRbObject(U_LONG mx, const char *str)
+VpCreateRbObject(U_LONG mx, 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)
 {
@@ -490,7 +318,6 @@ BigDecimal_IsNaN(VALUE self)
     return Qfalse;
 }
 
-/* Returns True if the value is infinite */
 static VALUE
 BigDecimal_IsInfinite(VALUE self)
 {
@@ -500,7 +327,6 @@ BigDecimal_IsInfinite(VALUE self)
     return Qnil;
 }
 
-/* Returns True if the value is finite (not NaN or infinite) */
 static VALUE
 BigDecimal_IsFinite(VALUE self)
 {
@@ -510,10 +336,6 @@ BigDecimal_IsFinite(VALUE self)
     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)
 {
@@ -577,47 +399,26 @@ BigDecimal_induced_from(VALUE self, VALUE x)
     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;
+    double d, d2;
     S_LONG e;
-    char *buf;
 
     GUARD_OBJ(p,GetVpValue(self,1));
     if(VpVtoD(&d, &e, p)!=1) return rb_float_new(d);
-    buf = ALLOCA_N(char,(unsigned int)VpNumOfChars(p,"E"));
-    VpToString(p, buf, 0, 0);
     errno = 0;
-    d = strtod(buf, 0);
-    if(errno == ERANGE) {
-       VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",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);
+    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)
 {
@@ -639,17 +440,6 @@ 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)
 {
@@ -677,17 +467,6 @@ BigDecimal_add(VALUE self, VALUE r)
     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)
 {
@@ -743,7 +522,6 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
     rb_bug("Undefined operation in BigDecimalCmp()");
 }
 
-/* Returns True if the value is zero. */
 static VALUE
 BigDecimal_zero(VALUE self)
 {
@@ -751,7 +529,6 @@ BigDecimal_zero(VALUE self)
     return VpIsZero(a) ? Qtrue : Qfalse;
 }
 
-/* Returns True if the value is non-zero. */
 static VALUE
 BigDecimal_nonzero(VALUE self)
 {
@@ -759,73 +536,42 @@ BigDecimal_nonzero(VALUE self)
     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_ne(VALUE self, VALUE r)
+{
+    return BigDecimalCmp(self, r, '!');
+}
+
 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)
 {
@@ -833,7 +579,7 @@ BigDecimal_ge(VALUE self, VALUE r)
 }
 
 static VALUE
-BigDecimal_neg(VALUE self)
+BigDecimal_neg(VALUE self, VALUE r)
 {
     ENTER(5);
     Real *c, *a;
@@ -843,17 +589,6 @@ BigDecimal_neg(VALUE self)
     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)
 {
@@ -892,23 +627,6 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
     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 */
@@ -987,12 +705,6 @@ NaN:
     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 */
 {
@@ -1043,42 +755,16 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
     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=0;
+    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)
 {
@@ -1180,12 +866,6 @@ BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
     }
 }
 
-/* Returns the absolute value.
- *
- * BigDecimal('5').abs -> 5
- *
- * BigDecimal('-3').abs -> 3
- */
 static VALUE
 BigDecimal_abs(VALUE self)
 {
@@ -1201,13 +881,6 @@ BigDecimal_abs(VALUE self)
     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)
 {
@@ -1225,8 +898,6 @@ BigDecimal_sqrt(VALUE self, VALUE nFig)
     return ToValue(c);
 }
 
-/* Return the integer part of the number.
- */
 static VALUE
 BigDecimal_fix(VALUE self)
 {
@@ -1241,34 +912,12 @@ BigDecimal_fix(VALUE self)
     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;
+    int    iLoc;
     U_LONG mx;
     VALUE  vLoc;
     VALUE  vRound;
@@ -1291,7 +940,7 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
         Check_Type(vRound, T_FIXNUM);
         sw   = FIX2INT(vRound);
         if(!VpIsRoundMode(sw)) {
-            rb_raise(rb_eTypeError, "invalid rounding mode");
+            rb_raise(rb_eTypeError, "Invalid rounding mode.");
             return Qnil;
         }
         break;
@@ -1306,25 +955,6 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
     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)
 {
@@ -1350,8 +980,6 @@ BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
     return ToValue(c);
 }
 
-/* Return the fractional part of the number.
- */
 static VALUE
 BigDecimal_frac(VALUE self)
 {
@@ -1366,25 +994,6 @@ BigDecimal_frac(VALUE self)
     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)
 {
@@ -1410,25 +1019,6 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
     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)
 {
@@ -1454,36 +1044,6 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
     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)
 {
@@ -1502,13 +1062,13 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
     if(rb_scan_args(argc,argv,"01",&f)==1) {
         if(TYPE(f)==T_STRING) {
             SafeStringValue(f);
-            psz = RSTRING_PTR(f);
+            psz = RSTRING(f)->ptr;
             if(*psz==' ') {
                 fPlus = 1; psz++;
             } else if(*psz=='+') {
                 fPlus = 2; psz++;
             }
-            while((ch=*psz++)!=0) {
+            while(ch=*psz++) {
                 if(ISSPACE(ch)) continue;
                 if(!ISDIGIT(ch)) {
                     if(ch=='F' || ch=='f') fmt = 1; /* F format */
@@ -1537,30 +1097,6 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
     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)
 {
@@ -1589,11 +1125,6 @@ BigDecimal_split(VALUE self)
     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)
 {
@@ -1601,16 +1132,6 @@ BigDecimal_exponent(VALUE self)
     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)
 {
@@ -1633,13 +1154,6 @@ BigDecimal_inspect(VALUE self)
     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)
 {
@@ -1679,22 +1193,10 @@ BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
         mf = GetPositiveInt(nFig);
     }
     SafeStringValue(iniValue);
-    GUARD_OBJ(pv,VpCreateRbObject(mf, RSTRING_PTR(iniValue)));
+    GUARD_OBJ(pv,VpCreateRbObject(mf, RSTRING(iniValue)->ptr));
     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)
 {
@@ -1710,22 +1212,10 @@ BigDecimal_new(int argc, VALUE *argv, VALUE self)
         mf = GetPositiveInt(nFig);
     }
     SafeStringValue(iniValue);
-    GUARD_OBJ(pv,VpNewRbClass(mf, RSTRING_PTR(iniValue),self));
+    GUARD_OBJ(pv,VpNewRbClass(mf, RSTRING(iniValue)->ptr,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)
 {
@@ -1745,22 +1235,6 @@ BigDecimal_limit(int argc, VALUE *argv, VALUE self)
     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 */
@@ -1790,112 +1264,37 @@ Init_bigdecimal(void)
     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.
-     */
+    /* Computation 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. */
+    /* Constants for sign value */
     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);
@@ -1931,6 +1330,7 @@ Init_bigdecimal(void)
     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_ne, 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);
@@ -1965,27 +1365,17 @@ static int gfCheckVal = 1;      /* Value checking flag in VpNmlz()  */
 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   */
 
-#ifndef BASE_FIG
 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  */
-#else
-#ifndef BASE
-#error BASE_FIG is defined but BASE is not
-#endif
-#define HALF_BASE (BASE/2)
-#define BASE1 (BASE/10)
-#endif
-#ifndef DBLE_FIG
-#define DBLE_FIG (DBL_DIG+1)    /* figure of double */
-#endif
 
 static Real *VpConstOne;    /* constant 1.0 */
 static Real *VpPt5;        /* constant 0.5 */
-#define maxnr 100UL    /* Maximum iterations for calcurating sqrt. */
+static U_LONG maxnr = 100;    /* Maximum iterations for calcurating sqrt. */
                 /* used in VpSqrt() */
 
 /* ETC */
@@ -2102,8 +1492,8 @@ VpSetRoundMode(unsigned long n)
  *    (to let the compiler know they may be changed in outside
  *    (... but not actually..)).
  */
-volatile const double gZero_ABCED9B1_CE73__00400511F31D = 0.0;
-volatile const double gOne_ABCED9B4_CE73__00400511F31D  = 1.0;
+volatile double gZero_ABCED9B1_CE73__00400511F31D = 0.0;
+volatile double gOne_ABCED9B4_CE73__00400511F31D  = 1.0;
 static double
 Zero(void)
 {
@@ -2188,7 +1578,7 @@ VpIsNegDoubleZero(double v)
 }
 
 VP_EXPORT int
-VpException(unsigned short f, const char *str,int always)
+VpException(unsigned short f,char *str,int always)
 {
     VALUE exc;
     int   fatal=0;
@@ -2225,8 +1615,8 @@ VpException(unsigned short f, const char *str,int always)
     return 0; /* 0 Means VpException() raised no exception */
 
 raise:
-    if(fatal) rb_fatal("%s", str);
-    else   rb_raise(exc, "%s", str);
+    if(fatal) rb_fatal(str);
+    else   rb_raise(exc,str);
     return 0;
 }
 
@@ -2330,7 +1720,7 @@ NaN:
  *    returns number of chars needed to represent vp in specified format.
  */
 VP_EXPORT U_LONG
-VpNumOfChars(Real *vp,const char *pszFmt)
+VpNumOfChars(Real *vp,char *pszFmt)
 {
     S_INT  ex;
     U_LONG nc;
@@ -2375,15 +1765,16 @@ VpNumOfChars(Real *vp,const char *pszFmt)
 VP_EXPORT U_LONG
 VpInit(U_LONG BaseVal)
 {
+    U_LONG w;
+    double v;
+
     /* Setup +/- Inf  NaN -0 */
     VpGetDoubleNaN();
     VpGetDoublePosInf();
     VpGetDoubleNegInf();
     VpGetDoubleNegZero();
 
-#ifndef BASE_FIG
     if(BaseVal <= 0) {
-        U_LONG w;
         /* Base <= 0, then determine Base by calcuration. */
         BASE = 1;
         while(
@@ -2400,8 +1791,6 @@ VpInit(U_LONG BaseVal)
     BASE1 = BASE / 10;
     BASE_FIG = 0;
     while(BaseVal /= 10) ++BASE_FIG;
-#endif
-
     /* Allocates Vp constants. */
     VpConstOne = VpAlloc((U_LONG)1, "1");
     VpPt5 = VpAlloc((U_LONG)1, ".5");
@@ -2410,6 +1799,15 @@ VpInit(U_LONG BaseVal)
     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);
@@ -2425,7 +1823,7 @@ VpInit(U_LONG BaseVal)
 }
 
 VP_EXPORT Real *
-VpOne(void)
+VpOne()
 {
     return VpConstOne;
 }
@@ -2475,7 +1873,7 @@ overflow:
  *   NULL be returned if memory allocation is failed,or any error.
  */
 VP_EXPORT Real *
-VpAlloc(U_LONG mx, const char *szVal)
+VpAlloc(U_LONG mx, char *szVal)
 {
     U_LONG i, ni, ipn, ipf, nf, ipe, ne, nalloc;
     char v,*psz;
@@ -2507,25 +1905,14 @@ VpAlloc(U_LONG mx, const char *szVal)
        return vp;
     }
 
-    /* Skip all '_' after digit: 2006-6-30 */
-    ni = 0;
+    /* Skip all spaces */
     psz = ALLOCA_N(char,strlen(szVal)+1);
     i   = 0;
     ipn = 0;
-    while((psz[i]=szVal[ipn])!=0) {
-        if(ISDIGIT(psz[i])) ++ni;
-        if(psz[i]=='_') {
-            if(ni>0) {ipn++;continue;}
-            psz[i]=0;
-            break;
-        }
+    while(psz[i]=szVal[ipn]) {
+        if(ISSPACE(szVal[ipn])) {ipn++;continue;}
         ++i; ++ipn;
     }
-    /* Skip trailing spaces */
-    while((--i)>0) {
-        if(ISSPACE(psz[i])) psz[i] = 0;
-        else                break;
-    }
     szVal = psz;
 
     /* Check on Inf & NaN */
@@ -2555,7 +1942,7 @@ VpAlloc(U_LONG mx, const char *szVal)
     else if(szVal[i] == '+')          ++i;
     /* Skip digits */
     ni = 0;            /* digits in mantissa */
-    while((v = szVal[i]) != 0) {
+    while(v = szVal[i]) {
         if(!ISDIGIT(v)) break;
         ++i;
         ++ni;
@@ -2569,7 +1956,7 @@ VpAlloc(U_LONG mx, const char *szVal)
         if(szVal[i] == '.') {    /* xxx. */
             ++i;
             ipf = i;
-            while((v = szVal[i]) != 0) {    /* get fraction part. */
+            while(v = szVal[i]) {    /* get fraction part. */
                 if(!ISDIGIT(v)) break;
                 ++i;
                 ++nf;
@@ -2587,7 +1974,7 @@ VpAlloc(U_LONG mx, const char *szVal)
             ipe = i;
             v = szVal[i];
             if((v == '-') ||(v == '+')) ++i;
-            while((v=szVal[i])!=0) {
+            while(v=szVal[i]) {
                 if(!ISDIGIT(v)) break;
                 ++i;
                 ++ne;
@@ -2826,7 +2213,8 @@ VpAddAbs(Real *a, Real *b, Real *c)
     while(b_pos + word_shift > a_pos) {
         --c_pos;
         if(b_pos > 0) {
-            c->frac[c_pos] = b->frac[--b_pos];
+            --b_pos;
+            c->frac[c_pos] = b->frac[b_pos];
         } else {
             --word_shift;
             c->frac[c_pos] = 0;
@@ -2837,14 +2225,19 @@ VpAddAbs(Real *a, Real *b, Real *c)
     /* corresponding digits to be added. */
     bv = b_pos + word_shift;
     while(a_pos > bv) {
-        c->frac[--c_pos] = a->frac[--a_pos];
+        --c_pos;
+        --a_pos;
+        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;
+        --a_pos;
+        --b_pos;
+        --c_pos;
+        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;
@@ -2856,7 +2249,9 @@ VpAddAbs(Real *a, Real *b, Real *c)
     /* 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;
+        --a_pos;
+        --c_pos;
+        c->frac[c_pos] = a->frac[a_pos] + carry;
         if(c->frac[c_pos] >= BASE) {
             c->frac[c_pos] -= BASE;
             carry = 1;
@@ -2924,15 +2319,19 @@ VpSubAbs(Real *a, Real *b, Real *c)
     /* 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) {
+        borrow = 1;
+        --c_pos;
+        --b_pos;
+        c->frac[c_pos] = BASE - b->frac[b_pos];
         while(b_pos + word_shift > a_pos) {
             --c_pos;
             if(b_pos > 0) {
-                c->frac[c_pos] = BASE - b->frac[--b_pos] - borrow;
+                --b_pos;
+                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 */
@@ -2940,14 +2339,18 @@ VpSubAbs(Real *a, Real *b, Real *c)
 
     bv = b_pos + word_shift;
     while(a_pos > bv) {
-        c->frac[--c_pos] = a->frac[--a_pos];
+        --c_pos;
+        --a_pos;
+        c->frac[c_pos] = a->frac[a_pos];
     }
 
     /* Now perform subtraction until every digits of b will be */
     /* exhausted. */
     while(b_pos > 0) {
+        --a_pos;
+        --b_pos;
         --c_pos;
-        if(a->frac[--a_pos] < b->frac[--b_pos] + borrow) {
+        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 {
@@ -2960,7 +2363,8 @@ VpSubAbs(Real *a, Real *b, Real *c)
     /* the borrow obtained so far because b has been exhausted. */
     while(a_pos > 0) {
         --c_pos;
-        if(a->frac[--a_pos] < borrow) {
+        --a_pos;
+        if(a->frac[a_pos] < borrow) {
             c->frac[c_pos] = BASE + a->frac[a_pos] - borrow;
             borrow = 1;
         } else {
@@ -3890,7 +3294,7 @@ VpToFString(Real *a,char *psz,int fFmt,int fPlus)
  *   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)
+VpCtoV(Real *a, char *int_chr, U_LONG ni, char *frac, U_LONG nf, char *exp_chr, U_LONG ne)
 {
     U_LONG i, j, ind_a, ma, mi, me;
     U_LONG loc;
@@ -3917,7 +3321,7 @@ VpCtoV(Real *a, const char *int_chr, U_LONG ni, const char *frac, U_LONG nf, con
             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);
+                return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0);
             }
             ++i;
         }
@@ -3926,7 +3330,7 @@ VpCtoV(Real *a, const char *int_chr, U_LONG ni, const char *frac, U_LONG nf, con
     /* get integer part */
     i = 0;
     sign = 1;
-    if(ni >= 0) {
+    if(ni > 0) {
         if(int_chr[0] == '-') {
             sign = -1;
             ++i;
@@ -4336,45 +3740,28 @@ VpMidRound(Real *y, int f, int nf)
  *   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;
+    int n,i,ix,ioffset;
+    U_LONG v;
     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 */
+    if(ix<0 || ((U_LONG)ix)>=y->Prec) return 0; /* Unable to round */
     ioffset = nf - ix*((int)BASE_FIG);
 
+    memset(y->frac+ix+1, 0, (y->Prec - (ix+1)) * sizeof(U_LONG));
     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;
+    for(i=0;i<n;++i) v /= 10;
     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;
+        if(v) ++div;
          break;
     case VP_ROUND_HALF_UP:   /* Round half up  */
         if(v>=5) ++div;
@@ -4383,10 +3770,10 @@ VpMidRound(Real *y, int f, int nf)
         if(v>=6) ++div;
         break;
     case VP_ROUND_CEIL: /* ceil */
-        if(fracf && (VpGetSign(y)>0)) ++div;
+        if(v && (VpGetSign(y)>0)) ++div;
         break;
     case VP_ROUND_FLOOR: /* floor */
-        if(fracf && (VpGetSign(y)<0)) ++div;
+        if(v && (VpGetSign(y)<0)) ++div;
         break;
     case VP_ROUND_HALF_EVEN: /* Banker's rounding */
         if(v>5) ++div;
@@ -4401,31 +3788,19 @@ VpMidRound(Real *y, int f, int nf)
     }
     for(i=0;i<=n;++i) div *= 10;
     if(div>=BASE) {
+        y->frac[ix] = 0;
         if(ix) {
-            y->frac[ix] = 0;
-            VpRdup(y,ix);
+            VpNmlz(y);
+            VpRdup(y,0);
         } 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;
 }
 
@@ -4439,7 +3814,7 @@ VpLeftRound(Real *y, int f, int nf)
     if(!VpHasVal(y)) return 0; /* Unable to round */
     v = y->frac[0];
     nf -= VpExponent(y)*BASE_FIG;
-    while((v /= 10) != 0) nf--;
+    while(v=v/10) nf--;
     nf += (BASE_FIG-1);
     return VpMidRound(y,f,nf);
 }
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index 4f77feab00..aabc551a76 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -105,7 +105,7 @@ typedef struct {
 VP_EXPORT  Real *
 VpNewRbClass(U_LONG mx,char *str,VALUE klass);
 
-VP_EXPORT  Real *VpCreateRbObject(U_LONG mx,const char *str);
+VP_EXPORT  Real *VpCreateRbObject(U_LONG mx,char *str);
 
 VP_EXPORT U_LONG VpBaseFig(void);
 VP_EXPORT U_LONG VpDblFig(void);
@@ -126,13 +126,13 @@ 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 VpException(unsigned short f,char *str,int always);
 VP_EXPORT int VpIsNegDoubleZero(double v);
-VP_EXPORT U_LONG VpNumOfChars(Real *vp,const char *pszFmt);
+VP_EXPORT U_LONG VpNumOfChars(Real *vp,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 Real *VpAlloc(U_LONG mx, 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);
@@ -143,7 +143,7 @@ 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 VpCtoV(Real *a,char *int_chr,U_LONG ni,char *frac,U_LONG nf,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);
@@ -155,7 +155,7 @@ 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);
+VP_EXPORT Real *VpOne();
 
 /*  
  *  ------------------
diff --git a/ext/bigdecimal/bigdecimal_en.html b/ext/bigdecimal/bigdecimal_en.html
index c2b86faef6..02c88df43e 100644
--- a/ext/bigdecimal/bigdecimal_en.html
+++ b/ext/bigdecimal/bigdecimal_en.html
@@ -379,7 +379,7 @@ 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.
+n can be an string representing a positive integer number.
 <CODE><PRE>
 BigDecimal("0.1234567890123456789").to_s("10") #  ==> "0.1234567890 123456789E0"
 </PRE></CODE>
@@ -678,9 +678,10 @@ 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.
+Advantages stated so far can also be disadvantages if the input from outside is
+ represented in binary.
+Translation error from decimal to binary or vice versa is inevitable.
+So,translation from Float(binary) to BigDecimal(decimal) is not alway done exactly.
 
 <H4>Which is the first input?</H4>
 Because most people uses decimal notatin for numeric data representation,
diff --git a/ext/bigdecimal/bigdecimal_ja.html b/ext/bigdecimal/bigdecimal_ja.html
index 37bbcbbb09..8fd95a6fe3 100644
--- a/ext/bigdecimal/bigdecimal_ja.html
+++ b/ext/bigdecimal/bigdecimal_ja.html
@@ -676,11 +676,10 @@ exponent=1�Asign=2 ‚È‚ç�”’l‚ª 1234.56784321 ‚Å‚ ‚é‚Ì‚ÍŒ©‚ê‚Î’¼‚®‚É•ª‚©‚è‚Ü‚·�B
 
 <H3>10�i‚̃fƒ�ƒŠƒbƒg</H3>
 ŽÀ‚Í�¡‚܂ł̃�ƒŠƒbƒg‚Í�A‚»‚̂܂܃fƒ�ƒŠƒbƒg‚É‚à‚È‚è‚Ü‚·�B
-‚»‚à‚»‚à�A10�i‚ð2�i‚É•ÏŠ·‚·‚é‚悤‚È‘€�ì‚Í•ÏŠ·Œë�·
+‚»‚à‚»‚à�A10�i‚ð2�i�A2�i‚ð10�i‚É•ÏŠ·‚·‚é‚悤‚È‘€�ì‚Í•ÏŠ·Œë�·
 ‚𔺂¤�ê�‡‚ð‰ñ”ð‚·‚é‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ�B
-‘åŠT‚̃Rƒ“ƒsƒ…�[ƒ^‚Í10�i‚Ì“à•”•\Œ»‚ðŽ�‚Á‚Ä‚¢‚È‚¢‚Ì‚Å�A
-BigDecimal ‚ð—˜—p‚µ‚ÄŒë�·–³‚µ‚ÌŒvŽZ‚ð‚·‚é�ê�‡‚Í�AŒvŽZ‘¬“x
-‚𖳎‹‚µ‚Ä‚à�ÅŒã‚Ü‚Å BigDecimal ‚ðŽg—p‘±‚¯‚é•K—v‚ª‚ ‚è‚Ü‚·�B
+Šù‚ÉŒvŽZ‹@“à•”‚ÉŽæ‚è�ž‚܂ꂽ2�i�”’l‚ð BigDecimal ‚Ì“à•”•\Œ»‚É
+•ÏŠ·‚·‚é‚Æ‚«‚É‚ÍŒë�·‚ª”ð‚¯‚ç‚ê‚È‚¢�ê�‡‚ª‚ ‚è‚Ü‚·�B
 
 <H3>�Å�‰‚͉½‚©�H</H3>
 Ž©•ª‚ÅŒvŽZ‚·‚é‚Æ‚«‚É‚í‚´‚í‚´2�i�”‚ðŽg‚¤�l‚Í‹É‚ß‚Ä‚Ü‚ê‚Å‚·�B
diff --git a/ext/bigdecimal/extconf.rb b/ext/bigdecimal/extconf.rb
index 0c8b98e4a3..a68a656044 100644
--- a/ext/bigdecimal/extconf.rb
+++ b/ext/bigdecimal/extconf.rb
@@ -1,10 +1,2 @@
 require 'mkmf'
-
-base_fig = 0
-src = "(BASE * (BASE+1)) / BASE == (BASE+1)"
-while try_static_assert(src, nil, "-DBASE=10#{'0'*base_fig}UL")
-  base_fig += 1
-end
-$defs << "-DBASE=1#{'0'*base_fig}UL" << "-DBASE_FIG=#{base_fig}"
-
 create_makefile('bigdecimal')
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index d80eeab901..34a60ae67a 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -1,27 +1,9 @@
 #
-# require 'bigdecimal/jacobian'
+# jacobian.rb
 #
-# 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).
+# Computes Jacobian matrix of f at x
 #
 module Jacobian
-  #--
   def isEqual(a,b,zero=0.0,e=1.0e-8)
     aa = a.abs
     bb = b.abs
@@ -35,10 +17,7 @@ module Jacobian
           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
@@ -70,7 +49,6 @@ module Jacobian
     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)
diff --git a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
index 8f4888725e..1d5d3170cc 100644
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
@@ -1,8 +1,7 @@
 #
-# Solves a*x = b for x, using LU decomposition.
+# ludcmp.rb
 #
 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     = []
@@ -53,12 +52,6 @@ module LUSolve
     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
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index f3248a3c5c..7b3f46ed1a 100644
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ b/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -1,5 +1,4 @@
 #
-#--
 # Contents:
 #   sqrt(x, prec)
 #   sin (x, prec)
@@ -14,35 +13,19 @@
 #   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:
 #
+# Usage:
 #   require "bigdecimal"
-#   require "bigdecimal/math"
-#
+#   require "bigdecimal/math.rb"
 #   include BigMath
-#
 #   a = BigDecimal((PI(100)/2).to_s)
-#   puts sin(a,100) # -> 0.10000000000000000000......E1
+#   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?
@@ -68,9 +51,6 @@ module BigMath
     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?
@@ -96,10 +76,6 @@ module BigMath
     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?
@@ -120,13 +96,6 @@ module BigMath
     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?
@@ -148,11 +117,6 @@ module BigMath
     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?
@@ -174,7 +138,6 @@ module BigMath
     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
@@ -213,8 +176,6 @@ module BigMath
     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
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
index 59ac0f7f04..67a92474ac 100644
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ b/ext/bigdecimal/lib/bigdecimal/newton.rb
@@ -1,29 +1,27 @@
 #
 # newton.rb 
 #
-# Solves the nonlinear algebraic equation system f = 0 by Newton's method.
-# This program is not dependent on BigDecimal.
+# Solves 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:
+#  where n is the number of iterations required.
+#        x is the solution vector.
+#        f is the object to be solved which must have following methods.
 #
-# f.values(x):: returns the values of all functions at x
+#   f ... Object to compute Jacobian matrix of the equation systems.
+#       [Methods required for f]
+#         f.values(x) returns 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       convergence criterion
+#   x ... initial values
 #
-# 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"
+require "ludcmp"
+require "jacobian"
 
 module Newton
   include LUSolve
@@ -62,7 +60,7 @@ module Newton
       begin
         fact *= p5
         if fact < minfact then
-          raise "Failed to reduce function values."
+          raize "Failed to reduce function values."
         end
         for i in 0...n do
           x[i] = xs[i] - dx[i]*fact
diff --git a/ext/bigdecimal/lib/bigdecimal/nlsolve.rb b/ext/bigdecimal/lib/bigdecimal/nlsolve.rb
new file mode 100644
index 0000000000..08f17f9ecd
--- /dev/null
+++ b/ext/bigdecimal/lib/bigdecimal/nlsolve.rb
@@ -0,0 +1,38 @@
+#!/usr/local/bin/ruby
+
+#
+# nlsolve.rb
+# An example for solving nonlinear algebraic equation system.
+#
+
+require "bigdecimal"
+require "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/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
index 09e926acd5..1f8d6c7a49 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -1,17 +1,19 @@
 #
 # BigDecimal utility library.
+# ----------------------------------------------------------------------
+# Contents:
 #
-# To use these functions, require 'bigdecimal/util'
-#
-# The following methods are provided to convert other types to BigDecimals:
+#   String#
+#     to_d      ... to BigDecimal
 #
-#   String#to_d -> BigDecimal
-#   Float#to_d -> BigDecimal
-#   Rational#to_d -> BigDecimal
+#   Float#
+#     to_d      ... to BigDecimal
 #
-# The following method is provided to convert BigDecimals to other types:
+#   BigDecimal#
+#     to_r      ... to Rational
 #
-#   BigDecimal#to_r -> Rational
+#   Rational#
+#     to_d      ... to BigDecimal
 #
 # ----------------------------------------------------------------------
 #
@@ -28,8 +30,8 @@ class String
 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.
+  # to "nnnnnn.mmm" form digit string
+  # Use BigDecimal#to_s("F") instead.
   def to_digits
      if self.nan? || self.infinite? || self.zero?
         self.to_s
@@ -40,21 +42,22 @@ class BigDecimal < Numeric
      end
   end
 
-  # Converts a BigDecimal to a Rational.
+  # Convert BigDecimal to 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))
+        denominator = base ** (-denomi_power)
      else
-        Rational(numerator * (base ** denomi_power),1)
+        denominator = base ** denomi_power
      end
+     Rational(numerator,denominator)
   end
 end
 
 class Rational < Numeric
-  # Converts a Rational to a BigDecimal
+  # Convert Rational to BigDecimal
   def to_d(nFig=0)
      num = self.numerator.to_s
      if nFig<=0
diff --git a/ext/bigdecimal/sample/linear.rb b/ext/bigdecimal/sample/linear.rb
index 88a62ffa71..7c8ca263eb 100644
--- a/ext/bigdecimal/sample/linear.rb
+++ b/ext/bigdecimal/sample/linear.rb
@@ -11,7 +11,7 @@
 #
 
 require "bigdecimal"
-require "bigdecimal/ludcmp"
+require "ludcmp"
 
 #
 # NOTE:
diff --git a/ext/bigdecimal/sample/nlsolve.rb b/ext/bigdecimal/sample/nlsolve.rb
index 7f729e6aaa..08f17f9ecd 100644
--- a/ext/bigdecimal/sample/nlsolve.rb
+++ b/ext/bigdecimal/sample/nlsolve.rb
@@ -6,7 +6,7 @@
 #
 
 require "bigdecimal"
-require "bigdecimal/newton"
+require "newton"
 include Newton
 
 class Function
diff --git a/ext/curses/MANIFEST b/ext/curses/MANIFEST
new file mode 100644
index 0000000000..5882d682f0
--- /dev/null
+++ b/ext/curses/MANIFEST
@@ -0,0 +1,9 @@
+MANIFEST
+curses.c
+depend
+extconf.rb
+hello.rb
+rain.rb
+view.rb
+view2.rb
+mouse.rb
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 9c51a2127f..106c43da4c 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -21,11 +21,7 @@
 #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 <varargs.h>
 # include <curses_colr/curses.h>
 #else
 # include <curses.h>
@@ -54,9 +50,6 @@
 # define USE_MOUSE 1
 #endif
 
-#define NUM2CH NUM2LONG
-#define CH2FIX LONG2FIX
-
 static VALUE mCurses;
 static VALUE mKey;
 static VALUE cWindow;
@@ -127,7 +120,7 @@ curses_init_screen()
     if (rb_stdscr) return rb_stdscr;
     initscr();
     if (stdscr == 0) {
-	rb_raise(rb_eRuntimeError, "can't initialize curses");
+	rb_raise(rb_eRuntimeError, "cannot initialize curses");
     }
     clear();
     rb_stdscr = prep_window(cWindow, stdscr);
@@ -186,15 +179,6 @@ curses_clear(obj)
     return Qnil;
 }
 
-/* def clrtoeol */
-static VALUE
-curses_clrtoeol()
-{
-    curses_stdscr();
-    clrtoeol();
-    return Qnil;
-}
-
 /* def refresh */
 static VALUE
 curses_refresh(obj)
@@ -374,7 +358,7 @@ curses_inch(obj)
     VALUE obj;
 {
     curses_stdscr();
-    return CH2FIX(inch());
+    return CHR2FIX(inch());
 }
 
 /* def addch(ch) */
@@ -384,7 +368,7 @@ curses_addch(obj, ch)
     VALUE ch;
 {
     curses_stdscr();
-    addch(NUM2CH(ch));
+    addch(NUM2CHR(ch));
     return Qnil;
 }
 
@@ -395,7 +379,7 @@ curses_insch(obj, ch)
     VALUE ch;
 {
     curses_stdscr();
-    insch(NUM2CH(ch));
+    insch(NUM2CHR(ch));
     return Qnil;
 }
 
@@ -458,17 +442,6 @@ curses_deleteln(obj)
     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)
@@ -559,7 +532,7 @@ static VALUE
 curses_bkgdset(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGDSET
-  bkgdset(NUM2CH(ch));
+  bkgdset(NUM2CHR(ch));
 #endif
   return Qnil;
 }
@@ -568,7 +541,7 @@ static VALUE
 curses_bkgd(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGD
-  return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+  return (bkgd(NUM2CHR(ch)) == OK) ? Qtrue : Qfalse;
 #else
   return Qfalse;
 #endif
@@ -683,7 +656,7 @@ curses_getmouse(VALUE obj)
 
   val = Data_Make_Struct(cMouseEvent,struct mousedata,
 			 0,curses_mousedata_free,mdata);
-  mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
+  mdata->mevent = (MEVENT*)malloc(sizeof(MEVENT));
   return (getmouse(mdata->mevent) == OK) ? val : Qnil;
 }
 
@@ -789,26 +762,22 @@ window_initialize(obj, h, w, top, left)
     return obj;
 }
 
-/* def subwin(height, width, top, left) */
+/* def subwin(h, w, top, left) */
 static VALUE
-window_subwin(obj, height, width, top, left)
+window_subwin(obj, h, w, top, left)
     VALUE obj;
-    VALUE height;
-    VALUE width;
+    VALUE h;
+    VALUE w;
     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);
+    window = subwin(winp->window, NUM2INT(h), NUM2INT(w),
+		                  NUM2INT(top), NUM2INT(left));
     win = prep_window(rb_obj_class(obj), window);
 
     return win;
@@ -841,19 +810,6 @@ window_clear(obj)
     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)
@@ -1027,13 +983,13 @@ window_box(argc, argv, self)
     rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
 
     GetWINDOW(self, winp);
-    box(winp->window, NUM2CH(vert), NUM2CH(hor));
+    box(winp->window, NUM2CHR(vert), NUM2CHR(hor));
 
     if (!NIL_P(corn)) {
       int cur_x, cur_y, x, y;
-      chtype c;
+      char c;
 
-      c = NUM2CH(corn);
+      c = NUM2CHR(corn);
       getyx(winp->window, cur_y, cur_x);
       x = NUM2INT(window_maxx(self)) - 1;
       y = NUM2INT(window_maxy(self)) - 1;
@@ -1083,7 +1039,7 @@ window_inch(obj)
     struct windata *winp;
     
     GetWINDOW(obj, winp);
-    return CH2FIX(winch(winp->window));
+    return CHR2FIX(winch(winp->window));
 }
 
 /* def addch(ch) */
@@ -1095,7 +1051,7 @@ window_addch(obj, ch)
     struct windata *winp;
     
     GetWINDOW(obj, winp);
-    waddch(winp->window, NUM2CH(ch));
+    waddch(winp->window, NUM2CHR(ch));
     
     return Qnil;
 }
@@ -1109,7 +1065,7 @@ window_insch(obj, ch)
     struct windata *winp;
     
     GetWINDOW(obj, winp);
-    winsch(winp->window, NUM2CH(ch));
+    winsch(winp->window, NUM2CHR(ch));
     
     return Qnil;
 }
@@ -1195,20 +1151,6 @@ window_deleteln(obj)
     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)
 {
@@ -1245,19 +1187,6 @@ window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
 #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)
 {
@@ -1337,7 +1266,7 @@ window_bkgdset(VALUE obj, VALUE ch)
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  wbkgdset(winp->window, NUM2CH(ch));
+  wbkgdset(winp->window, NUM2CHR(ch));
 #endif
   return Qnil;
 }
@@ -1349,7 +1278,7 @@ window_bkgd(VALUE obj, VALUE ch)
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+  return (wbkgd(winp->window, NUM2CHR(ch)) == OK) ? Qtrue : Qfalse;
 #else
   return Qfalse;
 #endif
@@ -1359,11 +1288,11 @@ static VALUE
 window_getbkgd(VALUE obj)
 {
 #ifdef HAVE_WGETBKGD
-  chtype c;
+  char c;
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
+  return (c = getbkgd(winp->window) != ERR) ? CHR2FIX(c) : Qnil;
 #else
   return Qnil;
 #endif
@@ -1463,7 +1392,6 @@ Init_curses()
     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);
@@ -1488,7 +1416,6 @@ Init_curses()
     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);
@@ -1531,15 +1458,11 @@ Init_curses()
     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);
@@ -1557,7 +1480,6 @@ Init_curses()
     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);
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index 0124bbbf4a..9b319ba30e 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -19,8 +19,8 @@ elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
 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) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase)))
+  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)
+    have_func(f)
   end
   flag = "-D_XOPEN_SOURCE_EXTENDED"
   src = "int test_var[(sizeof(char*)>sizeof(int))*2-1];"
diff --git a/ext/curses/view.rb b/ext/curses/view.rb
index d9a82a57db..5ba1a8413c 100644
--- a/ext/curses/view.rb
+++ b/ext/curses/view.rb
@@ -49,7 +49,7 @@ while TRUE
   n = 0
   while TRUE
     c = getch.chr
-    if c =~ /[0-9]/
+    if c =~ "[0-9]" then
       n = 10 * n + c.to_i
     else
       break
diff --git a/ext/dbm/MANIFEST b/ext/dbm/MANIFEST
new file mode 100644
index 0000000000..c8719f62a7
--- /dev/null
+++ b/ext/dbm/MANIFEST
@@ -0,0 +1,5 @@
+MANIFEST
+dbm.c
+depend
+extconf.rb
+testdbm.rb
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 0247387fdc..c422394405 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -24,8 +24,6 @@
 
 static VALUE rb_cDBM, rb_eDBMError;
 
-#define RUBY_DBM_RW_BIT 0x20000000
-
 struct dbmdata {
     int  di_size;
     DBM *di_dbm;
@@ -43,11 +41,6 @@ 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;
@@ -71,21 +64,6 @@ fdbm_close(obj)
     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)
@@ -100,12 +78,12 @@ fdbm_initialize(argc, argv, obj)
     VALUE *argv;
     VALUE obj;
 {
-    VALUE file, vmode, vflags;
+    VALUE file, vmode;
     DBM *dbm;
     struct dbmdata *dbmp;
-    int mode, flags = 0;
+    int mode;
 
-    if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
+    if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
 	mode = 0666;		/* default value */
     }
     else if (NIL_P(vmode)) {
@@ -114,27 +92,17 @@ fdbm_initialize(argc, argv, obj)
     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);
+    dbm = 0;
+    if (mode >= 0) {
+	dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, 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) {
+	dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, 0);
+    }
+    if (!dbm) {
+	dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
     }
 
     if (!dbm) {
@@ -181,7 +149,8 @@ fdbm_fetch(obj, keystr, ifnone)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (ifnone == Qnil && rb_block_given_p())
@@ -226,7 +195,8 @@ fdbm_index(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	if (val.dsize == RSTRING(valstr)->len &&
@@ -271,18 +241,17 @@ fdbm_select(argc, argv, obj)
 	if (argc > 0) {
 	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
-        GetDBM2(obj, dbmp, dbm);
+        GetDBM(obj, dbmp);
+        dbm = dbmp->di_dbm;
+
         for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-            VALUE assoc, v;
+            VALUE assoc;
             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);
-	}
+            if (RTEST(rb_yield(assoc)))
+                rb_ary_push(new, assoc);
+        }
     }
     else {
 	rb_warn("DBM#select(index..) is deprecated; use DBM#values_at");
@@ -311,14 +280,6 @@ fdbm_values_at(argc, argv, obj)
     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;
@@ -328,12 +289,14 @@ fdbm_delete(obj, keystr)
     DBM *dbm;
     VALUE valstr;
 
-    fdbm_modify(obj);
+    rb_secure(4);
     StringValue(keystr);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (rb_block_given_p()) return rb_yield(keystr);
@@ -362,8 +325,9 @@ fdbm_shift(obj)
     DBM *dbm;
     VALUE keystr, valstr;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
 
     key = dbm_firstkey(dbm); 
@@ -387,8 +351,9 @@ fdbm_delete_if(obj)
     VALUE ret, ary = rb_ary_new();
     int i, status = 0, n;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     n = dbmp->di_size;
     dbmp->di_size = -1;
 
@@ -399,12 +364,10 @@ fdbm_delete_if(obj)
         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)) {
@@ -425,8 +388,9 @@ fdbm_clear(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
     while (key = dbm_firstkey(dbm), key.dptr) {
 	if (dbm_delete(dbm, key)) {
@@ -448,7 +412,8 @@ fdbm_invert(obj)
     VALUE keystr, valstr;
     VALUE hash = rb_hash_new();
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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);
@@ -506,18 +471,19 @@ fdbm_store(obj, keystr, valstr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    fdbm_modify(obj);
+    rb_secure(4);
     keystr = rb_obj_as_string(keystr);
-    valstr = rb_obj_as_string(valstr);
 
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
+    valstr = rb_obj_as_string(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     dbmp->di_size = -1;
+    dbm = dbmp->di_dbm;
     if (dbm_store(dbm, key, val, DBM_REPLACE)) {
 #ifdef HAVE_DBM_CLEARERR
 	dbm_clearerr(dbm);
@@ -538,8 +504,9 @@ fdbm_length(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+    dbm = dbmp->di_dbm;
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	i++;
@@ -558,7 +525,7 @@ fdbm_empty_p(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size < 0) {
 	dbm = dbmp->di_dbm;
 
@@ -581,11 +548,11 @@ fdbm_each_value(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
 }
@@ -598,10 +565,10 @@ fdbm_each_key(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
 }
@@ -615,14 +582,14 @@ fdbm_each_pair(obj)
     struct dbmdata *dbmp;
     VALUE keystr, valstr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
@@ -637,7 +604,8 @@ fdbm_keys(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
 
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
@@ -656,7 +624,9 @@ fdbm_values(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
@@ -678,7 +648,8 @@ fdbm_has_key(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     val = dbm_fetch(dbm, key);
     if (val.dptr) return Qtrue;
     return Qfalse;
@@ -696,7 +667,8 @@ fdbm_has_value(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	if (val.dsize == RSTRING(valstr)->len &&
@@ -715,12 +687,14 @@ fdbm_to_a(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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)));
+				rb_tainted_str_new(val.dptr, val.dsize)));
     }
 
     return ary;
@@ -735,7 +709,9 @@ fdbm_to_hash(obj)
     DBM *dbm;
     VALUE hash;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     hash = rb_hash_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
@@ -765,7 +741,6 @@ Init_dbm()
 
     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);
@@ -804,15 +779,7 @@ Init_dbm()
     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));
-#else
-    rb_define_const(rb_cDBM, "VERSION",  rb_str_new2("unknown"));
 #endif
 }
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 0074ab605b..5a67603e69 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -2,13 +2,9 @@ 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
+dblib = with_config("dbm-type", nil)
 
-headers = {
+$dbm_conf_headers = {
   "db" => ["db.h"],
   "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
   "db2" => ["db2/db.h", "db2.h", "db.h"],
@@ -18,36 +14,48 @@ headers = {
   "qdbm" => ["relic.h"],
 }
 
-def headers.db_check(db)
-  db_prefix = nil
-  have_gdbm = false
-  hsearch = nil
+def db_check(db)
+  $dbm_conf_db_prefix = ""
+  $dbm_conf_have_gdbm = false
+  hsearch = ""
 
   case db
   when /^db2?$/
-    db_prefix = "__db_n"
+    $dbm_conf_db_prefix = "__db_n"
     hsearch = "-DDB_DBM_HSEARCH "
   when "gdbm"
-    have_gdbm = true
+    $dbm_conf_have_gdbm = true
   when "gdbm_compat"
-    have_gdbm = true
+    $dbm_conf_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
+
+  if have_library(db, db_prefix("dbm_open")) || have_func(db_prefix("dbm_open"))
+    for hdr in $dbm_conf_headers.fetch(db, ["ndbm.h"])
+      if have_header(hdr.dup) and have_type("DBM", hdr.dup, hsearch)
+	$CFLAGS += " " + hsearch + '-DDBM_HDR="<'+hdr+'>"'
+	return true
+      end
+    end
+  end
+  return false
+end
+
+def db_prefix(func)
+  $dbm_conf_db_prefix+func
+end
+
+if dblib
+  db_check(dblib)
+else
+  for dblib in %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
+    db_check(dblib) and break
   end
 end
 
-if dblib.any? {|db| headers.db_check(db)}
-  have_header("cdefs.h")
-  have_header("sys/cdefs.h")
+have_header("cdefs.h") 
+have_header("sys/cdefs.h") 
+if /DBM_HDR/ =~ $CFLAGS and have_func(db_prefix("dbm_open"))
+  have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm
   create_makefile("dbm")
 end
diff --git a/ext/dbm/testdbm.rb b/ext/dbm/testdbm.rb
new file mode 100644
index 0000000000..4942ffb64a
--- /dev/null
+++ b/ext/dbm/testdbm.rb
@@ -0,0 +1,593 @@
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+if $".grep(/\bdbm.so\b/).empty?
+  begin
+    require './dbm'
+  rescue LoadError
+    require 'dbm'
+  end
+end
+
+def uname_s
+  require 'rbconfig'
+  case Config::CONFIG['host_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['host_os']
+  end
+end
+
+SYSTEM = uname_s
+
+class TestDBM < RUNIT::TestCase
+  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)
+    GC.start
+    File.delete *Dir.glob("tmptest_dbm*").to_a
+    p Dir.glob("tmptest_dbm*") if $DEBUG
+  end
+
+  def check_size(expect, dbm=@dbm)
+    assert_equals(expect, dbm.size)
+    n = 0
+    dbm.each { n+=1 }
+    assert_equals(expect, n)
+    if expect == 0
+      assert_equals(true, dbm.empty?)
+    else
+      assert_equals(false, dbm.empty?)
+    end
+  end
+
+  def test_version
+    STDERR.print DBM::VERSION
+  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_equals(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_equals(DBM.open("tmptest_dbm") { :foo }, :foo)
+  end
+  def test_s_open_lock
+    fork() {
+      assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      assert_exception(Errno::EWOULDBLOCK, "NEVER MIND IF YOU USE Berkeley DB3") {
+	begin
+	  assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644))
+	rescue Errno::EAGAIN, Errno::EACCES, Errno::EINVAL
+	  raise Errno::EWOULDBLOCK
+	end
+      }
+    ensure
+      Process.wait
+    end
+  end
+
+=begin
+  # Is it guaranteed on many OS?
+  def test_s_open_lock_one_process
+    # locking on one process
+    assert_instance_of(DBM, dbm  = DBM.open("tmptest_dbm", 0644))
+    assert_exception(Errno::EWOULDBLOCK) {
+      begin
+	DBM.open("tmptest_dbm", 0644)
+      rescue Errno::EAGAIN
+	raise Errno::EWOULDBLOCK
+      end
+    }
+  end
+=end
+
+  def test_s_open_nolock
+    # dbm 1.8.0 specific
+    if not defined? DBM::NOLOCK
+      return
+    end
+
+    fork() {
+      assert_instance_of(DBM, dbm  = DBM.open("tmptest_dbm", 0644,
+						DBM::NOLOCK))
+      sleep 2
+    }
+    sleep 1
+    begin
+      dbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644))
+      }
+    ensure
+      Process.wait
+      dbm2.close if dbm2
+    end
+
+    p Dir.glob("tmptest_dbm*") if $DEBUG
+
+    fork() {
+      assert_instance_of(DBM, dbm  = DBM.open("tmptest_dbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      dbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	# this test is failed on Cygwin98 (???)
+	assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644,
+						   DBM::NOLOCK))
+      }
+    ensure
+      Process.wait
+      dbm2.close if dbm2
+    end
+  end
+
+  def test_s_open_error
+    assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm", 0))
+    assert_exception(Errno::EACCES, "NEVER MIND IF YOU USE Berkeley DB3") {
+      DBM.open("tmptest_dbm", 0)
+    }
+    dbm.close
+  end
+
+  def test_close
+    assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm"))
+    assert_nil(dbm.close)
+
+    # closed DBM file
+    assert_exception(DBMError) { dbm.close }
+  end
+
+  def test_aref
+    assert_equals('bar', @dbm['foo'] = 'bar')
+    assert_equals('bar', @dbm['foo'])
+
+    assert_nil(@dbm['bar'])
+  end
+
+  def test_fetch
+    assert_equals('bar', @dbm['foo']='bar')
+    assert_equals('bar', @dbm.fetch('foo'))
+
+    # key not found
+    assert_exception(IndexError) {
+      @dbm.fetch('bar')
+    }
+
+    # test for `ifnone' arg
+    assert_equals('baz', @dbm.fetch('bar', 'baz'))
+
+    # test for `ifnone' block
+    assert_equals('foobar', @dbm.fetch('bar') {|key| 'foo' + key })
+  end
+
+  def test_aset
+    num = 0
+    2.times {|i|
+      assert_equals('foo', @dbm['foo'] = 'foo')
+      assert_equals('foo', @dbm['foo'])
+      assert_equals('bar', @dbm['foo'] = 'bar')
+      assert_equals('bar', @dbm['foo'])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+
+      # assign nil
+      assert_equals('', @dbm['bar'] = '')
+      assert_equals('', @dbm['bar'])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+
+      # empty string
+      assert_equals('', @dbm[''] = '')
+      assert_equals('', @dbm[''])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+
+      # Fixnum
+      assert_equals('200', @dbm['100'] = '200')
+      assert_equals('200', @dbm['100'])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+
+      # Big key and value
+      assert_equals('y' * 100, @dbm['x' * 100] = 'y' * 100)
+      assert_equals('y' * 100, @dbm['x' * 100])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+    }
+  end
+
+  def test_index
+    assert_equals('bar', @dbm['foo'] = 'bar')
+    assert_equals('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_equals(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_equals(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_equals(k.upcase, v)
+      k != "bar"
+    }
+    assert_equals([['baz', 'BAZ'], ['foo', 'FOO']],
+		  ret.sort)
+  end
+
+  def test_length
+    num = 10
+    assert_equals(0, @dbm.size)
+    num.times {|i|
+      i = i.to_s
+      @dbm[i] = i
+    }
+    assert_equals(num, @dbm.size)
+
+    @dbm.shift
+
+    assert_equals(num - 1, @dbm.size)
+  end
+
+  def test_empty?
+    assert_equals(true, @dbm.empty?)
+    @dbm['foo'] = 'FOO'
+    assert_equals(false, @dbm.empty?)
+  end
+
+  def test_each_pair
+    n = 0
+    @dbm.each_pair { n += 1 }
+    assert_equals(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_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@dbm, ret)
+  end
+
+  def test_each_value
+    n = 0
+    @dbm.each_value { n += 1 }
+    assert_equals(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_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@dbm, ret)
+  end
+
+  def test_each_key
+    n = 0
+    @dbm.each_key { n += 1 }
+    assert_equals(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_equals(@dbm[key], values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@dbm, ret)
+  end
+
+  def test_keys
+    assert_equals([], @dbm.keys)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+    assert_equals(keys.sort, @dbm.keys.sort)
+    assert_equals(values.sort, @dbm.values.sort)
+  end
+
+  def test_values
+    test_keys
+  end
+
+  def test_shift
+    assert_nil(@dbm.shift)
+    assert_equals(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_equals(keys.size - ret_keys.size, @dbm.size)
+    end
+
+    assert_equals(keys.sort, ret_keys.sort)
+    assert_equals(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_equals(0, @dbm.size)
+
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+    assert_equals('BAR', @dbm.delete(key))
+    assert_nil(@dbm[key])
+    assert_equals(2, @dbm.size)
+
+    assert_nil(@dbm.delete(key))
+
+    if /^CYGWIN_9/ !~ SYSTEM
+      assert_exception(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_equals('foo', @dbm.delete(key) {|k| k.replace 'called block'})
+    assert_equals('no called block', key)
+    assert_equals(0, @dbm.size)
+
+    key = 'no called block'
+    assert_equals(:blockval,
+		  @dbm.delete(key) {|k| k.replace 'called block'; :blockval})
+    assert_equals('called block', key)
+    assert_equals(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_equals(@dbm, ret)
+    check_size(50, @dbm)
+
+    ret = @dbm.delete_if {|key, val| key.to_i >= 50}
+    assert_equals(@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_equals(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_equals(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_equals(100, @dbm.size)
+
+    assert_equals(50, hash.size)
+    hash.each_pair {|key,val|
+      assert_equals(false, key.to_i < 50)
+      assert_equals(key, val)
+    }
+
+    hash = @dbm.reject {|key, val| key.to_i < 100}
+    assert_instance_of(Hash, hash)
+    assert_equals(true, hash.empty?)
+  end
+
+  def test_clear
+    v = "1"
+    100.times {v = v.next; @dbm[v] = v}
+
+    assert_equals(@dbm, @dbm.clear)
+
+    # validate DBM#size
+    i = 0
+    @dbm.each { i += 1 }
+    assert_equals(@dbm.size, i)
+    assert_equals(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_equals(100, hash.size)
+    hash.each_pair {|key, val|
+      assert_equals(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_equals(101, @dbm.size)
+    @dbm.each_pair {|key, val|
+      assert_equals(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_equals(100, @dbm.size)
+    @dbm.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_haskey?
+    assert_equals('bar', @dbm['foo']='bar')
+    assert_equals(true,  @dbm.has_key?('foo'))
+    assert_equals(false, @dbm.has_key?('bar'))
+  end
+
+  def test_has_value?
+    assert_equals('bar', @dbm['foo']='bar')
+    assert_equals(true,  @dbm.has_value?('bar'))
+    assert_equals(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_equals(100, ary.size)
+    ary.each {|key,val|
+      assert_equals(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_equals(100, hash.size)
+    hash.each {|key,val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+end
+
+if $0 == __FILE__
+  if ARGV.size == 0
+    suite = RUNIT::TestSuite.new
+    suite.add_test(TestDBM.suite)
+  else
+    suite = RUNIT::TestSuite.new
+    ARGV.each do |testmethod|
+      suite.add_test(TestDBM.new(testmethod))
+    end
+  end
+
+  RUNIT::CUI::TestRunner.run(suite)
+end
diff --git a/ext/digest/MANIFEST b/ext/digest/MANIFEST
new file mode 100644
index 0000000000..ef15bdb9b7
--- /dev/null
+++ b/ext/digest/MANIFEST
@@ -0,0 +1,11 @@
+MANIFEST
+defs.h
+digest.c
+digest.h
+digest.txt
+digest.txt.ja
+extconf.rb
+lib/md5.rb
+lib/sha1.rb
+test.sh
+depend
diff --git a/ext/digest/bubblebabble/.cvsignore b/ext/digest/bubblebabble/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/bubblebabble/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/bubblebabble/bubblebabble.c b/ext/digest/bubblebabble/bubblebabble.c
deleted file mode 100644
index 3a03ceced0..0000000000
--- a/ext/digest/bubblebabble/bubblebabble.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/************************************************
-
-  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/ext/digest/bubblebabble/depend b/ext/digest/bubblebabble/depend
deleted file mode 100644
index b20148ded4..0000000000
--- a/ext/digest/bubblebabble/depend
+++ /dev/null
@@ -1,3 +0,0 @@
-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/ext/digest/bubblebabble/extconf.rb b/ext/digest/bubblebabble/extconf.rb
deleted file mode 100644
index 53cb83934a..0000000000
--- a/ext/digest/bubblebabble/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'mkmf'
-
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
-
-create_makefile('digest/bubblebabble')
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
index b9a3470e65..5cfc77dd24 100644
--- a/ext/digest/defs.h
+++ b/ext/digest/defs.h
@@ -23,8 +23,12 @@
   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;
+# elif defined(__GNUC__)
+  typedef unsigned long long uint64_t;
+# elif defined(_MSC_VER)
+  typedef unsigned _int64 uint64_t;
+# elif defined(__BORLANDC__)
+  typedef unsigned __int64 uint64_t;
 # else
 #  define NO_UINT64_T
 # endif
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 0b910e8c47..c570055322 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -6,487 +6,153 @@
   created at: Fri May 25 08:57:27 JST 2001
 
   Copyright (C) 1995-2001 Yukihiro Matsumoto
-  Copyright (C) 2001-2006 Akinori MUSHA
+  Copyright (C) 2001 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 an interface to the following hash algorithms:
  *
- * 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
+ *   - the MD5 Message-Digest Algorithm by the RSA Data Security,
+ *     Inc., described in RFC 1321
  *
- * 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
+ *   - the SHA-1 Secure Hash Algorithm by NIST (the US' National
+ *     Institute of Standards and Technology), described in FIPS PUB
+ *     180-1.
  *
- * 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 SHA-256/384/512 Secure Hash Algorithm by NIST (the US'
+ *     National Institute of Standards and Technology), described in
+ *     FIPS PUB 180-2.
  *
- * The update() method and the left-shift operator are overridden by
- * each implementation subclass. (One should be an alias for the
- * other)
+ *   - the RIPEMD-160 cryptographic hash function, designed by Hans
+ *     Dobbertin, Antoon Bosselaers, and Bart Preneel.
  */
-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)));
-}
+#include "digest.h"
 
-/*
- * 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)));
-}
+static VALUE mDigest, cDigest_Base;
+static ID id_metadata;
 
 /*
- * call-seq:
- *     digest_obj.new -> another_digest_obj
- *
- * Returns a new, initialized copy of the digest object.  Equivalent
- * to digest_obj.clone().reset().
+ * Digest::Base
  */
-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)
+static algo_t *
+get_digest_base_metadata(klass)
+    VALUE klass;
 {
-    VALUE value = rb_funcall(self, id_finish, 0);
-    rb_funcall(self, id_reset, 0);
-
-    return value;
-}
+    VALUE obj;
+    algo_t *algo;
 
-/*
- * 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);
+    if (rb_cvar_defined(klass, id_metadata) == Qfalse) {
+	rb_notimplement();
     }
 
-    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);
-}
+    obj = rb_cvar_get(klass, id_metadata);
 
-/*
- * 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);
-}
+    Data_Get_Struct(obj, algo_t, algo);
 
-/*
- * 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;
+    return algo;
 }
 
-/*
- * 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_base_alloc _((VALUE));
 static VALUE
-rb_digest_instance_equal(VALUE self, VALUE other)
+rb_digest_base_alloc(klass)
+    VALUE klass;
 {
-    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);
+    algo_t *algo;
+    VALUE obj;
+    void *pctx;
 
-    if (RSTRING_LEN(str1) == RSTRING_LEN(str2) &&
-	rb_str_cmp(str1, str2) == 0) {
-	return Qtrue;
+    if (klass == cDigest_Base) {
+	rb_raise(rb_eNotImpError, "Digest::Base is an abstract class");
     }
-    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);
+    algo = get_digest_base_metadata(klass);
 
-    /* never blindly assume that #digest() returns a string */
-    StringValue(digest);
-    return INT2NUM(RSTRING_LEN(digest));
-}
+    /* XXX: An uninitialized buffer leads ALGO_Equal() to fail */
+    pctx = xcalloc(algo->ctx_size, 1);
+    algo->init_func(pctx);
 
-/*
- * 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);
-}
+    obj = Data_Wrap_Struct(klass, 0, free, pctx);
 
-/*
- * 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)));
+    return obj;
 }
 
-/*
- * 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)
-{
+rb_digest_base_s_digest(klass, str)
+    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;
+    algo_t *algo;
+    void *pctx;
+    size_t len;
+    unsigned char *digest;
+    VALUE obj = rb_digest_base_alloc(klass);
 
-    for (p = klass; p; p = RCLASS(p)->super) {
-        if (rb_ivar_defined(p, id_metadata)) {
-            obj = rb_ivar_get(p, id_metadata);
-            break;
-        }
-    }
+    algo = get_digest_base_metadata(klass);
+    Data_Get_Struct(obj, void, pctx);
 
-    if (!p)
-        rb_raise(rb_eRuntimeError, "Digest::Base cannot be directly inherited in Ruby");
+    StringValue(str);
+    algo->update_func(pctx, RSTRING(str)->ptr, RSTRING(str)->len);
 
-    Data_Get_Struct(obj, rb_digest_metadata_t, algo);
+    len = algo->digest_len;
 
-    switch (algo->api_version) {
-      case 2:
-        break;
+    digest = xmalloc(len);
+    algo->final_func(digest, pctx);
 
-      /*
-       * put conversion here if possible when API is updated
-       */
+    obj = rb_str_new(digest, len);
 
-      default:
-        rb_raise(rb_eRuntimeError, "Incompatible digest API version");
-    }
+    free(digest);
 
-    return algo;
+    return obj;
 }
 
 static VALUE
-rb_digest_base_alloc(VALUE klass)
+rb_digest_base_s_hexdigest(klass, str)
+    VALUE klass;
+    VALUE str;
 {
-    rb_digest_metadata_t *algo;
-    VALUE obj;
+    algo_t *algo;
     void *pctx;
-
-    if (klass == rb_cDigest_Base) {
-	rb_raise(rb_eNotImpError, "Digest::Base is an abstract class");
-    }
+    size_t len;
+    unsigned char *hexdigest;
+    VALUE obj = rb_digest_base_alloc(klass);
 
     algo = get_digest_base_metadata(klass);
+    Data_Get_Struct(obj, void, pctx);
 
-    pctx = xmalloc(algo->ctx_size);
-    algo->init_func(pctx);
+    StringValue(str);
+    algo->update_func(pctx, RSTRING(str)->ptr, RSTRING(str)->len);
 
-    obj = Data_Wrap_Struct(klass, 0, free, pctx);
+    len = algo->digest_len * 2;
+
+    hexdigest = xmalloc(len + 1); /* +1 is for '\0' */
+    algo->end_func(pctx, hexdigest);
+
+    obj = rb_str_new(hexdigest, len);
+
+    free(hexdigest);
 
     return obj;
 }
 
-/* :nodoc: */
 static VALUE
-rb_digest_base_copy(VALUE copy, VALUE obj)
+rb_digest_base_copy(copy, obj)
+    VALUE copy, obj;
 {
-    rb_digest_metadata_t *algo;
+    algo_t *algo;
     void *pctx1, *pctx2;
 
     if (copy == obj) return copy;
-
     rb_check_frozen(copy);
-
-    algo = get_digest_base_metadata(rb_obj_class(copy));
-
+    algo = get_digest_base_metadata(CLASS_OF(copy));
+    if (algo != get_digest_base_metadata(CLASS_OF(obj))) {
+	rb_raise(rb_eTypeError, "wrong argument class");
+    }
     Data_Get_Struct(obj, void, pctx1);
     Data_Get_Struct(copy, void, pctx2);
     memcpy(pctx2, pctx1, algo->ctx_size);
@@ -494,149 +160,157 @@ rb_digest_base_copy(VALUE copy, VALUE obj)
     return copy;
 }
 
-/* :nodoc: */
 static VALUE
-rb_digest_base_reset(VALUE self)
+rb_digest_base_update(self, str)
+    VALUE self, str;
 {
-    rb_digest_metadata_t *algo;
+    algo_t *algo;
     void *pctx;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
-
+    StringValue(str);
+    algo = get_digest_base_metadata(CLASS_OF(self));
     Data_Get_Struct(self, void, pctx);
 
-    algo->init_func(pctx);
+    algo->update_func(pctx, RSTRING(str)->ptr, RSTRING(str)->len);
 
     return self;
 }
 
-/* :nodoc: */
 static VALUE
-rb_digest_base_update(VALUE self, VALUE str)
+rb_digest_base_init(argc, argv, self)
+    int argc;
+    VALUE* argv;
+    VALUE self;
 {
-    rb_digest_metadata_t *algo;
-    void *pctx;
+    VALUE arg;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    rb_scan_args(argc, argv, "01", &arg);
 
-    Data_Get_Struct(self, void, pctx);
-
-    StringValue(str);
-    algo->update_func(pctx, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
+    if (!NIL_P(arg)) rb_digest_base_update(self, arg);
 
     return self;
 }
 
-/* :nodoc: */
 static VALUE
-rb_digest_base_finish(VALUE self)
+rb_digest_base_digest(self)
+    VALUE self;
 {
-    rb_digest_metadata_t *algo;
-    void *pctx;
+    algo_t *algo;
+    void *pctx1, *pctx2;
+    unsigned char *digest;
+    size_t len;
     VALUE str;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_base_metadata(CLASS_OF(self));
+    Data_Get_Struct(self, void, pctx1);
 
-    Data_Get_Struct(self, void, pctx);
+    len = algo->ctx_size;
 
-    str = rb_str_new(0, algo->digest_len);
-    algo->finish_func(pctx, (unsigned char *)RSTRING_PTR(str));
+    pctx2 = xmalloc(len);
+    memcpy(pctx2, pctx1, len);
 
-    /* avoid potential coredump caused by use of a finished context */
-    algo->init_func(pctx);
+    len = algo->digest_len;
+
+    digest = xmalloc(len);
+    algo->final_func(digest, pctx2);
+
+    str = rb_str_new(digest, len);
+
+    free(digest);
+    free(pctx2);
 
     return str;
 }
 
-/* :nodoc: */
 static VALUE
-rb_digest_base_digest_length(VALUE self)
+rb_digest_base_hexdigest(self)
+    VALUE self;
 {
-    rb_digest_metadata_t *algo;
+    algo_t *algo;
+    void *pctx1, *pctx2;
+    unsigned char *hexdigest;
+    size_t len;
+    VALUE str;
+
+    algo = get_digest_base_metadata(CLASS_OF(self));
+    Data_Get_Struct(self, void, pctx1);
+
+    len = algo->ctx_size;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    pctx2 = xmalloc(len);
+    memcpy(pctx2, pctx1, len);
 
-    return INT2NUM(algo->digest_len);
+    len = algo->digest_len * 2;
+
+    hexdigest = xmalloc(len + 1); /* +1 is for '\0' */
+    algo->end_func(pctx2, hexdigest);
+
+    str = rb_str_new(hexdigest, len);
+
+    free(hexdigest);
+    free(pctx2);
+
+    return str;
 }
 
-/* :nodoc: */
 static VALUE
-rb_digest_base_block_length(VALUE self)
+rb_digest_base_equal(self, other)
+    VALUE self, other;
 {
-    rb_digest_metadata_t *algo;
+    algo_t *algo;
+    VALUE klass;
+    VALUE str1, str2;
+
+    klass = CLASS_OF(self);
+    algo = get_digest_base_metadata(klass);
+
+    if (CLASS_OF(other) == klass) {
+	void *pctx1, *pctx2;
+
+	Data_Get_Struct(self, void, pctx1);
+	Data_Get_Struct(other, void, pctx2);
+
+	return algo->equal_func(pctx1, pctx2) ? Qtrue : Qfalse;
+    }
+
+    StringValue(other);
+    str2 = other;
+
+    if (RSTRING(str2)->len == algo->digest_len)
+	str1 = rb_digest_base_digest(self);
+    else
+	str1 = rb_digest_base_hexdigest(self);
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    if (RSTRING(str1)->len == RSTRING(str2)->len
+      && rb_str_cmp(str1, str2) == 0)
+	return Qtrue;
 
-    return INT2NUM(algo->block_len);
+    return Qfalse;
 }
 
+/*
+ * Init
+ */
+
 void
-Init_digest(void)
+Init_digest()
 {
-    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);
+    mDigest = rb_define_module("Digest");
 
-    id_metadata = rb_intern("metadata");
+    cDigest_Base = rb_define_class_under(mDigest, "Base", rb_cObject);
 
-    /* class Digest::Base < Digest::Class */
-    rb_cDigest_Base = rb_define_class_under(rb_mDigest, "Base", rb_cDigest_Class);
+    rb_define_alloc_func(cDigest_Base, rb_digest_base_alloc);
+    rb_define_singleton_method(cDigest_Base, "digest", rb_digest_base_s_digest, 1);
+    rb_define_singleton_method(cDigest_Base, "hexdigest", rb_digest_base_s_hexdigest, 1);
 
-    rb_define_alloc_func(rb_cDigest_Base, rb_digest_base_alloc);
+    rb_define_method(cDigest_Base, "initialize", rb_digest_base_init, -1);
+    rb_define_method(cDigest_Base, "initialize_copy",  rb_digest_base_copy, 1);
+    rb_define_method(cDigest_Base, "update", rb_digest_base_update, 1);
+    rb_define_method(cDigest_Base, "<<", rb_digest_base_update, 1);
+    rb_define_method(cDigest_Base, "digest", rb_digest_base_digest, 0);
+    rb_define_method(cDigest_Base, "hexdigest", rb_digest_base_hexdigest, 0);
+    rb_define_method(cDigest_Base, "to_s", rb_digest_base_hexdigest, 0);
+    rb_define_method(cDigest_Base, "==", rb_digest_base_equal, 1);
 
-    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);
+    id_metadata = rb_intern("metadata");
 }
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
index 6e4906c859..5e846df040 100644
--- a/ext/digest/digest.h
+++ b/ext/digest/digest.h
@@ -1,12 +1,12 @@
 /************************************************
 
-  digest.h - header file for ruby digest modules
+  digest.c -
 
   $Author$
   created at: Fri May 25 08:54:56 JST 2001
 
 
-  Copyright (C) 2001-2006 Akinori MUSHA
+  Copyright (C) 2001 Akinori MUSHA
 
   $RoughId: digest.h,v 1.3 2001/07/13 15:38:27 knu Exp $
   $Id$
@@ -15,18 +15,18 @@
 
 #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 void (*hash_init_func_t) _((void *));
+typedef void (*hash_update_func_t) _((void *, unsigned char *, size_t));
+typedef void (*hash_end_func_t) _((void *, unsigned char *));
+typedef void (*hash_final_func_t) _((unsigned char *, void *));
+typedef int (*hash_equal_func_t) _((void *, void *));
 
 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;
+    hash_init_func_t init_func;
+    hash_update_func_t update_func;
+    hash_end_func_t end_func;
+    hash_final_func_t final_func;
+    hash_equal_func_t equal_func;
+} algo_t;
diff --git a/ext/digest/digest.txt b/ext/digest/digest.txt
new file mode 100644
index 0000000000..5797dd18f9
--- /dev/null
+++ b/ext/digest/digest.txt
@@ -0,0 +1,113 @@
+.\" digest.txt -  -*- Indented-Text -*- created at: Fri May 25 08:13:50 JST 2001
+$RoughId: digest.txt,v 1.9 2001/07/13 19:46:51 knu Exp $
+$Id$
+
+** MD5(Class)
+
+A class to implement the MD5 Message-Digest Algorithm by RSA Data
+Security, Inc., described in RFC1321.
+
+Superclass: Digest::Base
+
+require 'digest/md5'
+
+** SHA1(Class)
+
+A class to implement the SHA-1 Secure Hash Algorithm by NIST (the US'
+National Institute of Standards and Technology), described in FIPS PUB
+180-1.
+
+Superclass: Digest::Base
+
+require 'digest/sha1'
+
+** SHA256(Class)
+** SHA384(Class)
+** SHA512(Class)
+
+Classes to implement 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.
+
+Superclass: Digest::Base
+
+require 'digest/sha2'
+
+** RMD160(Class)
+
+A class to implement the RIPEMD-160 cryptographic hash function,
+designed by Hans Dobbertin, Antoon Bosselaers, and Bart Preneel.
+
+Superclass: Digest::Base
+
+require 'digest/rmd160'
+
+
+Those above classes provide a common interface as shown below.
+
+
+Class Methods:
+
+   new([str])
+
+	Creates a new digest object.  If a string argument is given,
+	it is added to the object. (see update.)
+
+   digest(str)
+
+	Immediately calculates and return the hash of the given
+	strings as a string.  Equivalent to new(str).digest.
+
+   hexdigest(str)
+
+	Immediately calculates and return the hash of the given
+	strings as a string of hexadecimal digits.  Equivalent to
+	new(str).hexdigest.
+
+Methods:
+
+   clone
+
+	Creates a copy of the digest object.
+
+   digest
+
+	Returns the hash of the added strings as a string of 16 bytes
+	for MD5, 20 bytes for SHA1 and RMD160, 32 bytes for SHA256, 48
+	bytes for SHA384, and 64 bytes for SHA512.
+
+   hexdigest
+   to_s
+
+	Returns the hash of the added strings as a string of 32
+	hexadecimal digits for MD5, 40 hexadecimal digits for SHA1 and
+	RMD160, 64 hexadecimal digits for SHA256, 96 hexadecimal
+	digits for SHA384, and 128 hexadecimal digits for SHA512.
+	This method is equal to:
+
+	def hexdigest
+	  digest.unpack("H*")[0]
+	end
+
+   update(str)
+   << str
+
+	Appends the string str to the digest object.  Repeated calls
+	are equivalent to a single call with the concatenation of all
+	the arguments, i.e. m.update(a); m.update(b) is equivalent to
+	m.update(a + b) and m << a << b is equivalent to m << a + b.
+
+   == md
+
+	Checks if the object is equal to the given digest object.
+
+   == str
+
+	Regards the value as either a digest value or a hexdigest
+	value (depending on the length) and checks if the object is
+	equal to the given string.
+
+-------------------------------------------------------
+Local variables:
+fill-column: 70
+end:
diff --git a/ext/digest/digest.txt.ja b/ext/digest/digest.txt.ja
new file mode 100644
index 0000000000..8997d25b9d
--- /dev/null
+++ b/ext/digest/digest.txt.ja
@@ -0,0 +1,111 @@
+.\" digest.txt.ja -  -*- Indented-Text -*- created at: Fri May 25 08:22:19 JST 2001
+$RoughId: digest.txt.jp,v 1.8 2001/07/13 15:38:27 knu Exp $
+$Id$
+
+** MD5(¥¯¥é¥¹)
+
+RFC1321¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤ëRSA Data Security, Inc. ¤Î MD5 Message-Digest
+Algorithm¤ò¼ÂÁõ¤¹¤ë¥¯¥é¥¹¡£
+
+Superclass: Digest::Base
+
+require 'digest/md5'
+
+** SHA1(¥¯¥é¥¹)
+
+FIPS PUB 180-1¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤ëNIST (the US' National Institute of
+Standards and Technology) ¤Î SHA-1 Secure Hash Algorithm¤ò¼ÂÁõ¤¹¤ë¥¯¥é¥¹¡£
+
+Superclass: Digest::Base
+
+require 'digest/sha1'
+
+** SHA256(¥¯¥é¥¹)
+** SHA384(¥¯¥é¥¹)
+** SHA512(¥¯¥é¥¹)
+
+FIPS PUB 180-2¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤ëNIST (the US' National Institute of
+Standards and Technology) ¤Î SHA-256/384/512 Secure Hash Algorithm¤ò
+¼ÂÁõ¤¹¤ë¥¯¥é¥¹¡£
+
+Superclass: Digest::Base
+
+require 'digest/sha2'
+
+** RMD160(¥¯¥é¥¹)
+
+Hans Dobbertin, Antoon Bosselaers, Bart Preneel ¤Ë¤è¤Ã¤ÆÀ߷פµ¤ì¤¿ 
+RIPEMD-160 ¥Ï¥Ã¥·¥å´Ø¿ô¤ò¼ÂÁõ¤¹¤ë¥¯¥é¥¹¡£
+
+Superclass: Digest::Base
+
+require 'digest/rmd160'
+
+
+¤³¤ì¤é¤Î¥¯¥é¥¹¤Ï°Ê²¼¤Î¤è¤¦¤Ê¶¦Ä̤Υ¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤òÄ󶡤¹¤ë¡£
+
+
+Class Methods:
+
+   new([str])
+
+        ¿·¤·¤¤¥À¥¤¥¸¥§¥¹¥È¥ª¥Ö¥¸¥§¥¯¥È¤òÀ¸À®¤¹¤ë¡¥Ê¸»úÎó°ú¿ô¤¬Í¿¤¨¤é¤ì¤ë
+        ¤È¤½¤ì¤òÄɲ乤ë(see update)¡£
+
+   digest(str)
+
+	Í¿¤¨¤é¤ì¤¿Ê¸»úÎó¤ËÂФ¹¤ë¥Ï¥Ã¥·¥åÃͤòʸ»úÎó¤ÇÊÖ¤¹¡£
+	new(str).digest ¤ÈÅù²Á¡£
+
+   hexdigest(str)
+
+	Í¿¤¨¤é¤ì¤¿Ê¸»úÎó¤ËÂФ¹¤ë¥Ï¥Ã¥·¥åÃͤò¡¢ASCII¥³¡¼¥É¤ò»È¤Ã¤Æ
+        16¿Ê¿ô¤ÎÎó¤ò¼¨¤¹Ê¸»úÎó¤Ë¥¨¥ó¥³¡¼¥É¤·¤ÆÊÖ¤¹¡£
+	new(str).hexdigest ¤ÈÅù²Á¡£
+
+Methods:
+
+   clone
+
+	¥À¥¤¥¸¥§¥¹¥È¥ª¥Ö¥¸¥§¥¯¥È¤ÎÊ£À½¤òºî¤ë¡£
+
+   digest
+
+        º£¤Þ¤Ç¤ËÄɲä·¤¿Ê¸»úÎó¤ËÂФ¹¤ë¥Ï¥Ã¥·¥åÃͤòʸ»úÎó¤ÇÊÖ¤¹¡£MD5¤Ç¤Ï
+        16¥Ð¥¤¥ÈĹ¡¢SHA1¤ª¤è¤ÓRMD160¤Ç¤Ï20¥Ð¥¤¥ÈĹ¡¢SHA256¤Ç¤Ï32¥Ð¥¤¥ÈĹ¡¢
+	SHA384¤Ç¤Ï48¥Ð¥¤¥ÈĹ¡¢SHA512¤Ç¤Ï64¥Ð¥¤¥ÈĹ¤È¤Ê¤ë¡£
+
+   hexdigest
+   to_s
+
+        º£¤Þ¤Ç¤ËÄɲä·¤¿Ê¸»úÎó¤ËÂФ¹¤ë¥Ï¥Ã¥·¥åÃͤò¡¢ASCII¥³¡¼¥É¤ò»È¤Ã¤Æ
+        16¿Ê¿ô¤ÎÎó¤ò¼¨¤¹Ê¸»úÎó¤Ë¥¨¥ó¥³¡¼¥É¤·¤ÆÊÖ¤¹¡£MD5¤Ç¤Ï32¥Ð¥¤¥ÈĹ¡¢
+        SHA1¤ª¤è¤ÓRMD160¤Ç¤Ï40¥Ð¥¤¥ÈĹ¡¢SHA256¤Ç¤Ï64¥Ð¥¤¥ÈĹ¡¢SHA384¤Ç¤Ï
+	96¥Ð¥¤¥ÈĹ¡¢SHA512¤Ç¤Ï128¥Ð¥¤¥ÈĹ¤È¤Ê¤ë¡£Ruby¤Ç½ñ¤¯¤È°Ê²¼¤ÈƱ¤¸¡£
+
+	def hexdigest
+	  digest.unpack("H*")[0]
+	end
+
+   update(str)
+   << str
+
+        ʸ»úÎó¤òÄɲ乤롣ʣ¿ô²óupdate¤ò¸Æ¤Ö¤³¤È¤Ïʸ»úÎó¤òÏ¢·ë¤·¤Æ
+	update¤ò¸Æ¤Ö¤³¤È¤ÈÅù¤·¤¤¡£¤¹¤Ê¤ï¤Á m.update(a); m.update(b) ¤Ï
+	m.update(a + b) ¤È¡¢ m << a << b ¤Ï m << a + b ¤È¤½¤ì¤¾¤ìÅù²Á
+	¤Ç¤¢¤ë¡£
+
+   == md
+
+	Í¿¤¨¤é¤ì¤¿¥À¥¤¥¸¥§¥¹¥È¥ª¥Ö¥¸¥§¥¯¥È¤ÈÈæ³Ó¤¹¤ë¡£
+
+   == str
+
+	Í¿¤¨¤é¤ì¤¿Ê¸»úÎó¤ò digest ÃÍ¡¢¤â¤·¤¯¤Ï hexdigest ÃͤÈÈæ³Ó¤¹¤ë¡£
+	¤¤¤º¤ì¤ÎÃͤȸ«¤ë¤«¤ÏÍ¿¤¨¤é¤ì¤¿Ê¸»úÎó¤ÎŤµ¤Ë¤è¤Ã¤Æ¼«Æ°È½ÊÌ
+	¤µ¤ì¤ë¡£
+
+-------------------------------------------------------
+Local variables:
+fill-column: 70
+end:
diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
index cf9127ecc0..cd512622a4 100644
--- a/ext/digest/extconf.rb
+++ b/ext/digest/extconf.rb
@@ -3,8 +3,4 @@
 
 require "mkmf"
 
-$INSTALLFILES = {
-  "digest.h" => "$(RUBYARCHDIR)"
-}
-
 create_makefile("digest")
diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
deleted file mode 100644
index 0c4ee3c2cc..0000000000
--- a/ext/digest/lib/digest.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-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/ext/digest/lib/md5.rb b/ext/digest/lib/md5.rb
index c399f2de1d..1d05d7d04e 100644
--- a/ext/digest/lib/md5.rb
+++ b/ext/digest/lib/md5.rb
@@ -5,19 +5,10 @@
 
 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
+MD5 = Digest::MD5
 
-    def md5(*args)
-      new(*args)
-    end
+class MD5
+  def self.md5(*args)
+    new(*args)
   end
 end
diff --git a/ext/digest/lib/sha1.rb b/ext/digest/lib/sha1.rb
index 4446e12e8d..c4ac6f66ea 100644
--- a/ext/digest/lib/sha1.rb
+++ b/ext/digest/lib/sha1.rb
@@ -5,19 +5,10 @@
 
 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
+SHA1 = Digest::SHA1
 
-    def sha1(*args)
-      new(*args)
-    end
+class SHA1
+  def self.sha1(*args)
+    new(*args)
   end
 end
diff --git a/ext/digest/md5/MANIFEST b/ext/digest/md5/MANIFEST
new file mode 100644
index 0000000000..d4a09b3ff6
--- /dev/null
+++ b/ext/digest/md5/MANIFEST
@@ -0,0 +1,8 @@
+MANIFEST
+extconf.rb
+md5.c
+md5.h
+md5init.c
+md5ossl.c
+md5ossl.h
+depend
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index 018f8ccb02..0db0404dbe 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -3,8 +3,7 @@
 
 require "mkmf"
 
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [ "md5init.#{$OBJEXT}" ]
 
@@ -14,6 +13,7 @@ if !with_config("bundled-md5") &&
     have_library("crypto") && have_header("openssl/md5.h")
   $objs << "md5ossl.#{$OBJEXT}"
 
+  $libs << " -lcrypto"
 else
   $objs << "md5.#{$OBJEXT}"
 end
@@ -24,6 +24,4 @@ have_header("inttypes.h")
 
 have_header("unistd.h")
 
-$preload = %w[digest]
-
 create_makefile("digest/md5")
diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
index 993bc47a06..6b61f031c4 100644
--- a/ext/digest/md5/md5.c
+++ b/ext/digest/md5/md5.c
@@ -41,12 +41,6 @@
   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$ */
@@ -397,7 +391,7 @@ MD5_Update(MD5_CTX *pms, const uint8_t *data, size_t nbytes)
 }
 
 void
-MD5_Finish(MD5_CTX *pms, uint8_t *digest)
+MD5_Final(uint8_t *digest, MD5_CTX *pms)
 {
     static const uint8_t pad[64] = {
 	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -418,3 +412,21 @@ MD5_Finish(MD5_CTX *pms, uint8_t *digest)
     for (i = 0; i < 16; ++i)
 	digest[i] = (uint8_t)(pms->state[i >> 2] >> ((i & 3) << 3));
 }
+
+void
+MD5_End(MD5_CTX *pctx, uint8_t *hexdigest)
+{
+    unsigned char digest[16];
+    size_t i;
+
+    MD5_Final(digest, pctx);
+
+    for (i = 0; i < 16; i++)
+        sprintf(hexdigest + i * 2, "%02x", digest[i]);
+}
+
+int MD5_Equal(MD5_CTX* pctx1, MD5_CTX* pctx2) {
+	return memcmp(pctx1->count, pctx2->count, sizeof(pctx1->count)) == 0
+		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
+		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
+}
diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h
index f4580ef5e7..fc41380d38 100644
--- a/ext/digest/md5/md5.h
+++ b/ext/digest/md5/md5.h
@@ -63,15 +63,18 @@ typedef struct md5_state_s {
 } 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
+#define MD5_Final	rb_Digest_MD5_Final
+#define MD5_End		rb_Digest_MD5_End
+#define MD5_Equal	rb_Digest_MD5_Equal
 #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));
+void	MD5_Final _((uint8_t *digest, MD5_CTX *pms));
+void	MD5_End _((MD5_CTX *pctx, uint8_t *hexdigest));
+int	MD5_Equal _((MD5_CTX *pctx1, MD5_CTX *pctx2));
 
 #define MD5_BLOCK_LENGTH		64
 #define MD5_DIGEST_LENGTH		16
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index 17658f4fce..2acca16a46 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -8,33 +8,28 @@
 #include "md5.h"
 #endif
 
-static rb_digest_metadata_t md5 = {
-    RUBY_DIGEST_API_VERSION,
+static algo_t md5 = {
     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,
+    (hash_init_func_t)MD5_Init,
+    (hash_update_func_t)MD5_Update,
+    (hash_end_func_t)MD5_End,
+    (hash_final_func_t)MD5_Final,
+    (hash_equal_func_t)MD5_Equal,
 };
 
-/*
- * 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");
+    rb_require("digest.so");
 
     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));
+    rb_cvar_set(cDigest_MD5, rb_intern("metadata"),
+		Data_Wrap_Struct(rb_cObject, 0, 0, &md5), Qtrue);
 }
diff --git a/ext/digest/md5/md5ossl.c b/ext/digest/md5/md5ossl.c
index d94ae2cd2f..d930c7ab51 100644
--- a/ext/digest/md5/md5ossl.c
+++ b/ext/digest/md5/md5ossl.c
@@ -1,9 +1,30 @@
 /* $Id$ */
 
 #include "md5ossl.h"
+#include <sys/types.h>
+#include <stdio.h>
+#include <string.h>
 
 void
-MD5_Finish(MD5_CTX *pctx, unsigned char *digest)
+MD5_End(MD5_CTX *pctx, unsigned char *hexdigest)
 {
+    unsigned char digest[16];
+    size_t i;
+
     MD5_Final(digest, pctx);
+
+    for (i = 0; i < 16; i++)
+        sprintf(hexdigest + i * 2, "%02x", digest[i]);
+}
+
+int
+MD5_Equal(MD5_CTX* pctx1, MD5_CTX* pctx2) {
+    return pctx1->num == pctx2->num
+      && pctx1->A == pctx2->A
+      && pctx1->B == pctx2->B
+      && pctx1->C == pctx2->C
+      && pctx1->D == pctx2->D
+      && pctx1->Nl == pctx2->Nl
+      && pctx1->Nh == pctx2->Nh
+      && memcmp(pctx1->data, pctx2->data, sizeof(pctx1->data)) == 0;
 }
diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h
index 1680c4f5c9..dda7c743ed 100644
--- a/ext/digest/md5/md5ossl.h
+++ b/ext/digest/md5/md5ossl.h
@@ -3,11 +3,9 @@
 #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);
+void MD5_End(MD5_CTX *pctx, unsigned char *hexdigest);
+int MD5_Equal(MD5_CTX *pctx1, MD5_CTX *pctx2);
 
 #endif
diff --git a/ext/digest/rmd160/MANIFEST b/ext/digest/rmd160/MANIFEST
new file mode 100644
index 0000000000..bcddc7d1d8
--- /dev/null
+++ b/ext/digest/rmd160/MANIFEST
@@ -0,0 +1,9 @@
+MANIFEST
+extconf.rb
+rmd160.c
+rmd160.h
+rmd160hl.c
+rmd160init.c
+rmd160ossl.c
+rmd160ossl.h
+depend
diff --git a/ext/digest/rmd160/depend b/ext/digest/rmd160/depend
index a21d7188dc..0ca79c5f40 100644
--- a/ext/digest/rmd160/depend
+++ b/ext/digest/rmd160/depend
@@ -1,5 +1,7 @@
 rmd160.o: rmd160.c rmd160.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
   $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
+rmd160hl.o: rmd160hl.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
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index 09359944f2..3f6a88e756 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -3,8 +3,7 @@
 
 require "mkmf"
 
-$defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 
@@ -13,8 +12,9 @@ dir_config("openssl")
 if !with_config("bundled-rmd160") &&
     have_library("crypto") && have_header("openssl/ripemd.h")
   $objs << "rmd160ossl.#{$OBJEXT}"
+  $libs << " -lcrypto"
 else
-  $objs << "rmd160.#{$OBJEXT}"
+  $objs << "rmd160.#{$OBJEXT}" << "rmd160hl.#{$OBJEXT}"
 end
 
 have_header("sys/cdefs.h")
@@ -23,6 +23,4 @@ have_header("inttypes.h")
 
 have_header("unistd.h")
 
-$preload = %w[digest]
-
 create_makefile("digest/rmd160")
diff --git a/ext/digest/rmd160/rmd160.c b/ext/digest/rmd160/rmd160.c
index 88918728cd..2de3c99b29 100644
--- a/ext/digest/rmd160/rmd160.c
+++ b/ext/digest/rmd160/rmd160.c
@@ -409,7 +409,7 @@ RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
 /********************************************************************/
 
 void
-RMD160_Finish(RMD160_CTX *context, uint8_t digest[20])
+RMD160_Final(uint8_t digest[20], RMD160_CTX *context)
 {
 	uint32_t i;
 	uint32_t X[16];
@@ -454,4 +454,11 @@ RMD160_Finish(RMD160_CTX *context, uint8_t digest[20])
 	}
 }
 
+int RMD160_Equal(RMD160_CTX* pctx1, RMD160_CTX* pctx2) {
+	return pctx1->buflen == pctx2->buflen
+		&& memcmp(pctx1->length, pctx2->length, sizeof(pctx1->length)) == 0
+		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
+		&& memcmp(pctx1->bbuffer, pctx2->bbuffer, sizeof(pctx1->bbuffer)) == 0;
+}
+
 /************************ end of file rmd160.c **********************/
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
index 54d1ca9140..24f9a025f0 100644
--- a/ext/digest/rmd160/rmd160.h
+++ b/ext/digest/rmd160/rmd160.h
@@ -39,14 +39,26 @@ typedef struct {
 #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
+#define RMD160_Final	rb_Digest_RMD160_Final
+#define RMD160_Equal	rb_Digest_RMD160_Equal
+#ifndef _KERNEL
+#define RMD160_End	rb_Digest_RMD160_End
+#define RMD160_File	rb_Digest_RMD160_File
+#define RMD160_Data	rb_Digest_RMD160_Data
+#endif /* _KERNEL */
 #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]));
+void	RMD160_Final _((uint8_t[20], RMD160_CTX *));
+int	RMD160_Equal _((RMD160_CTX *, RMD160_CTX *));
+#ifndef	_KERNEL
+char	*RMD160_End _((RMD160_CTX *, char *));
+char	*RMD160_File _((char *, char *));
+char	*RMD160_Data _((const uint8_t *, size_t, char *));
+#endif /* _KERNEL */
 __END_DECLS
 
 #define RMD160_BLOCK_LENGTH             64
diff --git a/ext/digest/rmd160/rmd160hl.c b/ext/digest/rmd160/rmd160hl.c
new file mode 100644
index 0000000000..4c5e0217d9
--- /dev/null
+++ b/ext/digest/rmd160/rmd160hl.c
@@ -0,0 +1,96 @@
+/*	$NetBSD: rmd160hl.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $	*/
+/*	$RoughId: rmd160hl.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
+/*	$Id$	*/
+
+/* rmd160hl.c
+ * ----------------------------------------------------------------------------
+ * "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
+ * ----------------------------------------------------------------------------
+ *
+ * from OpenBSD: rmd160hl.c,v 1.2 1999/08/17 09:13:12 millert Exp $
+ */  
+
+#include "rmd160.h"
+
+#ifndef lint
+/* __RCSID("$NetBSD: rmd160hl.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $"); */
+#endif	/* not lint */
+
+/* #include "namespace.h" */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#if defined(HAVE_UNISTD_H)
+# include <unistd.h>
+#endif
+
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(cond)	assert(cond)
+#endif
+
+
+char *
+RMD160_End(RMD160_CTX *ctx, char *buf)
+{
+    size_t i;
+    char *p = buf;
+    uint8_t digest[20];
+    static const char hex[]="0123456789abcdef";
+
+    _DIAGASSERT(ctx != NULL);
+    /* buf may be NULL */
+
+    if (p == NULL && (p = malloc(41)) == NULL)
+	return 0;
+
+    RMD160_Final(digest,ctx);
+    for (i = 0; i < 20; i++) {
+	p[i + i] = hex[(uint32_t)digest[i] >> 4];
+	p[i + i + 1] = hex[digest[i] & 0x0f];
+    }
+    p[i + i] = '\0';
+    return(p);
+}
+
+char *
+RMD160_File(char *filename, char *buf)
+{
+    uint8_t buffer[BUFSIZ];
+    RMD160_CTX ctx;
+    int fd, num, oerrno;
+
+    _DIAGASSERT(filename != NULL);
+    /* XXX: buf may be NULL ? */
+
+    RMD160_Init(&ctx);
+
+    if ((fd = open(filename, O_RDONLY)) < 0)
+	return(0);
+
+    while ((num = read(fd, buffer, sizeof(buffer))) > 0)
+	RMD160_Update(&ctx, buffer, (size_t)num);
+
+    oerrno = errno;
+    close(fd);
+    errno = oerrno;
+    return(num < 0 ? 0 : RMD160_End(&ctx, buf));
+}
+
+char *
+RMD160_Data(const uint8_t *data, size_t len, char *buf)
+{
+    RMD160_CTX ctx;
+
+    _DIAGASSERT(data != NULL);
+    /* XXX: buf may be NULL ? */
+
+    RMD160_Init(&ctx);
+    RMD160_Update(&ctx, data, len);
+    return(RMD160_End(&ctx, buf));
+}
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index 763867df86..b16cdbbed8 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -8,33 +8,31 @@
 #include "rmd160.h"
 #endif
 
-static rb_digest_metadata_t rmd160 = {
-    RUBY_DIGEST_API_VERSION,
+static algo_t rmd160 = {
     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,
+    (hash_init_func_t)RMD160_Init,
+    (hash_update_func_t)RMD160_Update,
+    (hash_end_func_t)RMD160_End,
+    (hash_final_func_t)RMD160_Final,
+    (hash_equal_func_t)RMD160_Equal,
 };
 
-/*
- * 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;
+    ID id_metadata;
 
-    rb_require("digest");
+    rb_require("digest.so");
 
     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));
+    id_metadata = rb_intern("metadata");
+
+    rb_cvar_set(cDigest_RMD160, id_metadata,
+		Data_Wrap_Struct(rb_cObject, 0, 0, &rmd160), Qtrue);
 }
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
index f24e63e3d8..be66d81ff9 100644
--- a/ext/digest/rmd160/rmd160ossl.c
+++ b/ext/digest/rmd160/rmd160ossl.c
@@ -1,8 +1,45 @@
 /* $Id$ */
 
-#include "defs.h"
 #include "rmd160ossl.h"
+#include "defs.h"
+#include <assert.h>
+#include <stdlib.h>
+
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(cond)	assert(cond)
+#endif
+
+char *
+RMD160_End(RMD160_CTX *ctx, char *buf)
+{
+    size_t i;
+    char *p = buf;
+    uint8_t digest[20];
+    static const char hex[]="0123456789abcdef";
+
+    _DIAGASSERT(ctx != NULL);
+    /* buf may be NULL */
+
+    if (p == NULL && (p = malloc(41)) == NULL)
+	return 0;
+
+    RMD160_Final(digest,ctx);
+    for (i = 0; i < 20; i++) {
+	p[i + i] = hex[(uint32_t)digest[i] >> 4];
+	p[i + i + 1] = hex[digest[i] & 0x0f];
+    }
+    p[i + i] = '\0';
+    return(p);
+}
 
-void RMD160_Finish(RMD160_CTX *ctx, char *buf) {
-	RIPEMD160_Final((unsigned char *)buf, ctx);
+int RMD160_Equal(RMD160_CTX* pctx1, RMD160_CTX* pctx2) {
+	return pctx1->num == pctx2->num
+	  && pctx1->A == pctx2->A
+	  && pctx1->B == pctx2->B
+	  && pctx1->C == pctx2->C
+	  && pctx1->D == pctx2->D
+	  && pctx1->E == pctx2->E
+	  && pctx1->Nl == pctx2->Nl
+	  && pctx1->Nh == pctx2->Nh
+	  && memcmp(pctx1->data, pctx2->data, sizeof(pctx1->data)) == 0;
 }
diff --git a/ext/digest/rmd160/rmd160ossl.h b/ext/digest/rmd160/rmd160ossl.h
index 3df38a01c0..824a1bf32f 100644
--- a/ext/digest/rmd160/rmd160ossl.h
+++ b/ext/digest/rmd160/rmd160ossl.h
@@ -3,17 +3,18 @@
 #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_Final	RIPEMD160_Final
 
 #define RMD160_BLOCK_LENGTH		RIPEMD160_CBLOCK
 #define RMD160_DIGEST_LENGTH		RIPEMD160_DIGEST_LENGTH
 
-void RMD160_Finish(RMD160_CTX *ctx, char *buf);
+char *RMD160_End(RMD160_CTX *ctx, char *buf);
+int RMD160_Equal(RMD160_CTX *pctx1, RMD160_CTX *pctx2);
 
 #endif
diff --git a/ext/digest/sha1/MANIFEST b/ext/digest/sha1/MANIFEST
new file mode 100644
index 0000000000..2c49b577df
--- /dev/null
+++ b/ext/digest/sha1/MANIFEST
@@ -0,0 +1,9 @@
+MANIFEST
+extconf.rb
+sha1.c
+sha1.h
+sha1hl.c
+sha1init.c
+sha1ossl.c
+sha1ossl.h
+depend
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
index 61607844d0..a159f456d3 100644
--- a/ext/digest/sha1/depend
+++ b/ext/digest/sha1/depend
@@ -1,5 +1,7 @@
 sha1.o: sha1.c sha1.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
   $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
+sha1hl.o: sha1hl.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
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index 87b74c34af..c249a415ed 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -3,8 +3,7 @@
 
 require "mkmf"
 
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [ "sha1init.#{$OBJEXT}" ]
 
@@ -14,7 +13,7 @@ if !with_config("bundled-sha1") &&
     have_library("crypto") && have_header("openssl/sha.h")
   $objs << "sha1ossl.#{$OBJEXT}"
 else
-  $objs << "sha1.#{$OBJEXT}"
+  $objs << "sha1.#{$OBJEXT}" << "sha1hl.#{$OBJEXT}"
 end
 
 have_header("sys/cdefs.h")
@@ -23,6 +22,4 @@ have_header("inttypes.h")
 
 have_header("unistd.h")
 
-$preload = %w[digest]
-
 create_makefile("digest/sha1")
diff --git a/ext/digest/sha1/sha1.c b/ext/digest/sha1/sha1.c
index 6196ca6b82..1012ef8751 100644
--- a/ext/digest/sha1/sha1.c
+++ b/ext/digest/sha1/sha1.c
@@ -129,7 +129,9 @@ do_R4(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LON
 /*
  * 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])
+void SHA1_Transform(state, buffer)
+    uint32_t state[5];
+    const uint8_t buffer[64];
 {
     uint32_t a, b, c, d, e;
     CHAR64LONG16 *block;
@@ -199,7 +201,8 @@ void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
 /*
  * SHA1_Init - Initialize new context
  */
-void SHA1_Init(SHA1_CTX *context)
+void SHA1_Init(context)
+    SHA1_CTX *context;
 {
 
     _DIAGASSERT(context != 0);
@@ -217,7 +220,10 @@ void SHA1_Init(SHA1_CTX *context)
 /*
  * Run your data through this.
  */
-void SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len)
+void SHA1_Update(context, data, len)
+    SHA1_CTX *context;
+    const uint8_t *data;
+    size_t len;
 {
     uint32_t i, j;
 
@@ -244,7 +250,9 @@ void SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len)
 /*
  * Add padding and return the message digest.
  */
-void SHA1_Finish(SHA1_CTX* context, uint8_t digest[20])
+void SHA1_Final(digest, context)
+    uint8_t digest[20];
+    SHA1_CTX* context;
 {
     size_t i;
     uint8_t finalcount[8];
@@ -267,3 +275,9 @@ void SHA1_Finish(SHA1_CTX* context, uint8_t digest[20])
 		((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
     }
 }
+
+int SHA1_Equal(SHA1_CTX* pctx1, SHA1_CTX* pctx2) {
+	return memcmp(pctx1->count, pctx2->count, sizeof(pctx1->count)) == 0
+		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
+		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
+}
diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h
index 60e3b01fe2..2303cecc2b 100644
--- a/ext/digest/sha1/sha1.h
+++ b/ext/digest/sha1/sha1.h
@@ -20,17 +20,28 @@ typedef struct {
 } 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
+#define SHA1_Final	rb_Digest_SHA1_Final
+#define SHA1_Equal	rb_Digest_SHA1_Equal
+#ifndef _KERNEL
+#define SHA1_End	rb_Digest_SHA1_End
+#define SHA1_File	rb_Digest_SHA1_File
+#define SHA1_Data	rb_Digest_SHA1_Data
+#endif /* _KERNEL */
 #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]));
+void	SHA1_Final _((uint8_t digest[20], SHA1_CTX *context));
+int	SHA1_Equal _((SHA1_CTX *pctx1, SHA1_CTX *pctx2));
+#ifndef _KERNEL
+char	*SHA1_End _((SHA1_CTX *, char *));
+char	*SHA1_File _((char *, char *));
+char	*SHA1_Data _((const uint8_t *, size_t, char *));
+#endif /* _KERNEL */
 
 #define SHA1_BLOCK_LENGTH		64
 #define SHA1_DIGEST_LENGTH		20
diff --git a/ext/digest/sha1/sha1hl.c b/ext/digest/sha1/sha1hl.c
new file mode 100644
index 0000000000..d1a236b22c
--- /dev/null
+++ b/ext/digest/sha1/sha1hl.c
@@ -0,0 +1,102 @@
+/*	$NetBSD: sha1hl.c,v 1.2 2001/03/10 15:55:14 tron Exp $	*/
+/*	$RoughId: sha1hl.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
+/*	$Id$	*/
+
+/* sha1hl.c
+ * ----------------------------------------------------------------------------
+ * "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
+ * ----------------------------------------------------------------------------
+ */
+
+/* #include "namespace.h" */
+
+#include "sha1.h"
+#include <fcntl.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#if defined(HAVE_UNISTD_H)
+# include <unistd.h>
+#endif
+
+#if defined(LIBC_SCCS) && !defined(lint)
+/* __RCSID("$NetBSD: sha1hl.c,v 1.2 2001/03/10 15:55:14 tron Exp $"); */
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(cond)	assert(cond)
+#endif
+
+
+/* ARGSUSED */
+char *
+SHA1_End(ctx, buf)
+    SHA1_CTX *ctx;
+    char *buf;
+{
+    int i;
+    char *p = buf;
+    uint8_t digest[20];
+    static const char hex[]="0123456789abcdef";
+
+    _DIAGASSERT(ctx != NULL);
+    /* buf may be NULL */
+
+    if (p == NULL && (p = malloc(41)) == NULL)
+	return 0;
+
+    SHA1_Final(digest,ctx);
+    for (i = 0; i < 20; i++) {
+	p[i + i] = hex[((uint32_t)digest[i]) >> 4];
+	p[i + i + 1] = hex[digest[i] & 0x0f];
+    }
+    p[i + i] = '\0';
+    return(p);
+}
+
+char *
+SHA1_File (filename, buf)
+    char *filename;
+    char *buf;
+{
+    uint8_t buffer[BUFSIZ];
+    SHA1_CTX ctx;
+    int fd, num, oerrno;
+
+    _DIAGASSERT(filename != NULL);
+    /* XXX: buf may be NULL ? */
+
+    SHA1_Init(&ctx);
+
+    if ((fd = open(filename,O_RDONLY)) < 0)
+	return(0);
+
+    while ((num = read(fd, buffer, sizeof(buffer))) > 0)
+	SHA1_Update(&ctx, buffer, (size_t)num);
+
+    oerrno = errno;
+    close(fd);
+    errno = oerrno;
+    return(num < 0 ? 0 : SHA1_End(&ctx, buf));
+}
+
+char *
+SHA1_Data (data, len, buf)
+    const uint8_t *data;
+    size_t len;
+    char *buf;
+{
+    SHA1_CTX ctx;
+
+    _DIAGASSERT(data != NULL);
+    /* XXX: buf may be NULL ? */
+
+    SHA1_Init(&ctx);
+    SHA1_Update(&ctx, data, len);
+    return(SHA1_End(&ctx, buf));
+}
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index b2146f05a9..426afb7cd0 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -8,33 +8,31 @@
 #include "sha1.h"
 #endif
 
-static rb_digest_metadata_t sha1 = {
-    RUBY_DIGEST_API_VERSION,
+static algo_t sha1 = {
     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,
+    (hash_init_func_t)SHA1_Init,
+    (hash_update_func_t)SHA1_Update,
+    (hash_end_func_t)SHA1_End,
+    (hash_final_func_t)SHA1_Final,
+    (hash_equal_func_t)SHA1_Equal,
 };
 
-/*
- * 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");
- 
+    ID id_metadata;
+
+    rb_require("digest.so");
+
     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));
+    id_metadata = rb_intern("metadata");
+
+    rb_cvar_set(cDigest_SHA1, id_metadata,
+		Data_Wrap_Struct(rb_cObject, 0, 0, &sha1), Qtrue);
 }
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
index 452cf35084..b125128f82 100644
--- a/ext/digest/sha1/sha1ossl.c
+++ b/ext/digest/sha1/sha1ossl.c
@@ -1,10 +1,45 @@
 /* $Id$ */
 
-#include "defs.h"
 #include "sha1ossl.h"
+#include "defs.h"
+#include <assert.h>
+#include <stdlib.h>
 
-void
-SHA1_Finish(SHA1_CTX *ctx, char *buf)
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(cond)	assert(cond)
+#endif
+
+char *
+SHA1_End(SHA1_CTX *ctx, char *buf)
 {
-	SHA1_Final((unsigned char *)buf, ctx);
+    int i;
+    char *p = buf;
+    uint8_t digest[20];
+    static const char hex[]="0123456789abcdef";
+
+    _DIAGASSERT(ctx != NULL);
+    /* buf may be NULL */
+
+    if (p == NULL && (p = malloc(41)) == NULL)
+	return 0;
+
+    SHA1_Final(digest,ctx);
+    for (i = 0; i < 20; i++) {
+	p[i + i] = hex[((uint32_t)digest[i]) >> 4];
+	p[i + i + 1] = hex[digest[i] & 0x0f];
+    }
+    p[i + i] = '\0';
+    return(p);
+}
+
+int SHA1_Equal(SHA1_CTX* pctx1, SHA1_CTX* pctx2) {
+	return pctx1->num == pctx2->num
+	  && pctx1->h0 == pctx2->h0
+	  && pctx1->h1 == pctx2->h1
+	  && pctx1->h2 == pctx2->h2
+	  && pctx1->h3 == pctx2->h3
+	  && pctx1->h4 == pctx2->h4
+	  && pctx1->Nl == pctx2->Nl
+	  && pctx1->Nh == pctx2->Nh
+	  && memcmp(pctx1->data, pctx2->data, sizeof(pctx1->data)) == 0;
 }
diff --git a/ext/digest/sha1/sha1ossl.h b/ext/digest/sha1/sha1ossl.h
index 8f9984cc64..e8d7e74baf 100644
--- a/ext/digest/sha1/sha1ossl.h
+++ b/ext/digest/sha1/sha1ossl.h
@@ -3,18 +3,14 @@
 #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);
+char *SHA1_End(SHA1_CTX *ctx, char *buf);
+int SHA1_Equal(SHA1_CTX *pctx1, SHA1_CTX *pctx2);
 
 #endif
diff --git a/ext/digest/sha2/MANIFEST b/ext/digest/sha2/MANIFEST
new file mode 100644
index 0000000000..d94089e17b
--- /dev/null
+++ b/ext/digest/sha2/MANIFEST
@@ -0,0 +1,7 @@
+MANIFEST
+extconf.rb
+sha2.c
+sha2.h
+sha2hl.c
+sha2init.c
+depend
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
index 225d6ad52b..2587415fdc 100644
--- a/ext/digest/sha2/depend
+++ b/ext/digest/sha2/depend
@@ -1,5 +1,7 @@
 sha2.o: sha2.c sha2.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
   $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
+sha2hl.o: sha2hl.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/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index c084a51a64..c982aa64de 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -3,11 +3,11 @@
 
 require "mkmf"
 
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [
   "sha2.#{$OBJEXT}",
+  "sha2hl.#{$OBJEXT}",
   "sha2init.#{$OBJEXT}",
 ]
 
@@ -17,8 +17,12 @@ have_header("inttypes.h")
 
 have_header("unistd.h")
 
-$preload = %w[digest]
-
-if have_type("uint64_t", "defs.h", $defs.join(' '))
+if try_cpp(<<SRC, $defs.join(' '))
+#include "defs.h"
+#ifdef NO_UINT64_T
+  #error ** Cannot find a 64bit integer type - skipping the SHA2 module.
+#endif
+SRC
+then
   create_makefile("digest/sha2")
 end
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
deleted file mode 100644
index 52dd639f9b..0000000000
--- a/ext/digest/sha2/lib/sha2.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#--
-# 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/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c
index aca9ee926f..24a57ded0d 100644
--- a/ext/digest/sha2/sha2.c
+++ b/ext/digest/sha2/sha2.c
@@ -67,7 +67,7 @@ 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__)
+#if defined(__GNUC__) || defined(_HPUX_SOURCE)
 #define ULL(number)	number##ULL
 #else
 #define ULL(number)	(uint64_t)(number)
@@ -515,7 +515,7 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
 	usedspace = freespace = 0;
 }
 
-void SHA256_Finish(SHA256_CTX* context, sha2_byte digest[]) {
+void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
 	sha2_word32	*d = (sha2_word32*)digest;
 	unsigned int	usedspace;
 
@@ -578,6 +578,12 @@ void SHA256_Finish(SHA256_CTX* context, sha2_byte digest[]) {
 	usedspace = 0;
 }
 
+int SHA256_Equal(SHA256_CTX* pctx1, SHA256_CTX* pctx2) {
+	return pctx1->bitcount == pctx2->bitcount
+		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
+		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
+}
+
 /*** SHA-512: *********************************************************/
 void SHA512_Init(SHA512_CTX* context) {
 	if (context == (SHA512_CTX*)0) {
@@ -846,7 +852,7 @@ void SHA512_Last(SHA512_CTX* context) {
 	SHA512_Transform(context, (const sha2_word64*)context->buffer);
 }
 
-void SHA512_Finish(SHA512_CTX* context, sha2_byte digest[]) {
+void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
 	sha2_word64	*d = (sha2_word64*)digest;
 
 	/* Sanity check: */
@@ -875,6 +881,12 @@ void SHA512_Finish(SHA512_CTX* context, sha2_byte digest[]) {
 	MEMSET_BZERO(context, sizeof(SHA512_CTX));
 }
 
+int SHA512_Equal(SHA512_CTX* pctx1, SHA512_CTX* pctx2) {
+	return memcmp(pctx1->bitcount, pctx2->bitcount, sizeof(pctx1->bitcount)) == 0
+		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
+		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
+}
+
 /*** SHA-384: *********************************************************/
 void SHA384_Init(SHA384_CTX* context) {
 	if (context == (SHA384_CTX*)0) {
@@ -889,7 +901,7 @@ 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[]) {
+void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
 	sha2_word64	*d = (sha2_word64*)digest;
 
 	/* Sanity check: */
@@ -917,3 +929,9 @@ void SHA384_Finish(SHA384_CTX* context, sha2_byte digest[]) {
 	/* Zero out state data */
 	MEMSET_BZERO(context, sizeof(SHA384_CTX));
 }
+
+int SHA384_Equal(SHA384_CTX* pctx1, SHA384_CTX* pctx2) {
+	return memcmp(pctx1->bitcount, pctx2->bitcount, sizeof(pctx1->bitcount)) == 0
+		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
+		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
+}
diff --git a/ext/digest/sha2/sha2.h b/ext/digest/sha2/sha2.h
index 917d415b73..4689ad93ce 100644
--- a/ext/digest/sha2/sha2.h
+++ b/ext/digest/sha2/sha2.h
@@ -77,29 +77,53 @@ 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 SHA256_Final		rb_Digest_SHA256_Final
+#define SHA256_End		rb_Digest_SHA256_End
+#define SHA256_Data		rb_Digest_SHA256_Data
+#define SHA256_File		rb_Digest_SHA256_File
+#define SHA256_Equal		rb_Digest_SHA256_Equal
 
 #define SHA384_Init		rb_Digest_SHA384_Init
 #define SHA384_Update		rb_Digest_SHA384_Update
-#define SHA384_Finish		rb_Digest_SHA384_Finish
+#define SHA384_Final		rb_Digest_SHA384_Final
+#define SHA384_End		rb_Digest_SHA384_End
+#define SHA384_Data		rb_Digest_SHA384_Data
+#define SHA384_File		rb_Digest_SHA384_File
+#define SHA384_Equal		rb_Digest_SHA384_Equal
 
 #define SHA512_Init		rb_Digest_SHA512_Init
 #define SHA512_Update		rb_Digest_SHA512_Update
-#define SHA512_Finish		rb_Digest_SHA512_Finish
+#define SHA512_Final		rb_Digest_SHA512_Final
+#define SHA512_End		rb_Digest_SHA512_End
+#define SHA512_Data		rb_Digest_SHA512_Data
+#define SHA512_File		rb_Digest_SHA512_File
+#define SHA512_Equal		rb_Digest_SHA512_Equal
 #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 SHA256_Final _((uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*));
+char* SHA256_End _((SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]));
+char* SHA256_Data _((const uint8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]));
+char *SHA256_File _((char *, char *));
+int SHA256_Equal _((SHA256_CTX*, SHA256_CTX*));
 
 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 SHA384_Final _((uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*));
+char* SHA384_End _((SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]));
+char* SHA384_Data _((const uint8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]));
+char *SHA384_File _((char *, char *));
+int SHA384_Equal _((SHA384_CTX*, SHA384_CTX*));
 
 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]));
+void SHA512_Final _((uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*));
+char* SHA512_End _((SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]));
+char* SHA512_Data _((const uint8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]));
+char *SHA512_File _((char *, char *));
+int SHA512_Equal _((SHA512_CTX*, SHA512_CTX*));
 
 #ifdef	__cplusplus
 }
diff --git a/ext/digest/sha2/sha2hl.c b/ext/digest/sha2/sha2hl.c
new file mode 100644
index 0000000000..03fde538c3
--- /dev/null
+++ b/ext/digest/sha2/sha2hl.c
@@ -0,0 +1,252 @@
+/* $NetBSD: sha2hl.c,v 1.1 2001/03/12 09:08:40 agc Exp $	 */
+/* $RoughId: sha2hl.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
+/* $Id$ */
+
+/*
+ * sha2hl.c
+ * This code includes some functions taken from sha2.c, hence the
+ * following licence reproduction.
+ *
+ * This code is not a verbatim copy, since some routines have been added,
+ * and some bugs have been fixed.
+ *
+ * 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.
+ *
+ */
+
+#include "sha2.h"
+
+#ifndef lint
+/* __RCSID("$NetBSD: sha2hl.c,v 1.1 2001/03/12 09:08:40 agc Exp $"); */
+#endif				/* not lint */
+
+/* #include "namespace.h" */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#if defined(HAVE_UNISTD_H)
+# include <unistd.h>
+#endif
+
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(cond)	assert(cond)
+#endif
+
+/*
+ * Constant used by SHA256/384/512_End() functions for converting the
+ * digest to a readable hexadecimal character string:
+ */
+static const char sha2_hex_digits[] = "0123456789abcdef";
+
+char           *
+SHA256_File(char *filename, char *buf)
+{
+	uint8_t         buffer[BUFSIZ * 20];
+	SHA256_CTX      ctx;
+	int             fd, num, oerrno;
+
+	_DIAGASSERT(filename != NULL);
+	/* XXX: buf may be NULL ? */
+
+	SHA256_Init(&ctx);
+
+	if ((fd = open(filename, O_RDONLY)) < 0)
+		return (0);
+
+	while ((num = read(fd, buffer, sizeof(buffer))) > 0)
+		SHA256_Update(&ctx, buffer, (size_t) num);
+
+	oerrno = errno;
+	close(fd);
+	errno = oerrno;
+	return (num < 0 ? 0 : SHA256_End(&ctx, buf));
+}
+
+
+char           *
+SHA256_End(SHA256_CTX *ctx, char buffer[])
+{
+	uint8_t         digest[SHA256_DIGEST_LENGTH], *d = digest;
+	uint8_t	       *ret;
+	int             i;
+
+	/* Sanity check: */
+	assert(ctx != NULL);
+
+	if ((ret = buffer) != NULL) {
+		SHA256_Final(digest, ctx);
+
+		for (i = 0; i < SHA256_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char) 0;
+	} else {
+		(void) memset(ctx, 0, sizeof(SHA256_CTX));
+	}
+	(void) memset(digest, 0, SHA256_DIGEST_LENGTH);
+	return ret;
+}
+
+char           *
+SHA256_Data(const uint8_t * data, size_t len, char *digest)
+{
+	SHA256_CTX      ctx;
+
+	SHA256_Init(&ctx);
+	SHA256_Update(&ctx, data, len);
+	return SHA256_End(&ctx, digest);
+}
+
+char           *
+SHA384_File(char *filename, char *buf)
+{
+	SHA384_CTX      ctx;
+	uint8_t         buffer[BUFSIZ * 20];
+	int             fd, num, oerrno;
+
+	_DIAGASSERT(filename != NULL);
+	/* XXX: buf may be NULL ? */
+
+	SHA384_Init(&ctx);
+
+	if ((fd = open(filename, O_RDONLY)) < 0)
+		return (0);
+
+	while ((num = read(fd, buffer, sizeof(buffer))) > 0)
+		SHA384_Update(&ctx, buffer, (size_t) num);
+
+	oerrno = errno;
+	close(fd);
+	errno = oerrno;
+	return (num < 0 ? 0 : SHA384_End(&ctx, buf));
+}
+
+char           *
+SHA384_End(SHA384_CTX * ctx, char buffer[])
+{
+	uint8_t         digest[SHA384_DIGEST_LENGTH], *d = digest;
+	uint8_t	       *ret;
+	int             i;
+
+	/* Sanity check: */
+	assert(ctx != NULL);
+
+	if ((ret = buffer) != NULL) {
+		SHA384_Final(digest, ctx);
+
+		for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char) 0;
+	} else {
+		(void) memset(ctx, 0, sizeof(SHA384_CTX));
+	}
+	(void) memset(digest, 0, SHA384_DIGEST_LENGTH);
+	return ret;
+}
+
+char           *
+SHA384_Data(const uint8_t * data, size_t len, char *digest)
+{
+	SHA384_CTX      ctx;
+
+	SHA384_Init(&ctx);
+	SHA384_Update(&ctx, data, len);
+	return SHA384_End(&ctx, digest);
+}
+
+char           *
+SHA512_File(char *filename, char *buf)
+{
+	SHA512_CTX      ctx;
+	uint8_t         buffer[BUFSIZ * 20];
+	int             fd, num, oerrno;
+
+	_DIAGASSERT(filename != NULL);
+	/* XXX: buf may be NULL ? */
+
+	SHA512_Init(&ctx);
+
+	if ((fd = open(filename, O_RDONLY)) < 0)
+		return (0);
+
+	while ((num = read(fd, buffer, sizeof(buffer))) > 0)
+		SHA512_Update(&ctx, buffer, (size_t) num);
+
+	oerrno = errno;
+	close(fd);
+	errno = oerrno;
+	return (num < 0 ? 0 : SHA512_End(&ctx, buf));
+}
+
+char           *
+SHA512_End(SHA512_CTX * ctx, char buffer[])
+{
+	uint8_t         digest[SHA512_DIGEST_LENGTH], *d = digest;
+	uint8_t	       *ret;
+	int             i;
+
+	/* Sanity check: */
+	assert(ctx != NULL);
+
+	if ((ret = buffer) != NULL) {
+		SHA512_Final(digest, ctx);
+
+		for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char) 0;
+	} else {
+		(void) memset(ctx, 0, sizeof(SHA512_CTX));
+	}
+	(void) memset(digest, 0, SHA512_DIGEST_LENGTH);
+	return ret;
+}
+
+char           *
+SHA512_Data(const uint8_t * data, size_t len, char *digest)
+{
+	SHA512_CTX      ctx;
+
+	SHA512_Init(&ctx);
+	SHA512_Update(&ctx, data, len);
+	return SHA512_End(&ctx, digest);
+}
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
index c83a29316a..4b14031811 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -7,23 +7,18 @@
 #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, \
+static algo_t sha##bitlen = { \
     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, \
+    (hash_init_func_t)SHA##bitlen##_Init, \
+    (hash_update_func_t)SHA##bitlen##_Update, \
+    (hash_end_func_t)SHA##bitlen##_End, \
+    (hash_final_func_t)SHA##bitlen##_Final, \
+    (hash_equal_func_t)SHA##bitlen##_Equal, \
 };
 
 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()
 {
@@ -35,7 +30,7 @@ Init_sha2()
 
     FOREACH_BITLEN(DECLARE_ALGO_CLASS)
 
-    rb_require("digest");
+    rb_require("digest.so");
 
     id_metadata = rb_intern("metadata");
 
@@ -45,8 +40,8 @@ Init_sha2()
 #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));
+    rb_cvar_set(cDigest_SHA##bitlen, id_metadata, \
+		Data_Wrap_Struct(rb_cObject, 0, 0, &sha##bitlen), Qtrue);
 
     FOREACH_BITLEN(DEFINE_ALGO_CLASS)
 }
diff --git a/ext/digest/test.sh b/ext/digest/test.sh
index 328c7575e6..6fb07d2177 100644
--- a/ext/digest/test.sh
+++ b/ext/digest/test.sh
@@ -11,6 +11,8 @@ ${RUBY} extconf.rb --with-cflags="${CFLAGS}"
 ${MAKE} clean
 ${MAKE}
 
+mkdir -p lib/digest
+
 for algo in md5 rmd160 sha1 sha2; do
     args=--with-cflags="${CFLAGS}"
 
@@ -25,6 +27,7 @@ for algo in md5 rmd160 sha1 sha2; do
     ln -sf ../../$algo/$algo.so lib/digest/
 done
 
-${RUBY} -I. -I./lib ../../test/digest/test_digest.rb
+${RUBY} -I. -I./lib test.rb
 
 rm lib/digest/*.so
+rmdir lib/digest
diff --git a/ext/dl/MANIFEST b/ext/dl/MANIFEST
new file mode 100644
index 0000000000..d44344421d
--- /dev/null
+++ b/ext/dl/MANIFEST
@@ -0,0 +1,31 @@
+MANIFEST
+depend
+dl.c
+dl.def
+dl.h
+doc/dl.txt
+extconf.rb
+h2rb
+handle.c
+install.rb
+lib/dl/import.rb
+lib/dl/struct.rb
+lib/dl/types.rb
+lib/dl/win32.rb
+mkcall.rb
+mkcallback.rb
+mkcbtable.rb
+ptr.c
+sample/c++sample.C
+sample/c++sample.rb
+sample/drives.rb
+sample/getch.rb
+sample/libc.rb
+sample/msgbox.rb
+sample/msgbox2.rb
+sample/stream.rb
+sym.c
+test/libtest.def
+test/test.c
+test/test.rb
+type.rb
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
index e92db298f6..22abb754d2 100644
--- a/ext/dl/dl.c
+++ b/ext/dl/dl.c
@@ -147,7 +147,7 @@ dlstrdup(const char *str)
 {
   char *newstr;
 
-  newstr = (char*)dlmalloc(strlen(str)+1);
+  newstr = (char*)dlmalloc(strlen(str));
   strcpy(newstr,str);
 
   return newstr;
@@ -435,15 +435,7 @@ c_parray(VALUE v, long *size)
 	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);
-	}
+	rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
       }
       break;
     }
@@ -459,7 +451,7 @@ rb_ary2cary(char t, VALUE v, long *size)
   VALUE val0;
 
   val0 = rb_check_array_type(v);
-  if(NIL_P(val0)) {
+  if(NIL_P(TYPE(val0))) {
     rb_raise(rb_eDLTypeError, "an array is expected.");
   }
   v = val0;
@@ -503,12 +495,6 @@ rb_ary2cary(char t, VALUE v, long *size)
     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);
@@ -551,13 +537,13 @@ rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
 VALUE
 rb_io_to_ptr(VALUE self)
 {
-  rb_io_t *fptr;
+  OpenFile *fptr;
   FILE     *fp;
 
   GetOpenFile(self, fptr);
   fp = fptr->f;
 
-  return fp ? rb_dlptr_new(fp, 0, 0) : Qnil;
+  return fp ? rb_dlptr_new(fp, sizeof(FILE), 0) : Qnil;
 }
 
 VALUE
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index 69d47caac0..95b6dc74dc 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -66,12 +66,12 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
   ptr = dlopen(clib, cflag);
 #if defined(HAVE_DLERROR)
   if (!ptr && (err = dlerror())) {
-    rb_raise(rb_eRuntimeError, "%s", err);
+    rb_raise(rb_eRuntimeError, err);
   }
 #else
   if (!ptr) {
     err = dlerror();
-    rb_raise(rb_eRuntimeError, "%s", err);
+    rb_raise(rb_eRuntimeError, err);
   }
 #endif
   Data_Get_Struct(self, struct dl_handle, dlhandle);
@@ -161,7 +161,7 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
 
   Data_Get_Struct(self, struct dl_handle, dlhandle);
   if (!dlhandle->open) {
-    rb_raise(rb_eRuntimeError, "closed handle");
+    rb_raise(rb_eRuntimeError, "Closed handle.");
   }
   handle = dlhandle->ptr;
 
@@ -187,11 +187,11 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
       if (!func)
 #endif
       {
-	rb_raise(rb_eRuntimeError, "unknown symbol \"%sA\"", name);
+	rb_raise(rb_eRuntimeError, "Unknown symbol \"%sA\".", name);
       }
     }
 #else
-    rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", name);
+    rb_raise(rb_eRuntimeError, "Unknown symbol \"%s\".", name);
 #endif
   }
   val = rb_dlsym_new(func, name, stype);
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index 01ee2490e8..c0dfb5f705 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -9,11 +9,15 @@ module DL
 
     module Internal
       def init_types()
-	@types ||= ::DL::Types.new
+	if( !@types )
+	  @types = ::DL::Types.new
+	end
       end
 
       def init_sym()
-	@SYM ||= {}
+	if( !@SYM )
+	  @SYM = {}
+	end
       end
 
       def [](name)
@@ -38,10 +42,10 @@ module DL
 	case proto
 	when /^([\d\w\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
 	  ret = $1
-	  args = $2.strip()
+	  args = $2
 	  ret = ret.split(/\s+/)
 	  args = args.split(/\s*,\s*/)
-	  func = ret.pop()
+	  func = ret.pop
 	  if( func =~ /^\*/ )
 	    func.gsub!(/^\*+/,"")
 	    ret.push("*")
@@ -70,11 +74,8 @@ module DL
 	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)
+	rty,renc,rdec = @types.encode_type(ret)
+	ty,enc,dec = encode_types(args)
 	symty = rty + ty
 
 	module_eval("module_function :#{func}")
@@ -84,10 +85,10 @@ module DL
 	  "  args = enc.call(args) if enc",
 	  "  r,rs = #{func}(*args)",
 	  "  r  = renc.call(r) if rdec",
-	  "  rs = dec.call(rs) if (dec && rs)",
+	  "  rs = dec.call(rs) if dec",
 	  "  @retval = r",
 	  "  @args   = rs",
-	  "  r",
+	  "  @retval",
 	  "}",
 	].join("\n"))
 
@@ -99,10 +100,9 @@ module DL
       # example:
       #  typealias("uint", "unsigned int")
       #
-      def typealias(alias_type, ty1, enc1=nil, dec1=nil, ty2=nil, enc2=nil, dec2=nil)
+      def typealias(*args)
 	init_types()
-	@types.typealias(alias_type, ty1, enc1, dec1,
-                                     ty2||ty1, enc2, dec2)
+	@types.typealias(*args)
       end
 
       # example:
@@ -135,11 +135,8 @@ module DL
 	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)
+	rty,_,rdec = @types.encode_type(rettype)
+	ty,enc,dec = encode_types(argtypes)
 	symty = rty + ty
 
 	sym = symbol(name, symty)
@@ -169,7 +166,7 @@ module DL
 	  "  rs = dec.call(rs) if dec",
 	  "  @retval = r",
 	  "  @args   = rs",
-	  "  return r",
+	  "  return @retval",
 	  "end",
 	  "module_function :#{mname}",
 	].join("\n")
@@ -185,16 +182,13 @@ module DL
 	return @retval
       end
 
-      def encode_argument_types(tys)
+      def encode_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
+	  ty,c1,c2,_,_ = @types.encode_type(ty)
 	  encty.push(ty)
 	  if( enc )
 	    if( c1 )
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index 33f303fe22..2c52d5040d 100644
--- a/ext/dl/lib/dl/struct.rb
+++ b/ext/dl/lib/dl/struct.rb
@@ -33,7 +33,7 @@ module DL
 	      "def #{name}",
 	      "  v = @ptr[\"#{name}\"]",
 	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @dec[\"#{name}\"] ? @dec[\"#{name}\"].call(x) : x }",
+	      "    v = v.collect{|x| @dec[\"#{name}\"].call(x) if @dec[\"#{name}\"] }",
               "  else",
 	      "    v = @dec[\"#{name}\"].call(v) if @dec[\"#{name}\"]",
 	      "  end",
@@ -41,7 +41,7 @@ module DL
 	      "end",
 	      "def #{name}=(v)",
 	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @enc[\"#{name}\"] ? @enc[\"#{name}\"].call(x) : x }",
+	      "    v = v.collect{|x| @enc[\"#{name}\"].call(x) if @enc[\"#{name}\"] }",
 	      "  else",
 	      "    v = @enc[\"#{name}\"].call(v) if @enc[\"#{name}\"]",
               "  end",
@@ -128,10 +128,7 @@ module DL
 	  else
 	    raise(RuntimeError, "invalid element: #{elem}")
 	  end
-	  ty,enc,dec = @types.encode_struct_type(ty)
-          if( !ty )
-            raise(TypeError, "unsupported type: #{ty}")
-          end
+	  ty,_,_,enc,dec = @types.encode_type(ty)
 	  return [name,ty,num,enc,dec]
 	end
       end  # class Struct
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
index 1144917dae..b9a235f3b4 100644
--- a/ext/dl/lib/dl/types.rb
+++ b/ext/dl/lib/dl/types.rb
@@ -6,240 +6,174 @@ 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)
+      # ["alias name", "type name",
+      #    encoding_method, decoding_method,   for function prototypes
+      #    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],
+      ["DWORD",  "unsigned long", nil, nil, nil, nil],
+      ["PDWORD", "unsigned long *", nil, nil, nil, nil],
+      ["WORD",   "unsigned short", nil, nil, nil, nil],
+      ["PWORD",  "unsigned int *", nil, nil, nil, nil],
+      ["BYTE",   "unsigned char",   nil, nil, nil, nil],
+      ["PBYTE",  "unsigned char *", nil, nil, nil, nil],
+      ["BOOL",   "ibool", nil, nil, nil, nil],
+      ["ATOM",   "int", nil, nil, nil, nil],
+      ["BYTE",   "unsigned char", nil, nil, nil, nil],
+      ["PBYTE",  "unsigned char *", nil, nil, nil, nil],
+      ["UINT",   "unsigned int", nil, nil, nil, nil],
+      ["ULONG",  "unsigned long", nil, nil, nil, nil],
+      ["UCHAR",  "unsigned char", nil, nil, nil, nil],
+      ["HANDLE", "unsigned long", nil, nil, nil, nil],
+      ["PHANDLE","void*", nil, nil, nil, nil],
+      ["PVOID",  "void*", nil, nil, nil, nil],
+      ["LPCSTR", "char*", nil, nil, nil, nil],
+      ["HDC",    "unsigned int", nil, nil, nil, nil],
+      ["HWND",   "unsigned int", nil, nil, 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],
+      ["uint",   "unsigned int", nil, nil, nil, nil],
+      ["u_int",  "unsigned int", nil, nil, nil, nil],
+      ["ulong",  "unsigned long", nil, nil, nil, nil],
+      ["u_long", "unsigned long", nil, nil, nil, nil],
 
       # DL::Importable primitive types
-      ["ibool",
-        "I",
+      ["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",
+      ["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",
+      ["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",
+      ["unsigned char", "I",
 	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",
+      ["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",
+      ["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",
+      ["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",
+      ["unsigned char ref", "i",
 	proc{|v| [v].pack("C").unpack("c")[0]},
 	proc{|v| [v].pack("c").unpack("C")[0]},
-	nil, nil, nil],
-      ["unsigned int ref",
-        "i",
+	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",
+	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],
+	nil, nil],
+      ["char ref",  "c", nil, nil, nil, nil],
+      ["short ref", "h", nil, nil, nil, nil],
+      ["int ref",   "i", nil, nil, nil, nil],
+      ["long ref",  "l", nil, nil, nil, nil],
+      ["float ref", "f", nil, nil, nil, nil],
+      ["double ref","d", nil, nil, nil, nil],
+      ["char",   "C", nil, nil, nil, nil],
+      ["short",  "H", nil, nil, nil, nil],
+      ["int",    "I", nil, nil, nil, nil],
+      ["long",   "L", nil, nil, nil, nil],
+      ["float",  "F", nil, nil, nil, nil],
+      ["double", "D", nil, nil, nil, nil],
+      [/^char\s*\*$/,"S",nil, nil, nil, nil],
+      [/^.+\*$/,   "P", nil, nil, nil, nil],
+      [/^.+\[\]$/, "a", nil, nil, nil, nil],
+      ["void",   "0", 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])
+    def typealias(ty1, ty2, enc=nil, dec=nil, senc=nil, sdec=nil)
+      @TYDEFS.unshift([ty1,ty2, enc,dec, 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))}
+    def encode_type(ty)
+      orig_ty = ty
+      enc = nil
+      dec = nil
+      senc = nil
+      sdec = nil
+      @TYDEFS.each{|t1,t2,c1,c2,c3,c4|
+#	if( t1.is_a?(String) )
+#	  t1 = Regexp.new("^" + t1 + "$")
+#	end
+	if( (t1.is_a?(Regexp) && (t1 =~ ty)) || (t1 == ty) )
+	  ty = ty.gsub(t1,t2)
+	  if( enc )
+	    if( c1 )
+	      conv1 = enc
+	      enc = proc{|v| c1.call(conv1.call(v))}
 	    end
 	  else
-	    if( enc )
-	      proc_encode = enc
+	    if( c1 )
+	      enc = c1
 	    end
 	  end
-	  if( proc_decode )
-	    if( dec )
-	      conv2 = proc_decode
-	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	  if( dec )
+	    if( c2 )
+	      conv2 = dec
+	      dec = proc{|v| c2.call(conv2.call(v))}
 	    end
 	  else
-	    if( dec )
-	      proc_decode = dec
+	    if( c2 )
+	      dec = c2
 	    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))}
+	  if( senc )
+	    if( c3 )
+	      conv3 = senc
+	      senc = proc{|v| c3.call(conv3.call(v))}
 	    end
 	  else
-	    if( enc )
-	      proc_encode = enc
+	    if( c3 )
+	      senc = c3
 	    end
 	  end
-	  if( proc_decode )
-	    if( dec )
-	      conv2 = proc_decode
-	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	  if( sdec )
+	    if( c4 )
+	      conv4 = sdec
+	      sdec = proc{|v| c4.call(conv4.call(v))}
 	    end
 	  else
-	    if( dec )
-	      proc_decode = dec
+	    if( c4 )
+	      sdec = c4
 	    end
 	  end
 	end
       }
-      return [alias_type, proc_encode, proc_decode]
+      ty = ty.strip
+      if( ty.length != 1 )
+	raise(TypeError, "unknown type: #{orig_ty}.")
+      end
+      return [ty,enc,dec,senc,sdec]
     end
   end # end of Types
 end
diff --git a/ext/dl/lib/dl/win32.rb b/ext/dl/lib/dl/win32.rb
index 0fed47c324..92f473d392 100644
--- a/ext/dl/lib/dl/win32.rb
+++ b/ext/dl/lib/dl/win32.rb
@@ -6,7 +6,7 @@ class Win32API
   DLL = {}
 
   def initialize(dllname, func, import, export = "0")
-    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
+    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI")
     handle = DLL[dllname] ||= DL::Handle.new(dllname)
     @sym = handle.sym(func, prototype)
   end
diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
index c9f92e4a0d..b7ea1718d0 100644
--- a/ext/dl/mkcallback.rb
+++ b/ext/dl/mkcallback.rb
@@ -31,9 +31,6 @@ def mkfunc(rettype, fnum, argc)
     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);",
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c
index 01eb31da20..32f78c4de5 100644
--- a/ext/dl/ptr.c
+++ b/ext/dl/ptr.c
@@ -4,22 +4,30 @@
 
 #include <ruby.h>
 #include <ctype.h>
-#include "st.h"
+#include <version.h> /* for ruby version code */
 #include "dl.h"
 
 VALUE rb_cDLPtrData;
 VALUE rb_mDLMemorySpace;
-static st_table* st_memory_table;
+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);
-  st_delete(st_memory_table, (st_data_t*)&ptr, NULL);
+  rb_hash_delete(DLMemoryTable, DLLONG2NUM(ptr));
 }
 
 static void
@@ -29,7 +37,7 @@ rb_dlmem_aset(void *ptr, VALUE obj)
     rb_dlmem_delete(ptr);
   }
   else{
-    st_insert(st_memory_table, (st_data_t)ptr, (st_data_t)obj);
+    rb_hash_aset(DLMemoryTable, DLLONG2NUM(ptr), DLLONG2NUM(obj));
   }
 }
 
@@ -38,8 +46,8 @@ rb_dlmem_aref(void *ptr)
 {
   VALUE val;
 
-  if(!st_lookup(st_memory_table, (st_data_t)ptr, &val)) return Qnil;
-  return val == Qundef ? Qnil : val;
+  val = rb_hash_aref(DLMemoryTable, DLLONG2NUM(ptr));
+  return val == Qnil ? Qnil : (VALUE)DLNUM2LONG(val);
 }
 
 void
@@ -336,7 +344,7 @@ rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
       n = data->size / sizeof(void*);
       break;
     case 'S': case 's':
-      n = data->size / sizeof(char*);
+      for (n=0; ((void**)(data->ptr))[n]; n++) {};
       break;
     default:
 	n = 0;
@@ -458,9 +466,8 @@ rb_dlptr_inspect(VALUE self)
   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);
+  snprintf(str, 1023, "#<%s:0x%p ptr=0x%p size=%ld free=0x%p>",
+	   rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free);
   return rb_str_new2(str);
 }
 
@@ -746,32 +753,32 @@ rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
   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) {
+	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]);
+	}
 	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
       }
       switch (data->stype[i]) {
@@ -876,35 +883,34 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
   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) {
+	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]);
+	}
 	memimg = ary2cary(data->stype[i], val, &memsize);
 	memcpy((char *)data->ptr + offset, memimg, memsize);
-        dlfree(memimg);
 	return val;
       }
       switch (data->stype[i]) {
@@ -975,7 +981,6 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
 	}
 	memimg = ary2cary(data->stype[i], val, NULL);
 	memcpy(data->ptr, memimg, memsize);
-        dlfree(memimg);
       }
     }
     return val;
@@ -1002,18 +1007,20 @@ rb_dlptr_size(int argc, VALUE argv[], VALUE self)
   }
 }
 
-static int
-dlmem_each_i(void* key, VALUE value, void* arg)
+static VALUE
+dlmem_each_i(VALUE assoc, void *data)
 {
-  VALUE vkey = DLLONG2NUM(key);
-  rb_yield(rb_assoc_new(vkey, value));
+  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)
 {
-  st_foreach(st_memory_table, dlmem_each_i, 0);
+  rb_iterate(rb_each, DLMemoryTable, dlmem_each_i, 0);
   return Qnil;
 }
 
@@ -1052,7 +1059,7 @@ Init_dlptr()
   rb_define_method(rb_cDLPtrData, "size=", rb_dlptr_size, -1);
 
   rb_mDLMemorySpace = rb_define_module_under(rb_mDL, "MemorySpace");
-  st_memory_table = st_init_numtable();
-  rb_define_const(rb_mDLMemorySpace, "MemoryTable", Qnil); /* historical */
+  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/ext/dl/sym.c b/ext/dl/sym.c
index 01e0474f58..a4dfbffce4 100644
--- a/ext/dl/sym.c
+++ b/ext/dl/sym.c
@@ -154,9 +154,8 @@ rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
   rb_scan_args(argc, argv, "12", &addr, &name, &type);
 
   saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
-  if (!NIL_P(name)) StringValue(name);
+  sname = NIL_P(name) ? NULL : StringValuePtr(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);
@@ -268,7 +267,7 @@ rb_dlsym_inspect(VALUE self)
   str_size = RSTRING(proto)->len + 100;
   str = dlmalloc(str_size);
   snprintf(str, str_size - 1,
-          "#<DL::Symbol:0x%lx func=0x%lx '%s'>",
+	   "#<DL::Symbol:0x%p func=0x%p '%s'>",
 	   sym, sym->func, RSTRING(proto)->ptr);
   val = rb_tainted_str_new2(str);
   dlfree(str);
@@ -520,11 +519,11 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
       PUSH_P(ftype);
       break;
     case 'H':
-      ANY2H(args[i]) = DLSHORT(NUM2INT(argv[i]));
+      ANY2H(args[i]) = DLSHORT(NUM2CHR(argv[i]));
       PUSH_C(ftype);
       break;
     case 'h':
-      ANY2H(dargs[i]) = DLSHORT(NUM2INT(argv[i]));
+      ANY2H(dargs[i]) = DLSHORT(NUM2CHR(argv[i]));
       ANY2P(args[i]) = DLVOIDP(&(ANY2H(dargs[i])));
       dtypes[i] = 'h';
       PUSH_P(ftype);
@@ -941,7 +940,6 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
     }
   }
 
-  FREE_ARGS;
 #undef FREE_ARGS
   return rb_assoc_new(val,dvals);
 }
diff --git a/ext/dl/test/test.rb b/ext/dl/test/test.rb
index bf8dfc18e3..52be04699f 100644
--- a/ext/dl/test/test.rb
+++ b/ext/dl/test/test.rb
@@ -273,7 +273,7 @@ assert("data_aref", :must,
 
 GC.start
 
-ptr = DL::malloc(32)
+ptr = DL::malloc(1024)
 ptr.struct!("CHIL", "c", "h", "i", "l")
 ptr["c"] = 1
 ptr["h"] = 2
@@ -291,16 +291,5 @@ 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/ext/enumerator/.cvsignore b/ext/enumerator/.cvsignore
new file mode 100644
index 0000000000..fc802ff1c2
--- /dev/null
+++ b/ext/enumerator/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+mkmf.log
diff --git a/ext/enumerator/MANIFEST b/ext/enumerator/MANIFEST
new file mode 100644
index 0000000000..b1ab0ba8e2
--- /dev/null
+++ b/ext/enumerator/MANIFEST
@@ -0,0 +1,3 @@
+MANIFEST
+enumerator.c
+enumerator.txt
diff --git a/ext/enumerator/enumerator.c b/ext/enumerator/enumerator.c
new file mode 100644
index 0000000000..8c3c566178
--- /dev/null
+++ b/ext/enumerator/enumerator.c
@@ -0,0 +1,201 @@
+/************************************************
+
+  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"
+
+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;
+
+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);
+}
+
+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;
+}
+
+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);
+
+    rb_gc_force_recycle((VALUE)memo);
+    return Qnil;
+}
+
+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;
+    long len = RARRAY(ary)->len;
+
+    if (len == size) {
+	rb_ary_shift(ary);
+	rb_ary_push(ary, val);
+	rb_yield(ary);
+    } else {
+	rb_ary_push(ary, val);
+	if (len + 1 == size) rb_yield(ary);
+    }
+    return Qnil;
+}
+
+static VALUE
+enum_each_cons(obj, n)
+    VALUE obj, n;
+{
+    long size = NUM2LONG(n);
+    NODE *memo;
+    VALUE ary;
+
+    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);
+
+    rb_gc_force_recycle((VALUE)memo);
+    return Qnil;
+}
+
+static VALUE
+enumerator_enum_cons(obj, n)
+    VALUE obj, n;
+{
+    return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_cons, n);
+}
+
+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);
+}
+
+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);
+    rb_gc_force_recycle(obj);
+    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/ext/enumerator/enumerator.txt b/ext/enumerator/enumerator.txt
new file mode 100644
index 0000000000..64c7d50226
--- /dev/null
+++ b/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/ext/etc/MANIFEST b/ext/etc/MANIFEST
new file mode 100644
index 0000000000..62cf5be233
--- /dev/null
+++ b/ext/etc/MANIFEST
@@ -0,0 +1,6 @@
+MANIFEST
+etc.c
+etc.txt
+etc.txt.ja
+depend
+extconf.rb
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index ecb9e16411..c42f279d58 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -23,10 +23,6 @@
 #include <grp.h>
 #endif
 
-#ifndef HAVE_TYPE_UID_T
-#define uid_t int
-#endif
-
 static VALUE sPasswd, sGroup;
 
 #ifndef _WIN32
@@ -34,13 +30,6 @@ char *getenv();
 #endif
 char *getlogin();
 
-/* Returns the short user name of the currently logged in user.
- * Unfortunately, it is often rather easy to fool getlogin().
- * Avoid getlogin() for security-related purposes.
- *
- * e.g.
- *   Etc.getlogin -> 'guest'
- */
 static VALUE
 etc_getlogin(obj)
     VALUE obj;
@@ -81,21 +70,21 @@ setup_passwd(pwd)
 #ifdef HAVE_ST_PW_PASSWD
 			 safe_setup_str(pwd->pw_passwd),
 #endif
-			 PW_UID2VAL(pwd->pw_uid),
-			 PW_GID2VAL(pwd->pw_gid),
+			 INT2FIX(pwd->pw_uid),
+			 INT2FIX(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),
+			 INT2FIX(pwd->pw_change),
 #endif
 #ifdef HAVE_ST_PW_QUOTA
-			 INT2NUM(pwd->pw_quota),
+			 INT2FIX(pwd->pw_quota),
 #endif
 #ifdef HAVE_ST_PW_AGE
-			 PW_AGE2VAL(pwd->pw_age),
+			 INT2FIX(pwd->pw_age),
 #endif
 #ifdef HAVE_ST_PW_CLASS
 			 safe_setup_str(pwd->pw_class),
@@ -104,22 +93,13 @@ setup_passwd(pwd)
 			 safe_setup_str(pwd->pw_comment),
 #endif
 #ifdef HAVE_ST_PW_EXPIRE
-			 INT2NUM(pwd->pw_expire),
+			 INT2FIX(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;
@@ -128,12 +108,12 @@ etc_getpwuid(argc, argv, obj)
 {
 #if defined(HAVE_GETPWENT)
     VALUE id;
-    uid_t uid;
+    int uid;
     struct passwd *pwd;
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &id) == 1) {
-	uid = PW_VAL2UID(id);
+	uid = NUM2INT(id);
     }
     else {
 	uid = getuid();
@@ -146,14 +126,6 @@ etc_getpwuid(argc, argv, obj)
 #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;
@@ -193,21 +165,6 @@ passwd_iterate()
 }
 #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;
@@ -230,9 +187,6 @@ etc_passwd(obj)
     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;
@@ -243,9 +197,6 @@ etc_setpwent(obj)
     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;
@@ -256,32 +207,6 @@ etc_endpwent(obj)
     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;
@@ -315,31 +240,21 @@ setup_group(grp)
 #ifdef HAVE_ST_GR_PASSWD
 			 safe_setup_str(grp->gr_passwd),
 #endif
-			 PW_GID2VAL(grp->gr_gid),
+			 INT2FIX(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;
+    int gid;
     struct group *grp;
 
     rb_secure(4);
-    gid = PW_VAL2GID(id);
+    gid = NUM2INT(id);
     grp = getgrgid(gid);
     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
     return setup_group(grp);
@@ -348,16 +263,6 @@ etc_getgrgid(obj, id)
 #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;
@@ -398,21 +303,6 @@ group_iterate()
 }
 #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;
@@ -435,9 +325,6 @@ etc_group(obj)
     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;
@@ -448,9 +335,6 @@ etc_setgrent(obj)
     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;
@@ -461,26 +345,6 @@ etc_endgrent(obj)
     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;
@@ -497,11 +361,6 @@ etc_getgrent(obj)
 
 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()
 {
@@ -523,7 +382,6 @@ Init_etc()
     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
@@ -549,13 +407,10 @@ Init_etc()
 				"expire",
 #endif
 				NULL);
+    rb_global_variable(&sPasswd);
 
 #ifdef HAVE_GETGRENT
+    sGroup = rb_struct_define("Group", "name", "passwd", "gid", "mem", NULL);
     rb_global_variable(&sGroup);
-    sGroup = rb_struct_define("Group", "name",
-#ifdef HAVE_ST_GR_PASSWD
-			      "passwd",
-#endif
-			      "gid", "mem", NULL);
 #endif
 }
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index dbd0672545..16f2da352b 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -8,36 +8,11 @@ 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_age', 'pwd.h')
   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/ext/extmk.rb b/ext/extmk.rb
index 64746552c1..fe777a4ceb 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -1,19 +1,13 @@
 #! /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
 
@@ -22,76 +16,26 @@ alias $PROGRAM_NAME $0
 alias $0 $progname
 
 $extlist = []
-$compiled = {}
 
-$:.replace([Dir.pwd])
+$:.replace ["."]
 require 'rbconfig'
 
-srcdir = File.dirname(File.dirname(__FILE__))
+srcdir = Config::CONFIG["srcdir"]
 
-$:.unshift(srcdir, File.expand_path("lib", srcdir))
-
-$topdir = "."
-$top_srcdir = srcdir
+$:.replace [srcdir, srcdir+"/lib", "."]
 
 require 'mkmf'
-require 'optparse/shellwords'
+require 'getopts'
+
+$topdir = File.expand_path(".")
+$top_srcdir = srcdir
+$hdrdir = $top_srcdir
 
 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
@@ -105,63 +49,28 @@ def extmake(target)
     return true if $nodynamic and not $static
   end
 
-  FileUtils.mkpath target unless File.directory?(target)
+  init_mkmf
+
   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 = {
-	"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 $static ||
+	 !(t = modified?(makefile, MTIMES)) ||
+	 %W<#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb
+	    #{$srcdir}/depend #{$srcdir}/MANIFEST>.any? {|f| modified?(f, [t])}
+      then
+	$defs = []
+	Logging::logfile 'mkmf.log'
+	Config::CONFIG["srcdir"] = $srcdir
+	rm_f makefile
+	begin
 	  if File.exist?($0 = "#{$srcdir}/makefile.rb")
 	    load $0
 	  elsif File.exist?($0 = "#{$srcdir}/extconf.rb")
@@ -169,140 +78,67 @@ def extmake(target)
 	  else
 	    create_makefile(target)
 	  end
-	  $defs << "-DRUBY_EXPORT" if $static
-	  ok = File.exist?(makefile)
+	  File.exist?(makefile)
+	rescue SystemExit
+	  # ignore
+	ensure
+	  rm_f "conftest*"
+	  $0 = $PROGRAM_NAME
+	  Config::CONFIG["srcdir"] = $top_srcdir
 	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"])
+      else
+	true
       end
+    else
+      File.exist?(makefile)
+    end or open(makefile, "w") do |f|
+      f.print dummy_makefile($srcdir)
       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
+      args += ["static"]
       $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)
+      $extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty?
+      $extflags += " " + $LDFLAGS unless $LDFLAGS.empty?
+      $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
+  getopts('n', 'extstatic:', 'dest-dir:',
+	  'make:', 'make-flags:', 'mflags:')
+
+  $dryrun = $OPT['n']
+  $force_static = $OPT['extstatic'] == 'static'
+  $destdir = $OPT['dest-dir'] || ''
+  $make = $OPT['make'] || $make || 'make'
+  mflags = ($OPT['make-flags'] || '').strip
+  mflags = ($OPT['mflags'] || '').strip if mflags.empty?
+
+  $mflags = Shellwords.shellwords(mflags)
+  if arg = $mflags.first
+    arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
   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-(?!-).*#{flag.chr}/i) { return true }
-    false
-  end
-  def $mflags.defined?(var)
-    grep(/\A#{var}=(.*)/) {return $1}
+    grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
     false
   end
 
@@ -313,34 +149,25 @@ def parse_args()
   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
+  $mflags |= ["DESTDIR=#{$destdir}"]
 end
 
 parse_args()
 
-if target = ARGV.shift and /^[a-z-]+$/ =~ target
-  $mflags.push(target)
-  case target
-  when /^(dist|real)?(clean)$/
-    target = $2
-    $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('-', ' ')
+  if $message = ARGV.shift and /^[a-z]+$/ =~ $message
+    $mflags.push($message)
+    $message = $message.sub(/^(?:dist|real)(?=(?:clean)?$)/, '\1')
+    case $message
+    when "clean"
+      $ignore ||= true
+    when "install"
+      $ignore ||= true
+      $mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
+		      "INSTALL_DATA=install -c -p -m 0644",
+		      "MAKEDIRS=mkdir -p") if $dryrun
+    end
+    $message.sub!(/e?$/, "ing")
   else
     $message = "compiling"
   end
@@ -349,36 +176,22 @@ end
 EXEEXT = CONFIG['EXEEXT']
 if CROSS_COMPILING
   $ruby = CONFIG['MINIRUBY']
-elsif sep = config_string('BUILD_FILE_SEPARATOR')
-  $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
+elsif $nmake
+  $ruby = '$(topdir:/=\\)\\miniruby' + EXEEXT
 else
   $ruby = '$(topdir)/miniruby' + EXEEXT
 end
-$ruby << " -I'$(topdir)'"
-unless CROSS_COMPILING
-  $ruby << " -I'$(top_srcdir)/lib'"
-  $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
-  $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
-  ENV["RUBYLIB"] = "-"
-  ENV["RUBYOPT"] = "-rpurelib.rb"
-end
+$ruby << " -I$(topdir) -I$(hdrdir)/lib"
 $config_h = '$(topdir)/config.h'
-$mflags << "ruby=#$ruby"
 
-MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
+MTIMES = [__FILE__, 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)
+    f = open(setup) 
     while line = f.gets()
       line.chomp!
       line.sub!(/#.*$/, '')
@@ -392,135 +205,64 @@ for dir in ["ext", File::join($top_srcdir, "ext")]
 	next
       end
       target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
-      $static_ext[target] = $static_ext.size
+      $static_ext[target] = true
     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
+ext_prefix = "#{$top_srcdir}/ext"
+Dir.glob("#{ext_prefix}/*/**/MANIFEST") do |d|
+  d = File.dirname(d)
+  d.slice!(0, ext_prefix.length + 1)
+  extmake(d) or exit(1)
 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
-    if $extout
-      FileUtils.rm_rf([extout+"/common", extout+"/include/ruby", extout+"/rdoc"])
-      FileUtils.rm_rf(extout+"/"+CONFIG["arch"])
-      if $clean != true
-	FileUtils.rm_rf(extout+"/include/"+CONFIG["arch"])
-	FileUtils.rm_f($mflags.defined?("INSTALLED_LIST")||ENV["INSTALLED_LIST"]||".installed.list")
-	Dir.rmdir(extout+"/include") rescue nil
-	Dir.rmdir(extout) rescue nil
-      end
-    end
-  end
   exit
 end
 
-$extinit ||= ""
-$extobjs ||= ""
-$extpath ||= []
-$extflags ||= ""
-$extlibs ||= []
-unless $extlist.empty?
-  $extinit << "\n" unless $extinit.empty?
+if $extlist.size > 0
+  $extinit ||= ""
+  $extobjs ||= ""
   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
+  until list.empty?
+    s,t,i,r = list.shift
+    if r and list.any? {|l| r.include?(l[1])}
+      list << [s,t,i]
       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
+      $extinit += "\tinit(Init_#{i}, \"#{t}.so\");\n"
+      $extobjs += "ext/#{f} "
     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}
+  src = <<SRC
+extern char *ruby_sourcefile, *rb_source_filename();
+#define init(func, name) (ruby_sourcefile = src = rb_source_filename(name), func(), rb_provide(src))
+void Init_ext() {\n\tchar* src;\n#$extinit}
+SRC
+  if !modified?("extinit.c", MTIMES) || IO.read("extinit.c") != src
+    open("extinit.c", "w") {|f| f.print src}
   end
 
-  $extobjs = "ext/#{extinit.o} #{$extobjs}"
+  $extobjs = "ext/extinit.#{$OBJEXT} " + $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],
+    ['SETUP', $setup], [$enable_shared ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
     ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
   ].map {|n, v|
     "#{n}=#{v}" if v and !(v = v.strip).empty?
@@ -528,38 +270,20 @@ void Init_ext _((void))\n{\n#$extinit}
   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
+%w[RUBY RUBYW].each {|r|
+  config_string(r+"_INSTALL_NAME") {|r| rubies << r+EXEEXT}
 }
 
 Dir.chdir ".."
-unless $destdir.to_s.empty?
-  $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
+if $extlist.size > 0
+  rm_f(Config::CONFIG["LIBRUBY_SO"])
 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:
diff --git a/ext/fcntl/MANIFEST b/ext/fcntl/MANIFEST
new file mode 100644
index 0000000000..aef7ad4ca0
--- /dev/null
+++ b/ext/fcntl/MANIFEST
@@ -0,0 +1,3 @@
+MANIFEST
+depend
+fcntl.c
diff --git a/ext/fcntl/extconf.rb b/ext/fcntl/extconf.rb
deleted file mode 100644
index 8b717d4a5b..0000000000
--- a/ext/fcntl/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('fcntl')
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 57cca103f4..d48630fc66 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -34,81 +34,6 @@ 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()
 {
diff --git a/ext/gdbm/MANIFEST b/ext/gdbm/MANIFEST
new file mode 100644
index 0000000000..1359b4fdaf
--- /dev/null
+++ b/ext/gdbm/MANIFEST
@@ -0,0 +1,6 @@
+MANIFEST
+README
+depend
+extconf.rb
+gdbm.c
+testgdbm.rb
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 82109fda90..84996896ab 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -6,8 +6,6 @@
   $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"
@@ -16,73 +14,15 @@
 #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);
+    rb_raise(rb_eGDBMFatalError, msg);
 }
 
 struct dbmdata {
@@ -102,27 +42,16 @@ 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);
+	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;
@@ -136,27 +65,6 @@ fgdbm_close(obj)
     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
@@ -166,29 +74,6 @@ fgdbm_s_alloc(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;
@@ -201,13 +86,13 @@ fgdbm_initialize(argc, argv, obj)
     int mode, flags = 0;
 
     if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
-        mode = 0666;            /* default value */
+	mode = 0666;		/* default value */
     }
     else if (NIL_P(vmode)) {
-        mode = -1;              /* return nil if DB does not exist */
+	mode = -1;		/* return nil if DB not exist */
     }
     else {
-        mode = NUM2INT(vmode);
+	mode = NUM2INT(vmode);
     }
 
     if (!NIL_P(vflags))
@@ -215,23 +100,16 @@ fgdbm_initialize(argc, argv, obj)
 
     SafeStringValue(file);
 
-    if (flags & RUBY_GDBM_RW_BIT) {
-        flags &= ~RUBY_GDBM_RW_BIT;
+    dbm = 0;
+    if (mode >= 0)
 	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);
-    }
+			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;
@@ -253,25 +131,6 @@ fgdbm_initialize(argc, argv, obj)
     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;
@@ -334,7 +193,8 @@ rb_gdbm_fetch3(obj, keystr)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     return rb_gdbm_fetch2(dbm, keystr);
 }
 
@@ -398,12 +258,6 @@ fgdbm_fetch(obj, keystr, ifnone)
     return valstr;
 }
 
-/*
- * call-seq:
- *      gdbm[key] -> value
- *
- * Retrieves the _value_ corresponding to _key_.
- */
 static VALUE
 fgdbm_aref(obj, keystr)
     VALUE obj, keystr;
@@ -411,13 +265,6 @@ fgdbm_aref(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;
@@ -429,18 +276,11 @@ fgdbm_fetch_m(argc, argv, obj)
     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");
+	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;
@@ -450,7 +290,8 @@ fgdbm_index(obj, valstr)
     VALUE keystr, valstr2;
 
     StringValue(valstr);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
@@ -482,13 +323,6 @@ fgdbm_indexes(argc, argv, obj)
     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;
@@ -506,16 +340,15 @@ fgdbm_select(argc, argv, obj)
 	if (argc > 0) {
 	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
-        GetDBM2(obj, dbmp, dbm);
+        GetDBM(obj, dbmp);
+        dbm = dbmp->di_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);
+            if (RTEST(rb_yield(assoc)))
+                rb_ary_push(new, assoc);
         }
     }
     else {
@@ -529,12 +362,6 @@ fgdbm_select(argc, argv, obj)
     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;
@@ -551,14 +378,6 @@ fgdbm_values_at(argc, argv, obj)
     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;
@@ -567,33 +386,28 @@ rb_gdbm_delete(obj, keystr)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
+    rb_secure(4);
     StringValue(keystr);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     if (!gdbm_exists(dbm, key)) {
-        return Qnil;
+	return Qnil;
     }
 
     if (gdbm_delete(dbm, key)) {
-        dbmp->di_size = -1;
-        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+	dbmp->di_size = -1;
+	rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
     }
     else if (dbmp->di_size >= 0) {
-        dbmp->di_size--;
+	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;
@@ -605,13 +419,6 @@ fgdbm_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;
@@ -620,8 +427,10 @@ fgdbm_shift(obj)
     GDBM_FILE dbm;
     VALUE keystr, valstr;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     keystr = rb_gdbm_firstkey(dbm);
     if (NIL_P(keystr)) return Qnil;
     valstr = rb_gdbm_fetch2(dbm, keystr);
@@ -630,13 +439,6 @@ fgdbm_shift(obj)
     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;
@@ -647,19 +449,19 @@ fgdbm_delete_if(obj)
     VALUE ret, ary = rb_ary_new();
     int i, status = 0, n;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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);
+	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);
+	if (RTEST(ret)) rb_ary_push(ary, keystr);
     }
 
     for (i = 0; i < RARRAY(ary)->len; i++)
@@ -670,12 +472,6 @@ fgdbm_delete_if(obj)
     return obj;
 }
 
-/*
- * call-seq:
- *      gdbm.clear -> gdbm
- *
- * Removes all the key-value pairs within _gdbm_.
- */
 static VALUE
 fgdbm_clear(obj)
     VALUE obj;
@@ -684,17 +480,18 @@ fgdbm_clear(obj)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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); 
+	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) {
@@ -714,13 +511,6 @@ fgdbm_clear(obj)
     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;
@@ -730,7 +520,8 @@ fgdbm_invert(obj)
     VALUE keystr, valstr;
     VALUE hash = rb_hash_new();
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 	valstr = rb_gdbm_fetch2(dbm, keystr);
@@ -763,14 +554,6 @@ update_i(pair, dbm)
     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;
@@ -779,13 +562,6 @@ fgdbm_update(obj, other)
     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;
@@ -795,13 +571,6 @@ fgdbm_replace(obj, other)
     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;
@@ -810,33 +579,26 @@ fgdbm_store(obj, keystr, valstr)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
+    rb_secure(4);
     StringValue(keystr);
-    StringValue(valstr);
-
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
+    StringValue(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     dbmp->di_size = -1;
+    dbm = dbmp->di_dbm;
     if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
-        if (errno == EPERM) rb_sys_fail(0);
-        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+	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;
@@ -846,8 +608,9 @@ fgdbm_length(obj)
     GDBM_FILE dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+    dbm = dbmp->di_dbm;
 
     for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
         nextkey = gdbm_nextkey(dbm, key);
@@ -859,12 +622,6 @@ fgdbm_length(obj)
     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;
@@ -889,13 +646,6 @@ fgdbm_empty_p(obj)
     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;
@@ -904,23 +654,17 @@ fgdbm_each_value(obj)
     GDBM_FILE dbm;
     VALUE keystr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
@@ -929,23 +673,17 @@ fgdbm_each_key(obj)
     GDBM_FILE dbm;
     VALUE keystr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
@@ -954,23 +692,18 @@ fgdbm_each_pair(obj)
     struct dbmdata *dbmp;
     VALUE keystr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
@@ -979,7 +712,9 @@ fgdbm_keys(obj)
     GDBM_FILE dbm;
     VALUE keystr, ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -990,12 +725,6 @@ fgdbm_keys(obj)
     return ary;
 }
 
-/*
- * call-seq:
- *      gdbm.values -> array
- *
- * Returns an array of all values of this database.
- */
 static VALUE
 fgdbm_values(obj)
     VALUE obj;
@@ -1005,26 +734,20 @@ fgdbm_values(obj)
     GDBM_FILE dbm;
     VALUE valstr, ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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);
+	valstr = rb_gdbm_fetch(dbm, key);
         free(key.dptr);
-        rb_ary_push(ary, valstr);
+	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;
@@ -1037,20 +760,13 @@ fgdbm_has_key(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
@@ -1060,7 +776,8 @@ fgdbm_has_value(obj, valstr)
     VALUE keystr, valstr2;
 
     StringValue(valstr);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
@@ -1076,12 +793,6 @@ fgdbm_has_value(obj, valstr)
     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;
@@ -1090,7 +801,9 @@ fgdbm_to_a(obj)
     GDBM_FILE dbm;
     VALUE keystr, ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -1101,14 +814,6 @@ fgdbm_to_a(obj)
     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;
@@ -1116,22 +821,13 @@ fgdbm_reorganize(obj)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
@@ -1139,18 +835,13 @@ fgdbm_sync(obj)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
@@ -1159,24 +850,16 @@ fgdbm_set_cachesize(obj, val)
     GDBM_FILE dbm;
     int optval;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     optval = FIX2INT(val);
     if (gdbm_setopt(dbm, GDBM_CACHESIZE, &optval, sizeof(optval)) == -1) {
-        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+	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;
@@ -1185,30 +868,19 @@ fgdbm_set_fastmode(obj, val)
     GDBM_FILE dbm;
     int optval;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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));
+	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;
@@ -1221,24 +893,20 @@ fgdbm_set_syncmode(obj, val)
     GDBM_FILE dbm;
     int optval;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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));
+	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;
@@ -1247,7 +915,9 @@ fgdbm_to_hash(obj)
     GDBM_FILE dbm;
     VALUE keystr, hash;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     hash = rb_hash_new();
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -1258,13 +928,6 @@ fgdbm_to_hash(obj)
     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;
@@ -1285,7 +948,6 @@ Init_gdbm()
 
     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);
@@ -1310,15 +972,15 @@ Init_gdbm()
     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,"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);
@@ -1330,29 +992,23 @@ Init_gdbm()
     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 */
+    /* flags for gdbm_opn() */
+    /*
+    rb_define_const(rb_cGDBM, "READER",  INT2FIX(GDBM_READER));
+    rb_define_const(rb_cGDBM, "WRITER",  INT2FIX(GDBM_WRITER));
+    rb_define_const(rb_cGDBM, "WRCREAT", INT2FIX(GDBM_WRCREAT));
+    rb_define_const(rb_cGDBM, "NEWDB",   INT2FIX(GDBM_NEWDB));
+    */
     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/ext/gdbm/testgdbm.rb b/ext/gdbm/testgdbm.rb
new file mode 100644
index 0000000000..a435498640
--- /dev/null
+++ b/ext/gdbm/testgdbm.rb
@@ -0,0 +1,663 @@
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+if $".grep(/\bgdbm.so\b/).empty?
+  begin
+    require './gdbm'
+  rescue LoadError
+    require 'gdbm'
+  end
+end
+
+def uname_s
+  require 'rbconfig'
+  case Config::CONFIG['host_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['host_os']
+  end
+end
+
+SYSTEM = uname_s
+
+class TestGDBM < RUNIT::TestCase
+  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)
+    GC.start
+    File.delete *Dir.glob("tmptest_gdbm*").to_a
+    p Dir.glob("tmptest_gdbm*") if $DEBUG
+  end
+
+  def check_size(expect, gdbm=@gdbm)
+    assert_equals(expect, gdbm.size)
+    n = 0
+    gdbm.each { n+=1 }
+    assert_equals(expect, n)
+    if expect == 0
+      assert_equals(true, gdbm.empty?)
+    else
+      assert_equals(false, gdbm.empty?)
+    end
+  end
+
+  def test_version
+    STDERR.print GDBM::VERSION
+  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_equals(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_equals(File.stat("tmptest_gdbm").mode & 0777, 0666)
+      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm2", 0644))
+      gdbm.close
+      assert_equals(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_equals(GDBM.open("tmptest_gdbm") { :foo }, :foo)
+  end
+  def test_s_open_lock
+    fork() {
+      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      assert_exception(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
+    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_exception(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
+
+    fork() {
+      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644,
+						GDBM::NOLOCK))
+      sleep 2
+    }
+    sleep 1
+    begin
+      gdbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644))
+      }
+    ensure
+      Process.wait
+      gdbm2.close if gdbm2
+    end
+
+    p Dir.glob("tmptest_gdbm*") if $DEBUG
+
+    fork() {
+      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      gdbm2 = nil
+      assert_no_exception(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
+      gdbm2.close if gdbm2
+    end
+  end
+
+  def test_s_open_error
+    assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0))
+    assert_exception(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_exception(RuntimeError) { gdbm.close }
+  end
+
+  def test_aref
+    assert_equals('bar', @gdbm['foo'] = 'bar')
+    assert_equals('bar', @gdbm['foo'])
+
+    assert_nil(@gdbm['bar'])
+  end
+
+  def test_fetch
+    assert_equals('bar', @gdbm['foo']='bar')
+    assert_equals('bar', @gdbm.fetch('foo'))
+
+    # key not found
+    assert_exception(IndexError) {
+      @gdbm.fetch('bar')
+    }
+
+    # test for `ifnone' arg
+    assert_equals('baz', @gdbm.fetch('bar', 'baz'))
+
+    # test for `ifnone' block
+    assert_equals('foobar', @gdbm.fetch('bar') {|key| 'foo' + key })
+  end
+
+  def test_aset
+    num = 0
+    2.times {|i|
+      assert_equals('foo', @gdbm['foo'] = 'foo')
+      assert_equals('foo', @gdbm['foo'])
+      assert_equals('bar', @gdbm['foo'] = 'bar')
+      assert_equals('bar', @gdbm['foo'])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+
+      # assign nil
+      assert_equals('', @gdbm['bar'] = '')
+      assert_equals('', @gdbm['bar'])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+
+      # empty string
+      assert_equals('', @gdbm[''] = '')
+      assert_equals('', @gdbm[''])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+
+      # Fixnum
+      assert_equals('200', @gdbm['100'] = '200')
+      assert_equals('200', @gdbm['100'])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+
+      # Big key and value
+      assert_equals('y' * 100, @gdbm['x' * 100] = 'y' * 100)
+      assert_equals('y' * 100, @gdbm['x' * 100])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+    }
+  end
+
+  def test_index
+    assert_equals('bar', @gdbm['foo'] = 'bar')
+    assert_equals('foo', @gdbm.index('bar'))
+    assert_nil(@gdbm['bar'])
+  end
+
+  def test_indexes
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+    assert_equals(values.reverse, @gdbm.indexes(*keys.reverse))
+  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_equals(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_equals(k.upcase, v)
+      k != "bar"
+    }
+    assert_equals([['baz', 'BAZ'], ['foo', 'FOO']],
+		  ret.sort)
+  end
+
+  def test_length
+    num = 10
+    assert_equals(0, @gdbm.size)
+    num.times {|i|
+      i = i.to_s
+      @gdbm[i] = i
+    }
+    assert_equals(num, @gdbm.size)
+
+    @gdbm.shift
+
+    assert_equals(num - 1, @gdbm.size)
+  end
+
+  def test_empty?
+    assert_equals(true, @gdbm.empty?)
+    @gdbm['foo'] = 'FOO'
+    assert_equals(false, @gdbm.empty?)
+  end
+
+  def test_each_pair
+    n = 0
+    @gdbm.each_pair { n += 1 }
+    assert_equals(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_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@gdbm, ret)
+  end
+
+  def test_each_value
+    n = 0
+    @gdbm.each_value { n += 1 }
+    assert_equals(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_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@gdbm, ret)
+  end
+
+  def test_each_key
+    n = 0
+    @gdbm.each_key { n += 1 }
+    assert_equals(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_equals(@gdbm[key], values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@gdbm, ret)
+  end
+
+  def test_keys
+    assert_equals([], @gdbm.keys)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+    assert_equals(keys.sort, @gdbm.keys.sort)
+    assert_equals(values.sort, @gdbm.values.sort)
+  end
+
+  def test_values
+    test_keys
+  end
+
+  def test_shift
+    assert_nil(@gdbm.shift)
+    assert_equals(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_equals(keys.size - ret_keys.size, @gdbm.size)
+    end
+
+    assert_equals(keys.sort, ret_keys.sort)
+    assert_equals(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_equals(0, @gdbm.size)
+
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+    assert_equals('BAR', @gdbm.delete(key))
+    assert_nil(@gdbm[key])
+    assert_equals(2, @gdbm.size)
+
+    assert_nil(@gdbm.delete(key))
+
+    if /^CYGWIN_9/ !~ SYSTEM
+      assert_exception(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_equals('foo', @gdbm.delete(key) {|k| k.replace 'called block'})
+    assert_equals('no called block', key)
+    assert_equals(0, @gdbm.size)
+
+    key = 'no called block'
+    assert_equals(:blockval,
+		  @gdbm.delete(key) {|k| k.replace 'called block'; :blockval})
+    assert_equals('called block', key)
+    assert_equals(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_equals(@gdbm, ret)
+    check_size(50, @gdbm)
+
+    ret = @gdbm.delete_if {|key, val| key.to_i >= 50}
+    assert_equals(@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_equals(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_equals(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_equals(100, @gdbm.size)
+
+    assert_equals(50, hash.size)
+    hash.each_pair {|key,val|
+      assert_equals(false, key.to_i < 50)
+      assert_equals(key, val)
+    }
+
+    hash = @gdbm.reject {|key, val| key.to_i < 100}
+    assert_instance_of(Hash, hash)
+    assert_equals(true, hash.empty?)
+  end
+
+  def test_clear
+    v = "1"
+    100.times {v = v.next; @gdbm[v] = v}
+
+    assert_equals(@gdbm, @gdbm.clear)
+
+    # validate GDBM#size
+    i = 0
+    @gdbm.each { i += 1 }
+    assert_equals(@gdbm.size, i)
+    assert_equals(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_equals(100, hash.size)
+    hash.each_pair {|key, val|
+      assert_equals(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_equals(101, @gdbm.size)
+    @gdbm.each_pair {|key, val|
+      assert_equals(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_equals(100, @gdbm.size)
+    @gdbm.each_pair {|key, val|
+      assert_equals(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_equals(true, size1 < size2)
+    # this test is failed on Cygwin98. `GDBM version 1.8.0, as of May 19, 1999'
+    assert_equals(true, size3 < size2)
+    assert_equals(size1, size3)
+  end
+
+  def test_sync
+    assert_instance_of(GDBM, gdbm = GDBM.open('tmptest_gdbm', 0666, GDBM::FAST))
+    assert_equals(gdbm.sync, gdbm)
+    gdbm.close
+    assert_instance_of(GDBM, gdbm = GDBM.open('tmptest_gdbm', 0666))
+    assert_equals(gdbm.sync, gdbm)
+    gdbm.close
+  end
+
+  def test_cachesize=
+      assert_equals(@gdbm.cachesize = 1024, 1024)
+  end
+
+  def test_fastmode=
+      assert_equals(@gdbm.fastmode = true, true)
+  end
+
+  def test_syncmode=
+      assert_equals(@gdbm.syncmode = true, true)
+  end
+
+  def test_haskey?
+    assert_equals('bar', @gdbm['foo']='bar')
+    assert_equals(true,  @gdbm.has_key?('foo'))
+    assert_equals(false, @gdbm.has_key?('bar'))
+  end
+
+  def test_has_value?
+    assert_equals('bar', @gdbm['foo']='bar')
+    assert_equals(true,  @gdbm.has_value?('bar'))
+    assert_equals(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_equals(100, ary.size)
+    ary.each {|key,val|
+      assert_equals(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_equals(100, hash.size)
+    hash.each {|key,val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+end
+
+if $0 == __FILE__
+  if ARGV.size == 0
+    suite = RUNIT::TestSuite.new
+    suite.add_test(TestGDBM.suite)
+  else
+    suite = RUNIT::TestSuite.new
+    ARGV.each do |testmethod|
+      suite.add_test(TestGDBM.new(testmethod))
+    end
+  end
+
+  RUNIT::CUI::TestRunner.run(suite)
+end
diff --git a/ext/iconv/MANIFEST b/ext/iconv/MANIFEST
new file mode 100644
index 0000000000..fd7e22deda
--- /dev/null
+++ b/ext/iconv/MANIFEST
@@ -0,0 +1,5 @@
+MANIFEST
+extconf.rb
+iconv.c
+depend
+charset_alias.rb
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index aed4644290..be2c1412e7 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -1,12 +1,10 @@
 #! /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"]
+OS = Config::CONFIG["target"]
 SHELL = Config::CONFIG['SHELL']
 
 class Hash::Ordered < Hash
@@ -15,89 +13,39 @@ class Hash::Ordered < Hash
   end
   def []=(key, val)
     ary = fetch(key) {return super(key, [self.size, key, val])} and
-      ary << val
+      ary.last = val
   end
-  def sort
-    values.sort.collect {|i, *rest| rest}
-  end
-  def each(&block)
-    sort.each(&block)
+  def each
+    values.sort.each {|i, key, val| yield key, val}
   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
+  IO.foreach("|#{SHELL} #{config_charset} #{target}") do |list|
+    next comments << list if /^\#/ =~ list
+    next unless /^(\S+)\s+(\S+)$/ =~ list
+    sys, can = $1, $2
+    can.downcase!
+    map[can] = sys
   end
   case target
   when /linux|-gnu/
-    # map.delete('ascii')
-  when /cygwin|os2-emx/
+    map.delete('ascii')
+  when /cygwin/
     # 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|
+  open(mapfile, "w") 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
+    map.each {|can, sys| f.puts("  charset_map['#{can}'.freeze] = '#{sys}'.freeze")}
     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)
+(2..3) === ARGV.size or abort "usage: #$0 config.status map.rb [target]"
+charset_alias(*ARGV)
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
index a9d0cfb5e6..8dfd562a40 100644
--- a/ext/iconv/extconf.rb
+++ b/ext/iconv/extconf.rb
@@ -5,39 +5,33 @@ 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
+if have_header("iconv.h")
+  if !try_compile("", "-Werror") or checking_for("iconv() 2nd argument is const") do
+      !try_compile('
+#include <iconv.h>
+size_t
+test(iconv_t cd, char **inptr, size_t *inlen, char **outptr, size_t *outlen)
+{
+    return iconv(cd, inptr, inlen, outptr, outlen);
+}
+', "-Werror")
     end
-    $defs.push('-DICONV_INPTR_CONST')
+    $defs.push('-DICONV_INPTR_CAST=""')
+  else
+    $defs.push('-DICONV_INPTR_CAST="(char **)"')
   end
+  have_library("iconv")
   if conf
     prefix = '$(srcdir)'
     prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"
-    if $extout
-      wrapper = "$(RUBYARCHDIR)/iconv.rb"
-    else
-      wrapper = "./iconv.rb"
-      $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]]
-    end
+    $INSTALLFILES = [["./iconv.rb", "$(RUBYLIBDIR)"]]
     if String === conf
       require 'uri'
       scheme = URI.parse(conf).scheme
     else
-      conf = "$(srcdir)/config.charset"
+      conf = prefix + "config.charset"
     end
+    wrapper = "iconv.rb"
     $cleanfiles << wrapper
   end
   create_makefile("iconv")
@@ -45,7 +39,7 @@ if have_func("iconv", "iconv.h") or
     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")
+      mf.print("\n\t$(RUBY) ", prefix, "charset_alias.rb ", conf, " $@\n")
     end
   end
 end
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index d989b97df2..4b1f4b5073 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -10,10 +10,28 @@
   All the files in this distribution are covered under the Ruby's
   license (see the file COPYING).
 
-  Documentation by Yukihiro Matsumoto and Gavin Sinclair.
-
 **********************************************************************/
 
+/*
+=begin
+= Summary
+Ruby extension for codeset conversion.
+
+= Abstract
+Iconv is a wrapper class for UNIX 95 (({iconv()})) function family, which
+translates string between various coding systems.
+
+See ((<Open Group|URL:http://www.opengroup.org/>))'s on-line documents for more details.
+* ((<iconv.h|URL:http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html>))
+* ((<iconv_open()|URL:http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_open.html>))
+* ((<iconv()|URL:http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html>))
+* ((<iconv_close()|URL:http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_close.html>))
+
+Which coding systems are available, it depends on the platform.
+
+=end
+*/
+
 #include "ruby.h"
 #include <errno.h>
 #include <iconv.h>
@@ -21,54 +39,6 @@
 #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. Simple conversion between two charsets.
- *
- *      converted_text = Iconv.conv('iso-8859-15', 'utf-8', text)
- *
- * 2. 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
- *
- * 3. Invoke Iconv.open with a block.
- *
- *      Iconv.open(to, from) do |cd|
- *        input.each { |s| output << cd.iconv(s) }
- *        output << cd.iconv(nil)
- *      end
- *
- * 4. Shorthand for (3).
- *
- *      Iconv.iconv(to, from, *input.to_a)
- */
-
 /* 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))
@@ -83,12 +53,10 @@ struct iconv_env_t
     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));
@@ -101,7 +69,7 @@ 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, long start, long length, struct iconv_env_t* env));
+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));
@@ -111,14 +79,20 @@ 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;
+
+/*
+=begin
+= Classes & Modules
+=end
+*/
 
 /*
- * Document-method: charset_map
- * call-seq: Iconv.charset_map
- *
- * Returns the map from canonical name to system dependent name.
- */
+=begin
+== Iconv
+=end
+*/
+static VALUE charset_map;
+
 static VALUE charset_map_get _((void))
 {
     return charset_map;
@@ -169,18 +143,10 @@ iconv_create
 	    cd = iconv_open(tocode, fromcode);
 	}
 	if (cd == (iconv_t)-1) {
-	    int inval = errno == EINVAL;
-	    const 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);
+	    volatile VALUE msg = rb_str_new2("iconv(\"");
+	    rb_str_buf_cat2(rb_str_buf_append(msg, to), "\", \"");
+	    rb_str_buf_cat2(rb_str_buf_append(msg, from), "\")");
+	    rb_sys_fail(StringValuePtr(msg));
 	}
     }
 
@@ -244,15 +210,7 @@ iconv_try
     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);
+    size_t ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
     if (ret == (size_t)-1) {
 	if (!*inlen)
 	    return Qfalse;
@@ -264,8 +222,6 @@ iconv_try
 	    return rb_eIconvIllegalSeq;
 	  case EINVAL:
 	    return rb_eIconvInvalidChar;
-	  case 0:
-	    return rb_eIconvBrokenLibrary;
 	  default:
 	    rb_sys_fail("iconv");
 	}
@@ -362,13 +318,13 @@ rb_str_derive
 static VALUE
 iconv_convert
 #ifdef HAVE_PROTOTYPES
-    (iconv_t cd, VALUE str, long start, long length, struct iconv_env_t* env)
+    (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;
-    long start;
-    long length;
+    int start;
+    int length;
     struct iconv_env_t *env;
 #endif /* HAVE_PROTOTYPES */
 {
@@ -417,9 +373,14 @@ iconv_convert
 	slen = RSTRING(str)->len;
 	inptr = RSTRING(str)->ptr;
 
-	inptr += start;
-	if (length < 0 || length > start + slen)
-	    length = slen - start;
+	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;
@@ -498,6 +459,36 @@ iconv_convert
     return ret;
 }
 
+
+/*
+=begin
+=== Class methods
+=end
+*/
+/*
+=begin
+--- Iconv.new(to, from) {|cd| ...}
+    Creates new code converter from a coding-system designated with ((|from|))
+    to another one designated with ((|to|)).
+    :Parameters
+      :((|to|))
+        coding-system name for destination.
+      :((|from|))
+        coding-system name for source.
+    :Exceptions
+      :(({TypeError}))
+        if ((|to|)) or ((|from|)) aren't String
+      :(({ArgumentError}))
+        if designated converter couldn't find out.
+      :(({SystemCallError}))
+        when (({iconv_open(3)})) failed.
+
+--- Iconv.open(to, from)
+    Equivalents to ((<Iconv.new>)) except with in the case of called
+    with a block, yields with the new instance and closes it, and
+    returns the result which returned from the block.
+=end
+*/
 static VALUE
 iconv_s_allocate
 #ifdef HAVE_PROTOTYPES
@@ -510,24 +501,6 @@ iconv_s_allocate
     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
@@ -545,14 +518,6 @@ iconv_initialize
     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
@@ -575,6 +540,22 @@ iconv_s_open
     }
 }
 
+/*
+=begin
+--- Iconv.iconv(to, from, *strs)
+    Shorthand for
+      Iconv.open(to, from) {|cd| (strs + [nil]).collect {|s| cd.iconv(s)}}
+    :Parameters
+      :((|to|)), ((|from|))
+        see ((<Iconv.new>)).
+      :((|strs|))
+        strings to be converted.
+    :Exceptions
+      exceptions thrown by ((<Iconv.new>)), ((<Iconv.open>)) and
+      ((<Iconv#iconv>)).
+=end
+*/
+
 static VALUE
 iconv_s_convert
 #ifdef HAVE_PROTOTYPES
@@ -600,24 +581,6 @@ iconv_s_convert
     return env->ret;
 }
 
-/*
- * Document-method: Iconv::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
@@ -632,7 +595,7 @@ iconv_s_iconv
     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);
+	rb_raise(rb_eArgError, "wrong # of arguments (%d for %d)", argc, 2);
 
     arg.argc = argc -= 2;
     arg.argv = argv + 2;
@@ -642,14 +605,6 @@ iconv_s_iconv
     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
@@ -669,17 +624,23 @@ iconv_s_conv
     return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
 }
 
+
+/*
+=begin
+=== Instance methods
+=end
+*/
 /*
- * 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.
- */
+=begin
+--- Iconv#close
+    Finishes conversion.
+    * After calling this, invoking method ((<Iconv#iconv>)) will cause
+      exception, but multiple calls of (({close})) are guaranteed to
+      end successfully.
+    * Returns a string contains the byte sequence to change the
+      output buffer to its initial shift state.
+=end
+*/
 static VALUE
 iconv_init_state
 #ifdef HAVE_PROTOTYPES
@@ -710,32 +671,30 @@ iconv_finish
 }
 
 /*
- * Document-method: Iconv#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.
- */
+=begin
+--- Iconv#iconv(str, [ start = 0, [ length = -1 ] ])
+    Converts string and returns converted one.
+    * In the case of ((|str|)) is (({String})), converts (({str[start, length]})).
+      Returns converted string.
+    * In the case of ((|str|)) is (({nil})), places ((|converter|))
+      itself into initial shift state and just returns a string contains
+      the byte sequence to change the output buffer to its initial shift
+      state.
+    * Otherwise, causes exception.
+    :Parameters
+      :((|str|))
+        string to be converted or (({nil})).
+      :((|start|))
+        starting offset.
+      :((|length|))
+        conversion length,
+        (({nil})) or (({-1})) means whole string from (({start})).
+    :Exceptions
+      * ((<Iconv::IllegalSequence>))
+      * ((<Iconv::InvalidCharacter>))
+      * ((<Iconv::OutOfRange>))
+=end
+*/
 static VALUE
 iconv_iconv
 #ifdef HAVE_PROTOTYPES
@@ -749,39 +708,39 @@ iconv_iconv
 {
     VALUE str, n1, n2;
     VALUE cd = check_iconv(self);
-    long start = 0, length = 0, slen = 0;
 
+    n1 = n2 = Qnil;
     rb_scan_args(argc, argv, "12", &str, &n1, &n2);
-    if (!NIL_P(str)) slen = RSTRING_LEN(StringValue(str));
-    if (argc != 2 || !RTEST(rb_range_beg_len(n1, &start, &length, slen, 0))) {
-	if (NIL_P(n1) || ((start = NUM2LONG(n1)) < 0 ? (start += slen) >= 0 : start < slen)) {
-	    if (NIL_P(n2)) {
-		length = -1;
-	    }
-	    else if ((length = NUM2LONG(n2)) >= slen - start) {
-		length = slen - start;
-	    }
-	}
-    }
 
-    return iconv_convert(VALUE2ICONV(cd), str, start, length, NULL);
+    return iconv_convert(VALUE2ICONV(cd), str,
+			 NIL_P(n1) ? 0 : NUM2INT(n1),
+			 NIL_P(n2) ? -1 : NUM2INT(n1),
+			 NULL);
 }
 
+
+/*
+=begin
+= Exceptions
+=end
+*/
 /*
- * Document-class: Iconv::Failure
- *
- * Base attributes for Iconv exceptions.
- */
+=begin
+== Iconv::Failure
+Base exceptional attributes from ((<Iconv>)).
 
+=== Instance methods
+=end
+*/
 /*
- * 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.
- */
+=begin
+--- Iconv::Failure#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.
+=end
+*/
 static VALUE
 iconv_failure_success
 #ifdef HAVE_PROTOTYPES
@@ -795,12 +754,12 @@ iconv_failure_success
 }
 
 /*
- * Document-method: failed
- * call-seq: failed
- *
- * Returns substring of the original string passed to Iconv that starts at the
- * character caused the exception. 
- */
+=begin
+--- Iconv::Failure#failed
+    Returns substring of the original string passed to ((<Iconv>)) that
+    starts at the character caused the exception. 
+=end
+*/
 static VALUE
 iconv_failure_failed
 #ifdef HAVE_PROTOTYPES
@@ -814,11 +773,11 @@ iconv_failure_failed
 }
 
 /*
- * Document-method: inspect
- * call-seq: inspect
- *
- * Returns inspected string like as: #<_class_: _success_, _failed_>
- */
+=begin
+--- Iconv::Failure#inspect
+    Returns inspected string like as: #<(({type})): "(({success}))", "(({failed}))">
+=end
+*/
 static VALUE
 iconv_failure_inspect
 #ifdef HAVE_PROTOTYPES
@@ -828,7 +787,7 @@ iconv_failure_inspect
     VALUE self;
 #endif /* HAVE_PROTOTYPES */
 {
-    const char *cname = rb_class2name(CLASS_OF(self));
+    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);
@@ -840,38 +799,34 @@ iconv_failure_inspect
 }
 
 /*
- * 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
- */
+  Hmmm, I don't like to write RD inside of function :-<.
+
+=begin
+== 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.
+=== Superclass
+(({ArgumentError}))
+=== Included Modules
+((<Iconv::Failure>))
+
+== Iconv::InvalidCharacter
+Input conversion stopped due to an incomplete character or shift
+sequence at the end of the input buffer.
+=== Superclass
+(({ArgumentError}))
+=== Included Modules
+((<Iconv::Failure>))
+
+== Iconv::OutOfRange
+Iconv library internal error.  Must not occur.
+=== Superclass
+(({RuntimeError}))
+=== Included Modules
+((<Iconv::Failure>))
+=end
+*/
 
 void
 Init_iconv _((void))
@@ -892,22 +847,39 @@ Init_iconv _((void))
     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_gc_register_address(&charset_map);
     rb_define_singleton_method(rb_cIconv, "charset_map", charset_map_get, 0);
 }
 
+
+/*
+=begin
+== Example
+(1) Instantiate a new ((<Iconv>)), 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)
+=end
+*/
diff --git a/ext/io/wait/MANIFEST b/ext/io/wait/MANIFEST
new file mode 100644
index 0000000000..a08526c13a
--- /dev/null
+++ b/ext/io/wait/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+extconf.rb
+wait.c
+lib/nonblock.rb
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
index e8181d25f5..ea7dc9f6cf 100644
--- a/ext/io/wait/extconf.rb
+++ b/ext/io/wait/extconf.rb
@@ -3,15 +3,10 @@ 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)
+    checking_for("FIONREAD") {macro_defined?("FIONREAD", "#include <#{h}>\n")}
   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/ext/io/wait/lib/nonblock.rb b/ext/io/wait/lib/nonblock.rb
index 2103fdf25b..46511fb40c 100644
--- a/ext/io/wait/lib/nonblock.rb
+++ b/ext/io/wait/lib/nonblock.rb
@@ -20,4 +20,4 @@ class IO
   ensure
     self.nonblock = nb
   end
-end if defined?(Fcntl::F_GETFL)
+end
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index 02cb54a014..53d5bd7d18 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -15,24 +15,7 @@
 #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));
@@ -56,18 +39,17 @@ static VALUE
 io_ready_p(io)
     VALUE io;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     FILE *fp;
-    ioctl_arg n;
+    int 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);
+    if (n > 0) return INT2NUM(n);
     return Qnil;
 }
 
@@ -84,11 +66,10 @@ io_wait(argc, argv, io)
     VALUE *argv;
     VALUE io;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     fd_set rd;
     FILE *fp;
-    int fd;
-    ioctl_arg n;
+    int fd, n;
     VALUE timeout;
     struct timeval *tp, timerec;
 
@@ -112,7 +93,6 @@ io_wait(argc, argv, io)
     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;
diff --git a/ext/nkf/MANIFEST b/ext/nkf/MANIFEST
new file mode 100644
index 0000000000..5114a3762a
--- /dev/null
+++ b/ext/nkf/MANIFEST
@@ -0,0 +1,7 @@
+MANIFEST
+depend
+extconf.rb
+lib/kconv.rb
+nkf.c
+nkf1.7/nkf.c
+test.rb
diff --git a/ext/nkf/depend b/ext/nkf/depend
index 0ed8fea8d2..13e32e6074 100644
--- a/ext/nkf/depend
+++ b/ext/nkf/depend
@@ -1 +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
+nkf.o : nkf.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(srcdir)/nkf1.7/nkf.c
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index 4ffe8d984e..af6d82275f 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -1,367 +1,73 @@
-#
-# 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
+    when NKF::JIS
       opt << 'J'
-    when ::NKF::EUC
+    when NKF::EUC
       opt << 'E'
-    when ::NKF::SJIS
+    when NKF::SJIS
       opt << 'S'
-    when ::NKF::UTF8
-      opt << 'W'
-    when ::NKF::UTF16
-      opt << 'W16'
     end
 
     case out_code
-    when ::NKF::JIS
+    when NKF::JIS
       opt << 'j'
-    when ::NKF::EUC
+    when NKF::EUC
       opt << 'e'
-    when ::NKF::SJIS
+    when NKF::SJIS
       opt << 's'
-    when ::NKF::UTF8
-      opt << 'w'
-    when ::NKF::UTF16
-      opt << 'w16'
-    when ::NKF::NOCONV
+    when NKF::NOCONV
       return str
     end
 
     opt = '' if opt == '-'
 
-    ::NKF::nkf(opt, str)
+    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)
+    NKF::nkf('-j', 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)
+    NKF::nkf('-e', 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)
+    NKF::nkf('-s', 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)
+    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
+  def tojis
+    NKF::nkf('-j', self)
+  end
+  def toeuc
+    NKF::nkf('-e', self)
+  end
+  def tosjis
+    NKF::nkf('-s', self)
+  end
 end
diff --git a/ext/nkf/nkf-utf8/config.h b/ext/nkf/nkf-utf8/config.h
deleted file mode 100644
index 9da82c6aee..0000000000
--- a/ext/nkf/nkf-utf8/config.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#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/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
deleted file mode 100644
index 3cd1b160da..0000000000
--- a/ext/nkf/nkf-utf8/nkf.c
+++ /dev/null
@@ -1,6040 +0,0 @@
-/** 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/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
deleted file mode 100644
index e43ad553d6..0000000000
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ /dev/null
@@ -1,8500 +0,0 @@
-#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/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h
deleted file mode 100644
index 1f40f0b363..0000000000
--- a/ext/nkf/nkf-utf8/utf8tbl.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#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/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 2bb0340a64..ca6de73e10 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -1,149 +1,51 @@
-/*
- *  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 getc(f)   	(input_ctr<i_len?input[input_ctr++]:-1)
+#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 */
+#define putchar(c)	rb_nkf_putchar(c)
 
-static unsigned char *output;
-static unsigned char *input;
-static int input_ctr;
-static int i_len;
-static int output_ctr;
-static int o_len;
+#define INCSIZE		32
 static int incsize;
 
-static VALUE result;
+static unsigned char *input, *output;
+static int input_ctr, i_len;
+static int output_ctr, o_len;
+
+static VALUE dst;
 
 static int
 rb_nkf_putchar(c)
-  unsigned int c;
+     unsigned int c;
 {
   if (output_ctr >= o_len) {
     o_len += incsize;
-    rb_str_resize(result, o_len);
+    rb_str_resize(dst, o_len);
+    output = RSTRING(dst)->ptr;
     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.
- */
+#include "nkf1.7/nkf.c"
 
 static VALUE
 rb_nkf_kconv(obj, opt, src)
-  VALUE obj, opt, src;
+     VALUE obj, opt, src;
 {
   char *opt_ptr, *opt_end;
   volatile VALUE v;
@@ -152,82 +54,69 @@ rb_nkf_kconv(obj, opt, src)
   StringValue(opt);
   opt_ptr = RSTRING(opt)->ptr;
   opt_end = opt_ptr + RSTRING(opt)->len;
-  nkf_split_options(opt_ptr);
+  for (; opt_ptr < opt_end; opt_ptr++) {
+    if (*opt_ptr != '-') {
+      continue;
+    }
+    arguments(opt_ptr);
+  }
 
   incsize = INCSIZE;
 
-  input_ctr = 0;
+  input_ctr = 0; 
   StringValue(src);
-  input = (unsigned char *)RSTRING(src)->ptr;
+  input = RSTRING(src)->ptr;
   i_len = RSTRING(src)->len;
-  result = rb_str_new(0, i_len*3 + 10);
-  v = result;
+  dst = rb_str_new(0, i_len*3 + 10);
+  v = dst;
 
   output_ctr = 0;
-  output     = (unsigned char *)RSTRING(result)->ptr;
-  o_len      = RSTRING(result)->len;
+  output     = RSTRING(dst)->ptr;
+  o_len      = RSTRING(dst)->len;
   *output    = '\0';
 
-  if(x0201_f == WISH_TRUE)
-    x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+  if(iso8859_f && (oconv != j_oconv || !x0201_f )) {
+    iso8859_f = FALSE;
+  } 
 
   kanji_convert(NULL);
-  RSTRING(result)->ptr[output_ctr] = '\0';
-  RSTRING(result)->len = output_ctr;
-  OBJ_INFECT(result, src);
+  RSTRING(dst)->ptr[output_ctr] = '\0';
+  RSTRING(dst)->len = output_ctr;
+  OBJ_INFECT(dst, src);
 
-  return result;
+  return dst;
 }
 
-
 /*
- *  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
+ * Character code detection - Algorithm described in:
+ * Ken Lunde. `Understanding Japanese Information Processing'
+ * Sebastopol, CA: O'Reilly & Associates.
  */
 
 static VALUE
-rb_nkf_guess1(obj, src)
-  VALUE obj, src;
+rb_nkf_guess(obj, src)
+     VALUE obj, src;
 {
   unsigned char *p;
   unsigned char *pend;
   int sequence_counter = 0;
 
   StringValue(src);
-  p = (unsigned char *)RSTRING(src)->ptr;
+  p = 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)\
+    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;\
-      if (6 <= sequence_counter) {\
-	  sequence_counter = 0;\
-	  return INT2FIX(_EUC);\
-      }\
-  } while (0)
+	return INT2FIX(_EUC);\
+    }\
+} while (0)
 
   if (*p == 0xa4)
     sequence_counter = 1;
@@ -291,364 +180,19 @@ rb_nkf_guess1(obj, src)
   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");
+    rb_define_module_function(mKconv, "guess", rb_nkf_guess, 1);
 
-    /* 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/ext/nkf/nkf1.7/nkf.c b/ext/nkf/nkf1.7/nkf.c
new file mode 100644
index 0000000000..09419f40a7
--- /dev/null
+++ b/ext/nkf/nkf1.7/nkf.c
@@ -0,0 +1,1900 @@
+/** 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
+** $BO"Mm@h!'(B $BN05eBg3X>pJs9)3X2J(B $B2OLn(B $B??<#(B  mine/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
+**    $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.
+**    You don't have to ask before copying or publishing.
+**    THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
+***********************************************************************/
+
+static char *CopyRight =
+      "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),1998 S. Kono, COW";
+static char *Version =
+      "1.7";
+static char *Patchlevel =
+      "0/9711/Shinji Kono";
+
+/*
+**
+**
+**
+** USAGE:       nkf [flags] [file] 
+**
+** Flags:
+** b    Output is bufferred             (DEFAULT)
+** u    Output is unbufferred
+**
+** t    no operation
+**
+** j    Outout code is JIS 7 bit        (DEFAULT SELECT) 
+** s    Output code is MS Kanji         (DEFAULT SELECT) 
+** e    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_ Output sequence to designate JIS-kanji (DEFAULT_J)
+** o_ Output sequence to designate single-byte roman characters (DEFAULT_R)
+**
+** 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 
+** d   Delete \r in line feed 
+** c   Add \r in line feed 
+**/
+/******************************/
+/* $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 */
+/******************************/
+
+#if (defined(__TURBOC__) || defined(LSI_C)) && !defined(MSDOS)
+#define MSDOS
+#endif
+
+#ifndef PERL_XS
+#include <stdio.h>
+#endif
+
+#if defined(MSDOS) || defined(__OS2__) 
+#include <stdlib.h>
+#include <fcntl.h>
+#include <io.h>
+#endif
+
+#ifdef MSDOS
+#ifdef LSI_C
+#define setbinmode(fp) fsetbin(fp)
+#else /* Microsoft C, Turbo C */
+#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
+#endif
+#else /* UNIX,OS/2 */
+#define setbinmode(fp)
+#endif
+
+#ifdef _IOFBF /* SysV and MSDOS */
+#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
+#include <windows.h>
+#endif
+
+#define         FALSE   0
+#define         TRUE    1
+
+/* state of output_mode and input_mode  */
+
+#define         ASCII           0
+#define         X0208           1
+#define         X0201           2
+#define         NO_X0201        3
+#define         JIS_INPUT       4
+#define         SJIS_INPUT      5
+#define         LATIN1_INPUT    6
+#define         FIXED_MIME      7
+#define         DOUBLE_SPACE    -2
+
+#define         NL      0x0a
+#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         HOLD_SIZE       32
+#define         IOBUF_SIZE      16384
+
+#define         DEFAULT_J       'B'
+#define         DEFAULT_R       'B'
+
+#define         SJ0162  0x00e1          /* 01 - 62 ku offset */
+#define         SJ6394  0x0161          /* 63 - 94 ku offset */
+
+
+/* MIME preprocessor */
+
+#undef STRICT_MIME       /* do stupid strict mime integrity check */
+#define GETC(p) ((!mime_mode)?getc(p):mime_getc(p))
+#define UNGETC(c,p)     ((!mime_mode)?ungetc(c,p):mime_ungetc(c))
+
+
+#ifdef EASYWIN /*Easy Win */
+extern POINT _BufferSize;
+#endif
+
+/*      function prototype  */
+
+#ifndef _
+# ifdef __STDC__
+#  define _(args) args
+# else
+#  define _(args) ()
+# endif
+#endif
+
+#ifndef PERL_XS
+static  void    noconvert _((FILE *f));
+static  int     mime_integrity _((FILE *f,unsigned char *p));
+static  int     usage _((void));
+static char            stdibuf[IOBUF_SIZE];
+static char            stdobuf[IOBUF_SIZE];
+static unsigned int            mime_input = 0; /* undecoded */
+static int             end_check;
+#endif
+
+static  void    kanji_convert _((FILE *f));
+static  void    h_conv _((FILE *f,int c2,int c1));
+static  int     push_hold_buf _((int c2,int c1));
+static  void    s_iconv _((int c2,int c1));
+static  void    e_oconv _((int c2,int c1));
+static  void    s_oconv _((int c2,int c1));
+static  void    j_oconv _((int c2,int c1));
+static  int     line_fold _((int c2,int c1));
+static  int     pre_convert _((int c1,int c2));
+static  int     mime_begin _((FILE *f));
+static  int     mime_getc _((FILE *f));
+static  int     mime_ungetc _((unsigned int c));
+static  int     base64decode _((int c));
+static  void    arguments _((char *c));
+static  void    reinit _((void));
+
+/* buffers */
+
+static unsigned char   hold_buf[HOLD_SIZE*2];
+static int             hold_count;
+
+/* 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 */
+
+/* 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             input_f = FALSE;        /* non fixed input code  */
+static int             alpha_f = FALSE;        /* convert JIx0208 alphbet to ASCII */
+static int             mime_f = TRUE;         /* convert MIME B base64 or Q */
+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 */
+#if defined(MSDOS) || defined(__OS2__) 
+static int             x0201_f = TRUE;         /* Assume JISX0201 kana */
+#else
+static int             x0201_f = NO_X0201;     /* Assume NO JISX0201 */
+#endif
+
+/* X0208 -> ASCII converter */
+
+static int             c1_return;
+
+/* fold parameter */
+static int line = 0;    /* chars in line */
+static int prev = 0;
+static int             fold_f  = FALSE;
+static int             fold_len  = 0;
+
+/* options */
+static char            kanji_intro = DEFAULT_J,
+                ascii_intro = DEFAULT_R;
+
+/* Folding */
+
+int line_fold();
+#define FOLD_MARGIN  10
+#define DEFAULT_FOLD 60
+
+/* 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
+
+static void            (*iconv) _((int c2,int c1));
+					/* s_iconv or oconv */
+static void            (*oconv) _((int c2,int c1)) = DEFAULT_CONV; 
+					  /* [ejs]_oconv */
+
+/* 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_mode =   FALSE;    /* MIME mode B base64, Q hex */
+
+/* X0201 / X0208 conversion tables */
+
+/* X0201 kana conversion table */
+/* 90-9F A0-DF */
+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 */
+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,0x00,0x00,
+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 */
+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 */
+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
+} ;
+
+
+static int             file_out = FALSE;
+static int             add_cr = FALSE;
+static int             del_cr = FALSE;
+
+#ifndef PERL_XS
+int
+main(argc, argv)
+    int             argc;
+    char          **argv;
+{
+    FILE  *fin;
+    char  *cp;
+
+#ifdef EASYWIN /*Easy Win */
+    _BufferSize.y = 400;/*Set Scroll Buffer Size*/
+#endif
+
+    for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
+        cp = *argv;
+	arguments(cp);
+    }
+
+    if(iso8859_f && (oconv != j_oconv || !x0201_f )) {
+        fprintf(stderr,"Mixed ISO8859/JISX0201/SJIS/EUC output is not allowed.\n");
+        exit(1);
+    }
+
+    if(binmode_f == TRUE)
+#ifdef __OS2__
+    if(freopen("","wb",stdout) == NULL) 
+        return (-1);
+#else
+    setbinmode(stdout);
+#endif
+
+    if(unbuf_f)
+      setbuf(stdout, (char *) NULL);
+    else
+      setvbuffer(stdout, stdobuf, IOBUF_SIZE);
+
+    if(argc == 0) {
+      if(binmode_f == TRUE)
+#ifdef __OS2__
+      if(freopen("","rb",stdin) == NULL) return (-1);
+#else
+      setbinmode(stdin);
+#endif
+      setvbuffer(stdin, stdibuf, IOBUF_SIZE);
+      if(nop_f)
+          noconvert(stdin);
+      else
+          kanji_convert(stdin);
+    } else {
+      while (argc--) {
+          if((fin = fopen(*argv++, "r")) == NULL) {
+              perror(*--argv);
+              return(-1);
+          } else {
+/* reopen file for stdout */
+              if(file_out == TRUE){ 
+                  if(argc == 1 ) {
+                      if(freopen(*argv++, "w", stdout) == NULL) {
+                          perror(*--argv);
+                          return (-1);
+                      }
+                      argc--;
+                  } else {
+                      if(freopen("nkf.out", "w", stdout) == NULL) {
+                         perror(*--argv);
+                         return (-1);
+                      }
+                  }
+                  if(binmode_f == TRUE) {
+#ifdef __OS2__
+                      if(freopen("","wb",stdout) == NULL) 
+                           return (-1);
+#else
+                      setbinmode(stdout);
+#endif
+                  }
+              }
+              if(binmode_f == TRUE)
+#ifdef __OS2__
+                 if(freopen("","rb",fin) == NULL) 
+                    return (-1);
+#else
+                 setbinmode(fin);
+#endif 
+              setvbuffer(fin, stdibuf, IOBUF_SIZE);
+              if(nop_f)
+                  noconvert(fin);
+              else
+                  kanji_convert(fin);
+              fclose(fin);
+          }
+      }
+    }
+#ifdef EASYWIN /*Easy Win */
+    if(file_out == FALSE) 
+        scanf("%d",&end_check);
+    else 
+        fclose(stdout);
+#else /* for Other OS */
+    if(file_out == TRUE) 
+        fclose(stdout);
+#endif 
+    return (0);
+}
+#endif
+
+static void
+arguments(cp) 
+    char *cp;
+{
+    while (*cp) {
+	switch (*cp++) {
+	case 'b':           /* buffered mode */
+	    unbuf_f = FALSE;
+	    continue;
+	case 'u':           /* non bufferd mode */
+	    unbuf_f = TRUE;
+	    continue;
+	case 't':           /* transparent mode */
+	    nop_f = TRUE;
+	    continue;
+	case 'j':           /* JIS output */
+	case 'n':
+	    oconv = j_oconv;
+	    continue;
+	case 'e':           /* AT&T EUC output */
+	    oconv = e_oconv;
+	    continue;
+	case 's':           /* SJIS output */
+	    oconv = 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 'r':
+	    rot_f = TRUE;
+	    continue;
+#if defined(MSDOS) || defined(__OS2__) 
+	case 'T':
+	    binmode_f = FALSE;
+	    continue;
+#endif
+#ifndef PERL_XS
+	case 'v':
+	    usage();
+	    exit(1);
+	    break;
+#endif
+	/* Input code assumption */
+	case 'J':   /* JIS input */
+	case 'E':   /* AT&T EUC input */
+	    input_f = JIS_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
+	    */
+	    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':   /* folding -f60 or -f */
+	    fold_f = TRUE;
+	    fold_len = atoi(cp);
+	    if(!(0<fold_len && fold_len<BUFSIZ)) 
+		fold_len = DEFAULT_FOLD;
+	    while('0'<= *cp && *cp <='9') cp++;
+	    continue;
+	case 'm':   /* MIME support */
+	    mime_f = TRUE;
+	    if(*cp=='B'||*cp=='Q') {
+		mime_mode = *cp++;
+		mimebuf_f = FIXED_MIME;
+	    } else if (*cp=='0') {
+		mime_f = FALSE;
+	    }
+	    continue;
+	case 'M':   /* MIME output */
+	    oconv = j_oconv;    /* sorry... not yet done.. */
+	    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 = TRUE;
+	    continue;
+#endif
+	case 'c':/* add cr code */
+	    add_cr = TRUE;
+	    continue;
+	case 'd':/* delete cr code */
+	    del_cr = TRUE;
+	    continue;
+	default:
+	    /* bogus option but ignored */
+	    continue;
+	}
+    }
+}
+
+#ifndef PERL_XS
+static void
+noconvert(f)
+    FILE  *f;
+{
+    int    c;
+
+    while ((c = getc(f)) != EOF)
+      putchar(c);
+}
+#endif
+
+
+static void
+kanji_convert(f)
+    FILE  *f;
+{
+    int    c1, c2;
+
+    c2 = 0;
+
+    if(input_f == JIS_INPUT || input_f == LATIN1_INPUT) {
+        estab_f = TRUE; iconv = oconv;
+    } else if(input_f == SJIS_INPUT) {
+        estab_f = TRUE;  iconv = s_iconv;
+    } else {
+        estab_f = FALSE; iconv = oconv;
+    }
+    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  */
+
+    while ((c1 = GETC(f)) != EOF) {
+        if(c2) {
+            /* second byte */
+            if(c2 > DEL) {
+                /* in case of 8th bit is on */
+                if(!estab_f) {
+                    /* in case of not established yet */
+                    if(c1 > SSP) {
+                        /* It is still ambiguious */
+                        h_conv(f, c2, c1);
+                        c2 = 0;
+                        NEXT;
+                    } else if(c1 < AT) {
+                        /* ignore bogus code */
+                        c2 = 0;
+                        NEXT;
+                    } else {
+                        /* established */
+                        /* it seems to be MS Kanji */
+                        estab_f = TRUE;
+                        iconv = s_iconv;
+                        SEND;
+                    }
+                } else
+                    /* in case of already established */
+                    if(c1 < AT) {
+                        /* ignore bogus code */
+                        c2 = 0;
+                        NEXT;
+                    } else
+                        SEND;
+            } else
+                /* 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 */
+            if(c1 > DEL) {
+                /* 8 bit code */
+                if(!estab_f && !iso8859_f) {
+                    /* not established yet */
+                    if(c1 < SSP) {
+                        /* it seems to be MS Kanji */
+                        estab_f = TRUE;
+                        iconv = s_iconv;
+                    } else if(c1 < 0xe0) {
+                        /* it seems to be EUC */
+                        estab_f = TRUE;
+                        iconv = oconv;
+                    } else {
+                        /* still ambiguious */
+                    }
+                    c2 = c1;
+                    NEXT;
+                } else { /* estab_f==TRUE */
+                    if(iso8859_f) {
+                        SEND;
+                    } else if(SSP<=c1 && c1<0xe0 && iconv == s_iconv) {
+                        /* SJIS X0201 Case... */
+                        /* This is too arrogant, but ... */
+                        if(x0201_f==NO_X0201) {
+                            iconv = oconv;
+                            c2 = c1;
+                            NEXT;
+                        } else 
+                        if(x0201_f) {
+                            if(dv[(c1-SSP)*2]||ev[(c1-SSP)*2]) {
+                            /* look ahead for X0201/X0208conversion */
+                                if((c2 = GETC(f)) == EOF) {
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    LAST;
+                                } else if(c2==(0xde)) { /* $BByE@(B */
+                                    (*oconv)(dv[(c1-SSP)*2],dv[(c1-SSP)*2+1]);
+                                    c2=0; 
+                                    NEXT;
+                                } else if(c2==(0xdf)&&ev[(c1-SSP)*2]) { 
+                                    /* $BH>ByE@(B */
+                                    (*oconv)(ev[(c1-SSP)*2],ev[(c1-SSP)*2+1]);
+                                    c2=0; 
+                                    NEXT;
+                                } 
+                                UNGETC(c2,f); c2 = 0;
+                            }
+                            (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                            NEXT;
+                        } else
+                            SEND;
+                    } else if(c1==SSO && iconv != s_iconv) {
+                        /* EUC X0201 Case */
+                        /* This is too arrogant
+                        if(x0201_f == NO_X0201) {
+                            estab_f = FALSE; 
+                            c2 = 0;  
+                            NEXT;
+                        } */
+                        c1 = GETC(f);  /* skip SSO */
+                        euc_1byte_check:
+                        if(x0201_f && SSP<=c1 && c1<0xe0) {
+                            if(dv[(c1-SSP)*2]||ev[(c1-SSP)*2]) {
+                                if((c2 = GETC(f)) == EOF) {
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    LAST;
+                                }
+                                /* forward lookup $BByE@(B/$BH>ByE@(B */
+                                if(c2 != SSO) {
+                                    UNGETC(c2,f); c2 = 0; 
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    NEXT;
+                                } else if((c2 = GETC(f)) == EOF) {
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    (*oconv)(0,SSO); 
+                                    LAST;
+                                } else if(c2==(0xde)) { /* $BByE@(B */
+                                    (*oconv)(dv[(c1-SSP)*2],dv[(c1-SSP)*2+1]);
+                                    c2=0; 
+                                    NEXT;
+                                } else if(c2==(0xdf)&&ev[(c1-SSP)*2]) { 
+                                    /* $BH>ByE@(B */
+                                    (*oconv)(ev[(c1-SSP)*2],ev[(c1-SSP)*2+1]);
+                                    c2=0; 
+                                    NEXT;
+                                } else {
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    /* we have to check this c2 */
+                                    /* and no way to push back SSO */
+                                    c1 = c2; c2 = 0;
+                                    goto euc_1byte_check;
+                                }
+                            }
+                            (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                            NEXT;
+                        } else 
+                            SEND;
+                    } else if(c1 < SSP && iconv != s_iconv) {
+                        /* strange code in EUC */
+                        iconv = s_iconv;  /* try SJIS */
+                        c2 = c1;
+                        NEXT;
+                    } else {
+                       /* already established */
+                       c2 = c1;
+                       NEXT;
+                    }
+                }
+            } else if((c1 > SPACE) && (c1 != DEL)) {
+                /* in case of Roman characters */
+                if(shift_mode) { 
+                    c1 |= 0x80;
+                    /* output 1 shifted byte */
+                    if(x0201_f && (!iso8859_f||input_mode==X0201) && 
+                            SSP<=c1 && c1<0xe0 ) {
+                        if(dv[(c1-SSP)*2]||ev[(c1-SSP)*2]) {
+                            if((c2 = GETC(f)) == EOF) {
+                                (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                LAST;
+                            } else if(c2==(0xde&0x7f)) { /* $BByE@(B */
+                                (*oconv)(dv[(c1-SSP)*2],dv[(c1-SSP)*2+1]);
+                                c2=0; 
+                                NEXT;
+                            } else if(c2==(0xdf&0x7f)&&ev[(c1-SSP)*2]) {  
+                                /* $BH>ByE@(B */
+                                (*oconv)(ev[(c1-SSP)*2],ev[(c1-SSP)*2+1]);
+                                c2=0; 
+                                NEXT;
+                            }
+                            UNGETC(c2,f); c2 = 0;
+                        }
+                        (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                        NEXT;
+                    } else
+                        SEND;
+                } else if(c1 == '(' && broken_f && input_mode == X0208
+                        && !mime_mode ) {
+                    /* Try to recover missing escape */
+                    if((c1 = GETC(f)) == EOF) {
+                        (*oconv)(0, '(');
+                        LAST;
+                    } else {
+                        if(c1 == 'B' || c1 == 'J' || c1 == 'H') {
+                            input_mode = ASCII; shift_mode = FALSE;
+                            NEXT;
+                        } else {
+                            (*oconv)(0, '(');
+                            /* do not modify various input_mode */
+                            /* It can be vt100 sequence */
+                            SEND;
+                        }
+                    }
+                } else if(input_mode == X0208) {
+                    /* in case of Kanji shifted */
+                    c2 = c1;
+                    NEXT;
+                    /* goto next_byte */
+                } else if(c1 == '=' && mime_f && !mime_mode ) {
+                    if((c1 = getc(f)) == EOF) {
+                        (*oconv)(0, '=');
+                        LAST;
+                    } else if(c1 == '?') {
+                        /* =? is mime conversiooon start sequence */
+                        if(mime_begin(f) == EOF) /* check in detail */
+                            LAST;
+                        else
+                            NEXT;
+                    } else {
+                        (*oconv)(0, '=');
+                        ungetc(c1,f);
+                        NEXT;
+                    }
+                } else if(c1 == '$' && broken_f && !mime_mode) {
+                    /* try to recover missing escape */
+                    if((c1 = GETC(f)) == EOF) {
+                        (*oconv)(0, '$');
+                        LAST;
+                    } else if(c1 == '@'|| c1 == 'B') {
+                        /* in case of Kanji in ESC sequence */
+                        input_mode = X0208;
+                        shift_mode = FALSE;
+                        NEXT;
+                    } else {
+                        /* sorry */
+                        (*oconv)(0, '$');
+                        (*oconv)(0, c1);
+                        NEXT;
+                    }
+                } else
+                    SEND;
+            } else if(c1 == SI) {
+                shift_mode = FALSE; 
+                NEXT;
+            } else if(c1 == SO) {
+                shift_mode = TRUE; 
+                NEXT;
+            } else if(c1 == ESC) {
+                if((c1 = GETC(f)) == EOF) {
+                    (*oconv)(0, ESC);
+                    LAST;
+                } else if(c1 == '$') {
+                    if((c1 = GETC(f)) == EOF) {
+                        (*oconv)(0, ESC);
+                        (*oconv)(0, '$');
+                        LAST;
+                    } else if(c1 == '@'|| c1 == 'B') {
+                        /* This is kanji introduction */
+                        input_mode = X0208;
+                        shift_mode = FALSE;
+                        NEXT;
+                    } else if(c1 == '(') {
+			if((c1 = GETC(f)) == EOF) {
+			    (*oconv)(0, ESC);
+			    (*oconv)(0, '$');
+			    (*oconv)(0, '(');
+			    LAST;
+			} else if(c1 == '@'|| c1 == 'B') {
+			    /* This is kanji introduction */
+			    input_mode = X0208;
+			    shift_mode = FALSE;
+			    NEXT;
+			} else {
+			    (*oconv)(0, ESC);
+			    (*oconv)(0, '$');
+			    (*oconv)(0, '(');
+			    (*oconv)(0, c1);
+			    NEXT;
+			}
+                    } else if(broken_f&0x2) {
+                        input_mode = X0208;
+                        shift_mode = FALSE;
+                        NEXT;
+                    } else {
+                        (*oconv)(0, ESC);
+                        (*oconv)(0, '$');
+                        (*oconv)(0, c1);
+                        NEXT;
+                    }
+                } else if(c1 == '(') {
+                    if((c1 = GETC(f)) == EOF) {
+                        (*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 {
+                    /* lonely ESC  */
+                    (*oconv)(0, ESC);
+                    SEND;
+                }
+            } else if(c1 == NL && broken_f&4) {
+                input_mode = ASCII; 
+                SEND;
+            } else
+                SEND;
+        }
+        /* send: */
+        if(input_mode == X0208) 
+            (*oconv)(c2, c1);  /* this is JIS, not SJIS/EUC case */
+        else
+            (*iconv)(c2, c1);  /* can be EUC/SJIS */
+        c2 = 0;
+        continue;
+        /* goto next_word */
+    }
+
+    /* epilogue */
+    (*iconv)(EOF, 0);
+}
+
+
+
+
+static void
+h_conv(f, c2, c1)
+    FILE  *f;
+    int    c1, c2;
+{
+    int    wc;
+
+
+    /** 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, c1);
+    c2 = 0;
+
+    while ((c1 = GETC(f)) != EOF) {
+        if(c2) {
+            /* second byte */
+            if(!estab_f) {
+                /* not established */
+                if(c1 > SSP) {
+                    /* it is still ambiguious yet */
+                    SEND;
+                } else if(c1 < AT) {
+                    /* ignore bogus first byte */
+                    c2 = 0;
+                    SEND;
+                } else {
+                    /* now established */
+                    /* it seems to be MS Kanji */
+                    estab_f = TRUE;
+                    iconv = s_iconv;
+                    SEND;
+                }
+            } else
+                SEND;
+        } else {
+            /* First byte */
+            if(c1 > DEL) {
+                /* 8th bit is on */
+                if(c1 < SSP) {
+                    /* it seems to be MS Kanji */
+                    estab_f = TRUE;
+                    iconv = s_iconv;
+                } else if(c1 < 0xe0) {
+                    /* it seems to be EUC */
+                    estab_f = TRUE;
+                    iconv = oconv;
+                } else {
+                    /* still ambiguious */
+                }
+                c2 = c1;
+                NEXT;
+            } else
+            /* 7 bit code , then send without any process */
+                SEND;
+        }
+        /* send: */
+        if((push_hold_buf(c2, c1) == EOF) || estab_f)
+            break;
+        c2 = 0;
+        continue;
+    }
+
+    /** 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.
+     **/
+
+    for (wc = 0; wc < hold_count; wc += 2) {
+        c2 = hold_buf[wc];
+        c1 = hold_buf[wc+1];
+        (*iconv)(c2, c1);
+    }
+    return;
+}
+
+
+
+static int
+push_hold_buf(c2, c1)
+    int c2, c1;
+{
+    if(hold_count >= HOLD_SIZE*2)
+        return (EOF);
+    hold_buf[hold_count++] = c2;
+    hold_buf[hold_count++] = c1;
+    return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count);
+}
+
+
+static void
+s_iconv(c2, c1)
+    int    c2,
+                    c1;
+{
+    if((c2 == EOF) || (c2 == 0)) {
+        /* NOP */
+    } else {
+        c2 = c2 + c2 - ((c2 <= 0x9f) ? SJ0162 : SJ6394);
+        if(c1 < 0x9f)
+            c1 = c1 - ((c1 > DEL) ? SPACE : 0x1f);
+        else {
+            c1 = c1 - 0x7e;
+            c2++;
+        }
+    }
+    (*oconv)(c2, c1);
+}
+
+
+static void
+e_oconv(c2, c1)
+    int    c2, c1;
+{
+    c2 = pre_convert(c1,c2); c1 = c1_return;
+    if(fold_f) {
+        switch(line_fold(c2,c1)) {
+            case '\n': 
+                if(add_cr == TRUE) {
+                    putchar('\r');
+                    c1 = '\n';
+                }
+                putchar('\n');
+                break;
+            case 0:    return;
+            case '\r': 
+                c1 = '\n'; c2 = 0;
+                break;
+            case '\t': 
+            case ' ': 
+                c1 = ' '; c2 = 0;
+                break;
+        }
+    }
+    if(c2==DOUBLE_SPACE) {
+        putchar(' '); putchar(' ');
+        return;
+    }
+    if(c2 == EOF)
+        return;
+    else if(c2 == 0 && (c1&0x80)) {
+        putchar(SSO); putchar(c1);
+    } else if(c2 == 0) {
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    } else {
+        if((c1<0x20 || 0x7e<c1) ||
+           (c2<0x20 || 0x7e<c2)) {
+            estab_f = FALSE;
+            return; /* too late to rescue this char */
+        }
+        putchar(c2 | 0x080);
+        putchar(c1 | 0x080);
+    }
+    return;
+}
+
+
+static void
+s_oconv(c2, c1)
+    int    c2, c1;
+{
+    c2 = pre_convert(c1,c2); c1 = c1_return;
+    if(fold_f) {
+        switch(line_fold(c2,c1)) {
+            case '\n': 
+                if(add_cr == TRUE) {
+                   putchar('\r');
+                   c1 = '\n';
+                }
+                putchar('\n');
+                break;
+            case '\r': 
+                c1 = '\n'; c2 = 0;
+                break;
+            case 0:    return;
+            case '\t': 
+            case ' ': 
+                c1 = ' '; c2 = 0;
+                break;
+        }
+    }
+    if(c2==DOUBLE_SPACE) {
+        putchar(' '); putchar(' ');
+        return;
+    }
+    if(c2 == EOF)
+        return;
+    else if(c2 == 0) {
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    } else {
+        if((c1<0x20 || 0x7e<c1) ||
+           (c2<0x20 || 0x7e<c2)) {
+            estab_f = FALSE;
+            return; /* too late to rescue this char */
+        }
+        putchar((((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1)));
+        putchar((c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e)));
+    }
+    return;
+}
+
+
+static void
+j_oconv(c2, c1)
+    int    c2, c1;
+{
+    c2 = pre_convert(c1,c2); c1 = c1_return;
+    if(fold_f) {
+        switch(line_fold(c2,c1)) {
+            case '\n': 
+                if(output_mode) {
+                    putchar(ESC);
+                    putchar('(');
+                    putchar(ascii_intro);
+                }
+                if(add_cr == TRUE) {
+                    putchar('\r');
+                    c1 = '\n';
+                }
+                putchar('\n');
+                output_mode = ASCII;
+                break;
+            case '\r': 
+                c1 = '\n'; c2 = 0;
+                break;
+            case '\t': 
+            case ' ': 
+                c1 = ' '; c2 = 0;
+                break;
+            case 0:    return;
+        }
+     }
+    if(c2 == EOF) {
+        if(output_mode) {
+            putchar(ESC);
+            putchar('(');
+            putchar(ascii_intro);
+        }
+    } else if(c2 == 0 && (c1 & 0x80)) {
+        if(input_mode==X0201 || !iso8859_f) {
+            if(output_mode!=X0201) {
+                putchar(ESC);
+                putchar('(');
+                putchar('I');
+                output_mode = X0201;
+            }
+            c1 &= 0x7f;
+        } else {
+            /* iso8859 introduction, or 8th bit on */
+            /* Can we convert in 7bit form using ESC-'-'-A ? 
+               Is this popular? */
+        }
+        putchar(c1);
+    } else if(c2 == 0) {
+        if(output_mode) {
+            putchar(ESC);
+            putchar('(');
+            putchar(ascii_intro);
+            output_mode = ASCII;
+        }
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    } else if(c2 == DOUBLE_SPACE) {
+        if(output_mode) {
+            putchar(ESC);
+            putchar('(');
+            putchar(ascii_intro);
+            output_mode = ASCII;
+        }
+        putchar(' ');
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    } else {
+        if(output_mode != X0208) {
+            putchar(ESC);
+            putchar('$');
+            putchar(kanji_intro);
+            output_mode = X0208;
+        }
+        if(c1<0x20 || 0x7e<c1) 
+            return;
+        if(c2<0x20 || 0x7e<c2) 
+            return;
+        putchar(c2);
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    }
+    return;
+}
+
+
+
+#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 \
+)
+
+
+/* 
+  Return value of line_fold()
+
+       \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.
+*/
+
+static int
+line_fold(c2,c1) 
+int c2,c1;
+{ 
+    int prev0;
+    if(c1=='\r') 
+        return 0;               /* ignore cr */
+    if(c1== 8) {
+        if(line>0) line--;
+        return 1;
+    }
+    if(c2==EOF && line != 0)    /* close open last line */
+        return '\n';
+    /* new line */
+    if(c1=='\n') {
+        if(prev == c1) {        /* duplicate newline */
+            if(line) {
+                line = 0;
+                return '\n';    /* output two newline */
+            } else {
+                line = 0;
+                return 1;
+            }
+        } else  {
+            if(prev&0x80) {     /* Japanese? */
+                prev = c1;
+                return 0;       /* ignore given single newline */
+            } else if(prev==' ') {
+                return 0;
+            } else {
+                prev = c1;
+                if(++line<=fold_len) 
+                    return ' ';
+                else {
+                    line = 0;
+                    return '\r';        /* fold and output nothing */
+                }
+            }
+        }
+    }
+    if(c1=='\f') {
+        prev = '\n';
+        if(line==0)
+            return 1;
+        line = 0;
+        return '\n';            /* output newline and clear */
+    }
+    /* X0208 kankaku or ascii space */
+    if( (c2==0&&c1==' ')||
+        (c2==0&&c1=='\t')||
+        (c2==DOUBLE_SPACE)||
+        (c2=='!'&& c1=='!')) {
+        if(prev == ' ') {
+            return 0;           /* remove duplicate spaces */
+        } 
+        prev = ' ';    
+        if(++line<=fold_len) 
+            return ' ';         /* output ASCII space only */
+        else {
+            prev = ' '; line = 0;
+            return '\r';        /* fold and output nothing */
+        }
+    } 
+    prev0 = prev; /* we still need this one... , but almost done */
+    prev = c1;
+    if(c2 || (SSP<=c1 && c1<=0xdf)) 
+        prev |= 0x80;  /* this is Japanese */
+    line += (c2==0)?1:2;
+    if(line<=fold_len) {   /* normal case */
+        return 1;
+    }
+    if(line>=fold_len+FOLD_MARGIN) { /* too many kinsou suspension */
+        line = (c2==0)?1:2;
+        return '\n';       /* We can't wait, do fold now */
+    }
+    /* simple kinsoku rules  return 1 means no folding  */
+    if(c2==0) {
+        if(c1==0xde) return 1; /* $B!+(B*/
+        if(c1==0xdf) return 1; /* $B!,(B*/
+        if(c1==0xa4) return 1; /* $B!#(B*/
+        if(c1==0xa3) return 1; /* $B!$(B*/
+        if(c1==0xa1) return 1; /* $B!W(B*/
+        if(c1==0xb0) return 1; /* - */
+        if(SSP<=c1 && c1<=0xdf) {               /* X0201 */
+            line = 1;
+            return '\n';/* add one new line before this character */
+        }
+        /* fold point in ASCII { [ ( */
+        if(( c1!=')'&&
+             c1!=']'&&
+             c1!='}'&&
+             c1!='.'&&
+             c1!=','&&
+             c1!='!'&&
+             c1!='?'&&
+             c1!='/'&&
+             c1!=':'&&
+             c1!=';')&&
+            ((prev0=='\n')|| (prev0==' ')||     /* ignored new line */
+            (prev0&0x80))                       /* X0208 - ASCII */
+            ) {
+            line = 1;
+            return '\n';/* add one new line before this character */
+        }
+        return 1;  /* default no fold in ASCII */
+    } else {
+        if(c2=='!') {
+            if(c1=='"')  return 1; /* $B!"(B */
+            if(c1=='#')  return 1; /* $B!#(B */
+            if(c1=='$')  return 1; /* $B!$(B */
+            if(c1=='%')  return 1; /* $B!%(B */
+            if(c1=='\'') return 1; /* $B!\(B */
+            if(c1=='(')  return 1; /* $B!((B */
+            if(c1==')')  return 1; /* $B!)(B */
+            if(c1=='*')  return 1; /* $B!*(B */
+            if(c1=='+')  return 1; /* $B!+(B */
+            if(c1==',')  return 1; /* $B!,(B */
+        }
+        line = 2;
+        return '\n'; /* add one new line before this character */
+    }
+}
+
+static int
+pre_convert(c1,c2)
+    int c1,c2;
+{
+        if(c2) c1 &= 0x7f;
+        c1_return = c1;
+        if(c2==EOF) return c2;
+        c2 &= 0x7f;
+        if(rot_f) {
+            if(c2) {
+                c1 = rot47(c1);
+                c2 = rot47(c2);
+            } else {
+                if(!(c1 & 0x80)) 
+                    c1 = rot13(c1);
+            }
+            c1_return = c1;
+        }
+        /* JISX0208 Alphabet */
+        if(alpha_f && c2 == 0x23 ) return 0; 
+        /* JISX0208 Kigou */
+        if(alpha_f && c2 == 0x21 ) { 
+           if(0x21==c1) {
+               if(alpha_f&0x2) {
+                   c1_return = ' ';
+                   return 0;
+               } else if(alpha_f&0x4) {
+                   c1_return = ' ';
+                   return DOUBLE_SPACE;
+               } else {
+                   return c2;
+               }
+           } else if(0x20<c1 && c1<0x7f && fv[c1-0x20]) {
+               c1_return = fv[c1-0x20];
+               return 0;
+           } 
+        }
+        return c2;
+}
+
+
+#ifdef STRICT_MIME
+/* This converts  */
+
+unsigned char *mime_pattern[] = {
+   (unsigned char *)"\075?ISO-8859-1?Q?",
+   (unsigned char *)"\075?ISO-2022-JP?B?",
+   (unsigned char *)"\075?ISO-2022-JP?Q?",
+   (unsigned char *)"\075?JAPANESE_EUC?B?",
+   (unsigned char *)"\075?SHIFT_JIS?B?",
+   NULL
+};
+
+int      mime_encode[] = {
+    'Q', 'B', 'Q',
+    0
+};
+#endif
+
+#define MAXRECOVER 20
+int iso8859_f_save;
+
+#ifdef STRICT_MIME
+
+#define nkf_toupper(c)  (('a'<=c && c<='z')?(c-('a'-'A')):c)
+/* I don't trust portablity of toupper */
+
+static int
+mime_begin(f)
+    FILE *f;
+{
+    int c1;
+    int i,j,k;
+    unsigned char *p,*q;
+    int r[MAXRECOVER];    /* recovery buffer, max mime pattern lenght */
+
+    mime_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 = getc(f))==EOF) || nkf_toupper(c1) != p[i] ) {
+            /* pattern fails, try next one */
+            q = p;
+            while (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;
+            }
+            if(p) continue;  /* found next one, continue */
+            /* all fails, output from recovery buffer */
+            ungetc(c1,f);
+            for(j=0;j<i;j++) {
+                (*oconv)(0,r[j]);
+            }
+            return c1;
+        }
+    }
+    mime_mode = mime_encode[j];
+    iso8859_f_save = iso8859_f;
+    if(j==0) {
+        iso8859_f = TRUE;
+    }
+    if(mime_mode=='B') {
+        mimebuf_f = unbuf_f;
+        if(!unbuf_f) {
+            /* do MIME integrity check */
+            return mime_integrity(f,mime_pattern[j]);
+        } 
+    }
+    mimebuf_f = TRUE;
+    return c1;
+}
+
+#define mime_getc0(f)   (mimebuf_f?getc(f):Fifo(mime_input++))
+#define mime_ungetc0(c,f) (mimebuf_f?ungetc(c,f):mime_input--)
+
+#else
+static int
+mime_begin(f)
+FILE *f;
+{
+    int c1;
+    int i,j;
+    int r[MAXRECOVER];    /* recovery buffer, max mime pattern lenght */
+
+    mime_mode = FALSE;
+    /* =? has been checked   */
+    j = 0;
+    r[0]='='; r[1]='?';
+    for(i=2;i<MAXRECOVER;i++) {                   /* start at =? */
+	/* We accept any charcter type even if it is breaked by new lines */
+        if( (r[i] = c1 = getc(f))==EOF) break;
+	if(c1=='=') break;
+	if(c1<' '&& c1!='\r' && c1!='\n') break;
+	if(c1=='?') {
+	    i++;
+	    if(!(i<MAXRECOVER) || (r[i] = c1 = getc(f))==EOF) break;
+	    if(c1=='b'||c1=='B') {
+		mime_mode = 'B';
+	    } else if(c1=='q'||c1=='Q') {
+		mime_mode = 'Q';
+	    } else {
+		break;
+	    }
+	    i++;
+	    if(!(i<MAXRECOVER) || (r[i] = c1 = getc(f))==EOF) break;
+	    if(c1=='?') {
+		break;
+	    } else {
+		mime_mode = FALSE;
+	    }
+	    break;
+	}
+    }
+    if(!mime_mode || c1==EOF || i==MAXRECOVER) {
+	ungetc(c1,f);
+	if (i == MAXRECOVER)
+	    i--;
+	for(j=0;j<i;j++) {
+	    (*oconv)(0,r[j]);
+	}
+	return c1;
+    }
+    iso8859_f_save = iso8859_f;
+    /* do no MIME integrity check */
+    return c1;   /* used only for checking EOF */
+}
+
+#define mime_getc0(f)   getc(f)
+#define mime_ungetc0(c,f) ungetc(c,f)
+
+#endif
+
+static int 
+mime_getc(f)
+    FILE *f;
+{
+    int c1, c2, c3, c4, cc;
+    int t1, t2, t3, t4, mode, exit_mode;
+
+    if(mime_top != mime_last) {  /* Something is in FIFO */
+        return  Fifo(mime_top++);
+    }
+
+    if(mimebuf_f == FIXED_MIME)
+        exit_mode = mime_mode;
+    else
+        exit_mode = FALSE;
+    if(mime_mode == 'Q') {
+        if((c1 = mime_getc0(f)) == EOF) return (EOF);
+        if(c1=='_') return ' ';
+        if(c1!='=' && c1!='?') 
+            return c1;
+        mime_mode = exit_mode; /* prepare for quit */
+        if(c1<=' ') return c1;
+        if((c2 = mime_getc0(f)) == EOF) return (EOF);
+        if(c2<=' ') return c2;
+        if(c1=='?'&&c2=='=') {
+            /* end Q encoding */
+            input_mode = exit_mode;
+            iso8859_f = iso8859_f_save;
+            return getc(f);
+        }
+        if(c1=='?') {
+            mime_mode = 'Q'; /* still in MIME */
+            mime_ungetc0(c2,f);
+            return c1;
+        }
+        if((c3 = mime_getc0(f)) == EOF) return (EOF);
+        if(c2<=' ') return c2;
+        mime_mode = 'Q'; /* still in MIME */
+#define hex(c)   (('0'<=c&&c<='9')?(c-'0'):\
+     ('A'<=c&&c<='F')?(c-'A'+10):('a'<=c&&c<='f')?(c-'a'+10):0)
+        return ((hex(c2)<<4) + hex(c3));
+    }
+
+    if(mime_mode != 'B') {
+        mime_mode = FALSE;
+        return getc(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_mode;
+    mime_mode = exit_mode;  /* prepare for quit */
+
+    while ((c1 = mime_getc0(f))<=' ') {
+        if(c1==EOF)
+            return (EOF);
+    }
+    if((c2 = mime_getc0(f))<=' ') {
+        if(c2==EOF)
+            return (EOF);
+        if(mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c2;
+    }
+    if((c1 == '?') && (c2 == '=')) {
+        input_mode = ASCII;
+        while((c1 =  getc(f))==' ' /* || c1=='\n' || c1=='\r' */);
+        return c1;
+    }
+    if((c3 = mime_getc0(f))<=' ') {
+        if(c3==EOF)
+            return (EOF);
+        if(mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c3;
+    }
+    if((c4 = mime_getc0(f))<=' ') {
+        if(c4==EOF)
+            return (EOF);
+        if(mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c4;
+    }
+
+    mime_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++) = cc;
+        cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
+        if(c3 != '=') {
+            Fifo(mime_last++) = cc;
+            cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
+            if(c4 != '=') 
+                Fifo(mime_last++) = cc;
+        }
+    } else {
+        return c1;
+    }
+    return  Fifo(mime_top++);
+}
+
+static int
+mime_ungetc(c) 
+    unsigned int c;
+{
+    Fifo(mime_last++) = c;
+    return c;
+}
+
+#ifdef STRICT_MIME
+int
+mime_integrity(f,p)
+    FILE *f;
+    unsigned char *p;
+{
+    int c,d;
+    unsigned int q;
+    /* In buffered mode, read until =? or NL or buffer fffull
+     */
+    mime_input = mime_top;
+    mime_last = mime_top;
+    while(*p) Fifo(mime_input++) = *p++;
+    d = 0;
+    q = mime_input;
+    while((c=getc(f))!=EOF) {
+        if(((mime_input-mime_top)&MIME_BUF_MASK)==0) break;
+        if(c=='=' && d=='?') {
+            /* checked. skip header, start decode */
+            Fifo(mime_input++) = c;
+            mime_input = q; 
+            return 1;
+        }
+        if(!( (c=='+'||c=='/'|| c=='=' || c=='?' ||
+            ('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))))
+            break;
+        /* Should we check length mod 4? */
+        Fifo(mime_input++) = c;
+        d=c;
+    }
+    /* In case of Incomplete MIME, no MIME decode  */
+    Fifo(mime_input++) = c;
+    mime_last = mime_input;     /* point undecoded buffer */
+    mime_mode = 1;              /* no decode on Fifo last in mime_getc */
+    return 1;
+}
+#endif
+
+static int
+base64decode(c)
+    int 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 void 
+reinit()
+{
+    unbuf_f = FALSE;
+    estab_f = FALSE;
+    nop_f = FALSE;
+    binmode_f = TRUE;       
+    rot_f = FALSE;         
+    input_f = FALSE;      
+    alpha_f = FALSE;     
+    mime_f = TRUE;      
+    mimebuf_f = FALSE; 
+    broken_f = FALSE;  
+    iso8859_f = FALSE; 
+    x0201_f = TRUE;    
+    x0201_f = NO_X0201; 
+    fold_f  = FALSE;
+    kanji_intro = DEFAULT_J;
+    ascii_intro = DEFAULT_R;
+    oconv = DEFAULT_CONV; 
+    output_mode = ASCII;
+    input_mode =  ASCII;
+    shift_mode =  FALSE;
+    mime_mode =   FALSE;
+    file_out = FALSE;
+    add_cr = FALSE;
+    del_cr = FALSE;
+    line = 0;
+}
+
+#ifndef PERL_XS
+int 
+usage()   
+{
+    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 bufferred (DEFAULT),Output is unbufferred\n");
+#ifdef DEFAULT_CODE_SJIS
+    fprintf(stderr,"j,s,e    Outout code is JIS 7 bit, Shift JIS (DEFAULT), AT&T JIS (EUC)\n");
+#endif
+#ifdef DEFAULT_CODE_JIS
+    fprintf(stderr,"j,s,e    Outout code is JIS 7 bit (DEFAULT), Shift JIS, AT&T JIS (EUC)\n");
+#endif
+#ifdef DEFAULT_CODE_EUC
+    fprintf(stderr,"j,s,e    Outout code is JIS 7 bit, Shift JIS, AT&T JIS (EUC) (DEFAULT)\n");
+#endif
+    fprintf(stderr,"J,S,E    Input assumption is JIS 7 bit , Shift JIS, AT&T JIS (EUC)\n");
+    fprintf(stderr,"t        no conversion\n");
+    fprintf(stderr,"i_       Output sequence to designate JIS-kanji (DEFAULT B)\n");
+    fprintf(stderr,"o_       Output sequence to designate ASCII (DEFAULT B)\n");
+    fprintf(stderr,"r        {de/en}crypt ROT13/47\n");
+    fprintf(stderr,"v        Show this usage\n");
+    fprintf(stderr,"m[BQ0]   MIME decode [B:base64,Q:quoted,0:no decode]\n");
+    fprintf(stderr,"l        ISO8859-1 (Latin-1) support\n");
+    fprintf(stderr,"f        Folding: -f60 or -f\n");
+    fprintf(stderr,"Z[0-2]   Convert X0208 alphabet to ASCII  1: Kankaku to space,2: 2 spaces\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,"d,c      Delete \\r in line feed, Add \\r in line feed\n");
+    fprintf(stderr,"Network Kanji Filter Version %s (%s) "
+#if defined(MSDOS) && !defined(_Windows)
+                  "for DOS"
+#endif
+#if !defined(__WIN32__) && defined(_Windows)
+                  "for Win16"
+#endif
+#if defined(__WIN32__) && defined(_Windows)
+                  "for Win32"
+#endif
+#ifdef __OS2__
+                  "for OS/2"
+#endif
+                  ,Version,Patchlevel);
+    fprintf(stderr,"\n%s\n",CopyRight);
+    return 0;
+}
+#endif
+
+/**
+ ** $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)
+ **
+ ** $B:G=*99?7F|(B
+ **  1998.11.7
+ **/
+
+/* end */
diff --git a/ext/nkf/test.rb b/ext/nkf/test.rb
new file mode 100644
index 0000000000..4519f8ba7e
--- /dev/null
+++ b/ext/nkf/test.rb
@@ -0,0 +1,318 @@
+$counter = 0
+def result(result, message = nil)
+  $counter += 1
+  printf("%s %d%s\n",
+	 result ? 'ok' : 'no', 
+	 $counter, 
+	 message ? ' ... ' + message : '')
+end
+
+begin
+  require 'nkf'
+  include NKF
+rescue LoadError
+  result(false)
+end
+result(true)
+
+if nkf('-me', '1')
+  result(true);
+else
+  result(false);
+end
+
+output = nkf('-e', "\033\$@#1#3#2%B")
+if output
+  # print output, "\n"
+  result(true, output)
+else
+  result(false)
+end
+
+output = nkf('-Zj', "\033\$@#1#3#2%B")
+if output
+  # print output, "\n"
+  result(true, output)
+else
+  result(false)
+end
+
+output = "\244\306 " * 1024
+old =  output.length
+output = nkf("-j", output)
+if output
+  # print output, "\n"
+  result(true, "#{old} #{output.length}")
+else
+    result(false)
+end
+
+
+$detail = false
+def test(opt, input, expect)
+  print "\nINPUT:\n", input if $detail
+  print "\nEXPECT:\n", expect if $detail
+  result = nkf(opt, input)
+  print "\nGOT:\n", result if $detail
+
+  print result == expect ? "Ok\n" : "Fail\n"
+  return result
+end
+
+# Basic Conversion
+print "\nBasic Conversion test\n\n"
+
+example = {}
+example['jis'] = <<'eofeof'.unpack('u')[0]
+M1FER<W0@4W1A9V4@&R1"(3DQ(3%^2R%+?D]3&RA"(%-E8V]N9"!3=&%G92`;
+M)$)0)TU:&RA"($AI<F%G86YA(!LD0B0B)"0D)B0H)"HD;R1R)',;*$(*2V%T
+M86MA;F$@&R1")2(E)"4F)2@E*B5O)7(E<QLH0B!+:6=O=2`;)$(A)B%G(S`C
+/029!)E@G(B=!*$`;*$(*
+eofeof
+#'
+
+example['sjis'] = <<'eofeof'.unpack('u')[0]
+M1FER<W0@4W1A9V4@@5B)0(F>ED"6GIAR(%-E8V]N9"!3=&%G92"8I9=Y($AI
+M<F%G86YA((*@@J*"I(*F@JB"[8+P@O$*2V%T86MA;F$@@T&#0X-%@T>#28./
+>@Y*#DR!+:6=O=2"!18&'@D^"8(._@]:$081@A+X*
+eofeof
+#'
+
+example['euc'] = <<'eofeof'.unpack('u')[0]
+M1FER<W0@4W1A9V4@H;FQH;'^RZ'+_L_3(%-E8V]N9"!3=&%G92#0I\W:($AI
+M<F%G86YA(*2BI*2DIJ2HI*JD[Z3RI/,*2V%T86MA;F$@I:*EI*6FI:BEJJ7O
+>I?*E\R!+:6=O=2"AIJ'GH["CP:;!IMBGHJ?!J,`*
+eofeof
+#'
+
+example['amb'] = <<'eofeof'.unpack('u')[0]
+MI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&E
+MPK"QI<*PL:7"L+&EPK"QI<(*I<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*P
+ML:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<(*I<*PL:7"L+&E
+MPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"
+ML+&EPK"QI<(*I<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"Q
+MI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<(*I<*PL:7"L+&EPK"QI<*PL:7"
+ML+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<(*
+eofeof
+
+example['amb.euc'] = <<'eofeof'.unpack('u')[0]
+M&R1")4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25"
+M,#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*&R1")4(P,25",#$E0C`Q)4(P,25"
+M,#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;
+M*$(*&R1")4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P
+M,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*&R1")4(P,25",#$E0C`Q)4(P
+M,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q
+M)4(;*$(*&R1")4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q
+>)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*
+eofeof
+
+example['amb.sjis'] = <<'eofeof'.unpack('u')[0]
+M&RA))4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25"
+M,#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*&RA))4(P,25",#$E0C`Q)4(P,25"
+M,#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;
+M*$(*&RA))4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P
+M,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*&RA))4(P,25",#$E0C`Q)4(P
+M,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q
+M)4(;*$(*&RA))4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q
+>)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*
+eofeof
+
+example['x0201.sjis'] = <<'eofeof'.unpack('u')[0]
+MD5.*<(-*@TR#3H-0@U*#2X--@T^#48-3"I%3B7""8()A@F*"8X)D@F6"9H*!
+M@H*"@X*$@H6"AH*'"I%3BTR-AH%)@9>!E(&0@9.!3X&5@9:!:8%J@7R!>X&!
+M@6V!;H%O@7"!CPJ4O(IPMK>X/;FZMMZWWKC>N=ZZWH+&"I2\BG#*W\O?S-_-
+MW\[?M]^QW@K*W\O?S`IH86YK86MU(,K?R]_,I`K*W\O?S-VA"I2\BG""S(SC
+!"@!"
+eofeof
+#'
+
+example['x0201.euc'] = <<'eofeof'.unpack('u')[0]
+MP;2ST:6KI:VEKZ6QI;.EK*6NI;"ELJ6T"L&TL=&CP:/"H\.CQ*/%H\:CQZ/A
+MH^*CXZ/DH^6CYJ/G"L&TM:VYYJ&JH?>A]*'PH?.AL*'UH?:ARJ'+H=VAW*'A
+MH<ZASZ'0H=&A[PK(OK/1CK:.MXZX/8ZYCKJ.MH[>CK>.WHZXCMZ.N8[>CKJ.
+MWJ3("LB^L]&.RH[?CLN.WX[,CM^.S8[?CLZ.WXZWCM^.L8[>"H[*CM^.RX[?
+MCLP*:&%N:V%K=2".RH[?CLN.WX[,CJ0*CLJ.WX[+CM^.S([=CJ$*R+ZST:3.
+#N.4*
+eofeof
+#'
+
+example['x0201.jis'] = <<'eofeof'.unpack('u')[0]
+M&R1"030S424K)2TE+R4Q)3,E+"4N)3`E,B4T&RA""ALD0D$T,5$C02-"(T,C
+M1"-%(T8C1R-A(V(C8R-D(V4C9B-G&RA""ALD0D$T-2TY9B$J(7<A="%P(7,A
+M,"%U(78A2B%+(5TA7"%A(4XA3R%0(5$A;QLH0@H;)$)(/C-1&RA)-C<X&RA"
+M/1LH23DZ-EXW7CA>.5XZ7ALD0B1(&RA""ALD0D@^,U$;*$E*7TM?3%]-7TY?
+M-U\Q7ALH0@H;*$E*7TM?3!LH0@IH86YK86MU(!LH24I?2U],)!LH0@H;*$E*
+97TM?3%TA&RA""ALD0D@^,U$D3CAE&RA""@``
+eofeof
+#`
+
+example['x0201.sosi'] = <<'eofeof'.unpack('u')[0]
+M&R1"030S424K)2TE+R4Q)3,E+"4N)3`E,B4T&RA*"ALD0D$T,5$C02-"(T,C
+M1"-%(T8C1R-A(V(C8R-D(V4C9B-G&RA*"ALD0D$T-2TY9B$J(7<A="%P(7,A
+M,"%U(78A2B%+(5TA7"%A(4XA3R%0(5$A;QLH2@H;)$)(/C-1&RA*#C8W.`\;
+M*$H]#CDZ-EXW7CA>.5XZ7@\;)$(D2!LH2@H;)$)(/C-1&RA*#DI?2U],7TU?
+M3E\W7S%>#PH.2E]+7TP/&RA*"FAA;FMA:W4@#DI?2U],)`\;*$H*#DI?2U],
+672$/&RA*"ALD0D@^,U$D3CAE&RA""@``
+eofeof
+#"
+
+example['x0201.x0208'] = <<'eofeof'.unpack('u')[0]
+M&R1"030S424K)2TE+R4Q)3,E+"4N)3`E,B4T&RA""ALD0D$T,5$;*$)!0D-$
+M149'86)C9&5F9PH;)$)!-#4M.68;*$(A0",D)5XF*B@I+2L]6UU[?1LD0B%O
+M&RA""ALD0D@^,U$E*R4M)2\;*$(]&R1")3$E,R4L)2XE,"4R)30D2!LH0@H;
+M)$)(/C-1)5$E5"57)5HE724M(2PE(B$K&RA""ALD0B51)50E51LH0@IH86YK
+M86MU(!LD0B51)50E52$B&RA""ALD0B51)50E525S(2,;*$(*&R1"2#XS421.
+&.&4;*$(*
+eofeof
+#`
+
+example['mime.iso2022'] = <<'eofeof'.unpack('u')[0]
+M/3])4T\M,C`R,BU*4#]"/T=Y4D%.144W96E23TI566Q/4U9)1WEH2S\]"CT_
+M:7-O+3(P,C(M2E`_0C]'>5)!3D5%-V5I4D]*55EL3U-624=Y:$L_/0H]/VES
+M;RTR,#(R+4I0/U$_/3%")$(D1B11/3%"*$)?96YD/ST*&R1`)#TD)B0K)$H;
+M*$H@/3])4T\M,C`R,BU*4#]"/T=Y4D%.144W96E23U!Y:S=D:'-O4V<]/3\]
+M(&5N9"!O9B!L:6YE"CT_25-/+3(P,C(M2E`_0C]'>5)!3D5%-V5I4D]0>6LW
+M9&AS;U-G/3T_/2`]/TE33RTR,#(R+4I0/T(_1WE204Y%13=E:5)/4'EK-V1H
+M<V]39ST]/ST*0G)O:V5N(&-A<V4*/3])4T\M,C`R,BU*4#]"/T=Y4D%.144W
+M96E23U!Y:S=D"FAS;U-G/3T_/2`]/TE33RTR,`HR,BU*4#]"/T=Y4D%.144W
+M96E23U!Y:S=D:'-O4V<]/3\]"CT_25-/+3(P,C(M2E`_0C]'>5)!3D5%-V5I
+44D]*55EL3QM;2U-624=Y:$L_/0H_
+eofeof
+#'
+
+example['mime.ans.strict'] = <<'eofeof'.unpack('u')[0]
+M&R1"-$$[>B1.)48E.25(&RA""ALD0C1!.WHD3B5&)3DE2!LH0@H;)$(D1B11
+M&RA"(&5N9`H;)$(D/20F)"LD2ALH0B`;)$(T03MZ)$X_*3MV&RA"96YD(&]F
+M(&QI;F4*&R1"-$$[>B1./RD[=C1!.WHD3C\I.W8;*$(*0G)O:V5N(&-A<V4*
+M/3])4T\M,C`R,BU*4#]"/T=Y4D%.144W96E23U!Y:S=D"FAS;U-G/3T_/2`]
+M/TE33RTR,`HR,BU*4#]"/T=Y4D%.144W96E23U!Y:S=D:'-O4V<]/3\]"CT_
+L25-/+3(P,C(M2E`_0C]'>5)!3D5%-V5I4D]*55EL3QM;2U-624=Y:$L_/0H_
+eofeof
+#'
+
+example['mime.unbuf.strict'] = <<'eofeof'.unpack('u')[0]
+M&R1"-$$[>B1.)48E.25(&RA""ALD0C1!.WHD3B5&)3DE2!LH0@H;)$(D1B11
+M&RA"(&5N9`H;)$(D/20F)"LD2ALH0B`;)$(T03MZ)$X_*3MV&RA"96YD(&]F
+M(&QI;F4*&R1"-$$[>B1./RD[=C1!.WHD3C\I.W8;*$(*0G)O:V5N(&-A<V4*
+M&R1"-$$[>B1./RD;*$)H<V]39ST]/ST@/3])4T\M,C`*,C(M2E`_0C]'>5)!
+M3D5%-V5I4D]0>6LW9&AS;U-G/3T_/0H;)$(T03MZ)$XE1ALH0EM+4U9)1WEH
+$2S\]"F5I
+eofeof
+
+example['mime.ans'] = <<'eofeof'.unpack('u')[0]
+M&R1"-$$[>B1.)48E.25(&RA""ALD0C1!.WHD3B5&)3DE2!LH0@H;)$(D1B11
+M&RA"(&5N9`H;)$(D/20F)"LD2ALH0B`;)$(T03MZ)$X_*3MV&RA"96YD(&]F
+M(&QI;F4*&R1"-$$[>B1./RD[=C1!.WHD3C\I.W8;*$(*0G)O:V5N(&-A<V4*
+M&R1"-$$[>B1./RD;*$)H<V]39ST]/ST@&R1"-$$[>B1./RD[=ALH0@H;)$(T
+603MZ)$XE1ALH0EM+4U9)1WEH2S\]"@`*
+eofeof
+#"
+
+example['mime.unbuf'] = <<'eofeof'.unpack('u')[0]
+M&R1"-$$[>B1.)48E.25(&RA""ALD0C1!.WHD3B5&)3DE2!LH0@H;)$(D1B11
+M&RA"(&5N9`H;)$(D/20F)"LD2ALH0B`;)$(T03MZ)$X_*3MV&RA"96YD(&]F
+M(&QI;F4*&R1"-$$[>B1./RD[=C1!.WHD3C\I.W8;*$(*0G)O:V5N(&-A<V4*
+M&R1"-$$[>B1./RD;*$)H<V]39ST]/ST@&R1"-$$[>B1./RD[=ALH0@H;)$(T
+603MZ)$XE1ALH0EM+4U9)1WEH2S\]"@`*
+eofeof
+#"
+
+example['mime.base64'] = <<'eofeof'.unpack('u')[0]
+M9W-M5"])3&YG<FU#>$I+-&=Q=4,S24LS9W%Q0E%:3TUI-39,,S0Q-&=S5T)1
+M43!+9VUA1%9O3T@*9S)+1%1O3'=K8C)1;$E+;V=Q2T-X24MG9W5M0W%*3EEG
+<<T=#>$E+9V=U;4,X64Q&9W)70S592VMG<6U""F=Q
+eofeof
+#"
+
+example['mime.base64.ans'] = <<'eofeof'.unpack('u')[0]
+M&R1")$M&?B1I)#LD1D0Z)"TD7B0Y)"PA(D5L-7XV83E9)$<A(ALH0@T*&R1"
+M(T<E-R5G)4,E+R1R0C\_="0J)"0D1B0B)&LD*D4Y)$,D1B0B)&LD<R1')#<D
+(9R0F)"L;*$(E
+eofeof
+#'
+
+example['mime.is8859'] = <<'eofeof'.unpack('u')[0]
+M/3])4T\M.#@U.2TQ/U$_*CU#-V%V83\_/2`*4&5E<B!4]G)N9W)E;@I,87-S
+M92!(:6QL97+X92!0971E<G-E;B`@7"`B36EN(&MA97!H97-T(&AA<B!F86%E
+M="!E="!F;V5L(2(*06%R:'5S(%5N:79E<G-I='DL($1%3DU!4DL@(%P@(DUI
+<;B!KYG!H97-T(&AA<B!FY65T(&5T(&;X;"$B"@!K
+eofeof
+
+example['mime.is8859.ans'] = <<'eofeof'.unpack('u')[0]
+M*L=A=F$_(`I0965R(%3V<FYG<F5N"DQA<W-E($AI;&QE<OAE(%!E=&5R<V5N
+M("!<(")-:6X@:V%E<&AE<W0@:&%R(&9A865T(&5T(&9O96PA(@I!87)H=7,@
+M56YI=F5R<VET>2P@1$5.34%22R`@7"`B36EN(&OF<&AE<W0@:&%R(&;E970@
+)970@9OAL(2(*
+eofeof
+#"
+
+print 'JIS  to JIS ... '; test('  ', example['jis'], example['jis'])
+print 'JIS  to SJIS... '; test('-s', example['jis'], example['sjis'])
+print 'JIS  to EUC ... '; test('-e', example['jis'], example['euc'])
+
+print 'SJIS to JIS ... '; test('-j', example['sjis'], example['jis'])
+print 'SJIS to SJIS... '; test('-s', example['sjis'], example['sjis'])
+print 'SJIS to EUC ... '; test('-e', example['sjis'], example['euc'])
+
+print 'EUC  to JIS ... '; test('  ', example['euc'], example['jis'])
+print 'EUC  to SJIS... '; test('-s', example['euc'], example['sjis'])
+print 'EUC  to EUC ... '; test('-e', example['euc'], example['euc'])
+
+
+# Ambigous Case
+print 'Ambiguous Case. '; test(''  , example['amb'], example['amb.euc'])
+
+# Input assumption
+print 'SJIS  Input assumption '
+test('-Sx', example['amb'], example['amb.sjis'])
+
+# X0201 ²¾Ì¾
+# X0201->X0208 conversion
+# X0208 aphabet -> ASCII
+# X0201 Áê¸ßÊÑ´¹
+
+print "\nX0201 test\n\n"
+
+# -X is necessary to allow X0201 in SJIS
+# -Z convert X0208 alphabet to ASCII
+print 'X0201 conversion: SJIS '
+test('-XZ', example['x0201.sjis'], example['x0201.x0208'])
+print 'X0201 conversion: JIS  '
+test('-Z',  example['x0201.jis'],  example['x0201.x0208'])
+print 'X0201 conversion:SI/SO '
+test('-Z',  example['x0201.sosi'], example['x0201.x0208'])
+print 'X0201 conversion: EUC  '
+test('-Z',  example['x0201.euc'],  example['x0201.x0208'])
+# -x means X0201 output
+print 'X0201 output: SJIS     '
+test('-xs', example['x0201.euc'],  example['x0201.sjis'])
+print 'X0201 output: JIS      '
+test('-xj', example['x0201.sjis'], example['x0201.jis'])
+print 'X0201 output: EUC      '
+test('-xe', example['x0201.jis'],  example['x0201.euc'])
+
+# MIME decode
+
+print "\nMIME test\n\n"
+
+# MIME ISO-2022-JP
+
+print "Next test is expeced to Fail.\n"
+
+print 'MIME decode (strict)   '
+tmp = test('-m', example['mime.iso2022'], example['mime.ans.strict'])
+print 'MIME decode (nonstrict)'
+tmp = test('-m', example['mime.iso2022'], example['mime.ans'])
+#    open(OUT,'>tmp1');print OUT pack('u',$tmp);close(OUT);
+# unbuf mode implies more pessimistic decode
+print 'MIME decode (unbuf)    '
+test('-mu', example['mime.iso2022'], example['mime.unbuf'])
+print 'MIME decode (base64)   '
+t = test('-mB', example['mime.base64'],  example['mime.base64.ans'])
+
+# MIME ISO-8859-1
+
+# Without -l, ISO-8859-1 was handled as X0201.
+
+print 'MIME ISO-8859-1 (Q)    '
+test('-ml', example['mime.is8859'], example['mime.is8859.ans'])
diff --git a/ext/openssl/.cvsignore b/ext/openssl/.cvsignore
index 3a9a9f341f..dfb8bfb8bb 100644
--- a/ext/openssl/.cvsignore
+++ b/ext/openssl/.cvsignore
@@ -2,4 +2,3 @@ GNUmakefile
 Makefile
 mkmf.log
 dep
-extconf.h
diff --git a/ext/openssl/MANIFEST b/ext/openssl/MANIFEST
new file mode 100644
index 0000000000..75768b7814
--- /dev/null
+++ b/ext/openssl/MANIFEST
@@ -0,0 +1,62 @@
+MANIFEST
+extconf.rb
+lib/net/ftptls.rb
+lib/net/https.rb
+lib/net/protocols.rb
+lib/net/telnets.rb
+lib/openssl.rb
+lib/openssl/bn.rb
+lib/openssl/buffering.rb
+lib/openssl/cipher.rb
+lib/openssl/digest.rb
+lib/openssl/ssl.rb
+lib/openssl/x509.rb
+openssl_missing.c
+openssl_missing.h
+ossl.c
+ossl.h
+ossl_asn1.c
+ossl_asn1.h
+ossl_bio.c
+ossl_bio.h
+ossl_bn.c
+ossl_bn.h
+ossl_cipher.c
+ossl_cipher.h
+ossl_config.c
+ossl_config.h
+ossl_digest.c
+ossl_digest.h
+ossl_engine.c
+ossl_engine.h
+ossl_hmac.c
+ossl_hmac.h
+ossl_ns_spki.c
+ossl_ns_spki.h
+ossl_ocsp.c
+ossl_ocsp.h
+ossl_pkcs12.c
+ossl_pkcs12.h
+ossl_pkcs7.c
+ossl_pkcs7.h
+ossl_pkey.c
+ossl_pkey.h
+ossl_pkey_dh.c
+ossl_pkey_dsa.c
+ossl_pkey_rsa.c
+ossl_rand.c
+ossl_rand.h
+ossl_ssl.c
+ossl_ssl.h
+ossl_version.h
+ossl_x509.c
+ossl_x509.h
+ossl_x509attr.c
+ossl_x509cert.c
+ossl_x509crl.c
+ossl_x509ext.c
+ossl_x509name.c
+ossl_x509req.c
+ossl_x509revoked.c
+ossl_x509store.c
+ruby_missing.h
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 02e06b7149..a4239a1225 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -33,9 +33,13 @@ if with_config("debug") or enable_config("debug")
   end
 end
 
+
+
 message "=== Checking for system dependent stuff... ===\n"
 have_library("nsl", "t_open")
 have_library("socket", "socket")
+have_header("unistd.h")
+have_header("sys/time.h")
 have_header("assert.h")
 
 message "=== Checking for required stuff... ===\n"
@@ -54,73 +58,71 @@ if !result
   end
 end
 
-unless have_header("openssl/conf_api.h")
-  message "OpenSSL 0.9.6 or later required.\n"
-  exit 1
-end
-
-%w"rb_str_set_len rb_block_call".each {|func| have_func(func, "ruby.h")}
-
 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("HMAC_CTX_copy")
+have_func("X509_STORE_get_ex_data")
+have_func("X509_STORE_set_ex_data")
 have_func("EVP_MD_CTX_create")
+have_func("EVP_MD_CTX_cleanup")
 have_func("EVP_MD_CTX_destroy")
+have_func("PEM_def_callback")
 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("PKCS5_PBKDF2_HMAC")
-have_func("PKCS5_PBKDF2_HMAC_SHA1")
-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("HMAC_CTX_cleanup")
 have_func("X509_CRL_set_version")
+have_func("X509_CRL_set_issuer_name")
 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("SSL_SESSION_get_id")
-have_func("OPENSSL_cleanse")
+have_func("X509_CRL_add0_revoked")
+have_func("CONF_get1_default_config_file")
+have_func("BN_mod_sqr")
+have_func("BN_mod_add")
+have_func("BN_mod_sub")
+have_func("BN_rand_range")
+have_func("BN_pseudo_rand_range")
+have_func("CONF_get1_default_config_file")
+have_func("X509V3_set_nconf")
 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_header("openssl/ocsp.h")
 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
+$distcleanfiles << "GNUmakefile" << "dep"
 create_makefile("openssl")
+if /gcc/ =~ CONFIG["CC"]
+  File.open("GNUmakefile", "w") {|f|
+    f.print <<EOD
+include Makefile
+
+SRCS = $(OBJS:.o=.c)
+
+test-link: $(OBJS)
+	$(CC) $(DLDFLAGS) #{OUTFLAG}.testlink $(OBJS) $(LIBPATH) $(LIBS) $(LOCAL_LIBS)
+	@$(RM) .testlink
+	@echo "Done."
+
+dep:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(SRCS) -MM | \\
+	$(RUBY) -p -e 'BEGIN{S = []' \\
+		-e 'while !ARGV.empty? and /^(\\w+)=(.*)/ =~ ARGV[0]' \\
+		  -e 'S << [/\#{Regexp.quote($$2)}\\//, "$$(\#{$$1})/"]' \\
+		  -e 'ARGV.shift' \\
+		-e 'end' \\
+		-e '}' -e 'S.each(&method(:gsub!))' -- \\
+            'topdir=$(topdir)' 'srcdir=$(srcdir)' 'hdrdir=$(hdrdir)' \\
+	> dep
+
+include dep
+EOD
+  }
+end
 message "Done.\n"
diff --git a/ext/openssl/lib/net/ftptls.rb b/ext/openssl/lib/net/ftptls.rb
index a21c1f6c3c..f433457923 100644
--- a/ext/openssl/lib/net/ftptls.rb
+++ b/ext/openssl/lib/net/ftptls.rb
@@ -29,23 +29,13 @@ require 'net/ftp'
 
 module Net
   class FTPTLS < FTP
-    def connect(host, port=FTP_PORT)
-      @hostname = host
-      super
-    end
-
     def login(user = "anonymous", passwd = nil, acct = nil)
-       store = OpenSSL::X509::Store.new
-       store.set_default_paths
        ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
-       ctx.cert_store = store
-       ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
        ctx.key = nil
        ctx.cert = nil
        voidcmd("AUTH TLS")
        @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
        @sock.connect
-       @sock.post_connection_check(@hostname)
        super(user, passwd, acct)
        voidcmd("PBSZ 0")
     end
diff --git a/ext/openssl/lib/net/https.rb b/ext/openssl/lib/net/https.rb
new file mode 100644
index 0000000000..fb7f53c555
--- /dev/null
+++ b/ext/openssl/lib/net/https.rb
@@ -0,0 +1,188 @@
+=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.
+
+== class Net::HTTP
+
+== Example
+
+Simple HTTP client is here:
+
+    require 'net/http'
+    host, port, path = "localhost", 80, "/"
+    if %r!http://(.*?)(?::(\d+))?(/.*)! =~ ARGV[0]
+      host   = $1
+      port   = $2.to_i if $2
+      path   = $3
+    end
+    h = Net::HTTP.new(host, port)
+    h.get2(path){ |resp| print resp.body }
+
+It can be replaced by follow one:
+
+    require 'net/https'
+    host, port, path = "localhost", 80, "/"
+    if %r!(https?)://(.*?)(?::(\d+))?(/.*)! =~ ARGV[0]
+      scheme = $1
+      host   = $2
+      port   = $3 ? $3.to_i : ((scheme == "http") ? 80 : 443)
+      path   = $4
+    end
+    h = Net::HTTP.new(host, port)
+    h.use_ssl = true if scheme == "https" # enable SSL/TLS
+    h.get2(path){ |resp| print resp.body }
+
+=== Instance Methods
+
+: use_ssl
+    returns ture 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|))
+    Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
+    (This method is appeared in Michal Rokos's OpenSSL extention.)
+
+: key_file=((|path|))
+    Sets a private key file to use in PEM format.
+
+: cert=((|cert|))
+    Sets an OpenSSL::X509::Certificate object as client certificate.
+    (This method is appeared in Michal Rokos's OpenSSL extention.)
+
+: cert_file=((|path|))
+    Sets pathname of a X.509 certification file in PEM format.
+
+: ca_file=((|path|))
+    Sets path of a CA certification file in PEM format.
+    The file can contrain several CA certificats.
+
+: ca_path=((|path|))
+    Sets path of a CA certification directory containing certifications
+    in PEM format.
+
+: 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=((|proc|))
+    Sets the verify callback for the server certification verification.
+
+: verify_depth=((|num|))
+    Sets the maximum depth for the certificate chain verification.
+
+: cert_store=((|store|))
+    Sets the X509::Store to verify peer certificate.
+
+=end
+
+require 'net/protocols'
+require 'net/http'
+
+module Net
+  class HTTP
+    class Conn < HTTPRequest
+      REQUEST_HAS_BODY=false
+      RESPONSE_HAS_BODY=false
+      METHOD="connect"
+
+      def initialize
+        super nil, nil
+      end
+
+      def exec( sock, addr, port, ver )
+        @socket = sock
+        request(addr, port, ver)
+      end
+
+      def request( addr, port, ver )
+        @socket.writeline sprintf('CONNECT %s:%s HTTP/%s', addr, port, ver)
+        @socket.writeline ''
+      end
+    end
+
+    module ProxyMod
+      def edit_path( path )
+        if use_ssl
+          'https://' + addr_port + path
+        else
+          'http://' + addr_port + path
+        end
+      end
+    end
+
+    def self.socket_type
+      SSLIO
+    end
+
+    attr_reader :use_ssl
+    attr_writer :key, :cert
+    attr_writer :ca_file, :ca_path
+    attr_writer :verify_mode, :verify_callback, :verify_depth
+    attr_writer :cert_store, :timeout
+    attr_reader :peer_cert
+
+    alias :default_initialize :initialize
+
+    def initialize(*args)
+      default_initialize(*args)
+      @key = @cert = @ca_file = @ca_path = @verify_mode =
+      @verify_callback = @verify_depth = @timeout = @cert_store = nil
+      @already_connected = false
+    end
+
+    def use_ssl=(flag)
+      if @already_connected && !@use_ssl
+        raise ProtocolError, "connection is alrady set up"
+      end
+      @use_ssl = flag
+    end
+
+    def on_connect
+      if use_ssl
+        if proxy?
+          Conn.new.exec(@socket, @address, @port, "1.0")
+          resp = HTTPResponse.read_new(@socket)
+          if resp.code != '200'
+            raise resp.message
+          end
+        end
+        @socket.key             = @key       if @key
+        @socket.cert            = @cert      if @cert
+        @socket.ca_file         = @ca_file
+        @socket.ca_path         = @ca_path
+        @socket.verify_mode     = @verify_mode
+        @socket.verify_callback = @verify_callback
+        @socket.verify_depth    = @verify_depth
+        @socket.timeout         = @timeout
+        @socket.cert_store      = @cert_store
+        @socket.ssl_connect
+        @peer_cert = @socket.peer_cert
+      end
+      @already_connected = true
+    end
+
+  end
+end
diff --git a/ext/openssl/lib/net/protocols.rb b/ext/openssl/lib/net/protocols.rb
new file mode 100644
index 0000000000..073d4f3027
--- /dev/null
+++ b/ext/openssl/lib/net/protocols.rb
@@ -0,0 +1,56 @@
+=begin
+= $RCSfile$ -- SSL/TLS enhancement for Net.
+
+= 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.
+=end
+
+require 'net/protocol'
+require 'forwardable'
+require 'openssl'
+
+module Net
+  class SSLIO < InternetMessageIO
+    extend Forwardable
+
+    def_delegators(:@ssl_context,
+                   :key=, :cert=, :key_file=, :cert_file=,
+                   :ca_file=, :ca_path=,
+                   :verify_mode=, :verify_callback=, :verify_depth=,
+                   :timeout=, :cert_store=)
+
+    def initialize(addr, port, otime = nil, rtime = nil, dout = nil)
+      super
+      @ssl_context = OpenSSL::SSL::SSLContext.new()
+    end
+
+    def ssl_connect()
+      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
+      @socket = OpenSSL::SSL::SSLSocket.new(@socket, @ssl_context)
+      @socket.sync_close = true
+      @socket.connect
+    end
+
+    def peer_cert
+      @socket.peer_cert
+    end
+  end
+end
diff --git a/ext/openssl/lib/net/telnets.rb b/ext/openssl/lib/net/telnets.rb
index 2b69280432..c7ecbd717a 100644
--- a/ext/openssl/lib/net/telnets.rb
+++ b/ext/openssl/lib/net/telnets.rb
@@ -124,7 +124,9 @@ module Net
         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_file       = @options['CertFile']
             @sock.cert            = @options['Cert'] unless @sock.cert
+            @sock.key_file        = @options['KeyFile']
             @sock.key             = @options['Key'] unless @sock.key
             @sock.ca_cert         = @options['CACert']
             @sock.ca_file         = @options['CAFile']
@@ -134,9 +136,6 @@ module Net
             @sock.verify_callback = @options['VerifyCallback']
             @sock.verify_depth    = @options['VerifyDepth']
             @sock.connect
-            if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE
-              @sock.post_connection_check(@options['Host'])
-            end
             @ssl = true
           end
           ''
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index f10985ed2c..24a9eed136 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -19,7 +19,6 @@ require 'openssl.so'
 require 'openssl/bn'
 require 'openssl/cipher'
 require 'openssl/digest'
-require 'openssl/pkcs7'
 require 'openssl/ssl'
 require 'openssl/x509'
 
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 761a017487..fdbd71bc0c 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -20,8 +20,6 @@ module Buffering
   BLOCK_SIZE = 1024*16
 
   def initialize(*args)
-    @eof = false
-    @rbuffer = ""
     @sync = @io.sync
   end
 
@@ -31,17 +29,20 @@ module Buffering
   private
 
   def fill_rbuff
+    @rbuffer = "" unless defined? @rbuffer
     begin
+      if self.respond_to?(:to_io)
+        IO.select([self.to_io], nil, nil)
+      end
       @rbuffer << self.sysread(BLOCK_SIZE)
-    rescue Errno::EAGAIN
-      retry
     rescue EOFError
       @eof = true
     end
   end
 
   def consume_rbuff(size=nil)
-    if @rbuffer.empty?
+    if @rbuffer.size == 0
+      @eof = nil
       nil
     else
       size = @rbuffer.size unless size
@@ -53,54 +54,20 @@ module Buffering
 
   public
 
-  def read(size=nil, buf=nil)
-    if size == 0
-      if buf
-        buf.clear
-      else
-        buf = ""
-      end
-      return @eof ? nil : buf
-    end
+  def read(size=nil)
+    fill_rbuff unless defined? @rbuffer
+    @eof ||= nil
     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
+    consume_rbuff(size)
   end
 
   def gets(eol=$/)
+    fill_rbuff unless defined? @rbuffer
     idx = @rbuffer.index(eol)
+    @eof ||= nil
     until @eof
       break if idx
       fill_rbuff
@@ -115,7 +82,7 @@ module Buffering
   end
 
   def each(eol=$/)
-    while line = self.gets(eol)
+    while line = self.gets(eol?)
       yield line
     end
   end
@@ -130,13 +97,13 @@ module Buffering
   end
 
   def readline(eol=$/)
-    raise EOFError if eof?
+    raise EOFErorr if eof?
     gets(eol)
   end
 
   def getc
     c = read(1)
-    c ? c[0] : nil
+    c ? c.to_i : nil
   end
 
   def each_byte
@@ -146,7 +113,7 @@ module Buffering
   end
 
   def readchar
-    raise EOFError if eof?
+    raise EOFErorr if eof?
     getc
   end
 
@@ -155,8 +122,8 @@ module Buffering
   end
 
   def eof?
-    fill_rbuff if !@eof && @rbuffer.empty?
-    @eof && @rbuffer.empty?
+    @eof ||= nil
+    @eof && @rbuffer.size == 0
   end
   alias eof eof?
 
@@ -173,16 +140,11 @@ module Buffering
       remain = idx ? idx + $/.size : @wbuffer.length
       nwritten = 0
       while remain > 0
-        str = @wbuffer[nwritten,remain]
-        begin
-          nwrote = syswrite(str)
-        rescue Errno::EAGAIN
-          retry
-        end
+        nwrote = syswrite(@wbuffer[nwritten,remain])
         remain -= nwrote
         nwritten += nwrote
       end
-      @wbuffer[0,nwritten] = ""
+      @wbuffer = ""
     end
   end
 
@@ -200,13 +162,10 @@ module Buffering
 
   def puts(*args)
     s = ""
-    if args.empty?
-      s << "\n"
-    end
     args.each{|arg|
       s << arg.to_s
-      if $/ && /\n\z/ !~ s
-        s << "\n"
+      unless /#{$/}\Z/o =~ s
+        s << $/
       end
     }
     do_write(s)
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index 290e9c1d2d..11153104ee 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -19,47 +19,34 @@
 #require 'openssl'
 
 module OpenSSL
-  class 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)
+  module Cipher
+    %w(AES Cast5 BF DES Idea RC2 RC4 RC5).each{|cipher|
+      eval(<<-EOD)
+        class #{cipher} < Cipher
+          def initialize(*args)
+            args = args.join('-')
+            if args.size == 0
+              super(\"#{cipher}\")
+            else
+              super(\"#{cipher}-#\{args\}\")
+            end
+          end
+        end
+      EOD
     }
 
-    %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)
-    }
-
-    # Generate, set, and return a random key.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
-    def random_key
-      str = OpenSSL::Random.random_bytes(self.key_len)
-      self.key = str
-      return str
-    end
-
-    # Generate, set, and return a random iv.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
-    def random_iv
-      str = OpenSSL::Random.random_bytes(self.iv_len)
-      self.iv = str
-      return str
-    end
-
-    # This class is only provided for backwards compatibility.  Use OpenSSL::Digest in the future.
-    class Cipher < Cipher
-      # add warning
+    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/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index 4810f0121b..58622f543e 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -19,42 +19,25 @@
 #require 'openssl'
 
 module OpenSSL
-  class Digest
-
-    alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
-    if OPENSSL_VERSION_NUMBER > 0x00908000
-      alg += %w(SHA224 SHA256 SHA384 SHA512)
-    end
-
-    def self.digest(name, data)
-        super(data, name)
-    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)"
+  module Digest
+
+    %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1).each{|digest|
+      eval(<<-EOD)
+        class #{digest} < Digest
+          def initialize(data=nil)
+            super(\"#{digest}\", data)
+          end
+
+          def #{digest}::digest(data)
+            Digest::digest(\"#{digest}\", data)
           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)
-    }
 
-    # This class is only provided for backwards compatibility.  Use OpenSSL::Digest in the future.
-    class Digest < Digest
-      def initialize(*args)
-        # add warning
-        super(*args)
-      end
-    end
+          def #{digest}::hexdigest(data)
+            Digest::hexdigest(\"#{digest}\", data)
+          end
+        end
+      EOD
+    }
 
   end # Digest
 end # OpenSSL
diff --git a/ext/openssl/lib/openssl/pkcs7.rb b/ext/openssl/lib/openssl/pkcs7.rb
deleted file mode 100644
index 1f88c1de5e..0000000000
--- a/ext/openssl/lib/openssl/pkcs7.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-=begin
-= $RCSfile$ -- PKCS7
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id: digest.rb 12148 2007-04-05 05:59:22Z technorama $
-=end
-
-module OpenSSL
-  class PKCS7
-    # This class is only provided for backwards compatibility.  Use OpenSSL::PKCS7 in the future.
-    class PKCS7 < PKCS7
-      def initialize(*args)
-        super(*args)
-
-        warn("Warning: OpenSSL::PKCS7::PKCS7 is deprecated after Ruby 1.9; use OpenSSL::PKCS7 instead")
-      end
-    end
-
-  end # PKCS7
-end # OpenSSL
-
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index f722cb0c45..811a935509 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -14,39 +14,10 @@
   $Id$
 =end
 
-require "openssl"
-require "openssl/buffering"
-require "fcntl"
+require 'openssl/buffering'
 
 module OpenSSL
   module SSL
-    class SSLContext
-      DEFAULT_PARAMS = {
-        :ssl_version => "SSLv23",
-        :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-        :ciphers => "ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW",
-        :options => OpenSSL::SSL::OP_ALL,
-      }
-
-      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
-      DEFAULT_CERT_STORE.set_default_paths
-      if defined?(OpenSSL::X509::V_FLAG_CRL_CHECK_ALL)
-        DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
-      end
-
-      def set_params(params={})
-        params = DEFAULT_PARAMS.merge(params)
-        self.ssl_version = params.delete(:ssl_version)
-        params.each{|name, value| self.__send__("#{name}=", value) }
-        if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
-          unless self.ca_file or self.ca_path or self.cert_store
-            self.cert_store = DEFAULT_CERT_STORE
-          end
-        end
-        return params
-      end
-    end
-
     module SocketForwarder
       def addr
         to_io.addr
@@ -56,12 +27,12 @@ module OpenSSL
         to_io.peeraddr
       end
 
-      def setsockopt(level, optname, optval)
+      def getsockopt(level, optname, optval)
         to_io.setsockopt(level, optname, optval)
       end
 
-      def getsockopt(level, optname)
-        to_io.getsockopt(level, optname)
+      def setsockopt(level, optname)
+        to_io.setsockopt(level, optname)
       end
 
       def fcntl(*args)
@@ -71,65 +42,11 @@ module OpenSSL
       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
 
-    def verify_certificate_identity(cert, hostname)
-      should_verify_common_name = true
-      cert.extensions.each{|ext|
-        next if ext.oid != "subjectAltName"
-        ext.value.split(/,\s+/).each{|general_name|
-          if /\ADNS:(.*)/ =~ general_name
-            should_verify_common_name = false
-            reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
-            return true if /\A#{reg}\z/i =~ hostname
-          elsif /\AIP Address:(.*)/ =~ general_name
-            should_verify_common_name = false
-            return true if $1 == hostname
-          end
-        }
-      }
-      if should_verify_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
-      return false
-    end
-    module_function :verify_certificate_identity
-
     class SSLSocket
       include Buffering
       include SocketForwarder
-      include Nonblock
-
-      def post_connection_check(hostname)
-        unless OpenSSL::SSL.verify_certificate_identity(peer_cert, hostname)
-          raise SSLError, "hostname was not match with the server certificate"
-        end
-        return true
-      end
-
-      def session
-        SSL::Session.new(self)
-      rescue SSL::Session::SessionError
-        nil
-      end
     end
 
     class SSLServer
@@ -139,10 +56,6 @@ module OpenSSL
       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
 
@@ -150,14 +63,10 @@ module OpenSSL
         @svr
       end
 
-      def listen(backlog=5)
+      def listen(basklog=5)
         @svr.listen(backlog)
       end
 
-      def shutdown(how=Socket::SHUT_RDWR)
-        @svr.shutdown(how)
-      end
-
       def accept
         sock = @svr.accept
         begin
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index e711bda39c..40b1a6dd15 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -14,7 +14,9 @@
   $Id$
 =end
 
-require "openssl"
+##
+# Should we care what if somebody require this file directly?
+#require 'openssl'
 
 module OpenSSL
   module X509
@@ -42,7 +44,7 @@ module OpenSSL
       def create_ext_from_hash(hash)
         create_ext(hash["oid"], hash["value"], hash["critical"])
       end
-    end
+    end # ExtensionFactory
     
     class Extension
       def to_s # "oid = critical, value"
@@ -59,96 +61,14 @@ module OpenSSL
       def to_a
         [ self.oid, self.value, self.critical? ]
       end
-    end
-
+    end # Extension
+    
     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
+      def self.parse(str, type=ASN1::UTF8STRING)
+        ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=") }
+        self.new(ary, type)
       end
+    end # Name
 
-      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
+  end # X509
+end # OpenSSL
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
index 724f36b8ae..0c0be5fc1f 100644
--- a/ext/openssl/openssl_missing.c
+++ b/ext/openssl/openssl_missing.c
@@ -8,34 +8,29 @@
  * 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)
-void
+int
 HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
 {
-    if (!out || !in) return;
+    if (!out || !in) return 0;
     memcpy(out, in, sizeof(HMAC_CTX));
 
-    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);
+    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)
+#include <openssl/x509_vfy.h>
 
 int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data)
 {
@@ -110,29 +105,6 @@ HMAC_CTX_cleanup(HMAC_CTX *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)
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
index 3450b8130d..7a755f79b5 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -56,51 +56,12 @@ extern "C" {
 	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
 #endif
 
-#if !defined(HAVE_EVP_MD_CTX_INIT)
-void HMAC_CTX_init(HMAC_CTX *ctx);
-#endif
-
-#if !defined(HAVE_HMAC_CTX_COPY)
-void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-#endif
-
-#if !defined(HAVE_HMAC_CTX_CLEANUP)
-void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_CREATE)
+int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
+void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
+int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
 EVP_MD_CTX *EVP_MD_CTX_create(void);
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_INIT)
-void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
 int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_DESTROY)
 void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-#endif
-
-#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))
@@ -110,9 +71,9 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
 #  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
+void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
+void HMAC_CTX_init(HMAC_CTX *ctx);
+void HMAC_CTX_cleanup(HMAC_CTX *ctx);
 
 #if !defined(PKCS7_is_detached)
 #  define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
@@ -122,58 +83,17 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
 #  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
-
-#if !defined(HAVE_X509_STORE_SET_EX_DATA)
-void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
-int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
-#endif
-
-#if !defined(HAVE_X509_CRL_SET_VERSION)
 int X509_CRL_set_version(X509_CRL *x, long version);
-#endif
-
-#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
 int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-#endif
-
-#if !defined(HAVE_X509_CRL_SORT)
 int X509_CRL_sort(X509_CRL *c);
-#endif
-
-#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
 int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-#endif
-
-#if !defined(HAVE_BN_MOD_SQR)
 int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-#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);
-#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);
-#endif
-
-#if !defined(HAVE_BN_RAND_RANGE)
 int BN_rand_range(BIGNUM *r, BIGNUM *range);
-#endif
-
-#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
 int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
-#endif
-
-#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
 char *CONF_get1_default_config_file(void);
-#endif
-
-#if !defined(HAVE_PEM_DEF_CALLBACK)
 int PEM_def_callback(char *buf, int num, int w, void *key);
-#endif
 
 #if defined(__cplusplus)
 }
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 53f476fd65..ac98d6f0a6 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -59,11 +59,11 @@ ossl_x509_ary2sk0(VALUE ary)
     sk = sk_X509_new_null();
     if (!sk) ossl_raise(eOSSLError, NULL); 
 
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
+    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"); 
+            ossl_raise(eOSSLError, "object except X509 cert is in array"); 
         }
         x509 = DupX509CertPtr(val); /* NEED TO DUP */
         sk_X509_push(sk, x509);
@@ -131,7 +131,7 @@ ossl_buf2str(char *buf, int len)
     int status = 0;
 
     str = rb_protect((VALUE(*)_((VALUE)))ossl_str_new, len, &status);
-    if(!NIL_P(str)) memcpy(RSTRING_PTR(str), buf, len);
+    if(!NIL_P(str)) memcpy(RSTRING(str)->ptr, buf, len);
     OPENSSL_free(buf);
     if(status) rb_jump_tag(status);
 
@@ -170,7 +170,7 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
 	rflag = flag ? Qtrue : Qfalse;
 	pass  = rb_protect(ossl_pem_passwd_cb0, rflag, &status);
 	if (status) return -1; /* exception was raised. */
-	len = RSTRING_LEN(pass);
+	len = RSTRING(pass)->len;
 	if (len < 4) { /* 4 is OpenSSL hardcoded limit */
 	    rb_warning("password must be longer than 4 bytes");
 	    continue;
@@ -179,7 +179,7 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
 	    rb_warning("password must be shorter then %d bytes", max_len-1);
 	    continue;
 	}
-	memcpy(buf, RSTRING_PTR(pass), len);
+	memcpy(buf, RSTRING(pass)->ptr, len);
 	break;
     }
     return len;
@@ -278,61 +278,28 @@ ossl_raise(VALUE exc, const char *fmt, ...)
     va_list args;
     char buf[BUFSIZ];
     const char *msg;
-    long e;
+    long e = ERR_get_error();
     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);
+	len += snprintf(buf+len, BUFSIZ-len, ": ");
     }
-    if (len < BUFSIZ && e) {
+    if (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();
+	len += snprintf(buf+len, BUFSIZ-len, "%s", msg);
     }
-    ERR_clear_error();
 
-    if(len > BUFSIZ) len = strlen(buf);
     rb_exc_raise(rb_exc_new(exc, buf, len));
 }
 
 /*
- * call-seq:
- *   OpenSSL.errors -> [String...]
- *
- * See any remaining errors held in queue.
- *
- * Any errors you see here are probably due to a bug in ruby's OpenSSL implementation.
- */
-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;
@@ -353,23 +320,12 @@ ossl_debug(const char *fmt, ...)
 }
 #endif
 
-/*
- * call-seq:
- *   OpenSSL.debug -> true | false
- */
 static VALUE
 ossl_debug_get(VALUE self)
 {
     return dOSSL;
 }
 
-/*
- * call-seq:
- *   OpenSSL.debug = boolean -> boolean
- *
- * Turns on or off CRYPTO_MEM_CHECK.
- * Also shows some debugging message on stderr.
- */
 static VALUE
 ossl_debug_set(VALUE self, VALUE val)
 {
@@ -406,7 +362,6 @@ Init_openssl()
      */
     /* CRYPTO_malloc_init(); */
     /* ENGINE_load_builtin_engines(); */
-    OpenSSL_add_ssl_algorithms();
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
     SSL_load_error_strings();
@@ -446,8 +401,8 @@ Init_openssl()
     /*
      * Verify callback Proc index for ext-data
      */
-    if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, "ossl_verify_cb_idx", 0, 0, 0)) < 0)
-        ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
+    ossl_verify_cb_idx =
+	X509_STORE_CTX_get_ex_new_index(0, "ossl_verify_cb_idx", 0, 0, 0);
 
     /*
      * Init debug core
@@ -455,7 +410,6 @@ Init_openssl()
     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
@@ -473,7 +427,6 @@ Init_openssl()
     Init_ossl_ns_spki();
     Init_ossl_pkcs12();
     Init_ossl_pkcs7();
-    Init_ossl_pkcs5();
     Init_ossl_pkey();
     Init_ossl_rand();
     Init_ossl_ssl();
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 3cc30ae2e8..c5054beba2 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -11,26 +11,10 @@
 #if !defined(_OSSL_H_)
 #define _OSSL_H_
 
-#include RUBY_EXTCONF_H
-
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
-#if 0
-  mOSSL = rb_define_module("OpenSSL");
-  mX509 = rb_define_module_under(mOSSL, "X509");
-#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:
@@ -45,12 +29,8 @@ extern "C" {
 #endif
 
 #if defined(_WIN32)
+#  define OpenFile WINAPI_OpenFile
 #  define OSSL_NO_CONF_API 1
-#  ifdef USE_WINSOCK2
-#    include <winsock2.h>
-#  else
-#    include <winsock.h>
-#  endif
 #endif
 #include <errno.h>
 #include <openssl/err.h>
@@ -65,7 +45,7 @@ extern "C" {
 #include <openssl/conf_api.h>
 #undef X509_NAME
 #undef PKCS7_SIGNER_INFO
-#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ST_ENGINE)
+#if defined(HAVE_OPENSSL_ENGINE_H) && !defined(OPENSSL_NO_ENGINE)
 #  define OSSL_ENGINE_ENABLED
 #  include <openssl/engine.h>
 #endif
@@ -73,6 +53,18 @@ extern "C" {
 #  define OSSL_OCSP_ENABLED
 #  include <openssl/ocsp.h>
 #endif
+#if defined(_WIN32)
+#  undef OpenFile
+#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>
 
 /*
  * Common Module
@@ -123,10 +115,11 @@ 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_LEN(str);\
-    int newlen = (p) - (unsigned char*)RSTRING_PTR(str);\
+    int len = RSTRING(str)->len;\
+    int newlen = (p) - (unsigned char*)RSTRING(str)->ptr;\
     assert(newlen <= len);\
-    rb_str_set_len(str, newlen);\
+    RSTRING(str)->len = newlen;\
+    RSTRING(str)->ptr[newlen] = 0;\
 }while(0)
 
 /*
@@ -171,7 +164,7 @@ extern VALUE dOSSL;
   if (dOSSL == Qtrue) { \
     fprintf(stderr, "OSSL_DEBUG: "); \
     fprintf(stderr, fmt, ##__VA_ARGS__); \
-    fprintf(stderr, " [%s:%d]\n", __FILE__, __LINE__); \
+    fprintf(stderr, " [in %s (%s:%d)]\n", __func__, __FILE__, __LINE__); \
   } \
 } while (0)
 
@@ -207,7 +200,6 @@ void ossl_debug(const char *, ...);
 #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"
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 8ceea95021..f0d8dda9b8 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -42,19 +42,21 @@ asn1time_to_time(ASN1_TIME *time)
 	} else {
 	    tm.tm_year += 1900;
 	}
+	tm.tm_mon -= 1;
 	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" );
 	} 
+	tm.tm_mon -= 1;
 	break;
     default:
 	rb_warning("unknown time format");
         return Qnil;
     }
     argv[0] = INT2NUM(tm.tm_year);
-    argv[1] = INT2NUM(tm.tm_mon);
+    argv[1] = INT2NUM(tm.tm_mon+1);
     argv[2] = INT2NUM(tm.tm_mday);
     argv[3] = INT2NUM(tm.tm_hour);
     argv[4] = INT2NUM(tm.tm_min);
@@ -75,15 +77,6 @@ time_to_time_t(VALUE 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.
  */
@@ -196,7 +189,7 @@ static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
 static ASN1_BOOLEAN
 obj_to_asn1bool(VALUE obj)
 {
-     return RTEST(obj) ? 0xff : 0x100;
+     return RTEST(obj) ? 255 : 0;
 }
 
 static ASN1_INTEGER*
@@ -214,7 +207,7 @@ obj_to_asn1bstr(VALUE obj, long unused_bits)
     StringValue(obj);
     if(!(bstr = ASN1_BIT_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
-    ASN1_BIT_STRING_set(bstr, RSTRING_PTR(obj), RSTRING_LEN(obj));
+    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);
 
@@ -229,7 +222,7 @@ obj_to_asn1str(VALUE obj)
     StringValue(obj);
     if(!(str = ASN1_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
-    ASN1_STRING_set(str, RSTRING_PTR(obj), RSTRING_LEN(obj));
+    ASN1_STRING_set(str, RSTRING(obj)->ptr, RSTRING(obj)->len);
 
     return str;
 }
@@ -253,8 +246,8 @@ obj_to_asn1obj(VALUE obj)
     ASN1_OBJECT *a1obj;
 
     StringValue(obj);
-    a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 0);
-    if(!a1obj) a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 1);
+    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;
@@ -295,7 +288,7 @@ obj_to_asn1derstr(VALUE obj)
     str = ossl_to_der(obj);
     if(!(a1str = ASN1_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
-    ASN1_STRING_set(a1str, RSTRING_PTR(str), RSTRING_LEN(str));
+    ASN1_STRING_set(a1str, RSTRING(str)->ptr, RSTRING(str)->len);
 
     return a1str;
 }
@@ -445,7 +438,7 @@ decode_time(unsigned char* der, int length)
 /********/
 
 typedef struct {
-    const char *name;
+    char *name;
     VALUE *klass;
 } ossl_asn1_info_t;
 
@@ -574,7 +567,7 @@ ossl_asn1_default_tag(VALUE obj)
 	    return i;
 	}
     }
-    ossl_raise(eASN1Error, "universal tag for %s not found",
+    ossl_raise(eASN1Error, "not found universal tag for %s",
 	       rb_class2name(CLASS_OF(obj)));
 
     return -1; /* dummy */
@@ -657,7 +650,7 @@ 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_raise(eASN1Error, "too large tag number for Universal");
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
     ossl_asn1_set_tag_class(self, tag_class);
@@ -678,7 +671,7 @@ static VALUE
 join_der(VALUE enumerable)
 {
     VALUE str = rb_str_new(0, 0);
-    rb_block_call(enumerable, rb_intern("each"), 0, 0, join_der_i, str);
+    rb_iterate(rb_each, enumerable, join_der_i, str);
     return str;
 }
 
@@ -699,13 +692,13 @@ ossl_asn1data_to_der(VALUE self)
 
     tag = ossl_asn1_tag(self);
     tag_class = ossl_asn1_tag_class(self);
-    if((length = ASN1_object_size(1, RSTRING_LEN(value), tag)) <= 0)
+    if((length = ASN1_object_size(1, RSTRING(value)->len, tag)) <= 0)
 	ossl_raise(eASN1Error, NULL);
     der = rb_str_new(0, length);
-    p = RSTRING_PTR(der);
-    ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class);
-    memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
-    p += RSTRING_LEN(value);
+    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;
@@ -766,7 +759,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
 	if(tag_class == sUNIVERSAL &&
 	   tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass){
 	    VALUE klass = *ossl_asn1_info[tag].klass;
-	    long flag = 0;
+	    long flag;
 	    if(!rb_obj_is_kind_of(value, rb_cArray)){
 		switch(tag){
 		case V_ASN1_BOOLEAN:
@@ -820,14 +813,13 @@ 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_PTR(tmp);
-    ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 1);
+    StringValue(obj);
+    p = RSTRING(obj)->ptr;
+    ossl_asn1_decode0(&p, RSTRING(obj)->len, &offset, 0, 0, 1);
 
-    return Qnil;
+    return obj;
 }
 
 static VALUE
@@ -836,12 +828,11 @@ 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_PTR(tmp);
-    ary = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 1, 0);
+    StringValue(obj);
+    p = RSTRING(obj)->ptr;
+    ary = ossl_asn1_decode0(&p, RSTRING(obj)->len, &offset, 0, 1, 0);
     ret = rb_ary_entry(ary, 0);
 
     return ret;
@@ -853,12 +844,11 @@ 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_PTR(tmp);
-    ret = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 0);
+    StringValue(obj);
+    p = RSTRING(obj)->ptr;
+    ret = ossl_asn1_decode0(&p, RSTRING(obj)->len, &offset, 0, 0, 0);
 
     return ret;
 }
@@ -875,13 +865,13 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
         if(NIL_P(tagging))
 	    tagging = ID2SYM(sEXPLICIT);
 	if(!SYMBOL_P(tagging))
-	    ossl_raise(eASN1Error, "invalid tag default");
+	    ossl_raise(eASN1Error, "invelid tag default");
 	if(NIL_P(tag_class))
 	    tag_class = ID2SYM(sCONTEXT_SPECIFIC);
 	if(!SYMBOL_P(tag_class))
-	    ossl_raise(eASN1Error, "invalid tag class");
+	    ossl_raise(eASN1Error, "invelid tag class");
 	if(SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
-	    ossl_raise(eASN1Error, "tag number for Universal too large");
+	    ossl_raise(eASN1Error, "too large tag number for Universal");
     }
     else{
 	tag = INT2NUM(ossl_asn1_default_tag(self));
@@ -896,30 +886,6 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
     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)
 {
@@ -934,24 +900,24 @@ ossl_asn1prim_to_der(VALUE 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);
+    length = ASN1_object_size(1, i2d_ASN1_TYPE(asn1, NULL), tn);
     if(!(buf = OPENSSL_malloc(length))){
-	ossl_ASN1_TYPE_free(asn1);
+	ASN1_TYPE_free(asn1);
 	ossl_raise(eASN1Error, "cannot alloc buffer");
     }
     p = buf;
-    if(tc == V_ASN1_UNIVERSAL) ossl_i2d_ASN1_TYPE(asn1, &p);
+    if(tc == V_ASN1_UNIVERSAL) 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);
+	    ASN1_put_object(&p, 1, i2d_ASN1_TYPE(asn1, NULL), tn, tc);
+	    i2d_ASN1_TYPE(asn1, &p);
 	}
 	else{
-	    ossl_i2d_ASN1_TYPE(asn1, &p);
+	    i2d_ASN1_TYPE(asn1, &p);
 	    *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
 	}
     }
-    ossl_ASN1_TYPE_free(asn1);
+    ASN1_TYPE_free(asn1);
     reallen = p - buf;
     assert(reallen <= length);
     str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */
@@ -960,7 +926,7 @@ ossl_asn1prim_to_der(VALUE self)
 }
 
 static VALUE
-ossl_asn1cons_to_der(VALUE self)
+ossl_asn1cons_to_der(self)
 {
     int tag, tn, tc, explicit;
     long seq_len, length;
@@ -973,21 +939,21 @@ ossl_asn1cons_to_der(VALUE self)
     explicit = ossl_asn1_is_explicit(self);
     value = join_der(ossl_asn1_get_value(self));
 
-    seq_len = ASN1_object_size(1, RSTRING_LEN(value), tag);
+    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_PTR(str);
+    p = RSTRING(str)->ptr;
     if(tc == V_ASN1_UNIVERSAL)
-	ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
+	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_LEN(value), tag, V_ASN1_UNIVERSAL);
+	    ASN1_put_object(&p, 1, RSTRING(value)->len, tag, V_ASN1_UNIVERSAL);
 	}
-	else ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
+	else ASN1_put_object(&p, 1, RSTRING(value)->len, tn, tc);
     }
-    memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
-    p += RSTRING_LEN(value);
+    memcpy(p, RSTRING(value)->ptr, RSTRING(value)->len);
+    p += RSTRING(value)->len;
     ossl_str_adjust(str, p);
 
     return str;
@@ -1007,7 +973,7 @@ ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
     StringValue(sn);
     StringValue(ln);
 
-    if(!OBJ_create(RSTRING_PTR(oid), RSTRING_PTR(sn), RSTRING_PTR(ln)))
+    if(!OBJ_create(RSTRING(oid)->ptr, RSTRING(sn)->ptr, RSTRING(ln)->ptr))
 	ossl_raise(eASN1Error, NULL);
 
     return Qtrue;
@@ -1087,10 +1053,6 @@ 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");
@@ -1112,9 +1074,9 @@ Init_ossl_asn1()
     }
 
     cASN1Data = rb_define_class_under(mASN1, "ASN1Data", rb_cObject);
-    rb_attr(cASN1Data, rb_intern("value"), 1, 1, 0);
-    rb_attr(cASN1Data, rb_intern("tag"), 1, 1, 0);
-    rb_attr(cASN1Data, rb_intern("tag_class"), 1, 1, 0);
+    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);
 
@@ -1166,5 +1128,5 @@ do{\
     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, 0);
+    rb_attr(cASN1BitString, rb_intern("unused_bits"), 1, 1, Qtrue);
 }
diff --git a/ext/openssl/ossl_asn1.h b/ext/openssl/ossl_asn1.h
index 8aad9f970d..919ede0f3b 100644
--- a/ext/openssl/ossl_asn1.h
+++ b/ext/openssl/ossl_asn1.h
@@ -18,11 +18,6 @@ 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 *);
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
index 6db1fb9a62..8e80f412ee 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -9,9 +9,6 @@
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
 BIO *
 ossl_obj2bio(VALUE obj)
@@ -19,29 +16,16 @@ ossl_obj2bio(VALUE obj)
     BIO *bio;
 
     if (TYPE(obj) == T_FILE) {
-	rb_io_t *fptr;
-	FILE *fp;
-	int fd;
-
+	OpenFile *fptr;
 	GetOpenFile(obj, fptr);
 	rb_io_check_readable(fptr);
-	if ((fd = dup(FPTR_TO_FD(fptr))) < 0){
-	    rb_sys_fail(0);
-	}
-	if (!(fp = fdopen(fd, "r"))){
-	    close(fd);
-	    rb_sys_fail(0);
-	}
-	if (!(bio = BIO_new_fp(fp, BIO_CLOSE))){
-	    fclose(fp);
-	    ossl_raise(eOSSLError, NULL);
-	}
-    }
+	bio = BIO_new_fp(fptr->f, BIO_NOCLOSE);
+    }       
     else {
 	StringValue(obj);
-	bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LEN(obj));
-	if (!bio) ossl_raise(eOSSLError, NULL);
+	bio = BIO_new_mem_buf(RSTRING(obj)->ptr, RSTRING(obj)->len);
     }
+    if (!bio) ossl_raise(eOSSLError, NULL);
 
     return bio;
 }
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index 6856476261..c3a371a008 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -40,7 +40,7 @@ VALUE eBNError;
  * Public
  */
 VALUE
-ossl_bn_new(const BIGNUM *bn)
+ossl_bn_new(BIGNUM *bn)
 {
     BIGNUM *newbn;
     VALUE obj;
@@ -100,13 +100,6 @@ ossl_bn_alloc(VALUE klass)
     return obj;
 }
 
-/*
- * call-seq:
- *    BN.new => aBN
- *    BN.new(bn) => aBN
- *    BN.new(string) => aBN
- *    BN.new(string, 0 | 2 | 10 | 16) => aBN
- */
 static VALUE
 ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -114,11 +107,11 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
     VALUE str, bs;
     int base = 10;
 
+    GetBN(self, bn);
+
     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;
 
@@ -128,25 +121,27 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
 	}
 	return self;
     }
+    str = rb_String(str);
+    StringValue(str);
 
     switch (base) {
     case 0:
-	if (!BN_mpi2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
+	if (!BN_mpi2bn(RSTRING(str)->ptr, RSTRING(str)->len, bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 2:
-	if (!BN_bin2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
+	if (!BN_bin2bn(RSTRING(str)->ptr, RSTRING(str)->len, bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 10:
-	if (!BN_dec2bn(&bn, RSTRING_PTR(str))) {
+	if (!BN_dec2bn(&bn, RSTRING(str)->ptr)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 16:
-	if (!BN_hex2bn(&bn, RSTRING_PTR(str))) {
+	if (!BN_hex2bn(&bn, RSTRING(str)->ptr)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
@@ -156,19 +151,6 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-/*
- * call-seq:
- *    bn.to_s => string
- *    bn.to_s(base) => string
- *
- * === Parameters
- * * +base+ - integer
- * * * Valid values:
- * * * * 0 - MPI
- * * * * 2 - binary
- * * * * 10 - the default
- * * * * 16 - hex
- */
 static VALUE
 ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
 {
@@ -177,21 +159,22 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
     int base = 10, len;
     char *buf;
 
+    GetBN(self, bn);
+	
     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_PTR(str)) != 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_PTR(str)) != len)
+	if (BN_bn2bin(bn, RSTRING(str)->ptr) != len)
 	    ossl_raise(eBNError, NULL);
 	break;
     case 10:
@@ -209,10 +192,6 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
     return str;
 }
 
-/*
- * call-seq:
- *    bn.to_i => integer
- */
 static VALUE
 ossl_bn_to_i(VALUE self)
 {
@@ -257,11 +236,6 @@ ossl_bn_coerce(VALUE self, VALUE other)
 }
 
 #define BIGNUM_BOOL1(func)				\
-    /*							\
-     * call-seq:					\
-     *   bn.##func -> true | false			\
-     *							\
-     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self)				\
     {							\
@@ -277,11 +251,6 @@ BIGNUM_BOOL1(is_one);
 BIGNUM_BOOL1(is_odd);
 
 #define BIGNUM_1c(func)					\
-    /*							\
-     * call-seq:					\
-     *   bn.##func -> aBN				\
-     *							\
-     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self)				\
     {							\
@@ -301,11 +270,6 @@ BIGNUM_BOOL1(is_odd);
 BIGNUM_1c(sqr);
 
 #define BIGNUM_2(func)					\
-    /*							\
-     * call-seq:					\
-     *   bn.##func(bn2) -> aBN				\
-     *							\
-     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE other)		\
     {							\
@@ -326,11 +290,6 @@ BIGNUM_2(add);
 BIGNUM_2(sub);
 
 #define BIGNUM_2c(func)						\
-    /*								\
-     * call-seq:						\
-     *   bn.##func(bn2) -> aBN					\
-     *								\
-     */								\
     static VALUE						\
     ossl_bn_##func(VALUE self, VALUE other)			\
     {								\
@@ -354,10 +313,6 @@ BIGNUM_2c(gcd);
 BIGNUM_2c(mod_sqr);
 BIGNUM_2c(mod_inverse);
 
-/*
- * call-seq:
- *    bn1 / bn2 => [result, remainder]
- */
 static VALUE
 ossl_bn_div(VALUE self, VALUE other)
 {
@@ -385,11 +340,6 @@ ossl_bn_div(VALUE self, VALUE other)
 }
 
 #define BIGNUM_3c(func)						\
-    /*								\
-     * call-seq:						\
-     *   bn.##func(bn1, bn2) -> aBN				\
-     *								\
-     */								\
     static VALUE						\
     ossl_bn_##func(VALUE self, VALUE other1, VALUE other2)	\
     {								\
@@ -413,11 +363,6 @@ BIGNUM_3c(mod_mul);
 BIGNUM_3c(mod_exp);
 
 #define BIGNUM_BIT(func)				\
-    /*							\
-     * call-seq:					\
-     *   bn.##func(bit) -> self				\
-     *							\
-     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE bit)		\
     {							\
@@ -432,38 +377,28 @@ BIGNUM_BIT(set_bit);
 BIGNUM_BIT(clear_bit);
 BIGNUM_BIT(mask_bits);
 
-/*
- * call-seq:
- *    bn.bit_set?(bit) => true | false
- */
 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)) {
+
+    if (BN_is_bit_set(bn, NUM2INT(bit))) {
 	return Qtrue;
     }
     return Qfalse;
 }
 
 #define BIGNUM_SHIFT(func)				\
-    /*							\
-     * call-seq:					\
-     *   bn.##func(bits) -> aBN				\
-     *							\
-     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE bits)		\
     {							\
 	BIGNUM *bn, *result;				\
 	int b;						\
 	VALUE obj;					\
-	b = NUM2INT(bits);				\
 	GetBN(self, bn);				\
+	b = NUM2INT(bits);				\
 	if (!(result = BN_new())) {			\
 		ossl_raise(eBNError, NULL);		\
 	}						\
@@ -477,32 +412,7 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit)
 BIGNUM_SHIFT(lshift);
 BIGNUM_SHIFT(rshift);
 
-#define BIGNUM_SELF_SHIFT(func)				\
-    /*							\
-     * call-seq:					\
-     *   bn.##func!(bits) -> self			\
-     *							\
-     */							\
-    static VALUE					\
-    ossl_bn_self_##func(VALUE self, VALUE bits)		\
-    {							\
-	BIGNUM *bn;					\
-	int b;						\
-	b = NUM2INT(bits);				\
-	GetBN(self, bn);				\
-	if (!BN_##func(bn, bn, b))			\
-		ossl_raise(eBNError, NULL);		\
-	return self;					\
-    }
-BIGNUM_SELF_SHIFT(lshift);
-BIGNUM_SELF_SHIFT(rshift);
-
 #define BIGNUM_RAND(func)					\
-    /*								\
-     * call-seq:						\
-     *   BN.##func(bits [, fill [, odd]]) -> aBN		\
-     *								\
-     */								\
     static VALUE						\
     ossl_bn_s_##func(int argc, VALUE *argv, VALUE klass)	\
     {								\
@@ -515,7 +425,7 @@ BIGNUM_SELF_SHIFT(rshift);
 	    bottom = (odd == Qtrue) ? 1 : 0;			\
 	    /* FALLTHROUGH */					\
 	case 2:							\
-	    top = NUM2INT(fill);				\
+	    top = FIX2INT(fill);				\
 	}							\
 	b = NUM2INT(bits);					\
 	if (!(result = BN_new())) {				\
@@ -532,11 +442,6 @@ BIGNUM_RAND(rand);
 BIGNUM_RAND(pseudo_rand);
 
 #define BIGNUM_RAND_RANGE(func)					\
-    /*								\
-     * call-seq:						\
-     *   BN.##func(range) -> aBN				\
-     *								\
-     */								\
     static VALUE						\
     ossl_bn_s_##func##_range(VALUE klass, VALUE range)		\
     {								\
@@ -555,16 +460,6 @@ BIGNUM_RAND(pseudo_rand);
 BIGNUM_RAND_RANGE(rand);
 BIGNUM_RAND_RANGE(pseudo_rand);
 
-/*
- * call-seq:
- *    BN.generate_prime(bits, [, safe [, add [, rem]]]) => bn
- *
- * === Parameters
- * * +bits+ - integer
- * * +safe+ - boolean
- * * +add+ - BN
- * * +rem+ - BN
- */
 static VALUE
 ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
 {
@@ -580,8 +475,12 @@ ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
 	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 = NIL_P(vrem) ? NULL : GetBNPtr(vrem);
+	rem = GetBNPtr(vrem);
     }
     if (!(result = BN_new())) {
 	ossl_raise(eBNError, NULL);
@@ -592,15 +491,10 @@ ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
     }
     WrapBN(klass, obj, result);
     
-    return obj;
+	return obj;
 }
 
 #define BIGNUM_NUM(func)			\
-    /*							\
-     * call-seq:					\
-     *   bn.##func -> integer				\
-     *							\
-     */							\
     static VALUE 				\
     ossl_bn_##func(VALUE self)			\
     {						\
@@ -630,11 +524,6 @@ ossl_bn_copy(VALUE self, VALUE other)
 }
 
 #define BIGNUM_CMP(func)				\
-    /*							\
-     * call-seq:					\
-     *   bn.##func(bn2) -> integer			\
-     *							\
-     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE other)		\
     {							\
@@ -654,14 +543,6 @@ ossl_bn_eql(VALUE self, VALUE other)
     return Qfalse;
 }
 
-/*
- * call-seq:
- *    bn.prime? => true | false
- *    bn.prime?(checks) => true | false
- *
- * === Parameters
- * * +checks+ - integer
- */
 static VALUE
 ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
 {
@@ -669,10 +550,11 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
     VALUE vchecks;
     int checks = BN_prime_checks;
 
+    GetBN(self, bn);
+	
     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;
@@ -685,16 +567,6 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-/*
- * call-seq:
- *    bn.prime_fasttest? => true | false
- *    bn.prime_fasttest?(checks) => true | false
- *    bn.prime_fasttest?(checks, trial_div) => true | false
- *
- * === Parameters
- * * +checks+ - integer
- * * +trial_div+ - boolean
- */
 static VALUE
 ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
 {
@@ -702,12 +574,13 @@ ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
     VALUE vchecks, vtrivdiv;
     int checks = BN_prime_checks, do_trial_division = 1;
 
+    GetBN(self, bn);
+	
     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;
@@ -731,10 +604,6 @@ ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
 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");
     }
@@ -807,10 +676,8 @@ Init_ossl_bn()
     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);
-    rb_define_method(cBN, ">>", ossl_bn_rshift, 1);
-    rb_define_method(cBN, "lshift!", ossl_bn_self_lshift, 1);
-    rb_define_method(cBN, "rshift!", ossl_bn_self_rshift, 1);
     /* lshift1 - DON'T IMPL. */
+    rb_define_method(cBN, ">>", ossl_bn_rshift, 1);
     /* rshift1 - DON'T IMPL. */
 
     /*
diff --git a/ext/openssl/ossl_bn.h b/ext/openssl/ossl_bn.h
index d6c396227b..12aa484873 100644
--- a/ext/openssl/ossl_bn.h
+++ b/ext/openssl/ossl_bn.h
@@ -14,12 +14,9 @@
 extern VALUE cBN;
 extern VALUE eBNError;
 
-extern BN_CTX *ossl_bn_ctx;
-
-VALUE ossl_bn_new(const BIGNUM *);
+VALUE ossl_bn_new(BIGNUM *);
 BIGNUM *GetBNPtr(VALUE);
 void Init_ossl_bn(void);
 
-
 #endif /* _OSS_BN_H_ */
 
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index b680dc6e64..93b3f6ccf9 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -26,6 +26,7 @@
 /*
  * Classes
  */
+VALUE mCipher;
 VALUE cCipher;
 VALUE eCipherError;
 
@@ -53,7 +54,7 @@ ossl_cipher_new(const EVP_CIPHER *cipher)
     ret = ossl_cipher_alloc(cCipher);
     GetCipher(ret, ctx);
     EVP_CIPHER_CTX_init(ctx);
-    if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
+    if (EVP_CipherInit(ctx, cipher, NULL, NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
 
     return ret;
@@ -78,19 +79,10 @@ ossl_cipher_alloc(VALUE klass)
     VALUE obj;
 
     MakeCipher(obj, klass, ctx);
-    EVP_CIPHER_CTX_init(ctx);
 	
     return obj;
 }
 
-/*
- *  call-seq:
- *     Cipher.new(string) -> cipher
- *
- *  The string must contain a valid cipher name like "AES-128-CBC" or "3DES".
- *
- *  A list of cipher names is available by calling OpenSSL::Cipher.ciphers.
- */
 static VALUE
 ossl_cipher_initialize(VALUE self, VALUE str)
 {
@@ -98,13 +90,16 @@ ossl_cipher_initialize(VALUE self, VALUE str)
     const EVP_CIPHER *cipher;
     char *name;
 
-    name = StringValuePtr(str);
     GetCipher(self, ctx);
+
+    name = StringValuePtr(str);
+
     if (!(cipher = EVP_get_cipherbyname(name))) {
-	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%s)", 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);
+    EVP_CIPHER_CTX_init(ctx);
+    if (EVP_CipherInit(ctx, cipher, NULL, NULL, -1) != 1)
+		ossl_raise(eCipherError, NULL);
 
     return self;
 }
@@ -118,251 +113,143 @@ ossl_cipher_copy(VALUE self, VALUE other)
 
     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;
-}
-
-/*
- *  call-seq:
- *     Cipher.ciphers -> array[string...]
- *
- *  Returns the names of all available ciphers in an array.
- */
-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);
+    memcpy(ctx1, ctx2, sizeof(EVP_CIPHER_CTX));
 
-    return ary;
-#else
-    rb_notimplement();
-#endif
+    return self;
 }
 
-/*
- *  call-seq:
- *     cipher.reset -> self
- *
- *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, -1).
- */
 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)
+    if (EVP_CipherInit(ctx, NULL, NULL, NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
 		
     return self;
 }
 
 static VALUE
-ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
+ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
 {
     EVP_CIPHER_CTX *ctx;
-    unsigned char key[EVP_MAX_KEY_LENGTH], *p_key = NULL;
-    unsigned char iv[EVP_MAX_IV_LENGTH], *p_iv = NULL;
+    unsigned char iv[EVP_MAX_IV_LENGTH], key[EVP_MAX_KEY_LENGTH];
     VALUE pass, init_v;
 
-    if(rb_scan_args(argc, argv, "02", &pass, &init_v) > 0){
+    GetCipher(self, ctx);
+	
+    rb_scan_args(argc, argv, "02", &pass, &init_v);
+	
+    if (NIL_P(init_v)) {
 	/*
-	 * oops. this code mistakes salt for IV.
-	 * We deprecated the arguments for this method, but we decided
-	 * keeping this behaviour for backward compatibility.
-	 */
-	char *cname  = rb_class2name(rb_obj_class(self));
-	rb_warn("argumtents for %s#encrypt and %s#decrypt were deprecated; "
-                "use %s#pkcs5_keyivgen to derive key and IV",
-                cname, cname, cname);
-	StringValue(pass);
-	GetCipher(self, ctx);
-	if (NIL_P(init_v)) memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv));
-	else{
-	    StringValue(init_v);
-	    if (EVP_MAX_IV_LENGTH > RSTRING_LEN(init_v)) {
-		memset(iv, 0, EVP_MAX_IV_LENGTH);
-		memcpy(iv, RSTRING_PTR(init_v), RSTRING_LEN(init_v));
-	    }
-	    else memcpy(iv, RSTRING_PTR(init_v), sizeof(iv));
-	}
-	EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
-		       RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
-	p_key = key;
-	p_iv = iv;
+	 * TODO:
+	 * random IV generation!
+	 */ 
+	memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv));
+	/*
+	  RAND_add(data,i,0); where from take data?
+	  if (RAND_pseudo_bytes(iv, 8) < 0) {
+	  ossl_raise(eCipherError, NULL);
+	  }
+	*/
     }
     else {
-	GetCipher(self, ctx);
+	init_v = rb_obj_as_string(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));
+	}
     }
-    if (EVP_CipherInit_ex(ctx, NULL, NULL, p_key, p_iv, mode) != 1) {
-	ossl_raise(eCipherError, NULL);
+
+    if (EVP_CipherInit(ctx, NULL, NULL, NULL, 1) != 1) {
+        ossl_raise(eCipherError, NULL);
     }
 
-    return self;
-}
+    if (!NIL_P(pass)) {
+        StringValue(pass);
 
-/*
- *  call-seq:
- *     cipher.encrypt -> self
- *
- *  Make sure to call .encrypt or .decrypt before using any of the following methods:
- *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
- *
- *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 1).
- */
-static VALUE
-ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
-{
-    return ossl_cipher_init(argc, argv, self, 1);
-}
+        EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
+		   RSTRING(pass)->ptr, RSTRING(pass)->len, 1, key, NULL);
+        if (EVP_CipherInit(ctx, NULL, key, iv, -1) != 1) {
+            ossl_raise(eCipherError, NULL);
+        }
+    }
 
-/*
- *  call-seq:
- *     cipher.decrypt -> self
- *
- *  Make sure to call .encrypt or .decrypt before using any of the following methods:
- *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
- *
- *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 0).
- */
-static VALUE
-ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
-{
-    return ossl_cipher_init(argc, argv, self, 0);
+    return self;
 }
 
-/*
- *  call-seq:
- *     cipher.pkcs5_keyivgen(pass [, salt [, iterations [, digest]]] ) -> nil
- *
- *  Generates and sets the key/iv based on a password.
- *
- *  WARNING: This method is only PKCS5 v1.5 compliant when using RC2, RC4-40, or DES
- *  with MD5 or SHA1.  Using anything else (like AES) will generate the key/iv using an
- *  OpenSSL specific method.  Use a PKCS5 v2 key generation method instead.
- *
- *  === Parameters
- *  +salt+ must be an 8 byte string if provided.
- *  +iterations+ is a integer with a default of 2048.
- *  +digest+ is a Digest object that defaults to 'MD5'
- *
- *  A minimum of 1000 iterations is recommended.
- *
- */
 static VALUE
-ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
+ossl_cipher_decrypt(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_LEN(vsalt) != PKCS5_SALT_LEN)
-	    rb_raise(eCipherError, "salt must be an 8-octet string");
-	salt = RSTRING_PTR(vsalt);
-    }
-    iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
-    digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
+    unsigned char iv[EVP_MAX_IV_LENGTH], key[EVP_MAX_KEY_LENGTH];
+    VALUE pass, init_v;
+	
     GetCipher(self, ctx);
-    EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
-		   RSTRING_PTR(vpass), RSTRING_LEN(vpass), 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);
+    rb_scan_args(argc, argv, "02", &pass, &init_v);
 
-    return Qnil;
-}
+    if (NIL_P(init_v)) {
+	/*
+	 * TODO:
+	 * random IV generation!
+	 */
+	memcpy(iv, "OpenSSL for Ruby rulez!", EVP_MAX_IV_LENGTH);
+    }
+    else {
+	init_v = rb_obj_as_string(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, EVP_MAX_IV_LENGTH);
+	}
+    }
 
+    if (EVP_CipherInit(ctx, NULL, NULL, NULL, 0) != 1) {
+        ossl_raise(eCipherError, NULL);
+    }
 
-/*
- *  call-seq:
- *     cipher << data -> string
- *
- *  === Parameters
- *  +data+ is a nonempty string.
- *
- * This method is deprecated and not available in 1.9.x or later.
- */
-static VALUE
-ossl_cipher_update_deprecated(VALUE self, VALUE data)
-{
-    char *cname;
+    if (!NIL_P(pass)) {
+        StringValue(pass);
 
-    cname = rb_class2name(rb_obj_class(self));
-    rb_warning("%s#<< is deprecated; use %s#update instead", cname, cname);
-    return rb_funcall(self, rb_intern("update"), 1, data);
-}
+        EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
+		   RSTRING(pass)->ptr, RSTRING(pass)->len, 1, key, NULL);
+        if (EVP_CipherInit(ctx, NULL, key, iv, -1) != 1) {
+            ossl_raise(eCipherError, NULL);
+        }
+    }
 
+    return self;
+}
 
-/*
- *  call-seq:
- *     cipher.update(data [, buffer]) -> string or buffer
- *
- *  === Parameters
- *  +data+ is a nonempty string.
- *  +buffer+ is an optional string to store the result.
- */
 static VALUE 
-ossl_cipher_update(int argc, VALUE *argv, VALUE self)
+ossl_cipher_update(VALUE self, VALUE data)
 {
     EVP_CIPHER_CTX *ctx;
     char *in;
     int in_len, out_len;
-    VALUE data, str;
-
-    rb_scan_args(argc, argv, "11", &data, &str);
+    VALUE str;
 
-    StringValue(data);
-    in = RSTRING_PTR(data);
-    if ((in_len = RSTRING_LEN(data)) == 0)
-        rb_raise(rb_eArgError, "data must not be empty");
     GetCipher(self, ctx);
-    out_len = in_len+EVP_CIPHER_CTX_block_size(ctx);
-
-    if (NIL_P(str)) {
-        str = rb_str_new(0, out_len);
-    } else {
-        StringValue(str);
-        rb_str_resize(str, out_len);
-    }
-
-    if (!EVP_CipherUpdate(ctx, RSTRING_PTR(str), &out_len, in, in_len))
+    StringValue(data);
+    in = RSTRING(data)->ptr;
+    in_len = RSTRING(data)->len;
+    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_LEN(str));
-    rb_str_set_len(str, out_len);
+    assert(out_len < RSTRING(str)->len);
+    RSTRING(str)->len = out_len;
+    RSTRING(str)->ptr[out_len] = 0;
 
     return str;
 }
 
-/*
- *  call-seq:
- *     cipher.final -> aString
- *
- *  Returns the remaining data held in the cipher object.  Further calls to update() or final() will return garbage.
- *
- *  See EVP_CipherFinal_ex for further information.
- */
 static VALUE 
 ossl_cipher_final(VALUE self)
 {
@@ -372,20 +259,15 @@ ossl_cipher_final(VALUE self)
 
     GetCipher(self, ctx);
     str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx));
-    if (!EVP_CipherFinal_ex(ctx, RSTRING_PTR(str), &out_len))
+    if (!EVP_CipherFinal(ctx, RSTRING(str)->ptr, &out_len))
 	ossl_raise(eCipherError, NULL);
-    assert(out_len <= RSTRING_LEN(str));
-    rb_str_set_len(str, out_len);
+    assert(out_len <= RSTRING(str)->len);
+    RSTRING(str)->len = out_len;
+    RSTRING(str)->ptr[out_len] = 0;
 
     return str;
 }
 
-/*
- *  call-seq:
- *     cipher.name -> string
- *
- *  Returns the name of the cipher which may differ slightly from the original name provided.
- */
 static VALUE
 ossl_cipher_name(VALUE self)
 {
@@ -396,14 +278,6 @@ ossl_cipher_name(VALUE self)
     return rb_str_new2(EVP_CIPHER_name(EVP_CIPHER_CTX_cipher(ctx)));
 }
 
-/*
- *  call-seq:
- *     cipher.key = string -> string
- *
- *  Sets the cipher key.
- *
- *  Only call this method after calling cipher.encrypt or cipher.decrypt.
- */
 static VALUE
 ossl_cipher_set_key(VALUE self, VALUE key)
 {
@@ -412,23 +286,15 @@ ossl_cipher_set_key(VALUE self, VALUE key)
     StringValue(key);
     GetCipher(self, ctx);
 
-    if (RSTRING_LEN(key) < EVP_CIPHER_CTX_key_length(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_PTR(key), NULL, -1) != 1)
+    if (EVP_CipherInit(ctx, NULL, RSTRING(key)->ptr, NULL, -1) != 1)
         ossl_raise(eCipherError, NULL);
 
     return key;
 }
 
-/*
- *  call-seq:
- *     cipher.iv = string -> string
- *
- *  Sets the cipher iv.
- *
- *  Only call this method after calling cipher.encrypt or cipher.decrypt.
- */
 static VALUE
 ossl_cipher_set_iv(VALUE self, VALUE iv)
 {
@@ -437,60 +303,25 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
     StringValue(iv);
     GetCipher(self, ctx);
 
-    if (RSTRING_LEN(iv) < EVP_CIPHER_CTX_iv_length(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_PTR(iv), -1) != 1)
-	ossl_raise(eCipherError, NULL);
+    if (EVP_CipherInit(ctx, NULL, NULL, RSTRING(iv)->ptr, -1) != 1)
+		ossl_raise(eCipherError, NULL);
 
     return iv;
 }
 
-
-/*
- *  call-seq:
- *     cipher.key_length = integer -> integer
- *
- *  Sets the key length of the cipher.  If the cipher is a fixed length cipher then attempting to set the key
- *  length to any value other than the fixed value is an error.
- *
- *  Under normal circumstances you do not need to call this method (and probably shouldn't).
- *
- *  See EVP_CIPHER_CTX_set_key_length for further information.
- */
-static VALUE
-ossl_cipher_set_key_length(VALUE self, VALUE key_length)
-{
-    int len = NUM2INT(key_length);
-    EVP_CIPHER_CTX *ctx;
- 
-    GetCipher(self, ctx);
-    if (EVP_CIPHER_CTX_set_key_length(ctx, len) != 1)
-        ossl_raise(eCipherError, NULL);
-
-    return key_length;
-}
-
-/*
- *  call-seq:
- *     cipher.padding = integer -> integer
- *
- *  Enables or disables padding. By default encryption operations are padded using standard block padding and the
- *  padding is checked and removed when decrypting. If the pad parameter is zero then no padding is performed, the
- *  total amount of data encrypted or decrypted must then be a multiple of the block size or an error will occur.
- *
- *  See EVP_CIPHER_CTX_set_padding for further information.
- */
 static VALUE
 ossl_cipher_set_padding(VALUE self, VALUE padding)
 {
-#if defined(HAVE_EVP_CIPHER_CTX_SET_PADDING)
+#if defined(HAVE_ST_FLAGS)
     EVP_CIPHER_CTX *ctx;
-    int pad = NUM2INT(padding);
 
     GetCipher(self, ctx);
-    if (EVP_CIPHER_CTX_set_padding(ctx, pad) != 1)
-	ossl_raise(eCipherError, NULL);
+
+    if (EVP_CIPHER_CTX_set_padding(ctx, NUM2INT(padding)) != 1)
+		ossl_raise(eCipherError, NULL);
 #else
     rb_notimplement();
 #endif
@@ -509,59 +340,43 @@ CIPHER_0ARG_INT(key_length)
 CIPHER_0ARG_INT(iv_length)
 CIPHER_0ARG_INT(block_size)
 
-#if 0
-/*
- *  call-seq:
- *     cipher.key_length -> integer
- *
- */
-static VALUE ossl_cipher_key_length() { }
-/*
- *  call-seq:
- *     cipher.iv_length -> integer
- *
- */
-static VALUE ossl_cipher_iv_length() { }
-/*
- *  call-seq:
- *     cipher.block_size -> integer
- *
- */
-static VALUE ossl_cipher_block_size() { }
-#endif
-
 /*
  * INIT
  */
 void 
 Init_ossl_cipher(void)
 {
-#if 0 /* let rdoc know about mOSSL */
-    mOSSL = rb_define_module("OpenSSL");
-#endif
-    cCipher = rb_define_class_under(mOSSL, "Cipher", rb_cObject);
-    eCipherError = rb_define_class_under(cCipher, "CipherError", eOSSLError);
+    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(cCipher, "ciphers", ossl_s_ciphers, 0);
     rb_define_method(cCipher, "initialize", ossl_cipher_initialize, 1);
+
+    rb_define_copy_func(cCipher, ossl_cipher_copy);
+
     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);
-#if RUBY_VERSION_CODE < 190
-    rb_define_method(cCipher, "<<", ossl_cipher_update_deprecated, 1);
-#endif
+    rb_define_method(cCipher, "update", ossl_cipher_update, 1);
+    rb_define_alias(cCipher, "<<", "update");
     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);
+/*
+ * TODO
+ * int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ */
     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);
-}
+
+} /* Init_ossl_cipher */
 
diff --git a/ext/openssl/ossl_cipher.h b/ext/openssl/ossl_cipher.h
index bed4fa853b..63c7a875e8 100644
--- a/ext/openssl/ossl_cipher.h
+++ b/ext/openssl/ossl_cipher.h
@@ -11,6 +11,7 @@
 #if !defined(_OSSL_CIPHER_H_)
 #define _OSSL_CIPHER_H_
 
+extern VALUE mCipher;
 extern VALUE cCipher;
 extern VALUE eCipherError;
 
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index cc8e324029..7e6f696d33 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -119,8 +119,8 @@ ossl_config_copy(VALUE self, VALUE other)
     VALUE str;
     CONF *conf;
 
-    str = rb_funcall(self, rb_intern("to_s"), 0);
     GetConfig(other, conf);
+    str = rb_funcall(self, rb_intern("to_s"), 0);
     parse_config(str, conf);
 
     return self;
@@ -134,11 +134,11 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self)
     char *filename;
     VALUE path;
 
+    GetConfig(self, conf);
     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);
@@ -147,12 +147,9 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self)
         }
     }
 #ifdef OSSL_NO_CONF_API
-    else rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
+    else rb_raise(rb_eArgError, "wrong number of arguments(0 for 1)");
 #else
-    else {
-	GetConfig(self, conf);
-	_CONF_new_data(conf);
-    }
+    else _CONF_new_data(conf);
 #endif
     
     return self;
@@ -167,20 +164,20 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
     CONF *conf;
     CONF_VALUE *sv, *cv;
 
+    GetConfig(self, conf);
     StringValue(section);
     StringValue(name);
     StringValue(value);
-    GetConfig(self, conf);
-    if(!(sv = _CONF_get_section(conf, RSTRING_PTR(section)))){
-	if(!(sv = _CONF_new_section(conf, RSTRING_PTR(section)))){
+    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_PTR(name));
-    cv->value = BUF_strdup(RSTRING_PTR(value));
+    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);
@@ -198,10 +195,10 @@ ossl_config_get_value(VALUE self, VALUE section, VALUE name)
     CONF *conf;
     char *str;
 
+    GetConfig(self, conf);
     StringValue(section);
     StringValue(name);
-    GetConfig(self, conf);
-    str = NCONF_get_string(conf, RSTRING_PTR(section), RSTRING_PTR(name));
+    str = NCONF_get_string(conf, RSTRING(section)->ptr, RSTRING(name)->ptr);
     if(!str){
 	ERR_clear_error();
 	return Qnil;
@@ -245,11 +242,8 @@ set_conf_section_i(VALUE i, VALUE *arg)
 static VALUE
 ossl_config_set_section(VALUE self, VALUE section, VALUE hash)
 {
-    VALUE arg[2];
-
-    arg[0] = self;
-    arg[1] = section;
-    rb_block_call(hash, rb_intern("each"), 0, 0, set_conf_section_i, (VALUE)arg);
+    VALUE arg[2] = { self, section };
+    rb_iterate(rb_each, hash, set_conf_section_i, (VALUE)arg);
     return hash;
 }
 
@@ -267,7 +261,6 @@ ossl_config_get_section(VALUE self, VALUE section)
     VALUE hash;
 
     hash = rb_hash_new();
-    StringValue(section);
     GetConfig(self, conf);
     if (!(sk = NCONF_get_section(conf, StringValuePtr(section)))) {
 	ERR_clear_error();
@@ -314,7 +307,16 @@ ossl_config_get_sections(VALUE self)
 
     return ary;
 }
+#else
+static VALUE
+ossl_config_get_sections(VALUE self)
+{
+    rb_warn("Config::sections don't work with %s", OPENSSL_VERSION_TEXT);
+    return rb_ary_new();
+}
+#endif
 
+#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN
 static void
 dump_conf_value(CONF_VALUE *cv, VALUE str)
 {
@@ -360,61 +362,13 @@ ossl_config_to_s(VALUE self)
 
     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);
+    rb_warn("Config::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
@@ -443,7 +397,6 @@ Init_ossl_config()
 
     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);
@@ -457,6 +410,5 @@ Init_ossl_config()
     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/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
index 879d399fe7..b117ddd30d 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -24,6 +24,7 @@
 /*
  * Classes
  */
+VALUE mDigest;
 VALUE cDigest;
 VALUE eDigestError;
 
@@ -35,23 +36,11 @@ static VALUE ossl_digest_alloc(VALUE klass);
 const EVP_MD *
 GetDigestPtr(VALUE obj)
 {
-    const EVP_MD *md;
-
-    if (TYPE(obj) == T_STRING) {
-    	const char *name = STR2CSTR(obj);
-
-        md = EVP_get_digestbyname(name);
-        if (!md)
-            ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
-    } else {
-        EVP_MD_CTX *ctx;
+    EVP_MD_CTX *ctx;
 
-        SafeGetDigest(obj, ctx);
+    SafeGetDigest(obj, ctx);
 
-        md = EVP_MD_CTX_md(ctx);
-    }
-
-    return md;
+    return EVP_MD_CTX_md(ctx); /*== ctx->digest*/
 }
 
 VALUE
@@ -62,7 +51,8 @@ ossl_digest_new(const EVP_MD *md)
 
     ret = ossl_digest_alloc(cDigest);
     GetDigest(ret, ctx);
-    EVP_DigestInit_ex(ctx, md, NULL);
+    EVP_MD_CTX_init(ctx);
+    EVP_DigestInit(ctx, md);
    
     return ret;
 }
@@ -80,17 +70,12 @@ ossl_digest_alloc(VALUE klass)
     if (ctx == NULL)
 	ossl_raise(rb_eRuntimeError, "EVP_MD_CTX_create() failed");
     obj = Data_Wrap_Struct(klass, 0, EVP_MD_CTX_destroy, ctx);
-
+	
     return obj;
 }
 
 VALUE ossl_digest_update(VALUE, VALUE);
 
-/*
- *  call-seq:
- *     Digest.new(string) -> digest
- *
- */
 static VALUE
 ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -99,12 +84,18 @@ ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
     char *name;
     VALUE type, data;
 
+    GetDigest(self, ctx);
+
     rb_scan_args(argc, argv, "11", &type, &data);
-    md = GetDigestPtr(type);
+    name = StringValuePtr(type);
     if (!NIL_P(data)) StringValue(data);
-
-    GetDigest(self, ctx);
-    EVP_DigestInit_ex(ctx, md, NULL);
+    
+    md = EVP_get_digestbyname(name);
+    if (!md) {
+	ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
+    }
+    EVP_MD_CTX_init(ctx);
+    EVP_DigestInit(ctx, md);
     
     if (!NIL_P(data)) return ossl_digest_update(self, data);
     return self;
@@ -127,105 +118,143 @@ ossl_digest_copy(VALUE self, VALUE other)
     return self;
 }
 
-/*
- *  call-seq:
- *     digest.reset -> 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);
+    EVP_DigestInit(ctx, EVP_MD_CTX_md(ctx));
 
     return self;
 }
 
-/*
- *  call-seq:
- *     digest.update(string) -> aString
- *
- */
 VALUE
 ossl_digest_update(VALUE self, VALUE data)
 {
     EVP_MD_CTX *ctx;
 
-    StringValue(data);
     GetDigest(self, ctx);
-    EVP_DigestUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
+    StringValue(data);
+    EVP_DigestUpdate(ctx, RSTRING(data)->ptr, RSTRING(data)->len);
 
     return self;
 }
 
-/*
- *  call-seq:
- *      digest.finish -> aString
- *
- */
+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)))) {
+	ossl_raise(eDigestError, "Cannot allocate mem for digest");
+    }
+    EVP_DigestFinal(&final, *buf, buf_len);
+    EVP_MD_CTX_cleanup(&final);
+}
+
 static VALUE
-ossl_digest_finish(int argc, VALUE *argv, VALUE self)
+ossl_digest_digest(VALUE self)
 {
     EVP_MD_CTX *ctx;
-    VALUE str;
+    char *buf;
+    int buf_len;
+    VALUE digest;
+	
+    GetDigest(self, ctx);
+    digest_final(ctx, &buf, &buf_len);
+    digest = ossl_buf2str(buf, buf_len);
+	
+    return digest;
+}
 
-    rb_scan_args(argc, argv, "01", &str);
+static VALUE
+ossl_digest_hexdigest(VALUE self)
+{
+    EVP_MD_CTX *ctx;
+    char *buf, *hexbuf;
+    int buf_len;
+    VALUE hexdigest;
 
     GetDigest(self, ctx);
-
-    if (NIL_P(str)) {
-        str = rb_str_new(NULL, EVP_MD_CTX_size(ctx));
-    } else {
-        StringValue(str);
-        rb_str_resize(str, EVP_MD_CTX_size(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);
 
-    EVP_DigestFinal_ex(ctx, RSTRING_PTR(str), NULL);
+    return hexdigest;
+}
 
-    return str;
+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);
 }
 
-/*
- *  call-seq:
- *      digest.name -> string
- *
- */
 static VALUE
-ossl_digest_name(VALUE self)
+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;
 
     GetDigest(self, ctx);
+    if (rb_obj_is_kind_of(other, cDigest) == Qtrue) {
+	str2 = ossl_digest_digest(other);
+    } else {
+	StringValue(other);
+	str2 = other;
+    }
+    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 rb_str_new2(EVP_MD_name(EVP_MD_CTX_md(ctx)));
+    return Qfalse;
 }
 
-/*
- *  call-seq:
- *      digest.digest_size -> integer
- *
- *  Returns the output size of the digest.
- */
 static VALUE
-ossl_digest_size(VALUE self)
+ossl_digest_name(VALUE self)
 {
     EVP_MD_CTX *ctx;
 
     GetDigest(self, ctx);
 
-    return INT2NUM(EVP_MD_CTX_size(ctx));
+    return rb_str_new2(EVP_MD_name(EVP_MD_CTX_md(ctx)));
 }
 
 static VALUE
-ossl_digest_block_length(VALUE self)
+ossl_digest_size(VALUE self)
 {
     EVP_MD_CTX *ctx;
 
     GetDigest(self, ctx);
 
-    return INT2NUM(EVP_MD_CTX_block_size(ctx));
+    return INT2NUM(EVP_MD_CTX_size(ctx));
 }
 
 /*
@@ -234,26 +263,31 @@ ossl_digest_block_length(VALUE self)
 void
 Init_ossl_digest()
 {
-    rb_require("openssl");
-    rb_require("digest");
-
-#if 0 /* let rdoc know about mOSSL */
-    mOSSL = rb_define_module("OpenSSL");
-#endif
-
-    cDigest = rb_define_class_under(mOSSL, "Digest", rb_path2class("Digest::Class"));
-    eDigestError = rb_define_class_under(cDigest, "DigestError", eOSSLError);
+    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_copy_func(cDigest, ossl_digest_copy);
     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_private_method(cDigest, "finish", ossl_digest_finish, -1);
-    rb_define_method(cDigest, "digest_length", ossl_digest_size, 0);
-    rb_define_method(cDigest, "block_length", ossl_digest_block_length, 0);
-
+    
+    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/ext/openssl/ossl_digest.h b/ext/openssl/ossl_digest.h
index 8cc5b1bc56..8a1f7964f2 100644
--- a/ext/openssl/ossl_digest.h
+++ b/ext/openssl/ossl_digest.h
@@ -11,6 +11,7 @@
 #if !defined(_OSSL_DIGEST_H_)
 #define _OSSL_DIGEST_H_
 
+extern VALUE mDigest;
 extern VALUE cDigest;
 extern VALUE eDigestError;
 
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
index cd835d1237..91025941b9 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -40,7 +40,7 @@ VALUE eEngineError;
  */
 #define OSSL_ENGINE_LOAD_IF_MATCH(x) \
 do{\
-  if(!strcmp(#x, RSTRING_PTR(name))){\
+  if(!strcmp(#x, RSTRING(name)->ptr)){\
     ENGINE_load_##x();\
     return Qtrue;\
   }\
@@ -55,12 +55,9 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
     VALUE name;
 
     rb_scan_args(argc, argv, "01", &name);
-    if(NIL_P(name)){
-        ENGINE_load_builtin_engines();
-        return Qtrue;
-    }
+    if(NIL_P(name)) ENGINE_load_builtin_engines();
     StringValue(name);
-#ifndef OPENSSL_NO_STATIC_ENGINE
+    OSSL_ENGINE_LOAD_IF_MATCH(openssl);
     OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
     OSSL_ENGINE_LOAD_IF_MATCH(cswift);
     OSSL_ENGINE_LOAD_IF_MATCH(chil);
@@ -70,13 +67,10 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
     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_PTR(name));
-    return Qnil;
+    rb_raise(eEngineError, "no such engine `%s'", RSTRING(name)->ptr);
 #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
 }
 
@@ -112,15 +106,14 @@ ossl_engine_s_by_id(VALUE klass, VALUE id)
 
     StringValue(id);
     ossl_engine_s_load(1, &id, klass);
-    if(!(e = ENGINE_by_id(RSTRING_PTR(id))))
+    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();
+    WrapEngine(klass, obj, e);
 
     return obj;
 }
@@ -217,11 +210,11 @@ ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
 {
     ENGINE *e;
     EVP_PKEY *pkey;
-    VALUE id, data, obj;
+    VALUE id, data;
     char *sid, *sdata;
 
-    rb_scan_args(argc, argv, "02", &id, &data);
-    sid = NIL_P(id) ? NULL : StringValuePtr(id);
+    rb_scan_args(argc, argv, "11", &id, &data);
+    sid = StringValuePtr(id);
     sdata = NIL_P(data) ? NULL : StringValuePtr(data);
     GetEngine(self, e);
 #if OPENSSL_VERSION_NUMBER < 0x00907000L
@@ -230,10 +223,8 @@ ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
     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;
+    return ossl_pkey_new(pkey);
 }
 
 static VALUE
@@ -244,8 +235,8 @@ ossl_engine_load_pubkey(int argc, VALUE *argv, VALUE self)
     VALUE id, data;
     char *sid, *sdata;
 
-    rb_scan_args(argc, argv, "02", &id, &data);
-    sid = NIL_P(id) ? NULL : StringValuePtr(id);
+    rb_scan_args(argc, argv, "11", &id, &data);
+    sid = StringValuePtr(id);
     sdata = NIL_P(data) ? NULL : StringValuePtr(data);
     GetEngine(self, e);
 #if OPENSSL_VERSION_NUMBER < 0x00907000L
@@ -262,67 +253,14 @@ static VALUE
 ossl_engine_set_default(VALUE self, VALUE flag)
 {
     ENGINE *e;
-    int f = NUM2INT(flag);
 
     GetEngine(self, e);
-    ENGINE_set_default(e, f);
+    ENGINE_set_default(e, NUM2INT(flag));
 
     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_PTR(cmd),
-				 NIL_P(val) ? NULL : RSTRING_PTR(val), 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;
@@ -362,8 +300,6 @@ Init_ossl_engine()
     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);
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index ef77d6c427..0b4d8d9b54 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -41,8 +41,8 @@ VALUE eHMACError;
 static void
 ossl_hmac_free(HMAC_CTX *ctx)
 {
-    HMAC_CTX_cleanup(ctx);
-    free(ctx);
+	HMAC_CTX_cleanup(ctx);
+	free(ctx);
 }
 
 static VALUE
@@ -52,26 +52,19 @@ ossl_hmac_alloc(VALUE klass)
     VALUE obj;
 
     MakeHMAC(obj, klass, ctx);
-    HMAC_CTX_init(ctx);
 	
     return obj;
 }
 
-
-/*
- *  call-seq:
- *     HMAC.new(key, digest) -> hmac
- *
- */
 static VALUE
 ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
 {
     HMAC_CTX *ctx;
 
-    StringValue(key);
     GetHMAC(self, ctx);
-    HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LEN(key),
-		 GetDigestPtr(digest), NULL);
+    StringValue(key);
+    HMAC_CTX_init(ctx);
+    HMAC_Init(ctx, RSTRING(key)->ptr, RSTRING(key)->len, GetDigestPtr(digest));
 
     return self;
 }
@@ -87,23 +80,20 @@ ossl_hmac_copy(VALUE self, VALUE other)
     GetHMAC(self, ctx1);
     SafeGetHMAC(other, ctx2);
 
-    HMAC_CTX_copy(ctx1, ctx2);
+    if (!HMAC_CTX_copy(ctx1, ctx2)) {
+	ossl_raise(eHMACError, NULL);
+    }
     return self;
 }
 
-/*
- *  call-seq:
- *     hmac.update(string) -> self
- *
- */
 static VALUE
 ossl_hmac_update(VALUE self, VALUE data)
 {
     HMAC_CTX *ctx;
 
-    StringValue(data);
     GetHMAC(self, ctx);
-    HMAC_Update(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
+    StringValue(data);
+    HMAC_Update(ctx, RSTRING(data)->ptr, RSTRING(data)->len);
 
     return self;
 }
@@ -113,9 +103,10 @@ hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
 {
     HMAC_CTX final;
 
-    HMAC_CTX_copy(&final, ctx);
+    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");
     }
@@ -123,11 +114,6 @@ hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
     HMAC_CTX_cleanup(&final);
 }
 
-/*
- *  call-seq:
- *     hmac.digest -> aString
- *
- */
 static VALUE
 ossl_hmac_digest(VALUE self)
 {
@@ -143,11 +129,6 @@ ossl_hmac_digest(VALUE self)
     return digest;
 }
 
-/*
- *  call-seq:
- *     hmac.hexdigest -> aString
- *
- */
 static VALUE
 ossl_hmac_hexdigest(VALUE self)
 {
@@ -168,27 +149,6 @@ ossl_hmac_hexdigest(VALUE self)
     return hexdigest;
 }
 
-/*
- *  call-seq:
- *     hmac.reset -> self
- *
- */
-static VALUE
-ossl_hmac_reset(VALUE self)
-{
-    HMAC_CTX *ctx;
-
-    GetHMAC(self, ctx);
-    HMAC_Init_ex(ctx, NULL, 0, NULL, NULL);
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     HMAC.digest(digest, key, data) -> aString
- *
- */
 static VALUE
 ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 {
@@ -197,17 +157,12 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 	
     StringValue(key);
     StringValue(data);
-    buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
-	       RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
+    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);
 }
 
-/*
- *  call-seq:
- *     HMAC.digest(digest, key, data) -> aString
- *
- */
 static VALUE
 ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 {
@@ -218,8 +173,8 @@ ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
     StringValue(key);
     StringValue(data);
 	
-    buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
-	       RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
+    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");
     }
@@ -234,10 +189,6 @@ ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 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);
@@ -249,7 +200,6 @@ Init_ossl_hmac()
     rb_define_method(cHMAC, "initialize", ossl_hmac_initialize, 2);
     rb_define_copy_func(cHMAC, ossl_hmac_copy);
 
-    rb_define_method(cHMAC, "reset", ossl_hmac_reset, 0);
     rb_define_method(cHMAC, "update", ossl_hmac_update, 1);
     rb_define_alias(cHMAC, "<<", "update");
     rb_define_method(cHMAC, "digest", ossl_hmac_digest, 0);
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index 738a203d93..9aed773edc 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -56,46 +56,20 @@ 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_PTR(buffer), -1))) {
-	p = RSTRING_PTR(buffer);
-	if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING_LEN(buffer)))) {
-	    ossl_raise(eSPKIError, NULL);
-	}
+    if (!(spki = NETSCAPE_SPKI_b64_decode(StringValuePtr(buffer), -1))) {
+	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_PTR(str);
-    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;
@@ -169,7 +143,7 @@ ossl_spki_get_challenge(VALUE self)
     GetSPKI(self, spki);
     if (spki->spkac->challenge->length <= 0) {
 	OSSL_Debug("Challenge.length <= 0?");
-	return rb_str_new(0, 0);
+	return rb_str_new2(NULL);
     }
 
     return rb_str_new(spki->spkac->challenge->data,
@@ -181,10 +155,10 @@ ossl_spki_set_challenge(VALUE self, VALUE str)
 {
     NETSCAPE_SPKI *spki;
 
-    StringValue(str);
     GetSPKI(self, spki);
-    if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING_PTR(str),
-			 RSTRING_LEN(str))) {
+    StringValue(str);
+    if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING(str)->ptr,
+			 RSTRING(str)->len)) {
 	ossl_raise(eSPKIError, NULL);
     }
     
@@ -198,9 +172,9 @@ ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
     EVP_PKEY *pkey;
     const EVP_MD *md;
 
+    GetSPKI(self, spki);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
     md = GetDigestPtr(digest);
-    GetSPKI(self, spki);
     if (!NETSCAPE_SPKI_sign(spki, pkey, md)) {
 	ossl_raise(eSPKIError, NULL);
     }
@@ -243,7 +217,6 @@ Init_ossl_ns_spki()
     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);
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index 1e8e5903bd..d1f1b84127 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -109,9 +109,9 @@ ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
     if(!NIL_P(arg)){
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
-	p = (unsigned char*)RSTRING_PTR(arg);
+	p = (unsigned char*)RSTRING(arg)->ptr;
 	if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p,
-			     RSTRING_LEN(arg))){
+			     RSTRING(arg)->len)){
 	    ossl_raise(eOCSPError, "cannot load DER encoded request");
 	}
     }
@@ -127,14 +127,12 @@ ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
     int ret;
 
     rb_scan_args(argc, argv, "01", &val);
-    if(NIL_P(val)) {
-	GetOCSPReq(self, req);
+    GetOCSPReq(self, req);
+    if(NIL_P(val))
 	ret = OCSP_request_add1_nonce(req, NULL, -1);
-    }
     else{
 	StringValue(val);
-	GetOCSPReq(self, req);
-	ret = OCSP_request_add1_nonce(req, RSTRING_PTR(val), RSTRING_LEN(val));
+	ret = OCSP_request_add1_nonce(req, RSTRING(val)->ptr, RSTRING(val)->len);
     }
     if(!ret) ossl_raise(eOCSPError, NULL);
 
@@ -216,6 +214,7 @@ ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
     int ret;
 
     rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
+    GetOCSPReq(self, req);
     signer = GetX509CertPtr(signer_cert);
     key = GetPrivPKeyPtr(signer_key);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
@@ -224,7 +223,6 @@ ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
 	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);
@@ -242,10 +240,10 @@ ossl_ocspreq_verify(int argc, VALUE *argv, VALUE self)
     int flg, result;
 
     rb_scan_args(argc, argv, "21", &certs, &store, &flags);
+    GetOCSPReq(self, req);
     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));
@@ -262,10 +260,11 @@ ossl_ocspreq_to_der(VALUE self)
     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_PTR(str);
+    p = RSTRING(str)->ptr;
     if(i2d_OCSP_REQUEST(req, &p) <= 0)
 	ossl_raise(eOCSPError, NULL);
     ossl_str_adjust(str, p);
@@ -282,11 +281,10 @@ 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)))
+    if(!(res = OCSP_response_create(NUM2INT(status), bs)))
 	ossl_raise(eOCSPError, NULL);
     WrapOCSPRes(klass, obj, res);
 
@@ -316,9 +314,9 @@ ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
     if(!NIL_P(arg)){
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
-	p = RSTRING_PTR(arg);
+	p = RSTRING(arg)->ptr;
 	if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p,
-			      RSTRING_LEN(arg))){
+			      RSTRING(arg)->len)){
 	    ossl_raise(eOCSPError, "cannot load DER encoded response");
 	}
     }
@@ -377,7 +375,7 @@ ossl_ocspres_to_der(VALUE self)
     if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0)
 	ossl_raise(eOCSPError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = RSTRING(str)->ptr;
     if(i2d_OCSP_RESPONSE(res, NULL) <= 0)
 	ossl_raise(eOCSPError, NULL);
     ossl_str_adjust(str, p);
@@ -428,15 +426,13 @@ ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE self)
     VALUE val;
     int ret;
 
+    GetOCSPBasicRes(self, bs);
     rb_scan_args(argc, argv, "01", &val);
-    if(NIL_P(val)) {
-	GetOCSPBasicRes(self, bs);
+    if(NIL_P(val))
 	ret = OCSP_basic_add1_nonce(bs, NULL, -1);
-    }
     else{
 	StringValue(val);
-	GetOCSPBasicRes(self, bs);
-	ret = OCSP_basic_add1_nonce(bs, RSTRING_PTR(val), RSTRING_LEN(val));
+	ret = OCSP_basic_add1_nonce(bs, RSTRING(val)->ptr, RSTRING(val)->len);
     }
     if(!ret) ossl_raise(eOCSPError, NULL);
 
@@ -456,13 +452,15 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
     int error, i, rstatus = 0;
     VALUE tmp;
 
+    GetOCSPBasicRes(self, bs);
+    SafeGetOCSPCertId(cid, id);
     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_LEN(ext); i++)
-	    OSSL_Check_Kind(RARRAY_PTR(ext)[i], cX509Ext);
+	for (i = 0; i < RARRAY(ext)->len; i++)
+	    OSSL_Check_Kind(RARRAY(ext)->ptr[i], cX509Ext);
     }
 
     error = 0;
@@ -479,8 +477,6 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
     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;
@@ -490,8 +486,8 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
 	X509_EXTENSION *x509ext;
 	sk_X509_EXTENSION_pop_free(single->singleExtensions, X509_EXTENSION_free);
 	single->singleExtensions = NULL;
-	for(i = 0; i < RARRAY_LEN(ext); i++){
-	    x509ext = DupX509ExtPtr(RARRAY_PTR(ext)[i]);
+	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;
@@ -568,6 +564,7 @@ ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
     int ret;
 
     rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
+    GetOCSPBasicRes(self, bs);
     signer = GetX509CertPtr(signer_cert);
     key = GetPrivPKeyPtr(signer_key);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
@@ -578,7 +575,6 @@ ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
     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);
@@ -596,10 +592,10 @@ ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
     int flg, result;
 
     rb_scan_args(argc, argv, "21", &certs, &store, &flags);
+    GetOCSPBasicRes(self, bs);
     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));
@@ -629,11 +625,11 @@ ossl_ocspcid_initialize(VALUE self, VALUE subject, VALUE issuer)
     OCSP_CERTID *id, *newid;
     X509 *x509s, *x509i;
 
+    GetOCSPCertId(self, id);
     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;
 
@@ -681,7 +677,7 @@ Init_ossl_ocsp()
 {
     mOCSP = rb_define_module_under(mOSSL, "OCSP");
 
-    eOCSPError = rb_define_class_under(mOCSP, "OCSPError", eOSSLError);
+    eOCSPError = rb_define_class_under(mOCSP, "OCSPError", rb_cObject);
 
     cOCSPReq = rb_define_class_under(mOCSP, "Request", rb_cObject);
     rb_define_alloc_func(cOCSPReq, ossl_ocspreq_alloc);
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index 2ec69ba8db..e7d9954c5a 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -30,6 +30,7 @@
 /*
  * Classes
  */
+VALUE mPKCS12;
 VALUE cPKCS12;
 VALUE ePKCS12Error;
 
@@ -48,85 +49,32 @@ ossl_pkcs12_s_allocate(VALUE klass)
     return obj;
 }
 
-/*
- * call-seq:
- *    PKCS12.create(pass, name, key, cert [, ca, [, key_pbe [, cert_pbe [, key_iter [, mac_iter [, keytype]]]]]])
- *
- * === Parameters
- * * +pass+ - string
- * * +name+ - A string describing the key.
- * * +key+ - Any PKey.
- * * +cert+ - A X509::Certificate.
- * * * The public_key portion of the certificate must contain a valid public key.
- * * * The not_before and not_after fields must be filled in.
- * * +ca+ - An optional array of X509::Certificate's.
- * * +key_pbe+ - string
- * * +cert_pbe+ - string
- * * +key_iter+ - integer
- * * +mac_iter+ - integer
- * * +keytype+ - An integer representing an MSIE specific extension.
- *
- * Any optional arguments may be supplied as nil to preserve the OpenSSL defaults.
- *
- * See the OpenSSL documentation for PKCS12_create().
- */
 static VALUE
 ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
 {
-    VALUE pass, name, pkey, cert, ca, key_nid, cert_nid, key_iter, mac_iter, keytype;
+    VALUE pass, name, pkey, cert, ca;
     VALUE obj;
     char *passphrase, *friendlyname;
     EVP_PKEY *key;
     X509 *x509;
     STACK_OF(X509) *x509s;
-    int nkey = 0, ncert = 0, kiter = 0, miter = 0, ktype = 0;
     PKCS12 *p12;
     
-    rb_scan_args(argc, argv, "46", &pass, &name, &pkey, &cert, &ca, &key_nid, &cert_nid, &key_iter, &mac_iter, &keytype);
+    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);
-/* TODO: make a VALUE to nid function */
-    if (!NIL_P(key_nid)) {
-        if ((nkey = OBJ_txt2nid(StringValuePtr(key_nid))) == NID_undef)
-            rb_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(key_nid));
-    }
-    if (!NIL_P(cert_nid)) {
-        if ((ncert = OBJ_txt2nid(StringValuePtr(cert_nid))) == NID_undef)
-            rb_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(cert_nid));
-    }
-    if (!NIL_P(key_iter))
-        kiter = NUM2INT(key_iter);
-    if (!NIL_P(mac_iter))
-        miter = NUM2INT(mac_iter);
-    if (!NIL_P(keytype))
-        ktype = NUM2INT(keytype);
-
     p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
-                        nkey, ncert, kiter, miter, ktype);
+                        0, 0, 0, 0, 0);
     sk_X509_pop_free(x509s, X509_free);
     if(!p12) ossl_raise(ePKCS12Error, NULL);
     WrapPKCS12(cPKCS12, obj, p12);
 
-    ossl_pkcs12_set_key(obj, pkey);
-    ossl_pkcs12_set_cert(obj, cert);
-    ossl_pkcs12_set_ca_certs(obj, ca);
-
     return obj;
 }
 
-/*
- * call-seq:
- *    PKCS12.new -> pkcs12
- *    PKCS12.new(str) -> pkcs12
- *    PKCS12.new(str, pass) -> pkcs12
- *
- * === Parameters
- * * +str+ - Must be a DER encoded PKCS12 string.
- * * +pass+ - string
- */
 static VALUE
 ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -146,7 +94,7 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
 
     pkey = cert = ca = Qnil;
     if(!PKCS12_parse((PKCS12*)DATA_PTR(self), passphrase, &key, &x509, &x509s))
-	ossl_raise(ePKCS12Error, "PKCS12_parse");
+	ossl_raise(ePKCS12Error, NULL);
     pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
 		      &st); /* NO DUP */
     if(st) goto err;
@@ -181,7 +129,7 @@ ossl_pkcs12_to_der(VALUE self)
     if((len = i2d_PKCS12(p12, NULL)) <= 0)
 	ossl_raise(ePKCS12Error, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = RSTRING(str)->ptr;
     if(i2d_PKCS12(p12, &p) <= 0)
 	ossl_raise(ePKCS12Error, NULL);
     ossl_str_adjust(str, p);
@@ -192,14 +140,10 @@ ossl_pkcs12_to_der(VALUE self)
 void
 Init_ossl_pkcs12()
 {
-    /*
-     * Defines a file format commonly used to store private keys with
-     * accompanying public key certificates, protected with a password-based
-     * symmetric key.
-     */
-    cPKCS12 = rb_define_class_under(mOSSL, "PKCS12", rb_cObject);
-    ePKCS12Error = rb_define_class_under(cPKCS12, "PKCS12Error", eOSSLError);
-    rb_define_singleton_method(cPKCS12, "create", ossl_pkcs12_s_create, -1);
+    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);
diff --git a/ext/openssl/ossl_pkcs12.h b/ext/openssl/ossl_pkcs12.h
index 24d25d00bb..fa73c4bec5 100644
--- a/ext/openssl/ossl_pkcs12.h
+++ b/ext/openssl/ossl_pkcs12.h
@@ -4,8 +4,9 @@
  * $Id$
  */
 #if !defined(_OSSL_PKCS12_H_)
-#define _OSSL_PKCS12_H_
+#define _OSSL_PKCS7_H_
 
+extern VALUE mPKCS12;
 extern VALUE cPKCS12;
 extern VALUE ePKCS12Error;
 
diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c
deleted file mode 100644
index 007889fc94..0000000000
--- a/ext/openssl/ossl_pkcs5.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * $Id$
- * Copyright (C) 2007 Technorama Ltd. <oss-ruby@technorama.net>
- */
-#include "ossl.h"
-
-VALUE mPKCS5;
-VALUE ePKCS5;
-
-/*
- * call-seq:
- *    PKCS5.pbkdf2_hmac(pass, salt, iter, keylen, digest) => string
- *
- * === Parameters
- * * +pass+ - string
- * * +salt+ - string
- * * +iter+ - integer - should be greater than 1000.  2000 is better.
- * * +keylen+ - integer
- * * +digest+ - a string or OpenSSL::Digest object.
- *
- * Available in OpenSSL 0.9.9?.
- *
- * Digests other than SHA1 may not be supported by other cryptography libraries.
- */
-static VALUE
-ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen, VALUE digest)
-{
-#ifdef HAVE_PKCS5_PBKDF2_HMAC
-    VALUE str;
-    const EVP_MD *md;
-    int len = NUM2INT(keylen);
-
-    StringValue(pass);
-    StringValue(salt);
-    md = GetDigestPtr(digest);
-
-    str = rb_str_new(0, len);
-
-    if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LEN(pass), RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter), md, len, RSTRING_PTR(str)) != 1)
-        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC");
-
-    return str;
-#else
-    rb_notimplement();
-#endif
-}
-
-
-/*
- * call-seq:
- *    PKCS5.pbkdf2_hmac_sha1(pass, salt, iter, keylen) => string
- *
- * === Parameters
- * * +pass+ - string
- * * +salt+ - string
- * * +iter+ - integer - should be greater than 1000.  2000 is better.
- * * +keylen+ - integer
- *
- * This method is available almost any version OpenSSL.
- *
- * Conforms to rfc2898.
- */
-static VALUE
-ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen)
-{
-#ifdef HAVE_PKCS5_PBKDF2_HMAC_SHA1
-    VALUE str;
-    int len = NUM2INT(keylen);
-
-    StringValue(pass);
-    StringValue(salt);
-
-    str = rb_str_new(0, len);
-
-    if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LEN(pass), RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter), len, RSTRING_PTR(str)) != 1)
-        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1");
-
-    return str;
-#else
-    rb_notimplement();
-#endif
-}
-
-void
-Init_ossl_pkcs5()
-{
-    /*
-     * Password-based Encryption
-     *
-     */
-    mPKCS5 = rb_define_module_under(mOSSL, "PKCS5");
-    ePKCS5 = rb_define_class_under(mPKCS5, "PKCS5Error", eOSSLError);
-
-    rb_define_module_function(mPKCS5, "pbkdf2_hmac", ossl_pkcs5_pbkdf2_hmac, 5);
-    rb_define_module_function(mPKCS5, "pbkdf2_hmac_sha1", ossl_pkcs5_pbkdf2_hmac_sha1, 4);
-}
diff --git a/ext/openssl/ossl_pkcs5.h b/ext/openssl/ossl_pkcs5.h
deleted file mode 100644
index a3b132bc50..0000000000
--- a/ext/openssl/ossl_pkcs5.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if !defined(_OSSL_PKCS5_H_)
-#define _OSSL_PKCS5_H_
-
-void Init_ossl_pkcs5(void);
-
-#endif /* _OSSL_PKCS5_H_ */
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index 6918844779..aaa12ac7d7 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -44,23 +44,6 @@
     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))
@@ -71,9 +54,9 @@
 /* 
  * Classes
  */
+VALUE mPKCS7;
 VALUE cPKCS7;
 VALUE cPKCS7Signer;
-VALUE cPKCS7Recipient;
 VALUE ePKCS7Error;
 
 /*
@@ -106,35 +89,8 @@ DupPKCS7SignerPtr(VALUE obj)
     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;
-}
-
 /*
- * call-seq:
- *    PKCS7.read_smime(string) => pkcs7
+ * Private
  */
 static VALUE
 ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
@@ -156,10 +112,6 @@ ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
     return ret;
 }
 
-/*
- * call-seq:
- *    PKCS7.write_smime(pkcs7 [, data [, flags]]) => string
- */
 static VALUE
 ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
 {
@@ -170,9 +122,9 @@ ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
     int flg;
 
     rb_scan_args(argc, argv, "12", &pkcs7, &data, &flags);
+    SafeGetPKCS7(pkcs7, p7);
     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);
@@ -191,10 +143,6 @@ ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
     return str;
 }
 
-/*
- * call-seq:
- *    PKCS7.sign(cert, key, data, [, certs [, flags]]) => pkcs7
- */
 static VALUE
 ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
 {
@@ -234,10 +182,6 @@ ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
     return ret;
 }
 
-/*
- * call-seq:
- *    PKCS7.encrypt(certs, data, [, cipher [, flags]]) => pkcs7
- */
 static VALUE
 ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
 {
@@ -299,13 +243,6 @@ ossl_pkcs7_alloc(VALUE klass)
     return obj;
 }
 
-/*
- * call-seq:
- *    PKCS7.new => pkcs7
- *    PKCS7.new(string) => pkcs7
- *
- * Many methods in this class aren't documented.
- */
 static VALUE
 ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -354,7 +291,7 @@ static int
 ossl_pkcs7_sym2typeid(VALUE sym)
 {
     int i, ret = Qnil;
-    const char *s;
+    char *s;
 
     static struct {
         const char *name;
@@ -383,10 +320,6 @@ ossl_pkcs7_sym2typeid(VALUE sym)
     return ret;
 }
 
-/*
- * call-seq:
- *    pkcs7.type = type => type
- */
 static VALUE
 ossl_pkcs7_set_type(VALUE self, VALUE type)
 {
@@ -399,10 +332,6 @@ ossl_pkcs7_set_type(VALUE self, VALUE type)
     return type;
 }
 
-/*
- * call-seq:
- *    pkcs7.type => string or nil
- */
 static VALUE
 ossl_pkcs7_get_type(VALUE self)
 {
@@ -429,7 +358,7 @@ ossl_pkcs7_set_detached(VALUE self, VALUE flag)
 
     GetPKCS7(self, p7);
     if(flag != Qtrue && flag != Qfalse)
-	ossl_raise(ePKCS7Error, "must specify a boolean");
+	ossl_raise(ePKCS7Error, "must secify a boolean");
     if(!PKCS7_set_detached(p7, flag == Qtrue ? 1 : 0))
 	ossl_raise(ePKCS7Error, NULL);
 
@@ -471,8 +400,8 @@ ossl_pkcs7_add_signer(VALUE self, VALUE signer)
     PKCS7 *pkcs7;
     PKCS7_SIGNER_INFO *p7si;
 
-    p7si = DupPKCS7SignerPtr(signer); /* NEED TO DUP */
     GetPKCS7(self, pkcs7);
+    p7si = DupPKCS7SignerPtr(signer); /* NEED TO DUP */
     if (!PKCS7_add_signer(pkcs7, p7si)) {
 	PKCS7_SIGNER_INFO_free(p7si);
 	ossl_raise(ePKCS7Error, "Could not add signer.");
@@ -512,50 +441,30 @@ ossl_pkcs7_get_signer(VALUE self)
 }
 
 static VALUE
-ossl_pkcs7_add_recipient(VALUE self, VALUE recip)
+ossl_pkcs7_add_recipient(VALUE self, VALUE cert)
 {
     PKCS7 *pkcs7;
     PKCS7_RECIP_INFO *ri;
-
-    ri = DupPKCS7RecipientPtr(recip); /* NEED TO DUP */
+    X509 *x509;
+	
     GetPKCS7(self, pkcs7);
+    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
+    if (!(ri = PKCS7_RECIP_INFO_new())) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    if (!PKCS7_RECIP_INFO_set(ri, x509)) {
+	PKCS7_RECIP_INFO_free(ri);
+	ossl_raise(ePKCS7Error, NULL);
+    }
     if (!PKCS7_add_recipient_info(pkcs7, ri)) {
 	PKCS7_RECIP_INFO_free(ri);
-	ossl_raise(ePKCS7Error, "Could not add recipient.");
+	ossl_raise(ePKCS7Error, NULL);
     }
 
     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;
@@ -610,7 +519,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
 
     certs = pkcs7_get_certs_or_crls(self, 1);
     while((cert = sk_X509_pop(certs))) X509_free(cert);
-    rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self);
+    rb_iterate(rb_each, ary, ossl_pkcs7_set_certs_i, self);
 
     return ary;
 }
@@ -650,7 +559,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
 
     crls = pkcs7_get_certs_or_crls(self, 0);
     while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
-    rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self);
+    rb_iterate(rb_each, ary, ossl_pkcs7_set_crls_i, self);
 
     return ary;
 }
@@ -673,7 +582,9 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
     VALUE data;
     const char *msg;
 
+    GetPKCS7(self, p7);
     rb_scan_args(argc, argv, "22", &certs, &store, &indata, &flags);
+    x509st = GetX509StorePtr(store);
     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);
@@ -685,8 +596,6 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
 	    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);
@@ -694,10 +603,8 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
     }
     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);
@@ -717,10 +624,10 @@ ossl_pkcs7_decrypt(int argc, VALUE *argv, VALUE self)
     VALUE str;
 
     rb_scan_args(argc, argv, "21", &pkey, &cert, &flags);
+    GetPKCS7(self, p7);
     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)){
@@ -740,12 +647,13 @@ ossl_pkcs7_add_data(VALUE self, VALUE data)
     char buf[4096];
     int len;
 
-    in = ossl_obj2bio(data);
+    in = out = NULL;
     GetPKCS7(self, pkcs7);
     if(PKCS7_type_is_signed(pkcs7)){
 	if(!PKCS7_content_new(pkcs7, NID_pkcs7_data))
 	    ossl_raise(ePKCS7Error, NULL);
     }
+    in = ossl_obj2bio(data);
     if(!(out = PKCS7_dataInit(pkcs7, NULL))) goto err;
     for(;;){
 	if((len = BIO_read(in, buf, sizeof(buf))) <= 0)
@@ -778,7 +686,7 @@ ossl_pkcs7_to_der(VALUE self)
     if((len = i2d_PKCS7(pkcs7, NULL)) <= 0)
 	ossl_raise(ePKCS7Error, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = RSTRING(str)->ptr;
     if(i2d_PKCS7(pkcs7, &p) <= 0)
 	ossl_raise(ePKCS7Error, NULL);
     ossl_str_adjust(str, p);
@@ -831,10 +739,10 @@ ossl_pkcs7si_initialize(VALUE self, VALUE cert, VALUE key, VALUE digest)
     X509 *x509;
     const EVP_MD *md;
 
+    GetPKCS7si(self, p7si);
     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);
     }
@@ -843,7 +751,7 @@ ossl_pkcs7si_initialize(VALUE self, VALUE cert, VALUE key, VALUE digest)
 }
 
 static VALUE
-ossl_pkcs7si_get_issuer(VALUE self)
+ossl_pkcs7si_get_name(VALUE self)
 {
     PKCS7_SIGNER_INFO *p7si;
 
@@ -886,79 +794,20 @@ ossl_pkcs7si_get_signed_time(VALUE self)
 }
 
 /*
- * 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()
 {
-    cPKCS7 = rb_define_class_under(mOSSL, "PKCS7", rb_cObject);
-    ePKCS7Error = rb_define_class_under(cPKCS7, "PKCS7Error", eOSSLError);
-    rb_define_singleton_method(cPKCS7, "read_smime", ossl_pkcs7_s_read_smime, 1);
-    rb_define_singleton_method(cPKCS7, "write_smime", ossl_pkcs7_s_write_smime, -1);
-    rb_define_singleton_method(cPKCS7, "sign",  ossl_pkcs7_s_sign, -1);
-    rb_define_singleton_method(cPKCS7, "encrypt", ossl_pkcs7_s_encrypt, -1);
+    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);
@@ -973,7 +822,6 @@ Init_ossl_pkcs7()
     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);
@@ -988,23 +836,14 @@ Init_ossl_pkcs7()
     rb_define_alias(cPKCS7,  "to_s", "to_pem");
     rb_define_method(cPKCS7, "to_der", ossl_pkcs7_to_der, 0);
 
-    cPKCS7Signer = rb_define_class_under(cPKCS7, "SignerInfo", rb_cObject);
-    rb_define_const(cPKCS7, "Signer", cPKCS7Signer);
+    cPKCS7Signer = rb_define_class_under(mPKCS7, "Signer", rb_cObject);
     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, "name", ossl_pkcs7si_get_name,0);
     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(cPKCS7,"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); 
+    rb_define_method(cPKCS7Signer, "signed_time", ossl_pkcs7si_get_signed_time,0);
 
-#define DefPKCS7Const(x) rb_define_const(cPKCS7, #x, INT2NUM(PKCS7_##x))
+#define DefPKCS7Const(x) rb_define_const(mPKCS7, #x, INT2NUM(PKCS7_##x))
 
     DefPKCS7Const(TEXT);
     DefPKCS7Const(NOCERTS);
diff --git a/ext/openssl/ossl_pkcs7.h b/ext/openssl/ossl_pkcs7.h
index 371c421103..9378397f25 100644
--- a/ext/openssl/ossl_pkcs7.h
+++ b/ext/openssl/ossl_pkcs7.h
@@ -11,9 +11,9 @@
 #if !defined(_OSSL_PKCS7_H_)
 #define _OSSL_PKCS7_H_
 
+extern VALUE mPKCS7;
 extern VALUE cPKCS7;
-extern VALUE cPKCS7Signer;
-extern VALUE cPKCS7Recipient;
+extern VALUE cPKCS7SignerInfo;
 extern VALUE ePKCS7Error;
 
 void Init_ossl_pkcs7(void);
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index b295cfc25e..dcae075ee8 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -55,10 +55,6 @@ ossl_pkey_new(EVP_PKEY *pkey)
     case EVP_PKEY_DH:
 	return ossl_dh_new(pkey);
 #endif
-#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
-    case EVP_PKEY_EC:
-	return ossl_ec_new(pkey);
-#endif
     default:
 	ossl_raise(ePKeyError, "unsupported key type");
     }
@@ -72,7 +68,7 @@ ossl_pkey_new_from_file(VALUE filename)
     EVP_PKEY *pkey;
 
     SafeStringValue(filename);
-    if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
+    if (!(fp = fopen(RSTRING(filename)->ptr, "r"))) {
 	ossl_raise(ePKeyError, "%s", strerror(errno));
     }
 
@@ -100,21 +96,10 @@ GetPrivPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
 	
-    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
+    SafeGetPKey(obj, pkey);
+    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) { /* returns 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;
 }
@@ -124,10 +109,10 @@ DupPrivPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
 	
-    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
+    SafeGetPKey(obj, pkey);
+    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) { /* returns Qtrue */
 	ossl_raise(rb_eArgError, "Private key is needed.");
     }
-    SafeGetPKey(obj, pkey);
     CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
 
     return pkey;
@@ -160,6 +145,26 @@ ossl_pkey_initialize(VALUE self)
 }
 
 static VALUE
+ossl_pkey_to_der(VALUE self)
+{
+    EVP_PKEY *pkey;
+    VALUE str;
+    long len;
+    unsigned char *p;
+    
+    GetPKey(self, pkey);
+    if((len = i2d_PUBKEY(pkey, NULL)) <= 0)
+	ossl_raise(ePKeyError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(len = i2d_PUBKEY(pkey, &p) <= 0)
+	ossl_raise(ePKeyError, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+static VALUE
 ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
 {
     EVP_PKEY *pkey;
@@ -167,18 +172,19 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
     int buf_len;
     VALUE str;
 
+    GetPKey(self, pkey);
     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_PTR(data), RSTRING_LEN(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_PTR(str), &buf_len, pkey))
+    if (!EVP_SignFinal(&ctx, RSTRING(str)->ptr, &buf_len, pkey))
 	ossl_raise(ePKeyError, NULL);
-    assert(buf_len <= RSTRING_LEN(str));
-    rb_str_set_len(str, buf_len);
+    assert(buf_len <= RSTRING(str)->len);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
 
     return str;
 }
@@ -193,8 +199,8 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
     EVP_VerifyInit(&ctx, GetDigestPtr(digest));
     StringValue(sig);
     StringValue(data);
-    EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
-    switch (EVP_VerifyFinal(&ctx, RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
+    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:
@@ -211,10 +217,6 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
 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);
@@ -224,17 +226,17 @@ Init_ossl_pkey()
     rb_define_alloc_func(cPKey, ossl_pkey_alloc);
     rb_define_method(cPKey, "initialize", ossl_pkey_initialize, 0);
 
+    rb_define_method(cPKey, "to_der", ossl_pkey_to_der, 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, dh, ec
+     * INIT rsa, dsa
      */
     Init_ossl_rsa();
     Init_ossl_dsa();
     Init_ossl_dh();
-    Init_ossl_ec();
 }
 
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h
index 67ff1fddd0..189573546e 100644
--- a/ext/openssl/ossl_pkey.h
+++ b/ext/openssl/ossl_pkey.h
@@ -16,16 +16,11 @@ 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);\
@@ -43,7 +38,7 @@ 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 *DupPKeyPtr(VALUE);*/
 EVP_PKEY *GetPrivPKeyPtr(VALUE);
 EVP_PKEY *DupPrivPKeyPtr(VALUE);
 void Init_ossl_pkey(void);
@@ -71,30 +66,11 @@ void Init_ossl_dsa(void);
  */
 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);
 
-/*
- * EC
- */
-extern VALUE cEC;
-extern VALUE eECError;
-extern VALUE cEC_GROUP;
-extern VALUE eEC_GROUP;
-extern VALUE cEC_POINT;
-extern VALUE eEC_POINT;
-VALUE ossl_ec_new(EVP_PKEY *);
-void Init_ossl_ec(void);
-
-
 #define OSSL_PKEY_BN(keytype, name)					\
-/*									\
- *  call-seq:								\
- *     key.##name -> aBN						\
- */									\
 static VALUE ossl_##keytype##_get_##name(VALUE self)			\
 {									\
 	EVP_PKEY *pkey;							\
@@ -106,10 +82,6 @@ static VALUE ossl_##keytype##_get_##name(VALUE self)			\
 		return Qnil;						\
 	return ossl_bn_new(bn);						\
 }									\
-/*									\
- *  call-seq:								\
- *     key.##name = bn -> bn						\
- */									\
 static VALUE ossl_##keytype##_set_##name(VALUE self, VALUE bignum)	\
 {									\
 	EVP_PKEY *pkey;							\
@@ -132,10 +104,10 @@ static VALUE ossl_##keytype##_set_##name(VALUE self, VALUE bignum)	\
 	return bignum;							\
 }
 
-#define DEF_OSSL_PKEY_BN(class, keytype, name)				\
-do {									\
+#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);\
+	rb_define_method(class, #name "=", ossl_##keytype##_set_##name, 1);	\
 } while (0)
 
 #endif /* _OSSL_PKEY_H_ */
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
index 02c3d99ed8..e4823a2ec7 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -99,15 +99,6 @@ dh_generate(int size, int gen)
     return dh;
 }
 
-/*
- *  call-seq:
- *     DH.generate(size [, generator]) -> dh
- *
- *  === Parameters
- *  * +size+ is an integer representing the desired key size.  Keys smaller than 1024 should be considered insecure.
- *  * +generator+ is a small number > 1, typically 2 or 5.
- *
- */
 static VALUE
 ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
 {
@@ -116,9 +107,9 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
     VALUE size, gen, obj;
 	
     if (rb_scan_args(argc, argv, "11", &size, &gen) == 2) {
-	g = NUM2INT(gen);
+	g = FIX2INT(gen);
     }
-    dh = dh_generate(NUM2INT(size), g);
+    dh = dh_generate(FIX2INT(size), g);
     obj = dh_instance(klass, dh);
     if (obj == Qfalse) {
 	DH_free(dh);
@@ -128,21 +119,6 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
     return obj;
 }
 
-/*
- *  call-seq:
- *     DH.new([size [, generator] | string]) -> dh
- *
- *  === Parameters
- *  * +size+ is an integer representing the desired key size.  Keys smaller than 1024 should be considered insecure.
- *  * +generator+ is a small number > 1, typically 2 or 5.
- *  * +string+ contains the DER or PEM encoded key.
- *
- *  === Examples
- *  * DH.new -> dh
- *  * DH.new(1024) -> dh
- *  * DH.new(1024, 5) -> dh
- *  * DH.new(File.read('key.pem')) -> dh
- */
 static VALUE
 ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -153,12 +129,10 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
     VALUE arg, gen;
 
     GetPKey(self, pkey);
-    if(rb_scan_args(argc, argv, "02", &arg, &gen) == 0) {
-      dh = DH_new();
-    }
-    else if (FIXNUM_P(arg)) {
+    rb_scan_args(argc, argv, "11", &arg, &gen);
+    if (FIXNUM_P(arg)) {
 	if (!NIL_P(gen)) {
-	    g = NUM2INT(gen);
+	    g = FIX2INT(gen);
 	}
 	if (!(dh = dh_generate(FIX2INT(arg), g))) {
 	    ossl_raise(eDHError, NULL);
@@ -177,31 +151,24 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
     }
     if (!EVP_PKEY_assign_DH(pkey, dh)) {
 	DH_free(dh);
-	ossl_raise(eDHError, NULL);
+	ossl_raise(eRSAError, NULL);
     }
     return self;
 }
 
-/*
- *  call-seq:
- *     dh.public? -> true | false
- *
- */
 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;
 }
 
-/*
- *  call-seq:
- *     dh.private? -> true | false
- *
- */
 static VALUE
 ossl_dh_is_private(VALUE self)
 {
@@ -212,11 +179,6 @@ ossl_dh_is_private(VALUE self)
     return (DH_PRIVATE(pkey->pkey.dh)) ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
- *     dh.to_pem -> aString
- *
- */
 static VALUE
 ossl_dh_export(VALUE self)
 {
@@ -238,34 +200,6 @@ ossl_dh_export(VALUE self)
 }
 
 /*
- *  call-seq:
- *     dh.to_der -> aString
- *
- */
-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_PTR(str);
-    if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
-	ossl_raise(eDHError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-/*
- *  call-seq:
- *     dh.params -> hash
- *
  * Stores all parameters of key to the hash
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -289,9 +223,6 @@ ossl_dh_get_params(VALUE self)
 }
 
 /*
- *  call-seq:
- *     dh.to_text -> aString
- *
  * Prints all parameters of key to buffer
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -317,10 +248,7 @@ ossl_dh_to_text(VALUE self)
 }
 
 /*
- *  call-seq:
- *     dh.public_key -> aDH
- *
- *  Makes new instance DH PUBLIC_KEY from PRIVATE_KEY
+ * Makes new instance DH PUBLIC_KEY from PRIVATE_KEY
  */
 static VALUE
 ossl_dh_to_public_key(VALUE self)
@@ -340,11 +268,6 @@ ossl_dh_to_public_key(VALUE self)
     return obj;
 }
 
-/*
- *  call-seq:
- *     dh.check_params -> true | false
- *
- */
 static VALUE
 ossl_dh_check_params(VALUE self)
 {
@@ -362,11 +285,6 @@ ossl_dh_check_params(VALUE self)
     return codes == 0 ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
- *     dh.generate_key -> self
- *
- */
 static VALUE
 ossl_dh_generate_key(VALUE self)
 {
@@ -381,18 +299,6 @@ ossl_dh_generate_key(VALUE self)
     return self;
 }
 
-/*
- *  call-seq:
- *     dh.compute_key(pub_bn) -> aString
- *
- *  === Parameters
- *  * +pub_bn+ is a OpenSSL::BN.
- *
- *  Returns aString containing a shared secret computed from the other parties public value.
- *
- *  See DH_compute_key() for further information.
- *
- */
 static VALUE
 ossl_dh_compute_key(VALUE self, VALUE pub)
 {
@@ -407,126 +313,50 @@ ossl_dh_compute_key(VALUE self, VALUE pub)
     pub_key = GetBNPtr(pub);
     len = DH_size(dh);
     str = rb_str_new(0, len);
-    if ((len = DH_compute_key(RSTRING_PTR(str), pub_key, dh)) < 0) {
+    if ((len = DH_compute_key(RSTRING(str)->ptr, pub_key, dh)) < 0) {
 	ossl_raise(eDHError, NULL);
     }
-    rb_str_set_len(str, len);
+    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));
+    rb_define_method(cDH, "params", ossl_dh_get_params, 0);
 }
 
 #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/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index d9c7fcbe78..8da71a0867 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -20,7 +20,13 @@
 } while (0)
 
 #define DSA_HAS_PRIVATE(dsa) ((dsa)->priv_key)
-#define DSA_PRIVATE(obj,dsa) (DSA_HAS_PRIVATE(dsa)||OSSL_PKEY_IS_PRIVATE(obj))
+
+#ifdef OSSL_ENGINE_ENABLED
+#  define DSA_PRIVATE(dsa) (DSA_HAS_PRIVATE(dsa) || (dsa)->engine)
+#else
+#  define DSA_PRIVATE(dsa) DSA_HAS_PRIVATE(dsa)
+#endif
+
 
 /*
  * Classes
@@ -99,18 +105,10 @@ dsa_generate(int size)
     return dsa;
 }
 
-/*
- *  call-seq:
- *    DSA.generate(size) -> dsa
- *
- *  === Parameters
- *  * +size+ is an integer representing the desired key size.
- *
- */
 static VALUE
 ossl_dsa_s_generate(VALUE klass, VALUE size)
 {
-    DSA *dsa = dsa_generate(NUM2INT(size)); /* err handled by dsa_instance */
+    DSA *dsa = dsa_generate(FIX2INT(size)); /* err handled by dsa_instance */
     VALUE obj = dsa_instance(klass, dsa);
 
     if (obj == Qfalse) {
@@ -121,22 +119,6 @@ ossl_dsa_s_generate(VALUE klass, VALUE size)
     return obj;
 }
 
-/*
- *  call-seq:
- *    DSA.new([size | string [, pass]) -> dsa
- *
- *  === Parameters
- *  * +size+ is an integer representing the desired key size.
- *  * +string+ contains a DER or PEM encoded key.
- *  * +pass+ is a string that contains a optional password.
- *
- *  === Examples
- *  * DSA.new -> dsa
- *  * DSA.new(1024) -> dsa
- *  * DSA.new(File.read('dsa.pem')) -> dsa
- *  * DSA.new(File.read('dsa.pem'), 'mypassword') -> dsa
- *
- */
 static VALUE
 ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -147,10 +129,8 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
     VALUE arg, pass;
 	
     GetPKey(self, pkey);
-    if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
-        dsa = DSA_new();
-    }
-    else if (FIXNUM_P(arg)) {
+    rb_scan_args(argc, argv, "11", &arg, &pass);
+    if (FIXNUM_P(arg)) {
 	if (!(dsa = dsa_generate(FIX2INT(arg)))) {
 	    ossl_raise(eDSAError, NULL);
 	}
@@ -160,19 +140,18 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
 	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);
+	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) {
+        if (!dsa) {
 	    BIO_reset(in);
 	    dsa = d2i_DSAPrivateKey_bio(in, NULL);
 	}
-	if (!dsa) {
+        if (!dsa) {
 	    BIO_reset(in);
 	    dsa = d2i_DSA_PUBKEY_bio(in, NULL);
 	}
@@ -187,11 +166,6 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-/*
- *  call-seq:
- *    dsa.public? -> true | false
- *
- */
 static VALUE
 ossl_dsa_is_public(VALUE self)
 {
@@ -199,14 +173,13 @@ ossl_dsa_is_public(VALUE self)
 
     GetPKeyDSA(self, pkey);
 
+    /*
+     * Do we need to check dsap->dsa->public_pkey?
+     * return Qtrue;
+     */
     return (pkey->pkey.dsa->pub_key) ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
- *    dsa.private? -> true | false
- *
- */
 static VALUE
 ossl_dsa_is_private(VALUE self)
 {
@@ -214,22 +187,9 @@ ossl_dsa_is_private(VALUE self)
 	
     GetPKeyDSA(self, pkey);
 	
-    return (DSA_PRIVATE(self, pkey->pkey.dsa)) ? Qtrue : Qfalse;
+    return (DSA_PRIVATE(pkey->pkey.dsa)) ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
- *    dsa.to_pem([cipher, password]) -> aString
- *
- *  === Parameters
- *  +cipher+ is an OpenSSL::Cipher.
- *  +password+ is a string containing your password.
- *
- *  === Examples
- *  * DSA.to_pem -> aString
- *  * DSA.to_pem(cipher, 'mypassword') -> aString
- *
- */
 static VALUE
 ossl_dsa_export(int argc, VALUE *argv, VALUE self)
 {
@@ -268,39 +228,6 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self)
 }
 
 /*
- *  call-seq:
- *    dsa.to_der -> aString
- *
- */
-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_PTR(str);
-    if(i2d_func(pkey->pkey.dsa, &p) < 0)
-	ossl_raise(eDSAError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-/*
- *  call-seq:
- *    dsa.params -> hash
- *
  * Stores all parameters of key to the hash
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -325,9 +252,6 @@ ossl_dsa_get_params(VALUE self)
 }
 
 /*
- *  call-seq:
- *    dsa.to_text -> aString
- *
  * Prints all parameters of key to buffer
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -353,9 +277,6 @@ ossl_dsa_to_text(VALUE self)
 }
 
 /*
- *  call-seq:
- *    dsa.public_key -> aDSA
- *
  * Makes new instance DSA PUBLIC_KEY from PRIVATE_KEY
  */
 static VALUE
@@ -378,11 +299,6 @@ ossl_dsa_to_public_key(VALUE self)
 
 #define ossl_dsa_buf_size(pkey) (DSA_size((pkey)->pkey.dsa)+16)
 
-/*
- *  call-seq:
- *    dsa.syssign(string) -> aString
- *
- */
 static VALUE
 ossl_dsa_sign(VALUE self, VALUE data)
 {
@@ -392,24 +308,20 @@ ossl_dsa_sign(VALUE self, VALUE data)
 
     GetPKeyDSA(self, pkey);
     StringValue(data);
-    if (!DSA_PRIVATE(self, pkey->pkey.dsa)) {
+    if (!DSA_PRIVATE(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_PTR(data), RSTRING_LEN(data), RSTRING_PTR(str),
+    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);
     }
-    rb_str_set_len(str, buf_len);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
 
     return str;
 }
 
-/*
- *  call-seq:
- *    dsa.sysverify(digest, sig) -> true | false
- *
- */
 static VALUE
 ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
 {
@@ -420,8 +332,8 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
     StringValue(digest);
     StringValue(sig);
     /* type is ignored (0) */
-    ret = DSA_verify(0, RSTRING_PTR(digest), RSTRING_LEN(digest),
-		     RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
+    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);
     }
@@ -432,23 +344,12 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
     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);
@@ -462,23 +363,20 @@ Init_ossl_dsa()
     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/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
deleted file mode 100644
index 210054121d..0000000000
--- a/ext/openssl/ossl_pkey_ec.c
+++ /dev/null
@@ -1,1582 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Technorama Ltd. <oss-ruby@technorama.net>
- */
-
-#include "ossl.h"
-
-#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
-
-typedef struct {
-	EC_GROUP *group;
-	int dont_free;
-} ossl_ec_group;
-
-typedef struct {
-	EC_POINT *point;
-	int dont_free;
-} ossl_ec_point;
-
-
-#define EXPORT_PEM 0
-#define EXPORT_DER 1
-
-
-#define GetPKeyEC(obj, pkey) do { \
-    GetPKey(obj, pkey); \
-    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_EC) { \
-	ossl_raise(rb_eRuntimeError, "THIS IS NOT A EC PKEY!"); \
-    } \
-} while (0)
-
-#define SafeGet_ec_group(obj, group) do { \
-    OSSL_Check_Kind(obj, cEC_GROUP); \
-    Data_Get_Struct(obj, ossl_ec_group, group); \
-} while(0)
-
-#define Get_EC_KEY(obj, key) do { \
-    EVP_PKEY *pkey; \
-    GetPKeyEC(obj, pkey); \
-    key = pkey->pkey.ec; \
-} while(0)
-
-#define Require_EC_KEY(obj, key) do { \
-    Get_EC_KEY(obj, key); \
-    if (key == NULL) \
-        rb_raise(eECError, "EC_KEY is not initialized"); \
-} while(0)
-
-#define SafeRequire_EC_KEY(obj, key) do { \
-    OSSL_Check_Kind(obj, cEC); \
-    Require_EC_KEY(obj, key); \
-} while (0)
-
-#define Get_EC_GROUP(obj, g) do { \
-    ossl_ec_group *ec_group; \
-    Data_Get_Struct(obj, ossl_ec_group, ec_group); \
-    if (ec_group == NULL) \
-        rb_raise(eEC_GROUP, "missing ossl_ec_group structure"); \
-    g = ec_group->group; \
-} while(0)
-
-#define Require_EC_GROUP(obj, group) do { \
-    Get_EC_GROUP(obj, group); \
-    if (group == NULL) \
-        rb_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
-} while(0)
-
-#define SafeRequire_EC_GROUP(obj, group) do { \
-    OSSL_Check_Kind(obj, cEC_GROUP); \
-    Require_EC_GROUP(obj, group); \
-} while(0)
-
-#define Get_EC_POINT(obj, p) do { \
-    ossl_ec_point *ec_point; \
-    Data_Get_Struct(obj, ossl_ec_point, ec_point); \
-    if (ec_point == NULL) \
-        rb_raise(eEC_POINT, "missing ossl_ec_point structure"); \
-    p = ec_point->point; \
-} while(0)
-
-#define Require_EC_POINT(obj, point) do { \
-    Get_EC_POINT(obj, point); \
-    if (point == NULL) \
-        rb_raise(eEC_POINT, "EC_POINT is not initialized"); \
-} while(0)
-
-#define SafeRequire_EC_POINT(obj, point) do { \
-    OSSL_Check_Kind(obj, cEC_POINT); \
-    Require_EC_POINT(obj, point); \
-} while(0)
-
-VALUE cEC;
-VALUE eECError;
-VALUE cEC_GROUP;
-VALUE eEC_GROUP;
-VALUE cEC_POINT;
-VALUE eEC_POINT;
-
-static ID s_GFp;
-static ID s_GFp_simple;
-static ID s_GFp_mont;
-static ID s_GFp_nist;
-static ID s_GF2m;
-static ID s_GF2m_simple;
-
-static ID ID_uncompressed;
-static ID ID_compressed;
-static ID ID_hybrid;
-
-static VALUE ec_instance(VALUE klass, EC_KEY *ec)
-{
-    EVP_PKEY *pkey;
-    VALUE obj;
-	
-    if (!ec) {
-	return Qfalse;
-    }
-    if (!(pkey = EVP_PKEY_new())) {
-	return Qfalse;
-    }
-    if (!EVP_PKEY_assign_EC_KEY(pkey, ec)) {
-	EVP_PKEY_free(pkey);
-	return Qfalse;
-    }
-    WrapPKey(klass, obj, pkey);
-
-    return obj;
-}
-
-VALUE ossl_ec_new(EVP_PKEY *pkey)
-{
-    VALUE obj;
-
-    if (!pkey) {
-	obj = ec_instance(cEC, EC_KEY_new());
-    } else {
-	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_EC) {
-	    ossl_raise(rb_eTypeError, "Not a EC key!");
-	}
-	WrapPKey(cEC, obj, pkey);
-    }
-    if (obj == Qfalse) {
-	ossl_raise(eECError, NULL);
-    }
-
-    return obj;
-}
-
-
-/*  call-seq:
- *     OpenSSL::PKey::EC.new()
- *     OpenSSL::PKey::EC.new(ec_key)
- *     OpenSSL::PKey::EC.new(ec_group)
- *     OpenSSL::PKey::EC.new("secp112r1")
- *     OpenSSL::PKey::EC.new(pem_string)
- *     OpenSSL::PKey::EC.new(der_string)
- *
- *  See the OpenSSL documentation for:
- *     EC_KEY_*
- */
-static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    EC_KEY *ec = NULL;
-    VALUE arg, pass;
-    VALUE group = Qnil;
-	
-    GetPKey(self, pkey);
-    if (pkey->pkey.ec)
-        rb_raise(eECError, "EC_KEY already initialized");
-
-    rb_scan_args(argc, argv, "02", &arg, &pass);
-
-    if (NIL_P(arg)) {
-        ec = EC_KEY_new();
-    } else {
-        if (rb_obj_is_kind_of(arg, cEC)) {
-            EC_KEY *other_ec = NULL;
-
-            SafeRequire_EC_KEY(arg, other_ec);
-            ec = EC_KEY_dup(other_ec);
-        } else if (rb_obj_is_kind_of(arg, cEC_GROUP)) {
-        	ec = EC_KEY_new();
-        	group = arg;
-        } else {
-            BIO *in = ossl_obj2bio(arg);
-
-            ec = PEM_read_bio_ECPrivateKey(in, NULL, NULL, NULL);
-            if (!ec) {
-                BIO_reset(in);
-                ec = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
-            }
-            if (!ec) {
-                BIO_reset(in);
-                ec = d2i_ECPrivateKey_bio(in, NULL);
-            }
-            if (!ec) {
-                BIO_reset(in);
-                ec = d2i_EC_PUBKEY_bio(in, NULL);
-            }
-
-            BIO_free(in);
-
-            if (ec == NULL) {
-                const char *name = STR2CSTR(arg);
-                int nid = OBJ_sn2nid(name);
-
-                if (nid == NID_undef)
-                    ossl_raise(eECError, "unknown curve name (%s)\n", name);
-
-                if ((ec = EC_KEY_new_by_curve_name(nid)) == NULL)
-                    ossl_raise(eECError, "unable to create curve (%s)\n", name);
-
-                EC_KEY_set_asn1_flag(ec, OPENSSL_EC_NAMED_CURVE);
-                EC_KEY_set_conv_form(ec, POINT_CONVERSION_UNCOMPRESSED);
-            }
-        }
-    }
-
-    if (ec == NULL)
-        ossl_raise(eECError, NULL);
-
-    if (!EVP_PKEY_assign_EC_KEY(pkey, ec)) {
-	EC_KEY_free(ec);
-	ossl_raise(eECError, "EVP_PKEY_assign_EC_KEY");
-    }
-
-    rb_iv_set(self, "@group", Qnil);
-
-    if (!NIL_P(group))
-        rb_funcall(self, rb_intern("group="), 1, arg);
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     key.group   => group
- *
- *  Returns a constant <code>OpenSSL::EC::Group</code> that is tied to the key.
- *  Modifying the returned group can make the key invalid.
- */
-static VALUE ossl_ec_key_get_group(VALUE self)
-{
-    VALUE group_v;
-    EC_KEY *ec;
-    ossl_ec_group *ec_group;
-    EC_GROUP *group;
-
-    Require_EC_KEY(self, ec);
-
-    group_v = rb_iv_get(self, "@group");
-    if (!NIL_P(group_v))
-        return group_v;
-
-    if ((group = (EC_GROUP *)EC_KEY_get0_group(ec)) != NULL) {
-        group_v = rb_obj_alloc(cEC_GROUP);
-        SafeGet_ec_group(group_v, ec_group);
-        ec_group->group = group;
-        ec_group->dont_free = 1;
-        rb_iv_set(group_v, "@key", self);
-        rb_iv_set(self, "@group", group_v);
-        return group_v;
-    }
-
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     key.group = group   => group
- *
- *  Returns the same object passed, not the group object associated with the key.
- *  If you wish to access the group object tied to the key call key.group after setting
- *  the group.
- *
- *  Setting the group will immediately destroy any previously assigned group object.
- *  The group is internally copied by OpenSSL.  Modifying the original group after 
- *  assignment will not effect the internal key structure.
- *  (your changes may be lost).  BE CAREFUL.
- *
- *  EC_KEY_set_group calls EC_GROUP_free(key->group) then EC_GROUP_dup(), not EC_GROUP_copy.
- *  This documentation is accurate for OpenSSL 0.9.8b.
- */
-static VALUE ossl_ec_key_set_group(VALUE self, VALUE group_v)
-{
-    VALUE old_group_v;
-    EC_KEY *ec;
-    EC_GROUP *group;
-
-    Require_EC_KEY(self, ec);
-    SafeRequire_EC_GROUP(group_v, group);
-
-    old_group_v = rb_iv_get(self, "@group");
-    if (!NIL_P(old_group_v)) {
-        ossl_ec_group *old_ec_group;
-        SafeGet_ec_group(old_group_v, old_ec_group);
-
-        old_ec_group->group = NULL;
-        old_ec_group->dont_free = 0;
-        rb_iv_set(old_group_v, "@key", Qnil);
-    }
-
-    rb_iv_set(self, "@group", Qnil);
-
-    if (EC_KEY_set_group(ec, group) != 1)
-        ossl_raise(eECError, "EC_KEY_set_group");
-
-    return group_v;
-}
-
-/*
- *  call-seq:
- *     key.private_key   => OpenSSL::BN
- *
- *  See the OpenSSL documentation for EC_KEY_get0_private_key()
- */
-static VALUE ossl_ec_key_get_private_key(VALUE self)
-{
-    EC_KEY *ec;
-    const BIGNUM *bn;
-
-    Require_EC_KEY(self, ec);
-
-    if ((bn = EC_KEY_get0_private_key(ec)) == NULL)
-        return Qnil;
-
-    return ossl_bn_new(bn);
-}
-
-/*
- *  call-seq:
- *     key.private_key = openssl_bn
- *
- *  See the OpenSSL documentation for EC_KEY_set_private_key()
- */
-static VALUE ossl_ec_key_set_private_key(VALUE self, VALUE private_key)
-{
-    EC_KEY *ec;
-    BIGNUM *bn = NULL;
-
-    Require_EC_KEY(self, ec);
-    if (!NIL_P(private_key))
-        bn = GetBNPtr(private_key);
-
-    switch (EC_KEY_set_private_key(ec, bn)) {
-    case 1:
-        break;
-    case 0:
-        if (bn == NULL)
-            break;
-    default:
-        ossl_raise(eECError, "EC_KEY_set_private_key");
-    }
-
-    return private_key;
-}
-
-
-static VALUE ossl_ec_point_dup(const EC_POINT *point, VALUE group_v)
-{
-    VALUE obj;
-    const EC_GROUP *group;
-    ossl_ec_point *new_point;
-
-    obj = rb_obj_alloc(cEC_POINT);
-    Data_Get_Struct(obj, ossl_ec_point, new_point);
-
-    SafeRequire_EC_GROUP(group_v, group);
-
-    new_point->point = EC_POINT_dup(point, group);
-    if (new_point->point == NULL)
-        ossl_raise(eEC_POINT, "EC_POINT_dup");
-    rb_iv_set(obj, "@group", group_v);
-
-    return obj;
-}
-
-/*
- *  call-seq:
- *     key.public_key   => OpenSSL::PKey::EC::Point
- *
- *  See the OpenSSL documentation for EC_KEY_get0_public_key()
- */
-static VALUE ossl_ec_key_get_public_key(VALUE self)
-{
-    EC_KEY *ec;
-    const EC_POINT *point;
-    VALUE group;
-
-    Require_EC_KEY(self, ec);
-
-    if ((point = EC_KEY_get0_public_key(ec)) == NULL)
-        return Qnil;
-
-    group = rb_funcall(self, rb_intern("group"), 0);
-    if (NIL_P(group))
-        ossl_raise(eECError, "EC_KEY_get0_get0_group (has public_key but no group???");
-
-    return ossl_ec_point_dup(point, group);
-}
-
-/*
- *  call-seq:
- *     key.public_key = ec_point
- *
- *  See the OpenSSL documentation for EC_KEY_set_public_key()
- */
-static VALUE ossl_ec_key_set_public_key(VALUE self, VALUE public_key)
-{
-    EC_KEY *ec;
-    EC_POINT *point = NULL;
-
-    Require_EC_KEY(self, ec);
-    if (!NIL_P(public_key))
-        SafeRequire_EC_POINT(public_key, point);
-
-    switch (EC_KEY_set_public_key(ec, point)) {
-    case 1:
-        break;
-    case 0:
-        if (point == NULL)
-            break;
-    default:
-        ossl_raise(eECError, "EC_KEY_set_public_key");
-    }
-
-    return public_key;
-}
-
-/*
- *  call-seq:
- *     key.public_key? => true or false
- *
- *  Both public_key? and private_key? may return false at the same time unlike other PKey classes.
- */
-static VALUE ossl_ec_key_is_public_key(VALUE self)
-{
-    EC_KEY *ec;
-
-    Require_EC_KEY(self, ec);
-
-    return (EC_KEY_get0_public_key(ec) ? Qtrue : Qfalse);
-}
-
-/*
- *  call-seq:
- *     key.private_key? => true or false
- *
- *  Both public_key? and private_key? may return false at the same time unlike other PKey classes.
- */
-static VALUE ossl_ec_key_is_private_key(VALUE self)
-{
-    EC_KEY *ec;
-
-    Require_EC_KEY(self, ec);
-
-    return (EC_KEY_get0_private_key(ec) ? Qtrue : Qfalse);
-}
-
-static VALUE ossl_ec_key_to_string(VALUE self, int format)
-{
-    EC_KEY *ec;
-    BIO *out;
-    int i = -1;
-    int private = 0;
-    EVP_CIPHER *cipher = NULL;
-    char *password = NULL;
-    VALUE str;
-
-    Require_EC_KEY(self, ec);
-
-    if (EC_KEY_get0_public_key(ec) == NULL)
-        rb_raise(eECError, "can't export - no public key set");
-
-    if (EC_KEY_check_key(ec) != 1)
-	ossl_raise(eECError, "can't export - EC_KEY_check_key failed");
-
-    if (EC_KEY_get0_private_key(ec))
-        private = 1;
-
-    if (!(out = BIO_new(BIO_s_mem())))
-        ossl_raise(eECError, "BIO_new(BIO_s_mem())");
-
-    switch(format) {
-    case EXPORT_PEM:
-    	if (private) {
-    	    if (cipher || password)
-/* BUG: finish cipher/password key export */
-    	        rb_notimplement();
-            i = PEM_write_bio_ECPrivateKey(out, ec, cipher, NULL, 0, NULL, password);
-    	} else {
-    	    if (cipher || password)
-                rb_raise(rb_eArgError, "encryption is not supported when exporting this key type");
-
-            i = PEM_write_bio_EC_PUBKEY(out, ec);
-        }
-
-    	break;
-    case EXPORT_DER:
-        if (private) {
-    	    if (cipher || password)
-                rb_raise(rb_eArgError, "encryption is not supported when exporting this key type");
-
-            i = i2d_ECPrivateKey_bio(out, ec);
-        } else {
-    	    if (cipher || password)
-                rb_raise(rb_eArgError, "encryption is not supported when exporting this key type");
-
-            i = i2d_EC_PUBKEY_bio(out, ec);
-        }
-
-    	break;
-    default:
-        BIO_free(out);
-    	rb_raise(rb_eRuntimeError, "unknown format (internal error)");
-    }
-
-    if (i != 1) {
-        BIO_free(out);
-        ossl_raise(eECError, "outlen=%d", i);
-    }
-
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-/*
- *  call-seq:
- *     key.to_pem   => String
- *
- *  See the OpenSSL documentation for PEM_write_bio_ECPrivateKey()
- */
-static VALUE ossl_ec_key_to_pem(VALUE self)
-{
-    return ossl_ec_key_to_string(self, EXPORT_PEM);
-}
-
-/*
- *  call-seq:
- *     key.to_der   => String
- *
- *  See the OpenSSL documentation for i2d_ECPrivateKey_bio()
- */
-static VALUE ossl_ec_key_to_der(VALUE self)
-{
-    return ossl_ec_key_to_string(self, EXPORT_DER);
-}
-
-/*
- *  call-seq:
- *     key.to_text   => String
- *
- *  See the OpenSSL documentation for EC_KEY_print()
- */
-static VALUE ossl_ec_key_to_text(VALUE self)
-{
-    EC_KEY *ec;
-    BIO *out;
-    VALUE str;
-
-    Require_EC_KEY(self, ec);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eECError, "BIO_new(BIO_s_mem())");
-    }
-    if (!EC_KEY_print(out, ec, 0)) {
-	BIO_free(out);
-	ossl_raise(eECError, "EC_KEY_print");
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-/*
- *  call-seq:
- *     key.generate_key   => self
- *
- *  See the OpenSSL documentation for EC_KEY_generate_key()
- */
-static VALUE ossl_ec_key_generate_key(VALUE self)
-{
-    EC_KEY *ec;
-
-    Require_EC_KEY(self, ec);
-
-    if (EC_KEY_generate_key(ec) != 1)
-	ossl_raise(eECError, "EC_KEY_generate_key");
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     key.check_key   => true
- *
- *  Raises an exception if the key is invalid.
- *
- *  See the OpenSSL documentation for EC_KEY_check_key()
- */
-static VALUE ossl_ec_key_check_key(VALUE self)
-{
-    EC_KEY *ec;
-
-    Require_EC_KEY(self, ec);
-
-    if (EC_KEY_check_key(ec) != 1)
-	ossl_raise(eECError, "EC_KEY_check_key");
-
-    return Qtrue;
-}
-
-/*
- *  call-seq:
- *     key.dh_compute_key(pubkey)   => String
- *
- *  See the OpenSSL documentation for ECDH_compute_key()
- */
-static VALUE ossl_ec_key_dh_compute_key(VALUE self, VALUE pubkey)
-{
-    EC_KEY *ec;
-    EC_POINT *point;
-    int buf_len;
-    VALUE str;
-
-    Require_EC_KEY(self, ec);
-    SafeRequire_EC_POINT(pubkey, point);
-
-/* BUG: need a way to figure out the maximum string size */
-    buf_len = 1024;
-    str = rb_str_new(0, buf_len);
-/* BUG: take KDF as a block */
-    buf_len = ECDH_compute_key(RSTRING_PTR(str), buf_len, point, ec, NULL);
-    if (buf_len < 0)
-         ossl_raise(eECError, "ECDH_compute_key");
-
-    rb_str_resize(str, buf_len);
-
-    return str;
-}
-
-/* sign_setup */
-
-/*
- *  call-seq:
- *     key.dsa_sign_asn1(data)   => String
- *
- *  See the OpenSSL documentation for ECDSA_sign()
- */
-static VALUE ossl_ec_key_dsa_sign_asn1(VALUE self, VALUE data)
-{
-    EC_KEY *ec;
-    unsigned int buf_len;
-    VALUE str;
-
-    Require_EC_KEY(self, ec);
-    StringValue(data);
-
-    if (EC_KEY_get0_private_key(ec) == NULL)
-	ossl_raise(eECError, "Private EC key needed!");
-
-    str = rb_str_new(0, ECDSA_size(ec) + 16);
-    if (ECDSA_sign(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LEN(data), (unsigned char *) RSTRING_PTR(str), &buf_len, ec) != 1)
-         ossl_raise(eECError, "ECDSA_sign");
-
-    rb_str_resize(str, buf_len);
-
-    return str;
-}
-
-/*
- *  call-seq:
- *     key.dsa_verify(data, sig)   => true or false
- *
- *  See the OpenSSL documentation for ECDSA_verify()
- */
-static VALUE ossl_ec_key_dsa_verify_asn1(VALUE self, VALUE data, VALUE sig)
-{
-    EC_KEY *ec;
-
-    Require_EC_KEY(self, ec);
-    StringValue(data);
-    StringValue(sig);
-
-    switch (ECDSA_verify(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LEN(data), (unsigned char *) RSTRING_PTR(sig), RSTRING_LEN(sig), ec)) {
-    case 1:	return Qtrue;
-    case 0:	return Qfalse;
-    default:	break;
-    }
-
-    ossl_raise(eECError, "ECDSA_verify");
-}
-
-static void ossl_ec_group_free(ossl_ec_group *ec_group)
-{
-    if (!ec_group->dont_free && ec_group->group)
-        EC_GROUP_clear_free(ec_group->group);
-    free(ec_group);
-}
-
-static VALUE ossl_ec_group_alloc(VALUE klass)
-{
-    ossl_ec_group *ec_group;
-    VALUE obj;
-
-    obj = Data_Make_Struct(klass, ossl_ec_group, 0, ossl_ec_group_free, ec_group);
-
-    return obj;
-}
-
-/*  call-seq:
- *     OpenSSL::PKey::EC::Group.new("secp112r1")
- *     OpenSSL::PKey::EC::Group.new(ec_group)
- *     OpenSSL::PKey::EC::Group.new(pem_string)
- *     OpenSSL::PKey::EC::Group.new(der_string)
- *     OpenSSL::PKey::EC::Group.new(pem_file)
- *     OpenSSL::PKey::EC::Group.new(der_file)
- *     OpenSSL::PKey::EC::Group.new(:GFp_simple)
- *     OpenSSL::PKey::EC::Group.new(:GFp_mult)
- *     OpenSSL::PKey::EC::Group.new(:GFp_nist)
- *     OpenSSL::PKey::EC::Group.new(:GF2m_simple)
- *     OpenSSL::PKey::EC::Group.new(:GFp, bignum_p, bignum_a, bignum_b)
- *     OpenSSL::PKey::EC::Group.new(:GF2m, bignum_p, bignum_a, bignum_b)
- *
- *  See the OpenSSL documentation for EC_GROUP_*
- */
-static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE arg1, arg2, arg3, arg4;
-    ossl_ec_group *ec_group;
-    EC_GROUP *group = NULL;
-
-    Data_Get_Struct(self, ossl_ec_group, ec_group);
-    if (ec_group->group != NULL)
-        rb_raise(rb_eRuntimeError, "EC_GROUP is already initialized");
-
-    switch (rb_scan_args(argc, argv, "13", &arg1, &arg2, &arg3, &arg4)) {
-    case 1:
-        if (SYMBOL_P(arg1)) {
-            const EC_METHOD *method = NULL;
-            ID id = SYM2ID(arg1);
-
-            if (id == s_GFp_simple) {
-                method = EC_GFp_simple_method();
-            } else if (id == s_GFp_mont) {
-                method = EC_GFp_mont_method();
-            } else if (id == s_GFp_nist) {
-                method = EC_GFp_nist_method();
-            } else if (id == s_GF2m_simple) {
-                method = EC_GF2m_simple_method();
-            }
-
-            if (method) {
-                if ((group = EC_GROUP_new(method)) == NULL)
-                    ossl_raise(eEC_GROUP, "EC_GROUP_new");
-            } else {
-                rb_raise(rb_eArgError, "unknown symbol, must be :GFp_simple, :GFp_mont, :GFp_nist or :GF2m_simple");
-            }
-        } else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
-            const EC_GROUP *arg1_group;
-
-            SafeRequire_EC_GROUP(arg1, arg1_group);
-            if ((group = EC_GROUP_dup(arg1_group)) == NULL)
-                ossl_raise(eEC_GROUP, "EC_GROUP_dup");
-        } else {
-            BIO *in = ossl_obj2bio(arg1);
-
-            group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
-            if (!group) {
-                BIO_reset(in);
-                group = d2i_ECPKParameters_bio(in, NULL);
-            }
-
-            BIO_free(in);
-
-            if (!group) {
-                const char *name = STR2CSTR(arg1);
-                int nid = OBJ_sn2nid(name);
-
-                if (nid == NID_undef)
-                    ossl_raise(eEC_GROUP, "unknown curve name (%s)", name);
-
-                group = EC_GROUP_new_by_curve_name(nid);
-                if (group == NULL)
-                    ossl_raise(eEC_GROUP, "unable to create curve (%s)", name);
-
-                EC_GROUP_set_asn1_flag(group, OPENSSL_EC_NAMED_CURVE);
-                EC_GROUP_set_point_conversion_form(group, POINT_CONVERSION_UNCOMPRESSED);
-            }
-        }
-
-        break;
-    case 4:
-        if (SYMBOL_P(arg1)) {
-            ID id = SYM2ID(arg1);
-            EC_GROUP *(*new_curve)(const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *) = NULL;
-            const BIGNUM *p = GetBNPtr(arg2);
-            const BIGNUM *a = GetBNPtr(arg3);
-            const BIGNUM *b = GetBNPtr(arg4);
-
-            if (id == s_GFp) {
-                new_curve = EC_GROUP_new_curve_GFp;
-            } else if (id == s_GF2m) {
-                new_curve = EC_GROUP_new_curve_GF2m;
-            } else {
-                rb_raise(rb_eArgError, "unknown symbol, must be :GFp or :GF2m");
-            }
-
-            if ((group = new_curve(p, a, b, ossl_bn_ctx)) == NULL)
-                ossl_raise(eEC_GROUP, "EC_GROUP_new_by_GF*");
-        } else {
-             rb_raise(rb_eArgError, "unknown argument, must be :GFp or :GF2m");
-        }
-
-        break;
-    default:
-        rb_raise(rb_eArgError, "wrong number of arguments");
-    }
-
-    if (group == NULL)
-        ossl_raise(eEC_GROUP, "");
-
-    ec_group->group = group;
-
-    return self;
-}
-
-/*  call-seq:
- *     group1 == group2   => true | false
- *
- */
-static VALUE ossl_ec_group_eql(VALUE a, VALUE b)
-{
-    EC_GROUP *group1 = NULL, *group2 = NULL;
-
-    Require_EC_GROUP(a, group1);
-    SafeRequire_EC_GROUP(b, group2);
-
-    if (EC_GROUP_cmp(group1, group2, ossl_bn_ctx) == 1)
-       return Qfalse;
-
-    return Qtrue;
-}
-
-/*  call-seq:
- *     group.generator   => ec_point
- *
- *  See the OpenSSL documentation for EC_GROUP_get0_generator()
- */
-static VALUE ossl_ec_group_get_generator(VALUE self)
-{
-    VALUE point_obj;
-    EC_GROUP *group = NULL;
-
-    Require_EC_GROUP(self, group);
-
-    point_obj = ossl_ec_point_dup(EC_GROUP_get0_generator(group), self);
-
-    return point_obj;
-}
-
-/*  call-seq:
- *     group.set_generator(generator, order, cofactor)   => self
- *
- *  See the OpenSSL documentation for EC_GROUP_set_generator()
- */
-static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE order, VALUE cofactor)
-{
-    EC_GROUP *group = NULL;
-    const EC_POINT *point;
-    const BIGNUM *o, *co;
-
-    Require_EC_GROUP(self, group);
-    SafeRequire_EC_POINT(generator, point);
-    o = GetBNPtr(order);
-    co = GetBNPtr(cofactor);
-
-    if (EC_GROUP_set_generator(group, point, o, co) != 1)
-        ossl_raise(eEC_GROUP, "EC_GROUP_set_generator");
-
-    return self;
-}
-
-/*  call-seq:
- *     group.get_order   => order_bn
- *
- *  See the OpenSSL documentation for EC_GROUP_get_order()
- */
-static VALUE ossl_ec_group_get_order(VALUE self)
-{
-    VALUE bn_obj;
-    BIGNUM *bn;
-    EC_GROUP *group = NULL;
-
-    Require_EC_GROUP(self, group);
-
-    bn_obj = ossl_bn_new(NULL);
-    bn = GetBNPtr(bn_obj);
-
-    if (EC_GROUP_get_order(group, bn, ossl_bn_ctx) != 1)
-        ossl_raise(eEC_GROUP, "EC_GROUP_get_order");
-
-    return bn_obj;
-}
-
-/*  call-seq:
- *     group.get_cofactor   => cofactor_bn
- *
- *  See the OpenSSL documentation for EC_GROUP_get_cofactor()
- */
-static VALUE ossl_ec_group_get_cofactor(VALUE self)
-{
-    VALUE bn_obj;
-    BIGNUM *bn;
-    EC_GROUP *group = NULL;
-
-    Require_EC_GROUP(self, group);
-
-    bn_obj = ossl_bn_new(NULL);
-    bn = GetBNPtr(bn_obj);
-
-    if (EC_GROUP_get_cofactor(group, bn, ossl_bn_ctx) != 1)
-        ossl_raise(eEC_GROUP, "EC_GROUP_get_cofactor");
-
-    return bn_obj;
-}
-
-/*  call-seq:
- *     group.curve_name  => String
- *
- *  See the OpenSSL documentation for EC_GROUP_get_curve_name()
- */
-static VALUE ossl_ec_group_get_curve_name(VALUE self)
-{
-    EC_GROUP *group = NULL;
-    int nid;
-
-    Get_EC_GROUP(self, group);
-    if (group == NULL)
-        return Qnil;
-
-    nid = EC_GROUP_get_curve_name(group);
-
-/* BUG: an nid or asn1 object should be returned, maybe. */
-    return rb_str_new2(OBJ_nid2sn(nid));
-}
-
-/*  call-seq:
- *     EC.builtin_curves => [[name, comment], ...]
- *
- *  See the OpenSSL documentation for EC_builtin_curves()
- */
-static VALUE ossl_s_builtin_curves(VALUE self)
-{
-    EC_builtin_curve *curves = NULL;
-    int n;
-    int crv_len = EC_get_builtin_curves(NULL, 0);
-    VALUE ary, ret;
-
-    curves = ALLOCA_N(EC_builtin_curve, crv_len);
-    if (curves == NULL)
-        return Qnil;
-    if (!EC_get_builtin_curves(curves, crv_len))
-        ossl_raise(rb_eRuntimeError, "EC_get_builtin_curves");
-
-    ret = rb_ary_new2(crv_len);
-
-    for (n = 0; n < crv_len; n++) {
-        const char *sname = OBJ_nid2sn(curves[n].nid);
-        const char *comment = curves[n].comment;
-
-        ary = rb_ary_new2(2);
-        rb_ary_push(ary, rb_str_new2(sname));
-        rb_ary_push(ary, comment ? rb_str_new2(comment) : Qnil);
-        rb_ary_push(ret, ary);
-    }
-
-    return ret;
-}
-
-/*  call-seq:
- *     group.asn1_flag  => Fixnum
- *
- *  See the OpenSSL documentation for EC_GROUP_get_asn1_flag()
- */
-static VALUE ossl_ec_group_get_asn1_flag(VALUE self)
-{
-    EC_GROUP *group = NULL;
-    int flag;
-
-    Require_EC_GROUP(self, group);
-
-    flag = EC_GROUP_get_asn1_flag(group);
-
-    return INT2FIX(flag);
-}
-
-/*  call-seq:
- *     group.asn1_flag = Fixnum   => Fixnum
- *
- *  See the OpenSSL documentation for EC_GROUP_set_asn1_flag()
- */
-static VALUE ossl_ec_group_set_asn1_flag(VALUE self, VALUE flag_v)
-{
-    EC_GROUP *group = NULL;
-
-    Require_EC_GROUP(self, group);
-
-    EC_GROUP_set_asn1_flag(group, NUM2INT(flag_v));
-
-    return flag_v;
-}
-
-/*  call-seq:
- *     group.point_conversion_form  => :uncompressed | :compressed | :hybrid 
- *
- *  See the OpenSSL documentation for EC_GROUP_get_point_conversion_form()
- */
-static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
-{
-    EC_GROUP *group = NULL;
-    point_conversion_form_t form;
-    VALUE ret;
-
-    Require_EC_GROUP(self, group);
-
-    form = EC_GROUP_get_point_conversion_form(group);
-
-    switch (form) {
-    case POINT_CONVERSION_UNCOMPRESSED:	ret = ID_uncompressed; break;
-    case POINT_CONVERSION_COMPRESSED:	ret = ID_compressed; break;
-    case POINT_CONVERSION_HYBRID:	ret = ID_hybrid; break;
-    default:	rb_raise(eEC_GROUP, "unsupported point conversion form: %d, this module should be updated", form);
-    }
-    
-   return ID2SYM(ret);
-}
-
-/*  call-seq:
- *     group.point_conversion_form = form => form
- *
- *  See the OpenSSL documentation for EC_GROUP_set_point_conversion_form()
- */
-static VALUE ossl_ec_group_set_point_conversion_form(VALUE self, VALUE form_v)
-{
-    EC_GROUP *group = NULL;
-    point_conversion_form_t form;
-    ID form_id = SYM2ID(form_v);
-
-    Require_EC_GROUP(self, group);
-
-    if (form_id == ID_uncompressed) {
-        form = POINT_CONVERSION_UNCOMPRESSED;
-    } else if (form_id == ID_compressed) {
-        form = POINT_CONVERSION_COMPRESSED;
-    } else if (form_id == ID_hybrid) {
-        form = POINT_CONVERSION_HYBRID;
-    } else {
-        rb_raise(rb_eArgError, "form must be :compressed, :uncompressed, or :hybrid");
-    }
-
-    EC_GROUP_set_point_conversion_form(group, form);
-
-    return form_v;
-}
-
-/*  call-seq:
- *     group.seed   => String or nil
- *
- *  See the OpenSSL documentation for EC_GROUP_get0_seed()
- */
-static VALUE ossl_ec_group_get_seed(VALUE self)
-{
-    EC_GROUP *group = NULL;
-    size_t seed_len;
-
-    Require_EC_GROUP(self, group);
-
-    seed_len = EC_GROUP_get_seed_len(group);
-
-    if (seed_len == 0)
-        return Qnil;
-
-    return rb_str_new(EC_GROUP_get0_seed(group), seed_len);
-}
-
-/*  call-seq:
- *     group.seed = seed  => seed
- *
- *  See the OpenSSL documentation for EC_GROUP_set_seed()
- */
-static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
-{
-    EC_GROUP *group = NULL;
-
-    Require_EC_GROUP(self, group);
-    StringValue(seed);
-
-    if (EC_GROUP_set_seed(group, RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
-        ossl_raise(eEC_GROUP, "EC_GROUP_set_seed");
-
-    return seed;
-}
-
-/* get/set curve GFp, GF2m */
-
-/*  call-seq:
- *     group.degree   => Fixnum
- *
- *  See the OpenSSL documentation for EC_GROUP_get_degree()
- */
-static VALUE ossl_ec_group_get_degree(VALUE self)
-{
-    EC_GROUP *group = NULL;
-
-    Require_EC_GROUP(self, group);
-
-    return INT2NUM(EC_GROUP_get_degree(group));
-}
-
-static VALUE ossl_ec_group_to_string(VALUE self, int format)
-{
-    EC_GROUP *group;
-    BIO *out;
-    int i = -1;
-    VALUE str;
-
-    Get_EC_GROUP(self, group);
-
-    if (!(out = BIO_new(BIO_s_mem())))
-        ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
-
-    switch(format) {
-    case EXPORT_PEM:
-        i = PEM_write_bio_ECPKParameters(out, group);
-    	break;
-    case EXPORT_DER:
-        i = i2d_ECPKParameters_bio(out, group);
-    	break;
-    default:
-        BIO_free(out);
-    	rb_raise(rb_eRuntimeError, "unknown format (internal error)");
-    }
-
-    if (i != 1) {
-        BIO_free(out);
-        ossl_raise(eECError, NULL);
-    }
-
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-/*  call-seq:
- *     group.to_pem   => String
- *
- *  See the OpenSSL documentation for PEM_write_bio_ECPKParameters()
- */
-static VALUE ossl_ec_group_to_pem(VALUE self)
-{
-    return ossl_ec_group_to_string(self, EXPORT_PEM);
-}
-
-/*  call-seq:
- *     group.to_der   => String
- *
- *  See the OpenSSL documentation for i2d_ECPKParameters_bio()
- */
-static VALUE ossl_ec_group_to_der(VALUE self)
-{
-    return ossl_ec_group_to_string(self, EXPORT_DER);
-}
-
-/*  call-seq:
- *     group.to_text   => String
- *
- *  See the OpenSSL documentation for ECPKParameters_print()
- */
-static VALUE ossl_ec_group_to_text(VALUE self)
-{
-    EC_GROUP *group;
-    BIO *out;
-    VALUE str;
-
-    Require_EC_GROUP(self, group);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
-    }
-    if (!ECPKParameters_print(out, group, 0)) {
-	BIO_free(out);
-	ossl_raise(eEC_GROUP, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-
-static void ossl_ec_point_free(ossl_ec_point *ec_point)
-{
-    if (!ec_point->dont_free && ec_point->point)
-        EC_POINT_clear_free(ec_point->point);
-    free(ec_point);
-}
-
-static VALUE ossl_ec_point_alloc(VALUE klass)
-{
-    ossl_ec_point *ec_point;
-    VALUE obj;
-
-    obj = Data_Make_Struct(klass, ossl_ec_point, 0, ossl_ec_point_free, ec_point);
-
-    return obj;
-}
-
-/*
- *  call-seq:
- *     OpenSSL::PKey::EC::Point.new(point)
- *     OpenSSL::PKey::EC::Point.new(group)
- *     OpenSSL::PKey::EC::Point.new(group, bn)
- *
- *  See the OpenSSL documentation for EC_POINT_*
- */
-static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
-{
-    ossl_ec_point *ec_point;
-    EC_POINT *point = NULL;
-    VALUE arg1, arg2;
-    VALUE group_v = Qnil;
-    const EC_GROUP *group = NULL;
-
-    Data_Get_Struct(self, ossl_ec_point, ec_point);
-    if (ec_point->point)
-        rb_raise(eEC_POINT, "EC_POINT already initialized");
-
-    switch (rb_scan_args(argc, argv, "11", &arg1, &arg2)) {
-    case 1:
-        if (rb_obj_is_kind_of(arg1, cEC_POINT)) {
-            const EC_POINT *arg_point;
-
-            group_v = rb_iv_get(arg1, "@group");
-            SafeRequire_EC_GROUP(group_v, group);
-            SafeRequire_EC_POINT(arg1, arg_point);
-
-            point = EC_POINT_dup(arg_point, group);
-        } else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
-            group_v = arg1;
-            SafeRequire_EC_GROUP(group_v, group);
-
-            point = EC_POINT_new(group);
-        } else {
-            rb_raise(eEC_POINT, "wrong argument type: must be OpenSSL::PKey::EC::Point or OpenSSL::Pkey::EC::Group");
-        }
-
-        break;
-     case 2:
-        if (!rb_obj_is_kind_of(arg1, cEC_GROUP))
-            rb_raise(rb_eArgError, "1st argument must be OpenSSL::PKey::EC::Group");
-        group_v = arg1;
-        SafeRequire_EC_GROUP(group_v, group);
-        
-        if (rb_obj_is_kind_of(arg2, cBN)) {
-            const BIGNUM *bn = GetBNPtr(arg2);
-
-            point = EC_POINT_bn2point(group, bn, NULL, ossl_bn_ctx);
-        } else {
-            BIO *in = ossl_obj2bio(arg1);
-
-/* BUG: finish me */
-
-            BIO_free(in);
-
-            if (point == NULL) {
-                ossl_raise(eEC_POINT, "unknown type for 2nd arg");
-            }
-        }
-        break;
-    default:
-        rb_raise(rb_eArgError, "wrong number of arguments");
-    }
-
-    if (point == NULL)
-        ossl_raise(eEC_POINT, NULL);
-
-    if (NIL_P(group_v))
-        rb_raise(rb_eRuntimeError, "missing group (internal error)");
-
-    ec_point->point = point;
-
-    rb_iv_set(self, "@group", group_v);
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     point1 == point2 => true | false
- *
- */
-static VALUE ossl_ec_point_eql(VALUE a, VALUE b)
-{
-    EC_POINT *point1, *point2;
-    VALUE group_v1 = rb_iv_get(a, "@group");
-    VALUE group_v2 = rb_iv_get(b, "@group");
-    const EC_GROUP *group;
-
-    if (ossl_ec_group_eql(group_v1, group_v2) == Qfalse)
-        return Qfalse;
-
-    Require_EC_POINT(a, point1);
-    SafeRequire_EC_POINT(b, point2);
-    SafeRequire_EC_GROUP(group_v1, group);
-
-    if (EC_POINT_cmp(group, point1, point2, ossl_bn_ctx) == 1)
-        return Qfalse;
-
-    return Qtrue;
-}
-
-/*
- *  call-seq:
- *     point.infinity? => true | false
- *
- */
-static VALUE ossl_ec_point_is_at_infinity(VALUE self)
-{
-    EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
-    const EC_GROUP *group;
-
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
-
-    switch (EC_POINT_is_at_infinity(group, point)) {
-    case 1: return Qtrue;
-    case 0: return Qfalse;
-    default: ossl_raise(cEC_POINT, "EC_POINT_is_at_infinity");
-    }
-}
-
-/*
- *  call-seq:
- *     point.on_curve? => true | false
- *
- */
-static VALUE ossl_ec_point_is_on_curve(VALUE self)
-{
-    EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
-    const EC_GROUP *group;
-
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
-
-    switch (EC_POINT_is_on_curve(group, point, ossl_bn_ctx)) {
-    case 1: return Qtrue;
-    case 0: return Qfalse;
-    default: ossl_raise(cEC_POINT, "EC_POINT_is_on_curve");
-    }
-}
-
-/*
- *  call-seq:
- *     point.make_affine! => self
- *
- */
-static VALUE ossl_ec_point_make_affine(VALUE self)
-{
-    EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
-    const EC_GROUP *group;
-
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
-
-    if (EC_POINT_make_affine(group, point, ossl_bn_ctx) != 1)
-        ossl_raise(cEC_POINT, "EC_POINT_make_affine");
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     point.invert! => self
- *
- */
-static VALUE ossl_ec_point_invert(VALUE self)
-{
-    EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
-    const EC_GROUP *group;
-
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
-
-    if (EC_POINT_invert(group, point, ossl_bn_ctx) != 1)
-        ossl_raise(cEC_POINT, "EC_POINT_invert");
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     point.set_to_infinity! => self
- *
- */
-static VALUE ossl_ec_point_set_to_infinity(VALUE self)
-{
-    EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
-    const EC_GROUP *group;
-
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
-
-    if (EC_POINT_set_to_infinity(group, point) != 1)
-        ossl_raise(cEC_POINT, "EC_POINT_set_to_infinity");
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     point.to_bn   => OpenSSL::BN
- *
- *  See the OpenSSL documentation for EC_POINT_point2bn()
- */
-static VALUE ossl_ec_point_to_bn(VALUE self)
-{
-    EC_POINT *point;
-    VALUE bn_obj;
-    VALUE group_v = rb_iv_get(self, "@group");
-    const EC_GROUP *group;
-    point_conversion_form_t form;
-    BIGNUM *bn;
-
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
-
-    form = EC_GROUP_get_point_conversion_form(group);
-
-    bn_obj = rb_obj_alloc(cBN);
-    bn = GetBNPtr(bn_obj);
-
-    if (EC_POINT_point2bn(group, point, form, bn, ossl_bn_ctx) == NULL)
-        ossl_raise(eEC_POINT, "EC_POINT_point2bn");
-
-    return bn_obj;
-}
-
-static void no_copy(VALUE klass)
-{
-    rb_undef_method(klass, "copy");
-    rb_undef_method(klass, "clone");
-    rb_undef_method(klass, "dup");
-    rb_undef_method(klass, "initialize_copy");
-}
-
-void Init_ossl_ec()
-{
-#ifdef DONT_NEED_RDOC_WORKAROUND
-    mOSSL = rb_define_module("OpenSSL");
-    mPKey = rb_define_module_under(mOSSL, "PKey");
-#endif
-
-    eECError = rb_define_class_under(mPKey, "ECError", ePKeyError);
-
-    cEC = rb_define_class_under(mPKey, "EC", cPKey);
-    cEC_GROUP = rb_define_class_under(cEC, "Group", rb_cObject);
-    cEC_POINT = rb_define_class_under(cEC, "Point", rb_cObject);
-    eEC_GROUP = rb_define_class_under(cEC_GROUP, "Error", eOSSLError);
-    eEC_POINT = rb_define_class_under(cEC_POINT, "Error", eOSSLError);
-
-    s_GFp = rb_intern("GFp");
-    s_GF2m = rb_intern("GF2m");
-    s_GFp_simple = rb_intern("GFp_simple");
-    s_GFp_mont = rb_intern("GFp_mont");
-    s_GFp_nist = rb_intern("GFp_nist");
-    s_GF2m_simple = rb_intern("GF2m_simple");
-
-    ID_uncompressed = rb_intern("uncompressed");
-    ID_compressed = rb_intern("compressed");
-    ID_hybrid = rb_intern("hybrid");
-
-#ifdef OPENSSL_EC_NAMED_CURVE
-    rb_define_const(cEC, "NAMED_CURVE", ULONG2NUM(OPENSSL_EC_NAMED_CURVE));
-#endif
-
-    rb_define_singleton_method(cEC, "builtin_curves", ossl_s_builtin_curves, 0);
-
-    rb_define_method(cEC, "initialize", ossl_ec_key_initialize, -1);
-/* copy/dup/cmp */
-
-    rb_define_method(cEC, "group", ossl_ec_key_get_group, 0);
-    rb_define_method(cEC, "group=", ossl_ec_key_set_group, 1);
-    rb_define_method(cEC, "private_key", ossl_ec_key_get_private_key, 0);
-    rb_define_method(cEC, "private_key=", ossl_ec_key_set_private_key, 1);
-    rb_define_method(cEC, "public_key", ossl_ec_key_get_public_key, 0);
-    rb_define_method(cEC, "public_key=", ossl_ec_key_set_public_key, 1);
-    rb_define_method(cEC, "private_key?", ossl_ec_key_is_private_key, 0);
-    rb_define_method(cEC, "public_key?", ossl_ec_key_is_public_key, 0);
-/*  rb_define_method(cEC, "", ossl_ec_key_get_, 0);
-    rb_define_method(cEC, "=", ossl_ec_key_set_ 1);
-    set/get enc_flags
-    set/get _conv_from
-    set/get asn1_flag (can use ruby to call self.group.asn1_flag)
-    set/get precompute_mult
-*/
-    rb_define_method(cEC, "generate_key", ossl_ec_key_generate_key, 0);
-    rb_define_method(cEC, "check_key", ossl_ec_key_check_key, 0);
-
-    rb_define_method(cEC, "dh_compute_key", ossl_ec_key_dh_compute_key, 1);
-    rb_define_method(cEC, "dsa_sign_asn1", ossl_ec_key_dsa_sign_asn1, 1);
-    rb_define_method(cEC, "dsa_verify_asn1", ossl_ec_key_dsa_verify_asn1, 2);
-/* do_sign/do_verify */
-
-    rb_define_method(cEC, "to_pem", ossl_ec_key_to_pem, 0);
-    rb_define_method(cEC, "to_der", ossl_ec_key_to_der, 0);
-    rb_define_method(cEC, "to_text", ossl_ec_key_to_text, 0);
-
-
-    rb_define_alloc_func(cEC_GROUP, ossl_ec_group_alloc);
-    rb_define_method(cEC_GROUP, "initialize", ossl_ec_group_initialize, -1);
-    rb_define_method(cEC_GROUP, "eql?", ossl_ec_group_eql, 1);
-    rb_define_alias(cEC_GROUP, "==", "eql?");
-/* copy/dup/cmp */
-
-    rb_define_method(cEC_GROUP, "generator", ossl_ec_group_get_generator, 0);
-    rb_define_method(cEC_GROUP, "set_generator", ossl_ec_group_set_generator, 3);
-    rb_define_method(cEC_GROUP, "order", ossl_ec_group_get_order, 0);
-    rb_define_method(cEC_GROUP, "cofactor", ossl_ec_group_get_cofactor, 0);
-
-    rb_define_method(cEC_GROUP, "curve_name", ossl_ec_group_get_curve_name, 0);
-/*    rb_define_method(cEC_GROUP, "curve_name=", ossl_ec_group_set_curve_name, 1); */
-
-    rb_define_method(cEC_GROUP, "asn1_flag", ossl_ec_group_get_asn1_flag, 0);
-    rb_define_method(cEC_GROUP, "asn1_flag=", ossl_ec_group_set_asn1_flag, 1);
-
-    rb_define_method(cEC_GROUP, "point_conversion_form", ossl_ec_group_get_point_conversion_form, 0);
-    rb_define_method(cEC_GROUP, "point_conversion_form=", ossl_ec_group_set_point_conversion_form, 1);
-
-    rb_define_method(cEC_GROUP, "seed", ossl_ec_group_get_seed, 0);
-    rb_define_method(cEC_GROUP, "seed=", ossl_ec_group_set_seed, 1);
-
-/* get/set GFp, GF2m */
-
-    rb_define_method(cEC_GROUP, "degree", ossl_ec_group_get_degree, 0);
-
-/* check* */
-
-
-    rb_define_method(cEC_GROUP, "to_pem", ossl_ec_group_to_pem, 0);
-    rb_define_method(cEC_GROUP, "to_der", ossl_ec_group_to_der, 0);
-    rb_define_method(cEC_GROUP, "to_text", ossl_ec_group_to_text, 0);
-
-
-    rb_define_alloc_func(cEC_POINT, ossl_ec_point_alloc);
-    rb_define_method(cEC_POINT, "initialize", ossl_ec_point_initialize, -1);
-    rb_attr(cEC_POINT, rb_intern("group"), 1, 0, 0);
-    rb_define_method(cEC_POINT, "eql?", ossl_ec_point_eql, 1);
-    rb_define_alias(cEC_POINT, "==", "eql?");
-
-    rb_define_method(cEC_POINT, "infinity?", ossl_ec_point_is_at_infinity, 0);
-    rb_define_method(cEC_POINT, "on_curve?", ossl_ec_point_is_on_curve, 0);
-    rb_define_method(cEC_POINT, "make_affine!", ossl_ec_point_make_affine, 0);
-    rb_define_method(cEC_POINT, "invert!", ossl_ec_point_invert, 0);
-    rb_define_method(cEC_POINT, "set_to_infinity!", ossl_ec_point_set_to_infinity, 0);
-/* all the other methods */
-
-    rb_define_method(cEC_POINT, "to_bn", ossl_ec_point_to_bn, 0);
-
-    no_copy(cEC);
-    no_copy(cEC_GROUP);
-    no_copy(cEC_POINT);
-}
-
-#else /* defined NO_EC */
-void Init_ossl_ec()
-{
-}
-#endif /* NO_EC */
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index 9ac69e7ded..669e84efca 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -20,7 +20,12 @@
 } 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))
+
+#ifdef OSSL_ENGINE_ENABLED
+#  define RSA_PRIVATE(rsa) (RSA_HAS_PRIVATE(rsa) || (rsa)->engine)
+#else
+#  define RSA_PRIVATE(rsa) RSA_HAS_PRIVATE(rsa)
+#endif
 
 /*
  * Classes
@@ -84,19 +89,9 @@ rsa_generate(int size, int exp)
 	    NULL);
 }
 
-/*
- *  call-seq:
- *     RSA.generate(size [, exponent]) -> rsa
- *
- *  === Parameters
- *  * +size+ is an integer representing the desired key size.  Keys smaller than 1024 should be considered insecure.
- *  * +exponent+ is an odd number normally 3, 17, or 65537.
- *
- */
 static VALUE
 ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
 {
-/* why does this method exist?  why can't initialize take an optional exponent? */
     RSA *rsa;
     VALUE size, exp;
     VALUE obj;
@@ -114,20 +109,6 @@ ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
     return obj;
 }
 
-/*
- *  call-seq:
- *     RSA.new([size | encoded_key] [, pass]) -> rsa
- *
- *  === Parameters
- *  * +size+ is an integer representing the desired key size.
- *  * +encoded_key+ is a string containing PEM or DER encoded key.
- *  * +pass+ is an optional string with the password to decrypt the encoded key.
- *
- *  === Examples
- *  * RSA.new(2048) -> rsa 
- *  * RSA.new(File.read("rsa.pem")) -> rsa
- *  * RSA.new(File.read("rsa.pem"), "mypassword") -> rsa
- */
 static VALUE
 ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -138,10 +119,8 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
     VALUE arg, pass;
 	
     GetPKey(self, pkey);
-    if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
-	rsa = RSA_new();
-    }
-    else if (FIXNUM_P(arg)) {
+    rb_scan_args(argc, argv, "11", &arg, &pass);
+    if (FIXNUM_P(arg)) {
 	rsa = rsa_generate(FIX2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2INT(pass));
 	if (!rsa) ossl_raise(eRSAError, NULL);
     }
@@ -181,13 +160,6 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-/*
- *  call-seq:
- *     rsa.public? -> true
- *
- *  The return value is always true since every private key is also a public key.
- *
- */
 static VALUE
 ossl_rsa_is_public(VALUE self)
 {
@@ -195,38 +167,22 @@ ossl_rsa_is_public(VALUE self)
 
     GetPKeyRSA(self, pkey);
     /*
-     * This method should check for n and e.  BUG.
+     * SURPRISE! :-))
+     * Every key is public at the same time!
      */
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     rsa.private? -> true | false
- *
- */
 static VALUE
 ossl_rsa_is_private(VALUE self)
 {
     EVP_PKEY *pkey;
 	
     GetPKeyRSA(self, pkey);
-    
-    return (RSA_PRIVATE(self, pkey->pkey.rsa)) ? Qtrue : Qfalse;
+	
+    return (RSA_PRIVATE(pkey->pkey.rsa)) ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
- *     rsa.to_pem([cipher, pass]) -> aString
- *
- *  === Parameters
- *  * +cipher+ is a Cipher object.
- *  * +pass+ is a string.
- *
- *  === Examples
- *  * rsa.to_pem -> aString
- *  * rsa.to_pem(cipher, pass) -> aString
- */
 static VALUE
 ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 {
@@ -266,153 +222,95 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
     return str;
 }
 
-/*
- *  call-seq:
- *     rsa.to_der -> aString
- *
- */
-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_PTR(str);
-    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)
 
-/*
- *  call-seq:
- *     rsa.public_encrypt(string [, padding]) -> aString
- *
- */
 static VALUE
-ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
+ossl_rsa_public_encrypt(VALUE self, VALUE buffer)
 {
     EVP_PKEY *pkey;
-    int buf_len, pad;
-    VALUE str, buffer, padding;
-
+    int buf_len;
+    VALUE str;
+	
     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_LEN(buffer), RSTRING_PTR(buffer),
-				 RSTRING_PTR(str), pkey->pkey.rsa,
-				 pad);
+    buf_len = RSA_public_encrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
+				 RSTRING(str)->ptr, pkey->pkey.rsa,
+				 RSA_PKCS1_PADDING);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    rb_str_set_len(str, buf_len);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
 
     return str;
 }
 
-/*
- *  call-seq:
- *     rsa.public_decrypt(string [, padding]) -> aString
- *
- */
 static VALUE
-ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
+ossl_rsa_public_decrypt(VALUE self, VALUE buffer)
 {
     EVP_PKEY *pkey;
-    int buf_len, pad;
-    VALUE str, buffer, padding;
+    int buf_len;
+    VALUE str;
 
     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_LEN(buffer), RSTRING_PTR(buffer),
-				 RSTRING_PTR(str), pkey->pkey.rsa,
-				 pad);
-    if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    rb_str_set_len(str, buf_len);
+    buf_len = RSA_public_decrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
+				 RSTRING(str)->ptr, pkey->pkey.rsa,
+				 RSA_PKCS1_PADDING);
+    if(buf_len < 0) ossl_raise(eRSAError, NULL);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
     
     return str;
 }
 
-/*
- *  call-seq:
- *     rsa.private_encrypt(string [, padding]) -> aString
- *
- */
 static VALUE
-ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
+ossl_rsa_private_encrypt(VALUE self, VALUE buffer)
 {
     EVP_PKEY *pkey;
-    int buf_len, pad;
-    VALUE str, buffer, padding;
-
+    int buf_len;
+    VALUE str;
+	
     GetPKeyRSA(self, pkey);
-    if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
-	ossl_raise(eRSAError, "private key needed.");
+    if (!RSA_PRIVATE(pkey->pkey.rsa)) {
+	ossl_raise(eRSAError, "PRIVATE key needed for this operation!");
     }	
-    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_LEN(buffer), RSTRING_PTR(buffer),
-				  RSTRING_PTR(str), pkey->pkey.rsa,
-				  pad);
+    buf_len = RSA_private_encrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
+				  RSTRING(str)->ptr, pkey->pkey.rsa,
+				  RSA_PKCS1_PADDING);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    rb_str_set_len(str, buf_len);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
     
     return str;
 }
 
-
-/*
- *  call-seq:
- *     rsa.private_decrypt(string [, padding]) -> aString
- *
- */
 static VALUE
-ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
+ossl_rsa_private_decrypt(VALUE self, VALUE buffer)
 {
     EVP_PKEY *pkey;
-    int buf_len, pad;
-    VALUE str, buffer, padding;
+    int buf_len;
+    VALUE str;
 
     GetPKeyRSA(self, pkey);
-    if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
-	ossl_raise(eRSAError, "private key needed.");
+    if (!RSA_PRIVATE(pkey->pkey.rsa)) {
+	ossl_raise(eRSAError, "Private RSA 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_LEN(buffer), RSTRING_PTR(buffer),
-				  RSTRING_PTR(str), pkey->pkey.rsa,
-				  pad);
+    buf_len = RSA_private_decrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
+				  RSTRING(str)->ptr, pkey->pkey.rsa,
+				  RSA_PKCS1_PADDING);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    rb_str_set_len(str, buf_len);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
 
     return str;
 }
 
 /*
- *  call-seq:
- *     rsa.params -> hash
- *
  * Stores all parameters of key to the hash
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (I's up to you)
@@ -440,9 +338,6 @@ ossl_rsa_get_params(VALUE self)
 }
 
 /*
- *  call-seq:
- *     rsa.to_text -> aString
- *
  * Prints all parameters of key to buffer
  * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
  * Don't use :-)) (It's up to you)
@@ -468,9 +363,6 @@ ossl_rsa_to_text(VALUE self)
 }
 
 /*
- *  call-seq:
- *     rsa.public_key -> aRSA
- *
  * Makes new instance RSA PUBLIC_KEY from PRIVATE_KEY
  */
 static VALUE
@@ -493,6 +385,7 @@ ossl_rsa_to_public_key(VALUE self)
 
 /*
  * TODO: Test me
+extern BN_CTX *ossl_bn_ctx;
 
 static VALUE
 ossl_rsa_blinding_on(VALUE self)
@@ -531,16 +424,9 @@ 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);
@@ -554,12 +440,11 @@ Init_ossl_rsa()
     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);
+    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);
@@ -572,11 +457,6 @@ Init_ossl_rsa()
 
     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);
@@ -585,9 +465,11 @@ Init_ossl_rsa()
 }
 
 #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/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index ad830fbc98..ec9883d70a 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -27,150 +27,84 @@ VALUE eRandomError;
 /*
  * Private
  */
-
-/*
- *  call-seq:
- *     seed(str) -> str
- *
- */
 static VALUE
 ossl_rand_seed(VALUE self, VALUE str)
 {
     StringValue(str);
-    RAND_seed(RSTRING_PTR(str), RSTRING_LEN(str));
+    RAND_seed(RSTRING(str)->ptr, RSTRING(str)->len);
 
     return str;
 }
 
-/*
- *  call-seq:
- *     add(str, entropy) -> self
- *
- */
-static VALUE
-ossl_rand_add(VALUE self, VALUE str, VALUE entropy)
-{
-    StringValue(str);
-    RAND_add(RSTRING_PTR(str), RSTRING_LEN(str), NUM2DBL(entropy));
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     load_random_file(filename) -> true
- *
- */
 static VALUE
 ossl_rand_load_file(VALUE self, VALUE filename)
 {
     SafeStringValue(filename);
 	
-    if(!RAND_load_file(RSTRING_PTR(filename), -1)) {
+    if(!RAND_load_file(RSTRING(filename)->ptr, -1)) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     write_random_file(filename) -> true
- *
- */
 static VALUE
 ossl_rand_write_file(VALUE self, VALUE filename)
 {
     SafeStringValue(filename);
-    if (RAND_write_file(RSTRING_PTR(filename)) == -1) {
+    if (RAND_write_file(RSTRING(filename)->ptr) == -1) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     random_bytes(length) -> aString
- *
- */
 static VALUE
 ossl_rand_bytes(VALUE self, VALUE len)
 {
     VALUE str;
-    int n = NUM2INT(len);
-
-    str = rb_str_new(0, n);
-    if (!RAND_bytes(RSTRING_PTR(str), n)) {
+	
+    str = rb_str_new(0, FIX2INT(len));
+    if (!RAND_bytes(RSTRING(str)->ptr, FIX2INT(len))) {
 	ossl_raise(eRandomError, NULL);
     }
 
     return str;
 }
 
-/*
- *  call-seq:
- *     pseudo_bytes(length) -> aString
- *
- */
 static VALUE
 ossl_rand_pseudo_bytes(VALUE self, VALUE len)
 {
     VALUE str;
-    int n = NUM2INT(len);
 
-    str = rb_str_new(0, n);
-    if (!RAND_pseudo_bytes(RSTRING_PTR(str), n)) {
+    str = rb_str_new(0, FIX2INT(len));
+    if (!RAND_pseudo_bytes(RSTRING(str)->ptr, FIX2INT(len))) {
 	ossl_raise(eRandomError, NULL);
     }
 
     return str;
 }
 
-/*
- *  call-seq:
- *     egd(filename) -> true
- *
- */
 static VALUE
 ossl_rand_egd(VALUE self, VALUE filename)
 {
     SafeStringValue(filename);
 	
-    if(!RAND_egd(RSTRING_PTR(filename))) {
+    if(!RAND_egd(RSTRING(filename)->ptr)) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     egd_bytes(filename, length) -> true
- *
- */
 static VALUE
 ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
 {
-    long n = NUM2INT(len);
-
     SafeStringValue(filename);
 
-    if (!RAND_egd_bytes(RSTRING_PTR(filename), n)) {
+    if (!RAND_egd_bytes(RSTRING(filename)->ptr, FIX2INT(len))) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     status? => true | false
- *
- * Return true if the PRNG has been seeded with enough data, false otherwise.
- */
-static VALUE
-ossl_rand_status(VALUE self)
-{
-    return RAND_status() ? Qtrue : Qfalse;
-}
-
 #define DEFMETH(class, name, func, argc) \
 	rb_define_method(class, name, func, argc); \
 	rb_define_singleton_method(class, name, func, argc);
@@ -181,22 +115,16 @@ ossl_rand_status(VALUE self)
 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, "random_add", ossl_rand_add, 2);
     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);	
-    DEFMETH(mRandom, "status?", ossl_rand_status, 0)
 }
 
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 01b86fec27..d115b3aeb4 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -3,7 +3,6 @@
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2000-2002  GOTOU Yuuzou <gotoyuzo@notwork.org>
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * Copyright (C) 2001-2007  Technorama Ltd. <oss-ruby@technorama.net>
  * All rights reserved.
  */
 /*
@@ -31,6 +30,9 @@ 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))
@@ -43,9 +45,6 @@ VALUE cSSLSocket;
 #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")
@@ -59,40 +58,13 @@ VALUE cSSLSocket;
 #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 const char *ossl_sslctx_attrs[] = {
+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",
-    "session_get_cb", "session_new_cb", "session_remove_cb",
+    "verify_callback", "options", "cert_store", "extra_chain_cert"
 };
 
-#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 const char *ossl_ssl_attr_readers[] = { "io", "context", };
-static const char *ossl_ssl_attrs[] = { "sync_close", };
-
-ID ID_callback_state;
-
-/*
- * SSLContext class
- */
 struct {
     const char *name;
     SSL_METHOD *(*func)(void);
@@ -115,9 +87,6 @@ struct {
 
 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)
@@ -142,13 +111,24 @@ ossl_sslctx_s_alloc(VALUE klass)
 }
 
 static VALUE
-ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
+ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
 {
+    VALUE ssl_method;
     SSL_METHOD *method = NULL;
-    const char *s;
+    SSL_CTX *ctx;
     int i;
+    char *s;
 
-    SSL_CTX *ctx;
+    Data_Get_Struct(self, SSL_CTX, ctx);
+
+    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
@@ -162,126 +142,13 @@ ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
     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 ssl_method;
-}
-
-/*
- * call-seq:
- *    SSLContext.new => ctx
- *    SSLContext.new(:TLSv1) => ctx
- *    SSLContext.new("SSLv23_client") => ctx
- *
- * You can get a list of valid methods with OpenSSL::SSL::SSLContext::METHODS
- */
-static VALUE
-ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE ssl_method;
-    int i;
-
-    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;
-    }
-    ossl_sslctx_set_ssl_version(self, ssl_method);
-
     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)
-{
-    rb_warning("using default DH parameters.");
-
-    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)
 {
@@ -295,143 +162,6 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
 }
 
 static VALUE
-ossl_call_session_get_cb(VALUE ary)
-{
-    VALUE ssl_obj, sslctx_obj, cb, ret;
-    
-    Check_Type(ary, T_ARRAY);
-    ssl_obj = rb_ary_entry(ary, 0);
-
-    sslctx_obj = rb_iv_get(ssl_obj, "@context");
-    if (NIL_P(sslctx_obj)) return Qnil;
-    cb = rb_iv_get(sslctx_obj, "@session_get_cb");
-    if (NIL_P(cb)) return Qnil;
-
-    return rb_funcall(cb, rb_intern("call"), 1, ary);
-}
-
-/* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */
-static SSL_SESSION *
-ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
-{
-    VALUE ary, ssl_obj, ret_obj;
-    SSL_SESSION *sess;
-    void *ptr;
-    int state = 0;
-
-    OSSL_Debug("SSL SESSION get callback entered");
-    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return NULL;
-    ssl_obj = (VALUE)ptr;
-    ary = rb_ary_new2(2);
-    rb_ary_push(ary, ssl_obj);
-    rb_ary_push(ary, rb_str_new(buf, len));
-
-    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state);
-    if (state) {
-        rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
-        return NULL;
-    }
-    if (!rb_obj_is_instance_of(ret_obj, cSSLSession))
-        return NULL;
-
-    SafeGetSSLSession(ret_obj, sess);
-    *copy = 1;
-
-    return sess;
-}
-
-static VALUE
-ossl_call_session_new_cb(VALUE ary)
-{
-    VALUE ssl_obj, sslctx_obj, cb, ret;
-    
-    Check_Type(ary, T_ARRAY);
-    ssl_obj = rb_ary_entry(ary, 0);
-
-    sslctx_obj = rb_iv_get(ssl_obj, "@context");
-    if (NIL_P(sslctx_obj)) return Qnil;
-    cb = rb_iv_get(sslctx_obj, "@session_new_cb");
-    if (NIL_P(cb)) return Qnil;
-
-    return rb_funcall(cb, rb_intern("call"), 1, ary);
-}
-
-/* return 1 normal.  return 0 removes the session */
-static int
-ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
-{
-    VALUE ary, ssl_obj, sess_obj, ret_obj;
-    void *ptr;
-    int state = 0;
-
-    OSSL_Debug("SSL SESSION new callback entered");
-
-    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return 1;
-    ssl_obj = (VALUE)ptr;
-    sess_obj = rb_obj_alloc(cSSLSession);
-    CRYPTO_add(&sess->references, 1, CRYPTO_LOCK_SSL_SESSION);
-    DATA_PTR(sess_obj) = sess;
-
-    ary = rb_ary_new2(2);
-    rb_ary_push(ary, ssl_obj);
-    rb_ary_push(ary, sess_obj);
-
-    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_new_cb, ary, &state);
-    if (state) {
-        rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
-        return 0; /* what should be returned here??? */
-    }
-
-    return RTEST(ret_obj) ? 1 : 0;
-}
-
-static VALUE
-ossl_call_session_remove_cb(VALUE ary)
-{
-    VALUE sslctx_obj, cb, ret;
-    
-    Check_Type(ary, T_ARRAY);
-    sslctx_obj = rb_ary_entry(ary, 0);
-
-    cb = rb_iv_get(sslctx_obj, "@session_remove_cb");
-    if (NIL_P(cb)) return Qnil;
-
-    return rb_funcall(cb, rb_intern("call"), 1, ary);
-}
-
-static void
-ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
-{
-    VALUE ary, sslctx_obj, sess_obj, ret_obj;
-    void *ptr;
-    int state = 0;
-
-    OSSL_Debug("SSL SESSION remove callback entered");
-
-    if ((ptr = SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return;
-    sslctx_obj = (VALUE)ptr;
-    sess_obj = rb_obj_alloc(cSSLSession);
-    CRYPTO_add(&sess->references, 1, CRYPTO_LOCK_SSL_SESSION);
-    DATA_PTR(sess_obj) = sess;
-
-    ary = rb_ary_new2(2);
-    rb_ary_push(ary, sslctx_obj);
-    rb_ary_push(ary, sess_obj);
-
-    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_new_cb, ary, &state);
-    if (state) {
-/*
-  the SSL_CTX is frozen, nowhere to save state.
-  there is no common accessor method to check it either.
-        rb_ivar_set(sslctx_obj, ID_callback_state, INT2NUM(state));
-*/
-    }
-}
-
-static VALUE
 ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
 {
     X509 *x509;
@@ -446,14 +176,6 @@ ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
     return i;
 }
 
-/*
- * call-seq:
- *    ctx.setup => Qtrue # first time
- *    ctx.setup => nil # thereafter
- *
- * This method is called automatically when a new SSLSocket is created.
- * Normally you do not need to call this method (unless you are writing an extension in C).
- */
 static VALUE
 ossl_sslctx_setup(VALUE self)
 {
@@ -468,16 +190,6 @@ ossl_sslctx_setup(VALUE self)
     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{
-	SSL_CTX_set_tmp_dh_callback(ctx, ossl_default_tmp_dh_callback);
-    }
-#endif
-    SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_ptr_idx, (void*)self);
-
     val = ossl_sslctx_get_cert_store(self);
     if(!NIL_P(val)){
 	/*
@@ -493,7 +205,7 @@ ossl_sslctx_setup(VALUE self)
 
     val = ossl_sslctx_get_extra_cert(self);
     if(!NIL_P(val)){
-	rb_block_call(val, rb_intern("each"), 0, 0, ossl_sslctx_add_extra_chain_cert_i, self);
+	rb_iterate(rb_each, val, ossl_sslctx_add_extra_chain_cert_i, self);
     }
 
     /* private key may be bundled in certificate file. */
@@ -518,8 +230,8 @@ ossl_sslctx_setup(VALUE self)
     val = ossl_sslctx_get_client_ca(self);
     if(!NIL_P(val)){
 	if(TYPE(val) == T_ARRAY){
-	    for(i = 0; i < RARRAY_LEN(val); i++){
-		client_ca = GetX509CertPtr(RARRAY_PTR(val)[i]);
+	    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");
@@ -547,8 +259,6 @@ ossl_sslctx_setup(VALUE self)
     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));
@@ -560,27 +270,6 @@ ossl_sslctx_setup(VALUE 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_PTR(val),
-					    RSTRING_LEN(val))){
-	    ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
-	}
-    }
-
-    if (RTEST(rb_iv_get(self, "@session_get_cb"))) {
-	SSL_CTX_sess_set_get_cb(ctx, ossl_sslctx_session_get_cb);
-	OSSL_Debug("SSL SESSION get callback added");
-    }
-    if (RTEST(rb_iv_get(self, "@session_new_cb"))) {
-	SSL_CTX_sess_set_new_cb(ctx, ossl_sslctx_session_new_cb);
-	OSSL_Debug("SSL SESSION new callback added");
-    }
-    if (RTEST(rb_iv_get(self, "@session_remove_cb"))) {
-	SSL_CTX_sess_set_remove_cb(ctx, ossl_sslctx_session_remove_cb);
-	OSSL_Debug("SSL SESSION remove callback added");
-    }
     return Qtrue;
 }
 
@@ -600,10 +289,6 @@ ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
     return ary;
 }
 
-/*
- * call-seq:
- *    ctx.ciphers => [[name, version, bits, alg_bits], ...]
- */
 static VALUE
 ossl_sslctx_get_ciphers(VALUE self)
 {
@@ -632,12 +317,6 @@ ossl_sslctx_get_ciphers(VALUE self)
     return ary;
 }
 
-/*
- * call-seq:
- *    ctx.ciphers = "cipher1:cipher2:..."
- *    ctx.ciphers = [name, ...]
- *    ctx.ciphers = [[name, version, bits, alg_bits], ...]
- */
 static VALUE
 ossl_sslctx_set_ciphers(VALUE self, VALUE v)
 {
@@ -646,197 +325,46 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
     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_LEN(v); i++) {
+    Data_Get_Struct(self, SSL_CTX, ctx);
+    if(!ctx){
+        ossl_raise(eSSLError, "SSL_CTX is not initialized.");
+        return Qnil;
+    }
+
+    if (TYPE(v) == T_ARRAY) {
+        str = rb_str_new2(NULL);
+        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_LEN(v)-1) rb_str_cat2(str, ":");
+            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_PTR(str))) {
-        ossl_raise(eSSLError, "SSL_CTX_set_cipher_list:");
+    if (!SSL_CTX_set_cipher_list(ctx, RSTRING(str)->ptr)) {
+        ossl_raise(eSSLError, "SSL_CTX_set_ciphers:");
     }
-
-    return v;
-}
-
-
-/*
- *  call-seq:
- *     ctx.session_add(session) -> true | false
- *
- */
-static VALUE
-ossl_sslctx_session_add(VALUE self, VALUE arg)
-{
-    SSL_CTX *ctx;
-    SSL_SESSION *sess;
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-    SafeGetSSLSession(arg, sess);
-
-    return SSL_CTX_add_session(ctx, sess) == 1 ? Qtrue : Qfalse;
-}
-
-/*
- *  call-seq:
- *     ctx.session_remove(session) -> true | false
- *
- */
-static VALUE
-ossl_sslctx_session_remove(VALUE self, VALUE arg)
-{
-    SSL_CTX *ctx;
-    SSL_SESSION *sess;
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-    SafeGetSSLSession(arg, sess);
-
-    return SSL_CTX_remove_session(ctx, sess) == 1 ? Qtrue : Qfalse;
-}
-
-/*
- *  call-seq:
- *     ctx.session_cache_mode -> integer
- *
- */
-static VALUE
-ossl_sslctx_get_session_cache_mode(VALUE self)
-{
-    SSL_CTX *ctx;
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-
-    return LONG2NUM(SSL_CTX_get_session_cache_mode(ctx));
-}
-
-/*
- *  call-seq:
- *     ctx.session_cache_mode=(integer) -> integer
- *
- */
-static VALUE
-ossl_sslctx_set_session_cache_mode(VALUE self, VALUE arg)
-{
-    SSL_CTX *ctx;
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-
-    SSL_CTX_set_session_cache_mode(ctx, NUM2LONG(arg));
-
-    return arg;
-}
-
-/*
- *  call-seq:
- *     ctx.session_cache_size -> integer
- *
- */
-static VALUE
-ossl_sslctx_get_session_cache_size(VALUE self)
-{
-    SSL_CTX *ctx;
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-
-    return LONG2NUM(SSL_CTX_sess_get_cache_size(ctx));
-}
-
-/*
- *  call-seq:
- *     ctx.session_cache_size=(integer) -> integer
- *
- */
-static VALUE
-ossl_sslctx_set_session_cache_size(VALUE self, VALUE arg)
-{
-    SSL_CTX *ctx;
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-
-    SSL_CTX_sess_set_cache_size(ctx, NUM2LONG(arg));
-
-    return arg;
-}
-
-/*
- *  call-seq:
- *     ctx.session_cache_stats -> Hash
- *
- */
-static VALUE
-ossl_sslctx_get_session_cache_stats(VALUE self)
-{
-    SSL_CTX *ctx;
-    VALUE hash;
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-
-    hash = rb_hash_new();
-    rb_hash_aset(hash, ID2SYM(rb_intern("cache_num")), LONG2NUM(SSL_CTX_sess_number(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("connect")), LONG2NUM(SSL_CTX_sess_connect(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("connect_good")), LONG2NUM(SSL_CTX_sess_connect_good(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("connect_renegotiate")), LONG2NUM(SSL_CTX_sess_connect_renegotiate(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("accept")), LONG2NUM(SSL_CTX_sess_accept(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("accept_good")), LONG2NUM(SSL_CTX_sess_accept_good(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("accept_renegotiate")), LONG2NUM(SSL_CTX_sess_accept_renegotiate(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("cache_hits")), LONG2NUM(SSL_CTX_sess_hits(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("cb_hits")), LONG2NUM(SSL_CTX_sess_cb_hits(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("cache_misses")), LONG2NUM(SSL_CTX_sess_misses(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("cache_full")), LONG2NUM(SSL_CTX_sess_cache_full(ctx)));
-    rb_hash_aset(hash, ID2SYM(rb_intern("timeouts")), LONG2NUM(SSL_CTX_sess_timeouts(ctx)));
-
-    return hash;
+    return Qnil;
 }
 
-
 /*
- *  call-seq:
- *     ctx.flush_sessions(time | nil) -> self
- *
+ * SSLSocket class
  */
-static VALUE
-ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
-{
-    VALUE arg1;
-    SSL_CTX *ctx;
-    time_t tm = 0;
-    int cb_state;
-
-    rb_scan_args(argc, argv, "01", &arg1);
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-
-    if (NIL_P(arg1)) {
-        tm = time(0);
-    } else if (rb_obj_is_instance_of(arg1, rb_cTime)) {
-        tm = NUM2LONG(rb_funcall(arg1, rb_intern("to_i"), 0));
-    } else {
-        rb_raise(rb_eArgError, "arg must be Time or nil");
-    }
+#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")
 
-    SSL_CTX_flush_sessions(ctx, tm);
+#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))
 
-    return self;
-}
+static char *ossl_ssl_attr_readers[] = { "io", "context", };
+static char *ossl_ssl_attrs[] = { "sync_close", };
 
-/*
- * SSLSocket class
- */
 static void
 ossl_ssl_shutdown(SSL *ssl)
 {
@@ -859,20 +387,6 @@ ossl_ssl_s_alloc(VALUE klass)
     return Data_Wrap_Struct(klass, 0, ossl_ssl_free, NULL);
 }
 
-/*
- * call-seq:
- *    SSLSocket.new(io) => aSSLSocket
- *    SSLSocket.new(io, ctx) => aSSLSocket
- *
- * === Parameters
- * * +io+ is a real ruby IO object.  Not an IO like object that responds to read/write.
- * * +ctx+ is an OpenSSLSSL::SSLContext.
- *
- * The OpenSSL::Buffering module provides additional IO methods.
- *
- * This method will freeze the SSLContext if one is provided;
- * however, session management is still allowed in the frozen SSLContext.
- */
 static VALUE
 ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -895,10 +409,10 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_ssl_setup(VALUE self)
 {
-    VALUE io, v_ctx, cb;
+    VALUE io, v_ctx;
     SSL_CTX *ctx;
     SSL *ssl;
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     Data_Get_Struct(self, SSL, ssl);
     if(!ssl){
@@ -915,197 +429,153 @@ ossl_ssl_setup(VALUE self)
         GetOpenFile(io, fptr);
         rb_io_check_readable(fptr);
         rb_io_check_writable(fptr);
-        SSL_set_fd(ssl, TO_SOCKET(FPTR_TO_FD(fptr)));
-	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);
+        SSL_set_fd(ssl, TO_SOCKET(fileno(fptr->f)));
     }
 
     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)(), const char *funcname)
+static void
+ossl_start_ssl(SSL *ssl, int (*func)())
 {
-    SSL *ssl;
-    rb_io_t *fptr;
-    int ret, ret2;
-    VALUE cb_state;
-
-    rb_ivar_set(self, ID_callback_state, Qnil);
+    int ret;
 
-    Data_Get_Struct(self, SSL, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
     for(;;){
 	if((ret = func(ssl)) > 0) break;
-	switch((ret2 = ssl_get_error(ssl, ret))){
+	switch(SSL_get_error(ssl, ret)){
 	case SSL_ERROR_WANT_WRITE:
-            rb_io_wait_writable(FPTR_TO_FD(fptr));
-            continue;
 	case SSL_ERROR_WANT_READ:
-            rb_io_wait_readable(FPTR_TO_FD(fptr));
-            continue;
-	case SSL_ERROR_SYSCALL:
-	    if (errno) rb_sys_fail(funcname);
-	    ossl_raise(eSSLError, "%s SYSCALL returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
+	    rb_thread_schedule();
+	    continue;
 	default:
-	    ossl_raise(eSSLError, "%s returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
+	    ossl_raise(eSSLError, NULL);
 	}
     }
-
-    cb_state = rb_ivar_get(self, ID_callback_state);
-    if (!NIL_P(cb_state))
-        rb_jump_tag(NUM2INT(cb_state));
-
-    return self;
 }
 
-/*
- * call-seq:
- *    ssl.connect => self
- */
 static VALUE
 ossl_ssl_connect(VALUE self)
 {
+    SSL *ssl;
+    VALUE cb;
+
     ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_connect, "SSL_connect");
+    Data_Get_Struct(self, SSL, ssl);
+    cb = ossl_sslctx_get_verify_cb(ossl_ssl_get_ctx(self));
+    SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void *)cb);
+    ossl_start_ssl(ssl, SSL_connect);
+
+    return self;
 }
 
-/*
- * call-seq:
- *    ssl.accept => self
- */
 static VALUE
 ossl_ssl_accept(VALUE self)
 {
+    SSL *ssl;
+    VALUE cb;
+
     ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_accept, "SSL_accept");
+    Data_Get_Struct(self, SSL, ssl);
+    cb = ossl_sslctx_get_verify_cb(ossl_ssl_get_ctx(self));
+    SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void *)cb);
+    ossl_start_ssl(ssl, SSL_accept);
+
+    return self;
 }
 
-/*
- * call-seq:
- *    ssl.sysread(length) => string
- *    ssl.sysread(length, buffer) => buffer
- *
- * === Parameters
- * * +length+ is a positive integer.
- * * +buffer+ is a string used to store the result.
- */
 static VALUE
-ossl_ssl_read(int argc, VALUE *argv, VALUE self)
+ossl_ssl_read(VALUE self, VALUE len)
 {
     SSL *ssl;
     int ilen, nread = 0;
-    VALUE len, str;
-    rb_io_t *fptr;
+    VALUE str;
+    OpenFile *fptr;
 
-    rb_scan_args(argc, argv, "11", &len, &str);
+    Data_Get_Struct(self, SSL, ssl);
     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;
+    str = rb_str_new(0, ilen);
 
-    Data_Get_Struct(self, SSL, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
     if (ssl) {
-	if(SSL_pending(ssl) <= 0)
-	    rb_thread_wait_fd(FPTR_TO_FD(fptr));
 	for (;;){
-	    nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
-	    switch(ssl_get_error(ssl, nread)){
+	    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();
+		ossl_raise(rb_eEOFError, "End of file reached");
 	    case SSL_ERROR_WANT_WRITE:
-                rb_io_wait_writable(FPTR_TO_FD(fptr));
-                continue;
 	    case SSL_ERROR_WANT_READ:
-                rb_io_wait_readable(FPTR_TO_FD(fptr));
+		rb_thread_schedule();
 		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);
+        GetOpenFile(ossl_ssl_get_io(self), fptr);
+        rb_io_check_readable(fptr);
+        TRAP_BEG;
+        nread = read(fileno(fptr->f), RSTRING(str)->ptr, RSTRING(str)->len);
+        TRAP_END;
+	if (nread == 0) {
+	    ossl_raise(rb_eEOFError, "End of file reached");
+	}
+        if(nread < 0) {
+            ossl_raise(eSSLError, "read:%s", strerror(errno));
+        }
     }
 
   end:
-    rb_str_set_len(str, nread);
+    RSTRING(str)->len = nread;
+    RSTRING(str)->ptr[nread] = 0;
     OBJ_TAINT(str);
 
     return str;
 }
 
-/*
- * call-seq:
- *    ssl.syswrite(string) => integer
- */
 static VALUE
 ossl_ssl_write(VALUE self, VALUE str)
 {
     SSL *ssl;
     int nwrite = 0;
-    rb_io_t *fptr;
+    OpenFile *fptr;
+    FILE *fp;
 
-    StringValue(str);
     Data_Get_Struct(self, SSL, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
+    StringValue(str);
 
     if (ssl) {
 	for (;;){
-	    nwrite = SSL_write(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
-	    switch(ssl_get_error(ssl, nwrite)){
+	    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(FPTR_TO_FD(fptr));
-                continue;
 	    case SSL_ERROR_WANT_READ:
-                rb_io_wait_readable(FPTR_TO_FD(fptr));
-                continue;
-	    case SSL_ERROR_SYSCALL:
-		if (errno) rb_sys_fail(0);
+		rb_thread_schedule();
+		continue;
 	    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);
+        GetOpenFile(ossl_ssl_get_io(self), fptr);
+        rb_io_check_writable(fptr);
+        fp = GetWriteFile(fptr);
+        nwrite = write(fileno(fp), RSTRING(str)->ptr, RSTRING(str)->len);
+        if (nwrite < 0) {
+            ossl_raise(eSSLError, "write:%s", strerror(errno));
+        }
     }
 
   end:
     return INT2NUM(nwrite);
 }
 
-/*
- * call-seq:
- *    ssl.sysclose => nil
- */
 static VALUE
 ossl_ssl_close(VALUE self)
 {
@@ -1119,10 +589,6 @@ ossl_ssl_close(VALUE self)
     return Qnil;
 }
 
-/*
- * call-seq:
- *    ssl.cert => cert or nil
- */
 static VALUE
 ossl_ssl_get_cert(VALUE self)
 {
@@ -1147,10 +613,6 @@ ossl_ssl_get_cert(VALUE self)
     return ossl_x509_new(cert);
 }
 
-/*
- * call-seq:
- *    ssl.peer_cert => cert or nil
- */
 static VALUE
 ossl_ssl_get_peer_cert(VALUE self)
 {
@@ -1176,10 +638,6 @@ ossl_ssl_get_peer_cert(VALUE self)
     return obj;
 }
 
-/*
- * call-seq:
- *    ssl.peer_cert_chain => [cert, ...] or nil
- */
 static VALUE
 ossl_ssl_get_peer_cert_chain(VALUE self)
 {
@@ -1206,10 +664,6 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
     return ary;
 }
 
-/*
- * call-seq:
- *    ssl.cipher => [name, version, bits, alg_bits]
- */
 static VALUE
 ossl_ssl_get_cipher(VALUE self)
 {
@@ -1226,10 +680,6 @@ ossl_ssl_get_cipher(VALUE self)
     return ossl_ssl_cipher_to_ary(cipher);
 }
 
-/*
- * call-seq:
- *    ssl.state => string
- */
 static VALUE
 ossl_ssl_get_state(VALUE self)
 {
@@ -1249,166 +699,27 @@ ossl_ssl_get_state(VALUE self)
     return ret;
 }
 
-/*
- * call-seq:
- *    ssl.pending => integer
- */
-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));
-}
-
-/*
- *  call-seq:
- *     ssl.session_reused? -> true | false
- *
- */
-static VALUE
-ossl_ssl_session_reused(VALUE self)
-{
-    SSL *ssl;
-
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-
-    switch(SSL_session_reused(ssl)) {
-    case 1:	return Qtrue;
-    case 0:	return Qfalse;
-    default:	ossl_raise(eSSLError, "SSL_session_reused");
-    }
-}
-
-/*
- *  call-seq:
- *     ssl.session = session -> session
- *
- */
-static VALUE
-ossl_ssl_set_session(VALUE self, VALUE arg1)
-{
-    SSL *ssl;
-    SSL_SESSION *sess;
-
-/* why is ossl_ssl_setup delayed? */
-    ossl_ssl_setup(self);
-
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-
-    SafeGetSSLSession(arg1, sess);
-
-    if (SSL_set_session(ssl, sess) != 1)
-        ossl_raise(eSSLError, "SSL_set_session");
-
-    return arg1;
-}
-
-static VALUE
-ossl_ssl_get_verify_result(VALUE self)
-{
-    SSL *ssl;
-
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-
-    return INT2FIX(SSL_get_verify_result(ssl));
-}
-
 void
 Init_ossl_ssl()
 {
     int i;
-    VALUE ary;
-
-#if 0 /* let rdoc know about mOSSL */
-    mOSSL = rb_define_module("OpenSSL");
-#endif
-
-    ID_callback_state = rb_intern("@callback_state");
 
     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);
 
-    Init_ossl_ssl_session();
-
-    /* class SSLContext
-     *
-     * The following attributes are available but don't show up in rdoc.
-     * All attributes must be set before calling SSLSocket.new(io, ctx).
-     * * ssl_version, cert, key, client_ca, ca_file, ca_path, timeout,
-     * * verify_mode, verify_depth client_cert_cb, tmp_dh_callback,
-     * * session_id_context, session_add_cb, session_new_cb, session_remove_cb
-     */
+    /* 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_alias(cSSLContext, "ssl_timeout", "timeout");
     rb_define_method(cSSLContext, "initialize",  ossl_sslctx_initialize, -1);
-    rb_define_method(cSSLContext, "ssl_version=", ossl_sslctx_set_ssl_version, 1);
     rb_define_method(cSSLContext, "ciphers",     ossl_sslctx_get_ciphers, 0);
     rb_define_method(cSSLContext, "ciphers=",    ossl_sslctx_set_ciphers, 1);
 
-    rb_define_method(cSSLContext, "setup", ossl_sslctx_setup, 0);
-
-    
-    rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2FIX(SSL_SESS_CACHE_OFF));
-    rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2FIX(SSL_SESS_CACHE_CLIENT)); /* doesn't actually do anything in 0.9.8e */
-    rb_define_const(cSSLContext, "SESSION_CACHE_SERVER", LONG2FIX(SSL_SESS_CACHE_SERVER));
-    rb_define_const(cSSLContext, "SESSION_CACHE_BOTH", LONG2FIX(SSL_SESS_CACHE_BOTH)); /* no different than CACHE_SERVER in 0.9.8e */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_AUTO_CLEAR", LONG2FIX(SSL_SESS_CACHE_NO_AUTO_CLEAR));
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_LOOKUP", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP));
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_STORE", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_STORE));
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL));
-    rb_define_method(cSSLContext, "session_add",     ossl_sslctx_session_add, 1);
-    rb_define_method(cSSLContext, "session_remove",     ossl_sslctx_session_remove, 1);
-    rb_define_method(cSSLContext, "session_cache_mode",     ossl_sslctx_get_session_cache_mode, 0);
-    rb_define_method(cSSLContext, "session_cache_mode=",     ossl_sslctx_set_session_cache_mode, 1);
-    rb_define_method(cSSLContext, "session_cache_size",     ossl_sslctx_get_session_cache_size, 0);
-    rb_define_method(cSSLContext, "session_cache_size=",     ossl_sslctx_set_session_cache_size, 1);
-    rb_define_method(cSSLContext, "session_cache_stats",     ossl_sslctx_get_session_cache_stats, 0);
-    rb_define_method(cSSLContext, "flush_sessions",     ossl_sslctx_flush_sessions, -1);
-
-    ary = rb_ary_new2(numberof(ossl_ssl_method_tab));
-    for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
-        rb_ary_push(ary, ID2SYM(rb_intern(ossl_ssl_method_tab[i].name)));
-    }
-    rb_obj_freeze(ary);
-    /* holds a list of available SSL/TLS methods */
-    rb_define_const(cSSLContext, "METHODS", ary);
-
-    /* class SSLSocket
-     *
-     * The following attributes are available but don't show up in rdoc.
-     * * io, context, sync_close
-     *
-     */
+    /* 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++)
@@ -1419,7 +730,7 @@ Init_ossl_ssl()
     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, "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);
@@ -1427,10 +738,6 @@ Init_ossl_ssl()
     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);
-    rb_define_method(cSSLSocket, "session_reused?",    ossl_ssl_session_reused, 0);
-    rb_define_method(cSSLSocket, "session=",    ossl_ssl_set_session, 1);
-    rb_define_method(cSSLSocket, "verify_result", ossl_ssl_get_verify_result, 0);
 
 #define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2FIX(SSL_##x))
 
@@ -1466,9 +773,6 @@ Init_ossl_ssl()
     ossl_ssl_def_const(OP_NO_SSLv2);
     ossl_ssl_def_const(OP_NO_SSLv3);
     ossl_ssl_def_const(OP_NO_TLSv1);
-#if defined(SSL_OP_NO_TICKET)
-    ossl_ssl_def_const(OP_NO_TICKET);
-#endif
     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);
diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h
index 487f41216c..5929eef856 100644
--- a/ext/openssl/ossl_ssl.h
+++ b/ext/openssl/ossl_ssl.h
@@ -11,26 +11,11 @@
 #if !defined(_OSSL_SSL_H_)
 #define _OSSL_SSL_H_
 
-#define GetSSLSession(obj, sess) do { \
-	Data_Get_Struct(obj, SSL_SESSION, sess); \
-	if (!sess) { \
-		ossl_raise(rb_eRuntimeError, "SSL Session wasn't initialized."); \
-	} \
-} while (0)
-
-#define SafeGetSSLSession(obj, sess) do { \
-	OSSL_Check_Kind(obj, cSSLSession); \
-	GetSSLSession(obj, sess); \
-} while (0)
-        
 extern VALUE mSSL;
 extern VALUE eSSLError;
 extern VALUE cSSLSocket;
 extern VALUE cSSLContext;
-extern VALUE cSSLSession;
 
 void Init_ossl_ssl(void);
-void Init_ossl_ssl_session(void);
 
 #endif /* _OSSL_SSL_H_ */
-
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c
deleted file mode 100644
index 63c2bbb87a..0000000000
--- a/ext/openssl/ossl_ssl_session.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- *  Copyright (C) 2004-2007 Technorama Ltd. <oss-ruby@technorama.net>
- */
-
-#include "ossl.h"
-
-#define GetSSLSession(obj, sess) do { \
-	Data_Get_Struct(obj, SSL_SESSION, sess); \
-	if (!sess) { \
-		ossl_raise(rb_eRuntimeError, "SSL Session wasn't initialized."); \
-	} \
-} while (0)
-
-#define SafeGetSSLSession(obj, sess) do { \
-	OSSL_Check_Kind(obj, cSSLSession); \
-	GetSSLSession(obj, sess); \
-} while (0)
-        
-
-VALUE cSSLSession;
-static VALUE eSSLSession;
-
-static VALUE ossl_ssl_session_alloc(VALUE klass)
-{
-	return Data_Wrap_Struct(klass, 0, SSL_SESSION_free, NULL);
-}
-
-/*
- * call-seq:
- *    Session.new(SSLSocket | string) => session
- *
- * === Parameters
- * +SSLSocket+ is an OpenSSL::SSL::SSLSocket
- * +string+ must be a DER or PEM encoded Session.
-*/
-static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
-{
-	SSL_SESSION *ctx = NULL;
-	VALUE obj;
-	unsigned char *p;
-
-	if (RDATA(self)->data)
-		ossl_raise(eSSLSession, "SSL Session already initialized");
-
-	if (rb_obj_is_instance_of(arg1, cSSLSocket)) {
-		SSL *ssl;
-
-		Data_Get_Struct(arg1, SSL, ssl);
-
-		if (!ssl || (ctx = SSL_get1_session(ssl)) == NULL)
-			ossl_raise(eSSLSession, "no session available");
-	} else {
-		BIO *in = ossl_obj2bio(arg1);
-
-		ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
-
-		if (!ctx) {
-			BIO_reset(in);
-			ctx = d2i_SSL_SESSION_bio(in, NULL);
-		}
-
-		BIO_free(in);
-
-		if (!ctx)
-			ossl_raise(rb_eArgError, "unknown type");
-	}
-
-	/* should not happen */
-	if (ctx == NULL)
-		ossl_raise(eSSLSession, "ctx not set - internal error");
-
-	RDATA(self)->data = ctx;
-
-	return self;
-}
-
-/*
- * call-seq:
- *    session1 == session2 -> boolean
- *
-*/
-static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
-{
-	SSL_SESSION *ctx1, *ctx2;
-
-	GetSSLSession(val1, ctx1);
-	SafeGetSSLSession(val2, ctx2);
-
-	switch (SSL_SESSION_cmp(ctx1, ctx2)) {
-	case 0:		return Qtrue;
-	default:	return Qfalse;
-	}
-}
-
-/*
- * call-seq:
- *    session.time -> Time
- *
-*/
-static VALUE ossl_ssl_session_get_time(VALUE self)
-{
-	SSL_SESSION *ctx;
-	time_t t;
-
-	GetSSLSession(self, ctx);
-
-	t = SSL_SESSION_get_time(ctx);
-
-	if (t == 0)
-		return Qnil;
-
-	return rb_funcall(rb_cTime, rb_intern("at"), 1, LONG2NUM(t));
-}
-
-/*
- * call-seq:
- *    session.timeout -> integer
- *
- * How long until the session expires in seconds.
- *
-*/
-static VALUE ossl_ssl_session_get_timeout(VALUE self)
-{
-	SSL_SESSION *ctx;
-	time_t t;
-
-	GetSSLSession(self, ctx);
-
-	t = SSL_SESSION_get_timeout(ctx);
-
-	return ULONG2NUM(t);
-}
-
-#define SSLSESSION_SET_TIME(func)						\
-	static VALUE ossl_ssl_session_set_##func(VALUE self, VALUE time_v)	\
-	{									\
-		SSL_SESSION *ctx;						\
-		time_t t;							\
-										\
-		GetSSLSession(self, ctx);					\
-										\
-		if (rb_obj_is_instance_of(time_v, rb_cTime)) {			\
-			time_v = rb_funcall(time_v, rb_intern("to_i"), 0);	\
-		} else if (FIXNUM_P(time_v)) {					\
-			;							\
-		} else {							\
-			rb_raise(rb_eArgError, "unknown type");			\
-		}								\
-										\
-		t = NUM2ULONG(time_v);						\
-										\
-		SSL_SESSION_set_##func(ctx, t);					\
-										\
-		return ossl_ssl_session_get_##func(self);			\
-	}
-
-SSLSESSION_SET_TIME(time)
-SSLSESSION_SET_TIME(timeout)
-
-#ifdef HAVE_SSL_SESSION_GET_ID
-/*
- * call-seq:
- *    session.id -> aString
- *
- * Returns the Session ID.
-*/
-static VALUE ossl_ssl_session_get_id(VALUE self)
-{
-	SSL_SESSION *ctx;
-	const unsigned char *p = NULL;
-	unsigned int i = 0;
-
-	GetSSLSession(self, ctx);
-
-	p = SSL_SESSION_get_id(ctx, &i);
-
-	return rb_str_new((const char *) p, i);
-}
-#endif
-
-/*
- * call-seq:
- *    session.to_der -> aString
- *
- * Returns an ASN1 encoded String that contains the Session object.
-*/
-static VALUE ossl_ssl_session_to_der(VALUE self)
-{
-	SSL_SESSION *ctx;
-	unsigned char buf[1024*10], *p;
-	int len;
-
-	GetSSLSession(self, ctx);
-
-	p = buf;
-	len = i2d_SSL_SESSION(ctx, &p);
-
-	if (len <= 0)
-		ossl_raise(eSSLSession, "i2d_SSL_SESSION");
-	else if (len >= sizeof(buf))
-		ossl_raise(eSSLSession, "i2d_SSL_SESSION too large");
-
-	return rb_str_new((const char *) p, len);
-}
-
-/*
- * call-seq:
- *    session.to_pem -> String
- *
- * Returns a PEM encoded String that contains the Session object.
-*/
-static VALUE ossl_ssl_session_to_pem(VALUE self)
-{
-	SSL_SESSION *ctx;
-	BIO *out;
-	BUF_MEM *buf;
-	VALUE str;
-	int i;
-         
-	GetSSLSession(self, ctx);
-
-	if (!(out = BIO_new(BIO_s_mem()))) {
-		ossl_raise(eSSLSession, "BIO_s_mem()");
-	}
-
-	if (!(i=PEM_write_bio_SSL_SESSION(out, ctx))) {
-		BIO_free(out);
-		ossl_raise(eSSLSession, "SSL_SESSION_print()");
-	}
-
-	BIO_get_mem_ptr(out, &buf);
-	str = rb_str_new(buf->data, buf->length);
-	BIO_free(out);
-
-	return str;
-}
-
-
-/*
- * call-seq:
- *    session.to_text -> String
- *
- * Shows everything in the Session object.
-*/
-static VALUE ossl_ssl_session_to_text(VALUE self)
-{
-	SSL_SESSION *ctx;
-	BIO *out;
-	BUF_MEM *buf;
-	VALUE str;
-         
-	GetSSLSession(self, ctx);
-
-	if (!(out = BIO_new(BIO_s_mem()))) {
-		ossl_raise(eSSLSession, "BIO_s_mem()");
-	}
-
-	if (!SSL_SESSION_print(out, ctx)) {
-		BIO_free(out);
-		ossl_raise(eSSLSession, "SSL_SESSION_print()");
-	}
-
-	BIO_get_mem_ptr(out, &buf);
-	str = rb_str_new(buf->data, buf->length);
-	BIO_free(out);
-
-	return str;
-}
-                                                     
-
-void Init_ossl_ssl_session(void)
-{
-#if 0 /* let rdoc know about mOSSL */
-	mOSSL = rb_define_module("OpenSSL");
-	mSSL = rb_define_module_under(mOSSL, "SSL");
-#endif
-	cSSLSession = rb_define_class_under(mSSL, "Session", rb_cObject);
-	eSSLSession = rb_define_class_under(cSSLSession, "SessionError", eOSSLError);
-
-	rb_define_alloc_func(cSSLSession, ossl_ssl_session_alloc);
-	rb_define_method(cSSLSession, "initialize", ossl_ssl_session_initialize, 1);
-
-	rb_define_method(cSSLSession, "==", ossl_ssl_session_eq, 1);
-
-	rb_define_method(cSSLSession, "time", ossl_ssl_session_get_time, 0);
-	rb_define_method(cSSLSession, "time=", ossl_ssl_session_set_time, 1);
-	rb_define_method(cSSLSession, "timeout", ossl_ssl_session_get_timeout, 0);
-	rb_define_method(cSSLSession, "timeout=", ossl_ssl_session_set_timeout, 1);
-
-#ifdef HAVE_SSL_SESSION_GET_ID
-	rb_define_method(cSSLSession, "id", ossl_ssl_session_get_id, 0);
-#else
-	rb_undef_method(cSSLSession, "id");
-#endif
-	rb_define_method(cSSLSession, "to_der", ossl_ssl_session_to_der, 0);
-	rb_define_method(cSSLSession, "to_pem", ossl_ssl_session_to_pem, 0);
-	rb_define_method(cSSLSession, "to_text", ossl_ssl_session_to_text, 0);
-}
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index ca1c59aba9..576ad4c40a 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -84,10 +84,6 @@ ossl_x509attr_alloc(VALUE klass)
     return obj;
 }
 
-/*
- * call-seq:
- *    Attribute.new(oid [, value]) => attr
- */
 static VALUE
 ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -95,13 +91,12 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
     X509_ATTRIBUTE *attr;
     unsigned char *p;
 
-    GetX509Attr(self, attr);
     if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
+	GetX509Attr(self, attr);
 	oid = ossl_to_der_if_possible(oid);
 	StringValue(oid);
-	p = RSTRING_PTR(oid);
-	if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self),
-			       &p, RSTRING_LEN(oid))){
+	p = RSTRING(oid)->ptr;
+	if(!d2i_X509_ATTRIBUTE(&attr, &p, RSTRING(oid)->len)){
 	    ossl_raise(eX509AttrError, NULL);
 	}
 	return self;
@@ -112,10 +107,6 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-/*
- * call-seq:
- *    attr.oid = string => string
- */
 static VALUE
 ossl_x509attr_set_oid(VALUE self, VALUE oid)
 {
@@ -123,20 +114,16 @@ ossl_x509attr_set_oid(VALUE self, VALUE oid)
     ASN1_OBJECT *obj;
     char *s;
  
+    GetX509Attr(self, attr);
     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;
 }
 
-/*
- * call-seq:
- *    attr.oid => string
- */
 static VALUE
 ossl_x509attr_get_oid(VALUE self)
 {
@@ -168,23 +155,19 @@ ossl_x509attr_get_oid(VALUE self)
 #  define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->set = 0)
 #endif
 
-/*
- * call-seq:
- *    attr.value = asn1 => asn1
- */
 static VALUE
 ossl_x509attr_set_value(VALUE self, VALUE value)
 {
     X509_ATTRIBUTE *attr;
     ASN1_TYPE *a1type;
 
+    GetX509Attr(self, attr);
     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);
@@ -195,10 +178,6 @@ ossl_x509attr_set_value(VALUE self, VALUE value)
     return value;
 }
 
-/*
- * call-seq:
- *    attr.value => asn1
- */
 static VALUE
 ossl_x509attr_get_value(VALUE self)
 {
@@ -212,7 +191,7 @@ ossl_x509attr_get_value(VALUE self)
     if(OSSL_X509ATTR_IS_SINGLE(attr)){
 	length = i2d_ASN1_TYPE(attr->value.single, NULL);
 	str = rb_str_new(0, length);
-	p = RSTRING_PTR(str);
+	p = RSTRING(str)->ptr;
 	i2d_ASN1_TYPE(attr->value.single, &p);
 	ossl_str_adjust(str, p);
     }
@@ -220,7 +199,7 @@ ossl_x509attr_get_value(VALUE self)
 	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_PTR(str);
+	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);
@@ -230,10 +209,6 @@ ossl_x509attr_get_value(VALUE self)
     return asn1;
 }
 
-/*
- * call-seq:
- *    attr.to_der => string
- */
 static VALUE
 ossl_x509attr_to_der(VALUE self)
 {
@@ -246,10 +221,10 @@ ossl_x509attr_to_der(VALUE self)
     if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
 	ossl_raise(eX509AttrError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = RSTRING(str)->ptr;
     if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
 	ossl_raise(eX509AttrError, NULL);
-    rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str)); 
+    RSTRING(str)->len = p - (unsigned char*)RSTRING(str)->ptr; 
 
     return str;
 }
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
index b97f27ffa9..443a2ba4c3 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -63,7 +63,7 @@ ossl_x509_new_from_file(VALUE filename)
     VALUE obj;
 
     SafeStringValue(filename);
-    if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
+    if (!(fp = fopen(RSTRING(filename)->ptr, "r"))) {
 	ossl_raise(eX509CertError, "%s", strerror(errno));
     }
     x509 = PEM_read_X509(fp, NULL, NULL, NULL);
@@ -125,11 +125,6 @@ ossl_x509_alloc(VALUE klass)
     return obj;
 }
 
-/*
- * call-seq:
- *    Certificate.new => cert
- *    Certificate.new(string) => cert
- */
 static VALUE 
 ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -174,10 +169,6 @@ ossl_x509_copy(VALUE self, VALUE other)
     return self;
 }
 
-/*
- * call-seq:
- *    cert.to_der => string
- */
 static VALUE 
 ossl_x509_to_der(VALUE self)
 {
@@ -190,7 +181,7 @@ ossl_x509_to_der(VALUE self)
     if ((len = i2d_X509(x509, NULL)) <= 0)
 	ossl_raise(eX509CertError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = RSTRING(str)->ptr;
     if (i2d_X509(x509, &p) <= 0)
 	ossl_raise(eX509CertError, NULL);
     ossl_str_adjust(str, p);
@@ -198,10 +189,6 @@ ossl_x509_to_der(VALUE self)
     return str;
 }
 
-/*
- * call-seq:
- *    cert.to_pem => string
- */
 static VALUE 
 ossl_x509_to_pem(VALUE self)
 {
@@ -222,10 +209,6 @@ ossl_x509_to_pem(VALUE self)
     return str;
 }
 
-/*
- * call-seq:
- *    cert.to_text => string
- */
 static VALUE
 ossl_x509_to_text(VALUE self)
 {
@@ -269,10 +252,6 @@ ossl_x509_to_req(VALUE self)
 }
 #endif
 
-/*
- * call-seq:
- *    cert.version => integer
- */
 static VALUE 
 ossl_x509_get_version(VALUE self)
 {
@@ -283,20 +262,16 @@ ossl_x509_get_version(VALUE self)
     return LONG2NUM(X509_get_version(x509));
 }
 
-/*
- * call-seq:
- *    cert.version = integer => integer
- */
 static VALUE 
 ossl_x509_set_version(VALUE self, VALUE version)
 {
     X509 *x509;
     long ver;
 
+    GetX509(self, x509);
     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);
     }
@@ -304,10 +279,6 @@ ossl_x509_set_version(VALUE self, VALUE version)
     return version;
 }
 
-/*
- * call-seq:
- *    cert.serial => integer
- */
 static VALUE 
 ossl_x509_get_serial(VALUE self)
 {
@@ -318,10 +289,6 @@ ossl_x509_get_serial(VALUE self)
     return asn1integer_to_num(X509_get_serialNumber(x509));
 }
 
-/*
- * call-seq:
- *    cert.serial = integer => integer
- */
 static VALUE 
 ossl_x509_set_serial(VALUE self, VALUE num)
 {
@@ -335,10 +302,6 @@ ossl_x509_set_serial(VALUE self, VALUE num)
     return num;
 }
 
-/*
- * call-seq:
- *    cert.signature_algorithm => string
- */
 static VALUE 
 ossl_x509_get_signature_algorithm(VALUE self)
 {
@@ -347,6 +310,7 @@ ossl_x509_get_signature_algorithm(VALUE self)
     VALUE str;
 
     GetX509(self, x509);
+	
     out = BIO_new(BIO_s_mem());
     if (!out) ossl_raise(eX509CertError, NULL);
 
@@ -359,10 +323,6 @@ ossl_x509_get_signature_algorithm(VALUE self)
     return str;
 }
 
-/*
- * call-seq:
- *    cert.subject => name
- */
 static VALUE 
 ossl_x509_get_subject(VALUE self)
 {
@@ -377,10 +337,6 @@ ossl_x509_get_subject(VALUE self)
     return ossl_x509name_new(name);
 }
 
-/*
- * call-seq:
- *    cert.subject = name => name
- */
 static VALUE 
 ossl_x509_set_subject(VALUE self, VALUE subject)
 {
@@ -394,10 +350,6 @@ ossl_x509_set_subject(VALUE self, VALUE subject)
     return subject;
 }
 
-/*
- * call-seq:
- *    cert.issuer => name
- */
 static VALUE 
 ossl_x509_get_issuer(VALUE self)
 {
@@ -412,10 +364,6 @@ ossl_x509_get_issuer(VALUE self)
     return ossl_x509name_new(name);
 }
 
-/*
- * call-seq:
- *    cert.issuer = name => name
- */
 static VALUE 
 ossl_x509_set_issuer(VALUE self, VALUE issuer)
 {
@@ -429,10 +377,6 @@ ossl_x509_set_issuer(VALUE self, VALUE issuer)
     return issuer;
 }
 
-/*
- * call-seq:
- *    cert.not_before => time
- */
 static VALUE 
 ossl_x509_get_not_before(VALUE self)
 {
@@ -447,18 +391,14 @@ ossl_x509_get_not_before(VALUE self)
     return asn1time_to_time(asn1time);
 }
 
-/*
- * call-seq:
- *    cert.not_before = time => time
- */
 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);
+    sec = time_to_time_t(time);
     if (!X509_time_adj(X509_get_notBefore(x509), 0, &sec)) {
 	ossl_raise(eX509CertError, NULL);
     }
@@ -466,10 +406,6 @@ ossl_x509_set_not_before(VALUE self, VALUE time)
     return time;
 }
 
-/*
- * call-seq:
- *    cert.not_after => time
- */
 static VALUE 
 ossl_x509_get_not_after(VALUE self)
 {
@@ -484,18 +420,14 @@ ossl_x509_get_not_after(VALUE self)
     return asn1time_to_time(asn1time);
 }
 
-/*
- * call-seq:
- *    cert.not_before = time => time
- */
 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);
+    sec = time_to_time_t(time);
     if (!X509_time_adj(X509_get_notAfter(x509), 0, &sec)) {
 	ossl_raise(eX509CertError, NULL);
     }
@@ -503,10 +435,6 @@ ossl_x509_set_not_after(VALUE self, VALUE time)
     return time;
 }
 
-/*
- * call-seq:
- *    cert.public_key => key
- */
 static VALUE 
 ossl_x509_get_public_key(VALUE self)
 {
@@ -521,10 +449,6 @@ ossl_x509_get_public_key(VALUE self)
     return ossl_pkey_new(pkey); /* NO DUP - OK */
 }
 
-/*
- * call-seq:
- *    cert.public_key = key => key
- */
 static VALUE 
 ossl_x509_set_public_key(VALUE self, VALUE key)
 {
@@ -538,10 +462,6 @@ ossl_x509_set_public_key(VALUE self, VALUE key)
     return key;
 }
 
-/*
- * call-seq:
- *    cert.sign(key, digest) => self
- */
 static VALUE 
 ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
 {
@@ -549,9 +469,9 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
     EVP_PKEY *pkey;
     const EVP_MD *md;
 
+    GetX509(self, x509);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
     md = GetDigestPtr(digest);
-    GetX509(self, x509);
     if (!X509_sign(x509, pkey, md)) {
 	ossl_raise(eX509CertError, NULL);
     }
@@ -560,9 +480,6 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
 }
 
 /*
- * call-seq:
- *    cert.verify(key) => true | false
- *
  * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
  */
 static VALUE 
@@ -572,8 +489,8 @@ ossl_x509_verify(VALUE self, VALUE key)
     EVP_PKEY *pkey;
     int i;
 
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
     GetX509(self, x509);
+    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
     if ((i = X509_verify(x509, pkey)) < 0) {
 	ossl_raise(eX509CertError, NULL);
     } 
@@ -585,9 +502,6 @@ ossl_x509_verify(VALUE self, VALUE key)
 }
 
 /*
- * call-seq:
- *    cert.check_private_key(key)
- *
  * Checks if 'key' is PRIV key for this cert
  */
 static VALUE 
@@ -596,9 +510,9 @@ ossl_x509_check_private_key(VALUE self, VALUE key)
     X509 *x509;
     EVP_PKEY *pkey;
 	
+    GetX509(self, x509);
     /* 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;
@@ -608,8 +522,7 @@ ossl_x509_check_private_key(VALUE self, VALUE key)
 }
 
 /*
- * call-seq:
- *    cert.extensions => [extension...]
+ * Gets X509v3 extensions as array of X509Ext objects
  */
 static VALUE 
 ossl_x509_get_extensions(VALUE self)
@@ -634,8 +547,7 @@ ossl_x509_get_extensions(VALUE self)
 }
 
 /*
- * call-seq:
- *    cert.extensions = [ext...] => [ext...]
+ * Sets X509_EXTENSIONs
  */
 static VALUE 
 ossl_x509_set_extensions(VALUE self, VALUE ary)
@@ -644,16 +556,16 @@ ossl_x509_set_extensions(VALUE self, VALUE ary)
     X509_EXTENSION *ext;
     int i;
 	
+    GetX509(self, x509);
     Check_Type(ary, T_ARRAY);
     /* All ary's members should be X509Extension */
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
+    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_LEN(ary); i++) {
-	ext = DupX509ExtPtr(RARRAY_PTR(ary)[i]);
+    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);
@@ -665,10 +577,6 @@ ossl_x509_set_extensions(VALUE self, VALUE ary)
     return ary;
 }
 
-/*
- * call-seq:
- *    cert.add_extension(extension) => extension
- */
 static VALUE 
 ossl_x509_add_extension(VALUE self, VALUE extension)
 {
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index be9ddacf48..a7746aa2b3 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -146,10 +146,11 @@ ossl_x509crl_set_version(VALUE self, VALUE version)
     X509_CRL *crl;
     long ver;
 
+    GetX509CRL(self, crl);
+
     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);
     }
@@ -166,6 +167,7 @@ ossl_x509crl_get_signature_algorithm(VALUE self)
     VALUE str;
 
     GetX509CRL(self, crl);
+	
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -218,8 +220,8 @@ ossl_x509crl_set_last_update(VALUE self, VALUE time)
     X509_CRL *crl;
     time_t sec;
 
-    sec = time_to_time_t(time);
     GetX509CRL(self, crl);
+    sec = time_to_time_t(time);
     if (!X509_time_adj(crl->crl->lastUpdate, 0, &sec)) {
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -243,8 +245,8 @@ ossl_x509crl_set_next_update(VALUE self, VALUE time)
     X509_CRL *crl;
     time_t sec;
 
-    sec = time_to_time_t(time);
     GetX509CRL(self, crl);
+    sec = time_to_time_t(time);
     /* This must be some thinko in OpenSSL */
     if (!(crl->crl->nextUpdate = X509_time_adj(crl->crl->nextUpdate, 0, &sec))){
 	ossl_raise(eX509CRLError, NULL);
@@ -285,16 +287,16 @@ ossl_x509crl_set_revoked(VALUE self, VALUE ary)
     X509_REVOKED *rev;
     int i;
 
+    GetX509CRL(self, crl);
     Check_Type(ary, T_ARRAY);
     /* All ary members should be X509 Revoked */
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Rev);
+    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_LEN(ary); i++) {
-	rev = DupX509RevokedPtr(RARRAY_PTR(ary)[i]);
+    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);
 	}
@@ -459,16 +461,16 @@ ossl_x509crl_set_extensions(VALUE self, VALUE ary)
     X509_EXTENSION *ext;
     int i;
 	
+    GetX509CRL(self, crl);
     Check_Type(ary, T_ARRAY);
     /* All ary members should be X509 Extensions */
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
+    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_LEN(ary); i++) {
-	ext = DupX509ExtPtr(RARRAY_PTR(ary)[i]);
+    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);
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index aa9366f901..f0ce068d6b 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -26,12 +26,9 @@
     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 MakeX509ExtFactory(klass, obj, ctx) \
+    obj = Data_Make_Struct(klass, X509V3_CTX, 0, ossl_x509extfactory_free, ctx)
 #define GetX509ExtFactory(obj, ctx) do { \
     Data_Get_Struct(obj, X509V3_CTX, ctx); \
     if (!ctx) { \
@@ -217,35 +214,22 @@ ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
     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
 
+    GetX509ExtFactory(self, ctx);
     rb_scan_args(argc, argv, "21", &oid, &value, &critical);
     StringValue(oid);
     StringValue(value);
     if(NIL_P(critical)) critical = Qfalse;
 
-    nid = OBJ_ln2nid(RSTRING_PTR(oid));
-    if(!nid) nid = OBJ_sn2nid(RSTRING_PTR(oid));
-    if(!nid) ossl_raise(eX509ExtError, "unknown OID `%s'", RSTRING_PTR(oid));
+    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_PTR(valstr));
-#else
-    if (!empty_lhash) empty_lhash = lh_new(NULL, NULL);
-    ext = X509V3_EXT_conf_nid(empty_lhash, ctx, nid, RSTRING_PTR(valstr));
-#endif
+    ext = X509V3_EXT_conf_nid(NULL, ctx, nid, RSTRING(valstr)->ptr);
     if (!ext){
 	ossl_raise(eX509ExtError, "%s = %s",
-		   RSTRING_PTR(oid), RSTRING_PTR(value));
+		   RSTRING(oid)->ptr, RSTRING(value)->ptr);
     }
     WrapX509Ext(cX509Ext, obj, ext);
 
@@ -276,13 +260,13 @@ ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
     unsigned char *p;
     X509_EXTENSION *ext;
 
-    GetX509Ext(self, ext);
     if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){
+	/* evaluate oid as a DER string */
 	oid = ossl_to_der_if_possible(oid);
 	StringValue(oid);
-	p  = RSTRING_PTR(oid);
-	if(!d2i_X509_EXTENSION((X509_EXTENSION**)&DATA_PTR(self),
-			       &p, RSTRING_LEN(oid)))
+	GetX509Ext(self, ext);
+	p  = RSTRING(oid)->ptr;
+	if(!d2i_X509_EXTENSION(&ext, &p, RSTRING(oid)->len))
 	    ossl_raise(eX509ExtError, NULL);
 	return self;
     }
@@ -300,11 +284,11 @@ ossl_x509ext_set_oid(VALUE self, VALUE oid)
     ASN1_OBJECT *obj;
     char *s;
 
+    GetX509Ext(self, ext);
     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;
@@ -317,21 +301,21 @@ ossl_x509ext_set_value(VALUE self, VALUE data)
     ASN1_OCTET_STRING *asn1s;
     char *s;
 
+    GetX509Ext(self, ext);
     data = ossl_to_der_if_possible(data);
     StringValue(data);
-    if(!(s = OPENSSL_malloc(RSTRING_LEN(data))))
+    if(!(s = OPENSSL_malloc(RSTRING(data)->len)))
 	ossl_raise(eX509ExtError, "malloc error");
-    memcpy(s, RSTRING_PTR(data), RSTRING_LEN(data));
+    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_LEN(data))){
+    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;
@@ -392,7 +376,6 @@ static VALUE
 ossl_x509ext_get_critical(VALUE obj)
 {
     X509_EXTENSION *ext;
-
     GetX509Ext(obj, ext);
     return X509_EXTENSION_get_critical(ext) ? Qtrue : Qfalse;
 }
@@ -409,7 +392,7 @@ ossl_x509ext_to_der(VALUE obj)
     if((len = i2d_X509_EXTENSION(ext, NULL)) <= 0)
 	ossl_raise(eX509ExtError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = RSTRING(str)->ptr;
     if(i2d_X509_EXTENSION(ext, &p) < 0)
 	ossl_raise(eX509ExtError, NULL);
     ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index b4434d2a34..5964eec2ee 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -27,11 +27,6 @@
     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
  */
@@ -87,92 +82,49 @@ ossl_x509name_alloc(VALUE klass)
     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;
-}
-
-/*
- * call-seq:
- *    X509::Name.new => name
- *    X509::Name.new(string) => name
- *    X509::Name.new(dn) => name
- *    X509::Name.new(dn, template) => name
- */
 static VALUE
 ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
 {
     X509_NAME *name;
-    VALUE arg, template;
+    int i, type;
+    VALUE arg, str_type, item, key, value;
 
     GetX509Name(self, name);
-    if (rb_scan_args(argc, argv, "02", &arg, &template) == 0) {
+    if (rb_scan_args(argc, argv, "02", &arg, &str_type) == 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_block_call(tmp, rb_intern("each"), 0, 0, ossl_x509name_init_i, args);
+    if (argc == 1 && rb_respond_to(arg, ossl_s_to_der)){
+	unsigned char *p;
+	VALUE str = rb_funcall(arg, ossl_s_to_der, 0);
+	StringValue(str);
+	p  = RSTRING(str)->ptr;
+	if(!d2i_X509_NAME(&name, &p, RSTRING(str)->len))
+	    ossl_raise(eX509NameError, NULL);
+        return self;
+    }
+    Check_Type(arg, T_ARRAY);
+    type = NIL_P(str_type) ? V_ASN1_UTF8STRING : NUM2INT(str_type);
+    for (i=0; i<RARRAY(arg)->len; i++) {
+	item = RARRAY(arg)->ptr[i];
+	Check_Type(item, T_ARRAY);
+	if (RARRAY(item)->len != 2) {
+	    ossl_raise(rb_eArgError, "Unsupported structure.");
 	}
-	else{
-	    unsigned char *p;
-	    VALUE str = ossl_to_der_if_possible(arg);
-	    StringValue(str);
-	    p = RSTRING_PTR(str);
-	    if(!d2i_X509_NAME((X509_NAME**)&DATA_PTR(self), &p, RSTRING_LEN(str))){
-		ossl_raise(eX509NameError, NULL);
-	    }
+	key = RARRAY(item)->ptr[0];
+	value = RARRAY(item)->ptr[1];
+	StringValue(key);
+	StringValue(value);
+	if (!X509_NAME_add_entry_by_txt(name, RSTRING(key)->ptr, type,
+			RSTRING(value)->ptr, RSTRING(value)->len, -1, 0)) {
+	    ossl_raise(eX509NameError, NULL);
 	}
     }
 
     return self;
 }
 
-/*
- * call-seq:
- *    name.add_entry(oid, value [, type]) => 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_PTR(oid), NUM2INT(type),
-		RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
-	ossl_raise(eX509NameError, NULL);
-    }
-
-    return self;
-}
-
 static VALUE
-ossl_x509name_to_s_old(VALUE self)
+ossl_x509name_to_s(VALUE self)
 {
     X509_NAME *name;
     char *buf;
@@ -186,39 +138,6 @@ ossl_x509name_to_s_old(VALUE self)
     return str;
 }
 
-/*
- * call-seq:
- *    name.to_s => string
- *    name.to_s(integer) => string
- */
-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;
-}
-
-/*
- * call-seq:
- *    name.to_a => [[name, data, type], ...]
- */
 static VALUE 
 ossl_x509name_to_a(VALUE self)
 {
@@ -227,7 +146,7 @@ ossl_x509name_to_a(VALUE self)
     int i,entries;
     char long_name[512];
     const char *short_name;
-    VALUE ary, ret;
+    VALUE ary;
 	
     GetX509Name(self, name);
     entries = X509_NAME_entry_count(name);
@@ -235,7 +154,7 @@ ossl_x509name_to_a(VALUE self)
 	OSSL_Debug("name entries < 0!");
 	return rb_ary_new();
     }
-    ret = rb_ary_new2(entries);
+    ary = rb_ary_new2(entries);
     for (i=0; i<entries; i++) {
 	if (!(entry = X509_NAME_get_entry(name, i))) {
 	    ossl_raise(eX509NameError, NULL);
@@ -244,12 +163,11 @@ ossl_x509name_to_a(VALUE self)
 	    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);
+	
+	rb_ary_push(ary, rb_assoc_new(rb_str_new2(short_name),
+		rb_str_new(entry->value->data, entry->value->length)));
     }
-    return ret;
+    return ary;
 }
 
 static int
@@ -286,10 +204,6 @@ ossl_x509name_eql(VALUE self, VALUE other)
     return (result == 0) ? Qtrue : Qfalse;
 }
 
-/*
- * call-seq:
- *    name.hash => integer
- */
 static VALUE
 ossl_x509name_hash(VALUE self)
 {
@@ -303,10 +217,6 @@ ossl_x509name_hash(VALUE self)
     return ULONG2NUM(hash);
 }
 
-/*
- * call-seq:
- *    name.to_der => string
- */
 static VALUE
 ossl_x509name_to_der(VALUE self)
 {
@@ -319,7 +229,7 @@ ossl_x509name_to_der(VALUE self)
     if((len = i2d_X509_NAME(name, NULL)) <= 0)
 	ossl_raise(eX509NameError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = RSTRING(str)->ptr;
     if(i2d_X509_NAME(name, &p) <= 0)
 	ossl_raise(eX509NameError, NULL);
     ossl_str_adjust(str, p);
@@ -333,40 +243,17 @@ ossl_x509name_to_der(VALUE self)
 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_s", ossl_x509name_to_s, 0);
     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/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index 13a42dddaf..c532739997 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -171,7 +171,7 @@ ossl_x509req_to_der(VALUE self)
     if ((len = i2d_X509_REQ(req, NULL)) <= 0)
 	ossl_raise(eX509CertError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = RSTRING(str)->ptr;
     if (i2d_X509_REQ(req, &p) <= 0)
 	ossl_raise(eX509ReqError, NULL);
     ossl_str_adjust(str, p);
@@ -240,10 +240,10 @@ ossl_x509req_set_version(VALUE self, VALUE version)
     X509_REQ *req;
     long ver;
 
+    GetX509Req(self, req);
     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);
     }
@@ -402,15 +402,15 @@ ossl_x509req_set_attributes(VALUE self, VALUE ary)
     int i;
     VALUE item;
 
+    GetX509Req(self, req);
     Check_Type(ary, T_ARRAY);
-    for (i=0;i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Attr);
+    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_LEN(ary); i++) {
-	item = RARRAY_PTR(ary)[i];
+    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);
diff --git a/ext/openssl/ossl_x509revoked.c b/ext/openssl/ossl_x509revoked.c
index d0f816bad4..30ce75207f 100644
--- a/ext/openssl/ossl_x509revoked.c
+++ b/ext/openssl/ossl_x509revoked.c
@@ -129,8 +129,8 @@ ossl_x509revoked_set_time(VALUE self, VALUE time)
     X509_REVOKED *rev;
     time_t sec;
 
-    sec = time_to_time_t(time);
     GetX509Rev(self, rev);
+    sec = time_to_time_t(time);
     if (!X509_time_adj(rev->revocationDate, 0, &sec)) {
 	ossl_raise(eX509RevError, NULL);
     }
@@ -174,15 +174,15 @@ ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
     int i;
     VALUE item;
 
+    GetX509Rev(self, rev);
     Check_Type(ary, T_ARRAY);
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
+    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_LEN(ary); i++) {
-	item = RARRAY_PTR(ary)[i];
+    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);
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index 769ce8a91a..4c5f0624a9 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -118,18 +118,11 @@ ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
     return cb;
 }
 
-
-/*
- * call-seq:
- *    X509::Store.new => store
- *
- */
 static VALUE
 ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
 {
     X509_STORE *store;
 
-/* BUG: This method takes any number of arguments but appears to ignore them. */
     GetX509Store(self, store);
     X509_STORE_set_verify_cb_func(store, ossl_verify_cb);
     ossl_x509store_set_vfy_cb(self, Qnil);
@@ -144,7 +137,6 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
     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;
 }
@@ -154,10 +146,9 @@ 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);
+    X509_STORE_set_flags(store, NUM2LONG(flags));
 #else
     rb_iv_set(self, "@flags", flags);
 #endif
@@ -170,10 +161,9 @@ 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);
+    X509_STORE_set_purpose(store, NUM2LONG(purpose));
 #else
     rb_iv_set(self, "@purpose", purpose);
 #endif
@@ -186,10 +176,9 @@ 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);
+    X509_STORE_set_trust(store, NUM2LONG(trust));
 #else
     rb_iv_set(self, "@trust", trust);
 #endif
@@ -198,13 +187,6 @@ ossl_x509store_set_trust(VALUE self, VALUE 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;
@@ -213,7 +195,7 @@ ossl_x509store_add_file(VALUE self, VALUE file)
 
     if(file != Qnil){
         Check_SafeStr(file);
-	path = RSTRING_PTR(file);
+	path = RSTRING(file)->ptr;
     }
     GetX509Store(self, store);
     lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
@@ -234,7 +216,7 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
 
     if(dir != Qnil){
         Check_SafeStr(dir);
-	path = RSTRING_PTR(dir);
+	path = RSTRING(dir)->ptr;
     }
     GetX509Store(self, store);
     lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
@@ -247,19 +229,6 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
 }
 
 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;
@@ -267,9 +236,7 @@ ossl_x509store_add_cert(VALUE self, VALUE arg)
 
     cert = GetX509CertPtr(arg); /* NO NEED TO DUP */
     GetX509Store(self, store);
-    if (X509_STORE_add_cert(store, cert) != 1){
-        ossl_raise(eX509StoreError, NULL);
-    }
+    X509_STORE_add_cert(store, cert);
 
     return self;
 }
@@ -282,9 +249,7 @@ ossl_x509store_add_crl(VALUE self, VALUE arg)
 
     crl = GetX509CRLPtr(arg); /* NO NEED TO DUP */
     GetX509Store(self, store);
-    if (X509_STORE_add_crl(store, crl) != 1){
-        ossl_raise(eX509StoreError, NULL);
-    }
+    X509_STORE_add_crl(store, crl);
 
     return self;
 }
@@ -364,22 +329,17 @@ ossl_x509stctx_alloc(VALUE klass)
     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;
+    VALUE store, cert, chain;
     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);
+    rb_scan_args(argc, argv, "12", &store, &cert, &chain);
     SafeGetX509Store(store, x509st);
     if(!NIL_P(cert)) x509 = DupX509CertPtr(cert); /* NEED TO DUP */
     if(!NIL_P(chain)) x509s = ossl_x509_ary2sk(chain);
@@ -390,12 +350,10 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
     }
 #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"));
+    X509_STORE_CTX_set_flags(ctx, NUM2INT(rb_iv_get(store, "@flags")));
+    X509_STORE_CTX_set_purpose(ctx, NUM2INT(rb_iv_get(store, "@purpose")));
+    X509_STORE_CTX_set_trust(ctx, NUM2INT(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);
 
@@ -458,7 +416,7 @@ ossl_x509stctx_set_error(VALUE self, VALUE err)
     X509_STORE_CTX *ctx;
 
     GetX509StCtx(self, ctx);
-    X509_STORE_CTX_set_error(ctx, NUM2INT(err));
+    X509_STORE_CTX_set_error(ctx, FIX2INT(err));
 
     return err;
 }
@@ -525,10 +483,9 @@ 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);
+    X509_STORE_CTX_set_flags(store, NUM2LONG(flags));
 
     return flags;
 }
@@ -537,10 +494,9 @@ 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);
+    X509_STORE_CTX_set_purpose(store, NUM2LONG(purpose));
 
     return purpose;
 }
@@ -549,32 +505,14 @@ 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);
+    X509_STORE_CTX_set_trust(store, NUM2LONG(trust));
 
     return trust;
 }
 
 /*
- * call-seq:
- *    storectx.time = time => time
- */
-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 
@@ -595,10 +533,8 @@ Init_ossl_x509store()
     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);
@@ -619,6 +555,5 @@ Init_ossl_x509store()
     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/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h
index 64b76f26b4..4bd08890f8 100644
--- a/ext/openssl/ruby_missing.h
+++ b/ext/openssl/ruby_missing.h
@@ -9,33 +9,10 @@
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_RUBY_MISSING_H_)
-#define _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_ */
 
-#ifndef GetReadFile
-#define FPTR_TO_FD(fptr) (fptr->fd)
-#else
-#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
-#endif
-
-#ifndef HAVE_RB_IO_T
-#define rb_io_t OpenFile
-#endif
-
-#ifndef HAVE_RB_STR_SET_LEN
-/* these methods should probably be backported to 1.8 */
-#define rb_str_set_len(str, length) do {	\
-	RSTRING(str)->ptr[length] = 0;		\
-	RSTRING(str)->len = length;		\
-} while(0)
-#endif /* ! HAVE_RB_STR_SET_LEN */
-
-#ifndef HAVE_RB_BLOCK_CALL
-/* the openssl module doesn't use arg[3-4] and arg2 is always rb_each */
-#define rb_block_call(arg1, arg2, arg3, arg4, arg5, arg6) rb_iterate(rb_each, arg1, arg5, arg6)
-#endif /* ! HAVE_RB_BLOCK_CALL */
-
-#endif /* _OSSL_RUBY_MISSING_H_ */
diff --git a/ext/pty/MANIFEST b/ext/pty/MANIFEST
new file mode 100644
index 0000000000..0535a5b7ef
--- /dev/null
+++ b/ext/pty/MANIFEST
@@ -0,0 +1,12 @@
+MANIFEST
+README
+README.expect
+README.expect.ja
+README.ja
+depend
+expect_sample.rb
+extconf.rb
+lib/expect.rb
+pty.c
+script.rb
+shl.rb
diff --git a/ext/pty/expect_sample.rb b/ext/pty/expect_sample.rb
index 2a2e29f866..bf8a2352fe 100644
--- a/ext/pty/expect_sample.rb
+++ b/ext/pty/expect_sample.rb
@@ -15,6 +15,10 @@ PTY.spawn("ftp ftp.ruby-lang.org") do |r_f,w_f,pid|
   
   $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?
@@ -23,16 +27,19 @@ PTY.spawn("ftp ftp.ruby-lang.org") do |r_f,w_f,pid|
     username = 'guest'
   end
   
-  r_f.expect(/^(Name).*: |(word):|> /) do
-    w_f.puts($1 ? "ftp" : $2 ? "#{username}@" : "cd pub/ruby")
+  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|
+  r_f.expect("> ") do |output|
     for x in output[0].split("\n")
-      if x =~ /(ruby.*?\.tar\.gz)/ then
+      if x =~ /(ruby.*\.tar\.gz)/ then
          fnames.push $1
       end
     end
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index 08191b05b9..aa9ab895d3 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -10,7 +10,7 @@ class IO
       e_pat = pat
     end
     while true
-      if !IO.select([self],nil,nil,timeout) or eof? then
+      if IO.select([self],nil,nil,timeout).nil? then
         result = nil
         break
       end
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 939335242f..cfd7e4854e 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -39,10 +39,10 @@
 
 #if !defined(HAVE_OPENPTY)
 #if defined(__hpux)
-static const
-char	MasterDevice[] = "/dev/ptym/pty%s",
-	SlaveDevice[] =  "/dev/pty/tty%s",
-	*const deviceNo[] = {
+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",
@@ -62,10 +62,10 @@ char	MasterDevice[] = "/dev/ptym/pty%s",
 		0,
 	};
 #elif defined(_IBMESA)  /* AIX/ESA */
-static const
-char	MasterDevice[] = "/dev/ptyp%s",
-  	SlaveDevice[] = "/dev/ttyp%s",
-	*const deviceNo[] = {
+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",
@@ -84,10 +84,10 @@ char	MasterDevice[] = "/dev/ptyp%s",
 "f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
 		};
 #elif !defined(HAVE_PTSNAME)
-static const
-char	MasterDevice[] = "/dev/pty%s",
-	SlaveDevice[] = "/dev/tty%s",
-	*const deviceNo[] = {
+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",
@@ -101,6 +101,10 @@ char	MasterDevice[] = "/dev/pty%s",
 #endif
 #endif /* !defined(HAVE_OPENPTY) */
 
+static char SlaveName[DEVICELEN];
+
+extern int errno;
+
 #ifndef HAVE_SETEUID
 # ifdef HAVE_SETREUID
 #  define seteuid(e)	setreuid(-1, (e))
@@ -124,7 +128,7 @@ echild_status(self)
 
 struct pty_info {
     int fd;
-    rb_pid_t child_pid;
+    pid_t child_pid;
     VALUE thread;
 };
 
@@ -137,7 +141,7 @@ raise_from_wait(state, info)
     char buf[1024];
     VALUE exc;
 
-    snprintf(buf, sizeof(buf), "pty - %s: %ld", state, (long)info->child_pid);
+    snprintf(buf, sizeof(buf), "pty - %s: %d", state, 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);
@@ -153,15 +157,17 @@ pty_syswait(info)
 	cpid = rb_waitpid(info->child_pid, &status, WUNTRACED);
 	if (cpid == -1) return Qnil;
 
-#if defined(WIFSTOPPED)
-#elif defined(IF_STOPPED)
-#define WIFSTOPPED(status) IF_STOPPED(status)
-#else
----->> Either IF_STOPPED or WIFSTOPPED is needed <<----
-#endif /* WIFSTOPPED | IF_STOPPED */
+#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);
 	}
@@ -172,32 +178,28 @@ pty_syswait(info)
     }
 }
 
-static void getDevice _((int*, int*, char [DEVICELEN]));
+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;
+pty_exec(arg)
+    struct exec_info *arg;
 {
-    struct exec_info *arg = (struct exec_info *)v;
     return rb_f_exec(arg->argc, arg->argv);
 }
 
 static void
-establishShell(argc, argv, info, SlaveName)
+establishShell(argc, argv, info)
     int argc;
     VALUE *argv;
     struct pty_info *info;
-    char SlaveName[DEVICELEN];
-{
-    int 		i,master,slave;
-    char		*p, tmp, *getenv();
+{	
+    static int		i,master,slave,currentPid;
+    char		*p,*getenv();
     struct passwd	*pwent;
     VALUE		v;
     struct exec_info	arg;
@@ -220,9 +222,10 @@ establishShell(argc, argv, info, SlaveName)
 	argc = 1;
 	argv = &v;
     }
-    getDevice(&master, &slave, SlaveName);
+    getDevice(&master,&slave);
 
     info->thread = rb_thread_current();
+    currentPid = getpid();
     if((i = fork()) < 0) {
 	close(master);
 	close(slave);
@@ -230,6 +233,8 @@ establishShell(argc, argv, info, SlaveName)
     }
 
     if(i == 0) {	/* child */
+	currentPid = getpid();	
+
 	/*
 	 * Set free from process group and controlling terminal
 	 */
@@ -241,7 +246,7 @@ establishShell(argc, argv, info, SlaveName)
 	if (setpgrp() == -1)
 	    perror("setpgrp()");
 #  else /* SETGRP_VOID */
-	if (setpgrp(0, getpid()) == -1)
+	if (setpgrp(0, currentPid) == -1)
 	    rb_sys_fail("setpgrp()");
 	if ((i = open("/dev/tty", O_RDONLY)) < 0)
 	    rb_sys_fail("/dev/tty");
@@ -270,7 +275,6 @@ establishShell(argc, argv, info, SlaveName)
 	}
 	close(master);
 #endif
-	write(slave, "", 1);
 	dup2(slave,0);
 	dup2(slave,1);
 	dup2(slave,2);
@@ -286,7 +290,6 @@ establishShell(argc, argv, info, SlaveName)
 	_exit(1);
     }
 
-    read(master, &tmp, 1);
     close(slave);
 
     info->child_pid = i;
@@ -303,36 +306,40 @@ pty_finalize_syswait(info)
     return Qnil;
 }
 
-static int
-get_device_once(master, slave, SlaveName, fail)
-    int *master, *slave, fail;
-    char SlaveName[DEVICELEN];
-{
-#if defined HAVE_OPENPTY
+#ifdef HAVE_OPENPTY
 /*
  * Use openpty(3) of 4.3BSD Reno and later,
  * or the same interface function.
  */
+static void
+getDevice(master,slave)
+    int	*master,*slave;
+{
     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
+}
+#else /* HAVE_OPENPTY */
+#ifdef HAVE__GETPTY
+static void
+getDevice(master,slave)
+    int	*master,*slave;
+{
     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);
-    strncpy(SlaveName, name, sizeof SlaveName);
-
-    return 0;
+    strcpy(SlaveName, name);
+}
 #else /* HAVE__GETPTY */
+static void
+getDevice(master,slave)
+    int	*master,*slave;
+{
     int	 i,j;
 
 #ifdef HAVE_PTSNAME
@@ -353,12 +360,11 @@ get_device_once(master, slave, SlaveName, fail)
 #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;
-				strncpy(SlaveName, pn, sizeof SlaveName);
-				return 0;
+				strcpy(SlaveName, pn);
+				return;
 #if defined I_PUSH && !defined linux
 			    }
 			}
@@ -369,41 +375,36 @@ get_device_once(master, slave, SlaveName, fail)
 	}
 	close(i);
     }
-    if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
-    return -1;
+    rb_raise(rb_eRuntimeError, "Cannot get Master/Slave device");
 #else
     char **p;
     char MasterName[DEVICELEN];
 
     for (p = deviceNo; *p != NULL; p++) {
-	snprintf(MasterName, sizeof MasterName, MasterDevice, *p);
+	sprintf(MasterName,MasterDevice,*p);
 	if ((i = open(MasterName,O_RDWR,0)) >= 0) {
 	    *master = i;
-	    snprintf(SlaveName, sizeof SlaveName, SlaveDevice, *p);
+	    sprintf(SlaveName,SlaveDevice,*p);
 	    if ((j = open(SlaveName,O_RDWR,0)) >= 0) {
 		*slave = j;
 		chown(SlaveName, getuid(), getgid());
 		chmod(SlaveName, 0622);
-		return 0;
+		return;
 	    }
 	    close(i);
 	}
     }
-    if (fail) rb_raise(rb_eRuntimeError, "can't get %s", SlaveName);
-    return -1;
-#endif
+    rb_raise(rb_eRuntimeError, "Cannot get %s", SlaveName);
 #endif
 }
+#endif /* HAVE__GETPTY */
+#endif /* HAVE_OPENPTY */
 
 static void
-getDevice(master, slave, slavename)
-    int *master, *slave;
-    char slavename[DEVICELEN];
+freeDevice()
 {
-    if (get_device_once(master, slave, slavename, 0)) {
-	rb_gc();
-	get_device_once(master, slave, slavename, 1);
-    }
+    chmod(SlaveName, 0666);
+    chown(SlaveName, 0, 0);
 }
 
 /* ruby function: getpty */
@@ -416,15 +417,14 @@ pty_getpty(argc, argv, self)
     VALUE res;
     struct pty_info info;
     struct pty_info thinfo;
-    rb_io_t *wfptr,*rfptr;
+    OpenFile *wfptr,*rfptr;
     VALUE rport = rb_obj_alloc(rb_cFile);
     VALUE wport = rb_obj_alloc(rb_cFile);
-    char SlaveName[DEVICELEN];
-
+  
     MakeOpenFile(rport, rfptr);
     MakeOpenFile(wport, wfptr);
 
-    establishShell(argc, argv, &info, SlaveName);
+    establishShell(argc, argv, &info);
 
     rfptr->mode = rb_io_mode_flags("r");
     rfptr->f = fdopen(info.fd, "r");
diff --git a/ext/purelib.rb b/ext/purelib.rb
deleted file mode 100644
index dbe514c34a..0000000000
--- a/ext/purelib.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-nul = nil
-$:.each_with_index {|path, index|
-  if /\A(?:\.\/)*-\z/ =~ path
-    nul = index
-    break
-  end
-}
-if nul
-  $:[nul..-1] = ["."]
-end
diff --git a/ext/racc/cparse/MANIFEST b/ext/racc/cparse/MANIFEST
new file mode 100644
index 0000000000..6827937750
--- /dev/null
+++ b/ext/racc/cparse/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+cparse.c
+depend
+extconf.rb
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
index 18a26f670f..c15aaf5900 100644
--- a/ext/racc/cparse/cparse.c
+++ b/ext/racc/cparse/cparse.c
@@ -1,24 +1,25 @@
 /*
 
-    cparse.c -- Racc Runtime Core
+    cparse.c -- racc runtime core
   
-    Copyright (c) 1999-2006 Minero Aoki
+    Copyright (c) 1999-2003 Minero Aoki <aamine@loveruby.net>
   
     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 $
+    $raccId: cparse.c,v 1.3 2003/11/03 12:20:54 aamine Exp $
 
 */
 
 #include "ruby.h"
-#include "version.h"
+#include <stdio.h>
+
 
 /* -----------------------------------------------------------------------
                         Important Constants
 ----------------------------------------------------------------------- */
 
-#define RACC_VERSION "1.4.5"
+#define RACC_VERSION "1.4.4"
 
 #define DEFAULT_TOKEN -1
 #define ERROR_TOKEN    1
@@ -28,6 +29,7 @@
 #define vERROR_TOKEN    INT2FIX(ERROR_TOKEN)
 #define vFINAL_TOKEN    INT2FIX(FINAL_TOKEN)
 
+
 /* -----------------------------------------------------------------------
                           File Local Variables
 ----------------------------------------------------------------------- */
@@ -39,6 +41,8 @@ static ID id_yydebug;
 static ID id_nexttoken;
 static ID id_onerror;
 static ID id_noreduce;
+static ID id_catch;
+static VALUE sym_raccjump;
 static ID id_errstatus;
 
 static ID id_d_shift;
@@ -48,41 +52,44 @@ 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));
 
+#ifdef ID2SYM
+# define id_to_value(i) ID2SYM(i)
+#else
+# define id_to_value(i) ULONG2NUM(i)
+#endif
+
 static ID
-value_to_id(VALUE v)
+value_to_id(v)
+    VALUE v;
 {
+#ifndef SYMBOL_P
+#  define SYMBOL_P(v) FIXNUM_P(v)
+#endif
     if (! SYMBOL_P(v)) {
         rb_raise(rb_eTypeError, "not symbol");
     }
+#ifdef SYM2ID
     return SYM2ID(v);
+#else
+    return (ID)NUM2ULONG(v);
+#endif
 }
 
+#ifndef LONG2NUM
+#  define LONG2NUM(i) INT2NUM(i)
+#endif
+
 static inline long
-num_to_long(VALUE n)
+num_to_long(n)
+    VALUE n;
 {
     return NUM2LONG(n);
 }
@@ -90,6 +97,7 @@ num_to_long(VALUE n)
 #define AREF(s, idx) \
     ((0 <= idx && idx < RARRAY(s)->len) ? RARRAY(s)->ptr[idx] : Qnil)
 
+
 /* -----------------------------------------------------------------------
                         Parser Stack Interfaces
 ----------------------------------------------------------------------- */
@@ -98,7 +106,9 @@ 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)
+get_stack_tail(stack, len)
+    VALUE stack;
+    long len;
 {
     if (len < 0) return Qnil;  /* system error */
     if (len > RARRAY(stack)->len) len = RARRAY(stack)->len;
@@ -106,7 +116,9 @@ get_stack_tail(VALUE stack, long len)
 }
 
 static void
-cut_stack_tail(VALUE stack, long len)
+cut_stack_tail(stack, len)
+    VALUE stack;
+    long len;
 {
     while (len > 0) {
         rb_ary_pop(stack);
@@ -123,6 +135,7 @@ cut_stack_tail(VALUE stack, long len)
 #define GET_TAIL(s, len) get_stack_tail(s, len)
 #define CUT_TAIL(s, len) cut_stack_tail(s, len)
 
+
 /* -----------------------------------------------------------------------
                        struct cparse_params
 ----------------------------------------------------------------------- */
@@ -180,6 +193,7 @@ struct cparse_params {
     long i;                 /* table index */
 };
 
+
 /* -----------------------------------------------------------------------
                         Parser Main Routines
 ----------------------------------------------------------------------- */
@@ -189,14 +203,15 @@ 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_iter _((VALUE data));
 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,
+static void initialize_params _((struct cparse_params *v,
+                                 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));
@@ -204,6 +219,7 @@ 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 catch_iter _((VALUE dummy));
 static VALUE reduce0 _((VALUE block_args, VALUE data, VALUE self));
 
 #ifdef DEBUG
@@ -215,16 +231,15 @@ static VALUE reduce0 _((VALUE block_args, VALUE data, VALUE self));
 #endif
 
 static VALUE
-racc_cparse(VALUE parser, VALUE arg, VALUE sysdebug)
+racc_cparse(parser, arg, sysdebug)
+    VALUE parser, arg, sysdebug;
 {
-    volatile VALUE vparams;
-    struct cparse_params *v;
+    struct cparse_params params;
+    struct cparse_params *v = &params;
 
-    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);
+    initialize_params(v, parser, arg, Qnil, Qnil);
     v->lex_is_iterator = Qfalse;
     parse_main(v, Qnil, Qnil, 0);
 
@@ -232,16 +247,15 @@ racc_cparse(VALUE parser, VALUE arg, VALUE sysdebug)
 }
 
 static VALUE
-racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
+racc_yyparse(parser, lexer, lexmid, arg, sysdebug)
+    VALUE parser, lexer, lexmid, arg, sysdebug;
 {
-    volatile VALUE vparams;
-    struct cparse_params *v;
+    struct cparse_params params;
+    struct cparse_params *v = &params;
 
-    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);
+    initialize_params(v, parser, arg, lexer, lexmid);
     v->lex_is_iterator = Qtrue;
     D_puts("params initialized");
     parse_main(v, Qnil, Qnil, 0);
@@ -254,15 +268,16 @@ racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
     return v->retval;
 }
 
-#ifdef HAVE_RB_BLOCK_CALL
 static void
-call_lexer(struct cparse_params *v)
+call_lexer(v)
+    struct cparse_params *v;
 {
-    rb_block_call(v->lexer, v->lexmid, 0, NULL, lexer_i, v->value_v);
+    rb_iterate(lexer_iter, v->value_v, lexer_i, v->value_v);
 }
-#else
+
 static VALUE
-lexer_iter(VALUE data)
+lexer_iter(data)
+    VALUE data;
 {
     struct cparse_params *v;
 
@@ -271,15 +286,9 @@ lexer_iter(VALUE data)
     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)
+lexer_i(block_args, data, self)
+    VALUE block_args, data, self;
 {
     struct cparse_params *v;
     VALUE tok, val;
@@ -295,32 +304,35 @@ lexer_i(VALUE block_args, VALUE data, VALUE self)
 }
 
 static VALUE
-assert_array(VALUE a)
+assert_array(a)
+    VALUE a;
 {
     Check_Type(a, T_ARRAY);
     return a;
 }
 
 static VALUE
-assert_hash(VALUE h)
+assert_hash(h)
+    VALUE h;
 {
     Check_Type(h, T_HASH);
     return h;
 }
 
 static long
-assert_integer(VALUE n)
+assert_integer(n)
+    VALUE n;
 {
     return NUM2LONG(n);
 }
 
-static VALUE
-initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lexmid)
-{
+static void
+initialize_params(v, parser, arg, lexer, lexmid)
     struct cparse_params *v;
+    VALUE parser, arg, lexer, lexmid;
+{
+    v->value_v = Data_Wrap_Struct(CparseParams, 0, 0, v);
 
-    Data_Get_Struct(vparams, struct cparse_params, v);
-    v->value_v = vparams;
     v->parser = parser;
     v->lexer = lexer;
     if (! NIL_P(lexmid))
@@ -365,46 +377,13 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
     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)
+extract_user_token(v, block_args, tok, val)
+    struct cparse_params *v;
+    VALUE block_args;
+    VALUE *tok, *val;
 {
     if (NIL_P(block_args)) {
         /* EOF */
@@ -447,7 +426,10 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
 } while (0)
 
 static void
-parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
+parse_main(v, tok, val, resume)
+    struct cparse_params *v;
+    VALUE tok, val;
+    int resume;
 {
     long i;              /* table index */
     long act;            /* action type */
@@ -486,10 +468,8 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
                 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;
-            }
+            tmp = rb_hash_aref(v->token_table, tok);
+            v->t = NIL_P(tmp) ? vERROR_TOKEN : tmp;
             D_printf("(act) t(k2)=%ld\n", NUM2LONG(v->t));
             if (v->debug) {
                 rb_funcall(v->parser, id_d_read_token,
@@ -656,7 +636,10 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 }
 
 static void
-shift(struct cparse_params *v, long act, VALUE tok, VALUE val)
+shift(v, act, tok, val)
+    struct cparse_params *v;
+    long act;
+    VALUE tok, val;
 {
     PUSH(v->vstack, val);
     if (v->debug) {
@@ -669,23 +652,33 @@ shift(struct cparse_params *v, long act, VALUE tok, VALUE val)
 }
 
 static int
-reduce(struct cparse_params *v, long act)
+reduce(v, act)
+    struct cparse_params *v;
+    long act;
 {
     VALUE code;
     v->ruleno = -act * 3;
-    code = rb_catch("racc_jump", reduce0, v->value_v);
+    code = rb_iterate(catch_iter, Qnil, 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)
+catch_iter(dummy)
+    VALUE dummy;
+{
+    return rb_funcall(rb_mKernel, id_catch, 1, sym_raccjump);
+}
+
+static VALUE
+reduce0(val, data, self)
+    VALUE val, data, self;
 {
     struct cparse_params *v;
     VALUE reduce_to, reduce_len, method_id;
     long len;
     ID mid;
-    VALUE tmp, tmp_t = Qundef, tmp_v = Qundef;
+    VALUE tmp, tmp_t, tmp_v;
     long i, k1, k2;
     VALUE goto_state;
 
@@ -740,7 +733,7 @@ reduce0(VALUE val, VALUE data, VALUE self)
 
     /* calculate transition state */
     if (RARRAY(v->state)->len == 0)
-        rb_raise(RaccBug, "state stack unexpectedly empty");
+        rb_raise(RaccBug, "state stack unexpected 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);
@@ -784,12 +777,13 @@ reduce0(VALUE val, VALUE data, VALUE self)
     goto transit;
 }
 
+
 /* -----------------------------------------------------------------------
                           Ruby Interface
 ----------------------------------------------------------------------- */
 
 void
-Init_cparse(void)
+Init_cparse()
 {
     VALUE Racc, Parser;
     ID id_racc = rb_intern("Racc");
@@ -807,7 +801,7 @@ Init_cparse(void)
     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 $"));
+        rb_str_new2("$raccId: cparse.c,v 1.3 2003/11/03 12:20:54 aamine Exp $"));
 
     CparseParams = rb_define_class_under(Racc, "CparseParams", rb_cObject);
 
@@ -817,7 +811,9 @@ Init_cparse(void)
     id_nexttoken    = rb_intern("next_token");
     id_onerror      = rb_intern("on_error");
     id_noreduce     = rb_intern("_reduce_none");
+    id_catch        = rb_intern("catch");
     id_errstatus    = rb_intern("@racc_error_status");
+    sym_raccjump    = id_to_value(rb_intern("racc_jump"));
 
     id_d_shift       = rb_intern("racc_shift");
     id_d_reduce      = rb_intern("racc_reduce");
diff --git a/ext/readline/MANIFEST b/ext/readline/MANIFEST
new file mode 100644
index 0000000000..4dd1d9e1a1
--- /dev/null
+++ b/ext/readline/MANIFEST
@@ -0,0 +1,6 @@
+MANIFEST
+README
+README.ja
+depend
+extconf.rb
+readline.c
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index b820c0b32f..b883de3e01 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -1,64 +1,27 @@
 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("ncurses", "tgetnum") or
+  have_library("termcap", "tgetnum") or
   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
+if have_header("readline/readline.h") and
+    have_header("readline/history.h") and
+    have_library("readline", "readline")
+  if have_func("rl_filename_completion_function")
+    $CFLAGS += " -DREADLINE_42_OR_LATER"
   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
+  if have_func("rl_cleanup_after_signal")
+    $CFLAGS += " -DREADLINE_40_OR_LATER"
   end
+  if try_link(<<EOF, $libs)
+#include <stdio.h>
+#include <readline/readline.h>
+main() {rl_completion_append_character = 1;}
+EOF
+    # this feature is implemented in readline-2.1 or later. 
+    $CFLAGS += " -DREADLINE_21_OR_LATER"
+  end
+  create_makefile("readline")
 end
-
-have_func("rl_filename_completion_function")
-have_func("rl_username_completion_function")
-have_func("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("replace_history_entry")
-have_func("remove_history")
-create_makefile("readline")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index c9acaadac9..cac0b1d11c 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1,23 +1,12 @@
 /* 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
@@ -30,44 +19,20 @@ static VALUE mReadline;
 
 #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
+#ifndef READLINE_42_OR_LATER
 # 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 char **readline_attempted_completion_function(const char *text,
-                                                     int start, int end);
-
-#ifdef HAVE_RL_EVENT_HOOK
-#ifdef DOSISH
-#define BUSY_WAIT 1
-#else
-#define BUSY_WAIT 0
-#endif
-
-static int readline_event(void);
 static int
 readline_event()
 {
-#if BUSY_WAIT
+    CHECK_INTS;
     rb_thread_schedule();
-#else
-    fd_set rset;
-
-    FD_ZERO(&rset);
-    FD_SET(fileno(rl_instream), &rset);
-    rb_thread_select(fileno(rl_instream) + 1, &rset, NULL, NULL, NULL);
     return 0;
-#endif
 }
-#endif
 
 static VALUE
 readline_readline(argc, argv, self)
@@ -79,33 +44,22 @@ readline_readline(argc, argv, self)
     char *prompt = NULL;
     char *buff;
     int status;
-    rb_io_t *ofp, *ifp;
 
-    rb_secure(4);
     if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
-	SafeStringValue(tmp);
-	prompt = RSTRING(tmp)->ptr;
+	prompt = StringValuePtr(tmp);
     }
 
     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
+#if defined READLINE_40_OR_LATER
         /* restore terminal mode and signal handler*/
         rl_cleanup_after_signal();
-#elif defined HAVE_RL_DEPREP_TERM_FUNCTION
+#elif defined READLINE_21_OR_LATER
         /* restore terminal mode */
-	if (rl_deprep_term_function != NULL) /* NULL in libedit. [ruby-dev:29116] */
-	    (*rl_deprep_term_function)();
-	else
+        (*rl_deprep_term_function)();
 #else
         rl_deprep_terminal();
 #endif
@@ -128,18 +82,16 @@ 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);
+	rb_raise(rb_eArgError, "argument have to respond to `call'");
+    return rb_iv_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);
+    return rb_iv_get(mReadline, COMPLETION_PROC);
 }
 
 static VALUE
@@ -147,21 +99,19 @@ readline_s_set_completion_case_fold(self, val)
     VALUE self;
     VALUE val;
 {
-    rb_secure(4);
-    return rb_ivar_set(mReadline, completion_case_fold, val);
+    return rb_iv_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);
+    return rb_iv_get(mReadline, COMPLETION_CASE_FOLD);
 }
 
 static char **
 readline_attempted_completion_function(text, start, end)
-    const char *text;
+    char *text;
     int start;
     int end;
 {
@@ -170,13 +120,11 @@ readline_attempted_completion_function(text, start, end)
     int case_fold;
     int i, matches;
 
-    proc = rb_attr_get(mReadline, completion_proc);
+    proc = rb_iv_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));
+    case_fold = RTEST(rb_iv_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);
@@ -192,9 +140,9 @@ readline_attempted_completion_function(text, start, end)
     result[matches + 1] = NULL;
 
     if (matches == 1) {
-        result[0] = strdup(result[1]);
-    }
-    else {
+	result[0] = result[1];
+	result[1] = NULL;
+    } else {
 	register int i = 1;
 	int low = 100000;
 
@@ -230,83 +178,62 @@ 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)) {
+#ifdef READLINE_21_OR_LATER
+    if (NIL_P(str) || !StringValuePtr(str) || !RSTRING(str)->len) {
 	rl_completion_append_character = '\0';
+    } else {
+	rl_completion_append_character = RSTRING(str)->ptr[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 */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_completion_append_character(self)
     VALUE self;
 {
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+#ifdef READLINE_21_OR_LATER
     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 */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_basic_word_break_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *basic_word_break_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (basic_word_break_characters == NULL) {
 	basic_word_break_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -318,37 +245,34 @@ readline_s_set_basic_word_break_characters(self, str)
 	    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 */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_basic_word_break_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_basic_word_break_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_basic_word_break_characters);
+    return rb_str_new2(rl_basic_word_break_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_WORD_BREAK_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_completer_word_break_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *completer_word_break_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (completer_word_break_characters == NULL) {
 	completer_word_break_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -360,37 +284,34 @@ readline_s_set_completer_word_break_characters(self, str)
 	    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 */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_completer_word_break_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_completer_word_break_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_completer_word_break_characters);
+    return rb_str_new2(rl_completer_word_break_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_basic_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *basic_quote_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (basic_quote_characters == NULL) {
 	basic_quote_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -406,34 +327,30 @@ readline_s_set_basic_quote_characters(self, str)
     return self;
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_basic_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_basic_quote_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_basic_quote_characters);
+    return rb_str_new2(rl_basic_quote_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_completer_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *completer_quote_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (completer_quote_characters == NULL) {
 	completer_quote_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -449,34 +366,30 @@ readline_s_set_completer_quote_characters(self, str)
     return self;
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_completer_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_completer_quote_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_completer_quote_characters);
+    return rb_str_new2(rl_completer_quote_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_filename_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *filename_quote_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (filename_quote_characters == NULL) {
 	filename_quote_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -492,23 +405,37 @@ readline_s_set_filename_quote_characters(self, str)
     return self;
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_filename_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_filename_quote_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_filename_quote_characters);
+    return rb_str_new2(rl_filename_quote_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
+}
+
+static VALUE
+rb_remove_history(index)
+    int index;
+{
+    HIST_ENTRY *entry;
+    VALUE val;
+
+    entry = remove_history(index);
+    if (entry) {
+        val = rb_tainted_str_new2(entry->line);
+        free(entry->line);
+        free(entry);
+        return val;
+    }
+    return Qnil;
 }
 
 static VALUE
@@ -523,19 +450,18 @@ hist_get(self, index)
     VALUE self;
     VALUE index;
 {
-    HIST_ENTRY *entry;
+    HISTORY_STATE *state;
     int i;
 
-    rb_secure(4);
+    state = history_get_history_state();
     i = NUM2INT(index);
     if (i < 0) {
-        i += history_length;
+        i += state->length;
     }
-    entry = history_get(history_base + i);
-    if (entry == NULL) {
-	rb_raise(rb_eIndexError, "invalid index");
+    if (i < 0 || i > state->length - 1) {
+	rb_raise(rb_eIndexError, "Invalid index");
     }
-    return rb_tainted_str_new2(entry->line);
+    return rb_tainted_str_new2(state->entries[i]->line);
 }
 
 static VALUE
@@ -544,25 +470,20 @@ hist_set(self, index, str)
     VALUE index;
     VALUE str;
 {
-#ifdef HAVE_REPLACE_HISTORY_ENTRY
-    HIST_ENTRY *entry;
+    HISTORY_STATE *state;
+    VALUE s = str;
     int i;
 
-    rb_secure(4);
+    state = history_get_history_state();
     i = NUM2INT(index);
-    SafeStringValue(str);
     if (i < 0) {
-        i += history_length;
+        i += state->length;
     }
-    entry = replace_history_entry(i, RSTRING(str)->ptr, NULL);
-    if (entry == NULL) {
-	rb_raise(rb_eIndexError, "invalid index");
+    if (i < 0 || i > state->length - 1) {
+	rb_raise(rb_eIndexError, "Invalid index");
     }
+    replace_history_entry(i, StringValuePtr(s), NULL);
     return str;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif
 }
 
 static VALUE
@@ -570,9 +491,7 @@ hist_push(self, str)
     VALUE self;
     VALUE str;
 {
-    rb_secure(4);
-    SafeStringValue(str);
-    add_history(RSTRING(str)->ptr);
+    add_history(StringValuePtr(str));
     return self;
 }
 
@@ -584,45 +503,22 @@ hist_push_method(argc, argv, self)
 {
     VALUE str;
     
-    rb_secure(4);
     while (argc--) {
 	str = *argv++;
-	SafeStringValue(str);
-	add_history(RSTRING(str)->ptr);
+	add_history(StringValuePtr(str));
     }
     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);
+    HISTORY_STATE *state;
+
+    state = history_get_history_state();
+    if (state->length > 0) {
+	return rb_remove_history(state->length - 1);
     } else {
 	return Qnil;
     }
@@ -632,8 +528,10 @@ static VALUE
 hist_shift(self)
     VALUE self;
 {
-    rb_secure(4);
-    if (history_length > 0) {
+    HISTORY_STATE *state;
+
+    state = history_get_history_state();
+    if (state->length > 0) {
 	return rb_remove_history(0);
     } else {
 	return Qnil;
@@ -644,15 +542,12 @@ static VALUE
 hist_each(self)
     VALUE self;
 {
-    HIST_ENTRY *entry;
+    HISTORY_STATE *state;
     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));
+    state = history_get_history_state();
+    for (i = 0; i < state->length; i++) {
+	rb_yield(rb_tainted_str_new2(state->entries[i]->line));
     }
     return self;
 }
@@ -661,16 +556,23 @@ static VALUE
 hist_length(self)
     VALUE self;
 {
-    rb_secure(4);
-    return INT2NUM(history_length);
+    HISTORY_STATE *state;
+
+    state = history_get_history_state();
+    return INT2NUM(state->length);
 }
 
 static VALUE
 hist_empty_p(self)
     VALUE self;
 {
-    rb_secure(4);
-    return history_length == 0 ? Qtrue : Qfalse;
+    HISTORY_STATE *state;
+
+    state = history_get_history_state();
+    if (state->length == 0)
+	return Qtrue;
+    else
+	return Qfalse;
 }
 
 static VALUE
@@ -678,14 +580,15 @@ hist_delete_at(self, index)
     VALUE self;
     VALUE index;
 {
+    HISTORY_STATE *state;
     int i;
 
-    rb_secure(4);
+    state = history_get_history_state();
     i = NUM2INT(index);
     if (i < 0)
-        i += history_length;
-    if (i < 0 || i > history_length - 1) {
-	rb_raise(rb_eIndexError, "invalid index");
+        i += state->length;
+    if (i < 0 || i > state->length - 1) {
+	rb_raise(rb_eIndexError, "Invalid index");
     }
     return rb_remove_history(i);
 }
@@ -754,9 +657,6 @@ Init_readline()
 
     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);
@@ -809,6 +709,7 @@ Init_readline()
     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);
@@ -822,18 +723,21 @@ Init_readline()
     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
+#if defined READLINE_21_OR_LATER
     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
+#if defined READLINE_42_OR_LATER
+    rl_attempted_completion_function
+	= (rl_completion_func_t *)readline_attempted_completion_function;
+    rl_event_hook = (rl_hook_func_t *)readline_event;
+#else
+    rl_attempted_completion_function
+	= (CPPFunction *) readline_attempted_completion_function;
     rl_event_hook = readline_event;
 #endif
-#ifdef HAVE_RL_CLEAR_SIGNALS
     rl_clear_signals();
-#endif
 }
diff --git a/ext/sdbm/MANIFEST b/ext/sdbm/MANIFEST
new file mode 100644
index 0000000000..6e1dc6bebd
--- /dev/null
+++ b/ext/sdbm/MANIFEST
@@ -0,0 +1,7 @@
+MANIFEST
+_sdbm.c
+depend
+extconf.rb
+init.c
+sdbm.h
+testsdbm.rb
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index 5b34824afc..d8bfae80b2 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -71,7 +71,7 @@ static int   duppair proto((char *, datum));
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef DOSISH
+#ifdef MSDOS
 #include <io.h>
 #endif
 #include <sys/types.h>
@@ -103,7 +103,7 @@ static int   duppair proto((char *, datum));
 /*
  * externals
  */
-#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
+#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__
 extern int errno;
 #endif
 
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index acadc9b26a..f473555840 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -31,15 +31,9 @@ closed_sdbm()
 
 #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;
@@ -62,21 +56,6 @@ fsdbm_close(obj)
     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)
@@ -159,7 +138,8 @@ fsdbm_fetch(obj, keystr, ifnone)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     value = sdbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (ifnone == Qnil && rb_block_given_p())
@@ -204,7 +184,8 @@ fsdbm_index(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
 	if (val.dsize == RSTRING(valstr)->len &&
@@ -246,19 +227,18 @@ fsdbm_select(argc, argv, obj)
         struct dbmdata *dbmp;
 
 	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
-        GetDBM2(obj, dbmp, dbm);
+        GetDBM(obj, dbmp);
+        dbm = dbmp->di_dbm;
+
         for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-            VALUE assoc, v;
+            VALUE assoc;
             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);
+            if (RTEST(rb_yield(assoc)))
+                rb_ary_push(new, assoc);
         }
     }
     else {
@@ -288,14 +268,6 @@ fsdbm_values_at(argc, argv, obj)
     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;
@@ -305,12 +277,13 @@ fsdbm_delete(obj, keystr)
     DBM *dbm;
     VALUE valstr;
 
-    fdbm_modify(obj);
+    rb_secure(4);
     StringValue(keystr);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
 
     value = sdbm_fetch(dbm, key);
@@ -341,8 +314,10 @@ fsdbm_shift(obj)
     DBM *dbm;
     VALUE keystr, valstr;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     key = sdbm_firstkey(dbm); 
     if (!key.dptr) return Qnil;
     val = sdbm_fetch(dbm, key);
@@ -367,8 +342,9 @@ fsdbm_delete_if(obj)
     VALUE ret, ary = rb_ary_new();
     int i, status = 0, n;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     n = dbmp->di_size;
     dbmp->di_size = -1;
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
@@ -378,12 +354,10 @@ fsdbm_delete_if(obj)
         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)) {
@@ -404,8 +378,9 @@ fsdbm_clear(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
     while (key = sdbm_firstkey(dbm), key.dptr) {
 	if (sdbm_delete(dbm, key)) {
@@ -427,7 +402,8 @@ fsdbm_invert(obj)
     VALUE keystr, valstr;
     VALUE hash = rb_hash_new();
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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);
@@ -490,18 +466,21 @@ fsdbm_store(obj, keystr, valstr)
 	return Qnil;
     }
 
-    fdbm_modify(obj);
-    StringValue(keystr);
-    StringValue(valstr);
+    rb_secure(4);
+    keystr = rb_obj_as_string(keystr);
 
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
+    if (NIL_P(valstr)) return fsdbm_delete(obj, keystr);
+
+    valstr = rb_obj_as_string(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     dbmp->di_size = -1;
+    dbm = dbmp->di_dbm;
     if (sdbm_store(dbm, key, val, DBM_REPLACE)) {
 #ifdef HAVE_DBM_CLAERERR
 	sdbm_clearerr(dbm);
@@ -522,8 +501,9 @@ fsdbm_length(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+    dbm = dbmp->di_dbm;
 
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	i++;
@@ -565,11 +545,11 @@ fsdbm_each_value(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
 }
@@ -582,10 +562,10 @@ fsdbm_each_key(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
 }
@@ -599,13 +579,14 @@ fsdbm_each_pair(obj)
     struct dbmdata *dbmp;
     VALUE keystr, valstr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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;
@@ -620,7 +601,9 @@ fsdbm_keys(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_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));
@@ -638,7 +621,9 @@ fsdbm_values(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
@@ -660,7 +645,8 @@ fsdbm_has_key(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     val = sdbm_fetch(dbm, key);
     if (val.dptr) return Qtrue;
     return Qfalse;
@@ -678,7 +664,8 @@ fsdbm_has_value(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
 	if (val.dsize == RSTRING(valstr)->len &&
@@ -697,7 +684,9 @@ fsdbm_to_a(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
@@ -717,7 +706,9 @@ fsdbm_to_hash(obj)
     DBM *dbm;
     VALUE hash;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     hash = rb_hash_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
@@ -747,7 +738,6 @@ Init_sdbm()
 
     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);
diff --git a/ext/sdbm/testsdbm.rb b/ext/sdbm/testsdbm.rb
new file mode 100644
index 0000000000..5a185fd5c4
--- /dev/null
+++ b/ext/sdbm/testsdbm.rb
@@ -0,0 +1,556 @@
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+if $".grep(/\bsdbm.so\b/).empty?
+  begin
+    require './sdbm'
+  rescue LoadError
+    require 'sdbm'
+  end
+end
+
+def uname_s
+  require 'rbconfig'
+  case Config::CONFIG['host_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['host_os']
+  end
+end
+
+SYSTEM = uname_s
+
+class TestSDBM < RUNIT::TestCase
+  def setup
+    @path = "tmptest_sdbm_"
+    assert_instance_of(SDBM, @sdbm = SDBM.new(@path))
+  end
+  def teardown
+    assert_nil(@sdbm.close)
+    GC.start
+    File.delete *Dir.glob("tmptest_sdbm*").to_a
+    p Dir.glob("tmptest_sdbm*") if $DEBUG
+  end
+
+  def check_size(expect, sdbm=@sdbm)
+    assert_equals(expect, sdbm.size)
+    n = 0
+    sdbm.each { n+=1 }
+    assert_equals(expect, n)
+    if expect == 0
+      assert_equals(true, sdbm.empty?)
+    else
+      assert_equals(false, sdbm.empty?)
+    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_equals(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_equals(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_exception(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
+
+    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
+    assert_instance_of(SDBM, sdbm = SDBM.open("tmptest_sdbm", 0))
+    assert_exception(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_exception(SDBMError) { sdbm.close }
+  end
+
+  def test_aref
+    assert_equals('bar', @sdbm['foo'] = 'bar')
+    assert_equals('bar', @sdbm['foo'])
+
+    assert_nil(@sdbm['bar'])
+  end
+
+  def test_fetch
+    assert_equals('bar', @sdbm['foo']='bar')
+    assert_equals('bar', @sdbm.fetch('foo'))
+
+    # key not found
+    assert_exception(IndexError) {
+      @sdbm.fetch('bar')
+    }
+
+    # test for `ifnone' arg
+    assert_equals('baz', @sdbm.fetch('bar', 'baz'))
+
+    # test for `ifnone' block
+    assert_equals('foobar', @sdbm.fetch('bar') {|key| 'foo' + key })
+  end
+
+  def test_aset
+    num = 0
+    2.times {|i|
+      assert_equals('foo', @sdbm['foo'] = 'foo')
+      assert_equals('foo', @sdbm['foo'])
+      assert_equals('bar', @sdbm['foo'] = 'bar')
+      assert_equals('bar', @sdbm['foo'])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+
+      # assign nil
+      assert_equals('', @sdbm['bar'] = '')
+      assert_equals('', @sdbm['bar'])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+
+      # empty string
+      assert_equals('', @sdbm[''] = '')
+      assert_equals('', @sdbm[''])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+
+      # Fixnum
+      assert_equals('200', @sdbm['100'] = '200')
+      assert_equals('200', @sdbm['100'])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+
+      # Big key and value
+      assert_equals('y' * 100, @sdbm['x' * 100] = 'y' * 100)
+      assert_equals('y' * 100, @sdbm['x' * 100])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+    }
+  end
+
+  def test_index
+    assert_equals('bar', @sdbm['foo'] = 'bar')
+    assert_equals('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_equals(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_equals(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_equals(k.upcase, v)
+      k != "bar"
+    }
+    assert_equals([['baz', 'BAZ'], ['foo', 'FOO']],
+		  ret.sort)
+  end
+
+  def test_length
+    num = 10
+    assert_equals(0, @sdbm.size)
+    num.times {|i|
+      i = i.to_s
+      @sdbm[i] = i
+    }
+    assert_equals(num, @sdbm.size)
+
+    @sdbm.shift
+
+    assert_equals(num - 1, @sdbm.size)
+  end
+
+  def test_empty?
+    assert_equals(true, @sdbm.empty?)
+    @sdbm['foo'] = 'FOO'
+    assert_equals(false, @sdbm.empty?)
+  end
+
+  def test_each_pair
+    n = 0
+    @sdbm.each_pair { n += 1 }
+    assert_equals(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_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@sdbm, ret)
+  end
+
+  def test_each_value
+    n = 0
+    @sdbm.each_value { n += 1 }
+    assert_equals(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_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@sdbm, ret)
+  end
+
+  def test_each_key
+    n = 0
+    @sdbm.each_key { n += 1 }
+    assert_equals(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_equals(@sdbm[key], values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@sdbm, ret)
+  end
+
+  def test_keys
+    assert_equals([], @sdbm.keys)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    assert_equals(keys.sort, @sdbm.keys.sort)
+    assert_equals(values.sort, @sdbm.values.sort)
+  end
+
+  def test_values
+    test_keys
+  end
+
+  def test_shift
+    assert_nil(@sdbm.shift)
+    assert_equals(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_equals(keys.size - ret_keys.size, @sdbm.size)
+    end
+
+    assert_equals(keys.sort, ret_keys.sort)
+    assert_equals(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_equals(0, @sdbm.size)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    assert_equals('BAR', @sdbm.delete(key))
+    assert_nil(@sdbm[key])
+    assert_equals(2, @sdbm.size)
+
+    assert_nil(@sdbm.delete(key))
+  end
+  def test_delete_with_block
+    key = 'no called block'
+    @sdbm[key] = 'foo'
+    assert_equals('foo', @sdbm.delete(key) {|k| k.replace 'called block'})
+    assert_equals('no called block', key)
+    assert_equals(0, @sdbm.size)
+
+    key = 'no called block'
+    assert_equals(:blockval,
+		  @sdbm.delete(key) {|k| k.replace 'called block'; :blockval})
+    assert_equals('called block', key)
+    assert_equals(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_equals(@sdbm, ret)
+    check_size(50, @sdbm)
+
+    ret = @sdbm.delete_if {|key, val| key.to_i >= 50}
+    assert_equals(@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_equals(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_equals(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_equals(100, @sdbm.size)
+
+    assert_equals(50, hash.size)
+    hash.each_pair {|key,val|
+      assert_equals(false, key.to_i < 50)
+      assert_equals(key, val)
+    }
+
+    hash = @sdbm.reject {|key, val| key.to_i < 100}
+    assert_instance_of(Hash, hash)
+    assert_equals(true, hash.empty?)
+  end
+
+  def test_clear
+    v = "1"
+    100.times {v = v.next; @sdbm[v] = v}
+
+    assert_equals(@sdbm, @sdbm.clear)
+
+    # validate SDBM#size
+    i = 0
+    @sdbm.each { i += 1 }
+    assert_equals(@sdbm.size, i)
+    assert_equals(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_equals(100, hash.size)
+    hash.each_pair {|key, val|
+      assert_equals(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_equals(101, @sdbm.size)
+    @sdbm.each_pair {|key, val|
+      assert_equals(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_equals(100, @sdbm.size)
+    @sdbm.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_haskey?
+    assert_equals('bar', @sdbm['foo']='bar')
+    assert_equals(true,  @sdbm.has_key?('foo'))
+    assert_equals(false, @sdbm.has_key?('bar'))
+  end
+
+  def test_has_value?
+    assert_equals('bar', @sdbm['foo']='bar')
+    assert_equals(true,  @sdbm.has_value?('bar'))
+    assert_equals(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_equals(100, ary.size)
+    ary.each {|key,val|
+      assert_equals(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_equals(100, hash.size)
+    hash.each {|key,val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+end
+
+if $0 == __FILE__
+  if ARGV.size == 0
+    suite = RUNIT::TestSuite.new
+    suite.add_test(TestSDBM.suite)
+  else
+    suite = RUNIT::TestSuite.new
+    ARGV.each do |testmethod|
+      suite.add_test(TestSDBM.new(testmethod))
+    end
+  end
+
+  RUNIT::CUI::TestRunner.run(suite)
+end
diff --git a/ext/socket/MANIFEST b/ext/socket/MANIFEST
new file mode 100644
index 0000000000..616d459d92
--- /dev/null
+++ b/ext/socket/MANIFEST
@@ -0,0 +1,8 @@
+MANIFEST
+addrinfo.h
+depend
+extconf.rb
+getaddrinfo.c
+getnameinfo.c
+sockport.h
+socket.c
diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h
index e93adafba6..a22615ee00 100644
--- a/ext/socket/addrinfo.h
+++ b/ext/socket/addrinfo.h
@@ -61,15 +61,10 @@
 #undef NI_NUMERICSERV
 #undef NI_DGRAM
 
-#undef addrinfo
 #define addrinfo addrinfo__compat
-#undef getaddrinfo
 #define getaddrinfo getaddrinfo__compat
-#undef getnameinfo
 #define getnameinfo getnameinfo__compat
-#undef freehostent
 #define freehostent freehostent__compat
-#undef freeaddrinfo
 #define freeaddrinfo freeaddrinfo__compat
 
 #ifndef __P
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 8a13ddba73..4f7b49407f 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -4,13 +4,11 @@ case RUBY_PLATFORM
 when /bccwin32/
   test_func = "WSACleanup"
   have_library("ws2_32", "WSACleanup")
+  have_func("closesocket")
 when /mswin32|mingw/
   test_func = "WSACleanup"
-  if with_config("winsock2")
-    have_library("ws2_32", "WSACleanup")
-  else
-    have_library("wsock32", "WSACleanup")
-  end
+  have_library("wsock32", "WSACleanup")
+  have_func("closesocket")
 when /cygwin/
   test_func = "socket"
 when /beos/
@@ -26,21 +24,10 @@ else
   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
+$ipv6 = false
 default_ipv6 = /cygwin/ !~ RUBY_PLATFORM
 if enable_config("ipv6", default_ipv6)
-  if checking_for("ipv6") {try_link(<<EOF)}
+  if try_link(<<EOF)
 #include <sys/types.h>
 #include <sys/socket.h>
 main()
@@ -48,67 +35,160 @@ main()
   socket(AF_INET6, SOCK_STREAM, 0);
 }
 EOF
-    $defs << "-DENABLE_IPV6" << "-DINET6"
-    ipv6 = true
+    $CFLAGS+=" -DENABLE_IPV6"
+    $ipv6 = true
   end
 end
 
-if ipv6
-  ipv6lib = nil
-  class << (fmt = "unknown")
-    def %(s) s || self end
+$ipv6type = nil
+$ipv6lib = nil
+$ipv6libdir = nil
+$ipv6trylibc = nil
+if $ipv6
+  if macro_defined?("IPV6_INRIA_VERSION", <<EOF)
+#include <netinet/in.h>
+EOF
+    $ipv6type = "inria"
+    $CFLAGS="-DINET6 "+$CFLAGS
+  elsif macro_defined?("__KAME__", <<EOF)
+#include <netinet/in.h>
+EOF
+    $ipv6type = "kame"
+    $ipv6lib="inet6"
+    $ipv6libdir="/usr/local/v6/lib"
+    $ipv6trylibc=true
+    $CFLAGS="-DINET6 "+$CFLAGS
+  elsif File.directory? "/usr/inet6"
+    $ipv6type = "linux"
+    $ipv6lib="inet6"
+    $ipv6libdir="/usr/inet6/lib"
+    $CFLAGS="-DINET6 -I/usr/inet6/include "+$CFLAGS
+  elsif macro_defined?("_TOSHIBA_INET6", <<EOF)
+#include <sys/param.h>
+EOF
+    $ipv6type = "toshiba"
+    $ipv6lib="inet6"
+    $ipv6libdir="/usr/local/v6/lib"
+    $CFLAGS="-DINET6 "+$CFLAGS
+  elsif macro_defined?("__V6D__", <<EOF)
+#include </usr/local/v6/include/sys/v6config.h>
+EOF
+    $ipv6type = "v6d"
+    $ipv6lib="v6"
+    $ipv6libdir="/usr/local/v6/lib"
+    $CFLAGS="-DINET6 -I/usr/local/v6/include "+$CFLAGS
+  elsif macro_defined?("_ZETA_MINAMI_INET6", <<EOF)
+#include <sys/param.h>
+EOF
+    $ipv6type = "zeta"
+    $ipv6lib="inet6"
+    $ipv6libdir="/usr/local/v6/lib"
+    $CFLAGS="-DINET6 "+$CFLAGS
+  else
+    $ipv6lib=with_config("ipv6-lib", nil)
+    $ipv6libdir=with_config("ipv6-libdir", nil)
+    $CFLAGS="-DINET6 "+$CFLAGS
   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
+  
+  if $ipv6lib
+    if File.directory? $ipv6libdir and File.exist? "#{$ipv6libdir}/lib#{$ipv6lib}.a"
+      $LOCAL_LIBS = " -L#$ipv6libdir -l#$ipv6lib"
+    elsif !$ipv6trylibc
+      print <<EOS
 
-Fatal: no #{ipv6lib} library found.  cannot continue.
-You need to fetch lib#{ipv6lib}.a from appropriate
+Fatal: no #$ipv6lib library found.  cannot continue.
+You need to fetch lib#{$ipv6lib}.a from appropriate
 ipv6 kit and compile beforehand.
 EOS
+      exit
+    end
+  end
 end
 
-if have_struct_member("struct sockaddr_in", "sin_len", headers)
-  $defs[-1] = "-DHAVE_SIN_LEN"
+  if try_link(<<EOF)
+#ifdef _WIN32
+# include <windows.h>
+# include <winsock.h>
+#else
+# include <sys/types.h>
+# include <netdb.h>
+# include <string.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+#endif
+int
+main()
+{
+   struct sockaddr_in sin;
+
+   sin.sin_len;
+   return 0;
+}
+EOF
+    $CFLAGS="-DHAVE_SIN_LEN "+$CFLAGS
 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
+  if try_link(<<EOF)
+#ifdef _WIN32
+# include <windows.h>
+# include <winsock.h>
+#else
+# include <sys/types.h>
+# include <netdb.h>
+# include <string.h>
+# include <sys/socket.h>
+#endif
+int
+main()
+{
+   struct sockaddr_storage ss;
+
+   ss.ss_family;
+   return 0;
+}
+EOF
+    $CFLAGS="-DHAVE_SOCKADDR_STORAGE "+$CFLAGS
+else      #   doug's fix, NOW add -Dss_family... only if required!
+$CPPFLAGS += " -Dss_family=__ss_family -Dss_len=__ss_len"
+  if try_link(<<EOF)
+#ifdef _WIN32
+# include <windows.h>
+# include <winsock.h>
+#else
+# include <sys/types.h>
+# include <netdb.h>
+# include <string.h>
+# include <sys/socket.h>
+#endif
+int
+main()
+{
+   struct sockaddr_storage ss;
+
+   ss.ss_family;
+   return 0;
+}
+EOF
+    $CFLAGS="-DHAVE_SOCKADDR_STORAGE "+$CFLAGS
+end
 end
 
-if have_struct_member("struct sockaddr", "sa_len", headers)
-  $defs[-1] = "-DHAVE_SA_LEN "
+  if try_link(<<EOF)
+#include <sys/types.h>
+#include <netdb.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+int
+main()
+{
+   struct sockaddr sa;
+
+   sa.sa_len;
+   return 0;
+}
+EOF
+    $CFLAGS="-DHAVE_SA_LEN "+$CFLAGS
 end
 
 have_header("netinet/tcp.h") if not /cygwin/ =~ RUBY_PLATFORM # for cygwin 1.1.5
@@ -119,17 +199,13 @@ if have_func("sendmsg") | have_func("recvmsg")
   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
+$getaddr_info_ok = false
+if !enable_config("wide-getaddrinfo", false) and try_run(<<EOF)
+#include <sys/types.h>
+#include <netdb.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 #ifndef AF_LOCAL
 #define AF_LOCAL AF_UNIX
@@ -153,17 +229,8 @@ main()
     }
     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 ||
+      if (ai->ai_addr == NULL ||
+          ai->ai_addrlen == 0 ||
           getnameinfo(ai->ai_addr, ai->ai_addrlen,
                       straddr, sizeof(straddr), strport, sizeof(strport),
                       NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
@@ -214,57 +281,103 @@ main()
 
   if (aitop)
     freeaddrinfo(aitop);
-  exit(EXIT_SUCCESS);
+  exit(0);
 
  bad:
   if (aitop)
     freeaddrinfo(aitop);
-  exit(EXIT_FAILURE);
+  exit(1);
 }
 EOF
+  $getaddr_info_ok = true
 end
-if ipv6 and not getaddr_info_ok
-  abort <<EOS
+if $ipv6 and not $getaddr_info_ok
+      print <<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
+  exit
 end
-
+      
 case with_config("lookup-order-hack", "UNSPEC")
 when "INET"
-  $defs << "-DLOOKUP_ORDER_HACK_INET"
+  $CFLAGS="-DLOOKUP_ORDER_HACK_INET "+$CFLAGS
 when "INET6"
-  $defs << "-DLOOKUP_ORDER_HACK_INET6"
+  $CFLAGS="-DLOOKUP_ORDER_HACK_INET6 "+$CFLAGS
 when "UNSPEC"
   # nothing special
 else
-  abort <<EOS
+  print <<EOS
 
 Fatal: invalid value for --with-lookup-order-hack (expected INET, INET6 or UNSPEC)
 EOS
+  exit
 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"
+    
+if $getaddr_info_ok and have_func("getaddrinfo", "netdb.h") and have_func("getnameinfo", "netdb.h")
+  have_getaddrinfo = true
+else
+  if try_link(<<EOF)
+#ifndef _WIN32
+#  include <sys/types.h>
+#  include <netdb.h>
+#  include <string.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#else
+#  include <windows.h>
+#  ifdef _WIN32_WCE
+#    include <winsock.h>
+#  else
+#    include <winsock.h>
+#  endif
+#endif
+int
+main()
+{
+   struct in6_addr addr;
+   unsigned char c;
+   c = addr.s6_addr8;
+   return 0;
+}
+EOF
+    $CFLAGS="-DHAVE_ADDR8 "+$CFLAGS
   end
-  $CPPFLAGS="-I. "+$CPPFLAGS
+end
+
+if have_getaddrinfo
+  $CFLAGS="-DHAVE_GETADDRINFO "+$CFLAGS
+else
+  $CFLAGS="-I. "+$CFLAGS
   $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/inet.h")
   have_header("arpa/nameser.h")
   have_header("resolv.h")
 end
 
-unless have_type("socklen_t", headers)
-  $defs << "-Dsocklen_t=int"
+if !try_link(<<EOF)
+#include <sys/types.h>
+#include <netdb.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+int
+main()
+{
+   socklen_t len;
+   return 0;
+}
+EOF
+  $CFLAGS="-Dsocklen_t=int "+$CFLAGS
 end
 
 have_header("sys/un.h")
@@ -273,15 +386,14 @@ 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"
+      $CFLAGS+=" -DSOCKS5 -DSOCKS"
     elsif have_library("socks", "Rconnect")
-      $defs << "-DSOCKS"
+      $CFLAGS+=" -DSOCKS"
     end
   end
   create_makefile("socket")
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 9fb4ebcb06..c05fbd57ba 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -40,7 +40,7 @@
 
 #include "config.h"
 #include <sys/types.h>
-#if !defined(_WIN32) && !defined(__VMS)
+#ifndef _WIN32
 #include <sys/param.h>
 #if defined(__BEOS__)
 # include <net/socket.h>
@@ -56,17 +56,9 @@
 #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>
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index 66f7e8818a..a75f233a81 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -35,7 +35,6 @@
  */
 
 #include "config.h"
-#include <stdio.h>
 #include <sys/types.h>
 #ifndef _WIN32
 #if defined(__BEOS__)
@@ -57,6 +56,7 @@
 #endif
 #ifdef _WIN32
 #include <winsock2.h>
+#include <stdio.h>
 #define snprintf _snprintf
 #endif
 
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 1dcc7160e9..8a1825d795 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -30,7 +30,6 @@
 # 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
@@ -42,9 +41,6 @@
 #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>
@@ -56,16 +52,10 @@
 #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
@@ -74,10 +64,6 @@
 #endif
 #include "sockport.h"
 
-#if defined(__vms)
-#include <tcp.h>
-#endif
-
 static int do_not_reverse_lookup = 0;
 
 VALUE rb_cBasicSocket;
@@ -176,64 +162,6 @@ ruby_getaddrinfo(nodename, servname, hints, res)
 #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
@@ -244,7 +172,7 @@ init_sock(sock, fd)
     VALUE sock;
     int fd;
 {
-    rb_io_t *fp;
+    OpenFile *fp;
 
     MakeOpenFile(sock, fp);
     fp->f = rb_fdopen(fd, "r");
@@ -259,7 +187,7 @@ static VALUE
 bsock_s_for_fd(klass, fd)
     VALUE klass, fd;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     VALUE sock = init_sock(rb_obj_alloc(klass), NUM2INT(fd));
 
     GetOpenFile(sock, fptr);
@@ -275,7 +203,7 @@ bsock_shutdown(argc, argv, sock)
 {
     VALUE howto;
     int how;
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't shutdown socket");
@@ -300,7 +228,7 @@ static VALUE
 bsock_close_read(sock)
     VALUE sock;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
@@ -319,7 +247,7 @@ static VALUE
 bsock_close_write(sock)
     VALUE sock;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
@@ -334,57 +262,12 @@ bsock_close_write(sock)
     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;
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int i;
     char *v;
     int vlen;
@@ -392,7 +275,6 @@ bsock_setsockopt(sock, lev, optname, val)
     rb_secure(2);
     level = NUM2INT(lev);
     option = NUM2INT(optname);
-
     switch (TYPE(val)) {
       case T_FIXNUM:
 	i = FIX2INT(val);
@@ -419,46 +301,6 @@ bsock_setsockopt(sock, lev, optname, val)
     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;
@@ -467,13 +309,12 @@ bsock_getsockopt(sock, lev, optname)
     int level, option;
     socklen_t len;
     char *buf;
-    rb_io_t *fptr;
+    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)
@@ -491,7 +332,7 @@ bsock_getsockname(sock)
 {
     char buf[1024];
     socklen_t len = sizeof buf;
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     GetOpenFile(sock, fptr);
     if (getsockname(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
@@ -505,7 +346,7 @@ bsock_getpeername(sock)
 {
     char buf[1024];
     socklen_t len = sizeof buf;
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     GetOpenFile(sock, fptr);
     if (getpeername(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
@@ -521,30 +362,26 @@ bsock_send(argc, argv, sock)
 {
     VALUE mesg, to;
     VALUE flags;
-    rb_io_t *fptr;
+    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);
+    StringValue(mesg);
   retry:
     if (!NIL_P(to)) {
-        TRAP_BEG;
+	StringValue(to);
 	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)) {
@@ -557,7 +394,7 @@ bsock_send(argc, argv, sock)
 
 static VALUE ipaddr _((struct sockaddr*));
 #ifdef HAVE_SYS_UN_H
-static VALUE unixaddr _((struct sockaddr_un*, socklen_t));
+static VALUE unixaddr _((struct sockaddr_un*));
 #endif
 
 enum sock_recv_type {
@@ -574,12 +411,11 @@ s_recvfrom(sock, argc, argv, from)
     VALUE *argv;
     enum sock_recv_type from;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     VALUE str;
     char buf[1024];
     socklen_t alen = sizeof buf;
     VALUE len, flg;
-    long buflen;
     long slen;
     int fd, flags;
 
@@ -587,7 +423,6 @@ s_recvfrom(sock, argc, argv, from)
 
     if (flg == Qnil) flags = 0;
     else             flags = NUM2INT(flg);
-    buflen = NUM2INT(len);
 
     GetOpenFile(sock, fptr);
     if (rb_read_pending(fptr->f)) {
@@ -595,15 +430,14 @@ s_recvfrom(sock, argc, argv, from)
     }
     fd = fileno(fptr->f);
 
-    str = rb_tainted_str_new(0, buflen);
+    slen = NUM2INT(len);
+    str = rb_tainted_str_new(0, slen);
 
   retry:
-    rb_str_locktmp(str);
     rb_thread_wait_fd(fd);
     TRAP_BEG;
-    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
+    slen = recvfrom(fd, RSTRING(str)->ptr, slen, flags, (struct sockaddr*)buf, &alen);
     TRAP_END;
-    rb_str_unlocktmp(str);
 
     if (slen < 0) {
 	if (rb_io_wait_readable(fd)) {
@@ -625,14 +459,10 @@ s_recvfrom(sock, argc, argv, from)
 	    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);
-
+	return rb_assoc_new(str, ipaddr((struct sockaddr*)buf));
 #ifdef HAVE_SYS_UN_H
       case RECV_UNIX:
-        return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf, alen));
+	return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf));
 #endif
       case RECV_SOCKET:
 	return rb_assoc_new(str, rb_str_new(buf, alen));
@@ -642,70 +472,6 @@ s_recvfrom(sock, argc, argv, from)
 }
 
 static VALUE
-s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
-{
-    rb_io_t *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;
@@ -714,52 +480,6 @@ bsock_recv(argc, argv, 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()
 {
@@ -904,8 +624,7 @@ sock_addrinfo(host, port, socktype, flags)
     VALUE host, port;
     int socktype, flags;
 {
-    struct addrinfo hints;
-    struct addrinfo* res = NULL;
+    struct addrinfo hints, *hintsp, *res;
     char *hostp, *portp;
     int error;
     char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
@@ -917,11 +636,13 @@ sock_addrinfo(host, port, socktype, flags)
        socktype = SOCK_DGRAM;
     }
 
+    hintsp = &hints;
     MEMZERO(&hints, struct addrinfo, 1);
-    hints.ai_family = AF_UNSPEC;
+    hints.ai_family = PF_UNSPEC;
+    hints.ai_protocol = 0;
     hints.ai_socktype = socktype;
     hints.ai_flags = flags;
-    error = getaddrinfo(hostp, portp, &hints, &res);
+    error = getaddrinfo(hostp, portp, hintsp, &res);
     if (error) {
 	if (hostp && hostp[strlen(hostp)-1] == '\n') {
 	    rb_raise(rb_eSocket, "newline at the end of hostname");
@@ -929,23 +650,6 @@ sock_addrinfo(host, port, socktype, flags)
 	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;
 }
 
@@ -984,13 +688,13 @@ ipaddr(sockaddr)
 	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);
+	if (error) {
+	    rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
 	}
+	addr1 = rb_str_new2(hbuf);
     }
     error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
 			pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
@@ -998,7 +702,7 @@ ipaddr(sockaddr)
 	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
     }
     addr2 = rb_str_new2(hbuf);
-    if (addr1 == Qnil) {
+    if (do_not_reverse_lookup) {
 	addr1 = addr2;
     }
     port = INT2FIX(atoi(pbuf));
@@ -1023,40 +727,15 @@ ruby_socket(domain, type, proto)
     return fd;
 }
 
-static int
-wait_connectable(fd)
+static void
+thread_write_select(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;
-	}
-    }
+    fd_set fds;
 
-    return 0;
+    FD_ZERO(&fds);
+    FD_SET(fd, &fds);
+    rb_thread_select(fd+1, 0, &fds, 0, 0);
 }
 
 #ifdef __CYGWIN__
@@ -1085,16 +764,11 @@ ruby_connect(fd, sockaddr, len, socks)
     int mode;
 #if WAIT_IN_PROGRESS > 0
     int wait_in_progress = -1;
-    int sockerr;
-    socklen_t sockerrlen;
+    int sockerr, 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
@@ -1143,11 +817,7 @@ ruby_connect(fd, sockaddr, len, socks)
 #if WAIT_IN_PROGRESS > 0
 		wait_in_progress = WAIT_IN_PROGRESS;
 #endif
-		status = wait_connectable(fd);
-		if (status) {
-		    break;
-		}
-		errno = 0;
+		thread_write_select(fd);
 		continue;
 
 #if WAIT_IN_PROGRESS > 0
@@ -1246,7 +916,7 @@ init_inetsock_internal(arg)
 	}
 	arg->fd = fd;
 	if (type == INET_SERVER) {
-#if !defined(_WIN32) && !defined(__CYGWIN__)
+#ifndef _WIN32
 	    status = 1;
 	    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
 		       (char*)&status, sizeof(status));
@@ -1306,14 +976,6 @@ init_inetsock(sock, remote_host, remote_serv, local_host, local_serv, type)
 		     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;
@@ -1350,7 +1012,7 @@ static VALUE
 socks_s_close(sock)
     VALUE sock;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
@@ -1363,43 +1025,39 @@ socks_s_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;
+make_hostent(addr, ipaddr)
+    struct addrinfo *addr;
+    VALUE (*ipaddr) _((struct sockaddr*, size_t));
 {
-    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));
+    rb_ary_push(ary, rb_str_new2(addr->ai_canonname));
+#if defined(HAVE_GETIPNODEBYNAME)
+    {
+	int error;
 
-    if (addr->ai_canonname && (h = gethostbyname(addr->ai_canonname))) {
+	h = getipnodebyname(addr->ai_canonname, addr->ai_family, AI_ALL, &error);
+    }
+#elif defined(HAVE_GETHOSTBYNAME2)
+    h = gethostbyname2(addr->ai_canonname, addr->ai_family);
+#else
+    h = gethostbyname(addr->ai_canonname);
+#endif
+    if (h) {
 	names = rb_ary_new();
 	if (h->h_aliases != NULL) {
 	    for (pch = h->h_aliases; *pch; pch++) {
 		rb_ary_push(names, rb_str_new2(*pch));
 	    }
 	}
+#if defined(HAVE_GETIPNODEBYNAME)
+	freehostent(h);
+#endif
     }
     else {
 	names = rb_ary_new2(0);
@@ -1407,33 +1065,12 @@ make_hostent_internal(arg)
     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));
-       }
+	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;
@@ -1447,7 +1084,7 @@ 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);
+    return make_hostent(sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), tcp_sockaddr);
 }
 
 static VALUE
@@ -1464,39 +1101,6 @@ tcp_svr_init(argc, argv, sock)
 	return init_inetsock(sock, Qnil, arg1, Qnil, Qnil, INET_SERVER);
 }
 
-static void
-make_fd_nonblock(int fd)
-{
-    int flags;
-#ifdef F_GETFL
-    flags = fcntl(fd, F_GETFL);
-    if (flags == -1) {
-        rb_sys_fail(0);
-    }
-#else
-    flags = 0;
-#endif
-    flags |= O_NONBLOCK;
-    if (fcntl(fd, F_SETFL, flags) == -1) {
-        rb_sys_fail(0);
-    }
-}
-
-static VALUE
-s_accept_nonblock(VALUE klass, rb_io_t *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)");
-    }
-    make_fd_nonblock(fd2);
-    return init_sock(rb_obj_alloc(klass), fd2);
-}
-
 static VALUE
 s_accept(klass, fd, sockaddr, len)
     VALUE klass;
@@ -1525,8 +1129,6 @@ s_accept(klass, fd, sockaddr, len)
 	    rb_gc();
 	    retry = 1;
 	    goto retry;
-	  case EWOULDBLOCK:
-	    break;
 	  default:
 	    if (!rb_io_wait_readable(fd)) break;
 	    retry = 0;
@@ -1542,7 +1144,7 @@ static VALUE
 tcp_accept(sock)
     VALUE sock;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct sockaddr_storage from;
     socklen_t fromlen;
 
@@ -1552,54 +1154,11 @@ tcp_accept(sock)
 		    (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::EWOULDBLOCK, 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;
-{
-    rb_io_t *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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct sockaddr_storage from;
     socklen_t fromlen;
 
@@ -1630,7 +1189,7 @@ init_unixsock(sock, path, server)
 {
     struct sockaddr_un sockaddr;
     int fd, status;
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     SafeStringValue(path);
     fd = ruby_socket(AF_UNIX, SOCK_STREAM, 0);
@@ -1640,11 +1199,8 @@ init_unixsock(sock, path, server)
 
     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));
+    strncpy(sockaddr.sun_path, RSTRING(path)->ptr, sizeof(sockaddr.sun_path)-1);
+    sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
 
     if (server) {
         status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
@@ -1670,9 +1226,7 @@ init_unixsock(sock, path, server)
 
     init_sock(sock, fd);
     GetOpenFile(sock, fptr);
-    if (server) {
-        fptr->path = strdup(RSTRING(path)->ptr);
-    }
+    fptr->path = strdup(RSTRING(path)->ptr);
 
     return sock;
 }
@@ -1682,7 +1236,7 @@ static VALUE
 ip_addr(sock)
     VALUE sock;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct sockaddr_storage addr;
     socklen_t len = sizeof addr;
 
@@ -1697,7 +1251,7 @@ static VALUE
 ip_peeraddr(sock)
     VALUE sock;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct sockaddr_storage addr;
     socklen_t len = sizeof addr;
 
@@ -1778,13 +1332,13 @@ static VALUE
 udp_connect(sock, host, port)
     VALUE sock, host, port;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct udp_arg arg;
     VALUE ret;
 
     rb_secure(3);
-    arg.res = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     GetOpenFile(sock, fptr);
+    arg.res = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     arg.fd = fileno(fptr->f);
     ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
 		    RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)arg.res);
@@ -1796,12 +1350,12 @@ static VALUE
 udp_bind(sock, host, port)
     VALUE sock, host, port;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct addrinfo *res0, *res;
 
     rb_secure(3);
-    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     GetOpenFile(sock, fptr);
+    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     for (res = res0; res; res = res->ai_next) {
 	if (bind(fileno(fptr->f), res->ai_addr, res->ai_addrlen) < 0) {
 	    continue;
@@ -1821,7 +1375,7 @@ udp_send(argc, argv, sock)
     VALUE sock;
 {
     VALUE mesg, flags, host, port;
-    rb_io_t *fptr;
+    OpenFile *fptr;
     FILE *f;
     int n;
     struct addrinfo *res0, *res;
@@ -1832,10 +1386,10 @@ udp_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);
+    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     f = GetWriteFile(fptr);
+    StringValue(mesg);
     for (res = res0; res; res = res->ai_next) {
       retry:
 	n = sendto(fileno(f), RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
@@ -1853,52 +1407,6 @@ udp_send(argc, argv, sock)
     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)
@@ -1907,20 +1415,11 @@ unix_init(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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     GetOpenFile(sock, fptr);
     if (fptr->path == 0) {
@@ -1928,7 +1427,7 @@ unix_path(sock)
 	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));
+	fptr->path = strdup(addr.sun_path);
     }
     return rb_str_new2(fptr->path);
 }
@@ -1949,38 +1448,26 @@ unix_recvfrom(argc, argv, 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)
+#if defined(HAVE_SENDMSG) && (defined(HAVE_ST_MSG_CONTROL) || defined(HAVE_ST_MSG_ACCRIGHTS))
     int fd;
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct msghdr msg;
     struct iovec vec[1];
     char buf[1];
 
-#if FD_PASSING_BY_MSG_CONTROL
+#if defined(HAVE_ST_MSG_CONTROL)
     struct {
 	struct cmsghdr hdr;
-        char pad[8+sizeof(int)+8];
+	int fd;
     } cmsg;
 #endif
 
     if (rb_obj_is_kind_of(val, rb_cIO)) {
-        rb_io_t *valfptr;
+        OpenFile *valfptr;
 	GetOpenFile(val, valfptr);
 	fd = fileno(valfptr->f);
     }
@@ -1988,7 +1475,7 @@ unix_send_io(sock, val)
         fd = FIX2INT(val);
     }
     else {
-	rb_raise(rb_eTypeError, "neither IO nor file descriptor");
+	rb_raise(rb_eTypeError, "IO nor file descriptor");
     }
 
     GetOpenFile(sock, fptr);
@@ -2003,15 +1490,14 @@ unix_send_io(sock, val)
     msg.msg_iov = vec;
     msg.msg_iovlen = 1;
 
-#if FD_PASSING_BY_MSG_CONTROL
+#if defined(HAVE_ST_MSG_CONTROL)
     msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = CMSG_LEN(sizeof(int));
+    msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
     msg.msg_flags = 0;
-    MEMZERO((char*)&cmsg, char, sizeof(cmsg));
-    cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
+    cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
     cmsg.hdr.cmsg_level = SOL_SOCKET;
     cmsg.hdr.cmsg_type = SCM_RIGHTS;
-    *(int *)CMSG_DATA(&cmsg.hdr) = fd;
+    cmsg.fd = fd;
 #else
     msg.msg_accrights = (caddr_t)&fd;
     msg.msg_accrightslen = sizeof(fd);
@@ -2027,7 +1513,7 @@ unix_send_io(sock, val)
 #endif
 }
 
-#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+#if defined(HAVE_RECVMSG) && (defined(HAVE_ST_MSG_CONTROL) || defined(HAVE_ST_MSG_ACCRIGHTS))
 static void
 thread_read_select(fd)
     int fd;
@@ -2046,18 +1532,18 @@ unix_recv_io(argc, argv, sock)
     VALUE *argv;
     VALUE sock;
 {
-#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+#if defined(HAVE_RECVMSG) && (defined(HAVE_ST_MSG_CONTROL) || defined(HAVE_ST_MSG_ACCRIGHTS))
     VALUE klass, mode;
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct msghdr msg;
     struct iovec vec[2];
     char buf[1];
 
     int fd;
-#if FD_PASSING_BY_MSG_CONTROL
+#if defined(HAVE_ST_MSG_CONTROL)
     struct {
 	struct cmsghdr hdr;
-        char pad[8+sizeof(int)+8];
+	int fd;
     } cmsg;
 #endif
 
@@ -2079,14 +1565,14 @@ unix_recv_io(argc, argv, sock)
     msg.msg_iov = vec;
     msg.msg_iovlen = 1;
 
-#if FD_PASSING_BY_MSG_CONTROL
+#if defined(HAVE_ST_MSG_CONTROL)
     msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = CMSG_SPACE(sizeof(int));
+    msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
     msg.msg_flags = 0;
-    cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
+    cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
     cmsg.hdr.cmsg_level = SOL_SOCKET;
     cmsg.hdr.cmsg_type = SCM_RIGHTS;
-    *(int *)CMSG_DATA(&cmsg.hdr) = -1;
+    cmsg.fd = -1;
 #else
     msg.msg_accrights = (caddr_t)&fd;
     msg.msg_accrightslen = sizeof(fd);
@@ -2096,37 +1582,21 @@ unix_recv_io(argc, argv, sock)
     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 expected)",
-          msg.msg_controllen, CMSG_SPACE(sizeof(int)));
-    }
-    if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (cmsg_len=%d, %d expected)",
-          cmsg.hdr.cmsg_len, CMSG_LEN(sizeof(int)));
-    }
-    if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (cmsg_level=%d, %d expected)",
-          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 expected)",
-          cmsg.hdr.cmsg_type, SCM_RIGHTS);
-    }
+    if (
+#if defined(HAVE_ST_MSG_CONTROL)
+	msg.msg_controllen != sizeof(struct cmsghdr) + sizeof(int) ||
+        cmsg.hdr.cmsg_len != sizeof(struct cmsghdr) + sizeof(int) ||
+	cmsg.hdr.cmsg_level != SOL_SOCKET ||
+	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));
-    }
+        msg.msg_accrightslen != sizeof(fd)
 #endif
+	) {
+	rb_raise(rb_eSocket, "File descriptor was not passed");
+    }
 
-#if FD_PASSING_BY_MSG_CONTROL
-    fd = *(int *)CMSG_DATA(&cmsg.hdr);
+#if defined(HAVE_ST_MSG_CONTROL)
+    fd = cmsg.fd;
 #endif
 
     if (klass == Qnil)
@@ -2152,7 +1622,7 @@ static VALUE
 unix_accept(sock)
     VALUE sock;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct sockaddr_un from;
     socklen_t fromlen;
 
@@ -2162,54 +1632,11 @@ unix_accept(sock)
 		    (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::EWOULDBLOCK, 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;
-{
-    rb_io_t *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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct sockaddr_un from;
     socklen_t fromlen;
 
@@ -2219,19 +1646,18 @@ unix_sysaccept(sock)
 }
 
 static VALUE
-unixaddr(sockaddr, len)
+unixaddr(sockaddr)
     struct sockaddr_un *sockaddr;
-    socklen_t len;
 {
     return rb_assoc_new(rb_str_new2("AF_UNIX"),
-                        rb_str_new2(unixpath(sockaddr, len)));
+			rb_str_new2(sockaddr->sun_path));
 }
 
 static VALUE
 unix_addr(sock)
     VALUE sock;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct sockaddr_un addr;
     socklen_t len = sizeof addr;
 
@@ -2239,22 +1665,26 @@ unix_addr(sock)
 
     if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
-    return unixaddr(&addr, len);
+    if (len == 0)
+        addr.sun_path[0] = '\0';
+    return unixaddr(&addr);
 }
 
 static VALUE
 unix_peeraddr(sock)
     VALUE sock;
 {
-    rb_io_t *fptr;
+    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);
+	rb_sys_fail("getsockname(2)");
+    if (len == 0)
+        addr.sun_path[0] = '\0';
+    return unixaddr(&addr);
 }
 #endif
 
@@ -2263,13 +1693,10 @@ 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);
+    if (TYPE(domain) == T_STRING) {
+	SafeStringValue(domain);
 	ptr = RSTRING(domain)->ptr;
 	if (strcmp(ptr, "AF_INET") == 0)
 	    *dv = AF_INET;
@@ -2312,15 +1739,13 @@ setup_domain_and_type(domain, dv, type, tv)
 	    *dv = PF_IPX;
 #endif
 	else
-	    rb_raise(rb_eSocket, "unknown socket domain %s", ptr);
+	    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);
+    if (TYPE(type) == T_STRING) {
+	SafeStringValue(type);
 	ptr = RSTRING(type)->ptr;
 	if (strcmp(ptr, "SOCK_STREAM") == 0)
 	    *tv = SOCK_STREAM;
@@ -2343,7 +1768,7 @@ setup_domain_and_type(domain, dv, type, tv)
 	    *tv = SOCK_PACKET;
 #endif
 	else
-	    rb_raise(rb_eSocket, "unknown socket type %s", ptr);
+	    rb_raise(rb_eSocket, "Unknown socket type %s", ptr);
     }
     else {
 	*tv = NUM2INT(type);
@@ -2369,18 +1794,16 @@ 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;
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(__EMX__) && !defined(__QNXNTO__)
+    int d, t, sp[2];
 
     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) {
+  again:
+    if (socketpair(d, t, NUM2INT(protocol), sp) < 0) {
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    goto again;
+	}
 	rb_sys_fail("socketpair(2)");
     }
 
@@ -2411,126 +1834,16 @@ unix_s_socketpair(argc, argv, klass)
 }
 #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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int fd;
 
     StringValue(addr);
-    addr = rb_str_new4(addr);
+    rb_str_modify(addr);
+
     GetOpenFile(sock, fptr);
     fd = fileno(fptr->f);
     if (ruby_connect(fd, (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len, 0) < 0) {
@@ -2540,149 +1853,15 @@ sock_connect(sock, addr)
     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;
-{
-    rb_io_t *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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     StringValue(addr);
+    rb_str_modify(addr);
+
     GetOpenFile(sock, fptr);
     if (bind(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len) < 0)
 	rb_sys_fail("bind(2)");
@@ -2690,197 +1869,20 @@ sock_bind(sock, addr)
     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;
 {
-    rb_io_t *fptr;
-    int backlog;
+    OpenFile *fptr;
 
     rb_secure(4);
-    backlog = NUM2INT(log);
     GetOpenFile(sock, fptr);
-    if (listen(fileno(fptr->f), backlog) < 0)
+    if (listen(fileno(fptr->f), NUM2INT(log)) < 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;
@@ -2890,157 +1892,11 @@ sock_recvfrom(argc, argv, 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, Errno::EWOULDBLOCK
- * 	  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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     VALUE sock2;
     char buf[1024];
     socklen_t len = sizeof buf;
@@ -3051,112 +1907,11 @@ sock_accept(sock)
     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::EWOULDBLOCK, 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;
-{
-    rb_io_t *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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     VALUE sock2;
     char buf[1024];
     socklen_t len = sizeof buf;
@@ -3227,134 +1982,20 @@ make_addrinfo(res0)
     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);
+    return rb_str_new((char*)addr, 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);
+    return make_hostent(sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
 }
 
 static VALUE
@@ -3379,7 +2020,7 @@ sock_s_gethostbyaddr(argc, argv)
 	t = AF_INET6;
     }
 #endif
-    h = gethostbyaddr(RSTRING(addr)->ptr, RSTRING(addr)->len, t);
+    h = gethostbyaddr((char*)RSTRING(addr)->ptr, RSTRING(addr)->len, t);
     if (h == NULL) {
 #ifdef HAVE_HSTRERROR
 	extern int h_errno;
@@ -3409,33 +2050,22 @@ sock_s_gethostbyaddr(argc, argv)
     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;
+    VALUE service, protocol;
+    char *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);
+    rb_scan_args(argc, argv, "11", &service, &protocol);
+    if (NIL_P(protocol)) proto = "tcp";
+    else proto = StringValuePtr(protocol);
 
-    sp = getservbyname(StringValueCStr(service),  StringValueCStr(proto));
+    StringValue(service);
+    sp = getservbyname((char*)RSTRING(service)->ptr, proto);
     if (sp) {
 	port = ntohs(sp->s_port);
     }
@@ -3445,126 +2075,12 @@ sock_s_getservbyaname(argc, argv)
 
 	port = strtoul(s, &end, 0);
 	if (*end != '\0') {
-	    rb_raise(rb_eSocket, "no such service %s/%s", s, RSTRING(proto)->ptr);
+	    rb_raise(rb_eSocket, "no such service %s/%s", s, proto);
 	}
     }
     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;
@@ -3641,7 +2157,7 @@ sock_s_getnameinfo(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags, tmp;
+    VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags;
     char *hptr, *pptr;
     char hbuf[1024], pbuf[1024];
     int fl;
@@ -3658,9 +2174,7 @@ sock_s_getnameinfo(argc, argv)
     if (!NIL_P(flags)) {
 	fl = NUM2INT(flags);
     }
-    tmp = rb_check_string_type(sa);
-    if (!NIL_P(tmp)) {
-	sa = tmp;
+    if (TYPE(sa) == T_STRING) {
 	if (sizeof(ss) < RSTRING(sa)->len) {
 	    rb_raise(rb_eTypeError, "sockaddr length too big");
 	}
@@ -3669,11 +2183,8 @@ sock_s_getnameinfo(argc, argv)
 	    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;
+    else if (TYPE(sa) == T_ARRAY) {
 	MEMZERO(&hints, struct addrinfo, 1);
 	if (RARRAY(sa)->len == 3) {
 	    af = RARRAY(sa)->ptr[0];
@@ -3692,9 +2203,7 @@ sock_s_getnameinfo(argc, argv)
 		 * 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 {
@@ -3750,7 +2259,6 @@ sock_s_getnameinfo(argc, argv)
 	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;
@@ -3802,17 +2310,6 @@ sock_s_unpack_sockaddr_in(self, addr)
     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);
@@ -3824,17 +2321,11 @@ 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);
+    strncpy(sockaddr.sun_path, StringValuePtr(path), sizeof(sockaddr.sun_path)-1);
     addr = rb_str_new((char*)&sockaddr, sizeof(sockaddr));
     OBJ_INFECT(addr, path);
 
@@ -3846,24 +2337,15 @@ 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",
+    if (RSTRING(addr)->len != sizeof(struct sockaddr_un)) {
+	rb_raise(rb_eTypeError, "sockaddr_un size differs - %ld required; %d given",
 		 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);
+    /* xxx: should I check against sun_path size? */
+    path = rb_str_new2(sockaddr->sun_path);
     OBJ_INFECT(path, addr);
     return path;
 }
@@ -3880,31 +2362,6 @@ sock_define_const(name, 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()
 {
@@ -3928,7 +2385,6 @@ Init_socket()
     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);
@@ -3954,7 +2410,6 @@ Init_socket()
     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);
@@ -3965,7 +2420,6 @@ Init_socket()
     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);
@@ -3984,7 +2438,6 @@ Init_socket()
     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
@@ -3993,15 +2446,12 @@ Init_socket()
 
     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);
@@ -4067,195 +2517,6 @@ Init_socket()
 #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
@@ -4264,42 +2525,6 @@ Init_socket()
 #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
@@ -4484,9 +2709,6 @@ Init_socket()
     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
@@ -4538,33 +2760,6 @@ Init_socket()
 #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);
diff --git a/ext/stringio/MANIFEST b/ext/stringio/MANIFEST
new file mode 100644
index 0000000000..4f3a7dc6d0
--- /dev/null
+++ b/ext/stringio/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+README
+stringio.c
+depend
diff --git a/ext/stringio/extconf.rb b/ext/stringio/extconf.rb
deleted file mode 100644
index 8fc84b3735..0000000000
--- a/ext/stringio/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('stringio')
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 537fc19a4e..8d3275b2b8 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -14,14 +14,9 @@
 
 #include "ruby.h"
 #include "rubyio.h"
-#include "re.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
+#define STRIO_APPEND 4
+#define STRIO_EOF 8
 
 struct StringIO {
     VALUE string;
@@ -79,7 +74,7 @@ check_strio(self)
 {
     Check_Type(self, T_DATA);
     if (!IS_STRIO(self)) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected StringIO)",
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected String::IO)",
 		 rb_class2name(CLASS_OF(self)));
     }
     return DATA_PTR(self);
@@ -99,9 +94,9 @@ get_strio(self)
 
 #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)
+#define CLOSED(ptr) NIL_P((ptr)->string)
+#define READABLE(ptr) (!CLOSED(ptr) && ((ptr)->flags & FMODE_READABLE))
+#define WRITABLE(ptr) (!CLOSED(ptr) && ((ptr)->flags & FMODE_WRITABLE))
 
 static struct StringIO*
 readable(ptr)
@@ -137,7 +132,6 @@ check_modifiable(ptr)
 
 static VALUE strio_s_allocate _((VALUE));
 static VALUE strio_s_open _((int, VALUE *, VALUE));
-static void strio_init _((int, VALUE *, struct StringIO *));
 static VALUE strio_initialize _((int, VALUE *, VALUE));
 static VALUE strio_finalize _((VALUE));
 static VALUE strio_self _((VALUE));
@@ -163,7 +157,6 @@ 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_each_char _((VALUE));
 static VALUE strio_getc _((VALUE));
 static VALUE strio_ungetc _((VALUE, VALUE));
 static VALUE strio_readchar _((VALUE));
@@ -190,13 +183,6 @@ strio_s_allocate(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;
@@ -208,11 +194,6 @@ strio_s_open(argc, argv, klass)
     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;
@@ -220,43 +201,30 @@ strio_initialize(argc, argv, self)
     VALUE self;
 {
     struct StringIO *ptr = check_strio(self);
+    VALUE string, mode;
+    const char* m;
 
     if (!ptr) {
 	DATA_PTR(self) = ptr = strio_alloc();
     }
     rb_call_super(0, 0);
-    strio_init(argc, argv, ptr);
-    return self;
-}
-
-static void
-strio_init(argc, argv, ptr)
-    int argc;
-    VALUE *argv;
-    struct StringIO *ptr;
-{
-    VALUE string, mode;
-    int trunc = Qfalse;
-
     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(mode);
 	StringValue(string);
+	if (!(m = RSTRING(mode)->ptr)) m = "";
+	ptr->flags = rb_io_mode_flags(m);
 	if ((ptr->flags & FMODE_WRITABLE) && OBJ_FROZEN(string)) {
 	    errno = EACCES;
 	    rb_sys_fail(0);
 	}
-	if (trunc) {
+	switch (*m) {
+	  case 'a':
+	    ptr->flags |= STRIO_APPEND;
+	    break;
+	  case 'w':
 	    rb_str_resize(string, 0);
+	    break;
 	}
 	break;
       case 1:
@@ -269,6 +237,7 @@ strio_init(argc, argv, ptr)
 	break;
     }
     ptr->string = string;
+    return self;
 }
 
 static VALUE
@@ -281,9 +250,6 @@ strio_finalize(self)
     return self;
 }
 
-/*
- * Returns +false+.  Just for compatibility to IO.
- */
 static VALUE
 strio_false(self)
     VALUE self;
@@ -292,9 +258,6 @@ strio_false(self)
     return Qfalse;
 }
 
-/*
- * Returns +nil+.  Just for compatibility to IO.
- */
 static VALUE
 strio_nil(self)
     VALUE self;
@@ -303,9 +266,6 @@ strio_nil(self)
     return Qnil;
 }
 
-/*
- * Returns *strio* itself.  Just for compatibility to IO.
- */
 static VALUE
 strio_self(self)
     VALUE self;
@@ -314,9 +274,6 @@ strio_self(self)
     return self;
 }
 
-/*
- * Returns 0.  Just for compatibility to IO.
- */
 static VALUE
 strio_0(self)
     VALUE self;
@@ -325,9 +282,6 @@ strio_0(self)
     return INT2FIX(0);
 }
 
-/*
- * Returns the argument unchanged.  Just for compatibility to IO.
- */
 static VALUE
 strio_first(self, arg)
     VALUE self, arg;
@@ -336,9 +290,6 @@ strio_first(self, arg)
     return arg;
 }
 
-/*
- * Raises NotImplementedError.
- */
 static VALUE
 strio_unimpl(argc, argv, self)
     int argc;
@@ -350,11 +301,6 @@ strio_unimpl(argc, argv, self)
     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;
@@ -362,12 +308,6 @@ strio_get_string(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;
@@ -376,20 +316,15 @@ strio_set_string(self, string)
 
     if (!OBJ_TAINTED(self)) rb_secure(4);
     ptr->flags &= ~FMODE_READWRITE;
-    StringValue(string);
-    ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
+    if (!NIL_P(string)) {
+	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;
@@ -398,17 +333,11 @@ strio_close(self)
     if (CLOSED(ptr)) {
 	rb_raise(rb_eIOError, "closed stream");
     }
+    ptr->string = Qnil;
     ptr->flags &= ~FMODE_READWRITE;
-    return Qnil;
+    return self;
 }
 
-/*
- * 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;
@@ -417,17 +346,12 @@ strio_close_read(self)
     if (!READABLE(ptr)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
     }
-    ptr->flags &= ~FMODE_READABLE;
-    return Qnil;
+    if (!((ptr->flags &= ~FMODE_READABLE) & FMODE_READWRITE)) {
+	ptr->string = Qnil;
+    }
+    return self;
 }
 
-/*
- * 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;
@@ -436,16 +360,12 @@ strio_close_write(self)
     if (!WRITABLE(ptr)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
     }
-    ptr->flags &= ~FMODE_WRITABLE;
-    return Qnil;
+    if (!((ptr->flags &= ~FMODE_WRITABLE) & FMODE_READWRITE)) {
+	ptr->string = Qnil;
+    }
+    return self;
 }
 
-/*
- * call-seq:
- *   strio.closed?    -> true or false
- *
- * Returns +true+ if *strio* is completely closed, +false+ otherwise.
- */
 static VALUE
 strio_closed(self)
     VALUE self;
@@ -455,12 +375,6 @@ strio_closed(self)
     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;
@@ -470,12 +384,6 @@ strio_closed_read(self)
     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;
@@ -485,14 +393,6 @@ strio_closed_write(self)
     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;
@@ -502,7 +402,6 @@ strio_eof(self)
     return Qtrue;
 }
 
-/* :nodoc: */
 static VALUE
 strio_copy(copy, orig)
     VALUE copy, orig;
@@ -521,16 +420,6 @@ strio_copy(copy, orig)
     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;
@@ -538,13 +427,6 @@ strio_get_lineno(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;
@@ -553,26 +435,14 @@ strio_set_lineno(self, 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;
@@ -583,17 +453,9 @@ strio_reopen(argc, argv, self)
     if (argc == 1 && TYPE(*argv) != T_STRING) {
 	return strio_copy(self, *argv);
     }
-    strio_init(argc, argv, StringIO(self));
-    return self;
+    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;
@@ -601,12 +463,6 @@ strio_get_pos(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;
@@ -618,17 +474,9 @@ strio_set_pos(self, pos)
 	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;
@@ -640,13 +488,6 @@ strio_rewind(self)
     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;
@@ -659,9 +500,6 @@ strio_seek(argc, argv, self)
 
     rb_scan_args(argc, argv, "11", NULL, &whence);
     offset = NUM2LONG(argv[0]);
-    if (CLOSED(ptr)) {
-	rb_raise(rb_eIOError, "closed stream");
-    }
     switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
       case 0:
 	break;
@@ -672,7 +510,7 @@ strio_seek(argc, argv, self)
 	offset += RSTRING(ptr->string)->len;
 	break;
       default:
-	error_inval("invalid whence");
+	rb_raise(rb_eArgError, "invalid whence %ld", NUM2LONG(whence));
     }
     if (offset < 0) {
 	error_inval(0);
@@ -682,12 +520,6 @@ strio_seek(argc, argv, self)
     return INT2FIX(0);
 }
 
-/*
- * call-seq:
- *   strio.sync    -> true
- *
- * Returns +true+ always.
- */
 static VALUE
 strio_get_sync(self)
     VALUE self;
@@ -696,38 +528,22 @@ strio_get_sync(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));
-
-    RETURN_ENUMERATOR(self, 0, 0);
-
-    while (ptr->pos < RSTRING_LEN(ptr->string)) {
-	char c = RSTRING_PTR(ptr->string)[ptr->pos++];
+    while (ptr->pos < RSTRING(ptr->string)->len) {
+	char c = RSTRING(ptr->string)->ptr[ptr->pos++];
 	rb_yield(CHR2FIX(c));
     }
-    return self;
+    return Qnil;
 }
 
-/*
- * call-seq:
- *   strio.getc   -> fixnum or nil
- *
- * See IO#getc.
- */
 static VALUE
 strio_getc(self)
     VALUE self;
@@ -742,35 +558,6 @@ strio_getc(self)
     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;
@@ -780,11 +567,18 @@ strio_ungetc(self, 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] !=
+	if ((len = RSTRING(ptr->string)->len) < pos ||
+	    (unsigned char)RSTRING(ptr->string)->ptr[pos - 1] !=
 	    (unsigned char)cc) {
-	    strio_extend(ptr, pos, 1);
-	    RSTRING(ptr->string)->ptr[pos] = cc;
+	    check_modifiable(ptr);
+	    if (len < pos) {
+		rb_str_resize(ptr->string, pos);
+		MEMZERO(RSTRING(ptr->string)->ptr + len, char, pos - len - 1);
+	    }
+	    else {
+		rb_str_modify(ptr->string);
+	    }
+	    RSTRING(ptr->string)->ptr[pos - 1] = cc;
 	    OBJ_INFECT(ptr->string, self);
 	}
 	--ptr->pos;
@@ -793,12 +587,6 @@ strio_ungetc(self, ch)
     return Qnil;
 }
 
-/*
- * call-seq:
- *   strio.readchar   -> fixnum
- *
- * See IO#readchar.
- */
 static VALUE
 strio_readchar(self)
     VALUE self;
@@ -808,41 +596,6 @@ strio_readchar(self)
     return c;
 }
 
-/*
- * call-seq:
- *   strio.each_char {|char| block }  -> strio
- *
- * See IO#each_char.
- */
-static VALUE
-strio_each_char(self)
-    VALUE self;
-{
-    struct StringIO *sio;
-    VALUE str;
-    const char *ptr;
-    size_t len;
-
-    RETURN_ENUMERATOR(self, 0, 0);
-
-    sio = readable(StringIO(self));
-    str = sio->string;
-    ptr = RSTRING_PTR(str);
-    len = RSTRING_LEN(str);
-
-    while (sio->pos < len) {
-	int pos = sio->pos;
-	char c = ptr[pos];
-        int n = mbclen(c);
-
-	if (len < pos + n) n = len - pos;
-
-	sio->pos += n;
-        rb_yield(rb_str_substr(str, pos, n));
-    }
-    return self;
-}
-
 static void
 bm_init_skip(skip, pat, m)
      long *skip;
@@ -920,7 +673,8 @@ strio_getline(argc, argv, ptr)
 	    }
 	}
 	s = p;
-	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
+	while (p = memchr(p, '\n', e - p)) {
+	    if (p == e) break;
 	    if (*++p == '\n') {
 		e = p;
 		break;
@@ -929,7 +683,7 @@ strio_getline(argc, argv, ptr)
 	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) {
+	if (p = memchr(s, RSTRING(str)->ptr[0], e - s)) {
 	    e = p + 1;
 	}
 	str = rb_str_substr(ptr->string, ptr->pos, e - s);
@@ -960,12 +714,6 @@ strio_getline(argc, argv, ptr)
     return str;
 }
 
-/*
- * call-seq:
- *   strio.gets(sep_string=$/)   -> string or nil
- *
- * See IO#gets.
- */
 static VALUE
 strio_gets(argc, argv, self)
     int argc;
@@ -978,30 +726,17 @@ strio_gets(argc, argv, self)
     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_gets(argc, argv, 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;
@@ -1011,20 +746,12 @@ strio_each(argc, argv, self)
     struct StringIO *ptr = StringIO(self);
     VALUE line;
 
-    RETURN_ENUMERATOR(self, argc, argv);
-
     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;
@@ -1039,37 +766,31 @@ strio_readlines(argc, argv, self)
     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;
+    long len;
 
     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->flags & STRIO_APPEND) {
+	ptr->pos = RSTRING(ptr->string)->len;
     }
-    if (ptr->pos == olen) {
+    if (ptr->pos == RSTRING(ptr->string)->len) {
 	rb_str_cat(ptr->string, RSTRING(str)->ptr, len);
     }
     else {
-	strio_extend(ptr, ptr->pos, len);
+	if (ptr->pos + len > RSTRING(ptr->string)->len) {
+	    rb_str_resize(ptr->string, ptr->pos + len);
+	}
+	else {
+	    rb_str_modify(ptr->string);
+	}
 	rb_str_update(ptr->string, ptr->pos, len, str);
     }
     OBJ_INFECT(ptr->string, self);
@@ -1077,70 +798,36 @@ strio_write(self, str)
     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;
+    if (ptr->flags & STRIO_APPEND) {
+	ptr->pos = RSTRING(ptr->string)->len;
+    }
+    if (ptr->pos >= RSTRING(ptr->string)->len) {
+	rb_str_resize(ptr->string, ptr->pos + 1);
+    }
+    else {
+	rb_str_modify(ptr->string);
     }
-    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;
@@ -1192,7 +879,7 @@ strio_read(argc, argv, self)
 	}
 	break;
       default:
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	rb_raise(rb_eArgError, "wrong number arguments (%d for 0)", argc);
     }
     if (NIL_P(str)) {
 	str = rb_str_substr(ptr->string, ptr->pos, len);
@@ -1201,7 +888,7 @@ strio_read(argc, argv, self)
 	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);
+	MEMCPY(RSTRING(str)->ptr, RSTRING(ptr->string)->ptr, char, len);
     }
     if (NIL_P(str)) {
 	if (!(ptr->flags & STRIO_EOF)) str = rb_str_new(0, 0);
@@ -1214,13 +901,6 @@ strio_read(argc, argv, self)
     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;
@@ -1228,7 +908,7 @@ strio_sysread(argc, argv, self)
     VALUE self;
 {
     VALUE val = strio_read(argc, argv, self);
-    if (NIL_P(val) || RSTRING(val)->len == 0) {
+    if (NIL_P(val)) {
 	rb_eof_error();
     }
     return val;
@@ -1236,29 +916,14 @@ strio_sysread(argc, argv, self)
 
 #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;
@@ -1270,33 +935,19 @@ strio_size(self)
     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()
 {
@@ -1336,17 +987,11 @@ Init_stringio()
     rb_define_method(StringIO, "path", strio_path, 0);
 
     rb_define_method(StringIO, "each", strio_each, -1);
-    rb_define_method(StringIO, "each_line", strio_each, -1);
-    rb_define_method(StringIO, "lines", strio_each, -1);
     rb_define_method(StringIO, "each_byte", strio_each_byte, 0);
-    rb_define_method(StringIO, "bytes", strio_each_byte, 0);
-    rb_define_method(StringIO, "each_char", strio_each_char, 0);
-    rb_define_method(StringIO, "chars", strio_each_char, 0);
+    rb_define_method(StringIO, "each_line", strio_each, -1);
     rb_define_method(StringIO, "getc", strio_getc, 0);
-    rb_define_method(StringIO, "getbyte", strio_getc, 0);
     rb_define_method(StringIO, "ungetc", strio_ungetc, 1);
     rb_define_method(StringIO, "readchar", strio_readchar, 0);
-    rb_define_method(StringIO, "readbyte", 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);
diff --git a/ext/strscan/MANIFEST b/ext/strscan/MANIFEST
new file mode 100644
index 0000000000..5fdf598f2c
--- /dev/null
+++ b/ext/strscan/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+strscan.c
+extconf.rb
+depend
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index b5ee20282c..590f729e9f 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -1,15 +1,26 @@
 /*
-    $Id$
 
-    Copyright (c) 1999-2006 Minero Aoki
+    strscan.c
+
+    Copyright (c) 1999-2003 Minero Aoki <aamine@loveruby.net>
 
     This program is free software.
     You can distribute/modify this program under the terms of
     the Ruby License. For details, see the file COPYING.
+
+    $Id$
+
 */
 
+
 #include "ruby.h"
 #include "re.h"
+#include "version.h"
+
+#if (RUBY_VERSION_CODE < 150)
+#  define rb_eRangeError rb_eArgError
+#  define rb_obj_freeze(obj) rb_str_freeze(obj)
+#endif
 
 #define STRSCAN_VERSION "0.7.0"
 
@@ -62,16 +73,13 @@ 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));
@@ -93,13 +101,10 @@ static VALUE strscan_search_full _((VALUE self, VALUE re,
 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));
@@ -119,14 +124,18 @@ static VALUE inspect2 _((struct strscanner *p));
    ======================================================================= */
 
 static VALUE
-infect(VALUE str, struct strscanner *p)
+infect(str, p)
+    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)
+extract_range(p, beg_i, end_i)
+    struct strscanner *p;
+    long beg_i, end_i;
 {
     if (beg_i > S_LEN(p)) return Qnil;
     if (end_i > S_LEN(p))
@@ -135,7 +144,9 @@ extract_range(struct strscanner *p, long beg_i, long end_i)
 }
 
 static VALUE
-extract_beg_len(struct strscanner *p, long beg_i, long len)
+extract_beg_len(p, beg_i, len)
+    struct strscanner *p;
+    long beg_i, len;
 {
     if (beg_i > S_LEN(p)) return Qnil;
     if (beg_i + len > S_LEN(p))
@@ -143,25 +154,31 @@ extract_beg_len(struct strscanner *p, long beg_i, long len)
     return infect(rb_str_new(S_PBEG(p) + beg_i, len), p);
 }
 
+
 /* =======================================================================
                                Constructor
    ======================================================================= */
 
+
 static void
-strscan_mark(struct strscanner *p)
+strscan_mark(p)
+    struct strscanner *p;
 {
     rb_gc_mark(p->str);
 }
 
 static void
-strscan_free(struct strscanner *p)
+strscan_free(p)
+    struct strscanner *p;
 {
     re_free_registers(&(p->regs));
+    memset(p, sizeof(struct strscanner), 0);
     free(p);
 }
 
 static VALUE
-strscan_s_allocate(VALUE klass)
+strscan_s_allocate(klass)
+    VALUE klass;
 {
     struct strscanner *p;
     
@@ -173,14 +190,11 @@ strscan_s_allocate(VALUE klass)
     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)
+strscan_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     struct strscanner *p;
     VALUE str, need_dup;
@@ -193,61 +207,21 @@ strscan_initialize(int argc, VALUE *argv, VALUE self)
     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)
+strscan_s_mustc(self)
+    VALUE self;
 {
     return self;
 }
 
-/*
- * Reset the scan pointer (index 0) and clear matching data.
- */
 static VALUE
-strscan_reset(VALUE self)
+strscan_reset(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -257,15 +231,9 @@ strscan_reset(VALUE self)
     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)
+strscan_terminate(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -275,22 +243,9 @@ strscan_terminate(VALUE self)
     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)
+strscan_get_string(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -298,14 +253,9 @@ strscan_get_string(VALUE self)
     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)
+strscan_set_string(self, str)
+    VALUE self, str;
 {
     struct strscanner *p;
 
@@ -318,22 +268,9 @@ strscan_set_string(VALUE self, VALUE str)
     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)
+strscan_concat(self, str)
+    VALUE self, str;
 {
     struct strscanner *p;
 
@@ -343,22 +280,9 @@ strscan_concat(VALUE self, VALUE 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)
+strscan_get_pos(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -366,17 +290,9 @@ strscan_get_pos(VALUE self)
     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)
+strscan_set_pos(self, v)
+    VALUE self, v;
 {
     struct strscanner *p;
     long i;
@@ -390,8 +306,14 @@ strscan_set_pos(VALUE self, VALUE v)
     return INT2NUM(i);
 }
 
+
+/* I should implement this function? */
+#define strscan_prepare_re(re)  /* none */
+
 static VALUE
-strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
+strscan_do_scan(self, regex, succptr, getstr, headonly)
+    VALUE self, regex;
+    int succptr, getstr, headonly;
 {
     struct strscanner *p;
     int ret;
@@ -400,10 +322,10 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
     GET_SCANNER(self, p);
 
     CLEAR_MATCH_STATUS(p);
-    if (S_RESTLEN(p) < 0) {
+    if (EOS_P(p)) {
         return Qnil;
     }
-    rb_kcode_set_option(regex);
+    strscan_prepare_re(regex);
     if (headonly) {
         ret = re_match(RREGEXP(regex)->ptr,
                        CURPTR(p), S_RESTLEN(p),
@@ -417,7 +339,6 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
                         S_RESTLEN(p),
                         &(p->regs));
     }
-    rb_kcode_reset_option();
 
     if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
     if (ret < 0) {
@@ -438,201 +359,81 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
     }
 }
 
-/*
- * 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)
+strscan_scan(self, re)
+    VALUE self, 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)
+strscan_match_p(self, re)
+    VALUE self, 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)
+strscan_skip(self, re)
+    VALUE self, 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)
+strscan_check(self, re)
+    VALUE self, 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)
+strscan_scan_full(self, re, s, f)
+    VALUE self, re, s, 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)
+strscan_scan_until(self, re)
+    VALUE self, 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)
+strscan_exist_p(self, re)
+    VALUE self, 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)
+strscan_skip_until(self, re)
+    VALUE self, 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)
+strscan_check_until(self, re)
+    VALUE self, 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)
+strscan_search_full(self, re, s, f)
+    VALUE self, re, s, 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)
+adjust_registers_to_matched(p)
+    struct strscanner *p;
 {
     if (p->regs.allocated == 0) {
         p->regs.beg = ALLOC_N(int, RE_NREGS);
@@ -644,23 +445,9 @@ adjust_registers_to_matched(struct strscanner *p)
     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)
+strscan_getch(self)
+    VALUE self;
 {
     struct strscanner *p;
     long len;
@@ -669,10 +456,10 @@ strscan_getch(VALUE self)
     CLEAR_MATCH_STATUS(p);
     if (EOS_P(p))
         return Qnil;
+
     len = mbclen(*CURPTR(p));
-    if (p->curr + len > S_LEN(p)) {
+    if (p->curr + len > S_LEN(p))
         len = S_LEN(p) - p->curr;
-    }
     p->prev = p->curr;
     p->curr += len;
     MATCHED(p);
@@ -681,31 +468,17 @@ strscan_getch(VALUE self)
                             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)
+strscan_get_byte(self)
+    VALUE self;
 {
     struct strscanner *p;
 
     GET_SCANNER(self, p);
     CLEAR_MATCH_STATUS(p);
-    if (EOS_P(p)) {
+    if (EOS_P(p))
         return Qnil;
-    }
+
     p->prev = p->curr;
     p->curr++;
     MATCHED(p);
@@ -714,95 +487,43 @@ strscan_get_byte(VALUE self)
                             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)
+strscan_peek(self, vlen)
+    VALUE self, vlen;
 {
     struct strscanner *p;
     long len;
 
     GET_SCANNER(self, p);
+
     len = NUM2LONG(vlen);
-    if (EOS_P(p)) {
+    if (EOS_P(p))
         return infect(rb_str_new("", 0), p);
-    }
-    if (p->curr + len > S_LEN(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)
+strscan_unscan(self)
+    VALUE self;
 {
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    if (! MATCHED_P(p)) {
-        rb_raise(ScanError, "unscan failed: previous match had failed");
-    }
+    if (! MATCHED_P(p))
+        rb_raise(ScanError, "cannot unscan: prev 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)
+strscan_bol_p(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -812,80 +533,49 @@ strscan_bol_p(VALUE self)
     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)
+strscan_eos_p(self)
+    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);
+    if (EOS_P(p))
+        return Qtrue;
+    else
+        return Qfalse;
 }
 
-/*
- * 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)
+strscan_rest_p(self)
+    VALUE self;
 {
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    return EOS_P(p) ? Qfalse : Qtrue;
+    if (EOS_P(p))
+        return Qfalse;
+    else
+        return 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)
+strscan_matched_p(self)
+    VALUE self;
 {
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    return MATCHED_P(p) ? Qtrue : Qfalse;
+    if (MATCHED_P(p))
+        return Qtrue;
+    else
+        return Qfalse;
 }
 
-/*
- * Returns the last matched string.
- * 
- *   s = StringScanner.new('test string')
- *   s.match?(/\w+/)     # -> 4
- *   s.matched           # -> "test"
- */
 static VALUE
-strscan_matched(VALUE self)
+strscan_matched(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -896,18 +586,9 @@ strscan_matched(VALUE self)
                             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)
+strscan_matched_size(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -917,33 +598,9 @@ strscan_matched_size(VALUE self)
     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)
+strscan_aref(self, idx)
+    VALUE self, idx;
 {
     struct strscanner *p;
     long i;
@@ -962,17 +619,9 @@ strscan_aref(VALUE self, VALUE idx)
                             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)
+strscan_pre_match(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -982,17 +631,9 @@ strscan_pre_match(VALUE self)
     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)
+strscan_post_match(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -1002,12 +643,10 @@ strscan_post_match(VALUE self)
     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)
+strscan_rest(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -1018,11 +657,9 @@ strscan_rest(VALUE self)
     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)
+strscan_rest_size(self)
+    VALUE self;
 {
     struct strscanner *p;
     long i;
@@ -1036,37 +673,18 @@ strscan_rest_size(VALUE self)
     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)
+strscan_inspect(self)
+    VALUE self;
 {
     struct strscanner *p;
     char buf[BUFSIZE];
     long len;
+    VALUE result;
     VALUE a, b;
 
     Data_Get_Struct(self, struct strscanner, p);
@@ -1099,7 +717,8 @@ strscan_inspect(VALUE self)
 }
 
 static VALUE
-inspect1(struct strscanner *p)
+inspect1(p)
+    struct strscanner *p;
 {
     char buf[BUFSIZE];
     char *bp = buf;
@@ -1118,7 +737,8 @@ inspect1(struct strscanner *p)
 }
 
 static VALUE
-inspect2(struct strscanner *p)
+inspect2(p)
+    struct strscanner *p;
 {
     char buf[BUFSIZE];
     char *bp = buf;
@@ -1141,120 +761,20 @@ inspect2(struct strscanner *p)
                               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)
+Init_strscan()
 {
     ID id_scanerr = rb_intern("ScanError");
-    VALUE tmp;
+    volatile 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);
+    if (rb_const_defined(rb_cObject, id_scanerr)) {
+        ScanError = rb_const_get(rb_cObject, id_scanerr);
     }
+    else {
+        ScanError = rb_define_class_id(id_scanerr, rb_eStandardError);
+    }
+
+    StringScanner = rb_define_class("StringScanner", rb_cObject);
     tmp = rb_str_new2(STRSCAN_VERSION);
     rb_obj_freeze(tmp);
     rb_const_set(StringScanner, rb_intern("Version"), tmp);
@@ -1264,11 +784,10 @@ Init_strscan(void)
     
     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, "clear",       strscan_terminate,   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);
@@ -1292,29 +811,29 @@ Init_strscan(void)
 
     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, "getbyte",     strscan_get_byte,    0);
     rb_define_method(StringScanner, "peek",        strscan_peek,        1);
-    rb_define_method(StringScanner, "peep",        strscan_peep,        1);
+    rb_define_method(StringScanner, "peep",        strscan_peek,        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, "bol?",        strscan_bol_p,       0);
     rb_define_method(StringScanner, "eos?",        strscan_eos_p,       0);
-    rb_define_method(StringScanner, "empty?",      strscan_empty_p,     0);
+    rb_define_method(StringScanner, "empty?",      strscan_eos_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, "matchedsize", strscan_matched_size, 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, "restsize",    strscan_rest_size,   0);
 
     rb_define_method(StringScanner, "inspect",     strscan_inspect,     0);
 }
diff --git a/ext/syck/MANIFEST b/ext/syck/MANIFEST
new file mode 100644
index 0000000000..bb126fa530
--- /dev/null
+++ b/ext/syck/MANIFEST
@@ -0,0 +1,15 @@
+MANIFEST
+extconf.rb
+bytecode.c
+emitter.c
+gram.c
+gram.h
+handler.c
+implicit.c
+node.c
+rubyext.c
+syck.c
+syck.h
+token.c
+yaml2byte.c
+yamlbyte.h
diff --git a/ext/syck/bytecode.c b/ext/syck/bytecode.c
index 567aaf52a8..df15658a73 100644
--- a/ext/syck/bytecode.c
+++ b/ext/syck/bytecode.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Mon Sep 19 23:21:26 2005 */
+/* Generated by re2c 0.5 on Sun Nov 23 14:51:02 2003 */
 #line 1 "bytecode.re"
 /*
  * bytecode.re
@@ -8,8 +8,8 @@
  *
  * Copyright (C) 2003 why the lucky stiff
  */
-#include "ruby.h"
 #include "syck.h"
+#include "ruby.h"
 #include "gram.h"
 
 #define QUOTELEN 128
@@ -89,7 +89,7 @@ char *get_inline( SyckParser *parser );
 #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 ) \
+            if ( last_lvl->status == syck_lvl_inline ) \
             { \
                 goto Document; \
             } \
@@ -135,6 +135,7 @@ int
 sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
 {
     SyckLevel *lvl;
+    int doc_level = 0;
     syck_parser_ptr = parser;
     if ( YYCURSOR == NULL ) 
     {
@@ -148,7 +149,7 @@ sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
         return t;
     }
 
-#line 172 "bytecode.re"
+#line 173
 
 
     lvl = CURRENT_LEVEL();
@@ -157,22 +158,20 @@ sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
         goto Document;
     }
 
-/* Header: */
+Header:
 
     YYTOKEN = YYCURSOR;
 
-
-#line 165 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
 	goto yy0;
-	++YYCURSOR;
+yy1:	++YYCURSOR;
 yy0:
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy2;
+	case '\000':	goto yy2;
 	case 'D':	goto yy3;
 	default:	goto yy5;
 	}
@@ -183,23 +182,21 @@ yy2:	YYCURSOR = YYMARKER;
 yy3:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 0x0A:	goto yy6;
-	case 0x0D:	goto yy8;
+	case '\n':	goto yy6;
+	case '\r':	goto yy8;
 	default:	goto yy4;
 	}
 yy4:
-#line 199 "bytecode.re"
-{   YYPOS(0);
+#line 200
+	{   YYPOS(0);
             goto Document;
         }
-#line 195 "<stdout>"
 yy5:	yych = *++YYCURSOR;
 	goto yy4;
-yy6:	++YYCURSOR;
-	goto yy7;
+yy6:	yych = *++YYCURSOR;
 yy7:
-#line 186 "bytecode.re"
-{   if ( lvl->status == syck_lvl_header )
+#line 187
+	{   if ( lvl->status == syck_lvl_header )
             {
                 CHK_NL(YYCURSOR);
                 goto Directive;
@@ -211,14 +208,13 @@ yy7:
                 return 0;
             }
         }
-#line 214 "<stdout>"
-yy8:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy6;
+yy8:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy6;
 	default:	goto yy2;
 	}
 }
-#line 203 "bytecode.re"
+#line 204
 
 
 Document:
@@ -231,19 +227,18 @@ Document:
 
         YYTOKEN = YYCURSOR;
 
-
-#line 235 "<stdout>"
 {
 	YYCTYPE yych;
+	unsigned int yyaccept;
 	goto yy9;
-	++YYCURSOR;
+yy10:	++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 '\000':	goto yy30;
+	case '\n':	goto yy27;
+	case '\r':	goto yy29;
 	case 'A':	goto yy19;
 	case 'D':	goto yy12;
 	case 'E':	goto yy16;
@@ -258,69 +253,62 @@ yy9:
 	}
 yy11:yy12:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy41;
-	case 0x0D:	goto yy44;
+	case '\n':	goto yy41;
+	case '\r':	goto yy44;
 	default:	goto yy11;
 	}
 yy13:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy41;
-	case 0x0D:	goto yy43;
+	case '\n':	goto yy41;
+	case '\r':	goto yy43;
 	default:	goto yy11;
 	}
 yy14:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy38;
-	case 0x0D:	goto yy40;
+	case '\n':	goto yy38;
+	case '\r':	goto yy40;
 	default:	goto yy11;
 	}
 yy15:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy35;
-	case 0x0D:	goto yy37;
+	case '\n':	goto yy35;
+	case '\r':	goto yy37;
 	default:	goto yy11;
 	}
 yy16:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy32;
-	case 0x0D:	goto yy34;
+	case '\n':	goto yy32;
+	case '\r':	goto yy34;
 	default:	goto yy11;
 	}
-yy17:	++YYCURSOR;
-	goto yy18;
+yy17:	yych = *++YYCURSOR;
 yy18:
-#line 288 "bytecode.re"
-{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str); 
+#line 289
+	{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str); 
             goto Scalar;
         }
-#line 296 "<stdout>"
-yy19:	++YYCURSOR;
-	goto yy20;
+yy19:	yych = *++YYCURSOR;
 yy20:
-#line 292 "bytecode.re"
-{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
+#line 293
+	{   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;
+yy21:	yych = *++YYCURSOR;
 yy22:
-#line 299 "bytecode.re"
-{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
+#line 300
+	{   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;
+yy23:	yych = *++YYCURSOR;
 yy24:
-#line 306 "bytecode.re"
-{   char *qstr;
+#line 307
+	{   char *qstr;
             ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
             qstr = get_inline( parser );
             CHK_NL(YYCURSOR);
@@ -379,18 +367,14 @@ yy24:
             sycklval->name = qstr;
             return YAML_TAGURI;
         }
-#line 382 "<stdout>"
-yy25:	++YYCURSOR;
-	goto yy26;
+yy25:	yych = *++YYCURSOR;
 yy26:
-#line 366 "bytecode.re"
-{   goto Comment; }
-#line 388 "<stdout>"
-yy27:	++YYCURSOR;
-	goto yy28;
+#line 367
+	{   goto Comment; }
+yy27:	yych = *++YYCURSOR;
 yy28:
-#line 368 "bytecode.re"
-{   CHK_NL(YYCURSOR);
+#line 369
+	{   CHK_NL(YYCURSOR);
             if ( lvl->status == syck_lvl_seq )
             {
                 return YAML_INDENT; 
@@ -402,26 +386,22 @@ yy28:
             }
             goto Document;
         }
-#line 405 "<stdout>"
 yy29:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy27;
+	case '\n':	goto yy27;
 	default:	goto yy11;
 	}
-yy30:	++YYCURSOR;
-	goto yy31;
+yy30:	yych = *++YYCURSOR;
 yy31:
-#line 381 "bytecode.re"
-{   ENSURE_YAML_IEND(lvl, -1);
+#line 382
+	{   ENSURE_YAML_IEND(lvl, -1);
             YYPOS(0);
             return 0;
         }
-#line 419 "<stdout>"
-yy32:	++YYCURSOR;
-	goto yy33;
+yy32:	yych = *++YYCURSOR;
 yy33:
-#line 252 "bytecode.re"
-{   if ( lvl->status == syck_lvl_seq && lvl->ncount == 0 )
+#line 253
+	{   if ( lvl->status == syck_lvl_seq && lvl->ncount == 0 )
             {
                 lvl->ncount++;
                 YYPOS(0);
@@ -456,17 +436,15 @@ yy33:
             CHK_NL(YYCURSOR);
             return YAML_IEND;
         }
-#line 459 "<stdout>"
 yy34:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy32;
+	case '\n':	goto yy32;
 	default:	goto yy11;
 	}
-yy35:	++YYCURSOR;
-	goto yy36;
+yy35:	yych = *++YYCURSOR;
 yy36:
-#line 237 "bytecode.re"
-{   int complex = 0;
+#line 238
+	{   int complex = 0;
             if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
             {
                 complex = 1;
@@ -480,17 +458,15 @@ yy36:
             }
             return YAML_IOPEN;
         }
-#line 483 "<stdout>"
 yy37:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy35;
+	case '\n':	goto yy35;
 	default:	goto yy11;
 	}
-yy38:	++YYCURSOR;
-	goto yy39;
+yy38:	yych = *++YYCURSOR;
 yy39:
-#line 222 "bytecode.re"
-{   int complex = 0;
+#line 223
+	{   int complex = 0;
             if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
             {
                 complex = 1;
@@ -504,53 +480,48 @@ yy39:
             }
             return YAML_IOPEN;
         }
-#line 507 "<stdout>"
 yy40:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy38;
+	case '\n':	goto yy38;
 	default:	goto yy11;
 	}
-yy41:	++YYCURSOR;
-	goto yy42;
+yy41:	yych = *++YYCURSOR;
 yy42:
-#line 217 "bytecode.re"
-{   ENSURE_YAML_IEND(lvl, -1);
+#line 218
+	{   ENSURE_YAML_IEND(lvl, -1);
                 YYPOS(0);
                 return 0;
             }
-#line 521 "<stdout>"
 yy43:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy41;
+	case '\n':	goto yy41;
 	default:	goto yy11;
 	}
-yy44:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy41;
+yy44:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy41;
 	default:	goto yy11;
 	}
 }
-#line 386 "bytecode.re"
+#line 387
 
 
     }
 
 Directive:
     {
-        YYTOKEN = YYCURSOR;
+        YYTOKTMP = YYCURSOR;
 
-
-#line 543 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
 	goto yy45;
-	++YYCURSOR;
+yy46:	++YYCURSOR;
 yy45:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy47;
+	case '\000':	goto yy47;
 	case 'V':	goto yy48;
 	default:	goto yy50;
 	}
@@ -639,17 +610,15 @@ yy48:	yyaccept = 0;
 	default:	goto yy49;
 	}
 yy49:
-#line 399 "bytecode.re"
-{   YYCURSOR = YYTOKEN;
+#line 400
+	{   YYCURSOR = YYTOKTMP;
                return YAML_DOCSEP;
            }
-#line 646 "<stdout>"
 yy50:	yych = *++YYCURSOR;
 	goto yy49;
 yy51:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy52;
 yy52:	switch(yych){
 	case '.':
 	case '/':
@@ -807,12 +776,11 @@ yy53:	yych = *++YYCURSOR;
 	default:	goto yy47;
 	}
 yy54:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy55;
 yy55:	switch(yych){
-	case 0x0A:	goto yy56;
-	case 0x0D:	goto yy58;
+	case '\n':	goto yy56;
+	case '\r':	goto yy58;
 	case '.':
 	case '/':
 	case '0':
@@ -890,66 +858,59 @@ yy55:	switch(yych){
 	case 'z':	goto yy54;
 	default:	goto yy47;
 	}
-yy56:	++YYCURSOR;
-	goto yy57;
+yy56:	yych = *++YYCURSOR;
 yy57:
-#line 396 "bytecode.re"
-{   CHK_NL(YYCURSOR);
+#line 397
+	{   CHK_NL(YYCURSOR);
                goto Directive; }
-#line 899 "<stdout>"
-yy58:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy56;
+yy58:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy56;
 	default:	goto yy47;
 	}
 }
-#line 402 "bytecode.re"
+#line 403
 
 
     }
 
 Comment:
     {
-        YYTOKEN = YYCURSOR;
+        YYTOKTMP = YYCURSOR;
 
-
-#line 916 "<stdout>"
 {
 	YYCTYPE yych;
+	unsigned int yyaccept;
 	goto yy59;
-	++YYCURSOR;
+yy60:	++YYCURSOR;
 yy59:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy61;
-	case 0x0A:	goto yy62;
-	case 0x0D:	goto yy64;
+	case '\000':	goto yy61;
+	case '\n':	goto yy62;
+	case '\r':	goto yy64;
 	default:	goto yy66;
 	}
-yy61:yy62:	++YYCURSOR;
-	goto yy63;
+yy61:yy62:	yych = *++YYCURSOR;
 yy63:
-#line 412 "bytecode.re"
-{   CHK_NL(YYCURSOR);
+#line 413
+	{   CHK_NL(YYCURSOR);
                 goto Document; }
-#line 936 "<stdout>"
-yy64:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy67;
+yy64:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy67;
 	default:	goto yy65;
 	}
 yy65:
-#line 415 "bytecode.re"
-{   goto Comment; }
-#line 945 "<stdout>"
+#line 416
+	{   goto Comment; }
 yy66:	yych = *++YYCURSOR;
 	goto yy65;
-yy67:	++YYCURSOR;
-	yych = *YYCURSOR;
+yy67:	yych = *++YYCURSOR;
 	goto yy63;
 }
-#line 417 "bytecode.re"
+#line 418
 
 
     }
@@ -966,53 +927,48 @@ Scalar:
 Scalar2:
     tok = YYCURSOR;
 
-
-#line 970 "<stdout>"
 {
 	YYCTYPE yych;
+	unsigned int yyaccept;
 	goto yy68;
-	++YYCURSOR;
+yy69:	++YYCURSOR;
 yy68:
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy74;
-	case 0x0A:	goto yy70;
-	case 0x0D:	goto yy72;
+	case '\000':	goto yy74;
+	case '\n':	goto yy70;
+	case '\r':	goto yy72;
 	default:	goto yy76;
 	}
-yy70:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
+yy70:	yych = *++YYCURSOR;
+	switch(yych){
 	case 'C':	goto yy78;
 	case 'N':	goto yy80;
 	case 'Z':	goto yy83;
 	default:	goto yy71;
 	}
 yy71:
-#line 461 "bytecode.re"
-{   YYCURSOR = tok;
+#line 462
+	{   YYCURSOR = tok;
             goto ScalarEnd; 
         }
-#line 996 "<stdout>"
-yy72:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy77;
+yy72:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy77;
 	default:	goto yy73;
 	}
 yy73:
-#line 469 "bytecode.re"
-{   CAT(str, cap, idx, tok[0]);
+#line 470
+	{   CAT(str, cap, idx, tok[0]);
             goto Scalar2; 
         }
-#line 1007 "<stdout>"
-yy74:	++YYCURSOR;
-	goto yy75;
+yy74:	yych = *++YYCURSOR;
 yy75:
-#line 465 "bytecode.re"
-{   YYCURSOR = tok;
+#line 466
+	{   YYCURSOR = tok;
             goto ScalarEnd;
         }
-#line 1015 "<stdout>"
 yy76:	yych = *++YYCURSOR;
 	goto yy73;
 yy77:	yych = *++YYCURSOR;
@@ -1022,17 +978,14 @@ yy77:	yych = *++YYCURSOR;
 	case 'Z':	goto yy83;
 	default:	goto yy71;
 	}
-yy78:	++YYCURSOR;
-	goto yy79;
+yy78:	yych = *++YYCURSOR;
 yy79:
-#line 435 "bytecode.re"
-{   CHK_NL(tok+1);
+#line 436
+	{   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':
@@ -1047,8 +1000,8 @@ yy81:	switch(yych){
 	default:	goto yy82;
 	}
 yy82:
-#line 438 "bytecode.re"
-{   CHK_NL(tok+1);
+#line 439
+	{   CHK_NL(tok+1);
             if ( tok + 2 < YYCURSOR )
             {
                 char *count = tok + 2;
@@ -1065,18 +1018,15 @@ yy82:
             }
             goto Scalar2;
         }
-#line 1068 "<stdout>"
-yy83:	++YYCURSOR;
-	goto yy84;
+yy83:	yych = *++YYCURSOR;
 yy84:
-#line 456 "bytecode.re"
-{   CHK_NL(tok+1);
+#line 457
+	{   CHK_NL(tok+1);
             CAT(str, cap, idx, '\0');
             goto Scalar2; 
         }
-#line 1077 "<stdout>"
 }
-#line 473 "bytecode.re"
+#line 474
 
 
 ScalarEnd:
@@ -1110,54 +1060,47 @@ Inline:
     {
         tok = YYCURSOR;
 
-
-#line 1114 "<stdout>"
 {
 	YYCTYPE yych;
+	unsigned int yyaccept;
 	goto yy85;
-	++YYCURSOR;
+yy86:	++YYCURSOR;
 yy85:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy91;
-	case 0x0A:	goto yy87;
-	case 0x0D:	goto yy89;
+	case '\000':	goto yy91;
+	case '\n':	goto yy87;
+	case '\r':	goto yy89;
 	default:	goto yy93;
 	}
-yy87:	++YYCURSOR;
-	goto yy88;
+yy87:	yych = *++YYCURSOR;
 yy88:
-#line 508 "bytecode.re"
-{   CHK_NL(YYCURSOR);
+#line 509
+	{   CHK_NL(YYCURSOR);
                 return str; }
-#line 1134 "<stdout>"
-yy89:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy94;
+yy89:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy94;
 	default:	goto yy90;
 	}
 yy90:
-#line 515 "bytecode.re"
-{   CAT(str, cap, idx, tok[0]);
+#line 516
+	{   CAT(str, cap, idx, tok[0]);
                 goto Inline; 
             }
-#line 1145 "<stdout>"
-yy91:	++YYCURSOR;
-	goto yy92;
+yy91:	yych = *++YYCURSOR;
 yy92:
-#line 511 "bytecode.re"
-{   YYCURSOR = tok;
+#line 512
+	{   YYCURSOR = tok;
                 return str;
             }
-#line 1153 "<stdout>"
 yy93:	yych = *++YYCURSOR;
 	goto yy90;
-yy94:	++YYCURSOR;
-	yych = *YYCURSOR;
+yy94:	yych = *++YYCURSOR;
 	goto yy88;
 }
-#line 519 "bytecode.re"
+#line 520
 
 
     }
diff --git a/ext/syck/depend b/ext/syck/depend
deleted file mode 100644
index 3eec4de72a..0000000000
--- a/ext/syck/depend
+++ /dev/null
@@ -1,12 +0,0 @@
-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/ext/syck/emitter.c b/ext/syck/emitter.c
index 9c8ab8d49b..4dcc8b3fc5 100644
--- a/ext/syck/emitter.c
+++ b/ext/syck/emitter.c
@@ -9,20 +9,24 @@
  * 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"
+#include "ruby.h"
 
 #define DEFAULT_ANCHOR_FORMAT "id%03d"
 
-const char hex_table[] = 
-"0123456789ABCDEF";
 static char b64_table[] =
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
+struct adjust_arg {
+    /* Position to start adjusting */
+    long startpos;
+    /* Adjusting by an offset */
+    int offset;
+};
+
 /*
  * Built-in base64 (from Ruby's pack.c)
  */
@@ -31,7 +35,7 @@ syck_base64enc( char *s, long len )
 {
     long i = 0;
     int padding = '=';
-    char *buff = S_ALLOC_N(char, len * 4 / 3 + 6);
+    char *buff = S_ALLOCA_N(char, len * 4 / 3 + 6);
 
     while (len >= 3) {
         buff[i++] = b64_table[077 & (*s >> 2)];
@@ -111,29 +115,25 @@ syck_new_emitter()
     SyckEmitter *e;
     e = S_ALLOC( SyckEmitter );
     e->headless = 0;
+    e->seq_map = 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->block_style = block_arbitrary;
     e->stage = doc_open;
     e->indent = 2;
     e->level = -1;
+    e->ignore_id = 0;
     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->handler = NULL;
     e->bonus = NULL;
     return e;
 }
@@ -145,6 +145,13 @@ syck_st_free_anchors( char *key, char *name, char *arg )
     return ST_CONTINUE;
 }
 
+int
+syck_st_free_markers( char *key, SyckEmitterNode *n, char *arg )
+{
+    S_FREE( n );
+    return ST_CONTINUE;
+}
+
 void
 syck_emitter_st_free( SyckEmitter *e )
 {
@@ -158,94 +165,27 @@ syck_emitter_st_free( SyckEmitter *e )
         e->anchors = NULL;
     }
 
-    if ( e->anchored != NULL )
-    {
-        st_free_table( e->anchored );
-        e->anchored = NULL;
-    }
-
     /*
      * Free the markers tables
      */
     if ( e->markers != NULL )
     {
+        st_foreach( e->markers, syck_st_free_markers, 0 );
         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 )
+syck_emitter_ignore_id( SyckEmitter *e, SYMID id )
 {
-    e->emitter_handler = hdlr;
+    e->ignore_id = id;
 }
 
 void
-syck_output_handler( SyckEmitter *e, SyckOutputHandler hdlr )
+syck_emitter_handler( SyckEmitter *e, SyckOutputHandler hdlr )
 {
-    e->output_handler = hdlr;
+    e->handler = hdlr;
 }
 
 void
@@ -255,9 +195,6 @@ 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 );
@@ -302,7 +239,7 @@ syck_emitter_write( SyckEmitter *e, char *str, long len )
 	    long rest = e->bufsize - (e->marker - e->buffer);
 	    if (len <= rest) break;
 	    S_MEMCPY( e->marker, str, char, rest );
-	    e->marker += rest;
+	    e->marker += len;
 	    str += rest;
 	    len -= rest;
 	    syck_emitter_flush( e, 0 );
@@ -338,905 +275,169 @@ syck_emitter_flush( SyckEmitter *e, long check_room )
     }
 
     /*
-     * 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->stage == doc_open && ( e->headless == 0 || e->use_header == 1 ) ) || 
+         e->stage == doc_need_header )
     {
         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 ) );
+            (e->handler)( e, header, strlen( header ) );
             S_FREE( header );
         }
         else
         {
-            syck_emitter_write( e, "--- ", 4 );
+            (e->handler)( 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 ) )
+    /*
+     * Commit buffer.
+     */
+    if ( check_room > e->marker - e->buffer )
     {
-        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;
+        check_room = e->marker - e->buffer;
     }
+    (e->handler)( e, e->buffer, check_room );
+    e->bufpos += check_room;
+    e->marker -= check_room;
 }
 
 /*
- * 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.
+ * Emit a simple, unquoted string.
  */
-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 )
+void
+syck_emitter_simple( SyckEmitter *e, char *str, long len )
 {
-    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 );
-    }
+    e->seq_map = 0;
+    syck_emitter_write( e, str, len );
 }
 
-/* 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.
+ * Shift the offsets of all applicable anchors
  */
 int
-syck_scan_scalar( int req_width, char *cursor, long len )
+syck_adjust_anchors( char *key, SyckEmitterNode *n, struct adjust_arg *arg )
 {
-    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' ) )
+    if ( arg->startpos < n->pos )
     {
-            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;
+        n->pos += arg->offset;
     }
+    return ST_CONTINUE;
 }
 
 /*
- * Begins emission of a mapping.
+ * call on start of an object's marshalling
+ * (handles anchors, returns an alias)
  */
-void syck_emit_map( SyckEmitter *e, char *tag, enum map_style style )
+char *
+syck_emitter_start_obj( SyckEmitter *e, SYMID oid )
 {
-    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;
-    }
-}
+    SyckEmitterNode *n = NULL;
+    char *anchor_name = NULL;
 
-/*
- * 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 )
+    e->level++;
+    if ( oid != e->ignore_id )
     {
-        case syck_lvl_seq:
+        /*
+         * Look for anchors
+         */
+        if ( e->markers == NULL )
         {
-            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 );
+            e->markers = st_init_numtable();
         }
-        break;
 
-        case syck_lvl_iseq:
+        /*
+         * 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, (st_data_t)oid, (st_data_t *)&n ) )
         {
-            if ( lvl->ncount > 0 ) {
-                syck_emitter_write( e, ", ", 2 );
-            }
+            /*
+             * Store all markers
+             */
+            n = S_ALLOC( SyckEmitterNode );
+            n->is_shortcut = 0;
+            n->indent = e->level * e->indent;
+            n->pos = e->bufpos + ( e->marker - e->buffer );
+            st_insert( e->markers, (st_data_t)oid, (st_data_t)n );
         }
-        break;
-
-        case syck_lvl_map:
+        else
         {
-            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 );
+            if ( e->anchors == NULL )
+            {
+                e->anchors = st_init_numtable();
             }
-        }
-        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 );
+            if ( ! st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
+            {
+                int idx = 0;
+                /*
+                 * Second time hitting this object, let's give it an anchor
+                 */
+                idx = e->anchors->num_entries + 1;
+
+                /*
+                 * Create the anchor tag
+                 */
+                if ( n->pos >= e->bufpos )
+                {
+                    int alen;
+                    struct adjust_arg *args = S_ALLOC( struct adjust_arg );
+                    char *start = e->buffer + ( n->pos - e->bufpos );
+
+                    char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
+                    anchor_name = S_ALLOC_N( char, strlen( anc ) + 10 );
+                    S_MEMZERO( anchor_name, char, strlen( anc ) + 10 );
+                    sprintf( anchor_name, anc, idx );
+
+                    /*
+                     * Need to flush the buffer some, if there is not room for the anchor.
+                     */
+                    alen = strlen( anchor_name ) + 2;
+                    syck_emitter_flush( e, alen );
+
+                    /*
+                     * Write the anchor into the buffer
+                     */
+                    S_MEMMOVE( start + alen, start, char, e->marker - start );
+                    S_MEMCPY( start + 1, anchor_name, char, strlen( anchor_name ) );
+                    start[0] = '&';
+                    start[alen - 1] = ' ';
+                    e->marker += alen;
+
+                    /*
+                     * Cycle through anchors, modify for the size of the anchor.
+                     */
+                    args->startpos = n->pos;
+                    args->offset = alen;
+                    st_foreach( e->markers, syck_adjust_anchors, (st_data_t)args );
+                    S_FREE( args );
+
+                    /*
+                     * Insert into anchors table
+                     */
+                    st_insert( e->anchors, (st_data_t)oid, (st_data_t)anchor_name );
                 }
-                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 );
+    return anchor_name;
 }
 
 /*
- * Closes emission of a collection.
+ * call on completion of an object's marshalling
  */
-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 )
+void
+syck_emitter_end_obj( SyckEmitter *e )
 {
-    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;
+    e->level--;
 }
 
diff --git a/ext/syck/gram.c b/ext/syck/gram.c
index 615a594f61..5bdd025629 100644
--- a/ext/syck/gram.c
+++ b/ext/syck/gram.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made from gram.y, by GNU bison 1.75.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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
@@ -34,13 +34,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output.  */
-#define YYBISON 1
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
+#define YYBISON	1
 
 /* Pure parsers.  */
-#define YYPURE 1
+#define YYPURE	1
 
 /* Using locations.  */
 #define YYLSP_NEEDED 0
@@ -98,21 +95,9 @@
 
 #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.  */
@@ -128,49 +113,52 @@ void apply_seq_in_map( SyckParser *parser, SyckNode *n );
 # define YYERROR_VERBOSE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 35 "gram.y"
-typedef union YYSTYPE {
+#ifndef YYSTYPE
+#line 23 "gram.y"
+typedef union {
     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
+} yystype;
+/* Line 193 of /usr/local/share/bison/yacc.c.  */
+#line 125 "y.tab.c"
+# define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
-
+#ifndef YYLTYPE
+typedef struct yyltype
+{
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;
+} yyltype;
+# define YYLTYPE yyltype
+# define YYLTYPE_IS_TRIVIAL 1
+#endif
 
 /* Copy the second part of user declarations.  */
+int sycklex( YYSTYPE *, SyckParser * );
 
 
-/* Line 214 of yacc.c.  */
-#line 152 "gram.c"
+/* Line 213 of /usr/local/share/bison/yacc.c.  */
+#line 146 "y.tab.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
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
 # else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
 #   endif
 #  endif
 # endif
@@ -183,36 +171,36 @@ typedef union YYSTYPE {
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T size_t
 #  endif
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  short yyss;
   YYSTYPE yyvs;
   };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAX (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)
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+      + YYSTACK_GAP_MAX)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
@@ -221,7 +209,7 @@ union yyalloc
 	{					\
 	  register YYSIZE_T yyi;		\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
+	    (To)[yyi] = (From)[yyi];	\
 	}					\
       while (0)
 #  endif
@@ -238,7 +226,7 @@ union yyalloc
 	YYSIZE_T yynewbytes;						\
 	YYCOPY (&yyptr->Stack, Stack, yysize);				\
 	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
     while (0)
@@ -248,29 +236,28 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short int yysigned_char;
+   typedef short yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
-#define YYFINAL  52
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   396
+#define YYFINAL  38
+#define YYLAST   414
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  23
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  29
+#define YYNNTS  25
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  79
+#define YYNRULES  69
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  128
+#define YYNSTATES  121
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   269
 
-#define YYTRANSLATE(YYX) 						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+#define YYTRANSLATE(X) \
+  ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const unsigned char yytranslate[] =
@@ -310,54 +297,50 @@ static const unsigned char yytranslate[] =
 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
+      22,    26,    28,    31,    32,    34,    37,    39,    41,    43,
+      46,    49,    52,    55,    58,    60,    62,    64,    67,    70,
+      72,    74,    76,    78,    80,    84,    87,    89,    93,    96,
+     100,   103,   107,   110,   112,   116,   119,   123,   126,   128,
+     132,   136,   140,   144,   147,   151,   154,   158,   161,   165,
+     167,   173,   175,   179,   183,   186,   190,   194,   197,   199
 };
 
 /* 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
+      24,     0,    -1,    33,    -1,    11,    27,    -1,    -1,    32,
+      -1,    26,    -1,    33,    -1,     3,    26,    -1,    28,    32,
+      31,    -1,    28,    26,    31,    -1,    25,    -1,    28,    29,
+      -1,    -1,    12,    -1,    28,    13,    -1,    14,    -1,    13,
+      -1,    14,    -1,    30,    31,    -1,     5,    32,    -1,     6,
+      32,    -1,     7,    32,    -1,     3,    32,    -1,     4,    -1,
+       8,    -1,     9,    -1,     5,    33,    -1,     6,    33,    -1,
+      10,    -1,    34,    -1,    38,    -1,    40,    -1,    46,    -1,
+      28,    36,    29,    -1,    15,    27,    -1,    37,    -1,     5,
+      30,    36,    -1,     5,    36,    -1,     6,    30,    36,    -1,
+       6,    36,    -1,     3,    30,    36,    -1,     3,    36,    -1,
+      35,    -1,    37,    30,    35,    -1,    37,    30,    -1,    17,
+      39,    18,    -1,    17,    18,    -1,    25,    -1,    39,    21,
+      25,    -1,    28,    41,    29,    -1,    28,    44,    29,    -1,
+       5,    30,    44,    -1,     5,    41,    -1,     6,    30,    44,
+      -1,     6,    41,    -1,     3,    30,    44,    -1,     3,    41,
+      -1,    32,    16,    27,    -1,    42,    -1,    22,    25,    30,
+      16,    27,    -1,    43,    -1,    44,    30,    35,    -1,    44,
+      30,    43,    -1,    44,    30,    -1,    25,    16,    27,    -1,
+      19,    47,    20,    -1,    19,    20,    -1,    45,    -1,    47,
+      21,    45,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const unsigned short 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
+       0,    44,    44,    48,    52,    58,    59,    62,    63,    72,
+      76,    82,    83,    96,   114,   115,   118,   121,   124,   125,
+     133,   138,   143,   151,   155,   163,   176,   183,   188,   193,
+     194,   195,   196,   197,   203,   209,   215,   216,   221,   226,
+     231,   236,   240,   246,   250,   255,   264,   268,   274,   278,
+     288,   293,   300,   305,   310,   315,   320,   324,   330,   345,
+     346,   354,   355,   367,   374,   383,   391,   395,   401,   402
 };
 #endif
 
@@ -366,24 +349,23 @@ static const unsigned short int yyrline[] =
    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
+  "$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", "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", "implicit_map", "top_imp_map", 
+  "basic_mapping", "complex_mapping", "in_implicit_map", "basic_mapping2", 
+  "inline_map", "in_inline_map", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,    45,    58,    91,    93,   123,
@@ -395,26 +377,24 @@ static const unsigned short int yytoknum[] =
 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
+      26,    27,    27,    27,    28,    28,    29,    30,    31,    31,
+      32,    32,    32,    32,    32,    32,    32,    33,    33,    33,
+      33,    33,    33,    33,    34,    35,    36,    36,    36,    36,
+      36,    36,    36,    37,    37,    37,    38,    38,    39,    39,
+      40,    40,    41,    41,    41,    41,    41,    41,    42,    43,
+      43,    44,    44,    44,    44,    45,    46,    46,    47,    47
 };
 
 /* 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
+       0,     2,     1,     2,     0,     1,     1,     1,     2,     3,
+       3,     1,     2,     0,     1,     2,     1,     1,     1,     2,
+       2,     2,     2,     2,     1,     1,     1,     2,     2,     1,
+       1,     1,     1,     1,     3,     2,     1,     3,     2,     3,
+       2,     3,     2,     1,     3,     2,     3,     2,     1,     3,
+       3,     3,     3,     2,     3,     2,     3,     2,     3,     1,
+       5,     1,     3,     3,     2,     3,     3,     2,     1,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -422,167 +402,171 @@ static const unsigned char yyr2[] =
    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
+       4,     0,     0,    29,    13,    14,     0,     0,     0,     0,
+       2,    30,    31,    32,    33,    27,    28,     0,    24,     0,
+       0,     0,    25,    26,    11,     6,     3,     0,     5,     7,
+      47,    48,     0,     0,    67,     0,    68,     0,     1,     0,
+       0,     0,    15,    13,     0,     0,    43,     0,    36,     0,
+      59,    61,     0,     8,    23,     0,    20,    21,     0,     0,
+      22,     0,     0,     0,    16,     0,    12,     0,    46,     0,
+      13,    66,     0,    17,     0,    42,    57,     0,    38,    53,
+       0,    40,    55,    35,     0,    13,    34,    45,    50,    51,
+      64,    18,     0,    10,     9,    49,    65,    69,     0,     0,
+       0,    41,    56,    37,    52,    39,    54,     0,    58,    44,
+      62,    63,    19,     0,     0,     0,    13,     0,     0,     0,
+      60
 };
 
 /* 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
+      -1,     8,    24,    25,    26,    32,    66,    90,    93,    28,
+      29,    11,    46,    75,    48,    12,    33,    13,    49,    50,
+      51,    52,    36,    14,    37
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -97
-static const short int yypact[] =
+#define YYPACT_NINF -68
+static const short 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
+     133,   177,   177,   -68,   352,   -68,   335,   283,    27,   223,
+     -68,   -68,   -68,   -68,   -68,   -68,   -68,   352,   -68,   369,
+     369,    97,   -68,   -68,   -68,   -68,   -68,   154,   -68,   -68,
+     -68,   -68,   203,   -12,   -68,    17,   -68,    46,   -68,   386,
+     386,   386,   -68,   352,   352,    25,   -68,    30,    33,    30,
+     -68,   -68,    67,   -68,   -68,    97,   -68,   -68,    97,    97,
+     -68,   301,   318,   318,   -68,   107,   -68,    37,   -68,   352,
+     352,   -68,   352,   -68,   243,   -68,   -68,   243,   -68,   -68,
+     243,   -68,   -68,   -68,    33,   352,   -68,    40,   -68,   -68,
+     263,   -68,   107,   -68,   -68,   -68,   -68,   -68,   399,   399,
+     399,   -68,    33,   -68,    33,   -68,    33,    42,   -68,   -68,
+     -68,   -68,   -68,    84,    84,    84,   352,     9,     9,     9,
+     -68
 };
 
 /* 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
+     -68,   -68,    10,    -9,   -38,     0,    -7,    86,   -56,    56,
+      29,   -68,   -62,    -6,   -68,   -68,   -68,   -68,    -2,   -68,
+     -26,   -67,    -3,   -68,   -68
 };
 
 /* 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.  */
+   If YYTABLE_NINF, parse 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
+       9,     9,     9,    47,    27,    83,    68,   102,    53,    69,
+     104,    94,   117,   106,   118,   119,    31,    35,    65,     9,
+       9,    47,    73,    65,    43,   109,    47,    38,   110,    10,
+      15,    16,    96,    70,    78,    81,   112,    76,    79,    82,
+      86,    85,    88,    27,    64,    89,    73,   108,    15,    16,
+      73,    91,    53,    85,    84,    43,    78,    81,   116,    76,
+      79,    82,     9,     9,   111,    45,    71,    72,   101,    97,
+      27,   103,     0,    54,   105,    56,    57,    60,   120,    95,
+      73,    64,    35,    67,     0,    27,     0,   117,    67,   118,
+     119,    15,    16,    78,    81,    54,    56,    57,     0,    43,
+      55,    18,    58,    59,    21,    22,    23,   101,   103,   105,
+       0,    54,    78,    81,    56,    57,    27,    54,    56,    57,
+      73,    91,     0,     0,     0,    74,    77,    80,     0,     0,
+      45,     0,     0,    45,    87,     0,    45,     0,     1,     2,
+       0,     0,     0,     3,     4,     5,    45,    74,    77,    80,
+       6,    92,     7,    92,    54,    56,    57,    61,    18,    62,
+      63,    21,    22,    23,     3,     0,     5,    42,    64,    43,
+     107,     6,     0,     7,     0,     0,    44,     0,    92,     0,
+       0,     0,     1,     2,   113,   114,   115,     3,     0,     5,
+       0,     0,     0,     0,     6,     0,     7,     0,     0,     0,
+       0,     0,     0,   113,   114,   115,    61,    18,    62,    63,
+      21,    22,    23,     3,     0,     5,    42,     0,    43,     0,
+       6,     0,     7,     0,     0,    44,    39,    18,    40,    41,
+      21,    22,    23,     0,     0,     0,    42,     0,    43,     0,
+       0,     0,     0,     0,     0,    44,    98,    18,    99,   100,
+      21,    22,    23,     0,     0,     0,     0,     0,    43,     0,
+       0,     0,     0,     0,     0,    44,    55,    18,    58,    59,
+      21,    22,    23,     0,     0,     0,     0,     0,    43,     0,
+       0,     0,     0,     0,     0,    44,    17,    18,    19,    20,
+      21,    22,    23,     3,     0,     5,     0,     0,     0,     0,
+       6,     0,     7,    34,    61,    18,    62,    63,    21,    22,
+      23,     3,     0,     5,    73,     0,    43,     0,     6,     0,
+       7,    39,    18,    62,    63,    21,    22,    23,     3,     0,
+       5,    73,     0,    43,     0,     6,     0,     7,    17,    18,
+      19,    20,    21,    22,    23,     3,     0,     5,     0,     0,
+       0,     0,     6,    30,     7,    17,    18,    19,    20,    21,
+      22,    23,     3,     0,     5,     0,     0,     0,     0,     6,
+       0,     7,    55,    18,    19,    20,    21,    22,    23,     3,
+       0,     5,     0,     0,     0,     0,     6,     0,     7,    39,
+      18,    40,    41,    21,    22,    23,     0,     0,     0,    73,
+       0,    43,    98,    18,    99,   100,    21,    22,    23,     0,
+       0,     0,    73,     0,    43
 };
 
 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,
+       0,     1,     2,     9,     4,    43,    18,    74,    17,    21,
+      77,    67,     3,    80,     5,     6,     6,     7,    27,    19,
+      20,    27,    13,    32,    15,    87,    32,     0,    90,     0,
+       1,     2,    70,    16,    40,    41,    92,    39,    40,    41,
+      47,    16,    49,    43,    14,    52,    13,    85,    19,    20,
+      13,    14,    61,    16,    44,    15,    62,    63,    16,    61,
+      62,    63,    62,    63,    90,     9,    20,    21,    74,    72,
+      70,    77,    -1,    17,    80,    19,    20,    21,   116,    69,
+      13,    14,    72,    27,    -1,    85,    -1,     3,    32,     5,
+       6,    62,    63,    99,   100,    39,    40,    41,    -1,    15,
+       3,     4,     5,     6,     7,     8,     9,   113,   114,   115,
+      -1,    55,   118,   119,    58,    59,   116,    61,    62,    63,
+      13,    14,    -1,    -1,    -1,    39,    40,    41,    -1,    -1,
+      74,    -1,    -1,    77,    48,    -1,    80,    -1,     5,     6,
+      -1,    -1,    -1,    10,    11,    12,    90,    61,    62,    63,
+      17,    65,    19,    67,    98,    99,   100,     3,     4,     5,
+       6,     7,     8,     9,    10,    -1,    12,    13,    14,    15,
+      84,    17,    -1,    19,    -1,    -1,    22,    -1,    92,    -1,
+      -1,    -1,     5,     6,    98,    99,   100,    10,    -1,    12,
+      -1,    -1,    -1,    -1,    17,    -1,    19,    -1,    -1,    -1,
+      -1,    -1,    -1,   117,   118,   119,     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,    -1,    -1,    -1,    13,    -1,    15,    -1,
+      -1,    -1,    -1,    -1,    -1,    22,     3,     4,     5,     6,
+       7,     8,     9,    -1,    -1,    -1,    -1,    -1,    15,    -1,
+      -1,    -1,    -1,    -1,    -1,    22,     3,     4,     5,     6,
+       7,     8,     9,    -1,    -1,    -1,    -1,    -1,    15,    -1,
+      -1,    -1,    -1,    -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,    -1,    12,    13,    -1,    15,    -1,    17,    -1,
       19,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
-      12,    -1,    -1,    -1,    -1,    17,    -1,    19,     3,     4,
+      12,    13,    -1,    15,    -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
+      -1,    -1,    17,    18,    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,    -1,    13,
+      -1,    15,     3,     4,     5,     6,     7,     8,     9,    -1,
+      -1,    -1,    13,    -1,    15
 };
 
 /* 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
+       0,     5,     6,    10,    11,    12,    17,    19,    24,    28,
+      33,    34,    38,    40,    46,    33,    33,     3,     4,     5,
+       6,     7,     8,     9,    25,    26,    27,    28,    32,    33,
+      18,    25,    28,    39,    20,    25,    45,    47,     0,     3,
+       5,     6,    13,    15,    22,    32,    35,    36,    37,    41,
+      42,    43,    44,    26,    32,     3,    32,    32,     5,     6,
+      32,     3,     5,     6,    14,    26,    29,    32,    18,    21,
+      16,    20,    21,    13,    30,    36,    41,    30,    36,    41,
+      30,    36,    41,    27,    25,    16,    29,    30,    29,    29,
+      30,    14,    30,    31,    31,    25,    27,    45,     3,     5,
+       6,    36,    44,    36,    44,    36,    44,    30,    27,    35,
+      35,    43,    31,    30,    30,    30,    16,     3,     5,     6,
+      27
 };
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@@ -603,13 +587,12 @@ static const unsigned char yystos[] =
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
+#define YYEMPTY		-2
 #define YYEOF		0
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
+#define YYERROR		goto yyerrlab1
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -625,13 +608,13 @@ do								\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
+      yychar1 = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
     { 								\
-      yyerror ("syntax error: cannot back up");\
+      yyerror ("syntax error: cannot back up");			\
       YYERROR;							\
     }								\
 while (0)
@@ -643,19 +626,19 @@ while (0)
    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)
+# 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)
+# define YYLEX	yylex (&yylval, YYLEX_PARAM)
 #else
-# define YYLEX yylex (&yylval)
+# define YYLEX	yylex (&yylval)
 #endif
 
 /* Enable debugging if requested.  */
@@ -671,93 +654,19 @@ 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
@@ -770,7 +679,7 @@ int yydebug;
    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+#if YYMAXDEPTH == 0
 # undef YYMAXDEPTH
 #endif
 
@@ -836,111 +745,102 @@ yystpcpy (yydest, yysrc)
 
 
 #if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+/*-----------------------------.
+| Print this symbol on YYOUT.  |
+`-----------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
 static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#if defined (__STDC__) || defined (__cplusplus)
+yysymprint (FILE* yyout, int yytype, YYSTYPE yyvalue)
 #else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
+yysymprint (yyout, yytype, yyvalue)
+    FILE* yyout;
     int yytype;
-    YYSTYPE *yyvaluep;
+    YYSTYPE yyvalue;
 #endif
 {
   /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  (void) yyvalue;
 
   if (yytype < YYNTOKENS)
     {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+      YYFPRINTF (yyout, "token %s (", yytname[yytype]);
 # ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+      YYPRINT (yyout, yytoknum[yytype], yyvalue);
 # endif
     }
   else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+    YYFPRINTF (yyout, "nterm %s (", yytname[yytype]);
 
   switch (yytype)
     {
       default:
         break;
     }
-  YYFPRINTF (yyoutput, ")");
+  YYFPRINTF (yyout, ")");
 }
+#endif /* YYDEBUG. */
+
 
-#endif /* ! YYDEBUG */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+#if defined (__STDC__) || defined (__cplusplus)
+yydestruct (int yytype, YYSTYPE yyvalue)
 #else
-static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yytype, yyvalue)
     int yytype;
-    YYSTYPE *yyvaluep;
+    YYSTYPE yyvalue;
 #endif
 {
   /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  (void) yyvalue;
 
   switch (yytype)
     {
-
       default:
         break;
     }
 }
+
 
 
-/* Prevent warnings from -Wmissing-prototypes.  */
+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+   into yyparse.  The argument should have type void *.
+   It should actually point to an object.
+   Grammar actions can access the variable by casting it
+   to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
 # if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM);
+#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL
 # else
-int yyparse ();
+#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
 # endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#else /* !YYPARSE_PARAM */
+# define YYPARSE_PARAM_ARG
+# define YYPARSE_PARAM_DECL
+#endif /* !YYPARSE_PARAM */
+
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
+# ifdef YYPARSE_PARAM
+int yyparse (void *);
+# else
 int yyparse (void);
-#else
-int yyparse ();
+# endif
 #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
+yyparse (YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
 {
   /* The lookahead symbol.  */
 int yychar;
@@ -948,7 +848,7 @@ int yychar;
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
-/* Number of syntax errors so far.  */
+/* Number of parse errors so far.  */
 int yynerrs;
 
   register int yystate;
@@ -957,7 +857,7 @@ int yynerrs;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  int yychar1 = 0;
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -968,9 +868,9 @@ int yynerrs;
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  register short int *yyssp;
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
@@ -1007,7 +907,6 @@ int yynerrs;
   yyssp = yyss;
   yyvsp = yyvs;
 
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1022,7 +921,7 @@ int yynerrs;
  yysetstate:
   *yyssp = yystate;
 
-  if (yyss + yystacksize - 1 <= yyssp)
+  if (yyssp >= yyss + yystacksize - 1)
     {
       /* Get the current used size of the three stacks, in elements.  */
       YYSIZE_T yysize = yyssp - yyss + 1;
@@ -1033,7 +932,7 @@ int yynerrs;
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
@@ -1054,14 +953,14 @@ int yynerrs;
       goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
+      if (yystacksize >= YYMAXDEPTH)
 	goto yyoverflowlab;
       yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
+      if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
@@ -1083,7 +982,7 @@ int yynerrs;
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
-      if (yyss + yystacksize - 1 <= yyssp)
+      if (yyssp >= yyss + yystacksize - 1)
 	YYABORT;
     }
 
@@ -1108,28 +1007,39 @@ yybackup:
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* yychar is either YYEMPTY or YYEOF
+     or a valid token in external form.  */
+
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  if (yychar <= YYEOF)
+  /* Convert token to internal form (in yychar1) for indexing tables with.  */
+
+  if (yychar <= 0)		/* This means end of input.  */
     {
-      yychar = yytoken = YYEOF;
+      yychar1 = 0;
+      yychar = YYEOF;		/* Don't call YYLEX any more.  */
+
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      yychar1 = YYTRANSLATE (yychar);
+
+      /* We have to keep this `#if YYDEBUG', since we use variables
+	 which are defined only if `YYDEBUG' is set.  */
+      YYDPRINTF ((stderr, "Next token is "));
+      YYDSYMPRINT ((stderr, yychar1, yylval));
+      YYDPRINTF ((stderr, "\n"));
     }
 
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
+  /* If the proper action on seeing token YYCHAR1 is to reduce or to
      detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+  yyn += yychar1;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yychar1)
     goto yydefault;
   yyn = yytable[yyn];
   if (yyn <= 0)
@@ -1144,7 +1054,8 @@ yybackup:
     YYACCEPT;
 
   /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
+	      yychar, yytname[yychar1]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
@@ -1190,48 +1101,48 @@ yyreduce:
   yyval = yyvsp[1-yylen];
 
 
-  YY_REDUCE_PRINT (yyn);
+
+#if YYDEBUG
+  /* We have to keep this `#if YYDEBUG', since we use variables which
+     are defined only if `YYDEBUG' is set.  */
+  if (yydebug)
+    {
+      int yyi;
+
+      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
+		 yyn - 1, yyrline[yyn]);
+
+      /* Print the symbols being reduced, and their result.  */
+      for (yyi = yyprhs[yyn]; yyrhs[yyi] >= 0; yyi++)
+	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+    }
+#endif
   switch (yyn)
     {
         case 2:
-#line 57 "gram.y"
+#line 45 "gram.y"
     {
            ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
         }
     break;
 
   case 3:
-#line 61 "gram.y"
+#line 49 "gram.y"
     {
            ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
         }
     break;
 
   case 4:
-#line 65 "gram.y"
+#line 53 "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"
+#line 64 "gram.y"
     { 
            /*
             * _Anchors_: The language binding must keep a separate symbol table
@@ -1242,85 +1153,70 @@ yyreduce:
         }
     break;
 
-  case 11:
-#line 95 "gram.y"
+  case 9:
+#line 73 "gram.y"
     {
            yyval.nodeData = yyvsp[-1].nodeData;
         }
     break;
 
-  case 14:
-#line 105 "gram.y"
+  case 10:
+#line 77 "gram.y"
     {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
+           yyval.nodeData = yyvsp[-1].nodeData;
+        }
     break;
 
-  case 15:
-#line 109 "gram.y"
+  case 12:
+#line 84 "gram.y"
     {
-                    NULL_NODE( parser, n );
-                    yyval.nodeData = n;
-                }
-    break;
-
-  case 16:
-#line 114 "gram.y"
-    { 
-                   if ( ((SyckParser *)parser)->implicit_typing == 1 )
+                   SyckNode *n = syck_new_str( "" ); 
+                   if ( ((SyckParser *)parser)->taguri_expansion == 1 )
                    {
-                      try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+                       n->type_id = syck_taguri( YAML_DOMAIN, "null", 4 );
                    }
-                   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;
+                   else
+                   {
+                       n->type_id = syck_strndup( "null", 4 );
+                   }
+                   yyval.nodeData = n;
                 }
     break;
 
-  case 18:
-#line 127 "gram.y"
+  case 13:
+#line 97 "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 );
+                   SyckNode *n = syck_new_str( "" ); 
+                   if ( ((SyckParser *)parser)->taguri_expansion == 1 )
+                   {
+                       n->type_id = syck_taguri( YAML_DOMAIN, "null", 4 );
+                   }
+                   else
+                   {
+                       n->type_id = syck_strndup( "null", 4 );
+                   }
+                   yyval.nodeData = n;
                 }
     break;
 
-  case 26:
-#line 165 "gram.y"
+  case 20:
+#line 134 "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"
+  case 21:
+#line 139 "gram.y"
     { 
                syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
                yyval.nodeData = yyvsp[0].nodeData;
             }
     break;
 
-  case 28:
-#line 175 "gram.y"
+  case 22:
+#line 144 "gram.y"
     { 
                if ( ((SyckParser *)parser)->implicit_typing == 1 )
                {
@@ -1330,15 +1226,15 @@ yyreduce:
             }
     break;
 
-  case 29:
-#line 183 "gram.y"
+  case 23:
+#line 152 "gram.y"
     { 
                yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
             }
     break;
 
-  case 30:
-#line 187 "gram.y"
+  case 24:
+#line 156 "gram.y"
     {
                /*
                 * _Aliases_: The anchor symbol table is scanned for the anchor name.
@@ -1348,8 +1244,8 @@ yyreduce:
             }
     break;
 
-  case 31:
-#line 195 "gram.y"
+  case 25:
+#line 164 "gram.y"
     { 
                SyckNode *n = yyvsp[0].nodeData;
                if ( ((SyckParser *)parser)->taguri_expansion == 1 )
@@ -1364,212 +1260,216 @@ yyreduce:
             }
     break;
 
-  case 33:
-#line 209 "gram.y"
-    {
-               yyval.nodeData = yyvsp[-1].nodeData;
+  case 27:
+#line 184 "gram.y"
+    { 
+                syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+                yyval.nodeData = yyvsp[0].nodeData;
             }
     break;
 
-  case 39:
-#line 229 "gram.y"
-    { 
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
+  case 28:
+#line 189 "gram.y"
+    {
+                syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+                yyval.nodeData = yyvsp[0].nodeData;
+            }
     break;
 
-  case 40:
-#line 233 "gram.y"
+  case 34:
+#line 204 "gram.y"
     { 
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
-  case 41:
-#line 239 "gram.y"
+  case 35:
+#line 210 "gram.y"
     { 
                     yyval.nodeId = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
                 }
     break;
 
-  case 42:
-#line 245 "gram.y"
+  case 37:
+#line 217 "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"
+  case 38:
+#line 222 "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"
+  case 39:
+#line 227 "gram.y"
     { 
                     syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
     break;
 
-  case 45:
-#line 260 "gram.y"
+  case 40:
+#line 232 "gram.y"
     { 
                     syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
     break;
 
-  case 46:
-#line 265 "gram.y"
+  case 41:
+#line 237 "gram.y"
     { 
                     yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
                 }
     break;
 
-  case 47:
-#line 269 "gram.y"
+  case 42:
+#line 241 "gram.y"
     { 
                     yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
                 }
     break;
 
-  case 48:
-#line 275 "gram.y"
+  case 43:
+#line 247 "gram.y"
     {
                     yyval.nodeData = syck_new_seq( yyvsp[0].nodeId );
                 }
     break;
 
-  case 49:
-#line 279 "gram.y"
+  case 44:
+#line 251 "gram.y"
     { 
                     syck_seq_add( yyvsp[-2].nodeData, yyvsp[0].nodeId );
                     yyval.nodeData = yyvsp[-2].nodeData;
 				}
     break;
 
-  case 50:
-#line 284 "gram.y"
+  case 45:
+#line 256 "gram.y"
     { 
                     yyval.nodeData = yyvsp[-1].nodeData;
 				}
     break;
 
-  case 51:
-#line 293 "gram.y"
+  case 46:
+#line 265 "gram.y"
     { 
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
-  case 52:
-#line 297 "gram.y"
+  case 47:
+#line 269 "gram.y"
     { 
                     yyval.nodeData = syck_alloc_seq();
                 }
     break;
 
-  case 53:
-#line 303 "gram.y"
+  case 48:
+#line 275 "gram.y"
     {
                     yyval.nodeData = syck_new_seq( syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
                 }
     break;
 
-  case 54:
-#line 307 "gram.y"
+  case 49:
+#line 279 "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"
+  case 50:
+#line 289 "gram.y"
     { 
                     apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
-  case 58:
-#line 326 "gram.y"
+  case 51:
+#line 294 "gram.y"
     { 
                     apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
-  case 59:
-#line 333 "gram.y"
+  case 52:
+#line 301 "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"
+  case 53:
+#line 306 "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"
+  case 54:
+#line 311 "gram.y"
     { 
                     syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
     break;
 
-  case 62:
-#line 348 "gram.y"
+  case 55:
+#line 316 "gram.y"
     { 
                     syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
                     yyval.nodeData = yyvsp[0].nodeData;
                 }
     break;
 
-  case 63:
-#line 353 "gram.y"
+  case 56:
+#line 321 "gram.y"
     { 
                     yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
                 }
     break;
 
-  case 64:
-#line 357 "gram.y"
+  case 57:
+#line 325 "gram.y"
     { 
                     yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
                 }
     break;
 
-  case 66:
-#line 364 "gram.y"
+  case 58:
+#line 331 "gram.y"
     {
-                    yyval.nodeData = yyvsp[-1].nodeData;
+                    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 68:
-#line 380 "gram.y"
+  case 60:
+#line 347 "gram.y"
     {
                     yyval.nodeData = syck_new_map( 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), 
+                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-3].nodeData ), 
                         syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
                 }
     break;
 
-  case 70:
-#line 398 "gram.y"
-    {
+  case 62:
+#line 356 "gram.y"
+    { 
                     if ( yyvsp[-2].nodeData->shortcut == NULL )
                     {
                         yyvsp[-2].nodeData->shortcut = syck_new_seq( yyvsp[0].nodeId );
@@ -1582,26 +1482,25 @@ yyreduce:
                 }
     break;
 
-  case 71:
-#line 410 "gram.y"
-    {
+  case 63:
+#line 368 "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"
-    {
+  case 64:
+#line 375 "gram.y"
+    { 
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
-  case 73:
-#line 427 "gram.y"
+  case 65:
+#line 384 "gram.y"
     {
                     yyval.nodeData = syck_new_map( 
                         syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), 
@@ -1609,51 +1508,49 @@ yyreduce:
                 }
     break;
 
-  case 74:
-#line 435 "gram.y"
+  case 66:
+#line 392 "gram.y"
     {
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
-  case 75:
-#line 439 "gram.y"
+  case 67:
+#line 396 "gram.y"
     {
                     yyval.nodeData = syck_alloc_map();
                 }
     break;
 
-  case 77:
-#line 446 "gram.y"
+  case 69:
+#line 403 "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"
+/* Line 1016 of /usr/local/share/bison/yacc.c.  */
+#line 1538 "y.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
 
 
-  YY_STACK_PRINT (yyss, yyssp);
+#if YYDEBUG
+  if (yydebug)
+    {
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
+    }
+#endif
 
   *++yyvsp = yyval;
 
@@ -1688,118 +1585,88 @@ yyerrlab:
 	{
 	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  const char* yyprefix;
 	  char *yymsg;
-	  int yyx;
+	  int yyx, yycount;
 
+	  yycount = 0;
 	  /* 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)
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); 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]));
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("parse error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[yytype]);
 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
 	  if (yymsg != 0)
 	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
 	      yyp = yystpcpy (yyp, yytname[yytype]);
 
 	      if (yycount < 5)
 		{
-		  yyprefix = ", expecting ";
-		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
 		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		      {
-			yyp = yystpcpy (yyp, yyprefix);
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
 			yyp = yystpcpy (yyp, yytname[yyx]);
-			yyprefix = " or ";
+			yycount++;
 		      }
 		}
 	      yyerror (yymsg);
 	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
+	    yyerror ("parse error; also virtual memory exhausted");
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+	yyerror ("parse error");
     }
+  goto yyerrlab1;
 
 
-
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
+yyerrlab1:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      if (yychar <= YYEOF)
+      /* Return failure if at end of input.  */
+      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);
-	       }
+	  /* Pop the error token.  */
+          YYPOPSTACK;
+	  /* Pop the rest of the stack.  */
+	  while (yyssp > yyss)
+	    {
+	      YYDPRINTF ((stderr, "Error: popping "));
+	      YYDSYMPRINT ((stderr,
+			    yystos[*yyssp],
+			    *yyvsp));
+	      YYDPRINTF ((stderr, "\n"));
+	      yydestruct (yystos[*yyssp], *yyvsp);
+	      YYPOPSTACK;
+	    }
+	  YYABORT;
         }
-      else
-	{
-	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-	  yydestruct (yytoken, &yylval);
-	  yychar = YYEMPTY;
 
-	}
+      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
+		  yychar, yytname[yychar1]));
+      yydestruct (yychar1, 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 (;;)
@@ -1820,11 +1687,26 @@ yyerrlab1:
       if (yyssp == yyss)
 	YYABORT;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      YYPOPSTACK;
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
+      YYDPRINTF ((stderr, "Error: popping "));
+      YYDSYMPRINT ((stderr,
+		    yystos[*yyssp], *yyvsp));
+      YYDPRINTF ((stderr, "\n"));
+
+      yydestruct (yystos[yystate], *yyvsp);
+      yyvsp--;
+      yystate = *--yyssp;
+
+
+#if YYDEBUG
+      if (yydebug)
+	{
+	  short *yyssp1 = yyss - 1;
+	  YYFPRINTF (stderr, "Error: state stack now");
+	  while (yyssp1 != yyssp)
+	    YYFPRINTF (stderr, " %d", *++yyssp1);
+	  YYFPRINTF (stderr, "\n");
+	}
+#endif
     }
 
   if (yyn == YYFINAL)
@@ -1872,7 +1754,7 @@ yyreturn:
 }
 
 
-#line 464 "gram.y"
+#line 410 "gram.y"
 
 
 void
diff --git a/ext/syck/gram.h b/ext/syck/gram.h
index 547149ab4b..d1e577b0ee 100644
--- a/ext/syck/gram.h
+++ b/ext/syck/gram.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made from gram.y, by GNU bison 1.75.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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
@@ -23,6 +23,9 @@
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 
+#ifndef BISON_Y_TAB_H
+# define BISON_Y_TAB_H
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -59,21 +62,20 @@
 
 
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 35 "gram.y"
-typedef union YYSTYPE {
+#ifndef YYSTYPE
+#line 23 "gram.y"
+typedef union {
     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
+} yystype;
+/* Line 1281 of /usr/local/share/bison/yacc.c.  */
+#line 74 "y.tab.h"
+# define YYSTYPE yystype
 #endif
 
 
 
 
+#endif /* not BISON_Y_TAB_H */
 
diff --git a/ext/syck/handler.c b/ext/syck/handler.c
index 56fe838fbd..eddc6465af 100644
--- a/ext/syck/handler.c
+++ b/ext/syck/handler.c
@@ -7,8 +7,8 @@
  * Copyright (C) 2003 why the lucky stiff
  */
 
-#include "ruby.h"
 #include "syck.h"
+#include "ruby.h"
 
 SYMID 
 syck_hdlr_add_node( SyckParser *p, SyckNode *n )
@@ -31,8 +31,6 @@ syck_hdlr_add_node( SyckParser *p, SyckNode *n )
 SyckNode *
 syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
 {
-    SyckNode *ntmp = NULL;
-
     n->anchor = a;
     if ( p->bad_anchors != NULL )
     {
@@ -50,13 +48,6 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
     {
         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;
 }
@@ -64,19 +55,10 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *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 );
 }
 
diff --git a/ext/syck/implicit.c b/ext/syck/implicit.c
index d356faf7d9..1dfeac3953 100644
--- a/ext/syck/implicit.c
+++ b/ext/syck/implicit.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Mon Sep 19 21:46:50 2005 */
+/* Generated by re2c 0.5 on Thu Oct 16 14:12:57 2003 */
 #line 1 "implicit.re"
 /*
  * implicit.re
@@ -9,8 +9,8 @@
  * Copyright (C) 2003 why the lucky stiff
  */
 
-#include "ruby.h"
 #include "syck.h"
+#include "ruby.h"
 
 #define YYCTYPE     char
 #define YYCURSOR    cursor
@@ -36,7 +36,6 @@ try_tag_implicit( SyckNode *n, int taguri )
             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 ) );
@@ -51,18 +50,16 @@ char *syck_match_implicit( char *str, size_t len )
     cursor = str;
     limit = str + len;
 
-
-#line 55 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
 	goto yy0;
-	++YYCURSOR;
+yy1:	++YYCURSOR;
 yy0:
 	if((YYLIMIT - YYCURSOR) < 26) YYFILL(26);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy6;
+	case '\000':	goto yy6;
 	case '+':	goto yy16;
 	case '-':	goto yy17;
 	case '.':	goto yy20;
@@ -81,103 +78,99 @@ yy0:
 	case 'F':	goto yy15;
 	case 'N':	goto yy5;
 	case 'O':	goto yy13;
-	case 'T':	goto yy11;
-	case 'Y':	goto yy9;
+	case 'T':	goto yy9;
+	case 'Y':	goto yy11;
 	case 'f':	goto yy14;
 	case 'n':	goto yy4;
 	case 'o':	goto yy12;
-	case 't':	goto yy10;
-	case 'y':	goto yy8;
+	case 't':	goto yy8;
+	case 'y':	goto yy10;
 	case '~':	goto yy2;
 	default:	goto yy23;
 	}
-yy2:	++YYCURSOR;
-	if((yych = *YYCURSOR) <= 0x00)	goto yy6;
-	goto yy3;
+yy2:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy6;
 yy3:
-#line 123 "implicit.re"
-{   return "str"; }
-#line 100 "<stdout>"
+#line 116
+	{   return "str"; }
 yy4:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'o':	goto yy172;
-	case 'u':	goto yy200;
+	case 'o':	goto yy163;
+	case 'u':	goto yy191;
 	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;
+	case 'O':	case 'o':	goto yy163;
+	case 'U':	goto yy186;
+	case 'u':	goto yy187;
 	default:	goto yy3;
 	}
-yy6:	++YYCURSOR;
-	goto yy7;
+yy6:	yych = *++YYCURSOR;
 yy7:
-#line 85 "implicit.re"
-{   return "null"; }
-#line 121 "<stdout>"
+#line 82
+	{   return "null"; }
 yy8:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'e':	goto yy194;
+	case 'r':	goto yy184;
 	default:	goto yy3;
 	}
 yy9:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'E':	goto yy192;
-	case 'e':	goto yy193;
+	case 'R':	goto yy180;
+	case 'r':	goto yy181;
 	default:	goto yy3;
 	}
 yy10:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'r':	goto yy190;
+	case 'e':	goto yy179;
 	default:	goto yy3;
 	}
 yy11:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'R':	goto yy186;
-	case 'r':	goto yy187;
+	case 'E':	goto yy177;
+	case 'e':	goto yy178;
 	default:	goto yy3;
 	}
 yy12:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'f':	goto yy185;
-	case 'n':	goto yy182;
+	case 'f':	goto yy176;
+	case 'n':	goto yy173;
 	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;
+	case 'F':	goto yy171;
+	case 'N':	case 'n':	goto yy173;
+	case 'f':	goto yy172;
 	default:	goto yy3;
 	}
 yy14:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'a':	goto yy177;
+	case 'a':	goto yy168;
 	default:	goto yy3;
 	}
 yy15:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'A':	goto yy168;
-	case 'a':	goto yy169;
+	case 'A':	goto yy159;
+	case 'a':	goto yy160;
 	default:	goto yy3;
 	}
 yy16:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '.':	goto yy167;
-	case '0':	goto yy158;
+	case '.':	goto yy158;
+	case '0':	goto yy149;
 	case '1':
 	case '2':
 	case '3':
@@ -192,8 +185,8 @@ yy16:	yyaccept = 0;
 yy17:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '.':	goto yy157;
-	case '0':	goto yy158;
+	case '.':	goto yy148;
+	case '0':	goto yy149;
 	case '1':
 	case '2':
 	case '3':
@@ -208,9 +201,9 @@ yy17:	yyaccept = 0;
 yy18:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 0x00:	goto yy52;
-	case ',':	goto yy142;
-	case '.':	goto yy50;
+	case '\000':	goto yy51;
+	case ',':	goto yy133;
+	case '.':	goto yy49;
 	case '0':
 	case '1':
 	case '2':
@@ -218,19 +211,18 @@ yy18:	yyaccept = 0;
 	case '4':
 	case '5':
 	case '6':
-	case '7':	goto yy140;
+	case '7':	goto yy131;
 	case '8':
-	case '9':	goto yy141;
-	case ':':	goto yy49;
-	case 'x':	goto yy144;
+	case '9':	goto yy132;
+	case 'x':	goto yy135;
 	default:	goto yy3;
 	}
 yy19:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 0x00:	goto yy52;
+	case '\000':	goto yy51;
 	case ',':	goto yy47;
-	case '.':	goto yy50;
+	case '.':	goto yy49;
 	case '0':
 	case '1':
 	case '2':
@@ -241,7 +233,6 @@ yy19:	yyaccept = 0;
 	case '7':
 	case '8':
 	case '9':	goto yy46;
-	case ':':	goto yy49;
 	default:	goto yy3;
 	}
 yy20:	yyaccept = 0;
@@ -254,7 +245,7 @@ yy20:	yyaccept = 0;
 	default:	goto yy3;
 	}
 yy21:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy28;
+	if(yych <= '\000')	goto yy28;
 	goto yy3;
 yy22:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -265,24 +256,19 @@ yy22:	yyaccept = 0;
 yy23:	yych = *++YYCURSOR;
 	goto yy3;
 yy24:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy26;
-	goto yy25;
+	if(yych <= '\000')	goto yy26;
 yy25:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
 	case 0:	goto yy3;
 	}
-yy26:	++YYCURSOR;
-	goto yy27;
+yy26:	yych = *++YYCURSOR;
 yy27:
-#line 121 "implicit.re"
-{   return "merge"; }
-#line 279 "<stdout>"
-yy28:	++YYCURSOR;
-	goto yy29;
+#line 114
+	{   return "merge"; }
+yy28:	yych = *++YYCURSOR;
 yy29:
-#line 119 "implicit.re"
-{   return "default"; }
-#line 285 "<stdout>"
+#line 112
+	{   return "default"; }
 yy30:	yych = *++YYCURSOR;
 	switch(yych){
 	case 'a':	goto yy45;
@@ -316,14 +302,11 @@ yy35:	yych = *++YYCURSOR;
 	default:	goto yy25;
 	}
 yy36:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy37;
-yy37:	++YYCURSOR;
-	goto yy38;
+	if(yych >= '\001')	goto yy25;
+yy37:	yych = *++YYCURSOR;
 yy38:
-#line 105 "implicit.re"
-{   return "float#inf"; }
-#line 326 "<stdout>"
+#line 98
+	{   return "float#inf"; }
 yy39:	yych = *++YYCURSOR;
 	switch(yych){
 	case 'f':	goto yy36;
@@ -340,14 +323,11 @@ yy41:	yych = *++YYCURSOR;
 	default:	goto yy25;
 	}
 yy42:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy43;
-yy43:	++YYCURSOR;
-	goto yy44;
+	if(yych >= '\001')	goto yy25;
+yy43:	yych = *++YYCURSOR;
 yy44:
-#line 109 "implicit.re"
-{   return "float#nan"; }
-#line 350 "<stdout>"
+#line 102
+	{   return "float#nan"; }
 yy45:	yych = *++YYCURSOR;
 	switch(yych){
 	case 'n':	goto yy42;
@@ -364,15 +344,14 @@ yy46:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy74;
+	case '9':	goto yy65;
 	default:	goto yy48;
 	}
 yy47:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy48;
 yy48:	switch(yych){
-	case 0x00:	goto yy52;
+	case '\000':	goto yy51;
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -383,34 +362,16 @@ yy48:	switch(yych){
 	case '7':
 	case '8':
 	case '9':	goto yy47;
-	case '.':	goto yy50;
-	case ':':	goto yy49;
+	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;
+yy50:	switch(yych){
+	case '\000':	goto yy55;
+	case ',':	goto yy53;
+	case '.':	goto yy57;
 	case '0':
 	case '1':
 	case '2':
@@ -420,22 +381,19 @@ yy51:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy50;
-	case 'E':	case 'e':	goto yy60;
+	case '9':	goto yy49;
+	case 'E':	case 'e':	goto yy59;
 	default:	goto yy25;
 	}
-yy52:	++YYCURSOR;
-	goto yy53;
-yy53:
-#line 97 "implicit.re"
-{   return "int"; }
-#line 432 "<stdout>"
-yy54:	++YYCURSOR;
+yy51:	yych = *++YYCURSOR;
+yy52:
+#line 92
+	{   return "int"; }
+yy53:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy55;
-yy55:	switch(yych){
-	case 0x00:	goto yy56;
+yy54:	switch(yych){
+	case '\000':	goto yy55;
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -445,20 +403,17 @@ yy55:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy54;
+	case '9':	goto yy53;
 	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);
+yy55:	yych = *++YYCURSOR;
+yy56:
+#line 94
+	{   return "float#fix"; }
+yy57:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy59;
-yy59:	switch(yych){
+yy58:	switch(yych){
 	case '.':	case '0':
 	case '1':
 	case '2':
@@ -468,48 +423,23 @@ yy59:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy58;
-	case 'E':	case 'e':	goto yy60;
+	case '9':	goto yy57;
+	case 'E':	case 'e':	goto yy59;
 	default:	goto yy25;
 	}
-yy60:	yych = *++YYCURSOR;
+yy59:	yych = *++YYCURSOR;
 	switch(yych){
-	case '+':	case '-':	goto yy61;
+	case '+':	case '-':	goto yy60;
 	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;
+yy60:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy25;
+	goto yy62;
+yy61:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy70;
-	case '.':	goto yy68;
+yy62:	switch(yych){
+	case '\000':	goto yy63;
 	case '0':
 	case '1':
 	case '2':
@@ -519,50 +449,14 @@ yy66:	++YYCURSOR;
 	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;
+	case '9':	goto yy61;
 	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;
+yy63:	yych = *++YYCURSOR;
+yy64:
+#line 96
+	{   return "float#exp"; }
+yy65:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -573,15 +467,15 @@ yy74:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy75;
+	case '9':	goto yy66;
 	default:	goto yy48;
 	}
-yy75:	yych = *++YYCURSOR;
+yy66:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy76;
+	case '-':	goto yy67;
 	default:	goto yy48;
 	}
-yy76:	yych = *++YYCURSOR;
+yy67:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -592,10 +486,10 @@ yy76:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy77;
+	case '9':	goto yy68;
 	default:	goto yy25;
 	}
-yy77:	yych = *++YYCURSOR;
+yy68:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -606,15 +500,15 @@ yy77:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy78;
+	case '9':	goto yy69;
 	default:	goto yy25;
 	}
-yy78:	yych = *++YYCURSOR;
+yy69:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy79;
+	case '-':	goto yy70;
 	default:	goto yy25;
 	}
-yy79:	yych = *++YYCURSOR;
+yy70:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -625,10 +519,10 @@ yy79:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy80;
+	case '9':	goto yy71;
 	default:	goto yy25;
 	}
-yy80:	yych = *++YYCURSOR;
+yy71:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -639,12 +533,12 @@ yy80:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy81;
+	case '9':	goto yy72;
 	default:	goto yy25;
 	}
-yy81:	yych = *++YYCURSOR;
+yy72:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy82;
+	case '\000':	goto yy73;
 	case '0':
 	case '1':
 	case '2':
@@ -655,17 +549,15 @@ yy81:	yych = *++YYCURSOR;
 	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;
+	case 'T':	goto yy75;
+	case 't':	goto yy76;
+	default:	goto yy78;
+	}
+yy73:	yych = *++YYCURSOR;
+yy74:
+#line 104
+	{   return "timestamp#ymd"; }
+yy75:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -676,10 +568,10 @@ yy84:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy126;
+	case '9':	goto yy117;
 	default:	goto yy25;
 	}
-yy85:	yych = *++YYCURSOR;
+yy76:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -690,15 +582,14 @@ yy85:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy108;
+	case '9':	goto yy99;
 	default:	goto yy25;
 	}
-yy86:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
+yy77:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy87;
-yy87:	switch(yych){
-	case 0x09:	case ' ':	goto yy86;
+yy78:	switch(yych){
+	case '\t':	case ' ':	goto yy77;
 	case '0':
 	case '1':
 	case '2':
@@ -708,10 +599,10 @@ yy87:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy88;
+	case '9':	goto yy79;
 	default:	goto yy25;
 	}
-yy88:	yych = *++YYCURSOR;
+yy79:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -722,15 +613,15 @@ yy88:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy89;
+	case '9':	goto yy80;
 	default:	goto yy25;
 	}
-yy89:	yych = *++YYCURSOR;
+yy80:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy90;
+	case ':':	goto yy81;
 	default:	goto yy25;
 	}
-yy90:	yych = *++YYCURSOR;
+yy81:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -741,10 +632,10 @@ yy90:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy91;
+	case '9':	goto yy82;
 	default:	goto yy25;
 	}
-yy91:	yych = *++YYCURSOR;
+yy82:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -755,15 +646,15 @@ yy91:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy92;
+	case '9':	goto yy83;
 	default:	goto yy25;
 	}
-yy92:	yych = *++YYCURSOR;
+yy83:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy93;
+	case ':':	goto yy84;
 	default:	goto yy25;
 	}
-yy93:	yych = *++YYCURSOR;
+yy84:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -774,10 +665,10 @@ yy93:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy94;
+	case '9':	goto yy85;
 	default:	goto yy25;
 	}
-yy94:	yych = *++YYCURSOR;
+yy85:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -788,21 +679,20 @@ yy94:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy95;
+	case '9':	goto yy86;
 	default:	goto yy25;
 	}
-yy95:	yych = *++YYCURSOR;
+yy86:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x09:	case ' ':	goto yy98;
-	case '.':	goto yy96;
+	case '\t':	case ' ':	goto yy89;
+	case '.':	goto yy87;
 	default:	goto yy25;
 	}
-yy96:	++YYCURSOR;
+yy87:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy97;
-yy97:	switch(yych){
-	case 0x09:	case ' ':	goto yy98;
+yy88:	switch(yych){
+	case '\t':	case ' ':	goto yy89;
 	case '0':
 	case '1':
 	case '2':
@@ -812,23 +702,22 @@ yy97:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy96;
+	case '9':	goto yy87;
 	default:	goto yy25;
 	}
-yy98:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+yy89:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy99;
-yy99:	switch(yych){
-	case 0x09:	case ' ':	goto yy98;
-	case '+':	case '-':	goto yy101;
-	case 'Z':	goto yy100;
+yy90:	switch(yych){
+	case '\t':	case ' ':	goto yy89;
+	case '+':	case '-':	goto yy92;
+	case 'Z':	goto yy91;
 	default:	goto yy25;
 	}
-yy100:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy105;
+yy91:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy96;
 	goto yy25;
-yy101:	yych = *++YYCURSOR;
+yy92:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -839,10 +728,10 @@ yy101:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy102;
+	case '9':	goto yy93;
 	default:	goto yy25;
 	}
-yy102:	yych = *++YYCURSOR;
+yy93:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -853,16 +742,16 @@ yy102:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy103;
+	case '9':	goto yy94;
 	default:	goto yy25;
 	}
-yy103:	yych = *++YYCURSOR;
+yy94:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy105;
-	case ':':	goto yy104;
+	case '\000':	goto yy96;
+	case ':':	goto yy95;
 	default:	goto yy25;
 	}
-yy104:	yych = *++YYCURSOR;
+yy95:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -873,16 +762,14 @@ yy104:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy107;
+	case '9':	goto yy98;
 	default:	goto yy25;
 	}
-yy105:	++YYCURSOR;
-	goto yy106;
-yy106:
-#line 115 "implicit.re"
-{   return "timestamp#spaced"; }
-#line 884 "<stdout>"
-yy107:	yych = *++YYCURSOR;
+yy96:	yych = *++YYCURSOR;
+yy97:
+#line 108
+	{   return "timestamp#spaced"; }
+yy98:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -893,10 +780,10 @@ yy107:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy100;
+	case '9':	goto yy91;
 	default:	goto yy25;
 	}
-yy108:	yych = *++YYCURSOR;
+yy99:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -907,15 +794,15 @@ yy108:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy109;
+	case '9':	goto yy100;
 	default:	goto yy25;
 	}
-yy109:	yych = *++YYCURSOR;
+yy100:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy110;
+	case ':':	goto yy101;
 	default:	goto yy25;
 	}
-yy110:	yych = *++YYCURSOR;
+yy101:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -926,10 +813,10 @@ yy110:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy111;
+	case '9':	goto yy102;
 	default:	goto yy25;
 	}
-yy111:	yych = *++YYCURSOR;
+yy102:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -940,15 +827,15 @@ yy111:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy112;
+	case '9':	goto yy103;
 	default:	goto yy25;
 	}
-yy112:	yych = *++YYCURSOR;
+yy103:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy113;
+	case ':':	goto yy104;
 	default:	goto yy25;
 	}
-yy113:	yych = *++YYCURSOR;
+yy104:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -959,10 +846,10 @@ yy113:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy114;
+	case '9':	goto yy105;
 	default:	goto yy25;
 	}
-yy114:	yych = *++YYCURSOR;
+yy105:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -973,12 +860,12 @@ yy114:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy115;
+	case '9':	goto yy106;
 	default:	goto yy25;
 	}
-yy115:	yych = *++YYCURSOR;
+yy106:	yych = *++YYCURSOR;
 	switch(yych){
-	case '.':	goto yy116;
+	case '.':	goto yy107;
 	case '0':
 	case '1':
 	case '2':
@@ -989,14 +876,13 @@ yy115:	yych = *++YYCURSOR;
 	case '7':
 	case '8':
 	case '9':	goto yy25;
-	default:	goto yy117;
+	default:	goto yy108;
 	}
-yy116:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+yy107:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy117;
-yy117:	switch(yych){
-	case '+':	case '-':	goto yy119;
+yy108:	switch(yych){
+	case '+':	case '-':	goto yy110;
 	case '0':
 	case '1':
 	case '2':
@@ -1006,14 +892,14 @@ yy117:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy116;
-	case 'Z':	goto yy118;
+	case '9':	goto yy107;
+	case 'Z':	goto yy109;
 	default:	goto yy25;
 	}
-yy118:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy123;
+yy109:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy114;
 	goto yy25;
-yy119:	yych = *++YYCURSOR;
+yy110:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1024,10 +910,10 @@ yy119:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy120;
+	case '9':	goto yy111;
 	default:	goto yy25;
 	}
-yy120:	yych = *++YYCURSOR;
+yy111:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1038,16 +924,16 @@ yy120:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy121;
+	case '9':	goto yy112;
 	default:	goto yy25;
 	}
-yy121:	yych = *++YYCURSOR;
+yy112:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy123;
-	case ':':	goto yy122;
+	case '\000':	goto yy114;
+	case ':':	goto yy113;
 	default:	goto yy25;
 	}
-yy122:	yych = *++YYCURSOR;
+yy113:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1058,16 +944,14 @@ yy122:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy125;
+	case '9':	goto yy116;
 	default:	goto yy25;
 	}
-yy123:	++YYCURSOR;
-	goto yy124;
-yy124:
-#line 113 "implicit.re"
-{   return "timestamp#iso8601"; }
-#line 1069 "<stdout>"
-yy125:	yych = *++YYCURSOR;
+yy114:	yych = *++YYCURSOR;
+yy115:
+#line 106
+	{   return "timestamp#iso8601"; }
+yy116:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1078,10 +962,10 @@ yy125:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy118;
+	case '9':	goto yy109;
 	default:	goto yy25;
 	}
-yy126:	yych = *++YYCURSOR;
+yy117:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1092,15 +976,15 @@ yy126:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy127;
+	case '9':	goto yy118;
 	default:	goto yy25;
 	}
-yy127:	yych = *++YYCURSOR;
+yy118:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy128;
+	case ':':	goto yy119;
 	default:	goto yy25;
 	}
-yy128:	yych = *++YYCURSOR;
+yy119:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1111,10 +995,10 @@ yy128:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy129;
+	case '9':	goto yy120;
 	default:	goto yy25;
 	}
-yy129:	yych = *++YYCURSOR;
+yy120:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1125,15 +1009,15 @@ yy129:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy130;
+	case '9':	goto yy121;
 	default:	goto yy25;
 	}
-yy130:	yych = *++YYCURSOR;
+yy121:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy131;
+	case ':':	goto yy122;
 	default:	goto yy25;
 	}
-yy131:	yych = *++YYCURSOR;
+yy122:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1144,10 +1028,10 @@ yy131:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy132;
+	case '9':	goto yy123;
 	default:	goto yy25;
 	}
-yy132:	yych = *++YYCURSOR;
+yy123:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1158,12 +1042,12 @@ yy132:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy133;
+	case '9':	goto yy124;
 	default:	goto yy25;
 	}
-yy133:	yych = *++YYCURSOR;
+yy124:	yych = *++YYCURSOR;
 	switch(yych){
-	case '.':	goto yy134;
+	case '.':	goto yy125;
 	case '0':
 	case '1':
 	case '2':
@@ -1174,16 +1058,15 @@ yy133:	yych = *++YYCURSOR;
 	case '7':
 	case '8':
 	case '9':	goto yy25;
-	case 'Z':	goto yy136;
-	default:	goto yy135;
+	case 'Z':	goto yy127;
+	default:	goto yy126;
 	}
-yy134:	++YYCURSOR;
+yy125:	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
-	goto yy135;
-yy135:	switch(yych){
-	case '+':	case '-':	goto yy119;
-	case '0':	goto yy134;
+yy126:	switch(yych){
+	case '+':	case '-':	goto yy110;
+	case '0':	goto yy125;
 	case '1':
 	case '2':
 	case '3':
@@ -1192,22 +1075,20 @@ yy135:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy138;
-	case 'Z':	goto yy118;
+	case '9':	goto yy129;
+	case 'Z':	goto yy109;
 	default:	goto yy25;
 	}
-yy136:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy137;
-yy137:	yych = *++YYCURSOR;
-	goto yy124;
-yy138:	++YYCURSOR;
+yy127:	yych = *++YYCURSOR;
+	if(yych >= '\001')	goto yy25;
+yy128:	yych = *++YYCURSOR;
+	goto yy115;
+yy129:	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
-	goto yy139;
-yy139:	switch(yych){
-	case '+':	case '-':	goto yy119;
-	case '0':	goto yy134;
+yy130:	switch(yych){
+	case '+':	case '-':	goto yy110;
+	case '0':	goto yy125;
 	case '1':
 	case '2':
 	case '3':
@@ -1216,11 +1097,11 @@ yy139:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy138;
-	case 'Z':	goto yy136;
+	case '9':	goto yy129;
+	case 'Z':	goto yy127;
 	default:	goto yy25;
 	}
-yy140:	yych = *++YYCURSOR;
+yy131:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1229,12 +1110,12 @@ yy140:	yych = *++YYCURSOR;
 	case '4':
 	case '5':
 	case '6':
-	case '7':	goto yy155;
+	case '7':	goto yy146;
 	case '8':
-	case '9':	goto yy153;
-	default:	goto yy143;
+	case '9':	goto yy144;
+	default:	goto yy134;
 	}
-yy141:	yych = *++YYCURSOR;
+yy132:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1245,15 +1126,14 @@ yy141:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy153;
-	default:	goto yy152;
+	case '9':	goto yy144;
+	default:	goto yy143;
 	}
-yy142:	++YYCURSOR;
+yy133:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy143;
-yy143:	switch(yych){
-	case 0x00:	goto yy149;
+yy134:	switch(yych){
+	case '\000':	goto yy140;
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -1261,22 +1141,20 @@ yy143:	switch(yych){
 	case '4':
 	case '5':
 	case '6':
-	case '7':	goto yy142;
-	case '.':	goto yy50;
+	case '7':	goto yy133;
+	case '.':	goto yy49;
 	case '8':
-	case '9':	goto yy151;
-	case ':':	goto yy49;
+	case '9':	goto yy142;
 	default:	goto yy25;
 	}
-yy144:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy25;
-	goto yy146;
-yy145:	++YYCURSOR;
+yy135:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy25;
+	goto yy137;
+yy136:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy146;
-yy146:	switch(yych){
-	case 0x00:	goto yy147;
+yy137:	switch(yych){
+	case '\000':	goto yy138;
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -1296,26 +1174,21 @@ yy146:	switch(yych){
 	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;
+	case 'f':	goto yy136;
+	default:	goto yy25;
+	}
+yy138:	yych = *++YYCURSOR;
+yy139:
+#line 88
+	{   return "int#hex"; }
+yy140:	yych = *++YYCURSOR;
+yy141:
+#line 90
+	{   return "int#oct"; }
+yy142:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy152;
-yy152:	switch(yych){
+yy143:	switch(yych){
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -1325,12 +1198,11 @@ yy152:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy151;
-	case '.':	goto yy50;
-	case ':':	goto yy49;
+	case '9':	goto yy142;
+	case '.':	goto yy49;
 	default:	goto yy25;
 	}
-yy153:	yych = *++YYCURSOR;
+yy144:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1341,15 +1213,15 @@ yy153:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy154;
-	default:	goto yy152;
+	case '9':	goto yy145;
+	default:	goto yy143;
 	}
-yy154:	yych = *++YYCURSOR;
+yy145:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy76;
-	default:	goto yy152;
+	case '-':	goto yy67;
+	default:	goto yy143;
 	}
-yy155:	yych = *++YYCURSOR;
+yy146:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1358,256 +1230,222 @@ yy155:	yych = *++YYCURSOR;
 	case '4':
 	case '5':
 	case '6':
-	case '7':	goto yy156;
+	case '7':	goto yy147;
 	case '8':
-	case '9':	goto yy154;
-	default:	goto yy143;
+	case '9':	goto yy145;
+	default:	goto yy134;
 	}
-yy156:	yych = *++YYCURSOR;
+yy147:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy76;
-	default:	goto yy143;
+	case '-':	goto yy67;
+	default:	goto yy134;
 	}
+yy148:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'I':	goto yy151;
+	case 'i':	goto yy150;
+	default:	goto yy25;
+	}
+yy149:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\000':	goto yy51;
+	case 'x':	goto yy135;
+	default:	goto yy134;
+	}
+yy150:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'n':	goto yy157;
+	default:	goto yy25;
+	}
+yy151:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'N':	goto yy152;
+	case 'n':	goto yy153;
+	default:	goto yy25;
+	}
+yy152:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'F':	goto yy154;
+	default:	goto yy25;
+	}
+yy153:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'f':	goto yy154;
+	default:	goto yy25;
+	}
+yy154:	yych = *++YYCURSOR;
+	if(yych >= '\001')	goto yy25;
+yy155:	yych = *++YYCURSOR;
+yy156:
+#line 100
+	{   return "float#neginf"; }
 yy157:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'I':	goto yy160;
-	case 'i':	goto yy159;
+	case 'f':	goto yy154;
 	default:	goto yy25;
 	}
 yy158:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy52;
-	case 'x':	goto yy144;
-	default:	goto yy143;
+	case 'I':	goto yy33;
+	case 'i':	goto yy32;
+	default:	goto yy25;
 	}
 yy159:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'n':	goto yy166;
+	case 'L':	goto yy166;
 	default:	goto yy25;
 	}
 yy160:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'N':	goto yy161;
-	case 'n':	goto yy162;
+	case 'l':	goto yy161;
 	default:	goto yy25;
 	}
 yy161:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'F':	goto yy163;
+	case 's':	goto yy162;
 	default:	goto yy25;
 	}
 yy162:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'f':	goto yy163;
+	case 'e':	goto yy163;
 	default:	goto yy25;
 	}
 yy163:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy164;
-yy164:	++YYCURSOR;
-	goto yy165;
+	if(yych >= '\001')	goto yy25;
+yy164:	yych = *++YYCURSOR;
 yy165:
-#line 107 "implicit.re"
-{   return "float#neginf"; }
-#line 1412 "<stdout>"
+#line 86
+	{   return "bool#no"; }
 yy166:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'f':	goto yy163;
+	case 'S':	goto yy167;
 	default:	goto yy25;
 	}
 yy167:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'I':	goto yy33;
-	case 'i':	goto yy32;
+	case 'E':	goto yy163;
 	default:	goto yy25;
 	}
 yy168:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'L':	goto yy175;
+	case 'l':	goto yy169;
 	default:	goto yy25;
 	}
 yy169:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy170;
+	case 's':	goto yy170;
 	default:	goto yy25;
 	}
 yy170:	yych = *++YYCURSOR;
 	switch(yych){
-	case 's':	goto yy171;
+	case 'e':	goto yy163;
 	default:	goto yy25;
 	}
 yy171:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'e':	goto yy172;
+	case 'F':	goto yy163;
 	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;
+	case 'f':	goto yy163;
 	default:	goto yy25;
 	}
+yy173:	yych = *++YYCURSOR;
+	if(yych >= '\001')	goto yy25;
+yy174:	yych = *++YYCURSOR;
+yy175:
+#line 84
+	{   return "bool#yes"; }
 yy176:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'E':	goto yy172;
+	case 'f':	goto yy163;
 	default:	goto yy25;
 	}
 yy177:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy178;
+	case 'S':	goto yy173;
 	default:	goto yy25;
 	}
 yy178:	yych = *++YYCURSOR;
 	switch(yych){
-	case 's':	goto yy179;
+	case 's':	goto yy173;
 	default:	goto yy25;
 	}
 yy179:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'e':	goto yy172;
+	case 's':	goto yy173;
 	default:	goto yy25;
 	}
 yy180:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'F':	goto yy172;
+	case 'U':	goto yy183;
 	default:	goto yy25;
 	}
 yy181:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'f':	goto yy172;
+	case 'u':	goto yy182;
 	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;
+	case 'e':	goto yy173;
 	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;
+yy183:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'E':	goto yy182;
+	case 'E':	goto yy173;
 	default:	goto yy25;
 	}
-yy190:	yych = *++YYCURSOR;
+yy184:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'u':	goto yy191;
+	case 'u':	goto yy185;
 	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;
+yy185:	yych = *++YYCURSOR;
 	switch(yych){
-	case 's':	goto yy182;
+	case 'e':	goto yy173;
 	default:	goto yy25;
 	}
-yy195:	yych = *++YYCURSOR;
+yy186:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'L':	goto yy199;
+	case 'L':	goto yy190;
 	default:	goto yy25;
 	}
-yy196:	yych = *++YYCURSOR;
+yy187:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy197;
+	case 'l':	goto yy188;
 	default:	goto yy25;
 	}
-yy197:	yych = *++YYCURSOR;
+yy188:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy198;
+	case 'l':	goto yy189;
 	default:	goto yy25;
 	}
-yy198:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy6;
+yy189:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy6;
 	goto yy25;
-yy199:	yych = *++YYCURSOR;
+yy190:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'L':	goto yy198;
+	case 'L':	goto yy189;
 	default:	goto yy25;
 	}
-yy200:	yych = *++YYCURSOR;
+yy191:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy201;
+	case 'l':	goto yy192;
 	default:	goto yy25;
 	}
-yy201:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 'l':	goto yy198;
+yy192:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'l':	goto yy189;
 	default:	goto yy25;
 	}
 }
-#line 125 "implicit.re"
+#line 118
 
 
 }
 
-/* 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 )
 {
@@ -1616,19 +1454,17 @@ syck_type_id_to_uri( char *type_id )
     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);
+	goto yy193;
+yy194:	++YYCURSOR;
+yy193:
+	if((YYLIMIT - YYCURSOR) < 21) YYFILL(21);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x00:	goto yy204;
-	case '!':	goto yy208;
+	case '\000':	goto yy195;
+	case '!':	goto yy199;
 	case '0':
 	case '1':
 	case '2':
@@ -1684,22 +1520,22 @@ yy202:
 	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;
+	case 'z':	goto yy201;
+	case 't':	goto yy196;
+	case 'x':	goto yy198;
+	default:	goto yy202;
 	}
-yy204:	YYCURSOR = YYMARKER;
+yy195:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy206;
+	case 0:	goto yy197;
 	}
-yy205:	yyaccept = 0;
+yy196:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy212;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
+	case ',':	goto yy207;
+	case '-':	goto yy203;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
 	case '0':
 	case '1':
 	case '2':
@@ -1758,15 +1594,14 @@ yy205:	yyaccept = 0;
 	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;
+	case 'z':	goto yy205;
+	case 'a':	goto yy237;
+	default:	goto yy197;
+	}
+yy197:
+#line 170
+	{   return syck_taguri( YAML_DOMAIN, type_id, strlen( type_id ) ); }
+yy198:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
 	case ',':	case '.':
@@ -1830,23 +1665,21 @@ yy207:	yyaccept = 0;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy215;
-	case '-':	goto yy236;
-	default:	goto yy206;
+	case 'z':	goto yy206;
+	case '-':	goto yy227;
+	default:	goto yy197;
 	}
-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;
+yy199:	yych = *++YYCURSOR;
+yy200:
+#line 144
+	{   return syck_xprivate( type_id + 1, strlen( type_id ) - 1 ); }
+yy201:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy212;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
+	case ',':	goto yy207;
+	case '-':	goto yy203;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
 	case '0':
 	case '1':
 	case '2':
@@ -1906,17 +1739,16 @@ yy210:	yyaccept = 0;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy214;
-	default:	goto yy206;
+	case 'z':	goto yy205;
+	default:	goto yy197;
 	}
-yy211:	yych = *++YYCURSOR;
-	goto yy206;
-yy212:	++YYCURSOR;
+yy202:	yych = *++YYCURSOR;
+	goto yy197;
+yy203:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy213;
-yy213:	switch(yych){
-	case '-':	goto yy212;
+yy204:	switch(yych){
+	case '-':	goto yy203;
 	case '0':
 	case '1':
 	case '2':
@@ -1976,18 +1808,17 @@ yy213:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy214;
-	default:	goto yy204;
+	case 'z':	goto yy205;
+	default:	goto yy195;
 	}
-yy214:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+yy205:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy215;
-yy215:	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy212;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
+yy206:	switch(yych){
+	case ',':	goto yy207;
+	case '-':	goto yy203;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
 	case '0':
 	case '1':
 	case '2':
@@ -2047,10 +1878,10 @@ yy215:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy214;
-	default:	goto yy204;
+	case 'z':	goto yy205;
+	default:	goto yy195;
 	}
-yy216:	yych = *++YYCURSOR;
+yy207:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2061,10 +1892,10 @@ yy216:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy224;
-	default:	goto yy204;
+	case '9':	goto yy215;
+	default:	goto yy195;
 	}
-yy217:	++YYCURSOR;
+yy208:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
@@ -2127,14 +1958,13 @@ yy217:	++YYCURSOR;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy220;
-	default:	goto yy204;
+	case 'z':	goto yy211;
+	default:	goto yy195;
 	}
-yy218:	++YYCURSOR;
-	goto yy219;
-yy219:
-#line 178 "implicit.re"
-{   char *domain = S_ALLOC_N( char, ( YYCURSOR - type_id ) + 15 );
+yy209:	yych = *++YYCURSOR;
+yy210:
+#line 146
+	{   char *domain = S_ALLOC_N( char, ( YYCURSOR - type_id ) + 15 );
                     char *uri;
 
                     domain[0] = '\0';
@@ -2146,16 +1976,14 @@ yy219:
                     S_FREE( domain );
                     return uri;
                 }
-#line 2149 "<stdout>"
-yy220:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+yy211:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	goto yy221;
-yy221:	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy222;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
+yy212:	switch(yych){
+	case ',':	goto yy207;
+	case '-':	goto yy213;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
 	case '0':
 	case '1':
 	case '2':
@@ -2215,15 +2043,14 @@ yy221:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy220;
-	default:	goto yy204;
+	case 'z':	goto yy211;
+	default:	goto yy195;
 	}
-yy222:	++YYCURSOR;
+yy213:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy223;
-yy223:	switch(yych){
-	case '-':	goto yy222;
+yy214:	switch(yych){
+	case '-':	goto yy213;
 	case '0':
 	case '1':
 	case '2':
@@ -2283,10 +2110,10 @@ yy223:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy220;
-	default:	goto yy204;
+	case 'z':	goto yy211;
+	default:	goto yy195;
 	}
-yy224:	yych = *++YYCURSOR;
+yy215:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2297,10 +2124,10 @@ yy224:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy225;
-	default:	goto yy204;
+	case '9':	goto yy216;
+	default:	goto yy195;
 	}
-yy225:	yych = *++YYCURSOR;
+yy216:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2311,10 +2138,10 @@ yy225:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy226;
-	default:	goto yy204;
+	case '9':	goto yy217;
+	default:	goto yy195;
 	}
-yy226:	yych = *++YYCURSOR;
+yy217:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2325,16 +2152,16 @@ yy226:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy227;
-	default:	goto yy204;
+	case '9':	goto yy218;
+	default:	goto yy195;
 	}
-yy227:	yych = *++YYCURSOR;
+yy218:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy228;
-	case '/':	goto yy229;
-	default:	goto yy204;
+	case '-':	goto yy219;
+	case '/':	goto yy220;
+	default:	goto yy195;
 	}
-yy228:	yych = *++YYCURSOR;
+yy219:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2345,14 +2172,13 @@ yy228:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy231;
-	default:	goto yy204;
+	case '9':	goto yy222;
+	default:	goto yy195;
 	}
-yy229:	++YYCURSOR;
-	goto yy230;
-yy230:
-#line 191 "implicit.re"
-{   char *domain = S_ALLOC_N( char, YYCURSOR - type_id );
+yy220:	yych = *++YYCURSOR;
+yy221:
+#line 159
+	{   char *domain = S_ALLOC_N( char, YYCURSOR - type_id );
                                char *uri;
 
                                domain[0] = '\0';
@@ -2362,8 +2188,7 @@ yy230:
                                S_FREE( domain );
                                return uri;
                             }
-#line 2365 "<stdout>"
-yy231:	yych = *++YYCURSOR;
+yy222:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2374,16 +2199,16 @@ yy231:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy232;
-	default:	goto yy204;
+	case '9':	goto yy223;
+	default:	goto yy195;
 	}
-yy232:	yych = *++YYCURSOR;
+yy223:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy233;
-	case '/':	goto yy229;
-	default:	goto yy204;
+	case '-':	goto yy224;
+	case '/':	goto yy220;
+	default:	goto yy195;
 	}
-yy233:	yych = *++YYCURSOR;
+yy224:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2394,10 +2219,10 @@ yy233:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy234;
-	default:	goto yy204;
+	case '9':	goto yy225;
+	default:	goto yy195;
 	}
-yy234:	yych = *++YYCURSOR;
+yy225:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2408,112 +2233,109 @@ yy234:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy235;
-	default:	goto yy204;
+	case '9':	goto yy226;
+	default:	goto yy195;
 	}
-yy235:	yych = *++YYCURSOR;
+yy226:	yych = *++YYCURSOR;
 	switch(yych){
-	case '/':	goto yy229;
-	default:	goto yy204;
+	case '/':	goto yy220;
+	default:	goto yy195;
 	}
-yy236:	yych = *++YYCURSOR;
+yy227:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'p':	goto yy237;
-	default:	goto yy213;
+	case 'p':	goto yy228;
+	default:	goto yy204;
 	}
-yy237:	yych = *++YYCURSOR;
+yy228:	yych = *++YYCURSOR;
 	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'r':	goto yy238;
-	default:	goto yy213;
+	case ',':	goto yy207;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
+	case 'r':	goto yy229;
+	default:	goto yy204;
 	}
-yy238:	yych = *++YYCURSOR;
+yy229:	yych = *++YYCURSOR;
 	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'i':	goto yy239;
-	default:	goto yy213;
+	case ',':	goto yy207;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
+	case 'i':	goto yy230;
+	default:	goto yy204;
 	}
-yy239:	yych = *++YYCURSOR;
+yy230:	yych = *++YYCURSOR;
 	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'v':	goto yy240;
-	default:	goto yy213;
+	case ',':	goto yy207;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
+	case 'v':	goto yy231;
+	default:	goto yy204;
 	}
-yy240:	yych = *++YYCURSOR;
+yy231:	yych = *++YYCURSOR;
 	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'a':	goto yy241;
-	default:	goto yy213;
+	case ',':	goto yy207;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
+	case 'a':	goto yy232;
+	default:	goto yy204;
 	}
-yy241:	yych = *++YYCURSOR;
+yy232:	yych = *++YYCURSOR;
 	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 't':	goto yy242;
-	default:	goto yy213;
+	case ',':	goto yy207;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
+	case 't':	goto yy233;
+	default:	goto yy204;
 	}
-yy242:	yych = *++YYCURSOR;
+yy233:	yych = *++YYCURSOR;
 	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'e':	goto yy243;
-	default:	goto yy213;
+	case ',':	goto yy207;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
+	case 'e':	goto yy234;
+	default:	goto yy204;
 	}
-yy243:	yych = *++YYCURSOR;
+yy234:	yych = *++YYCURSOR;
 	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case ':':	goto yy244;
-	default:	goto yy213;
+	case ',':	goto yy207;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
+	case ':':	goto yy235;
+	default:	goto yy204;
 	}
-yy244:	++YYCURSOR;
-	goto yy245;
-yy245:
-#line 174 "implicit.re"
-{   return syck_strndup( type_id, strlen( type_id ) ); }
-#line 2485 "<stdout>"
-yy246:	yych = *++YYCURSOR;
+yy235:	yych = *++YYCURSOR;
+yy236:
+#line 142
+	{   return type_id; }
+yy237:	yych = *++YYCURSOR;
 	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'g':	goto yy247;
-	default:	goto yy213;
+	case ',':	goto yy207;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
+	case 'g':	goto yy238;
+	default:	goto yy204;
 	}
-yy247:	yych = *++YYCURSOR;
+yy238:	yych = *++YYCURSOR;
 	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case ':':	goto yy248;
-	default:	goto yy213;
+	case ',':	goto yy207;
+	case '.':	goto yy208;
+	case '/':	goto yy209;
+	case ':':	goto yy239;
+	default:	goto yy204;
 	}
-yy248:	yych = *++YYCURSOR;
+yy239:	yych = *++YYCURSOR;
 	switch(yych){
 	case ',':
 	case '-':
-	case '.':	goto yy204;
-	default:	goto yy250;
+	case '.':	goto yy195;
+	default:	goto yy241;
 	}
-yy249:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+yy240:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy250;
-yy250:	switch(yych){
-	case ',':	goto yy253;
-	case '-':	goto yy251;
-	case '.':	goto yy254;
+yy241:	switch(yych){
+	case ',':	goto yy244;
+	case '-':	goto yy242;
+	case '.':	goto yy245;
 	case '0':
 	case '1':
 	case '2':
@@ -2573,15 +2395,14 @@ yy250:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy249;
-	default:	goto yy204;
+	case 'z':	goto yy240;
+	default:	goto yy195;
 	}
-yy251:	++YYCURSOR;
+yy242:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy252;
-yy252:	switch(yych){
-	case '-':	goto yy251;
+yy243:	switch(yych){
+	case '-':	goto yy242;
 	case '0':
 	case '1':
 	case '2':
@@ -2641,10 +2462,10 @@ yy252:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy249;
-	default:	goto yy204;
+	case 'z':	goto yy240;
+	default:	goto yy195;
 	}
-yy253:	yych = *++YYCURSOR;
+yy244:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2655,10 +2476,10 @@ yy253:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy259;
-	default:	goto yy204;
+	case '9':	goto yy250;
+	default:	goto yy195;
 	}
-yy254:	++YYCURSOR;
+yy245:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
@@ -2721,17 +2542,16 @@ yy254:	++YYCURSOR;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy255;
-	default:	goto yy204;
+	case 'z':	goto yy246;
+	default:	goto yy195;
 	}
-yy255:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+yy246:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	goto yy256;
-yy256:	switch(yych){
-	case ',':	goto yy253;
-	case '-':	goto yy257;
-	case '.':	goto yy254;
+yy247:	switch(yych){
+	case ',':	goto yy244;
+	case '-':	goto yy248;
+	case '.':	goto yy245;
 	case '0':
 	case '1':
 	case '2':
@@ -2791,15 +2611,14 @@ yy256:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy255;
-	default:	goto yy204;
+	case 'z':	goto yy246;
+	default:	goto yy195;
 	}
-yy257:	++YYCURSOR;
+yy248:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy258;
-yy258:	switch(yych){
-	case '-':	goto yy257;
+yy249:	switch(yych){
+	case '-':	goto yy248;
 	case '0':
 	case '1':
 	case '2':
@@ -2859,10 +2678,10 @@ yy258:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy255;
-	default:	goto yy204;
+	case 'z':	goto yy246;
+	default:	goto yy195;
 	}
-yy259:	yych = *++YYCURSOR;
+yy250:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2873,10 +2692,10 @@ yy259:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy260;
-	default:	goto yy204;
+	case '9':	goto yy251;
+	default:	goto yy195;
 	}
-yy260:	yych = *++YYCURSOR;
+yy251:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2887,10 +2706,10 @@ yy260:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy261;
-	default:	goto yy204;
+	case '9':	goto yy252;
+	default:	goto yy195;
 	}
-yy261:	yych = *++YYCURSOR;
+yy252:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2901,16 +2720,16 @@ yy261:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy262;
-	default:	goto yy204;
+	case '9':	goto yy253;
+	default:	goto yy195;
 	}
-yy262:	yych = *++YYCURSOR;
+yy253:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy263;
-	case ':':	goto yy264;
-	default:	goto yy204;
+	case '-':	goto yy254;
+	case ':':	goto yy255;
+	default:	goto yy195;
 	}
-yy263:	yych = *++YYCURSOR;
+yy254:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2921,16 +2740,14 @@ yy263:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy266;
-	default:	goto yy204;
+	case '9':	goto yy257;
+	default:	goto yy195;
 	}
-yy264:	++YYCURSOR;
-	goto yy265;
-yy265:
-#line 172 "implicit.re"
-{   return syck_strndup( type_id, strlen( type_id ) ); }
-#line 2932 "<stdout>"
-yy266:	yych = *++YYCURSOR;
+yy255:	yych = *++YYCURSOR;
+yy256:
+#line 140
+	{   return type_id; }
+yy257:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2941,16 +2758,16 @@ yy266:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy267;
-	default:	goto yy204;
+	case '9':	goto yy258;
+	default:	goto yy195;
 	}
-yy267:	yych = *++YYCURSOR;
+yy258:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy268;
-	case ':':	goto yy264;
-	default:	goto yy204;
+	case '-':	goto yy259;
+	case ':':	goto yy255;
+	default:	goto yy195;
 	}
-yy268:	yych = *++YYCURSOR;
+yy259:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2961,10 +2778,10 @@ yy268:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy269;
-	default:	goto yy204;
+	case '9':	goto yy260;
+	default:	goto yy195;
 	}
-yy269:	yych = *++YYCURSOR;
+yy260:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2975,16 +2792,17 @@ yy269:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy270;
-	default:	goto yy204;
+	case '9':	goto yy261;
+	default:	goto yy195;
 	}
-yy270:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case ':':	goto yy264;
-	default:	goto yy204;
+yy261:	yych = *++YYCURSOR;
+	switch(yych){
+	case ':':	goto yy255;
+	default:	goto yy195;
 	}
 }
-#line 204 "implicit.re"
+#line 172
 
 
 }
+
diff --git a/ext/syck/node.c b/ext/syck/node.c
index 28fc78c077..f999700554 100644
--- a/ext/syck/node.c
+++ b/ext/syck/node.c
@@ -7,8 +7,8 @@
  * Copyright (C) 2003 why the lucky stiff
  */
 
-#include "ruby.h"
 #include "syck.h"
+#include "ruby.h"
 
 /*
  * Node allocation functions
@@ -33,15 +33,9 @@ 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 );
 }
 
@@ -52,7 +46,6 @@ syck_alloc_map()
     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 );
@@ -71,7 +64,6 @@ syck_alloc_seq()
     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 );
@@ -91,7 +83,6 @@ syck_alloc_str()
     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;
@@ -100,20 +91,19 @@ syck_alloc_str()
 }
 
 SyckNode *
-syck_new_str( char *str, enum scalar_style style )
+syck_new_str( char *str )
 {
-    return syck_new_str2( str, strlen( str ), style );
+    return syck_new_str2( str, strlen( str ) );
 }
 
 SyckNode *
-syck_new_str2( char *str, long len, enum scalar_style style )
+syck_new_str2( char *str, long len )
 {
     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';
 
@@ -121,28 +111,6 @@ syck_new_str2( char *str, long len, enum scalar_style style )
 }
 
 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;
@@ -179,22 +147,6 @@ syck_new_map( SYMID key, SYMID value )
 }
 
 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;
@@ -304,20 +256,6 @@ syck_new_seq( SYMID value )
 }
 
 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;
@@ -345,17 +283,6 @@ syck_seq_count( SyckNode *seq )
     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 )
 {
@@ -370,38 +297,27 @@ syck_seq_read( SyckNode *seq, long idx )
 void
 syck_free_members( SyckNode *n )
 {
-    if ( n == NULL ) return;
-
     switch ( n->kind  )
     {
         case syck_str_kind:
-            if ( n->data.str != NULL ) 
+            if ( n->data.str->ptr != 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;
-            }
+            S_FREE( n->data.list->items );
+            S_FREE( n->data.list );
         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;
-            }
+            S_FREE( n->data.pairs->keys );
+            S_FREE( n->data.pairs->values );
+            S_FREE( n->data.pairs );
         break;
     }
 }
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index 76e8279601..ecb39c344a 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -1,11 +1,10 @@
-/* -*- indent-tabs-mode: nil -*- */
 /*
  * rubyext.c
  *
  * $Author$
  * $Date$
  *
- * Copyright (C) 2003-2005 why the lucky stiff
+ * Copyright (C) 2003 why the lucky stiff
  */
 
 #include "ruby.h"
@@ -16,23 +15,23 @@
 typedef struct RVALUE {
     union {
 #if 0
-    struct {
-        unsigned long flags;    /* always 0 for freed obj */
-        struct RVALUE *next;
-    } free;
+	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;*/
+	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;
 
@@ -49,13 +48,11 @@ typedef struct {
 /*
  * 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 ID s_new, s_utc, s_at, s_to_f, s_to_i, s_read, s_binmode, s_call, s_transfer, s_update, s_dup, s_match, s_keys, s_to_str, s_unpack, s_tr_bang, s_anchors, s_default_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;
+VALUE cDate, cParser, cLoader, cNode, cPrivateType, cDomainType, cBadAlias, cDefaultKey, cMergeKey, cEmitter;
+VALUE oDefaultLoader;
 
 /*
  * my private collection of numerical oddities.
@@ -70,35 +67,25 @@ static VALUE syck_node_transform( VALUE );
 /*
  * handler prototypes
  */
+SYMID rb_syck_parse_handler _((SyckParser *, SyckNode *));
 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));
+int syck_parser_assign_io _((SyckParser *, VALUE));
 
 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;
+	VALUE self, port;
 {
     SYMID oid;
     int taint;
@@ -107,7 +94,7 @@ rb_syck_compile(self, port)
     bytestring_t *sav; 
 
     SyckParser *parser = syck_new_parser();
-    taint = syck_parser_assign_io(parser, &port);
+	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 );
@@ -115,7 +102,7 @@ rb_syck_compile(self, port)
     oid = syck_parse( parser );
     syck_lookup_sym( parser, oid, (char **)&sav );
 
-    ret = S_ALLOCA_N( char, strlen( sav->buffer ) + 3 );
+    ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
     ret[0] = '\0';
     strcat( ret, "D\n" );
     strcat( ret, sav->buffer );
@@ -149,7 +136,6 @@ rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
         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 );
         }
@@ -164,16 +150,15 @@ rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
  * (returns tainted? boolean)
  */
 int
-syck_parser_assign_io(parser, pport)
-    SyckParser *parser;
-    VALUE *pport;
+syck_parser_assign_io(parser, port)
+	SyckParser *parser;
+	VALUE port;
 {
     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 );
+    if (rb_respond_to(port, s_to_str)) {
+	    taint = OBJ_TAINTED(port); /* original taintedness */
+	    StringValue(port);	       /* possible conversion */
+	    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)) {
@@ -184,7 +169,6 @@ syck_parser_assign_io(parser, pport)
     else {
         rb_raise(rb_eTypeError, "instance of IO needed");
     }
-    *pport = port;
     return taint;
 }
 
@@ -208,85 +192,63 @@ syck_get_hash_aref(hsh, key)
  * creating timestamps
  */
 SYMID
-rb_syck_mktime(str, len)
+rb_syck_mktime(str)
     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;
+    VALUE year, mon, day, hour, min, sec, usec;
 
     /* Year*/
-    if ( ptr[0] != '\0' && len > 0 ) {
-        year = INT2FIX(strtol(ptr, NULL, 10));
-    }
+    ptr[4] = '\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));
-    }
+    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));
-    }
+    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));
-    }
+    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));
-    }
+    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));
-    }
+    while ( !ISDIGIT( *ptr ) ) ptr++;
+    sec = INT2FIX(strtol(ptr, NULL, 10));
 
     /* Millisecond */
     ptr += 2;
-    if ( len > ptr - str && *ptr == '.' )
+    if ( *ptr == '.' )
     {
-        char padded[] = "000000";
-        char *end = ptr + 1;
-        char *p = end;
-        while ( isdigit( *end ) ) end++;
-        if (end - p < sizeof(padded)) {
-            MEMCPY(padded, ptr + 1, char, end - (ptr + 1));
-            p = padded;
-        }
-        usec = strtol(p, NULL, 10);
+        usec = INT2FIX( strtod( ptr, NULL ) * 1000000 );
     }
     else
     {
-        usec = 0;
+        usec = INT2FIX( 0 );
     }
 
+    /* Make UTC time*/
+    time = rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, usec);
+
     /* Time Zone*/
-    while ( len > ptr - str && *ptr != 'Z' && *ptr != '+' && *ptr != '-' && *ptr != '\0' ) ptr++;
-    if ( len > ptr - str && ( *ptr == '-' || *ptr == '+' ) )
+    while ( *ptr != 'Z' && *ptr != '+' && *ptr != '-' && *ptr != '\0' ) ptr++;
+    if ( *ptr == '-' || *ptr == '+' )
     {
-        time_t tz_offset = strtol(ptr, NULL, 10) * 3600;
-        time_t tmp;
+        double tz_offset = 0;
+        double utc_time = 0;
+        tz_offset += strtod(ptr, NULL) * 3600;
 
         while ( *ptr != ':' && *ptr != '\0' ) ptr++;
         if ( *ptr == ':' )
@@ -294,24 +256,81 @@ rb_syck_mktime(str, len)
             ptr += 1;
             if ( tz_offset < 0 )
             {
-                tz_offset -= strtol(ptr, NULL, 10) * 60;
+                tz_offset -= strtod(ptr, NULL) * 60;
             }
             else
             {
-                tz_offset += strtol(ptr, NULL, 10) * 60;
+                tz_offset += strtod(ptr, NULL) * 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));
+        utc_time = NUM2DBL(rb_funcall(time, s_to_f, 0));
+        utc_time -= tz_offset;
+        time = rb_funcall(rb_cTime, s_at, 1, rb_float_new(utc_time));
     }
-    else
+
+    return time;
+}
+
+/*
+ * {generic mode} node handler
+ * - Loads data into Node classes
+ */
+SYMID
+rb_syck_parse_handler(p, n)
+    SyckParser *p;
+    SyckNode *n;
+{
+    VALUE t, obj, v = Qnil;
+    int i;
+    struct parser_xtra *bonus;
+
+    obj = rb_obj_alloc(cNode);
+    if ( n->type_id != NULL )
     {
-        /* Make UTC time*/
-        return rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, LONG2NUM(usec));
+        t = rb_str_new2(n->type_id);
+        rb_iv_set(obj, "@type_id", t);
+    }
+
+    switch (n->kind)
+    {
+        case syck_str_kind:
+            rb_iv_set(obj, "@kind", sym_scalar);
+            v = rb_str_new( n->data.str->ptr, n->data.str->len );
+        break;
+
+        case syck_seq_kind:
+            rb_iv_set(obj, "@kind", sym_seq);
+            v = rb_ary_new2( n->data.list->idx );
+            for ( i = 0; i < n->data.list->idx; i++ )
+            {
+                rb_ary_store( v, i, syck_seq_read( n, i ) );
+            }
+        break;
+
+        case syck_map_kind:
+            rb_iv_set(obj, "@kind", sym_map);
+            v = rb_hash_new();
+            for ( i = 0; i < n->data.pairs->idx; i++ )
+            {
+                VALUE key = syck_node_transform( syck_map_read( n, map_key, i ) );
+                VALUE val = rb_ary_new();
+                rb_ary_push(val, syck_map_read( n, map_key, i ));
+                rb_ary_push(val, syck_map_read( n, map_value, i ));
+
+                rb_hash_aset( v, key, val );
+            }
+        break;
     }
+
+    bonus = (struct parser_xtra *)p->bonus;
+    if ( bonus->taint)      OBJ_TAINT( obj );
+	if ( bonus->proc != 0 ) rb_funcall(bonus->proc, s_call, 1, v);
+
+    rb_iv_set(obj, "@value", v);
+    rb_hash_aset(bonus->data, INT2FIX(RHASH(bonus->data)->tbl->num_entries), obj);
+    return obj;
 }
 
 /*
@@ -322,13 +341,57 @@ 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")) )
+	if ( rb_obj_is_kind_of( entry, rb_cHash ) )
+	{
+		rb_funcall( hsh, s_update, 1, entry );
+	}
+    return Qnil;
+}
+
+/*
+ * build a syck node from a Ruby VALUE
+ */
+SyckNode *
+rb_new_syck_node( obj, type_id )
+    VALUE obj, type_id;
+{
+    long i = 0;
+    SyckNode *n = NULL;
+
+    if (rb_respond_to(obj, s_to_str)) 
     {
-        entry = tmp;
-        rb_funcall( hsh, s_update, 1, entry );
+	    StringValue(obj);	       /* possible conversion */
+        n = syck_alloc_str();
+        n->data.str->ptr = RSTRING(obj)->ptr;
+        n->data.str->len = RSTRING(obj)->len;
     }
-    return Qnil;
+	else if ( rb_obj_is_kind_of( obj, rb_cArray ) )
+    {
+        n = syck_alloc_seq();
+        for ( i = 0; i < RARRAY(obj)->len; i++ )
+        {
+            syck_seq_add(n, rb_ary_entry(obj, i));
+        }
+    }
+    else if ( rb_obj_is_kind_of( obj, rb_cHash ) )
+    {
+        VALUE keys;
+        n = syck_alloc_map();
+        keys = rb_funcall( obj, s_keys, 0 );
+        for ( i = 0; i < RARRAY(keys)->len; i++ )
+        {
+            VALUE key = rb_ary_entry(keys, i);
+            syck_map_add(n, key, rb_hash_aref(obj, key));
+        }
+    }
+
+    if ( n!= NULL && rb_respond_to( type_id, s_to_str ) ) 
+    {
+        StringValue(type_id);
+        n->type_id = syck_strndup( RSTRING(type_id)->ptr, RSTRING(type_id)->len );
+    }
+
+    return n;
 }
 
 /*
@@ -344,16 +407,11 @@ yaml_org_handler( n, ref )
     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 )
+            if ( type_id == NULL || strcmp( type_id, "str" ) == 0 )
             {
                 obj = rb_str_new( n->data.str->ptr, n->data.str->len );
             }
@@ -379,69 +437,17 @@ yaml_org_handler( n, ref )
             }
             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() );
@@ -463,11 +469,11 @@ yaml_org_handler( n, ref )
             }
             else if ( strcmp( type_id, "timestamp#iso8601" ) == 0 )
             {
-                obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
+                obj = rb_syck_mktime( n->data.str->ptr );
             }
             else if ( strcmp( type_id, "timestamp#spaced" ) == 0 )
             {
-                obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
+                obj = rb_syck_mktime( n->data.str->ptr );
             }
             else if ( strcmp( type_id, "timestamp#ymd" ) == 0 )
             {
@@ -488,40 +494,20 @@ yaml_org_handler( n, ref )
                 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 );
+                obj = rb_syck_mktime( n->data.str->ptr );
             }
+			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
             {
                 transferred = 0;
@@ -549,48 +535,46 @@ yaml_org_handler( n, ref )
             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;
-                        }
-                    }
-                }
+				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 );
-                }
+				if ( ! skip_aset )
+				{
+					rb_hash_aset( obj, k, v );
+				}
             }
         break;
     }
@@ -599,8 +583,6 @@ yaml_org_handler( n, ref )
     return transferred;
 }
 
-static void syck_node_mark( SyckNode *n );
-
 /*
  * {native mode} node handler
  * - Converts data into native Ruby types
@@ -611,30 +593,30 @@ rb_syck_load_handler(p, n)
     SyckNode *n;
 {
     VALUE obj = Qnil;
-    struct parser_xtra *bonus = (struct parser_xtra *)p->bonus;
-    VALUE resolver = bonus->resolver;
-    if ( NIL_P( resolver ) )
-    {
-        resolver = oDefaultResolver;
-    }
+    struct parser_xtra *bonus;
 
     /*
-     * Create node, 
+     * Attempt common transfers
      */
-    obj = rb_funcall( resolver, s_node_import, 1, Data_Wrap_Struct( cNode, NULL, NULL, n ) );
+    int transferred = yaml_org_handler(n, &obj);
+    if ( transferred == 0 && n->type_id != NULL )
+    {
+        obj = rb_funcall( oDefaultLoader, s_transfer, 2, rb_str_new2( n->type_id ), obj );
+    }
 
     /*
      * ID already set, let's alter the symbol table to accept the new object
      */
-    if (n->id > 0 && !NIL_P(obj))
+    if (n->id > 0)
     {
         MEMCPY((void *)n->id, (void *)obj, RVALUE, 1);
         MEMZERO((void *)obj, RVALUE, 1);
         obj = n->id;
     }
 
+    bonus = (struct parser_xtra *)p->bonus;
     if ( bonus->taint)      OBJ_TAINT( obj );
-    if ( bonus->proc != 0 ) rb_funcall(bonus->proc, s_call, 1, 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;
@@ -679,43 +661,30 @@ rb_syck_bad_anchor_handler(p, a)
  * 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 ); 
-    }
+syck_set_model( parser, input, model )
+	SyckParser *parser;
+	VALUE input, model;
+{
+	if ( model == sym_generic )
+	{
+		syck_parser_handler( parser, rb_syck_parse_handler );
+		syck_parser_implicit_typing( parser, 1 );
+		syck_parser_taguri_expansion( parser, 1 );
+	}
+	else
+	{
+		syck_parser_handler( parser, rb_syck_load_handler );
+		syck_parser_implicit_typing( parser, 1 );
+		syck_parser_taguri_expansion( parser, 0 );
+	}
     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
  */
@@ -723,76 +692,45 @@ 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 );
-    }
+    rb_gc_mark(parser->root);
+    rb_gc_mark(parser->root_on_error);
 }
 
 /*
- * Free the parser and any bonus attachment.
+ * YAML::Syck::Parser.new
  */
-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;
+syck_parser_new(argc, argv, class)
+    int argc;
+    VALUE *argv;
+	VALUE class;
 {
-    VALUE pobj;
+	VALUE pobj, options, init_argv[1];
     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 );
+    rb_scan_args(argc, argv, "01", &options);
+	pobj = Data_Wrap_Struct( class, syck_mark_parser, syck_free_parser, parser );
 
     syck_parser_set_root_on_error( parser, Qnil );
 
-    return pobj;
+    if ( ! rb_obj_is_instance_of( options, rb_cHash ) )
+    {
+        options = rb_hash_new();
+    }
+	init_argv[0] = options;
+	rb_obj_call_init(pobj, 1, init_argv);
+	return pobj;
 }
 
 /*
- * YAML::Syck::Parser.initialize( resolver, options )
+ * YAML::Syck::Parser.initialize( options )
  */
 static VALUE
-syck_parser_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_parser_initialize( self, options )
+    VALUE self, options;
 {
-    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;
+	rb_iv_set(self, "@options", options);
+	return self;
 }
 
 /*
@@ -802,14 +740,13 @@ static VALUE
 syck_parser_bufsize_set( self, size )
     VALUE self, size;
 {
-    SyckParser *parser;
+	SyckParser *parser;
 
+	Data_Get_Struct(self, 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;
+        parser->bufsize = NUM2INT(rb_funcall(size, s_to_i, 0));
     }
-    return self;
+	return self;
 }
 
 /*
@@ -819,10 +756,10 @@ static VALUE
 syck_parser_bufsize_get( self )
     VALUE self;
 {
-    SyckParser *parser;
+	SyckParser *parser;
 
-    Data_Get_Struct(self, SyckParser, parser);
-    return INT2FIX( parser->bufsize );
+	Data_Get_Struct(self, SyckParser, parser);
+	return INT2FIX( parser->bufsize );
 }
 
 /*
@@ -832,25 +769,26 @@ VALUE
 syck_parser_load(argc, argv, self)
     int argc;
     VALUE *argv;
-    VALUE self;
+	VALUE self;
 {
     VALUE port, proc, model, input;
-    SyckParser *parser;
-    struct parser_xtra *bonus;
+	SyckParser *parser;
+    struct parser_xtra bonus;
+    volatile VALUE hash;	/* protect from GC */
 
     rb_scan_args(argc, argv, "11", &port, &proc);
+	Data_Get_Struct(self, SyckParser, parser);
 
-    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 );
+	input = rb_hash_aref( rb_iv_get( self, "@options" ), sym_input );
+	model = rb_hash_aref( rb_iv_get( self, "@options" ), sym_model );
+	syck_set_model( parser, 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;
+	bonus.taint = syck_parser_assign_io(parser, port);
+    bonus.data = hash = rb_hash_new();
+	if ( NIL_P( proc ) ) bonus.proc = 0;
+    else                 bonus.proc = proc;
+    
+	parser->bonus = (void *)&bonus;
 
     return syck_parse( parser );
 }
@@ -862,379 +800,155 @@ VALUE
 syck_parser_load_documents(argc, argv, self)
     int argc;
     VALUE *argv;
-    VALUE self;
+	VALUE self;
 {
     VALUE port, proc, v, input, model;
-    SyckParser *parser;
-    struct parser_xtra *bonus;
+	SyckParser *parser;
+    struct parser_xtra bonus;
+    volatile VALUE hash;
 
     rb_scan_args(argc, argv, "1&", &port, &proc);
+	Data_Get_Struct(self, SyckParser, parser);
 
-    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 );
+	input = rb_hash_aref( rb_iv_get( self, "@options" ), sym_input );
+	model = rb_hash_aref( rb_iv_get( self, "@options" ), sym_model );
+	syck_set_model( parser, 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;
-
+	bonus.taint = syck_parser_assign_io(parser, port);
     while ( 1 )
-    {
+	{
         /* Reset hash for tracking nodes */
-        bonus->data = rb_hash_new();
+        bonus.data = hash = rb_hash_new();
+        bonus.proc = 0;
+        parser->bonus = (void *)&bonus;
 
         /* Parse a document */
-        v = syck_parse( parser );
+    	v = syck_parse( parser );
         if ( parser->eof == 1 )
         {
             break;
         }
 
         /* Pass document to block */
-        rb_funcall( proc, s_call, 1, v );
-    }
+		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
+ * YAML::Syck::Loader.initialize
  */
 static VALUE
-syck_resolver_initialize( self )
+syck_loader_initialize( self )
     VALUE self;
 {
-    rb_ivar_set(self, s_tags, rb_hash_new());
-    return self;
-}
+    VALUE families;
 
-/*
- * 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;
-}
+	rb_iv_set(self, "@families", rb_hash_new() );
+    rb_iv_set(self, "@private_types", rb_hash_new() );
+    rb_iv_set(self, "@anchors", rb_hash_new() );
+    families = rb_iv_get(self, "@families");
 
-/*
- * 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;
-}
+    rb_hash_aset(families, rb_str_new2( YAML_DOMAIN ), rb_hash_new());
+    rb_hash_aset(families, rb_str_new2( RUBY_DOMAIN ), rb_hash_new());
 
-/*
- * YAML::Syck::Resolver#detect_implicit 
- */
-VALUE
-syck_resolver_detect_implicit( self, val )
-    VALUE self, val;
-{
-    return rb_str_new2( "" );
+	return self;
 }
 
 /*
- * YAML::Syck::Resolver#node_import
+ * Add type family, used by add_*_type methods.
  */
 VALUE
-syck_resolver_node_import( self, node )
-    VALUE self, node;
+syck_loader_add_type_family( self, domain, type_re, proc )
+    VALUE self, domain, type_re, proc;
 {
-    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;
-    }
+    VALUE families, domain_types;
 
-    if ( n->type_id != NULL )
-    {
-        obj = rb_funcall( self, s_transfer, 2, rb_str_new2( n->type_id ), obj );
-    }
-    return obj;
+    families = rb_iv_get(self, "@families");
+    domain_types = syck_get_hash_aref(families, domain);
+    rb_hash_aset( domain_types, type_re, proc );
+    return Qnil;
 }
 
 /*
- * Set instance variables
+ * YAML::Syck::Loader.add_domain_type
  */
 VALUE
-syck_set_ivars( vars, obj )
-        VALUE vars, obj;
+syck_loader_add_domain_type( argc, argv, self )
+    int argc;
+    VALUE *argv;
+       VALUE self;
 {
-    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 ) );
+    VALUE domain, type_re, proc;
+
+    rb_scan_args(argc, argv, "2&", &domain, &type_re, &proc);
+    syck_loader_add_type_family( self, domain, type_re, proc );
     return Qnil;
 }
 
+
 /*
- * YAML::Syck::Resolver#const_find
+ * YAML::Syck::Loader.add_builtin_type
  */
 VALUE
-syck_const_find( const_name )
-    VALUE const_name;
+syck_loader_add_builtin_type( argc, argv, self )
+    int argc;
+    VALUE *argv;
+       VALUE self;
 {
-    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;
+    VALUE type_re, proc;
+
+    rb_scan_args(argc, argv, "1&", &type_re, &proc);
+    syck_loader_add_type_family( self, rb_str_new2( YAML_DOMAIN ), type_re, proc );
+    return Qnil;
 }
 
 /*
- * YAML::Syck::Resolver#transfer
+ * YAML::Syck::Loader.add_ruby_type
  */
 VALUE
-syck_resolver_transfer( self, type, val )
-    VALUE self, type, val;
+syck_loader_add_ruby_type( argc, argv, self )
+    int argc;
+    VALUE *argv;
+       VALUE self;
 {
-    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 );
-                }
+    VALUE type_re, proc;
 
-                /*
-                 * 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;
+    rb_scan_args(argc, argv, "1&", &type_re, &proc);
+    syck_loader_add_type_family( self, rb_str_new2( RUBY_DOMAIN ), type_re, proc );
+    return Qnil;
 }
 
 /*
- * YAML::Syck::Resolver#tagurize
+ * YAML::Syck::Loader.add_private_type
  */
 VALUE
-syck_resolver_tagurize( self, val )
-    VALUE self, val;
+syck_loader_add_private_type( argc, argv, self )
+    int argc;
+    VALUE *argv;
+       VALUE self;
 {
-    VALUE tmp = rb_check_string_type(val);
+    VALUE type_re, proc, priv_types;
 
-    if ( !NIL_P(tmp) )
-    {
-        char *taguri = syck_type_id_to_uri( RSTRING(tmp)->ptr );
-        val = rb_str_new2( taguri );
-        S_FREE( taguri );
-    }
+    rb_scan_args(argc, argv, "1&", &type_re, &proc);
 
-    return val;
+    priv_types = rb_iv_get(self, "@private_types");
+    rb_hash_aset( priv_types, type_re, proc );
+    return Qnil;
 }
 
 /*
- * YAML::Syck::DefaultResolver#detect_implicit 
+ * YAML::Syck::Loader#detect 
  */
 VALUE
-syck_defaultresolver_detect_implicit( self, val )
+syck_loader_detect_implicit( self, val )
     VALUE self, val;
 {
     char *type_id;
-    VALUE tmp = rb_check_string_type(val);
 
-    if ( !NIL_P(tmp) )
+    if ( TYPE(val) == T_STRING )
     {
-        val = tmp;
         type_id = syck_match_implicit( RSTRING(val)->ptr, RSTRING(val)->len );
         return rb_str_new2( type_id );
     }
@@ -1243,98 +957,129 @@ syck_defaultresolver_detect_implicit( self, val )
 }
 
 /*
- * YAML::Syck::DefaultResolver#node_import
+ * iterator to search a type hash for a match.
  */
-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;
+static VALUE
+transfer_find_i(entry, col)
+    VALUE entry, col;
+{
+    VALUE key = rb_ary_entry( entry, 0 );
+    VALUE tid = rb_ary_entry( col, 0 );
+	if ( rb_respond_to( key, s_match ) )
+	{
+		VALUE match = rb_funcall( key, rb_intern("match"), 1, tid );
+		if ( ! NIL_P( match ) )
+		{
+			rb_ary_push( col, rb_ary_entry( entry, 1 ) );
+			rb_iter_break();
+		}
+	}
+    return Qnil;
 }
 
 /*
- * YAML::Syck::GenericResolver#node_import
+ * YAML::Syck::Loader#transfer
  */
 VALUE
-syck_genericresolver_node_import( self, node )
-    VALUE self, node;
+syck_loader_transfer( self, type, val )
+    VALUE self, type, val;
 {
-    SyckNode *n;
-    int i = 0;
-    VALUE t = Qnil, obj = Qnil, v = Qnil, style = Qnil;
-    Data_Get_Struct(node, SyckNode, n);
+    char *taguri = NULL;
 
-    if ( n->type_id != NULL )
+    if (NIL_P(type) || !RSTRING(type)->ptr || RSTRING(type)->len == 0) 
     {
-        t = rb_str_new2(n->type_id);
+        /*
+         * Empty transfer, detect type
+         */
+        if ( TYPE(val) == T_STRING )
+        {
+            StringValue(val);
+            taguri = syck_match_implicit( RSTRING(val)->ptr, RSTRING(val)->len );
+            taguri = syck_taguri( YAML_DOMAIN, taguri, strlen( taguri ) );
+        }
+    }
+    else
+    {
+        taguri = syck_type_id_to_uri( RSTRING(type)->ptr );
     }
 
-    switch (n->kind)
+    if ( taguri != NULL )
     {
-        case syck_str_kind:
+        int transferred = 0;
+        VALUE scheme, name, type_hash, domain = Qnil, type_proc = Qnil;
+        VALUE type_uri = rb_str_new2( taguri );
+        VALUE str_taguri = rb_str_new2("tag");
+        VALUE str_xprivate = rb_str_new2("x-private");
+        VALUE str_yaml_domain = rb_str_new2(YAML_DOMAIN);
+        VALUE parts = rb_str_split( type_uri, ":" );
+
+        scheme = rb_ary_shift( parts );
+
+        if ( rb_str_cmp( scheme, str_xprivate ) == 0 )
         {
-            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 )
+            name = rb_ary_join( parts, rb_str_new2( ":" ) );
+            type_hash = rb_iv_get(self, "@private_types");
+        }
+        else if ( rb_str_cmp( scheme, str_taguri ) == 0 )
+        {
+            domain = rb_ary_shift( parts );
+            name = rb_ary_join( parts, rb_str_new2( ":" ) );
+            type_hash = rb_iv_get(self, "@families");
+            type_hash = rb_hash_aref(type_hash, domain);
+
+            /*
+             * Route yaml.org types through the transfer
+             * method here in this extension
+             */
+            if ( rb_str_cmp( domain, str_yaml_domain ) == 0 )
             {
-                style = sym_plain;
+                SyckNode *n = rb_new_syck_node(val, name);
+                if ( n != NULL )
+                {
+                    transferred = yaml_org_handler(n, &val);
+                    S_FREE( n );
+                }
             }
-            obj = rb_funcall( cScalar, s_new, 3, t, v, style );
+
+        }
+        else
+        {
+               rb_raise(rb_eTypeError, "invalid typing scheme: %s given",
+                       scheme);
         }
-        break;
 
-        case syck_seq_kind:
-            v = rb_ary_new2( syck_seq_count( n ) );
-            for ( i = 0; i < syck_seq_count( n ); i++ )
+        if ( ! transferred )
+        {
+            if ( rb_obj_is_instance_of( type_hash, rb_cHash ) )
             {
-                rb_ary_store( v, i, syck_seq_read( n, i ) );
+                type_proc = rb_hash_aref( type_hash, name );
+                if ( NIL_P( type_proc ) )
+                {
+                    VALUE col = rb_ary_new();
+                    rb_ary_push( col, name );
+                    rb_iterate(rb_each, type_hash, transfer_find_i, col );
+                    name = rb_ary_shift( col );
+                    type_proc = rb_ary_shift( col );
+                }
             }
-            if ( n->data.list->style == seq_inline )
-            {
-                style = sym_inline;
-            } 
-            obj = rb_funcall( cSeq, s_new, 3, t, v, style );
-            rb_iv_set(obj, "@kind", sym_seq);
-        break;
 
-        case syck_map_kind:
-            v = rb_hash_new();
-            for ( i = 0; i < syck_map_count( n ); i++ )
+            if ( rb_respond_to( type_proc, s_call ) )
             {
-                rb_hash_aset( v, syck_map_read( n, map_key, i ), syck_map_read( n, map_value, i ) );
+                val = rb_funcall(type_proc, s_call, 2, type_uri, val);
             }
-            if ( n->data.pairs->style == map_inline )
+            else if ( rb_str_cmp( scheme, str_xprivate ) == 0 )
             {
-                style = sym_inline;
-            } 
-            obj = rb_funcall( cMap, s_new, 3, t, v, style );
-            rb_iv_set(obj, "@kind", sym_map);
-        break;
+                val = rb_funcall(cPrivateType, s_new, 2, name, val);
+            }
+            else 
+            {
+                val = rb_funcall(cDomainType, s_new, 3, domain, name, val);
+            }
+            transferred = 1;
+        }
     }
 
-    return obj;
+    return val;
 }
 
 /*
@@ -1349,24 +1094,11 @@ syck_badalias_initialize( self, val )
 }
 
 /*
- * 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
+ * YAML::Syck::DomainType.initialize
  */
 VALUE
 syck_domaintype_initialize( self, domain, type_id, val )
-    VALUE self, domain, type_id, val;
+    VALUE self, type_id, val;
 {
     rb_iv_set( self, "@domain", domain );
     rb_iv_set( self, "@type_id", type_id );
@@ -1375,19 +1107,7 @@ syck_domaintype_initialize( self, domain, type_id, val )
 }
 
 /*
- * 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
+ * YAML::Syck::PrivateType.initialize
  */
 VALUE
 syck_privatetype_initialize( self, type_id, val )
@@ -1399,390 +1119,35 @@ syck_privatetype_initialize( self, type_id, val )
 }
 
 /*
- * 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=
+ * YAML::Syck::Node.initialize
  */
 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;
+syck_node_initialize( self, type_id, val )
+    VALUE self, type_id, 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, "@type_id", type_id );
     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;
+syck_node_thash( entry, t )
+    VALUE entry, t;
 {
-    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;
+    VALUE key, val;
+    key = rb_ary_entry( entry, 0 );
+    val = syck_node_transform( rb_ary_entry( rb_ary_entry( entry, 1 ), 1 ) );
+    rb_hash_aset( t, key, val );
+    return Qnil;
 }
 
-/*
- * Cloning method for all node types
- */
 VALUE
-syck_node_init_copy( copy, orig )
-    VALUE copy, orig;
+syck_node_ahash( entry, t )
+    VALUE entry, t;
 {
-    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;
+    VALUE val = syck_node_transform( entry );
+    rb_ary_push( t, val );
+    return Qnil;
 }
 
 /*
@@ -1792,100 +1157,24 @@ 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 )
+    VALUE t = Qnil;
+    VALUE type_id = rb_iv_get( self, "@type_id" );
+    VALUE val = rb_iv_get( self, "@value" );
+    if ( rb_obj_is_instance_of( val, rb_cHash ) )
     {
-        n->type_id = syck_strndup( orig_n->type_id, strlen( orig_n->type_id ) );
+        t = rb_hash_new();
+        rb_iterate( rb_each, val, syck_node_thash, t );
     }
-    if ( orig_n->anchor != NULL )
+    else if ( rb_obj_is_instance_of( val, rb_cArray ) )
     {
-        n->anchor = syck_strndup( orig_n->anchor, strlen( orig_n->anchor ) );
+        t = rb_ary_new();
+        rb_iterate( rb_each, val, syck_node_ahash, t );
     }
-    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)
+    else
     {
-        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;
+        t = val;
     }
+    return rb_funcall( oDefaultLoader, s_transfer, 2, type_id, t );
 }
 
 /*
@@ -1897,9 +1186,8 @@ rb_syck_output_handler( emitter, str, len )
     char *str;
     long len;
 {
-    struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
-    VALUE dest = bonus->port;
-    if (TYPE(dest) == T_STRING) {
+    VALUE dest = (VALUE)emitter->bonus;
+    if ( rb_respond_to( dest, s_to_str ) ) {
         rb_str_cat( dest, str, len );
     } else {
         rb_io_write( dest, rb_str_new( str, len ) );
@@ -1907,246 +1195,151 @@ rb_syck_output_handler( emitter, 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);
+    rb_gc_mark(emitter->ignore_id);
+    if ( emitter->bonus != NULL )
+    {
+        rb_gc_mark( (VALUE)emitter->bonus );
+    }
 }
 
 /*
- * YAML::Syck::Emitter.allocate
+ * YAML::Syck::Emitter.new
  */
-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 )
+syck_emitter_new(argc, argv, class)
     int argc;
     VALUE *argv;
-    VALUE self;
+	VALUE class;
 {
-    VALUE options, tmp;
-    SyckEmitter *emitter;
-    struct emitter_xtra *bonus;
+	VALUE pobj, options, init_argv[1];
+    SyckEmitter *emitter = syck_new_emitter();
+    syck_emitter_ignore_id( emitter, Qnil );
+    syck_emitter_handler( emitter, rb_syck_output_handler );
 
-    Data_Get_Struct(self, SyckEmitter, emitter);
-    bonus = (struct emitter_xtra *)emitter->bonus;
+    emitter->bonus = (void *)rb_str_new2( "" );
 
-    bonus->oid = Qnil;
-    bonus->port = rb_str_new2( "" );
-    bonus->data = rb_hash_new();
+    rb_scan_args(argc, argv, "01", &options);
+	pobj = Data_Wrap_Struct( class, syck_mark_emitter, syck_free_emitter, emitter );
 
-    if (rb_scan_args(argc, argv, "01", &options) == 0)
+    if ( ! rb_obj_is_instance_of( options, rb_cHash ) )
     {
         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;
+	init_argv[0] = options;
+	rb_obj_call_init(pobj, 1, init_argv);
+	return pobj;
 }
 
 /*
- * YAML::Syck::Emitter.emit( object_id ) { |out| ... }
+ * YAML::Syck::Emitter.initialize( options )
  */
-VALUE
-syck_emitter_emit( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
+static VALUE
+syck_emitter_initialize( self, options )
+    VALUE self, options;
 {
-    VALUE oid, proc;
-    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;
+	rb_iv_set(self, "@options", options);
+	return self;
 }
 
 /*
- * YAML::Syck::Emitter#node_export
+ * YAML::Syck::Emitter.level
  */
 VALUE
-syck_emitter_node_export( self, node )
-    VALUE self, node;
+syck_emitter_level_m( self )
+    VALUE self;
 {
-    return rb_funcall( node, s_to_yaml, 1, self );
+    SyckEmitter *emitter;
+
+	Data_Get_Struct(self, SyckEmitter, emitter);
+    return LONG2NUM( emitter->level );
 }
 
 /*
- * YAML::Syck::Emitter#set_resolver
+ * YAML::Syck::Emitter.flush
  */
 VALUE
-syck_emitter_set_resolver( self, resolver )
-    VALUE self, resolver;
+syck_emitter_flush_m( self )
+    VALUE self;
 {
-    rb_ivar_set( self, s_resolver, resolver );
+    SyckEmitter *emitter;
+
+	Data_Get_Struct(self, SyckEmitter, emitter);
+    syck_emitter_flush( emitter, 0 );
     return self;
 }
 
 /*
- * YAML::Syck::Out::initialize
+ * YAML::Syck::Emitter.write( str )
  */
 VALUE
-syck_out_initialize( self, emitter )
-    VALUE self, emitter;
+syck_emitter_write_m( self, str )
+    VALUE self, str;
 {
-    rb_ivar_set( self, s_emitter, emitter );
+    SyckEmitter *emitter;
+
+	Data_Get_Struct(self, SyckEmitter, emitter);
+    syck_emitter_write( emitter, RSTRING(str)->ptr, RSTRING(str)->len );
     return self;
 }
 
 /*
- * YAML::Syck::Out::map
+ * YAML::Syck::Emitter.simple( str )
  */
 VALUE
-syck_out_map( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_emitter_simple_write( self, str )
+    VALUE self, str;
 {
-    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;
+    SyckEmitter *emitter;
+
+	Data_Get_Struct(self, SyckEmitter, emitter);
+    syck_emitter_simple( emitter, RSTRING(str)->ptr, RSTRING(str)->len );
+    return self;
 }
 
 /*
- * YAML::Syck::Out::seq
+ * YAML::Syck::Emitter.start_object( object_id )
  */
 VALUE
-syck_out_seq( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_emitter_start_object( self, oid )
+    VALUE self, oid;
 {
-    VALUE type_id, style, seq;
-    if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
-        style = Qnil;
+    char *anchor_name;
+    SyckEmitter *emitter;
+
+	Data_Get_Struct(self, SyckEmitter, emitter);
+    anchor_name = syck_emitter_start_obj( emitter, oid );
+
+    if ( anchor_name == NULL )
+    {
+        return 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;
+
+    return rb_str_new2( anchor_name );
 }
 
 /*
- * YAML::Syck::Out::scalar
-syck_out_scalar( self, type_id, str, style )
-    VALUE self, type_id, str, style;
+ * YAML::Syck::Emitter.end_object( object_id )
  */
 VALUE
-syck_out_scalar( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
+syck_emitter_end_object( self, oid )
+    VALUE self, oid;
 {
-    VALUE type_id, str, style, scalar;
-    if (rb_scan_args(argc, argv, "21", &type_id, &str, &style) == 2) {
-        style = Qnil;
+    SyckEmitter *emitter;
+
+	Data_Get_Struct(self, SyckEmitter, emitter);
+    syck_emitter_end_obj( emitter );
+
+    if ( emitter->level < 0 )
+    {
+        syck_emitter_flush( emitter, 0 );
     }
-    scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
-    syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
-    return scalar;
+    return (VALUE)emitter->bonus;
 }
 
 /*
@@ -2160,208 +1353,129 @@ Init_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
-     */
+	/*
+	 * 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_anchors = rb_intern("anchors");
     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_update = rb_intern("update");
+	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_match = rb_intern("match");
+	s_keys = rb_intern("keys");
+	s_to_str = rb_intern("to_str");
+	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_model = ID2SYM(rb_intern("Model"));
+	sym_generic = ID2SYM(rb_intern("Generic"));
+	sym_input = ID2SYM(rb_intern("Input"));
+	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
+     * Load Date module
      */
-    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 );
+    rb_require( "date" );
+    cDate = rb_funcall( rb_cObject, rb_intern("const_get"), 1, rb_str_new2("Date") );
+
+    /*
+     * Define YAML::Syck::Loader class
+     */
+    cLoader = rb_define_class_under( rb_syck, "Loader", rb_cObject );
+    rb_define_attr( cLoader, "families", 1, 1 );
+    rb_define_attr( cLoader, "private_types", 1, 1 );
+    rb_define_attr( cLoader, "anchors", 1, 1 );
+    rb_define_method( cLoader, "initialize", syck_loader_initialize, 0 );
+    rb_define_method( cLoader, "add_domain_type", syck_loader_add_domain_type, -1 );
+    rb_define_method( cLoader, "add_builtin_type", syck_loader_add_builtin_type, -1 );
+    rb_define_method( cLoader, "add_ruby_type", syck_loader_add_ruby_type, -1 );
+    rb_define_method( cLoader, "add_private_type", syck_loader_add_private_type, -1 );
+    rb_define_method( cLoader, "bufsize=", syck_parser_bufsize_set, 1 );
+    rb_define_method( cLoader, "bufsize", syck_parser_bufsize_get, 0 );
+    rb_define_method( cLoader, "detect_implicit", syck_loader_detect_implicit, 1 );
+    rb_define_method( cLoader, "transfer", syck_loader_transfer, 2 );
+
+    oDefaultLoader = rb_funcall( cLoader, rb_intern( "new" ), 0 );
+    rb_define_const( rb_syck, "DefaultLoader", oDefaultLoader );
 
     /*
      * 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_singleton_method( cParser, "new", syck_parser_new, -1 );
+    rb_define_method(cParser, "initialize", syck_parser_initialize, 1);
     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_attr( cNode, "kind", 1, 1 );
+    rb_define_attr( cNode, "type_id", 1, 1 );
+    rb_define_attr( cNode, "value", 1, 1 );
+    rb_define_attr( cNode, "anchor", 1, 1 );
+    rb_define_method( cNode, "initialize", syck_node_initialize, 2);
     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_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
+     * Define YAML::Syck::PrivateType class
      */
-    cPrivateType = rb_define_class_under( rb_yaml, "PrivateType", rb_cObject );
+    cPrivateType = rb_define_class_under( rb_syck, "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
+     * Define YAML::Syck::DomainType class
      */
-    cDomainType = rb_define_class_under( rb_yaml, "DomainType", rb_cObject );
+    cDomainType = rb_define_class_under( rb_syck, "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::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::DefaultKey class
+	 */
+	cDefaultKey = rb_define_class_under( rb_syck, "DefaultKey", rb_cObject );
 
     /*
      * 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);
+	rb_define_singleton_method( cEmitter, "new", syck_emitter_new, -1 );
+    rb_define_method( cEmitter, "initialize", syck_emitter_initialize, 1 );
+    rb_define_method( cEmitter, "level", syck_emitter_level_m, 0 );
+    rb_define_method( cEmitter, "write", syck_emitter_write_m, 1 );
+    rb_define_method( cEmitter, "<<", syck_emitter_write_m, 1 );
+    rb_define_method( cEmitter, "simple", syck_emitter_simple_write, 1 );
+    rb_define_method( cEmitter, "flush", syck_emitter_flush_m, 0 );
+    rb_define_method( cEmitter, "start_object", syck_emitter_start_object, 1 );
+    rb_define_method( cEmitter, "end_object", syck_emitter_end_object, 0 );
 }
 
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
index a83c8813c1..ec4e7a1efd 100644
--- a/ext/syck/syck.c
+++ b/ext/syck/syck.c
@@ -6,12 +6,11 @@
  *
  * Copyright (C) 2003 why the lucky stiff
  */
-#include "ruby.h"
-
 #include <stdio.h>
 #include <string.h>
 
 #include "syck.h"
+#include "ruby.h"
 
 void syck_parser_pop_level( SyckParser * );
 
@@ -159,7 +158,6 @@ 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;
@@ -200,8 +198,7 @@ syck_lookup_sym( SyckParser *p, SYMID id, char **data )
 int
 syck_st_free_nodes( char *key, SyckNode *n, char *arg )
 {
-    if ( n != (void *)1 ) syck_free_node( n );
-    n = NULL;
+    syck_free_node( n );
     return ST_CONTINUE;
 }
 
@@ -209,6 +206,15 @@ void
 syck_st_free( SyckParser *p )
 {
     /*
+     * Free the adhoc symbol table
+     */
+    if ( p->syms != NULL )
+    {
+        st_free_table( p->syms );
+        p->syms = NULL;
+    }
+
+    /*
      * Free the anchor tables
      */
     if ( p->anchors != NULL )
@@ -230,15 +236,6 @@ 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 );
@@ -410,10 +407,12 @@ syck_move_tokens( SyckParser *p )
         return 0;
 
     skip = p->limit - p->token;
+    if ( skip < 1 )
+        return 0;
+
     if ( ( count = p->token - p->buffer ) )
     {
-	if (skip > 0)
-	    S_MEMMOVE( p->buffer, p->token, char, skip );
+        S_MEMMOVE( p->buffer, p->token, char, skip );
         p->token = p->buffer;
         p->marker -= count;
         p->cursor -= count;
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
index e7d07e9c0d..0383c5ad47 100644
--- a/ext/syck/syck.h
+++ b/ext/syck/syck.h
@@ -13,11 +13,10 @@
 #define SYCK_YAML_MAJOR 1
 #define SYCK_YAML_MINOR 0
 
-#define SYCK_VERSION    "0.60"
+#define SYCK_VERSION    "0.42"
 #define YAML_DOMAIN     "yaml.org,2002"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
 #include "st.h"
 
@@ -52,7 +51,7 @@ extern "C" {
 #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_FREE(n) free(n); n = NULL;
 
 #define S_ALLOCA_N(type,n) (type*)alloca(sizeof(type)*(n))
 
@@ -64,16 +63,12 @@ extern "C" {
 #define BLOCK_FOLD  10
 #define BLOCK_LIT   20
 #define BLOCK_PLAIN 30
-#define NL_CHOMP    40
-#define NL_KEEP     50
+#define NL_CHOMP    130
+#define NL_KEEP     140
 
 /*
  * Node definitions
  */
-#ifndef ST_DATA_T_DEFINED
-typedef long st_data_t;
-#endif
-
 #define SYMID unsigned long
 
 typedef struct _syck_node SyckNode;
@@ -89,25 +84,6 @@ enum map_part {
     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
  */
@@ -123,7 +99,6 @@ struct _syck_node {
     union {
         /* Storage for map data */
         struct SyckMap {
-            enum map_style style;
             SYMID *keys;
             SYMID *values;
             long capa;
@@ -131,14 +106,12 @@ struct _syck_node {
         } *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;
@@ -181,13 +154,9 @@ enum syck_level_status {
     syck_lvl_map,
     syck_lvl_block,
     syck_lvl_str,
-    syck_lvl_iseq,
-    syck_lvl_imap,
+    syck_lvl_inline,
     syck_lvl_end,
-    syck_lvl_pause,
-    syck_lvl_anctag,
-    syck_lvl_mapx,
-    syck_lvl_seqx
+    syck_lvl_pause
 };
 
 /*
@@ -208,16 +177,9 @@ struct _syck_str {
 };
 
 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;
 };
 
@@ -260,7 +222,6 @@ struct _syck_parser {
     SyckLevel *levels;
     int lvl_idx;
     int lvl_capa;
-    /* Pointer for extension's use */
     void *bonus;
 };
 
@@ -271,19 +232,27 @@ 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_need_header,
     doc_processing
 };
 
+enum block_styles {
+    block_arbitrary,
+    block_fold,
+    block_literal
+};
+
 /*
  * Emitter struct
  */
 struct _syck_emitter {
     /* Headerless doc flag */
     int headless;
+    /* Sequence map shortcut flag */
+    int seq_map;
     /* Force header? */
     int use_header;
     /* Force version? */
@@ -297,7 +266,7 @@ struct _syck_emitter {
     /* Best width on folded scalars */
     int best_width;
     /* Use literal[1] or folded[2] blocks on all text? */
-    enum scalar_style style;
+    enum block_styles block_style;
     /* Stage of written document */
     enum doc_stage stage;
     /* Level counter */
@@ -307,21 +276,15 @@ struct _syck_emitter {
     /* Object ignore ID */
     SYMID ignore_id;
     /* Symbol table for anchors */
-    st_table *markers, *anchors, *anchored;
+    st_table *markers, *anchors;
     /* 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;
+    SyckOutputHandler handler;
     /* Pointer for extension's use */
     void *bonus;
 };
@@ -348,7 +311,6 @@ 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 * );
@@ -365,42 +327,23 @@ 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_emitter_handler( SyckEmitter *, SyckOutputHandler );
 void syck_free_emitter( SyckEmitter * );
 void syck_emitter_clear( SyckEmitter * );
+void syck_emitter_simple( SyckEmitter *, char *, long );
 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 * );
+char *syck_emitter_start_obj( SyckEmitter *, SYMID );
+void syck_emitter_end_obj( 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 );
@@ -410,6 +353,7 @@ void syck_parser_pop_level( SyckParser * );
 void free_any_io( SyckParser * );
 long syck_parser_read( SyckParser * );
 long syck_parser_readlen( SyckParser *, long );
+void syck_parser_init( SyckParser *, int );
 SYMID syck_parse( SyckParser * );
 void syck_default_error_handler( SyckParser *, char * );
 SYMID syck_yaml2byte_handler( SyckParser *, SyckNode * );
@@ -423,33 +367,31 @@ 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 );
+SyckNode *syck_new_str( char * );
+SyckNode *syck_new_str2( char *, long );
 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 * );
 
+void apply_seq_in_map( SyckParser *, SyckNode * );
+
 /*
  * Lexer prototypes
  */
 void syckerror( char * );
-int syckparse( void * );
-union YYSTYPE;
-int sycklex( union YYSTYPE *, SyckParser * );
+
+#ifndef ST_DATA_T_DEFINED
+typedef long st_data_t;
+#endif
 
 #if defined(__cplusplus)
 }  /* extern "C" { */
diff --git a/ext/syck/token.c b/ext/syck/token.c
index 3c6cd1a9cf..f9e0601e52 100644
--- a/ext/syck/token.c
+++ b/ext/syck/token.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Tue Sep 20 17:46:17 2005 */
+/* Generated by re2c 0.5 on Tue Nov 25 12:10:28 2003 */
 #line 1 "token.re"
 /*
  * token.re
@@ -8,8 +8,8 @@
  *
  * Copyright (C) 2003 why the lucky stiff
  */
-#include "ruby.h"
 #include "syck.h"
+#include "ruby.h"
 #include "gram.h"
 
 /*
@@ -40,7 +40,7 @@
 /*
  * Track line numbers
  */
-#define NEWLINE(ptr)    YYLINEPTR = ptr + newline_len(ptr); if ( YYLINEPTR > YYLINECTPTR ) { YYLINE++; YYLINECTPTR = YYLINEPTR; }
+#define NEWLINE(ptr)    YYLINEPTR = ptr + 1; if ( YYLINEPTR > YYLINECTPTR ) { YYLINE++; YYLINECTPTR = YYLINEPTR; }
 
 /*
  * I like seeing the level operations as macros...
@@ -61,7 +61,7 @@
 #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 ) \
+            if ( last_lvl->status == syck_lvl_inline ) \
             { \
                 goto Document; \
             } \
@@ -122,7 +122,6 @@
         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 ) \
         { \
@@ -131,25 +130,6 @@
         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 *
@@ -157,28 +137,16 @@
 #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->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 ) \
+                if ( nlDoWhat != NL_CHOMP ) \
                     fc += 1; \
                 n->data.str->len = fc - n->data.str->ptr + 1; \
             } \
@@ -218,7 +186,7 @@
     { \
         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 )  ) \
+        if ( indt_len == YYTOKEN - YYLINEPTR ) \
         { \
             SyckLevel *lvl_over; \
             parser->lvl_idx--; \
@@ -237,9 +205,7 @@ 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();
@@ -268,7 +234,6 @@ sycklex( YYSTYPE *sycklval, SyckParser *parser )
         case syck_bytecode_utf8:
         return sycklex_bytecode_utf8( sycklval, parser );
     }
-    return YAML_DOCSEP;
 }
 
 /*
@@ -291,7 +256,7 @@ sycklex_yaml_utf8( YYSTYPE *sycklval, SyckParser *parser )
         return t;
     }
 
-#line 315 "token.re"
+#line 274
 
 
     if ( YYLINEPTR != YYCURSOR )
@@ -303,21 +268,19 @@ Header:
 
     YYTOKEN = YYCURSOR;
 
-
-#line 307 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
 	goto yy0;
-	++YYCURSOR;
+yy1:	++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 '\000':	goto yy7;
+	case '\n':	goto yy9;
+	case '\r':	goto yy11;
+	case ' ':	goto yy12;
 	case '#':	goto yy5;
 	case '-':	goto yy2;
 	case '.':	goto yy4;
@@ -330,83 +293,73 @@ yy2:	yyaccept = 0;
 	default:	goto yy3;
 	}
 yy3:
-#line 374 "token.re"
-{   YYPOS(0);
+#line 333
+	{   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;
+yy5:	yych = *++YYCURSOR;
 yy6:
-#line 356 "token.re"
-{   eat_comments( parser ); 
+#line 315
+	{   eat_comments( parser ); 
                         goto Header;
                     }
-#line 351 "<stdout>"
-yy7:	++YYCURSOR;
-	goto yy8;
+yy7:	yych = *++YYCURSOR;
 yy8:
-#line 360 "token.re"
-{   SyckLevel *lvl = CURRENT_LEVEL();
+#line 319
+	{   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 );
+#line 325
+	{   GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN );
                         goto Header; 
                     }
-#line 370 "<stdout>"
 yy11:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy17;
+	case '\n':	goto yy17;
 	default:	goto yy3;
 	}
-yy12:	++YYCURSOR;
-	yych = *YYCURSOR;
+yy12:	yych = *++YYCURSOR;
 	goto yy16;
 yy13:
-#line 370 "token.re"
-{   doc_level = YYCURSOR - YYLINEPTR;
+#line 329
+	{   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;
+	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;
+	case '\n':	case ' ':	goto yy17;
+	case '\r':	goto yy19;
 	default:	goto yy10;
 	}
 yy19:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy17;
+	case '\n':	goto yy17;
 	default:	goto yy20;
 	}
 yy20:	YYCURSOR = YYMARKER;
@@ -421,16 +374,15 @@ yy21:	yych = *++YYCURSOR;
 	}
 yy22:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy23;
-	case 0x0D:	goto yy27;
+	case '\n':	goto yy23;
+	case '\r':	goto yy27;
 	case ' ':	goto yy25;
 	default:	goto yy20;
 	}
-yy23:	++YYCURSOR;
-	goto yy24;
+yy23:	yych = *++YYCURSOR;
 yy24:
-#line 342 "token.re"
-{   SyckLevel *lvl = CURRENT_LEVEL();
+#line 301
+	{   SyckLevel *lvl = CURRENT_LEVEL();
                         if ( lvl->status == syck_lvl_header )
                         {
                             goto Header; 
@@ -443,18 +395,16 @@ yy24:
                         }
                         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;
+	case '\n':	goto yy23;
 	default:	goto yy20;
 	}
 yy28:	yych = *++YYCURSOR;
@@ -464,16 +414,15 @@ yy28:	yych = *++YYCURSOR;
 	}
 yy29:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy30;
-	case 0x0D:	goto yy34;
+	case '\n':	goto yy30;
+	case '\r':	goto yy34;
 	case ' ':	goto yy32;
 	default:	goto yy20;
 	}
-yy30:	++YYCURSOR;
-	goto yy31;
+yy30:	yych = *++YYCURSOR;
 yy31:
-#line 328 "token.re"
-{   SyckLevel *lvl = CURRENT_LEVEL();
+#line 287
+	{   SyckLevel *lvl = CURRENT_LEVEL();
                         if ( lvl->status == syck_lvl_header )
                         {
                             YYPOS(3);
@@ -486,22 +435,20 @@ yy31:
                             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;
+yy34:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy30;
 	default:	goto yy20;
 	}
 }
-#line 378 "token.re"
+#line 337
 
 
 Document:
@@ -514,41 +461,38 @@ Document:
 
         YYTOKEN = YYCURSOR;
 
-
-#line 518 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
 	goto yy35;
-	++YYCURSOR;
+yy36:	++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;
+	case '\000':	goto yy60;
+	case '\n':	goto yy37;
+	case '\r':	goto yy39;
+	case ' ':	goto yy58;
+	case '!':	goto yy49;
+	case '"':	goto yy53;
+	case '#':	goto yy56;
+	case '&':	goto yy47;
+	case '\'':	goto yy51;
+	case '*':	goto yy48;
+	case ',':	case ':':	goto yy45;
+	case '-':	case '?':	goto yy46;
+	case '>':	case '|':	goto yy55;
+	case '[':	case '{':	goto yy41;
+	case ']':	case '}':	goto yy43;
+	default:	goto yy62;
 	}
 yy37:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy92;
+	goto yy90;
 yy38:
-#line 392 "token.re"
-{   /* Isolate spaces */
+#line 351
+	{   /* Isolate spaces */
                         int indt_len;
                         GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
                         lvl = CURRENT_LEVEL();
@@ -560,12 +504,6 @@ yy38:
                             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);
@@ -575,63 +513,47 @@ yy38:
                         }
                         return YAML_INDENT;
                     }
-#line 578 "<stdout>"
-yy39:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy91;
+yy39:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy89;
 	default:	goto yy40;
 	}
 yy40:
-#line 497 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+#line 445
+	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         goto Plain; 
                     }
-#line 589 "<stdout>"
-yy41:	++YYCURSOR;
-	goto yy42;
+yy41:	yych = *++YYCURSOR;
 yy42:
-#line 420 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+#line 373
+	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         lvl = CURRENT_LEVEL();
-                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_iseq);
+                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_inline);
                         return YYTOKEN[0]; 
                     }
-#line 599 "<stdout>"
-yy43:	++YYCURSOR;
-	goto yy44;
+yy43:	yych = *++YYCURSOR;
 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();
+#line 379
+	{   POP_LEVEL();
                         return YYTOKEN[0]; 
                     }
-#line 617 "<stdout>"
-yy47:	yyaccept = 1;
+yy45:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 0x0A:	goto yy86;
-	case 0x0D:	goto yy90;
-	case ' ':	goto yy88;
+	case '\n':	goto yy84;
+	case '\r':	goto yy88;
+	case ' ':	goto yy86;
 	default:	goto yy40;
 	}
-yy48:	yyaccept = 1;
+yy46:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 0x0A:	goto yy81;
-	case 0x0D:	goto yy85;
-	case ' ':	goto yy83;
+	case '\n':	goto yy79;
+	case '\r':	goto yy83;
+	case ' ':	goto yy81;
 	default:	goto yy40;
 	}
-yy49:	yych = *++YYCURSOR;
+yy47:	yych = *++YYCURSOR;
 	switch(yych){
 	case '-':	case '0':
 	case '1':
@@ -692,10 +614,10 @@ yy49:	yych = *++YYCURSOR;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy78;
+	case 'z':	goto yy76;
 	default:	goto yy40;
 	}
-yy50:	yych = *++YYCURSOR;
+yy48:	yych = *++YYCURSOR;
 	switch(yych){
 	case '-':	case '0':
 	case '1':
@@ -756,35 +678,30 @@ yy50:	yych = *++YYCURSOR;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy75;
+	case 'z':	goto yy73;
 	default:	goto yy40;
 	}
-yy51:	++YYCURSOR;
-	goto yy52;
+yy49:	yych = *++YYCURSOR;
+yy50:
+#line 418
+	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        goto TransferMethod; }
+yy51:	yych = *++YYCURSOR;
 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);
+#line 421
+	{   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);
+yy53:	yych = *++YYCURSOR;
+yy54:
+#line 424
+	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         goto DoubleQuote; }
-#line 781 "<stdout>"
-yy57:	yyaccept = 1;
+yy55:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 0x0A:	goto yy70;
-	case 0x0D:	goto yy74;
-	case ' ':	goto yy72;
+	case '\n':	goto yy68;
+	case '\r':	goto yy72;
+	case ' ':	goto yy70;
 	case '+':	case '-':	case '0':
 	case '1':
 	case '2':
@@ -794,51 +711,43 @@ yy57:	yyaccept = 1;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy67;
+	case '9':	goto yy65;
 	default:	goto yy40;
 	}
-yy58:	++YYCURSOR;
-	goto yy59;
-yy59:
-#line 486 "token.re"
-{   eat_comments( parser ); 
+yy56:	yych = *++YYCURSOR;
+yy57:
+#line 434
+	{   eat_comments( parser ); 
                         goto Document;
                     }
-#line 807 "<stdout>"
-yy60:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy66;
+yy58:	yych = *++YYCURSOR;
+	goto yy64;
+yy59:
+#line 438
+	{   goto Document; }
+yy60:	yych = *++YYCURSOR;
 yy61:
-#line 490 "token.re"
-{   goto Document; }
-#line 814 "<stdout>"
-yy62:	++YYCURSOR;
-	goto yy63;
-yy63:
-#line 492 "token.re"
-{   ENSURE_YAML_IEND(lvl, -1);
+#line 440
+	{   ENSURE_YAML_IEND(lvl, -1);
                         YYPOS(0);
                         return 0; 
                     }
-#line 823 "<stdout>"
-yy64:	yych = *++YYCURSOR;
+yy62:	yych = *++YYCURSOR;
 	goto yy40;
-yy65:	++YYCURSOR;
+yy63:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy66;
-yy66:	switch(yych){
-	case 0x09:	case ' ':	goto yy65;
-	default:	goto yy61;
+yy64:	switch(yych){
+	case ' ':	goto yy63;
+	default:	goto yy59;
 	}
-yy67:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+yy65:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy68;
-yy68:	switch(yych){
-	case 0x0A:	goto yy70;
-	case 0x0D:	goto yy74;
-	case ' ':	goto yy72;
+yy66:	switch(yych){
+	case '\n':	goto yy68;
+	case '\r':	goto yy72;
+	case ' ':	goto yy70;
 	case '+':	case '-':	case '0':
 	case '1':
 	case '2':
@@ -848,43 +757,39 @@ yy68:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy67;
-	default:	goto yy69;
+	case '9':	goto yy65;
+	default:	goto yy67;
 	}
-yy69:	YYCURSOR = YYMARKER;
+yy67:	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 ) ) 
+yy68:	yych = *++YYCURSOR;
+yy69:
+#line 427
+	{   if ( is_newline( YYCURSOR - 1 ) ) 
                         {
                             YYCURSOR--;
                         }
                         goto ScalarBlock; 
                     }
-#line 869 "<stdout>"
-yy72:	++YYCURSOR;
+yy70:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy73;
-yy73:	switch(yych){
-	case ' ':	goto yy72;
-	default:	goto yy71;
+yy71:	switch(yych){
+	case ' ':	goto yy70;
+	default:	goto yy69;
 	}
-yy74:	yych = *++YYCURSOR;
+yy72:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy70;
-	default:	goto yy69;
+	case '\n':	goto yy68;
+	default:	goto yy67;
 	}
-yy75:	++YYCURSOR;
+yy73:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy76;
-yy76:	switch(yych){
+yy74:	switch(yych){
 	case '-':	case '0':
 	case '1':
 	case '2':
@@ -944,21 +849,19 @@ yy76:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy75;
-	default:	goto yy77;
+	case 'z':	goto yy73;
+	default:	goto yy75;
 	}
-yy77:
-#line 466 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+yy75:
+#line 413
+	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
                         return YAML_ALIAS;
                     }
-#line 956 "<stdout>"
-yy78:	++YYCURSOR;
+yy76:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy79;
-yy79:	switch(yych){
+yy77:	switch(yych){
 	case '-':	case '0':
 	case '1':
 	case '2':
@@ -1018,12 +921,13 @@ yy79:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy78;
-	default:	goto yy80;
+	case 'z':	goto yy76;
+	default:	goto yy78;
 	}
-yy80:
-#line 455 "token.re"
-{   sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
+yy78:
+#line 401
+	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
 
                         /*
                          * Remove previous anchors of the same name.  Since the parser will likely
@@ -1033,79 +937,70 @@ yy80:
                         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);
+yy79:	yych = *++YYCURSOR;
+yy80:
+#line 387
+	{   ENSURE_YAML_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1);
                         FORCE_NEXT_TOKEN(YAML_IOPEN);
-                        if ( *YYCURSOR == '#' || is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) )
+                        if ( is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) )
                         {
                             YYCURSOR--; 
-                            ADD_LEVEL((YYTOKEN + 1) - YYLINEPTR, syck_lvl_seq);
+                            ADD_LEVEL((YYTOKEN + 1) - YYLINEPTR, syck_lvl_doc);
                         }
-                        else /* spaces followed by content uses the space as indentation */
+                        else
                         {
-                            ADD_LEVEL(YYCURSOR - YYLINEPTR, syck_lvl_seq);
+                            ADD_LEVEL(YYCURSOR - YYLINEPTR, syck_lvl_doc);
                         }
                         return YYTOKEN[0]; 
                     }
-#line 1054 "<stdout>"
-yy83:	++YYCURSOR;
+yy81:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy84;
-yy84:	switch(yych){
-	case ' ':	goto yy83;
-	default:	goto yy82;
+yy82:	switch(yych){
+	case ' ':	goto yy81;
+	default:	goto yy80;
 	}
-yy85:	yych = *++YYCURSOR;
+yy83:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy81;
-	default:	goto yy69;
+	case '\n':	goto yy79;
+	default:	goto yy67;
 	}
-yy86:	++YYCURSOR;
-	goto yy87;
-yy87:
-#line 436 "token.re"
-{   if ( *YYTOKEN == ':' && lvl->status != syck_lvl_imap ) lvl->status = syck_lvl_map;
-                        YYPOS(1); 
+yy84:	yych = *++YYCURSOR;
+yy85:
+#line 383
+	{   YYPOS(1); 
                         return YYTOKEN[0]; 
                     }
-#line 1076 "<stdout>"
-yy88:	++YYCURSOR;
+yy86:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy89;
-yy89:	switch(yych){
-	case ' ':	goto yy88;
-	default:	goto yy87;
+yy87:	switch(yych){
+	case ' ':	goto yy86;
+	default:	goto yy85;
 	}
-yy90:	yych = *++YYCURSOR;
+yy88:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy86;
-	default:	goto yy69;
+	case '\n':	goto yy84;
+	default:	goto yy67;
 	}
-yy91:	yyaccept = 0;
+yy89:	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;
+yy90:	switch(yych){
+	case '\n':	case ' ':	goto yy89;
+	case '\r':	goto yy91;
 	default:	goto yy38;
 	}
-yy93:	++YYCURSOR;
+yy91:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy91;
-	default:	goto yy69;
+	case '\n':	goto yy89;
+	default:	goto yy67;
 	}
 }
-#line 501 "token.re"
+#line 449
 
     }
 
@@ -1113,27 +1008,25 @@ Directive:
     {
         YYTOKTMP = YYCURSOR;
 
-
-#line 1117 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy94;
-	++YYCURSOR;
-yy94:
+	goto yy92;
+yy93:	++YYCURSOR;
+yy92:
 	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;
+	case '\000':	goto yy94;
+	case ' ':	goto yy97;
+	case '%':	goto yy95;
+	default:	goto yy99;
 	}
-yy96:	YYCURSOR = YYMARKER;
+yy94:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy98;
+	case 0:	goto yy96;
 	}
-yy97:	yyaccept = 0;
+yy95:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
 	case '.':
@@ -1210,37 +1103,32 @@ yy97:	yyaccept = 0;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy104;
-	default:	goto yy98;
+	case 'z':	goto yy102;
+	default:	goto yy96;
 	}
-yy98:
-#line 514 "token.re"
-{   YYCURSOR = YYTOKTMP;
+yy96:
+#line 462
+	{   YYCURSOR = YYTOKTMP;
                         return YAML_DOCSEP;
                     }
-#line 1221 "<stdout>"
-yy99:	++YYCURSOR;
+yy97:	yych = *++YYCURSOR;
+	goto yy101;
+yy98:
+#line 460
+	{   goto Directive; }
+yy99:	yych = *++YYCURSOR;
+	goto yy96;
+yy100:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy103;
-yy100:
-#line 512 "token.re"
-{   goto Directive; }
-#line 1228 "<stdout>"
-yy101:	yych = *++YYCURSOR;
-	goto yy98;
+yy101:	switch(yych){
+	case ' ':	goto yy100;
+	default:	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':
@@ -1313,11 +1201,11 @@ yy105:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy104;
-	case ':':	goto yy106;
-	default:	goto yy96;
+	case 'z':	goto yy102;
+	case ':':	goto yy104;
+	default:	goto yy94;
 	}
-yy106:	yych = *++YYCURSOR;
+yy104:	yych = *++YYCURSOR;
 	switch(yych){
 	case '.':
 	case '/':
@@ -1393,14 +1281,13 @@ yy106:	yych = *++YYCURSOR;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy107;
-	default:	goto yy96;
+	case 'z':	goto yy105;
+	default:	goto yy94;
 	}
-yy107:	++YYCURSOR;
+yy105:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy108;
-yy108:	switch(yych){
+yy106:	switch(yych){
 	case '.':
 	case '/':
 	case '0':
@@ -1475,15 +1362,14 @@ yy108:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy107;
-	default:	goto yy109;
+	case 'z':	goto yy105;
+	default:	goto yy107;
 	}
-yy109:
-#line 510 "token.re"
-{   goto Directive; }
-#line 1484 "<stdout>"
+yy107:
+#line 458
+	{   goto Directive; }
 }
-#line 517 "token.re"
+#line 465
 
 
     }
@@ -1505,34 +1391,30 @@ Plain2:
 
 Plain3:
 
-
-#line 1509 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy110;
-	++YYCURSOR;
-yy110:
+	goto yy108;
+yy109:	++YYCURSOR;
+yy108:
 	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 '\000':	goto yy120;
+	case '\n':	goto yy110;
+	case '\r':	goto yy112;
+	case ' ':	goto yy118;
 	case ',':	goto yy117;
-	case ':':	goto yy116;
-	case ']':	goto yy120;
-	case '}':	goto yy118;
-	default:	goto yy127;
+	case ':':	goto yy114;
+	case ']':	case '}':	goto yy115;
+	default:	goto yy122;
 	}
-yy112:	yyaccept = 0;
+yy110:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy142;
-yy113:
-#line 540 "token.re"
-{   int indt_len, nl_count = 0;
+	goto yy136;
+yy111:
+#line 488
+	{   int indt_len, nl_count = 0;
                         SyckLevel *lvl;
                         char *tok = YYTOKEN;
                         GOBBLE_UP_YAML_INDENT( indt_len, tok );
@@ -1545,12 +1427,8 @@ yy113:
 
                         while ( YYTOKEN < YYCURSOR )
                         {
-                            int nl_len = newline_len( YYTOKEN++ );
-                            if ( nl_len )
-                            {
+                            if ( is_newline( YYTOKEN++ ) )
                                 nl_count++;
-                                YYTOKEN += nl_len - 1;
-                            }
                         }
                         if ( nl_count <= 1 )
                         {
@@ -1567,170 +1445,119 @@ yy113:
 
                         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);
+yy112:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy136;
-	case 0x0D:	goto yy140;
-	case ' ':	goto yy138;
-	default:	goto yy115;
+	case '\n':	goto yy135;
+	default:	goto yy113;
 	}
-yy117:	yyaccept = 1;
+yy113:
+#line 542
+	{   QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN);
+                        goto Plain2;
+                    }
+yy114:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 0x0A:	goto yy130;
-	case 0x0D:	goto yy134;
+	case '\n':	goto yy130;
+	case '\r':	goto yy134;
 	case ' ':	goto yy132;
-	default:	goto yy115;
+	default:	goto yy113;
 	}
-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 ) 
+yy115:	yych = *++YYCURSOR;
+yy116:
+#line 522
+	{   if ( plvl->status != syck_lvl_inline )
                         {
+                            if ( *(YYCURSOR - 1) == ' ' || is_newline( YYCURSOR - 1 ) )
+                            {
+                                YYCURSOR--;
+                            }
+                            QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN);
                             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();
-                        }
+yy117:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '\n':	goto yy125;
+	case '\r':	goto yy128;
+	case ' ':	goto yy126;
+	default:	goto yy113;
+	}
+yy118:	yych = *++YYCURSOR;
+	switch(yych){
+	case '#':	goto yy123;
+	default:	goto yy119;
+	}
+yy119:
+#line 540
+	{   goto Plain3; }
+yy120:	yych = *++YYCURSOR;
+yy121:
+#line 538
+	{   RETURN_IMPLICIT(); }
+yy122:	yych = *++YYCURSOR;
+	goto yy113;
+yy123:	yych = *++YYCURSOR;
+yy124:
+#line 534
+	{   eat_comments( parser ); 
                         RETURN_IMPLICIT();
                     }
-#line 1677 "<stdout>"
-yy132:	++YYCURSOR;
+yy125:	yych = *++YYCURSOR;
+	goto yy116;
+yy126:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy133;
-yy133:	switch(yych){
-	case ' ':	goto yy132;
-	default:	goto yy131;
+yy127:	switch(yych){
+	case ' ':	goto yy126;
+	default:	goto yy116;
 	}
-yy134:	yych = *++YYCURSOR;
+yy128:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy130;
-	default:	goto yy135;
+	case '\n':	goto yy125;
+	default:	goto yy129;
 	}
-yy135:	YYCURSOR = YYMARKER;
+yy129:	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;
+	case 0:	goto yy111;
+	case 1:	goto yy113;
+	}
+yy130:	yych = *++YYCURSOR;
+yy131:
+#line 520
+	{   RETURN_IMPLICIT(); }
+yy132:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy139;
-yy139:	switch(yych){
-	case ' ':	goto yy138;
-	default:	goto yy137;
+yy133:	switch(yych){
+	case ' ':	goto yy132;
+	default:	goto yy131;
 	}
-yy140:	yych = *++YYCURSOR;
+yy134:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy136;
-	default:	goto yy135;
+	case '\n':	goto yy130;
+	default:	goto yy129;
 	}
-yy141:	yyaccept = 0;
+yy135:	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;
+yy136:	switch(yych){
+	case '\n':	case ' ':	goto yy135;
+	case '\r':	goto yy137;
+	default:	goto yy111;
 	}
-yy143:	++YYCURSOR;
+yy137:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy141;
-	default:	goto yy135;
+	case '\n':	goto yy135;
+	default:	goto yy129;
 	}
 }
-#line 631 "token.re"
+#line 546
 
     }
 
@@ -1743,29 +1570,27 @@ SingleQuote:
 SingleQuote2:
         YYTOKEN = YYCURSOR;
 
-
-#line 1747 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy144;
-	++YYCURSOR;
-yy144:
+	goto yy138;
+yy139:	++YYCURSOR;
+yy138:
 	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;
+	case '\000':	goto yy146;
+	case '\n':	goto yy140;
+	case '\r':	goto yy142;
+	case '\'':	goto yy144;
+	default:	goto yy147;
 	}
-yy146:	yyaccept = 0;
+yy140:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy157;
-yy147:
-#line 645 "token.re"
-{   int indt_len;
+	goto yy151;
+yy141:
+#line 560
+	{   int indt_len;
                         int nl_count = 0;
                         SyckLevel *lvl;
                         GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
@@ -1782,12 +1607,8 @@ yy147:
 
                         while ( YYTOKEN < YYCURSOR )
                         {
-                            int nl_len = newline_len( YYTOKEN++ );
-                            if ( nl_len )
-                            {
+                            if ( is_newline( YYTOKEN++ ) )
                                 nl_count++;
-                                YYTOKEN += nl_len - 1;
-                            }
                         }
                         if ( nl_count <= 1 )
                         {
@@ -1804,26 +1625,24 @@ yy147:
 
                         goto SingleQuote2; 
                     }
-#line 1807 "<stdout>"
-yy148:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy156;
-	default:	goto yy149;
+yy142:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy150;
+	default:	goto yy143;
 	}
-yy149:
-#line 712 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
+yy143:
+#line 615
+	{   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;
+yy144:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\'':	goto yy148;
+	default:	goto yy145;
+	}
+yy145:
+#line 600
+	{   SyckLevel *lvl;
                         SyckNode *n = syck_alloc_str();
                         lvl = CURRENT_LEVEL();
 
@@ -1831,56 +1650,44 @@ yy151:
                         {
                             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->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, '\'');
+yy146:	yych = *++YYCURSOR;
+	goto yy145;
+yy147:	yych = *++YYCURSOR;
+	goto yy143;
+yy148:	yych = *++YYCURSOR;
+yy149:
+#line 596
+	{   QUOTECAT(qstr, qcapa, qidx, '\'');
                         goto SingleQuote2; 
                     }
-#line 1860 "<stdout>"
-yy156:	yyaccept = 0;
+yy150:	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;
+yy151:	switch(yych){
+	case '\n':	case ' ':	goto yy150;
+	case '\r':	goto yy152;
+	default:	goto yy141;
 	}
-yy158:	++YYCURSOR;
+yy152:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy156;
-	default:	goto yy159;
+	case '\n':	goto yy150;
+	default:	goto yy153;
 	}
-yy159:	YYCURSOR = YYMARKER;
+yy153:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy147;
+	case 0:	goto yy141;
 	}
 }
-#line 716 "token.re"
+#line 619
 
 
     }
@@ -1897,30 +1704,28 @@ DoubleQuote2:
         YYTOKEN = YYCURSOR;
 
 
-
-#line 1901 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy160;
-	++YYCURSOR;
-yy160:
+	goto yy154;
+yy155:	++YYCURSOR;
+yy154:
 	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;
+	case '\000':	goto yy161;
+	case '\n':	goto yy156;
+	case '\r':	goto yy158;
+	case '"':	goto yy163;
+	case '\\':	goto yy160;
+	default:	goto yy164;
+	}
+yy156:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy184;
-yy163:
-#line 734 "token.re"
-{   int indt_len;
+	goto yy178;
+yy157:
+#line 637
+	{   int indt_len;
                         int nl_count = 0;
                         SyckLevel *lvl;
                         GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
@@ -1939,12 +1744,8 @@ yy163:
                         {
                             while ( YYTOKEN < YYCURSOR )
                             {
-                                int nl_len = newline_len( YYTOKEN++ );
-                                if ( nl_len )
-                                {
+                                if ( is_newline( YYTOKEN++ ) )
                                     nl_count++;
-                                    YYTOKEN += nl_len - 1;
-                                }
                             }
                             if ( nl_count <= 1 )
                             {
@@ -1963,35 +1764,32 @@ yy163:
                         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)); 
+yy158:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy177;
+	default:	goto yy159;
+	}
+yy159:
+#line 722
+	{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
                         goto DoubleQuote2; 
                     }
-#line 1977 "<stdout>"
-yy166:	yyaccept = 1;
+yy160:	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 '\n':	goto yy168;
+	case '\r':	goto yy170;
+	case ' ':	goto yy165;
+	case '"':	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;
+	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy172;
+	case 'x':	goto yy171;
+	default:	goto yy159;
+	}
+yy161:	yych = *++YYCURSOR;
+yy162:
+#line 707
+	{   SyckLevel *lvl;
                         SyckNode *n = syck_alloc_str();
                         lvl = CURRENT_LEVEL();
 
@@ -1999,55 +1797,43 @@ yy168:
                         {
                             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->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);
+yy163:	yych = *++YYCURSOR;
+	goto yy162;
+yy164:	yych = *++YYCURSOR;
+	goto yy159;
+yy165:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy172;
-yy172:	switch(yych){
-	case 0x0A:	goto yy174;
-	case 0x0D:	goto yy176;
-	case ' ':	goto yy171;
-	default:	goto yy173;
-	}
-yy173:	YYCURSOR = YYMARKER;
+yy166:	switch(yych){
+	case '\n':	goto yy168;
+	case '\r':	goto yy170;
+	case ' ':	goto yy165;
+	default:	goto yy167;
+	}
+yy167:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy163;
-	case 1:	goto yy165;
-	}
-yy174:	++YYCURSOR;
-	goto yy175;
-yy175:
-#line 792 "token.re"
-{   keep_nl = 0;
+	case 0:	goto yy157;
+	case 1:	goto yy159;
+	}
+yy168:	yych = *++YYCURSOR;
+yy169:
+#line 702
+	{   keep_nl = 0;
                         YYCURSOR--;
                         goto DoubleQuote2; 
                     }
-#line 2044 "<stdout>"
-yy176:	yych = *++YYCURSOR;
+yy170:	yych = *++YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy174;
-	default:	goto yy173;
+	case '\n':	goto yy168;
+	default:	goto yy167;
 	}
-yy177:	yych = *++YYCURSOR;
+yy171:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2068,19 +1854,28 @@ yy177:	yych = *++YYCURSOR;
 	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 ));
+	case 'f':	goto yy174;
+	default:	goto yy167;
+	}
+yy172:	yych = *++YYCURSOR;
+yy173:
+#line 677
+	{  char ch = *( YYCURSOR - 1 );
+                        switch ( ch )
+                        {
+                            case 'a': ch = 7; break;
+                            case 'b': ch = '\010'; break;
+                            case 'e': ch = '\033'; break;
+                            case 'f': ch = '\014'; break;
+                            case 'n': ch = '\n'; break;
+                            case 'r': ch = '\015'; break;
+                            case 't': ch = '\t'; break;
+                            case 'v': ch = '\013'; break;
+                        }
+                        QUOTECAT(qstr, qcapa, qidx, ch);
                         goto DoubleQuote2; 
                     }
-#line 2082 "<stdout>"
-yy180:	yych = *++YYCURSOR;
+yy174:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2101,14 +1896,13 @@ yy180:	yych = *++YYCURSOR;
 	case 'c':
 	case 'd':
 	case 'e':
-	case 'f':	goto yy181;
-	default:	goto yy173;
+	case 'f':	goto yy175;
+	default:	goto yy167;
 	}
-yy181:	++YYCURSOR;
-	goto yy182;
-yy182:
-#line 783 "token.re"
-{   long ch;
+yy175:	yych = *++YYCURSOR;
+yy176:
+#line 693
+	{   long ch;
                         char *chr_text = syck_strndup( YYTOKEN, 4 );
                         chr_text[0] = '0';
                         ch = strtol( chr_text, NULL, 16 );
@@ -2116,26 +1910,24 @@ yy182:
                         QUOTECAT(qstr, qcapa, qidx, ch);
                         goto DoubleQuote2; 
                     }
-#line 2119 "<stdout>"
-yy183:	yyaccept = 0;
+yy177:	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;
+yy178:	switch(yych){
+	case '\n':	case ' ':	goto yy177;
+	case '\r':	goto yy179;
+	default:	goto yy157;
 	}
-yy185:	++YYCURSOR;
+yy179:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy183;
-	default:	goto yy173;
+	case '\n':	goto yy177;
+	default:	goto yy167;
 	}
 }
-#line 824 "token.re"
+#line 726
 
     }
 
@@ -2148,29 +1940,30 @@ TransferMethod:
 TransferMethod2:
         YYTOKTMP = YYCURSOR;
 
-
-#line 2152 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy186;
-	++YYCURSOR;
-yy186:
+	goto yy180;
+yy181:	++YYCURSOR;
+yy180:
 	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;
+	case '\000':	goto yy182;
+	case '\n':	goto yy183;
+	case '\r':	goto yy186;
+	case ' ':	goto yy185;
+	case '\\':	goto yy188;
+	default:	goto yy189;
+	}
+yy182:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy187;
+	}
+yy183:	yych = *++YYCURSOR;
+yy184:
+#line 740
+	{   SyckLevel *lvl;
                         YYCURSOR = YYTOKTMP;
                         if ( YYCURSOR == YYTOKEN + 1 )
                         {
@@ -2219,34 +2012,27 @@ yy189:
 
                         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;
+yy185:	yych = *++YYCURSOR;
+	goto yy196;
+yy186:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy194;
+	default:	goto yy187;
 	}
-yy193:
-#line 905 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
+yy187:
+#line 802
+	{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
                         goto TransferMethod2;
                     }
-#line 2237 "<stdout>"
-yy194:	yyaccept = 0;
+yy188:	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;
+	case 'x':	goto yy190;
+	default:	goto yy187;
 	}
-yy195:	yych = *++YYCURSOR;
-	goto yy193;
-yy196:	yych = *++YYCURSOR;
+yy189:	yych = *++YYCURSOR;
+	goto yy187;
+yy190:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2267,23 +2053,10 @@ yy196:	yych = *++YYCURSOR;
 	case 'c':
 	case 'd':
 	case 'e':
-	case 'f':	goto yy200;
-	default:	goto yy197;
-	}
-yy197:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy193;
+	case 'f':	goto yy191;
+	default:	goto yy182;
 	}
-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;
+yy191:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2304,14 +2077,13 @@ yy200:	yych = *++YYCURSOR;
 	case 'c':
 	case 'd':
 	case 'e':
-	case 'f':	goto yy201;
-	default:	goto yy197;
+	case 'f':	goto yy192;
+	default:	goto yy182;
 	}
-yy201:	++YYCURSOR;
-	goto yy202;
-yy202:
-#line 896 "token.re"
-{   long ch;
+yy192:	yych = *++YYCURSOR;
+yy193:
+#line 793
+	{   long ch;
                         char *chr_text = syck_strndup( YYTOKTMP, 4 );
                         chr_text[0] = '0';
                         ch = strtol( chr_text, NULL, 16 );
@@ -2319,17 +2091,17 @@ yy202:
                         QUOTECAT(qstr, qcapa, qidx, ch);
                         goto TransferMethod2;
                     }
-#line 2322 "<stdout>"
-yy203:	++YYCURSOR;
+yy194:	yych = *++YYCURSOR;
+	goto yy184;
+yy195:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy204;
-yy204:	switch(yych){
-	case ' ':	goto yy203;
-	default:	goto yy189;
+yy196:	switch(yych){
+	case ' ':	goto yy195;
+	default:	goto yy184;
 	}
 }
-#line 910 "token.re"
+#line 807
 
     }
 
@@ -2344,7 +2116,8 @@ ScalarBlock:
         int forceIndent = -1;
         char *yyt = YYTOKEN;
         SyckLevel *lvl = CURRENT_LEVEL();
-        int parentIndent = -1;
+        int parentIndent;
+        GET_TRUE_YAML_INDENT(parentIndent);
 
         switch ( *yyt )
         {
@@ -2364,7 +2137,7 @@ ScalarBlock:
             }
             else if ( isdigit( *yyt ) )
             {
-                forceIndent = strtol( yyt, NULL, 10 );
+                forceIndent = strtol( yyt, NULL, 10 ) + parentIndent;
             }
         }
 
@@ -2374,52 +2147,44 @@ ScalarBlock:
 ScalarBlock2:
         YYTOKEN = YYCURSOR;
 
-
-#line 2378 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy205;
-	++YYCURSOR;
-yy205:
-	if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
+	goto yy197;
+yy198:	++YYCURSOR;
+yy197:
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	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;
+	case '\000':	goto yy205;
+	case '\n':	goto yy199;
+	case '\r':	goto yy201;
+	case '#':	goto yy203;
+	default:	goto yy207;
+	}
+yy199:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy226;
-yy208:
-#line 956 "token.re"
-{   char *pacer;
+	goto yy209;
+yy200:
+#line 854
+	{   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 )
+                        if ( indt_len > parentIndent && 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();
-                            }
+                            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 if ( lvl->status != syck_lvl_block )
+                        {
+                            YYCURSOR = YYTOKEN;
+                            RETURN_YAML_BLOCK();
                         }
 
                         /*
@@ -2434,12 +2199,8 @@ yy208:
                         pacer = YYTOKEN;
                         while ( pacer < YYCURSOR )
                         {
-                            int nl_len = newline_len( pacer++ );
-                            if ( nl_len )
-                            {
+                            if ( is_newline( pacer++ ) )
                                 nl_count++;
-                                pacer += nl_len - 1;
-                            }
                         }
 
                         if ( fold_nl == 1 || nl_begin == 1 )
@@ -2471,23 +2232,20 @@ yy208:
                         }
                         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);
+yy201:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy208;
+	default:	goto yy202;
+	}
+yy202:
+#line 940
+	{   QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
                         goto ScalarBlock2;
                     }
-#line 2485 "<stdout>"
-yy211:	++YYCURSOR;
-	goto yy212;
-yy212:
-#line 1032 "token.re"
-{   lvl = CURRENT_LEVEL();
+yy203:	yych = *++YYCURSOR;
+yy204:
+#line 921
+	{   lvl = CURRENT_LEVEL();
                         if ( lvl->status != syck_lvl_block )
                         {
                             eat_comments( parser );
@@ -2499,96 +2257,37 @@ yy212:
                         }
                         goto ScalarBlock2;
                     }
-#line 2502 "<stdout>"
-yy213:	++YYCURSOR;
-	goto yy214;
-yy214:
-#line 1046 "token.re"
-{   YYCURSOR--;
+yy205:	yych = *++YYCURSOR;
+yy206:
+#line 935
+	{   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;
+yy207:	yych = *++YYCURSOR;
+	goto yy202;
+yy208:	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;
+yy209:	switch(yych){
+	case '\n':	case ' ':	goto yy208;
+	case '\r':	goto yy210;
+	default:	goto yy200;
 	}
-yy227:	++YYCURSOR;
+yy210:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy225;
-	default:	goto yy218;
+	case '\n':	goto yy208;
+	default:	goto yy211;
+	}
+yy211:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy200;
 	}
 }
-#line 1075 "token.re"
+#line 945
 
     }
 
@@ -2603,106 +2302,76 @@ Comment:
     {
         YYTOKEN = YYCURSOR;
 
-
-#line 2607 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy228;
-	++YYCURSOR;
-yy228:
+	goto yy212;
+yy213:	++YYCURSOR;
+yy212:
 	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;
+	case '\000':	goto yy214;
+	case '\n':	goto yy216;
+	case '\r':	goto yy217;
+	default:	goto yy219;
+	}
+yy214:	yych = *++YYCURSOR;
+yy215:
+#line 961
+	{   YYCURSOR = YYTOKEN;
                         return;
                     }
-#line 2629 "<stdout>"
-yy232:	yyaccept = 0;
+yy216:	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; 
+	goto yy221;
+yy217:	yych = *++YYCURSOR;
+	switch(yych){
+	case '\n':	goto yy220;
+	default:	goto yy218;
+	}
+yy218:
+#line 965
+	{   goto Comment; 
                     }
-#line 2642 "<stdout>"
-yy235:	yych = *++YYCURSOR;
-	goto yy234;
-yy236:	yyaccept = 0;
+yy219:	yych = *++YYCURSOR;
+	goto yy218;
+yy220:	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;
+yy221:	switch(yych){
+	case '\n':	goto yy220;
+	case '\r':	goto yy222;
+	default:	goto yy215;
 	}
-yy238:	++YYCURSOR;
+yy222:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case 0x0A:	goto yy236;
-	default:	goto yy239;
+	case '\n':	goto yy220;
+	default:	goto yy223;
 	}
-yy239:	YYCURSOR = YYMARKER;
+yy223:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy231;
+	case 0:	goto yy215;
 	}
 }
-#line 1098 "token.re"
+#line 968
 
 
     }
 
 }
 
-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 1;
 
     return 0;
 }
diff --git a/ext/syck/yaml2byte.c b/ext/syck/yaml2byte.c
index 821a3cd5b5..d55d1083b4 100644
--- a/ext/syck/yaml2byte.c
+++ b/ext/syck/yaml2byte.c
@@ -1,5 +1,5 @@
 /*
- * yaml2byte.c
+ * ybext.c
  *
  * $Author$
  * $Date$
@@ -9,11 +9,11 @@
  *   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 "ruby.h"
 
 #include <stdio.h>
 #define TRACE0(a)  \
@@ -145,7 +145,6 @@ syck_yaml2byte_handler(p, n)
             strcat( type_tag, "!" );
             strcat( type_tag, n->type_id );
             bytestring_append( val, YAMLBYTE_TRANSFER, type_tag, NULL);
-	    S_FREE(type_tag);
         }
     }
     switch (n->kind)
@@ -227,17 +226,12 @@ syck_yaml2byte(char *yamlstr)
     syck_parser_implicit_typing( parser, 1 );
     syck_parser_taguri_expansion( parser, 1 );
     oid = syck_parse( parser );
+    syck_lookup_sym( parser, oid, (char **)&sav );
 
-    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;
-    }
+    ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
+    ret[0] = '\0';
+    strcat( ret, "D\n" );
+    strcat( ret, sav->buffer );
 
     syck_free_parser( parser );
     return ret;
diff --git a/ext/syslog/MANIFEST b/ext/syslog/MANIFEST
new file mode 100644
index 0000000000..b5306034b7
--- /dev/null
+++ b/ext/syslog/MANIFEST
@@ -0,0 +1,6 @@
+MANIFEST
+extconf.rb
+syslog.c
+syslog.txt
+test.rb
+depend
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index ecc49318f7..ce386eda30 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -22,7 +22,6 @@ static void syslog_write(int pri, int argc, VALUE *argv)
 {
     VALUE str;
 
-    rb_secure(4);
     if (argc < 1) {
         rb_raise(rb_eArgError, "no log message supplied");
     }
@@ -39,7 +38,6 @@ static void syslog_write(int pri, int argc, VALUE *argv)
 /* Syslog module methods */
 static VALUE mSyslog_close(VALUE self)
 {
-    rb_secure(4);
     if (!syslog_opened) {
         rb_raise(rb_eRuntimeError, "syslog not opened");
     }
@@ -134,7 +132,6 @@ static VALUE mSyslog_get_mask(VALUE self)
 
 static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
 {
-    rb_secure(4);
     if (!syslog_opened) {
         rb_raise(rb_eRuntimeError, "must open syslog before setting log mask");
     }
@@ -149,7 +146,7 @@ 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);
+        rb_raise(rb_eArgError, "wrong # of arguments(%d for 2+)", argc);
     }
 
     argc--;
diff --git a/ext/syslog/syslog.txt b/ext/syslog/syslog.txt
index 35bd4cb057..9aed35133d 100644
--- a/ext/syslog/syslog.txt
+++ b/ext/syslog/syslog.txt
@@ -7,10 +7,7 @@ Amos Gouaux, University of Texas at Dallas
 <amos+ruby@utdallas.edu>
 &
 Akinori MUSHA
-<knu@iDaemons.org>
-
-Contact:
-  - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
+<knu@ruby-lang.org>
 
 ** Syslog(Module)
 
diff --git a/ext/tk/tkutil/.cvsignore b/ext/tcltklib/.cvsignore
index 90c83ed9b1..90c83ed9b1 100644
--- a/ext/tk/tkutil/.cvsignore
+++ b/ext/tcltklib/.cvsignore
diff --git a/ext/tcltklib/MANIFEST b/ext/tcltklib/MANIFEST
new file mode 100644
index 0000000000..e06547a6aa
--- /dev/null
+++ b/ext/tcltklib/MANIFEST
@@ -0,0 +1,19 @@
+MANIFEST
+README.1st
+README.euc
+MANUAL.euc
+MANUAL.eng
+tcltklib.c
+stubs.c
+depend
+extconf.rb
+lib/tcltk.rb
+demo/lines0.tcl
+demo/lines1.rb
+demo/lines2.rb
+demo/safeTk.rb
+sample/sample0.rb
+sample/sample1.rb
+sample/sample2.rb
+sample/maru.gif
+sample/batsu.gif
diff --git a/ext/tcltklib/MANUAL.eng b/ext/tcltklib/MANUAL.eng
new file mode 100644
index 0000000000..a037d18d41
--- /dev/null
+++ b/ext/tcltklib/MANUAL.eng
@@ -0,0 +1,264 @@
+(tof)
+                                    2003/10/17  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 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_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.
+
+
+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. 
+
+      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. 
+
+      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)
+      _fromUTF8(str, encoding)
+         : 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. 
+
+      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/ext/tcltklib/MANUAL.euc b/ext/tcltklib/MANUAL.euc
new file mode 100644
index 0000000000..9f9c77da02
--- /dev/null
+++ b/ext/tcltklib/MANUAL.euc
@@ -0,0 +1,408 @@
+(tof)
+                                    2003/10/17  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 ¤òÊÖ¤¹ ) ¤¹¤ë 
+
+   ¥â¥¸¥å¡¼¥ë¥á¥½¥Ã¥É
+      mainloop(check_root = true)
+         : ¥¤¥Ù¥ó¥È¥ë¡¼¥×¤òµ¯Æ°¤¹¤ë¡¥check_root ¤¬ true ¤Ç¤¢¤ì¤Ð¡¤
+         : root widget ¤¬Â¸ºß¤¹¤ë¸Â¤ê¡¤¤³¤Î¥á¥½¥Ã¥É¤Ï½ªÎ»¤·¤Ê¤¤¡¥
+         : check_root ¤¬ false ¤Î¾ì¹ç¤Ï¡¤root widget ¤¬¾ÃÌǤ·¤Æ¤â
+         : ¤³¤Î¥á¥½¥Ã¥É¤Ï½ªÎ»¤·¤Ê¤¤ ( root widget ¤¬¾ÃÌǤ·¤Æ¤â¡¤
+         : WINDOW °Ê³°¤Î¥¤¥Ù¥ó¥È¤ÏȯÀ¸¤·¤¦¤ë¤¿¤á )¡¥½ªÎ»¤Ë¤Ï¡¤³°Éô
+         : ¤«¤é¤ÎƯ¤­³Ý¤± ( ¥¹¥ì¥Ã¥É¤ò³èÍѤ¹¤ë¤Ê¤É ) ¤¬É¬Íס¥
+
+      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 ¤Îµ¡Ç½¤¬Í­¸ú¤Ç¤¢¤ë¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ÎÁí
+         : ¿ô¤ËÅù¤·¤¤¡¥
+
+
+¥¯¥é¥¹ 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 ¤òÊÖ¤¹¡¥
+
+      delete
+         : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ò delete ¤¹¤ë¡¥
+         : delete ¤µ¤ì¤¿¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ï¡¤°Ê¸å°ìÀÚ¤ÎÁàºî¤¬¤Ç¤­¤Ê¤¯¤Ê¤ê¡¤
+         : ¥³¥Þ¥ó¥É¤òÁ÷¤Ã¤Æ¤âÎã³°¤òȯÀ¸¤¹¤ë¤è¤¦¤Ë¤Ê¤ë¡¥
+
+      deleted?
+         : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤¬¤¹¤Ç¤Ë delete ¤µ¤ì¤Æ¤¤¤ë¤«¤òÄ´¤Ù¤ë¡¥
+         : delete ºÑ¤ß¤Ç¥³¥Þ¥ó¥É¤ò¼õ¤±ÉÕ¤±¤Ê¤¤¾õÂ֤ˤʤäƤ¤¤ë¤Ê¤é¤Ð
+         : true ¤òÊÖ¤¹¡¥
+
+      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)
+      _fromUTF8(str, encoding)
+         : 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 ¾å¤Ç¤Îɾ²Á¤Î¼Â¹Ô·ë²Ì¤È¤·¤Æ¤ÎÌá¤êÃͤòÊÖ¤¹¡¥
+
+      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/ext/tcltklib/README.1st b/ext/tcltklib/README.1st
new file mode 100644
index 0000000000..510dd1c2cd
--- /dev/null
+++ b/ext/tcltklib/README.1st
@@ -0,0 +1,41 @@
+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.3.so ==> --with-tcllib=tcl8.3)
+ --with-tklib=<libname>     (e.g. libtk8.3.so  ==> --with-tklib=tk8.3)
+
+ --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'
+
+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.3/ --with-tcllib=tcl8.3 --with-tklib=tk8.3 --enable-tcltk_stubs' 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. 
+
+==========================================================
+                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/old-README.tcltklib.eucj b/ext/tcltklib/README.euc
index fd75202c18..fd75202c18 100644
--- a/ext/tk/old-README.tcltklib.eucj
+++ b/ext/tcltklib/README.euc
diff --git a/ext/tk/sample/tcltklib/lines0.tcl b/ext/tcltklib/demo/lines0.tcl
index 8ed3c5e1c1..8ed3c5e1c1 100644
--- a/ext/tk/sample/tcltklib/lines0.tcl
+++ b/ext/tcltklib/demo/lines0.tcl
diff --git a/ext/tk/sample/tcltklib/lines2.rb b/ext/tcltklib/demo/lines1.rb
index e459589f50..e459589f50 100644
--- a/ext/tk/sample/tcltklib/lines2.rb
+++ b/ext/tcltklib/demo/lines1.rb
diff --git a/ext/tk/sample/tcltklib/lines1.rb b/ext/tcltklib/demo/lines2.rb
index 9f21ae6377..9f21ae6377 100644
--- a/ext/tk/sample/tcltklib/lines1.rb
+++ b/ext/tcltklib/demo/lines2.rb
diff --git a/ext/tk/sample/tcltklib/safeTk.rb b/ext/tcltklib/demo/safeTk.rb
index 5d2c60e700..5d2c60e700 100644
--- a/ext/tk/sample/tcltklib/safeTk.rb
+++ b/ext/tcltklib/demo/safeTk.rb
diff --git a/ext/tcltklib/depend b/ext/tcltklib/depend
new file mode 100644
index 0000000000..2cd9c400f7
--- /dev/null
+++ b/ext/tcltklib/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/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb
new file mode 100644
index 0000000000..575bf78034
--- /dev/null
+++ b/ext/tcltklib/extconf.rb
@@ -0,0 +1,58 @@
+# extconf.rb for tcltklib
+
+require 'mkmf'
+
+if RUBY_PLATFORM !~ /mswin32|mingw|cygwin|bccwin32/
+  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")
+
+def find_tcl(tcllib, stubs)
+  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+  func = stubs ? "Tcl_InitStubs" : "Tcl_FindExecutable"
+  if tcllib
+    find_library(tcllib, func, *paths)
+  elsif find_library("tcl", func, *paths)
+    true
+  else
+    %w[8.4 8.3 8.2 8.0 7.6].find { |ver|
+      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"]
+  func = stubs ? "Tk_InitStubs" : "Tk_Init"
+  if tklib
+    find_library(tklib, func, *paths)
+  elsif find_library("tk", func, *paths)
+    true
+  else
+    %w[8.4 8.3 8.2 8.0 4.2].find { |ver|
+      find_library("tk#{ver}", func, *paths) or
+	find_library("tk#{ver.delete('.')}", func, *paths)
+    }
+  end
+end
+
+if have_header("tcl.h") && have_header("tk.h") &&
+    (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM || 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
+  create_makefile("tcltklib")
+end
diff --git a/ext/tcltklib/lib/tcltk.rb b/ext/tcltklib/lib/tcltk.rb
new file mode 100644
index 0000000000..a6bc773b96
--- /dev/null
+++ b/ext/tcltklib/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/ext/tk/sample/tcltklib/batsu.gif b/ext/tcltklib/sample/batsu.gif
index 880cc73e09..880cc73e09 100644
--- a/ext/tk/sample/tcltklib/batsu.gif
+++ b/ext/tcltklib/sample/batsu.gif
diff --git a/ext/tk/sample/tcltklib/maru.gif b/ext/tcltklib/sample/maru.gif
index 2c0202892e..2c0202892e 100644
--- a/ext/tk/sample/tcltklib/maru.gif
+++ b/ext/tcltklib/sample/maru.gif
diff --git a/ext/tk/sample/tcltklib/sample0.rb b/ext/tcltklib/sample/sample0.rb
index cd4c8069b4..cd4c8069b4 100644
--- a/ext/tk/sample/tcltklib/sample0.rb
+++ b/ext/tcltklib/sample/sample0.rb
diff --git a/ext/tcltklib/sample/sample1.rb b/ext/tcltklib/sample/sample1.rb
new file mode 100644
index 0000000000..21ee0f29d5
--- /dev/null
+++ b/ext/tcltklib/sample/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.indexes(
+      "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().indexes(
+      "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().indexes(
+      "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().indexes(
+      "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().indexes("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().indexes(
+      "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().indexes(
+      "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().indexes(
+      "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().indexes(
+      "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().indexes(
+      "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().indexes(
+      "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().indexes(
+      "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().indexes(
+      "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().indexes(
+      "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().indexes("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/ext/tcltklib/sample/sample2.rb b/ext/tcltklib/sample/sample2.rb
new file mode 100644
index 0000000000..969d8de09a
--- /dev/null
+++ b/ext/tcltklib/sample/sample2.rb
@@ -0,0 +1,449 @@
+#!/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().indexes(
+   "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))
+	    @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/ext/tcltklib/stubs.c b/ext/tcltklib/stubs.c
new file mode 100644
index 0000000000..56cc8ca921
--- /dev/null
+++ b/ext/tcltklib/stubs.c
@@ -0,0 +1,97 @@
+int ruby_tcltk_stubs();
+
+#if defined USE_TCL_STUBS && defined USE_TK_STUBS
+#include "ruby.h"
+
+#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
+
+#include <tcl.h>
+#include <tk.h>
+
+int
+ruby_tcltk_stubs()
+{
+    DL_HANDLE tcl_dll;
+    DL_HANDLE tk_dll;
+    Tcl_Interp *(*p_Tcl_CreateInterp)();
+    int (*p_Tk_Init) _((Tcl_Interp *));
+    Tcl_Interp *tcl_ip;
+    int n;
+    char *ruby_tcl_dll = 0;
+    char *ruby_tk_dll = 0;
+    char tcl_name[20];
+    char tk_name[20];
+
+    ruby_tcl_dll = getenv("RUBY_TCL_DLL");
+#if defined _WIN32
+    if (ruby_tcl_dll) ruby_tcl_dll = ruby_strdup(ruby_tcl_dll);
+#endif
+    ruby_tk_dll = getenv("RUBY_TK_DLL");
+    if (ruby_tcl_dll && ruby_tk_dll) {
+	tcl_dll = (DL_HANDLE)DL_OPEN(ruby_tcl_dll);
+	tk_dll = (DL_HANDLE)DL_OPEN(ruby_tk_dll);
+    } else {
+	snprintf(tcl_name, sizeof tcl_name, TCL_NAME, DLEXT);
+	snprintf(tk_name, sizeof tk_name, TK_NAME, DLEXT);
+	/* examine from 8.9 to 8.1 */
+	for (n = '9'; n > '0'; n--) {
+	    tcl_name[TCL_INDEX] = n;
+	    tk_name[TK_INDEX] = n;
+	    tcl_dll = (DL_HANDLE)DL_OPEN(tcl_name);
+	    tk_dll = (DL_HANDLE)DL_OPEN(tk_name);
+	    if (tcl_dll && tk_dll)
+		break;
+	}
+    }
+
+#if defined _WIN32
+    if (ruby_tcl_dll) ruby_xfree(ruby_tcl_dll);
+#endif
+
+    if (!tcl_dll || !tk_dll)
+	return -1;
+
+    p_Tcl_CreateInterp = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_CreateInterp");
+    if (!p_Tcl_CreateInterp)
+	return -2;
+
+    tcl_ip = (*p_Tcl_CreateInterp)();
+    if (!tcl_ip)
+	return -3;
+
+    p_Tk_Init = (int (*) _((Tcl_Interp *)))DL_SYM(tk_dll, "Tk_Init");
+    if (!p_Tk_Init)
+	return -4;
+    (*p_Tk_Init)(tcl_ip);
+
+    if (!Tcl_InitStubs(tcl_ip, "8.1", 0))
+	return -5;
+    if (!Tk_InitStubs(tcl_ip, "8.1", 0))
+	return -6;
+
+    Tcl_DeleteInterp(tcl_ip);
+
+    return 0;
+}
+#endif
diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c
new file mode 100644
index 0000000000..ad7e377b66
--- /dev/null
+++ b/ext/tcltklib/tcltklib.c
@@ -0,0 +1,2396 @@
+/*
+ *	tcltklib.c
+ *		Aug. 27, 1997	Y. Shigehiro
+ *		Oct. 24, 1997	Y. Matsumoto
+ */
+
+#include "ruby.h"
+#include "rubysig.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>
+
+#ifdef __MACOS__
+# include <tkMac.h>
+# include <Quickdraw.h>
+#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
+#endif
+
+/* for ruby_debug */
+
+#define DUMP1(ARG1) if (ruby_debug) { fprintf(stderr, "tcltklib: %s\n", ARG1);}
+#define DUMP2(ARG1, ARG2) if (ruby_debug) { fprintf(stderr, "tcltklib: ");\
+fprintf(stderr, ARG1, ARG2); fprintf(stderr, "\n"); }
+/*
+#define DUMP1(ARG1)
+#define DUMP2(ARG1, ARG2)
+*/
+
+/* for callback break & continue */
+static VALUE eTkCallbackBreak;
+static VALUE eTkCallbackContinue;
+
+static VALUE ip_invoke_real _((int, VALUE*, VALUE));
+static VALUE ip_invoke _((int, VALUE*, VALUE));
+
+/* from tkAppInit.c */
+
+#if !defined __MINGW32__
+/*
+ * 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
+
+/*---- module TclTkLib ----*/
+
+struct invoke_queue {
+    Tcl_Event ev;
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+    int done;
+    int safe_level;
+    VALUE *result;
+    VALUE thread;
+};
+
+struct eval_queue {
+    Tcl_Event ev;
+    VALUE str;
+    VALUE obj;
+    int done;
+    int safe_level;
+    VALUE *result;
+    VALUE thread;
+};
+ 
+static VALUE eventloop_thread;
+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;
+
+#if TCL_MAJOR_VERSION >= 8
+static int ip_ruby _((ClientData, Tcl_Interp *, int, Tcl_Obj *CONST*));
+#else
+static int ip_ruby _((ClientData, Tcl_Interp *, int, char **));
+#endif
+
+/*---- class TclTkIp ----*/
+struct tcltkip {
+    Tcl_Interp *ip;		/* the interpreter */
+    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 ptr;
+}
+
+/* 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;
+{
+    /* struct invoke_queue *q, *tmp; */
+    /* VALUE thread; */
+
+    DUMP1("called timer_for_tcl");
+    Tk_DeleteTimerHandler(timer_token);
+
+    run_timer_flag = 1;
+
+    if (timer_tick > 0) {
+	timer_token = Tk_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+					    (ClientData)0);
+    } else {
+	timer_token = (Tcl_TimerToken)NULL;
+    }
+
+    /* rb_thread_schedule(); */
+    /* tick_counter += event_loop_max; */
+}
+
+static VALUE
+set_eventloop_tick(self, tick)
+    VALUE self;
+    VALUE tick;
+{
+    int ttick = NUM2INT(tick);
+
+    rb_secure(4);
+
+    if (ttick < 0) {
+	rb_raise(rb_eArgError, 
+		 "timer-tick parameter must be 0 or positive number");
+    }
+
+    /* delete old timer callback */
+    Tk_DeleteTimerHandler(timer_token);
+
+    timer_tick = req_timer_tick = ttick;
+    if (timer_tick > 0) {
+	/* start timer callback */
+	timer_token = Tk_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+					    (ClientData)0);
+    } else {
+	timer_token = (Tcl_TimerToken)NULL;
+    }
+
+    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);
+
+    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);
+
+    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);
+
+    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
+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 (val == Qnil) {
+	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);
+    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;
+{
+    return INT2FIX(Tk_GetNumMainWindows());
+}
+
+static int
+lib_eventloop_core(check_root, check_var)
+    int check_root;
+    int *check_var;
+{
+    VALUE current = eventloop_thread;
+    int found_event = 1;
+    struct timeval t;
+
+    t.tv_sec = (time_t)0;
+    t.tv_usec = (time_t)(no_event_wait*1000.0);
+
+    Tk_DeleteTimerHandler(timer_token);
+    run_timer_flag = 0;
+    if (timer_tick > 0) {
+	timer_token = Tk_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+					    (ClientData)0);
+    } else {
+	timer_token = (Tcl_TimerToken)NULL;
+    }
+
+    for(;;) {
+	if (rb_thread_alone()) {
+	    DUMP1("no other thread");
+	    event_loop_wait_event = 0;
+
+	    if (timer_tick == 0) {
+		timer_tick = NO_THREAD_INTERRUPT_TIME;
+		timer_token = Tk_CreateTimerHandler(timer_tick, 
+						    _timer_for_tcl, 
+						    (ClientData)0);
+	    }
+
+	    if (check_var != (int *)NULL) {
+		if (*check_var || !found_event) {
+		    return found_event;
+		}
+	    }
+
+	    found_event = Tcl_DoOneEvent(TCL_ALL_EVENTS);
+
+	    if (loop_counter++ > 30000) {
+		loop_counter = 0;
+	    }
+
+	    if (run_timer_flag) {
+		/* 
+		DUMP1("timer interrupt");
+		run_timer_flag = 0;
+		DUMP1("call rb_trap_exec()");
+		rb_trap_exec();
+		*/
+		DUMP1("check Root Widget");
+		if (check_root && Tk_GetNumMainWindows() == 0) {
+		    run_timer_flag = 0;
+		    rb_trap_exec();
+		    return 1;
+		}
+	    }
+
+	} else {
+	    int tick_counter;
+
+	    DUMP1("there are other threads");
+	    event_loop_wait_event = 1;
+
+	    found_event = 1;
+
+	    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 (Tcl_DoOneEvent(TCL_ALL_EVENTS | TCL_DONT_WAIT)) {
+		    tick_counter++;
+		} else {
+		    tick_counter += no_event_tick;
+
+		    DUMP1("check Root Widget");
+		    if (check_root && Tk_GetNumMainWindows() == 0) {
+			return 1;
+		    }
+
+		    rb_thread_wait_for(t);
+		}
+
+		if (loop_counter++ > 30000) {
+		    loop_counter = 0;
+		}
+
+		if (watchdog_thread != 0 && eventloop_thread != current) {
+		    return 1;
+		}
+
+		if (run_timer_flag) {
+		    /*
+		    DUMP1("timer interrupt");
+		    run_timer_flag = 0;
+		    */
+		    break; /* switch to other thread */
+		}
+	    }
+
+	    DUMP1("check Root Widget");
+	    if (check_root && Tk_GetNumMainWindows() == 0) {
+		return 1;
+	    }
+	}
+
+	/* rb_thread_schedule(); */
+	if (run_timer_flag) {
+	    run_timer_flag = 0;
+	    rb_trap_exec();
+	} else {
+            DUMP1("thread scheduling");
+	    if (is_ruby_native_thread()) {
+		rb_thread_schedule();
+	    }
+	}
+    }
+    return 1;
+}
+
+VALUE
+lib_eventloop_main(check_rootwidget)
+    VALUE check_rootwidget;
+{
+    check_rootwidget_flag = RTEST(check_rootwidget);
+
+    if (lib_eventloop_core(check_rootwidget_flag, (int *)NULL)) {
+	return Qtrue;
+    } else {
+	return Qfalse;
+    }
+}
+
+VALUE
+lib_eventloop_ensure(parent_evloop)
+    VALUE parent_evloop;
+{
+    Tk_DeleteTimerHandler(timer_token);
+    timer_token = (Tcl_TimerToken)NULL;
+    DUMP2("eventloop-ensure: current-thread : %lx\n", rb_thread_current());
+    DUMP2("eventloop-ensure: eventloop-thread : %lx\n", eventloop_thread);
+    if (eventloop_thread == rb_thread_current()) {
+	DUMP2("eventloop-thread -> %lx\n", parent_evloop);
+	eventloop_thread = parent_evloop;
+    }
+    return Qnil;
+}
+
+static VALUE
+lib_eventloop_launcher(check_rootwidget)
+    VALUE check_rootwidget;
+{
+    VALUE parent_evloop = eventloop_thread;
+
+    eventloop_thread = rb_thread_current();
+
+    if (ruby_debug) { 
+	fprintf(stderr, "tcltklib: eventloop-thread : %lx -> %lx\n", 
+		parent_evloop, eventloop_thread);
+    }
+
+    return rb_ensure(lib_eventloop_main, check_rootwidget, 
+		     lib_eventloop_ensure, parent_evloop);
+}
+
+/* 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(check_rootwidget);
+}
+
+static VALUE
+ip_mainloop(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+	/* slave IP */
+	return Qnil;
+    }
+    return lib_mainloop(argc, argv, self);
+}
+
+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 (watchdog_thread != 0) {
+	if (RTEST(rb_funcall(watchdog_thread, rb_intern("stop?"), 0))) {
+	    rb_funcall(watchdog_thread, rb_intern("kill"), 0);
+	} else {
+	    return Qnil;
+	}
+    }
+    watchdog_thread = rb_thread_current();
+
+    /* watchdog start */
+    do {
+	if (eventloop_thread == 0 
+	    || (loop_counter == prev_val
+		&& RTEST(rb_funcall(eventloop_thread, rb_intern("stop?"), 0))
+		&& ++chance >= 3 )
+	    ) {
+	    /* start new eventloop thread */
+	    DUMP2("eventloop thread %lx is sleeping or dead", 
+		  eventloop_thread);
+	    evloop = rb_thread_create(lib_eventloop_launcher, 
+				      (void*)&check_rootwidget);
+	    DUMP2("create new eventloop thread %lx", evloop);
+	    loop_counter = -1;
+	    chance = 0;
+	    rb_thread_run(evloop);
+	} else {
+	    loop_counter = prev_val;
+	    chance = 0;
+	    if (event_loop_wait_event) {
+		rb_thread_wait_for(t0);
+	    } else {
+		rb_thread_wait_for(t1);
+	    }
+	    /* rb_thread_schedule(); */
+	}
+    } while(!check || Tk_GetNumMainWindows() != 0);
+
+    return Qnil;
+}
+
+VALUE
+lib_watchdog_ensure(arg)
+    VALUE arg;
+{
+    eventloop_thread = 0; /* 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);
+
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+	/* slave IP */
+	return Qnil;
+    }
+    return lib_mainloop_watchdog(argc, argv, self);
+}
+
+static VALUE
+lib_do_one_event_core(argc, argv, self, is_ip)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+    int   is_ip;
+{
+    VALUE vflags;
+    int flags;
+    int found_event;
+
+    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);
+	if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+	    /* slave IP */
+	    flags |= TCL_DONT_WAIT;
+	}
+    }
+
+    found_event = Tcl_DoOneEvent(TCL_ALL_EVENTS | TCL_DONT_WAIT);
+
+    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);
+}
+
+
+/* Tcl command `ruby' */
+static VALUE
+ip_ruby_eval_rescue(failed, einfo)
+    VALUE *failed;
+    VALUE einfo;
+{
+    *failed = einfo;
+    return Qnil;
+}
+
+struct eval_body_arg {
+    char  *string;
+    VALUE failed;
+};
+
+static VALUE
+ip_ruby_eval_body(arg)
+     struct eval_body_arg *arg;
+{
+    rb_trap_immediate = 0;
+    return rb_rescue2(rb_eval_string, (VALUE)arg->string, 
+		      ip_ruby_eval_rescue, (VALUE)&(arg->failed),
+		      rb_eStandardError, rb_eScriptError, rb_eSystemExit, 
+		      (VALUE)0);
+}
+
+static VALUE
+ip_ruby_eval_ensure(trapflag)
+     VALUE trapflag;
+{
+    rb_trap_immediate = NUM2INT(trapflag);
+    return Qnil;
+}
+
+static int
+#if TCL_MAJOR_VERSION >= 8
+ip_ruby(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int argc;
+    Tcl_Obj *CONST argv[];
+#else
+ip_ruby(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int argc;
+    char *argv[];
+#endif
+{
+    VALUE res;
+    int old_trapflag;
+    struct eval_body_arg arg;
+    int  dummy;
+
+    /* ruby command has 1 arg. */
+    if (argc != 2) {
+	rb_raise(rb_eArgError, "wrong # of arguments (%d for 1)", argc);
+    }
+
+    /* get C string from Tcl object */
+#if TCL_MAJOR_VERSION >= 8
+    arg.string = Tcl_GetStringFromObj(argv[1], &dummy);
+#else
+    arg.string = argv[1];
+#endif
+    arg.failed = 0;
+
+    /* evaluate the argument string by ruby */
+    DUMP2("rb_eval_string(%s)", arg.string);
+    old_trapflag = rb_trap_immediate;
+    res = rb_ensure(ip_ruby_eval_body, (VALUE)&arg, 
+		    ip_ruby_eval_ensure, INT2FIX(old_trapflag));
+
+    /* status check */
+    if (arg.failed) {
+        VALUE eclass = CLASS_OF(arg.failed);
+	DUMP1("(rb_eval_string result) failed");
+	Tcl_ResetResult(interp);
+	Tcl_AppendResult(interp, StringValuePtr(arg.failed), (char*)NULL);
+        if (eclass == eTkCallbackBreak) {
+	    return TCL_BREAK;
+	} else if (eclass == eTkCallbackContinue) {
+	    return TCL_CONTINUE;
+	} else if (eclass == rb_eSystemExit) {
+	    Tcl_Eval(interp, "destroy .");
+	    rb_raise(rb_eSystemExit, StringValuePtr(arg.failed));
+	} else {
+	    return TCL_ERROR;
+	}
+    }
+
+    /* result must be string or nil */
+    if (NIL_P(res)) {
+	DUMP1("(rb_eval_string result) nil");
+	Tcl_ResetResult(interp);
+	return TCL_OK;
+    }
+
+    /* copy result to the tcl interpreter */
+    DUMP2("(rb_eval_string result) %s", StringValuePtr(res));
+    DUMP1("Tcl_AppendResult");
+    Tcl_ResetResult(interp);
+    Tcl_AppendResult(interp, StringValuePtr(res), (char *)NULL);
+
+    return TCL_OK;
+}
+
+
+/**************************/
+/*  based on tclEvent.c   */
+/**************************/
+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. */
+{
+    int *donePtr = (int *) clientData;
+
+    *donePtr = 1;
+    return (char *) NULL;
+}
+
+#if TCL_MAJOR_VERSION >= 8
+static int ip_rbVwaitObjCmd _((ClientData, Tcl_Interp *, int,
+			       Tcl_Obj *CONST []));
+static int
+ip_rbVwaitObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else
+static int ip_rbVwaitCommand _((ClientData, Tcl_Interp *, int, char *[]));
+static int
+ip_rbVwaitCommand(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    char *objv[];
+#endif
+{
+    int  done, foundEvent;
+    char *nameString;
+    int  dummy;
+
+    DUMP1("Ruby's 'vwait' is called");
+    if (objc != 2) {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "name");
+#else
+#if TCL_MAJOR_VERSION >= 8
+	/* nameString = Tcl_GetString(objv[0]); */
+	nameString = Tcl_GetStringFromObj(objv[0], &dummy);
+#else
+	nameString = objv[0];
+#endif
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+			 nameString, " name\"", (char *) NULL);
+#endif
+        return TCL_ERROR;
+    }
+#if TCL_MAJOR_VERSION >= 8
+    /* nameString = Tcl_GetString(objv[1]); */
+    nameString = Tcl_GetStringFromObj(objv[1], &dummy);
+#else
+    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;
+    };
+    done = 0;
+    foundEvent = lib_eventloop_core(/* not check root-widget */0, &done);
+    Tcl_UntraceVar(interp, nameString,
+		   TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		   VwaitVarProc, (ClientData) &done);
+
+    /*
+     * Clear out the interpreter's result, since it may have been set
+     * by event handlers.
+     */
+
+    Tcl_ResetResult(interp);
+    if (!foundEvent) {
+        Tcl_AppendResult(interp, "can't wait for variable \"", nameString,
+			 "\":  would wait forever", (char *) NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+
+/**************************/
+/*  based on tkCmd.c      */
+/**************************/
+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. */
+{
+    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, Tcl_Interp *, int,
+				Tcl_Obj *CONST []));
+static int
+ip_rbTkWaitObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else
+static int ip_rbTkWaitCommand _((ClientData, Tcl_Interp *, int, char *[]));
+static int
+ip_rbTkWaitCommand(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    char *objv[];
+#endif
+{
+    Tk_Window tkwin = (Tk_Window) clientData;
+    int done, index;
+    static CONST char *optionStrings[] = { "variable", "visibility", "window",
+					   (char *) NULL };
+    enum options { TKWAIT_VARIABLE, TKWAIT_VISIBILITY, TKWAIT_WINDOW };
+    char *nameString;
+    int  dummy;
+
+    DUMP1("Ruby's 'tkwait' is called");
+
+    if (objc != 3) {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name");
+#else
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+			 Tcl_GetStringFromObj(objv[0], &dummy), 
+			 " variable|visibility|window name\"", 
+			 (char *) NULL);
+#else
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+			 objv[0], " variable|visibility|window name\"", 
+			 (char *) NULL);
+#endif
+#endif
+        return TCL_ERROR;
+    }
+
+#if TCL_MAJOR_VERSION >= 8
+    if (Tcl_GetIndexFromObj(interp, objv[1], 
+                            (CONST84 char **)optionStrings, 
+			    "option", 0, &index) != TCL_OK) {
+        return TCL_ERROR;
+    }
+#else
+    {
+	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);
+	    return TCL_ERROR;
+	}
+    }
+#endif
+
+#if TCL_MAJOR_VERSION >= 8
+    /* nameString = Tcl_GetString(objv[2]); */
+    nameString = Tcl_GetStringFromObj(objv[2], &dummy);
+#else
+    nameString = objv[2];
+#endif
+
+    switch ((enum options) index) {
+    case TKWAIT_VARIABLE: {
+	if (Tcl_TraceVar(interp, nameString,
+			 TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+			 WaitVariableProc, (ClientData) &done) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	done = 0;
+	lib_eventloop_core(check_rootwidget_flag, &done);
+	Tcl_UntraceVar(interp, nameString,
+		       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		       WaitVariableProc, (ClientData) &done);
+	break;
+    }
+
+    case TKWAIT_VISIBILITY: {
+	Tk_Window window;
+
+	window = Tk_NameToWindow(interp, nameString, tkwin);
+	if (window == NULL) {
+	    return TCL_ERROR;
+	}
+	Tk_CreateEventHandler(window,
+			      VisibilityChangeMask|StructureNotifyMask,
+			      WaitVisibilityProc, (ClientData) &done);
+	done = 0;
+	lib_eventloop_core(check_rootwidget_flag, &done);
+	if (done != 1) {
+	    /*
+	     * Note that we do not delete the event handler because it
+	     * was deleted automatically when the window was destroyed.
+	     */
+
+	    Tcl_ResetResult(interp);
+	    Tcl_AppendResult(interp, "window \"", nameString,
+			     "\" was deleted before its visibility changed",
+			     (char *) NULL);
+	    return TCL_ERROR;
+	}
+	Tk_DeleteEventHandler(window,
+			      VisibilityChangeMask|StructureNotifyMask,
+			      WaitVisibilityProc, (ClientData) &done);
+	break;
+    }
+
+    case TKWAIT_WINDOW: {
+	Tk_Window window;
+            
+	window = Tk_NameToWindow(interp, nameString, tkwin);
+	if (window == NULL) {
+	    return TCL_ERROR;
+	}
+	Tk_CreateEventHandler(window, StructureNotifyMask,
+			      WaitWindowProc, (ClientData) &done);
+	done = 0;
+	lib_eventloop_core(check_rootwidget_flag, &done);
+	/*
+	 * 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);
+    return TCL_OK;
+}
+
+/****************************/
+/* vwait/tkwait with thread */
+/****************************/
+struct th_vwait_param {
+    VALUE thread;
+    int   done;
+};
+
+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. */
+{
+    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
+
+    param->done = 1;
+    rb_thread_run(param->thread);
+
+    return (char *)NULL;
+}
+
+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 = 1;
+    }
+    if (eventPtr->type == DestroyNotify) {
+        param->done = 2;
+    }
+}
+
+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 = 1;
+    }
+}
+
+#if TCL_MAJOR_VERSION >= 8
+static int ip_rb_threadVwaitObjCmd _((ClientData, Tcl_Interp *, int,
+				      Tcl_Obj *CONST []));
+static int
+ip_rb_threadVwaitObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else
+static int ip_rb_threadVwaitCommand _((ClientData, Tcl_Interp *, int,
+				       char *[]));
+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  dummy;
+
+    DUMP1("Ruby's 'thread_vwait' is called");
+
+    if (eventloop_thread == rb_thread_current()) {
+#if TCL_MAJOR_VERSION >= 8
+	DUMP1("call ip_rbVwaitObjCmd");
+	return ip_rbVwaitObjCmd(clientData, interp, objc, objv);
+#else
+	DUMP1("call ip_rbVwaitCommand");
+	return ip_rbVwaitCommand(clientData, interp, objc, objv);
+#endif
+    }
+
+    if (objc != 2) {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "name");
+#else
+#if TCL_MAJOR_VERSION >= 8
+	/* nameString = Tcl_GetString(objv[0]); */
+	nameString = Tcl_GetStringFromObj(objv[0], &dummy);
+#else
+	nameString = objv[0];
+#endif
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+			 nameString, " name\"", (char *) NULL);
+#endif
+        return TCL_ERROR;
+    }
+#if TCL_MAJOR_VERSION >= 8
+    /* nameString = Tcl_GetString(objv[1]); */
+    nameString = Tcl_GetStringFromObj(objv[1], &dummy);
+#else
+    nameString = objv[1];
+#endif
+
+    param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param));
+    param->thread = rb_thread_current();
+    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;
+    };
+
+    if (!param->done) {
+	rb_thread_stop();
+    }
+
+    Tcl_UntraceVar(interp, nameString,
+		   TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		   rb_threadVwaitProc, (ClientData) param);
+
+    Tcl_Free((char *)param);
+
+    return TCL_OK;
+}
+
+#if TCL_MAJOR_VERSION >= 8
+static int ip_rb_threadTkWaitObjCmd _((ClientData, Tcl_Interp *, int,
+				       Tcl_Obj *CONST []));
+static int
+ip_rb_threadTkWaitObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else
+static int ip_rb_threadTkWaitCommand _((ClientData, Tcl_Interp *, int,
+					char *[]));
+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;
+    int index;
+    static CONST char *optionStrings[] = { "variable", "visibility", "window",
+					   (char *) NULL };
+    enum options { TKWAIT_VARIABLE, TKWAIT_VISIBILITY, TKWAIT_WINDOW };
+    char *nameString;
+    int  dummy;
+
+    DUMP1("Ruby's 'thread_tkwait' is called");
+
+    if (eventloop_thread == rb_thread_current()) {
+#if TCL_MAJOR_VERSION >= 8
+	DUMP1("call ip_rbTkWaitObjCmd");
+	return ip_rbTkWaitObjCmd(clientData, interp, objc, objv);
+#else
+	DUMP1("call rb_VwaitCommand");
+	return ip_rbTkWaitCommand(clientData, interp, objc, objv);
+#endif
+    }
+
+    if (objc != 3) {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name");
+#else
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+			 Tcl_GetStringFromObj(objv[0], &dummy), 
+			 " variable|visibility|window name\"", 
+			 (char *) NULL);
+#else
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+			 objv[0], " variable|visibility|window name\"", 
+			 (char *) NULL);
+#endif
+#endif
+        return TCL_ERROR;
+    }
+
+#if TCL_MAJOR_VERSION >= 8
+    if (Tcl_GetIndexFromObj(interp, objv[1], 
+                            (CONST84 char **)optionStrings, 
+			    "option", 0, &index) != TCL_OK) {
+        return TCL_ERROR;
+    }
+#else
+    {
+	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);
+	    return TCL_ERROR;
+	}
+    }
+#endif
+
+#if TCL_MAJOR_VERSION >= 8
+    /* nameString = Tcl_GetString(objv[2]); */
+    nameString = Tcl_GetStringFromObj(objv[2], &dummy);
+#else
+    nameString = objv[2];
+#endif
+
+    param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param));
+    param->thread = rb_thread_current();
+    param->done = 0;
+
+    switch ((enum options) index) {
+    case TKWAIT_VARIABLE: {
+	if (Tcl_TraceVar(interp, nameString,
+			 TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+			 rb_threadVwaitProc, (ClientData) param) != TCL_OK) {
+	    return TCL_ERROR;
+	};
+
+	if (!param->done) {
+	    rb_thread_stop();
+	}
+
+	Tcl_UntraceVar(interp, nameString,
+		       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		       rb_threadVwaitProc, (ClientData) param);
+	break;
+    }
+
+    case TKWAIT_VISIBILITY: {
+	Tk_Window window;
+
+	window = Tk_NameToWindow(interp, nameString, tkwin);
+	if (window == NULL) {
+	    return TCL_ERROR;
+	}
+	Tk_CreateEventHandler(window,
+			      VisibilityChangeMask|StructureNotifyMask,
+			      rb_threadWaitVisibilityProc, (ClientData) param);
+	if (!param->done) {
+	    rb_thread_stop();
+	}
+	if (param->done != 1) {
+	    /*
+	     * Note that we do not delete the event handler because it
+	     * was deleted automatically when the window was destroyed.
+	     */
+
+	    Tcl_ResetResult(interp);
+	    Tcl_AppendResult(interp, "window \"", nameString,
+			     "\" was deleted before its visibility changed",
+			     (char *) NULL);
+	    return TCL_ERROR;
+	}
+	Tk_DeleteEventHandler(window,
+			      VisibilityChangeMask|StructureNotifyMask,
+			      rb_threadWaitVisibilityProc, (ClientData) param);
+	break;
+    }
+
+    case TKWAIT_WINDOW: {
+	Tk_Window window;
+            
+	window = Tk_NameToWindow(interp, nameString, tkwin);
+	if (window == NULL) {
+	    return TCL_ERROR;
+	}
+	Tk_CreateEventHandler(window, StructureNotifyMask,
+			      rb_threadWaitWindowProc, (ClientData) param);
+	if (!param->done) {
+	    rb_thread_stop();
+	}
+	/*
+	 * Note:  there's no need to delete the event handler.  It was
+	 * deleted automatically when the window was destroyed.
+	 */
+	break;
+    }
+    }
+
+    Tcl_Free((char *)param);
+
+    /*
+     * Clear out the interpreter's result, since it may have been set
+     * by event handlers.
+     */
+
+    Tcl_ResetResult(interp);
+    return TCL_OK;
+}
+
+static VALUE
+ip_thread_vwait(self, var)
+    VALUE self;
+    VALUE var;
+{
+    VALUE argv[2];
+
+    argv[0] = rb_str_new2("thread_vwait");
+    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];
+
+    argv[0] = rb_str_new2("thread_tkwait");
+    argv[1] = mode;
+    argv[2] = target;
+    return ip_invoke_real(3, argv, self);
+}
+
+
+/* destroy interpreter */
+static void
+ip_free(ptr)
+    struct tcltkip *ptr;
+{
+    DUMP1("Tcl_DeleteInterp");
+    if (ptr) {
+	Tcl_Release((ClientData)ptr->ip);
+	Tcl_DeleteInterp(ptr->ip);
+	free(ptr);
+    }
+}
+
+/* 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 VALUE
+ip_init(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct tcltkip *ptr;	/* tcltkip data struct */
+    VALUE argv0, opts;
+    int cnt;
+    int with_tk = 1;
+
+    /* create object */
+    Data_Get_Struct(self, struct tcltkip, ptr);
+    ptr = ALLOC(struct tcltkip);
+    DATA_PTR(self) = ptr;
+    ptr->return_value = 0;
+
+    /* from Tk_Main() */
+    DUMP1("Tcl_CreateInterp");
+    ptr->ip = Tcl_CreateInterp();
+    Tcl_Preserve((ClientData)ptr->ip);
+    current_interp = ptr->ip;
+
+    /* from Tcl_AppInit() */
+    DUMP1("Tcl_Init");
+    if (Tcl_Init(ptr->ip) == TCL_ERROR) {
+	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+    }
+
+    /* set variables */
+    cnt = rb_scan_args(argc, argv, "02", &argv0, &opts);
+    switch(cnt) {
+    case 2:
+	/* options */
+	if (opts == Qnil || opts == Qfalse) {
+	    /* without Tk */
+	    with_tk = 0;
+	} else {
+	    Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), 0);
+	}
+    case 1:
+	/* argv0 */
+	if (argv0 != Qnil) {
+	    Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0);
+	}
+    case 0:
+	/* no args */
+	;
+    }
+
+    /* from Tcl_AppInit() */
+    if (with_tk) {
+	DUMP1("Tk_Init");
+	if (Tk_Init(ptr->ip) == TCL_ERROR) {
+	    rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+	}
+	DUMP1("Tcl_StaticPackage(\"Tk\")");
+#if TCL_MAJOR_VERSION >= 8
+	Tcl_StaticPackage(ptr->ip, "Tk", Tk_Init, Tk_SafeInit);
+#else
+	Tcl_StaticPackage(ptr->ip, "Tk", Tk_Init,
+			  (Tcl_PackageInitProc *) NULL);
+#endif
+    }
+
+    /* add ruby command to the interpreter */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"ruby\")");
+    Tcl_CreateObjCommand(ptr->ip, "ruby", ip_ruby, (ClientData)NULL,
+			 (Tcl_CmdDeleteProc *)NULL);
+#else
+    DUMP1("Tcl_CreateCommand(\"ruby\")");
+    Tcl_CreateCommand(ptr->ip, "ruby", ip_ruby, (ClientData)NULL,
+		      (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* replace 'vwait' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"vwait\")");
+    Tcl_CreateObjCommand(ptr->ip, "vwait", ip_rbVwaitObjCmd, 
+			 (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#else
+    DUMP1("Tcl_CreateCommand(\"vwait\")");
+    Tcl_CreateCommand(ptr->ip, "vwait", ip_rbVwaitCommand, 
+		      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* replace 'tkwait' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"tkwait\")");
+    Tcl_CreateObjCommand(ptr->ip, "tkwait", ip_rbTkWaitObjCmd, 
+			 (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#else
+    DUMP1("Tcl_CreateCommand(\"tkwait\")");
+    Tcl_CreateCommand(ptr->ip, "tkwait", ip_rbTkWaitCommand, 
+		      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* add 'thread_vwait' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"thread_vwait\")");
+    Tcl_CreateObjCommand(ptr->ip, "thread_vwait", ip_rb_threadVwaitObjCmd, 
+			 (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#else
+    DUMP1("Tcl_CreateCommand(\"thread_vwait\")");
+    Tcl_CreateCommand(ptr->ip, "thread_vwait", ip_rb_threadVwaitCommand, 
+		      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* add 'thread_tkwait' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"thread_tkwait\")");
+    Tcl_CreateObjCommand(ptr->ip, "thread_tkwait", ip_rb_threadTkWaitObjCmd, 
+			 (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#else
+    DUMP1("Tcl_CreateCommand(\"thread_tkwait\")");
+    Tcl_CreateCommand(ptr->ip, "thread_tkwait", ip_rb_threadTkWaitCommand, 
+		      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    return self;
+}
+
+static VALUE
+ip_create_slave(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct tcltkip *master = get_ip(self);
+    struct tcltkip *slave = ALLOC(struct tcltkip);
+    VALUE name;
+    VALUE safemode;
+    int safe;
+
+    /* safe-mode check */
+    if (rb_scan_args(argc, argv, "11", &name, &safemode) == 1) {
+	safemode = Qfalse;
+    }
+    if (Tcl_IsSafe(master->ip) == 1) {
+	safe = 1;
+    } else if (safemode == Qfalse || safemode == Qnil) {
+	safe = 0;
+	rb_secure(4);
+    } else {
+	safe = 1;
+    }
+
+    /* create slave-ip */
+    if ((slave->ip = Tcl_CreateSlave(master->ip, StringValuePtr(name), safe)) 
+	== NULL) {
+	rb_raise(rb_eRuntimeError, "fail to create the new slave interpreter");
+    }
+    Tcl_Preserve((ClientData)slave->ip);
+    slave->return_value = 0;
+
+    return Data_Wrap_Struct(CLASS_OF(self), 0, ip_free, slave);
+}
+
+/* make ip "safe" */
+static VALUE
+ip_make_safe(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+    
+    if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) {
+	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+    }
+
+    return self;
+}
+
+/* is safe? */
+static VALUE
+ip_is_safe_p(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+    
+    if (Tcl_IsSafe(ptr->ip)) {
+	return Qtrue;
+    } else {
+	return Qfalse;
+    }
+}
+
+/* delete interpreter */
+static VALUE
+ip_delete(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    Tcl_DeleteInterp(ptr->ip);
+
+    return Qnil;
+}
+
+/* is deleted? */
+static VALUE
+ip_is_deleted_p(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    if (Tcl_InterpDeleted(ptr->ip)) {
+	return Qtrue;
+    } else {
+	return Qfalse;
+    }
+}
+
+
+/* eval string in tcl by Tcl_Eval() */
+static VALUE
+ip_eval_real(self, str)
+    VALUE self;
+    VALUE str;
+{
+    char *s;
+    char *buf;	/* Tcl_Eval requires re-writable string region */
+    struct tcltkip *ptr = get_ip(self);
+
+    /* call Tcl_Eval() */
+    s = StringValuePtr(str);
+    buf = ALLOCA_N(char, strlen(s)+1);
+    strcpy(buf, s);
+    DUMP2("Tcl_Eval(%s)", buf);
+    ptr->return_value = Tcl_Eval(ptr->ip, buf);
+    if (ptr->return_value == TCL_ERROR) {
+	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+    }
+    DUMP2("(TCL_Eval result) %d", ptr->return_value);
+
+    /* pass back the result (as string) */
+    /* return(rb_str_new2(ptr->ip->result)); */
+    return(rb_tainted_str_new2(ptr->ip->result));
+}
+
+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->obj, q->str);
+}
+
+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;
+
+    DUMP2("do_eval_queue_handler : evPtr = %p", evPtr);
+    DUMP2("eval 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->result) 
+	    = rb_funcall(rb_proc_new(evq_safelevel_handler, 
+				     Data_Wrap_Struct(rb_cData,0,0,q)), 
+			 rb_intern("call"), 0);
+    } else {
+    DUMP2("call eval_real (for caller thread:%lx)", q->thread);
+    DUMP2("call eval_real (current thread:%lx)", rb_thread_current());
+	*(q->result) = ip_eval_real(q->obj, q->str);
+    }
+
+    /* back to caller */
+    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");
+
+    /* end of handler : remove it */
+    return 1;
+}
+
+static VALUE
+ip_eval(self, str)
+    VALUE self;
+    VALUE str;
+{
+    struct eval_queue *tmp;
+    VALUE current = rb_thread_current();
+    VALUE result;
+    VALUE *alloc_result;
+    Tcl_QueuePosition position;
+
+    if (eventloop_thread == 0 || current == eventloop_thread) {
+	if (eventloop_thread) {
+	    DUMP2("eval from current eventloop %lx", current);
+	} else {
+	    DUMP2("eval from thread:%lx but no eventloop", current);
+	}
+	result = ip_eval_real(self, str);
+	if (rb_obj_is_kind_of(result, rb_eException)) {
+	    rb_exc_raise(result);
+	}
+	return result;
+    }
+
+    DUMP2("eval from thread %lx (NOT current eventloop)", current);
+
+    /* allocate memory (protected from Tcl_ServiceEvent) */
+    alloc_result = ALLOC(VALUE);
+
+    /* allocate memory (freed by Tcl_ServiceEvent) */
+    tmp = (struct eval_queue *)Tcl_Alloc(sizeof(struct eval_queue));
+
+    /* construct event data */
+    tmp->done = 0;
+    tmp->obj = self;
+    tmp->str = str;
+    tmp->result = alloc_result;
+    tmp->thread = current;
+    tmp->safe_level = rb_safe_level();
+    tmp->ev.proc = eval_queue_handler;
+    position = TCL_QUEUE_TAIL;
+
+    /* add the handler to Tcl event queue */
+    DUMP1("add handler");
+    Tcl_QueueEvent(&(tmp->ev), position);
+
+    /* wait for the handler to be processed */
+    DUMP2("wait for handler (current thread:%lx)", current);
+    rb_thread_stop();
+    DUMP2("back from handler (current thread:%lx)", current);
+
+    /* get result & free allocated memory */
+    result = *alloc_result;
+    free(alloc_result);
+    if (rb_obj_is_kind_of(result, rb_eException)) {
+	rb_exc_raise(result);
+    }
+
+    return result;
+}
+
+
+/* restart Tk */
+static VALUE
+lib_restart(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    rb_secure(4);
+
+    /* destroy the root wdiget */
+    /* ptr->return_value = Tcl_Eval(ptr->ip, "destroy ."); */
+    ptr->return_value = FIX2INT(ip_eval(self, "destroy ."));
+    /* ignore ERROR */
+    DUMP2("(TCL_Eval result) %d", ptr->return_value);
+    Tcl_ResetResult(ptr->ip);
+
+    /* execute Tk_Init of Tk_SafeInit */
+#if TCL_MAJOR_VERSION >= 8
+    if (Tcl_IsSafe(ptr->ip)) {
+	DUMP1("Tk_SafeInit");
+	if (Tk_SafeInit(ptr->ip) == TCL_ERROR) {
+	    rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+	}
+    } else {
+	DUMP1("Tk_Init");
+	if (Tk_Init(ptr->ip) == TCL_ERROR) {
+	    rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+	}
+    }
+#else
+    DUMP1("Tk_Init");
+    if (Tk_Init(ptr->ip) == TCL_ERROR) {
+	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+    }
+#endif
+
+    return Qnil;
+}
+
+
+static VALUE
+ip_restart(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    rb_secure(4);
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+	/* slave IP */
+	return Qnil;
+    }
+    return lib_restart(self);
+}
+
+static VALUE
+ip_toUTF8(self, str, encodename)
+    VALUE self;
+    VALUE str;
+    VALUE encodename;
+{
+#ifdef TCL_UTF_MAX
+    Tcl_Interp *interp;
+    Tcl_Encoding encoding;
+    Tcl_DString dstr;
+    struct tcltkip *ptr;
+    char *buf;
+
+    ptr = get_ip(self);
+    interp = ptr->ip;
+
+    StringValue(encodename);
+    StringValue(str);
+    encoding = Tcl_GetEncoding(interp, RSTRING(encodename)->ptr);
+    if (!RSTRING(str)->len) return str;
+    buf = ALLOCA_N(char,strlen(RSTRING(str)->ptr)+1);
+    strcpy(buf, RSTRING(str)->ptr);
+
+    Tcl_DStringInit(&dstr);
+    Tcl_DStringFree(&dstr);
+    Tcl_ExternalToUtfDString(encoding,buf,strlen(buf),&dstr);
+    /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
+    str = rb_tainted_str_new2(Tcl_DStringValue(&dstr));
+
+    Tcl_FreeEncoding(encoding);
+    Tcl_DStringFree(&dstr);
+#endif
+    return str;
+}
+
+static VALUE
+ip_fromUTF8(self, str, encodename)
+    VALUE self;
+    VALUE str;
+    VALUE encodename;
+{
+#ifdef TCL_UTF_MAX
+    Tcl_Interp *interp;
+    Tcl_Encoding encoding;
+    Tcl_DString dstr;
+    struct tcltkip *ptr;
+    char *buf;
+
+    ptr = get_ip(self);
+    interp = ptr->ip;
+
+    StringValue(encodename);
+    StringValue(str);
+    encoding = Tcl_GetEncoding(interp,RSTRING(encodename)->ptr);
+    if (!RSTRING(str)->len) return str;
+    buf = ALLOCA_N(char,strlen(RSTRING(str)->ptr)+1);
+    strcpy(buf,RSTRING(str)->ptr);
+
+    Tcl_DStringInit(&dstr);
+    Tcl_DStringFree(&dstr);
+    Tcl_UtfToExternalDString(encoding,buf,strlen(buf),&dstr);
+    /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
+    str = rb_tainted_str_new2(Tcl_DStringValue(&dstr));
+
+    Tcl_FreeEncoding(encoding);
+    Tcl_DStringFree(&dstr);
+
+#endif
+    return str;
+}
+
+
+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;
+
+    va_init_list(args,fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    buf[BUFSIZ - 1] = '\0';
+    va_end(args);
+    einfo = rb_exc_new2(exc, buf);
+    rb_iv_set(einfo, "interp", interp);
+    Tcl_ResetResult(get_ip(interp)->ip);
+    return einfo;
+}
+
+
+static VALUE
+ip_invoke_real(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE v;
+    struct tcltkip *ptr;	/* tcltkip data struct */
+    int i;
+    Tcl_CmdInfo info;
+    char *cmd, *s;
+    char **av = (char **)NULL;
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj **ov = (Tcl_Obj **)NULL;
+    Tcl_Obj *resultPtr;
+#endif
+
+    DUMP2("invoke_real called by thread:%lx", rb_thread_current());
+    /* get the command name string */
+    v = argv[0];
+    cmd = StringValuePtr(v);
+
+    /* get the data struct */
+    ptr = get_ip(obj);
+
+    /* ip is deleted? */
+    if (Tcl_InterpDeleted(ptr->ip)) {
+	return rb_tainted_str_new2("");
+    }
+
+    /* 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");
+	/* if (event_loop_abort_on_exc || cmd[0] != '.') { */
+	if (event_loop_abort_on_exc > 0) {
+	    /*rb_ip_raise(obj,rb_eNameError,"invalid command name `%s'",cmd);*/
+	    return create_ip_exc(obj, 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);
+	    return rb_tainted_str_new2("");
+	}
+    }
+    DUMP1("end Tcl_GetCommandInfo");
+
+    /* memory allocation for arguments of this command */
+#if TCL_MAJOR_VERSION >= 8
+    if (info.isNativeObjectProc) {
+	/* object interface */
+	ov = (Tcl_Obj **)ALLOCA_N(Tcl_Obj *, argc+1);
+	for (i = 0; i < argc; ++i) {
+	    v = argv[i];
+	    s = StringValuePtr(v);
+	    ov[i] = Tcl_NewStringObj(s, RSTRING(v)->len);
+	    Tcl_IncrRefCount(ov[i]);
+	}
+	ov[argc] = (Tcl_Obj *)NULL;
+    } 
+    else
+#endif
+    {
+	/* string interface */
+	av = (char **)ALLOCA_N(char *, argc+1);
+	for (i = 0; i < argc; ++i) {
+	    v = argv[i];
+	    s = StringValuePtr(v);
+	    av[i] = ALLOCA_N(char, strlen(s)+1);
+	    strcpy(av[i], s);
+	}
+	av[argc] = (char *)NULL;
+    }
+
+    Tcl_ResetResult(ptr->ip);
+
+    /* Invoke the C procedure */
+#if TCL_MAJOR_VERSION >= 8
+    if (info.isNativeObjectProc) {
+	int dummy;
+	ptr->return_value = (*info.objProc)(info.objClientData,
+					    ptr->ip, argc, ov);
+
+	/* get the string value from the result object */
+	resultPtr = Tcl_GetObjResult(ptr->ip);
+	Tcl_SetResult(ptr->ip, Tcl_GetStringFromObj(resultPtr, &dummy),
+		      TCL_VOLATILE);
+
+	for (i=0; i<argc; i++) {
+	    Tcl_DecrRefCount(ov[i]);
+	}
+    }
+    else
+#endif
+    {
+	TRAP_BEG;
+#if TCL_MAJOR_VERSION >= 8
+	ptr->return_value = (*info.proc)(info.clientData, ptr->ip, 
+					 argc, (CONST84 char **)av);
+#else /* TCL_MAJOR_VERSION < 8 */
+	ptr->return_value = (*info.proc)(info.clientData, ptr->ip, argc, av);
+#endif
+	TRAP_END;
+    }
+
+    /* exception on mainloop */
+    if (ptr->return_value == TCL_ERROR) {
+	if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
+	    /*rb_ip_raise(obj, rb_eRuntimeError, "%s", ptr->ip->result);*/
+	    return create_ip_exc(obj, rb_eRuntimeError, "%s", ptr->ip->result);
+	} else {
+	    if (event_loop_abort_on_exc < 0) {
+		rb_warning("%s (ignore)", ptr->ip->result);
+	    } else {
+		rb_warn("%s (ignore)", ptr->ip->result);
+	    }
+	    Tcl_ResetResult(ptr->ip);
+	    return rb_tainted_str_new2("");
+	}
+    }
+
+    /* pass back the result (as string) */
+    /* return rb_str_new2(ptr->ip->result); */
+    return rb_tainted_str_new2(ptr->ip->result);
+}
+
+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_real(q->argc, q->argv, q->obj);
+}
+
+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;
+
+    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->result) 
+	    = rb_funcall(rb_proc_new(ivq_safelevel_handler, 
+				     Data_Wrap_Struct(rb_cData,0,0,q)), 
+			 rb_intern("call"), 0);
+    } else {
+    DUMP2("call invoke_real (for caller thread:%lx)", q->thread);
+    DUMP2("call invoke_real (current thread:%lx)", rb_thread_current());
+	*(q->result) = ip_invoke_real(q->argc, q->argv, q->obj);
+    }
+
+    /* back to caller */
+    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");
+
+    /* end of handler : remove it */
+    return 1;
+}
+
+static VALUE
+ip_invoke(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct invoke_queue *tmp;
+    VALUE current = rb_thread_current();
+    VALUE result;
+    VALUE *alloc_argv, *alloc_result;
+    Tcl_QueuePosition position;
+
+    if (argc < 1) {
+	rb_raise(rb_eArgError, "command name missing");
+    }
+    if (eventloop_thread == 0 || current == eventloop_thread) {
+	if (eventloop_thread) {
+	    DUMP2("invoke from current eventloop %lx", current);
+	} else {
+	    DUMP2("invoke from thread:%lx but no eventloop", current);
+	}
+	result = ip_invoke_real(argc, argv, 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);
+
+    /* allocate memory (protected from Tcl_ServiceEvent) */
+    alloc_argv =  ALLOC_N(VALUE,argc);
+    MEMCPY(alloc_argv, argv, VALUE, argc);
+    alloc_result = ALLOC(VALUE);
+
+    /* allocate memory (freed by Tcl_ServiceEvent) */
+    tmp = (struct invoke_queue *)Tcl_Alloc(sizeof(struct invoke_queue));
+
+    /* construct event data */
+    tmp->done = 0;
+    tmp->obj = obj;
+    tmp->argc = argc;
+    tmp->argv = alloc_argv;
+    tmp->result = alloc_result;
+    tmp->thread = current;
+    tmp->safe_level = rb_safe_level();
+    tmp->ev.proc = invoke_queue_handler;
+    position = TCL_QUEUE_TAIL;
+
+    /* add the handler to Tcl event queue */
+    DUMP1("add handler");
+    Tcl_QueueEvent(&(tmp->ev), position);
+
+    /* wait for the handler to be processed */
+    DUMP2("wait for handler (current thread:%lx)", current);
+    rb_thread_stop();
+    DUMP2("back from handler (current thread:%lx)", current);
+
+    /* get result & free allocated memory */
+    result = *alloc_result;
+    free(alloc_argv);
+    free(alloc_result);
+    if (rb_obj_is_kind_of(result, rb_eException)) {
+	rb_exc_raise(result);
+    }
+
+    return result;
+}
+
+/* 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);
+
+    return (INT2FIX(ptr->return_value));
+}
+
+#ifdef __MACOS__
+static void
+_macinit()
+{
+    tcl_macQdPtr = &qd; /* setup QuickDraw globals */
+    Tcl_MacSetEventProc(TkMacConvertEvent); /* setup event handler */
+}
+#endif
+
+/*---- initialization ----*/
+void
+Init_tcltklib()
+{
+    VALUE lib = rb_define_module("TclTkLib");
+    VALUE ip = rb_define_class("TclTkIp", rb_cObject);
+
+    VALUE ev_flag = rb_define_module_under(lib, "EventFlag");
+
+#if defined USE_TCL_STUBS && defined USE_TK_STUBS
+    extern int ruby_tcltk_stubs();
+    int ret = ruby_tcltk_stubs();
+    if (ret)
+	rb_raise(rb_eLoadError, "tcltklib: tcltk_stubs init error(%d)", ret);
+#endif
+
+    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));
+
+    eTkCallbackBreak = rb_define_class("TkCallbackBreak", rb_eStandardError);
+    eTkCallbackContinue = rb_define_class("TkCallbackContinue",
+                                          rb_eStandardError);
+
+    rb_define_module_function(lib, "mainloop", lib_mainloop, -1);
+    rb_define_module_function(lib, "mainloop_watchdog", 
+			      lib_mainloop_watchdog, -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, "get_eventloop_weight", 
+			      get_eventloop_weight, 0);
+    rb_define_module_function(lib, "num_of_mainwindows", 
+			      lib_num_of_mainwindows, 0);
+
+    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, "make_safe", ip_make_safe, 0);
+    rb_define_method(ip, "safe?", ip_is_safe_p, 0);
+    rb_define_method(ip, "delete", ip_delete, 0);
+    rb_define_method(ip, "deleted?", ip_is_deleted_p, 0);
+    rb_define_method(ip, "_eval", ip_eval, 1);
+    rb_define_method(ip, "_toUTF8",ip_toUTF8, 2);
+    rb_define_method(ip, "_fromUTF8",ip_fromUTF8, 2);
+    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, "_return_value", ip_retval, 0);
+
+    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, "restart", ip_restart, 0);
+
+    eventloop_thread = 0;
+    watchdog_thread  = 0;
+
+#ifdef __MACOS__
+    _macinit();
+#endif
+
+    /*---- initialize tcl/tk libraries ----*/
+    /* from Tk_Main() */
+    DUMP1("Tcl_FindExecutable");
+    Tcl_FindExecutable(RSTRING(rb_argv0)->ptr);
+}
+
+/* eof */
diff --git a/ext/thread/extconf.rb b/ext/thread/extconf.rb
deleted file mode 100644
index 2f984efc6d..0000000000
--- a/ext/thread/extconf.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-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/ext/thread/lib/thread.rb b/ext/thread/lib/thread.rb
deleted file mode 100644
index 6c533aba39..0000000000
--- a/ext/thread/lib/thread.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-unless defined? Thread
-  fail "Thread not available for this ruby interpreter"
-end
-
-require 'thread.so'
diff --git a/ext/thread/thread.c b/ext/thread/thread.c
deleted file mode 100644
index 68f172220a..0000000000
--- a/ext/thread/thread.c
+++ /dev/null
@@ -1,1182 +0,0 @@
-/*
- * 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>
-
-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(VALUE (*func)(ANYARGS), VALUE arg)
-{
-    VALUE critical = rb_thread_critical;
-
-    rb_thread_critical = 1;
-    return rb_ensure(func, arg, set_critical, (VALUE)critical);
-}
-
-/*
- *  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 thread_exclusive(rb_yield, Qundef);
-}
-
-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 Qnil;
-
-    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 = wake_thread(shift_list(list));
-    }
-
-    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 VALUE
-wait_list(List *list)
-{
-    return rb_ensure(wait_list_inner, (VALUE)list, wait_list_cleanup, (VALUE)list);
-}
-
-static void
-kill_waiting_threads(List *waiting)
-{
-    Entry *entry;
-
-    for (entry = waiting->entries; entry; entry = entry->next) {
-	rb_thread_kill(entry->value);
-    }
-}
-
-/*
- * 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)
-{
-    kill_waiting_threads(&mutex->waiting);
-    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 {
-	do {
-	    wait_list(&mutex->waiting);
-	    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;
-}
-
-/*
- * 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 = thread_exclusive(unlock_mutex_inner, (VALUE)mutex);
-
-    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);
-
-    waking = thread_exclusive(rb_mutex_exclusive_unlock_inner, (VALUE)mutex);
-
-    if (!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)
-{
-    kill_waiting_threads(&condvar->waiting);
-    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, lock_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);
-  
-    thread_exclusive(wake_all, (VALUE)&condvar->waiting);
-    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 = thread_exclusive(wake_one, (VALUE)&condvar->waiting);
-
-    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)
-{
-    kill_waiting_threads(&queue->mutex.waiting);
-    kill_waiting_threads(&queue->space_available.waiting);
-    kill_waiting_threads(&queue->value_available.waiting);
-    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/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
deleted file mode 100644
index 8c5d01a954..0000000000
--- a/ext/tk/ChangeLog.tkextlib
+++ /dev/null
@@ -1,924 +0,0 @@
-2008-05-12  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name.
-
---------------< ... some changes ... >------------------
-
-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/ext/tk/MANIFEST b/ext/tk/MANIFEST
new file mode 100644
index 0000000000..503adaabb7
--- /dev/null
+++ b/ext/tk/MANIFEST
@@ -0,0 +1,205 @@
+MANIFEST
+README.1st
+extconf.rb
+depend
+tkutil.c
+lib/README
+lib/multi-tk.rb
+lib/tk.rb
+lib/tkafter.rb
+lib/tkbgerror.rb
+lib/tkcanvas.rb
+lib/tkclass.rb
+lib/tkconsole.rb
+lib/tkdialog.rb
+lib/tkentry.rb
+lib/tkfont.rb
+lib/tkmacpkg.rb
+lib/tkmenubar.rb
+lib/tkmngfocus.rb
+lib/tkpalette.rb
+lib/tkscrollbox.rb
+lib/tktext.rb
+lib/tkvirtevent.rb
+lib/tkwinpkg.rb
+sample/safe-tk.rb
+sample/tkalignbox.rb
+sample/tkballoonhelp.rb
+sample/tkbiff.rb
+sample/tkbrowse.rb
+sample/tkcombobox.rb
+sample/tkdialog.rb
+sample/tkfrom.rb
+sample/tkhello.rb
+sample/tkline.rb
+sample/tkmenubutton.rb
+sample/tkmulticolumnlist.rb
+sample/tkmultilistbox.rb
+sample/tkmultilistframe.rb
+sample/tkoptdb-safeTk.rb
+sample/tkoptdb.rb
+sample/tktextframe.rb
+sample/resource.ja
+sample/resource.en
+sample/tktimer.rb
+sample/tktimer2.rb
+sample/tktimer3.rb
+sample/demos-en/ChangeLog
+sample/demos-en/ChangeLog.prev
+sample/demos-en/README
+sample/demos-en/README.tkencoding
+sample/demos-en/arrow.rb
+sample/demos-en/bind.rb
+sample/demos-en/bitmap.rb
+sample/demos-en/browse1
+sample/demos-en/browse2
+sample/demos-en/button.rb
+sample/demos-en/check.rb
+sample/demos-en/clrpick.rb
+sample/demos-en/colors.rb
+sample/demos-en/cscroll.rb
+sample/demos-en/ctext.rb
+sample/demos-en/dialog1.rb
+sample/demos-en/dialog2.rb
+sample/demos-en/doc.org/README
+sample/demos-en/doc.org/README.JP
+sample/demos-en/doc.org/README.tk80
+sample/demos-en/doc.org/license.terms
+sample/demos-en/doc.org/license.terms.tk80
+sample/demos-en/entry1.rb
+sample/demos-en/entry2.rb
+sample/demos-en/entry3.rb
+sample/demos-en/filebox.rb
+sample/demos-en/floor.rb
+sample/demos-en/form.rb
+sample/demos-en/hello
+sample/demos-en/hscale.rb
+sample/demos-en/icon.rb
+sample/demos-en/image1.rb
+sample/demos-en/image2.rb
+sample/demos-en/image3.rb
+sample/demos-en/images/earth.gif
+sample/demos-en/images/earthris.gif
+sample/demos-en/images/face.xbm
+sample/demos-en/images/flagdown.xbm
+sample/demos-en/images/flagup.xbm
+sample/demos-en/images/gray25.xbm
+sample/demos-en/images/grey.25
+sample/demos-en/images/grey.5
+sample/demos-en/images/letters.xbm
+sample/demos-en/images/noletter.xbm
+sample/demos-en/images/pattern.xbm
+sample/demos-en/images/tcllogo.gif
+sample/demos-en/images/teapot.ppm
+sample/demos-en/items.rb
+sample/demos-en/ixset
+sample/demos-en/ixset2
+sample/demos-en/label.rb
+sample/demos-en/labelframe.rb
+sample/demos-en/menu.rb
+sample/demos-en/menu84.rb
+sample/demos-en/menubu.rb
+sample/demos-en/msgbox.rb
+sample/demos-en/patch_1.1c1
+sample/demos-en/paned1.rb
+sample/demos-en/paned2.rb
+sample/demos-en/plot.rb
+sample/demos-en/puzzle.rb
+sample/demos-en/radio.rb
+sample/demos-en/radio2.rb
+sample/demos-en/rmt
+sample/demos-en/rolodex
+sample/demos-en/rolodex-j
+sample/demos-en/ruler.rb
+sample/demos-en/sayings.rb
+sample/demos-en/search.rb
+sample/demos-en/spin.rb
+sample/demos-en/square
+sample/demos-en/states.rb
+sample/demos-en/style.rb
+sample/demos-en/tcolor
+sample/demos-en/tcolor.bak
+sample/demos-en/text.rb
+sample/demos-en/timer
+sample/demos-en/tkencoding.rb
+sample/demos-en/twind.rb
+sample/demos-en/unicodeout.rb
+sample/demos-en/vscale.rb
+sample/demos-en/widget
+sample/demos-jp/README
+sample/demos-jp/arrow.rb
+sample/demos-jp/bind.rb
+sample/demos-jp/bitmap.rb
+sample/demos-jp/browse1
+sample/demos-jp/browse2
+sample/demos-jp/button.rb
+sample/demos-jp/check.rb
+sample/demos-jp/clrpick.rb
+sample/demos-jp/colors.rb
+sample/demos-jp/cscroll.rb
+sample/demos-jp/ctext.rb
+sample/demos-jp/dialog1.rb
+sample/demos-jp/dialog2.rb
+sample/demos-jp/doc.org/README
+sample/demos-jp/doc.org/README.JP
+sample/demos-jp/doc.org/README.tk80
+sample/demos-jp/doc.org/license.terms
+sample/demos-jp/doc.org/license.terms.tk80
+sample/demos-jp/entry1.rb
+sample/demos-jp/entry2.rb
+sample/demos-jp/entry3.rb
+sample/demos-jp/filebox.rb
+sample/demos-jp/floor.rb
+sample/demos-jp/form.rb
+sample/demos-jp/hello
+sample/demos-jp/hscale.rb
+sample/demos-jp/icon.rb
+sample/demos-jp/image1.rb
+sample/demos-jp/image2.rb
+sample/demos-jp/image3.rb
+sample/demos-jp/images/earth.gif
+sample/demos-jp/images/earthris.gif
+sample/demos-jp/images/face.bmp
+sample/demos-jp/images/flagdown.bmp
+sample/demos-jp/images/flagup.bmp
+sample/demos-jp/images/gray25.bmp
+sample/demos-jp/images/grey.25
+sample/demos-jp/images/grey.5
+sample/demos-jp/images/letters.bmp
+sample/demos-jp/images/noletter.bmp
+sample/demos-jp/images/pattern.bmp
+sample/demos-jp/images/tcllogo.gif
+sample/demos-jp/images/teapot.ppm
+sample/demos-jp/items.rb
+sample/demos-jp/ixset
+sample/demos-jp/ixset2
+sample/demos-jp/label.rb
+sample/demos-jp/labelframe.rb
+sample/demos-jp/menu.rb
+sample/demos-jp/menu8x.rb
+sample/demos-jp/menu84.rb
+sample/demos-jp/menubu.rb
+sample/demos-jp/msgbox.rb
+sample/demos-jp/paned1.rb
+sample/demos-jp/paned2.rb
+sample/demos-jp/plot.rb
+sample/demos-jp/puzzle.rb
+sample/demos-jp/radio.rb
+sample/demos-jp/radio2.rb
+sample/demos-jp/rmt
+sample/demos-jp/rolodex
+sample/demos-jp/rolodex-j
+sample/demos-jp/ruler.rb
+sample/demos-jp/sayings.rb
+sample/demos-jp/search.rb
+sample/demos-jp/spin.rb
+sample/demos-jp/square
+sample/demos-jp/states.rb
+sample/demos-jp/style.rb
+sample/demos-jp/tcolor
+sample/demos-jp/text.rb
+sample/demos-jp/timer
+sample/demos-jp/twind.rb
+sample/demos-jp/unicodeout.rb
+sample/demos-jp/vscale.rb
+sample/demos-jp/widget
diff --git a/ext/tk/MANUAL_tcltklib.eng b/ext/tk/MANUAL_tcltklib.eng
deleted file mode 100644
index 6fa775b7de..0000000000
--- a/ext/tk/MANUAL_tcltklib.eng
+++ /dev/null
@@ -1,469 +0,0 @@
-(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 TclTkLib::RELEASE_TYPE
-    : Defines release type number of Tcl/Tk
-
-       ALPHA
-         : ALPHA release
-
-       BETA
-         : BETA release
-
-       FINAL
-         : FINAL release
-
-  [module methods]
-     get_version()
-        : return an array of major, minor, release-type number, 
-        : number, release-type name, and patchlevel of current 
-        : Tcl/Tk library.
-
-     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. 
-
-    encoding_table
-       : For Ruby m17n. Return encoding relation table between Ruby's 
-       : Encoding object and Tcl's encoding 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).
-  : However, current tcltklib supports Ruby's 'break' and 'next' to 
-  : get the same effect. That is, those classes are obsolete. Those 
-  : exist for backward compatibility. 
-
-(eof)
diff --git a/ext/tk/MANUAL_tcltklib.eucj b/ext/tk/MANUAL_tcltklib.eucj
deleted file mode 100644
index 7df42997b4..0000000000
--- a/ext/tk/MANUAL_tcltklib.eucj
+++ /dev/null
@@ -1,579 +0,0 @@
-(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 ¤È
-         : ¤»¤Í¤Ð¤Ê¤é¤Ê¤¤¡¥
-
-   ¥â¥¸¥å¡¼¥ë TclTkLib::RELEASE_TYPE
-      : Tcl/Tk ¤Î¥ê¥ê¡¼¥¹¥¿¥¤¥×ÈÖ¹æ¤ÎÄêµÁ
-
-      Äê¿ô  ALPHA
-         : ALPHA ¥ê¥ê¡¼¥¹
-
-      Äê¿ô  BETA
-         : BETA ¥ê¥ê¡¼¥¹
-
-      Äê¿ô  FINAL
-         : FINAL ¥ê¥ê¡¼¥¹
-
-   ¥â¥¸¥å¡¼¥ë¥á¥½¥Ã¥É
-      get_version()
-         : Tcl/Tk ¤Î major, minor, release-type ÈÖ¹æ, release-type ̾,
-         : patchlevel ¤òÇÛÎó¤Ë¤·¤ÆÊÖ¤¹¡¥
-
-      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 ¤ÎƱ̾¥á¥½¥Ã¥É¤ËƱ¤¸¡¥
-
-      encoding_table
-         : Ruby m17n ÍÑ¤Ë Ruby ¤È Tk ¤È¤Î´Ö¤Î encoding Âбþɽ¤òÊÖ¤¹¡¥
-
-¥¯¥é¥¹ TkCallbackBreak < StandardError
-¥¯¥é¥¹ TkCallbackContinue < StandardError
-   : ¤³¤ì¤é¤Ï¥¤¥Ù¥ó¥È¥³¡¼¥ë¥Ð¥Ã¥¯¤Ë¤ª¤¤¤Æ¡¤¥³¡¼¥ë¥Ð¥Ã¥¯½èÍý¤òŬÀÚ¤ËÃæ
-   : ÃǤ·¤¿¤ê¡¤¼¡¤Î¥Ð¥¤¥ó¥É¥¿¥°¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°½èÍý¤Ë¿Ê¤á¤¿¤ê¤¹¤ë¤³¤È
-   : ¤ò²Äǽ¤Ë¤¹¤ë¤¿¤á¤ÎÎã³°¥¯¥é¥¹¤Ç¤¢¤ë¡¥
-   : ¥³¡¼¥ë¥Ð¥Ã¥¯¤Ç break ¤ä continue ¤ò¼Â¸½¤¹¤ë¤¿¤á¤Ë¤Ï¡¤¥³¡¼¥ë¥Ð¥Ã¥¯
-   : ¤Ç¤¢¤ë Ruby ¼ê³¤­¤¬ Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿Â¦¤ËŬÀڤʥ꥿¡¼¥ó¥³¡¼
-   : ¥É¤òÊÖ¤¹É¬Íפ¬¤¢¤ë¡¥Ruby ¤Î¼ê³¤­¤¬ÉáÄ̤ËÃͤòÊÖ¤¹¤Î¤Ç¤Ï¡¤¤½¤ì¤¬Éá
-   : Ä̤ÎÌá¤êÃͤǤ¢¤ë¤Î¤«Èݤ«¤ò¶èÊ̤¬¤Ç¤­¤Ê¤¤¤¿¤á¡¤Î㳰ȯÀ¸¤òÍøÍѤ·¤¿
-   : ¼ÂÁõ¤ò¹Ô¤Ã¤Æ¤¤¤ë¡¥
-   : ¤¿¤À¤·¸½ºß¤Ç¤Ï¡¤¥³¡¼¥ë¥Ð¥Ã¥¯¼ê³¤­¤ò Ruby ¤Î break, next ¤Ç½ªÎ»¤¹
-   : ¤ë¤³¤È¤ÇƱÅù¤Î·ë²Ì¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¡¥¤½¤ì¤æ¤¨¡¤
-   : ¤³¤ì¤é¤ÏɬÍפʤ¤¤â¤Î¤Ç¤Ï¤¢¤ë¤¬¡¤¸ß´¹À­¤Î¤¿¤á¤Ë»Ä¤·¤Æ¤¢¤ë¡¥
-
-(eof)
diff --git a/ext/tk/README.1st b/ext/tk/README.1st
index fce5b0242b..ff92fdd8a3 100644
--- a/ext/tk/README.1st
+++ b/ext/tk/README.1st
@@ -1,19 +1,21 @@
-If you want to use Ruby/Tk (tk.rb and so on), you must have tcltklib.so 
-which is working correctly. When you have some troubles on compiling, 
-please read README.tcltklib and README.ActiveTcl. 
-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. 
+If you want to use Ruby/Tk (tk.rb and so on), you must have
+tcltklib.so which is working collectry. If you fail to call 
+'require "tcltklib"', you may not have tcltklib.so. 
+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 ¤¬Àµ¤·¤¯Æ°¤¤¤Æ¤¤¤Ê
-¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡¥¥³¥ó¥Ñ¥¤¥ë»þ¤Ë²¿¤«ÌäÂ꤬À¸¤¸¤¿¾ì¹ç¤Ï¡¤README.tcltklib 
-¤ä README.ActiveTcl ¤ò¸«¤Æ¤¯¤À¤µ¤¤¡¥
-¤¿¤È¤¨ Ruby ¤Î¥é¥¤¥Ö¥é¥ê¥Ç¥£¥ì¥¯¥È¥ê¤Ë tcltklib.so ¤¬Â¸ºß¤·¤Æ¤¤¤¿¤È¤·¤Æ
-¤â¡¤¼Â¹Ô´Ä¶­¤Ë Tcl/Tk ¥é¥¤¥Ö¥é¥ê (libtcl8.4.so ¤Ê¤É) ¤¬¤Ê¤±¤ì¤Ðµ¡Ç½¤·¤Þ
-¤»¤ó¡¥Tcl/Tk ¤¬Àµ¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¤â¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡¥
+Ruby/Tk (tk.rb ¤Ê¤É) ¤ò»È¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï¡¤tcltklib.so ¤¬Àµ¤·¤¯
+Æ°¤¤¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡¥¤â¤· require "tcltklib" ¤Ë¼ºÇÔ¤¹¤ë
+¤è¤¦¤Ê¤é¡¤tcltklib.so ¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤¤Î¤«¤â¤·¤ì¤Þ¤»¤ó¡¥
+¤¿¤È¤¨ Ruby ¤Î¥é¥¤¥Ö¥é¥ê¥Ç¥£¥ì¥¯¥È¥ê¤Ë tcltklib.so ¤¬Â¸ºß¤·¤Æ
+¤¤¤¿¤È¤·¤Æ¤â¡¤¼Â¹Ô´Ä¶­¤Ë Tcl/Tk ¥é¥¤¥Ö¥é¥ê (libtcl8.4.so ¤Ê¤É) 
+¤¬¤Ê¤±¤ì¤Ðµ¡Ç½¤·¤Þ¤»¤ó¡¥Tcl/Tk ¤¬Àµ¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«
+¤É¤¦¤«¤â¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡¥
 
 ==========================================================
                 Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.ActiveTcl b/ext/tk/README.ActiveTcl
deleted file mode 100644
index 3afb3f4cf6..0000000000
--- a/ext/tk/README.ActiveTcl
+++ /dev/null
@@ -1,49 +0,0 @@
-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/ext/tk/README.fork b/ext/tk/README.fork
deleted file mode 100644
index 707d78fc12..0000000000
--- a/ext/tk/README.fork
+++ /dev/null
@@ -1,34 +0,0 @@
-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/ext/tk/README.macosx-aqua b/ext/tk/README.macosx-aqua
deleted file mode 100644
index 25a8ed827c..0000000000
--- a/ext/tk/README.macosx-aqua
+++ /dev/null
@@ -1,67 +0,0 @@
-
-  *** 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/ext/tk/README.tcltklib b/ext/tk/README.tcltklib
deleted file mode 100644
index 8c6dd5178f..0000000000
--- a/ext/tk/README.tcltklib
+++ /dev/null
@@ -1,85 +0,0 @@
-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-tcltkversion=<version> 
-      force version of Tcl/Tk libaray
-      (e.g. libtcl8.4g.so ==> --with-tcltkversion=8.4g)
-
- --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 contains 'tcl.h'
- --with-tk-include=<dir>       the directry contains 'tk.h'
-
- --with-tcl-lib=<dir>          the directry contains 'libtcl<version>.so'
- --with-tk-lib=<dir>           the directry contains '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 contains 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 contais X11 header files
- --with-X11-lib=<dir>          the directry contais 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/ext/tk/depend b/ext/tk/depend
index 2cd9c400f7..fd63e230f0 100644
--- a/ext/tk/depend
+++ b/ext/tk/depend
@@ -1,2 +1 @@
-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
+tkutil.o: tkutil.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 4807ea7b40..f769b06e30 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -1,412 +1,2 @@
-# extconf.rb for tcltklib
-
 require 'mkmf'
-
-#is_win32 = (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM)
-is_win32 = (/mswin|mingw|cygwin|bccwin|wince/ =~ 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
-
-tk_idir,  tk_ldir  = dir_config("tk")
-tcl_idir, tcl_ldir = dir_config("tcl")
-x11_idir, x11_ldir = dir_config("X11")
-
-tk_ldir2  = with_config("tk-lib")
-tcl_ldir2 = with_config("tcl-lib")
-x11_ldir2 = with_config("X11-lib")
-
-tk_ldir_list  = [tk_ldir2,  tk_ldir]
-tcl_ldir_list = [tcl_ldir2, tcl_ldir]
-
-tklib = with_config("tklib")
-tcllib = with_config("tcllib")
-stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
-
-tcltk_version = with_config("tcltkversion")
-
-use_X = with_config("X11", (! is_win32))
-
-def check_tcltk_version(version)
-  return [nil, nil] unless version
-
-  version = version.strip
-
-  tclver = version.dup
-  tkver  = version.dup
-
-  major = dot = minor = dot = plvl = ext = nil
-
-  if version =~ /^(\d)(\.?)(\d)(\.?)(\d*)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; plvl_dot  = $4; plvl = $5; ext = $6
-    dot = ! minor_dot.empty?
-    if plvl_dot.empty? && ! plvl.empty?
-      minor << plvl
-    end
-  elsif version =~ /^(\d)(\.?)(\d?)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; ext = $4
-    dot = ! minor_dot.empty?
-  else # unknown -> believe user
-    return [tclver, tkver]
-  end
-
-  # check Tcl7.6 / Tk4.2 ?
-  if major == "7" # Tcl7.6 ( not support Tclversion < 7.6 )
-    # Tk4.2
-    tkver  = "4" + ((dot)? ".": "") + ((minor.empty)? "": "2") + ext
-  elsif major == "4" # Tk4.2 ( not support Tkversion < 4.2 )
-    # Tcl7.6
-    tclver = "7" + ((dot)? ".": "") + ((minor.empty)? "": "6") + ext
-  end
-
-  [tclver, tkver]
-end
-
-def find_tcl(tcllib, stubs, version, *opt_paths)
-  default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-  default_paths << "/Tcl/lib"  # default for ActiveTcl
-
-  if (paths = opt_paths.compact).empty?
-    paths = default_paths
-  end
-
-  if stubs
-    func = "Tcl_InitStubs"
-    lib = "tclstub"
-  else
-    func = "Tcl_FindExecutable"
-    lib = "tcl"
-  end
-
-  if version && ! version.empty?
-    versions = [version]
-  else
-    versions = %w[8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
-  end
-
-  if tcllib
-    st = find_library(tcllib, func, *paths)
-  else
-    st = versions.find { |ver|
-           find_library("#{lib}#{ver}", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-           find_library("#{lib}#{ver}g", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
-           find_library("tcl#{ver}", func, *paths) or
-           find_library("tcl#{ver.delete('.')}", func, *paths) or
-           find_library("tcl#{ver}g", func, *paths) or
-           find_library("tcl#{ver.delete('.')}g", func, *paths)
-         } || (!version && find_library(lib, func, *paths))
-  end
-
-  unless st
-    puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
-  end
-  st
-end
-
-def find_tk(tklib, stubs, version, *opt_paths)
-  default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-  default_paths << "/Tcl/lib"  # default for ActiveTcl
-
-  if (paths = opt_paths.compact).empty?
-    paths = default_paths
-  end
-
-  if stubs
-    func = "Tk_InitStubs"
-    lib = "tkstub"
-  else
-    func = "Tk_Init"
-    lib = "tk"
-  end
-
-  if version && ! version.empty?
-    versions = [version]
-  else
-    versions = %w[8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
-  end
-
-  if tklib
-    st = find_library(tklib, func, *paths)
-  else
-    st = versions.find { |ver|
-           find_library("#{lib}#{ver}", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-           find_library("#{lib}#{ver}g", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
-           find_library("tk#{ver}", func, *paths) or
-           find_library("tk#{ver.delete('.')}", func, *paths) or 
-           find_library("tk#{ver}g", func, *paths) or
-           find_library("tk#{ver.delete('.')}g", func, *paths)
-         } || (!version && find_library(lib, func, *paths))
-  end
-
-  unless st
-    puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
-  end
-  st
-end
-
-def find_X11(*opt_paths)
-  default_paths = 
-    [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
-  paths = opt_paths.compact.concat(default_paths)
-  st = find_library("X11", "XOpenDisplay", *paths)
-  unless st
-    puts("Warning:: cannot find X11 library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options. If your Tcl/Tk don't require X11, please try --without-X11.")
-  end
-  st
-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
-
-tclver, tkver = check_tcltk_version(tcltk_version)
-
-if have_header("tcl.h") && have_header("tk.h") && 
-    ( tcltk_framework || 
-        ( ( !use_X || find_X11(x11_ldir2, x11_ldir) ) &&
-            find_tcl(tcllib, stubs, tclver, *tcl_ldir_list) &&
-            find_tk(tklib, stubs, tkver, *tk_ldir_list) ) )
-  $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"]
-
-    have_func("rb_hash_lookup", "ruby.h")
-
-    # create
-    $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
-    $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
-    create_makefile("tcltklib")
-  end
-end
+create_makefile("tkutil")
diff --git a/ext/tk/lib/README b/ext/tk/lib/README
index 5918fe4bf0..c003adb2c8 100644
--- a/ext/tk/lib/README
+++ b/ext/tk/lib/README
@@ -1,17 +1,6 @@
 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
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index ec718678f0..b6c800177f 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -1,15 +1,10 @@
 #
-#               multi-tk.rb - supports multi Tk interpreters
-#                       by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+#		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?
 
@@ -18,83 +13,11 @@ TclTkLib.mainloop_abort_on_exception = true
 # 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)
+  def self.send(thred, ret=nil)
     thread.raise self.new(ret)
   end
 
@@ -112,209 +35,59 @@ MultiTkIp_OK.freeze
 ################################################
 # methods for construction
 class MultiTkIp
-  BASE_DIR = File.dirname(__FILE__)
-
-  WITH_RUBY_VM  = Object.const_defined?(:VM) && ::VM.class == Class
-  WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
-
-  (@@SLAVE_IP_ID = ['slave'.freeze, '0'.taint]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  @@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
+  SLAVE_IP_ID = ['slave'.freeze, '0'.taint].freeze
 
-  @@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]
+  @@IP_TABLE = {}.taint
 
-  @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
+  @@INIT_IP_ENV  = [].taint # table of Procs
+  @@ADD_TK_PROCS = [].taint # table of [name, args, body]
 
-  unless defined?(@@TK_CMD_TBL)
-    @@TK_CMD_TBL = Object.new.taint
+  @@TK_TABLE_LIST = [].taint
 
-    # @@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
-    @@TK_CMD_TBL.instance_variable_set('@tbl', Hash.new{|hash,key|
-                                           fail IndexError, 
-                                                "unknown command ID '#{key}'"
-                                       }.taint)
-
-    class << @@TK_CMD_TBL
-      allow = [
-        '__send__', '__id__', 'freeze', 'inspect', 'kind_of?', 'object_id', 
-        '[]', '[]=', 'delete', 'each', 'has_key?'
-      ]
-      instance_methods.each{|m| undef_method(m) unless allow.index(m.to_s)}
-
-      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
+  @@TK_CMD_TBL = {}.taint
 
   ######################################
 
-  @@CB_ENTRY_CLASS = Class.new(TkCallbackEntry){
+  @@CB_ENTRY_CLASS = Class.new{|c|
     def initialize(ip, cmd)
       @ip = ip
       @cmd = cmd
-      self.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
+      begin
+	 unless @ip.deleted?
+	   @ip.cb_eval(@cmd, *args)
+	 end
+      rescue TkCallbackBreak, TkCallbackContinue
+	fail
+      rescue Exception
       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(' ')
+  def _keys2opts(keys)
+    keys.collect{|k,v| "-#{k} #{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
+    return nil unless thread
 
     if wait == 0
       # no wait
-      Thread.pass
-      if thread.stop?
-        thread.raise exception
-      end
+      thread.raise exception
       return thread
     end
 
     # wait to stop the caller thread
     wait.times{
       if thread.stop?
-        # ready to send exception
-        thread.raise exception
-        return thread
+	# ready to send exception
+	thread.raise exception
+	return thread
       end
 
       # wait
@@ -328,378 +101,81 @@ class MultiTkIp
 
   ######################################
 
-  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)
+    @cmd_queue.enq([@system, 'set_safe_level', safe])
+    self
   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"))
-        if MultiTkIp::WITH_ENCODING
-          bt.force_encoding('utf-8')
-        else
-          bt.instance_variable_set(:@encoding, 'utf-8')
-        end
-      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
+    self
   end
 
-  def _create_receiver_and_watchdog(lvl = $SAFE)
-    lvl = $SAFE if lvl < $SAFE
-
+  def _create_receiver_and_watchdog()
     # command-procedures receiver
-    receiver = Thread.new(lvl){|safe_level|
-      last_thread = {}
-
+    receiver = Thread.new{
+      safe_level = $SAFE
       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
+	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
+	      nil
+	    end
+	  else
+	    # ignore
+	  end
+
+	else
+	  # procedure
+	  begin
+	    ret = proc{$SAFE = safe_level; cmd.call(*args)}.call
+	  rescue SystemExit
+	    # delete IP
+	    unless @interp.deleted?
+	      if @interp._invoke('info', 'command', '.') != ""
+		@interp._invoke('destroy', '.')
+	      end
+	      @interp.delete
+	    end
+	    _check_and_return(thread, MultiTkIp_OK.new(nil))
+	    break
+	  rescue Exception => e
+	    # raise exception
+	    _check_and_return(thread, e)
+	  else
+	    # no exception
+	    _check_and_return(thread, MultiTkIp_OK.new(ret))
+	  end
+	end
       end
     }
 
     # watchdog of receiver
     watchdog = Thread.new{
       begin
-        loop do
-          sleep 1
-          receiver.kill if @interp.deleted?
-          break unless receiver.alive?
-        end
+	loop do
+	  sleep 1
+	  break unless receiver.alive?
+	end
       rescue Exception
-        # ignore all kind of 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
+	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
     }
 
@@ -710,11 +186,6 @@ class MultiTkIp
 
   ######################################
 
-  unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
-    ### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
-    RUN_EVENTLOOP_ON_MAIN_THREAD = false
-  end
-
   if self.const_defined? :DEFAULT_MASTER_NAME
     name = DEFAULT_MASTER_NAME.to_s
   else
@@ -729,72 +200,28 @@ class MultiTkIp
 
   @@DEFAULT_MASTER = self.allocate
   @@DEFAULT_MASTER.instance_eval{
+    @encoding = [].taint
+
     @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
 
-    if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
-      @interp = TclTkIp.new(name, _keys2opts(keys))
-    else ### Ruby 1.9 !!!!!!!!!!!
-      @interp_thread = Thread.new{
-        current = Thread.current
-        current[:interp] = interp = TclTkIp.new(name, _keys2opts(keys))
-        #sleep
-        current[:mutex] = mutex = Mutex.new
-        current[:root_check] = cond_var = ConditionVariable.new
-
-        begin
-          current[:status] = interp.mainloop(true)
-        rescue Exception=>e
-          current[:status] = e
-        ensure
-          mutex.synchronize{ cond_var.broadcast }
-        end
-        current[:status] = interp.mainloop(false)
-      }
-      until @interp_thread[:interp]
-        Thread.pass
-      end
-      # INTERP_THREAD.run
-      @interp = @interp_thread[:interp]
-
-      def self.mainloop(check_root = true)
-        begin
-          TclTkLib.set_eventloop_window_mode(true)
-          @interp_thread.value
-        ensure
-          TclTkLib.set_eventloop_window_mode(false)
-        end
-      end
-    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])
+    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog()
 
     @threadgroup.add @cmd_receiver
     @threadgroup.add @receiver_watchdog
@@ -803,144 +230,7 @@ class MultiTkIp
 
     @@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, cond, 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.synchronize{ cond.signal }
-        end
-        mtx = cond = ret = table = script = nil  # clear variables for GC
-      }
-    }
-
-    def self.__init_ip_env__(table, script)
-      ret = []
-      mtx  = (Thread.current[:MultiTk_ip_Mutex] ||= Mutex.new)
-      cond = (Thread.current[:MultiTk_ip_CondVar] ||= ConditionVariable.new)
-      mtx.synchronize{
-        @init_ip_env_queue.enq([mtx, cond, ret, table, script])
-        cond.wait(mtx)
-      }
-      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
 
   ######################################
@@ -949,28 +239,28 @@ class MultiTkIp
     # 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
+	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"
+	subclass.freeze
+	fail SecurityError, 
+	  "cannot create subclass of MultiTkIp on a untrusted ThreadGroup"
       end
     end
   end
 
   ######################################
 
-  @@SAFE_OPT_LIST = [
+  SAFE_OPT_LIST = [
     'accessPath'.freeze, 
     'statics'.freeze, 
     'nested'.freeze, 
@@ -984,32 +274,25 @@ class MultiTkIp
     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
+      if k.to_s == 'name'
+	name = v 
+      elsif k.to_s == 'safe'
+	safe = v
+      elsif SAFE_OPT_LIST.member?(k.to_s)
+	safe_opts[k] = v
       else
-        tk_opts[k_str] = v
+	tk_opts[k] = v
       end
     }
 
-    if keys['without_tk'] || keys[:without_tk]
-      [name, safe, safe_opts, nil]
-    else
-      [name, safe, safe_opts, tk_opts]
-    end
+    [name, safe, safe_opts, tk_opts]
   end
   private :_parse_slaveopts
 
   def _create_slave_ip_name
-    @@SLAVE_IP_ID.mutex.synchronize{
-      name = @@SLAVE_IP_ID.join('')
-      @@SLAVE_IP_ID[1].succ!
-      name.freeze
-    }
+    name = SLAVE_IP_ID.join
+    SLAVE_IP_ID[1].succ!
+    name
   end
   private :_create_slave_ip_name
 
@@ -1023,15 +306,15 @@ class MultiTkIp
     # check 'display'
     if !new_keys.key?('display')
       begin
-        #new_keys['display'] = @interp._invoke('winfo screen .')
-        new_keys['display'] = @interp._invoke('winfo', 'screen', '.')
+	#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
+	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
 
@@ -1040,30 +323,30 @@ class MultiTkIp
       # 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', '.')
+	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'])
+	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
+	begin
+	  pathname = @interp._invoke('winfo', 'pathname', new_keys['use'])
+	  assco_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
+	if optkeys.keys?(:display) || optkeys.keys?('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
 
@@ -1091,8 +374,8 @@ class MultiTkIp
     # create toplevel widget
     begin
       top = TkToplevel.new(toplevel_keys)
-    rescue NameError => e
-      fail e unless @interp.safe?
+    rescue NameError
+      fail unless @interp.safe?
       fail SecurityError, "unable create toplevel on the safe interpreter"
     end
     msg = "Untrusted Ruby/Tk applet (#{slave_name})"
@@ -1105,36 +388,28 @@ class MultiTkIp
     # 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
+	if slave_ip._invoke('info', 'command', '.') != ""
+	  slave_ip._invoke('destroy', '.')
+	end
+	slave_ip.delete
       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)
+	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)
+		  :anchor=>:w).pack(:side=>:left, :fill=>:both, :expand=>true)
 
       fc.pack(:side=>:bottom, :fill=>:x)
     }
@@ -1143,60 +418,30 @@ class MultiTkIp
     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]
+    loadTk_keys
   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
+    # at present, not enough support for '-deleteHook' option
     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
+    @interp._eval("::safe::interpInit #{ip_name} "+_keys2opts(safe_opts))
+    tk_opts = __check_safetk_optkeys(tk_opts)
+    unless tk_opts.key?('use')
+      tk_opts = __create_safetk_frame(slave_ip, ip_name, app_name, tk_opts)
     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
-
+    @interp._eval("::safe::loadTk #{ip_name} #{_keys2opts(tk_opts)}")
+    @slave_ip_tbl[ip_name] = slave_ip
     [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)
@@ -1209,8 +454,6 @@ class MultiTkIp
   ######################################
 
   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
@@ -1226,11 +469,7 @@ class MultiTkIp
       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?
+    if !master.master? && master.safe?
       fail SecurityError, "safe-slave-ip cannot create a new interpreter"
     end
 
@@ -1242,174 +481,70 @@ class MultiTkIp
       fail ArgumentError, "expecting a Hash object for the 2nd argument"
     end
 
+    @encoding = []
     @tk_windows = {}
     @tk_table_list = []
     @slave_ip_tbl = {}
-    @slave_ip_top = {}
-    @cb_error_proc = []
-    @evloop_thread = []
 
+    @encoding.taint unless @encoding.tainted?
     @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
-      unless WITH_RUBY_VM
-        @interp = TclTkIp.new(name, _keys2opts(tk_opts))
-      else ### Ruby 1.9 !!!!!!!!!!!
-        @interp_thread = Thread.new{
-          Thread.current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
-          #sleep
-          TclTkLib.mainloop(true)
-        }
-        until @interp_thread[:interp]
-          Thread.pass
-        end
-        # INTERP_THREAD.run
-        @interp = @interp_thread[:interp]
-      end
-
+      @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)
-        # @interp_thread = nil if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!
-        @interp_thread = nil unless WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
-        if safe
-          safe = master.safe_level if safe < master.safe_level
-          @safe_level = [safe]
-        else
-          @safe_level = [4]
-        end
+	@interp, @ip_name = master.__create_safe_slave_obj(safe_opts, 
+							   name, tk_opts)
       else
-        @interp, @ip_name = master.__create_trusted_slave_obj(name, tk_opts)
-        # @interp_thread = nil if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!
-        @interp_thread = nil unless WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
-        if safe
-          safe = master.safe_level if safe < master.safe_level
-          @safe_level = [safe]
-        else
-          @safe_level = [master.safe_level]
-        end
+	@interp, @ip_name = master.__create_trusted_slave_obj(name, tk_opts)
       end
       @set_alias_proc = proc{|name| 
-        master._invoke('interp', 'alias', @ip_name, name, '', 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])
+    @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
+    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
     @@TK_TABLE_LIST.size.times{ 
       (tbl = {}).tainted? || tbl.taint
       @tk_table_list << tbl
     }
-    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
-
-    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
+    if Thread.current.group == ThreadGroup::Default
       @@DEFAULT_MASTER
     else
-      ip = @@IP_TABLE[current.group]
+      ip = @@IP_TABLE[Thread.current.group]
       unless ip
-        fail SecurityError, 
-          "cannot call Tk methods on #{Thread.current.inspect}"
+	fail SecurityError, 
+	  "cannot call Tk methods on #{Thread.current.inspect}"
       end
       ip
     end
@@ -1422,76 +557,24 @@ class << MultiTkIp
   alias __new new
   private :__new
 
-  def new_master(safe=nil, keys={})
-    if MultiTkIp::WITH_RUBY_VM
-      #### TODO !!!!!!
-      fail RuntimeError, 
-           'sorry, still not support multiple master-interpreters on Ruby VM'
-    end
-
-    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
-
+  def new_master(keys={}, &b)
     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.eval_proc(&b) if b
     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
-
+  def new_slave(keys={}, &b)
     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.eval_proc(&b) if b
     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
+  alias new_trusted_slave new_master
 
+  def new_safe_slave(keys={},&b)
     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.eval_proc(&b) if b
     ip
   end
   alias new_safeTk new_safe_slave
@@ -1502,21 +585,13 @@ end
 class MultiTkIp
   def inspect
     s = self.to_s.chop!
-    if self.manipulable?
-      if master?
-        if @interp.deleted?
-          s << ':deleted-master'
-        else
-          s << ':master'
-        end
+    if master?
+      s << ':master'
+    else
+      if @interp.safe?
+	s << ':safe-slave'
       else
-        if @interp.deleted?
-          s << ':deleted-slave'
-        elsif @interp.safe?
-          s << ':safe-slave'
-        else
-          s << ':trusted-slave'
-        end
+	s << ':trusted-slave'
       end
     end
     s << '>'
@@ -1537,11 +612,9 @@ class MultiTkIp
     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?
@@ -1575,34 +648,19 @@ class MultiTkIp
   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]
+	@slave_ip_tbl[name]
       elsif all
-        name
+	name
       else
-        nil
+	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
 
 
@@ -1630,7 +688,7 @@ class MultiTkIp
   end
 
   def _init_ip_env(script)
-    self.eval_proc{script.call(self)}
+    script.call(self)
   end
 
   def _add_tk_procs(name, args, body)
@@ -1641,30 +699,13 @@ class MultiTkIp
     }
   end
 
-  def _remove_tk_procs(*names)
-    return if slave?
-    names.each{|name|
-      name = name.to_s
-
-      return if @interp.deleted?
-      @interp._invoke('rename', name, '')
-
-      return if @interp.deleted?
-      @interp._invoke('interp', 'slaves').split.each{|slave|
-        return if @interp.deleted?
-        @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)}
+    init_ip_env.each{|script| script.call(self)}
     add_tk_procs.each{|name, args, body| 
       if master?
-        @interp._invoke('proc', name, args, body) if args && body
+	@interp._invoke('proc', name, args, body) if args && body
       else
-        @set_alias_proc.call(name)
+	@set_alias_proc.call(name)
       end
     }
   end
@@ -1683,34 +724,17 @@ class MultiTkIp
     __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
-
+    #if __getip.slave?
+    #  raise SecurityError, "slave-IP has no permission creating a new table"
+    #end
     id = @@TK_TABLE_LIST.size
     obj = Object.new
     @@TK_TABLE_LIST << obj
-    obj.instance_variable_set(:@id, id)
-    obj.instance_variable_set(:@mutex, Mutex.new)
-    obj.instance_eval{
-      def self.mutex
-        @mutex
-      end
+    obj.instance_eval <<-EOD
       def self.method_missing(m, *args)
-        MultiTkIp.tk_object_table(@id).__send__(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
@@ -1718,48 +742,15 @@ class MultiTkIp
 
   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)
+    @@IP_TABLE.each{|tg, ip| 
+      ip._init_ip_env(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
-      }
-    }
+    @@ADD_TK_PROCS << [name, args, body]
     @@IP_TABLE.each{|tg, ip| 
-      ip._remove_tk_procs(*names)
+      ip._add_tk_procs(name, args, body)
     }
   end
 
@@ -1771,186 +762,54 @@ 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))
-    }
+    self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
   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)
+    # cmd string ==> proc
+    if cmd.kind_of?(String)
+      xcmd  = cmd
+      xargs = args
+      cmd = proc{ TkComm._get_eval_string(TkUtil.eval_cmd(xcmd, *xargs)) }
+      args = []
+    end
+
     # 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"
+    unless cmd.kind_of?(Proc)
+      raise RuntimeError, "A Proc object is expected for the 'cmd' argument"
     end
 
     # on IP thread
-    if @cmd_receiver == Thread.current || 
-        (!req_val && TclTkLib.mainloop_thread? != false) # callback
+    if (@cmd_receiver == Thread.current)
       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
+	ret = cmd.call(*args)
+      rescue SystemExit
+	# exit IP
+	warn("Warning: "+ $! + " on " + self.inspect) if $DEBUG
+	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
+	warn("Warning: " + e.class.inspect + 
+	     ((e.message.length > 0)? ' "' + e.message + '"': '') +  
+	     " on " + self.inspect)
+	ret =  nil
       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
+      @cmd_queue.enq([nil, cmd, *args])
       return nil
     end
 
@@ -1961,209 +820,38 @@ class MultiTkIp
     rescue MultiTkIp_OK => ret
       # return value
       return ret.value
-    rescue SystemExit => e
+    rescue SystemExit
       # 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
+      self.delete
     rescue Exception => e
-      if $DEBUG
-        warn("Warning: " + e.class.inspect + 
-             ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-             " on " + self.inspect) 
-      end
-      return e
+      # others --> warning
+	warn("Warning: " + e.class.inspect + 
+	     ((e.message.length > 0)? ' "' + e.message + '"': '') +  
+	     " on " + self.inspect) 
     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
+  def eval_callback(cmd = Proc.new, *args)
+    eval_proc_core(false, cmd, *args)
   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
+  def eval_proc(cmd = Proc.new, *args)
+    eval_proc_core(true, cmd, *args)
   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
+  alias eval_string eval_proc
 end
-
 class << MultiTkIp
   # class method
-  def eval_proc(*args, &blk)
+  def eval_proc(cmd = Proc.new, *args)
     # class ==> interp object
-    __getip.eval_proc(*args, &blk)
+    __getip.eval_proc(cmd, *args)
   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
+  alias eval_string eval_proc
 end
 
 
@@ -2180,12 +868,10 @@ class << MultiTkIp
     __getip.do_one_event(flag)
   end
   def mainloop_abort_on_exception
-    # __getip.mainloop_abort_on_exception
-    TclTkLib.mainloop_abort_on_exception
+    __getip.mainloop_abort_on_exception
   end
   def mainloop_abort_on_exception=(mode)
-    # __getip.mainloop_abort_on_exception=(mode)
-    TclTkLib.mainloop_abort_on_exception=(mode)
+    __getip.mainloop_abort_on_exception=(mode)
   end
   def set_eventloop_tick(tick)
     __getip.set_eventloop_tick(tick)
@@ -2210,7 +896,7 @@ end
 # class methods to delegate to TclTkIp
 class << MultiTkIp
   def method_missing(id, *args)
-    __getip.__send__(id, *args)
+    __getip.send(id, *args)
   end
 
   def make_safe
@@ -2221,58 +907,7 @@ class << MultiTkIp
     __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
-
+  def restart
     __getip.restart
   end
 
@@ -2284,27 +919,11 @@ class << MultiTkIp
     __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)
+  def _toUTF8(str, encoding)
     __getip._toUTF8(str, encoding)
   end
 
-  def _fromUTF8(str, encoding=nil)
+  def _fromUTF8(str, encoding)
     __getip._fromUTF8(str, encoding)
   end
 
@@ -2319,62 +938,6 @@ class << MultiTkIp
   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
 
 
@@ -2389,12 +952,12 @@ class << TclTkLib
   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 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
@@ -2413,15 +976,8 @@ class << TclTkLib
   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)
+  def restart
+    MultiTkIp.restart
   end
 end
 
@@ -2429,402 +985,81 @@ end
 # depend on TclTkIp
 class MultiTkIp
   def mainloop(check_root = true, restart_on_dead = true)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
-      return @interp_thread.value if @interp_thread
-    end
-
-    #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
-
+    return self if self.slave?
     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
+      @interp.mainloop(check_root)
     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
+      begin
+	loop do
+	  break unless self.alive?
+	  if check_root
+	    begin
+	      break if TclTkLib.num_of_mainwindows == 0
+	    rescue Exception
+	      break
+	    end
+	  end
+	  @interp.mainloop(check_root)
+	end
+      rescue StandardError
+	if TclTkLib.mainloop_abort_on_exception != nil
+	  STDERR.print("Warning: Tk mainloop on ", @interp.inspect, 
+		       " receives ", $!.class.inspect, 
+		       " exception (ignore) : ", $!.message, "\n");
+	end
+	retry
       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
-
+  def restart
     @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?
+  def _toUTF8(str, encoding)
     @interp._toUTF8(str, encoding)
   end
 
-  def _fromUTF8(str, encoding=nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+  def _fromUTF8(str, encoding)
     @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
 
 
@@ -2843,10 +1078,9 @@ class MultiTkIp
     i = -1
     brace = 1
     str.each_byte {|c|
-      c = c.chr
       i += 1
-      brace += 1 if c == '{'
-      brace -= 1 if c == '}'
+      brace += 1 if c == ?{
+      brace -= 1 if c == ?}
       break if brace == 0
     }
     if i == 0
@@ -2856,8 +1090,7 @@ class MultiTkIp
     else
       list.push str[0..i-1]
     end
-    #list += _lst2ary(str[i+1..-1])
-    list.concat(_lst2ary(str[i+1..-1]))
+    list += tk_split_simplelist(str[i+1..-1])
     list
   end
   private :_lst2ary
@@ -2868,13 +1101,12 @@ class MultiTkIp
     elsif slave.kind_of?(String)
       slave
     else
-      slave.to_s
+      cmd_name.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)
@@ -2882,7 +1114,6 @@ class MultiTkIp
   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
@@ -2892,9 +1123,8 @@ class MultiTkIp
   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)
+			  '', org_cmd, *args)
     (ret == new_cmd)? self: nil
   end
   def self.def_alias(slave, new_cmd, org_cmd, *args)
@@ -2903,7 +1133,6 @@ class MultiTkIp
   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 = '')
@@ -2911,7 +1140,6 @@ class MultiTkIp
   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
@@ -2922,7 +1150,6 @@ class MultiTkIp
   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
@@ -2931,7 +1158,6 @@ class MultiTkIp
   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
@@ -2942,7 +1168,6 @@ class MultiTkIp
   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
@@ -2956,7 +1181,6 @@ class MultiTkIp
   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
@@ -2970,7 +1194,6 @@ class MultiTkIp
   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 = '')
@@ -2978,66 +1201,21 @@ class MultiTkIp
   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)
+    @interp._invoke('interp', 'invokehidden', _slavearg(slave), cmd, *args)
   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)
+    @interp._invoke('interp', 'invokehidden', _slavearg(slave), 
+		    '-global', cmd, *args)
   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
@@ -3046,75 +1224,7 @@ class MultiTkIp
     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 = '')
@@ -3122,7 +1232,6 @@ class MultiTkIp
   end
 
   def share_stdin(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
     @interp._invoke('interp', 'share', src, 'stdin', dist)
     self
   end
@@ -3132,7 +1241,6 @@ class MultiTkIp
   end
 
   def share_stdout(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
     @interp._invoke('interp', 'share', src, 'stdout', dist)
     self
   end
@@ -3142,7 +1250,6 @@ class MultiTkIp
   end
 
   def share_stderr(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
     @interp._invoke('interp', 'share', src, 'stderr', dist)
     self
   end
@@ -3152,7 +1259,6 @@ class MultiTkIp
   end
 
   def transfer_stdin(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
     @interp._invoke('interp', 'transfer', src, 'stdin', dist)
     self
   end
@@ -3162,7 +1268,6 @@ class MultiTkIp
   end
 
   def transfer_stdout(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
     @interp._invoke('interp', 'transfer', src, 'stdout', dist)
     self
   end
@@ -3172,7 +1277,6 @@ class MultiTkIp
   end
 
   def transfer_stderr(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
     @interp._invoke('interp', 'transfer', src, 'stderr', dist)
     self
   end
@@ -3182,7 +1286,6 @@ class MultiTkIp
   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)
@@ -3194,7 +1297,6 @@ class MultiTkIp
   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)
@@ -3207,162 +1309,46 @@ class MultiTkIp
 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_table
-    __getip.encoding_table
-  end
-end
 class MultiTkIp
-  def encoding_table
-    @interp.encoding_table
-  end
-
-  def force_default_encoding=(mode)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.force_default_encoding = mode
-  end
-  def force_default_encoding?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.force_default_encoding?
-  end
+  # from tkencoding.rb by ttate@jaist.ac.jp
+  alias __eval _eval
+  alias __invoke _invoke
 
-  def default_encoding=(enc)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.default_encoding = enc
+  def encoding
+    @encoding[0]
   end
-
   def encoding=(enc)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding = enc
-  end
-  def encoding_name
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding_name
+    @encoding[0] = enc
   end
-  def encoding_obj
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding_obj
-  end
-  alias encoding encoding_name
-  alias default_encoding encoding_name
-
-  def encoding_convertfrom(str, enc=None)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding_convertfrom(str, enc)
+    
+  def _eval(cmd)
+    if @encoding[0] != nil
+      _fromUTF8(__eval(_toUTF8(cmd, @encoding[0])), @encoding[0])
+    else
+      __eval(cmd)
+    end
   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)
+  def _invoke(*cmds)
+    if defined?(@encoding[0]) && @encoding[0] != nil
+      cmds = cmds.collect{|cmd| _toUTF8(cmd, @encoding[0])}
+      _fromUTF8(__invoke(*cmds), @encoding[0])
+    else
+      __invoke(*cmds)
+    end
   end
-  alias encoding_convert_to encoding_convertto
 end
 
 
 # remove methods for security
-if MultiTkIp::WITH_RUBY_VM && 
-    ! MultiTkIp::RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
-  class MultiTkIp
-    INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
-    INTERP_MUTEX  = INTERP_THREAD[:mutex]
-    INTERP_ROOT_CHECK = INTERP_THREAD[:root_check]
-  end
-  module TkCore
-    INTERP_THREAD = MultiTkIp::INTERP_THREAD
-    INTERP_MUTEX  = MultiTkIp::INTERP_MUTEX
-    INTERP_ROOT_CHECK = MultiTkIp::INTERP_ROOT_CHECK
-  end
-  class MultiTkIp
-    remove_const(:INTERP_THREAD)
-    remove_const(:INTERP_MUTEX)
-    remove_const(:INTERP_ROOT_CHECK)
-  end
-end
-
 class MultiTkIp
-  # undef_method :instance_eval
+  undef_method :instance_eval
   undef_method :instance_variable_get
   undef_method :instance_variable_set
 end
+
+
 # end of MultiTkIp definition
 
 # defend against modification
diff --git a/ext/tk/lib/remote-tk.rb b/ext/tk/lib/remote-tk.rb
deleted file mode 100644
index 70115a60aa..0000000000
--- a/ext/tk/lib/remote-tk.rb
+++ /dev/null
@@ -1,526 +0,0 @@
-#
-#               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/ext/tk/lib/tcltk.rb b/ext/tk/lib/tcltk.rb
deleted file mode 100644
index 7f6f41605d..0000000000
--- a/ext/tk/lib/tcltk.rb
+++ /dev/null
@@ -1,367 +0,0 @@
-# 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("invalid # 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/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index c5d5b804d2..7de4cd5f24 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -1,60 +1,34 @@
 #
-#               tk.rb - Tk interface module using tcltklib
-#                       by Yukihiro Matsumoto <matz@netlab.jp>
+#		tk.rb - Tk interface module using tcltklib
+#			$Date$
+#			by Yukihiro Matsumoto <matz@netlab.jp>
 
 # use Shigehiro's tcltklib
-require 'tcltklib'
-require 'tkutil'
+require "tcltklib"
+require "tkutil"
 
-# autoload
-require 'tk/autoload'
-
-# for Mutex
-require 'thread'
-
-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
+  None = Object.new
+  def None.to_s
+    'None'
+  end
+  None.freeze
 
   #Tk_CMDTBL = {}
   #Tk_WINDOWS = {}
-  Tk_IDs = ["00000".taint, "00000".taint]  # [0]-cmdid, [1]-winid
-  Tk_IDs.instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
+  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)
+    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)
+    TkCore::INTERP.tk_windows.send(id, *args)
   end
   Tk_WINDOWS.freeze
 
@@ -62,21 +36,6 @@ module TkComm
     @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|
@@ -91,7 +50,7 @@ module TkComm
 
     begin
       #tk_class = TkCore::INTERP._invoke('winfo', 'class', path)
-      tk_class = Tk.ip_invoke_without_enc('winfo', 'class', path)
+      tk_class = Tk.ip_invoke('winfo', 'class', path)
     rescue
       return path
     end
@@ -101,66 +60,17 @@ module TkComm
       # 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
+    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
-      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
+      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
-
-=begin
     unless Object.const_defined? gen_class_name
       Object.class_eval "class #{gen_class_name}<#{ruby_class_name}
                            #{classname_def}
@@ -168,365 +78,142 @@ module TkComm
     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+)/
+  def tk_tcl2ruby(val)
+    if val =~ /^rb_out (c\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]
+    if val.include? ?\s
+      return val.split.collect{|v| tk_tcl2ruby(v)}
     end
-    #if val.include? ?\s
-    #  return val.split.collect{|v| tk_tcl2ruby(v)}
-    #end
     case val
-    when /\A@font\S+\z/
+    when /^@font/
       TkFont.get_obj(val)
-    when /\A-?\d+\z/
+    when /^-?\d+$/
       val.to_i
-    when /\A\.\S*\z/
+    when /^\./
       #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.mutex.synchronize{
-        TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+    when /^i\d+$/
+      TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+    when / /
+      val.split.collect{|elt|
+	tk_tcl2ruby(elt)
       }
-    when /\A-?\d+\.?\d*(e[-+]?\d+)?\z/
+    when /^-?\d+\.?\d*(e[-+]?\d+)?$/
       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)}
+      val
     end
   end
 
-  def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
+  def tk_split_list(str)
     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
-        elsif TkCore::WITH_ENCODING
-          s_enc = s.encoding.name
-        else
-          s_enc = sys_enc
-        end
-        dst_enc = true if s_enc != dst_enc
+    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
-
-      s
+      return list
+    end
+
+    list = tk_tcl2ruby(str[0,idx])
+    list = [] if list == ""
+    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 sys_enc && dst_enc
-      dst.map!{|s| _toUTF8(s)}
-      ret = TkCore::INTERP._merge_tklist(*dst)
-      if TkCore::WITH_ENCODING
-        if dst_enc.kind_of?(String)
-          ret = _fromUTF8(ret, dst_enc)
-          ret.force_encoding(dst_enc)
-        else
-          ret.force_encoding('utf-8')
-        end
-      else # without encoding
-        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
-      end
-      ret
+    if str.size == i + 1
+      return tk_split_list(str[0, i])
+    end
+    if str[0, i] == ' '
+      list.push ' '
     else
-      TkCore::INTERP._merge_tklist(*dst)
+      list.push tk_split_list(str[0, i])
     end
+    list += tk_split_list(str[i+1..-1])
+    list
   end
 
-else
-  ###########################################################################
-  # use Ruby script version of split_list (traditional methods)
-  ###########################################################################
-
-  def tk_split_escstr(str, src_enc=true, dst_enc=true)
+  def tk_split_simplelist(str)
     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)
+    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
     }
-    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]
+    if i == 0
+      list.push ''
+    elsif str[0, i] == ' '
+      list.push ' '
     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)}
+      list.push str[0..i-1]
     end
+    list += tk_split_simplelist(str[i+1..-1])
+    list
   end
+  private :tk_tcl2ruby, :tk_split_list, :tk_split_simplelist
 
-  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)
-    }
+  def _symbolkey2str(keys)
+    h = {}
+    keys.each{|key,value| h[key.to_s] = value}
+    h
   end
+  private :_symbolkey2str
 
-  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
+  def hash_kv(keys)
+    conf = []
+    if keys and keys != None
+      for k, v in keys
+	 conf.push("-#{k}")
+	 conf.push(v)
       end
-      escape = false
-    }
-    list << token.gsub(/^\{(.*)\}$/, '\1') if token
-    list
+    end
+    conf
   end
+  private :hash_kv
+  module_function :hash_kv
 
-  def array2tk_list(ary, enc=nil)
+  def array2tk_list(ary)
     ary.collect{|e|
       if e.kind_of? Array
-        "{#{array2tk_list(e, enc)}}"
+	"{#{array2tk_list(e)}}"
       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)
+	"{#{e.to_a.collect{|ee| array2tk_list(ee)}.join(' ')}}"
       else
-        s = _get_eval_string(e, enc)
-        (s.index(/\s/) || s.size == 0)? "{#{s}}": s
+	s = _get_eval_string(e)
+	(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'
@@ -535,7 +222,6 @@ end
       false
     end
   end
-
   def number(val)
     case val
     when /^-?\d+$/
@@ -543,32 +229,24 @@ end
     when /^-?\d+\.?\d*(e[-+]?\d+)?$/
       val.to_f
     else
-      fail(ArgumentError, "invalid value for Number:'#{val}'")
+      fail(ArgumentError, 
+	   Kernel.format('invalid value for Number:"%s"', val.to_s))
     end
   end
   def string(val)
     if val == "{}"
       ''
-    elsif val[0] == ?{ && val[-1] == ?}
+    elsif val[0] == ?{
       val[1..-2]
     else
       val
     end
   end
-  def num_or_str(val)
-    begin
-      number(val)
-    rescue ArgumentError
-      string(val)
-    end
+  def list(val)
+    tk_split_list(val)
   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)
+  def simplelist(val)
+    tk_split_simplelist(val)
   end
   def window(val)
     if val =~ /^\./
@@ -579,80 +257,30 @@ end
       nil
     end
   end
-  def image_obj(val)
-    if val =~ /^i(_\d+_)?\d+$/
-      TkImage::Tk_IMGTBL.mutex.synchronize{
-        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+)/
+    if val =~ /^rb_out (c\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
+  private :bool, :number, :string, :list, :simplelist, :window, :procedure
+  module_function :bool, :number, :string, :list, :simplelist
+  module_function :window, :procedure
 
-  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)
+  def _get_eval_string(str)
     return nil if str == None
-    if str.kind_of?(TkObject)
-      str = str.path
-    elsif str.kind_of?(String)
-      str = _toUTF8(str) if enc_mode
+    if str.kind_of?(String)
+      # do nothing
     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(" ")
+      str = hash_kv(str).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
@@ -663,179 +291,60 @@ end
       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" 
+	fail RuntimeError, "fail to convert the object to a string" 
       end
-      str = _toUTF8(str) if enc_mode
+      str
     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)
+  def ruby2tcl(v)
     if v.kind_of?(Hash)
       v = hash_kv(v)
       v.flatten!
-      v.collect{|e|ruby2tcl(e, enc_mode)}
+      v.collect{|e|ruby2tcl(e)}
     else
-      _get_eval_string(v, enc_mode)
+      _get_eval_string(v)
     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]
+    id = "c" + TkComm::Tk_IDs[0]
   end
   def _next_cmd_id
-    TkComm::Tk_IDs.mutex.synchronize{
-      id = _curr_cmd_id
-      #Tk_IDs[0] += 1
-      TkComm::Tk_IDs[0].succ!
-      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 TkComm.install_cmd(cmd, local_cmdtbl=nil)
+  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
+    TkCore::INTERP.tk_cmd_tbl[id] = TkCore::INTERP.get_cb_entry(cmd)
     @cmdtbl = [] unless defined? @cmdtbl
     @cmdtbl.taint unless @cmdtbl.tainted?
     @cmdtbl.push id
-
-    if local_cmdtbl && local_cmdtbl.kind_of?(Array)
-      begin
-        local_cmdtbl << id
-      rescue Exception
-        # ignore
-      end
-    end
-
-    #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
+    return Kernel.format("rb_out %s", id);
   end
-  def TkComm.uninstall_cmd(id, local_cmdtbl=nil)
-    #id = $1 if /rb_out\S* (c(_\d+_)?\d+)/ =~ id
-    id = $4 if id =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-
-    if local_cmdtbl && local_cmdtbl.kind_of?(Array)
-      begin
-        local_cmdtbl.delete(id)
-      rescue Exception
-        # ignore
-      end
-    end
-    @cmdtbl.delete(id)
-
+  def uninstall_cmd(id)
+    id = $1 if /rb_out (c\d+)/ =~ id
     #Tk_CMDTBL.delete(id)
     TkCore::INTERP.tk_cmd_tbl.delete(id)
   end
-  # private :install_cmd, :uninstall_cmd
-  # module_function :install_cmd, :uninstall_cmd
-  def install_cmd(cmd)
-    TkComm.install_cmd(cmd, @cmdtbl)
-  end
-  def uninstall_cmd(id)
-    TkComm.uninstall_cmd(id, @cmdtbl)
-  end
+  private :install_cmd, :uninstall_cmd
+  module_function :install_cmd
 
-=begin
   def install_win(ppath,name=nil)
     if !name or name == ''
       #name = format("w%.4d", Tk_IDs[1])
@@ -853,31 +362,6 @@ 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
-      Tk_IDs.mutex.synchronize{
-        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)
@@ -885,22 +369,163 @@ end
   end
   private :install_win, :uninstall_win
 
-  def _epath(win)
-    if win.kind_of?(TkObject)
-      win.epath
-    elsif win.respond_to?(:epath)
-      win.epath
+  class Event
+    module TypeNum
+      KeyPress         =  2
+      KeyRelease       =  3
+      ButtonPress      =  4
+      ButtonRelease    =  5
+      MotionNotify     =  6
+      EnterNotify      =  7
+      LeaveNotify      =  8
+      FocusIn          =  9
+      FocusOut         = 10
+      KeymapNotify     = 11
+      Expose           = 12
+      GraphicsExpose   = 13
+      NoExpose         = 14
+      VisibilityNotify = 15
+      CreateNotify     = 16
+      DestroyNotify    = 17
+      UnmapNotify      = 18
+      MapNotify	       = 19
+      MapRequest       = 20
+      ReparentNotify   = 21
+      ConfigureNotify  = 22
+      ConfigureRequest = 23
+      GravityNotify    = 24
+      ResizeRequest    = 25
+      CirculateNotify  = 26
+      CirculateRequest = 27
+      PropertyNotify   = 28
+      SelectionClear   = 29
+      SelectionRequest = 30
+      SelectionNotify  = 31
+      ColormapNotify   = 32
+      ClientMessage    = 33
+      MappingNotify    = 34
+    end
+
+    EV_KEY  = '#abcdfhikmopstwxyABDEKNRSTWXY'
+    EV_TYPE = 'nsnnsbnsnsbsxnnnnsnnbsnssnwnn'
+
+    def self.scan_args(arg_str, arg_val)
+      arg_cnv = []
+      arg_str.strip.split(/\s+/).each_with_index{|kwd,idx|
+	if kwd =~ /^%(.)$/
+	  if num = EV_KEY.index($1)
+	    case EV_TYPE[num]
+	    when ?n
+	      begin
+		val = TkComm::number(arg_val[idx])
+	      rescue ArgumentError
+		# ignore --> no convert
+		val = TkComm::string(arg_val[idx])
+	      end
+	      arg_cnv << val
+	    when ?s
+	      arg_cnv << TkComm::string(arg_val[idx])
+	    when ?b
+	      arg_cnv << TkComm::bool(arg_val[idx])
+	    when ?w
+	      arg_cnv << TkComm::window(arg_val[idx])
+	    when ?x
+	      begin
+		arg_cnv << TkComm::number(arg_val[idx])
+	      rescue ArgumentError
+		arg_cnv << arg_val[idx]
+	      end
+	    else
+	      arg_cnv << arg_val[idx]
+	    end
+	  else
+	    arg_cnv << arg_val[idx]
+	  end
+	else
+	  arg_cnv << arg_val[idx]
+	end
+      }
+      arg_cnv
+    end
+
+    def initialize(seq,a,b,c,d,f,h,i,k,m,o,p,s,t,w,x,y,
+	           aa,bb,dd,ee,kk,nn,rr,ss,tt,ww,xx,yy)
+      @serial = seq
+      @above = a
+      @num = b
+      @count = c
+      @detail = d
+      @focus = f
+      @height = h
+      @win_hex = i
+      @keycode = k
+      @mode = m
+      @override = o
+      @place = p
+      @state = s
+      @time = t
+      @width = w
+      @x = x
+      @y = y
+      @char = aa
+      @borderwidth = bb
+      @wheel_delta = dd
+      @send_event = ee
+      @keysym = kk
+      @keysym_num = nn
+      @rootwin_id = rr
+      @subwindow = ss
+      @type = tt
+      @widget = ww
+      @x_root = xx
+      @y_root = yy
+    end
+    attr :serial
+    attr :above
+    attr :num
+    attr :count
+    attr :detail
+    attr :focus
+    attr :height
+    attr :win_hex
+    attr :keycode
+    attr :mode
+    attr :override
+    attr :place
+    attr :state
+    attr :time
+    attr :width
+    attr :x
+    attr :y
+    attr :char
+    attr :borderwidth
+    attr :wheel_delta
+    attr :send_event
+    attr :keysym
+    attr :keysym_num
+    attr :rootwin_id
+    attr :subwindow
+    attr :type
+    attr :widget
+    attr :x_root
+    attr :y_root
+  end
+
+  def install_bind(cmd, args=nil)
+    if args
+      id = install_cmd(proc{|*arg|
+	TkUtil.eval_cmd(cmd, *Event.scan_args(args, arg))
+      })
+      id + " " + args
     else
-      win
+      args = ' %# %a %b %c %d %f %h %i %k %m %o %p %s %t %w %x %y' + 
+             ' %A %B %D %E %K %N %R %S %T %W %X %Y'
+      id = install_cmd(proc{|*arg|
+	TkUtil.eval_cmd(cmd, Event.new(*Event.scan_args(args, arg)))
+      })
+      id + args
     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
@@ -908,11 +533,11 @@ module TkComm
     end
     if context.kind_of? Array
       context = context.collect{|ev|
-        if ev.kind_of? TkVirtualEvent
-          ev.path
-        else
-          ev
-        end
+	if ev.kind_of? TkVirtualEvent
+	  ev.path
+	else
+	  ev
+	end
       }.join("><")
     end
     if /,/ =~ context
@@ -922,125 +547,64 @@ module TkComm
     end
   end
 
-  def _bind_core(mode, what, context, cmd, *args)
-    id = install_bind(cmd, *args) if cmd
+  def _bind_core(mode, what, context, cmd, args=nil)
+    id = install_bind(cmd, args) if cmd
     begin
-      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", 
-                              mode + id]))
+      tk_call(*(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)
+  def _bind(what, context, cmd, args=nil)
+    _bind_core('', what, context, cmd, args)
   end
 
-  def _bind_append(what, context, cmd, *args)
-    _bind_core('+', what, context, cmd, *args)
+  def _bind_append(what, context, cmd, args=nil)
+    _bind_core('+', what, context, cmd, args)
   end
 
   def _bind_remove(what, context)
-    tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", '']))
+    tk_call(*(what + ["<#{tk_event_sequence(context)}>", '']))
   end
 
   def _bindinfo(what, context=nil)
     if context
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        enum_obj = tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"]).each_line
-      else
-        enum_obj = tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"])
-      end
-      enum_obj.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
+      tk_call(*what+["<#{tk_event_sequence(context)}>"]).collect {|cmdline|
+	if cmdline =~ /^rb_out (c\d+)\s+(.*)$/
+	  #[Tk_CMDTBL[$1], $2]
+	  [TkCore::INTERP.tk_cmd_tbl[$1], $2]
+	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
+      tk_split_simplelist(tk_call(*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
+  private :install_bind, :tk_event_sequence, 
+          :_bind_core, :_bind, :_bind_append, :_bind_remove, :_bindinfo
 
-  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)
+  def bind(tagOrClass, context, cmd=Proc.new, args=nil)
+    _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)
+  def bind_append(tagOrClass, context, cmd=Proc.new, args=nil)
+    _bind_append(["bind", tagOrClass], context, cmd, args)
     tagOrClass
   end
 
@@ -1053,33 +617,13 @@ module TkComm
     _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)
+  def bind_all(context, cmd=Proc.new, args=nil)
+    _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)
+  def bind_append_all(context, cmd=Proc.new, args=nil)
+    _bind_append(['bind', 'all'], context, cmd, args)
     TkBindTag::ALL
   end
 
@@ -1091,88 +635,53 @@ module TkComm
   def bindinfo_all(context=nil)
     _bindinfo(['bind', 'all'], context)
   end
-end
 
+  def pack(*args)
+    TkPack.configure(*args)
+  end
+
+  def grid(*args)
+    TkGrid.configure(*args)
+  end
+
+  def update(idle=nil)
+    if idle
+      tk_call 'update', 'idletasks'
+    else
+      tk_call 'update'
+    end
+  end
+
+end
 
 module TkCore
   include TkComm
   extend TkComm
 
-  WITH_RUBY_VM  = Object.const_defined?(:VM) && ::VM.class == Class
-  WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
-
-  unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
-    ### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
-    RUN_EVENTLOOP_ON_MAIN_THREAD = false
-  end
-
   unless self.const_defined? :INTERP
     if self.const_defined? :IP_NAME
       name = IP_NAME.to_s
     else
-      #name = nil
-      name = $0
+      name = nil
     end
     if self.const_defined? :IP_OPTS
       if IP_OPTS.kind_of?(Hash)
-        opts = hash_kv(IP_OPTS).join(' ')
+	opts = hash_kv(IP_OPTS).join(' ')
       else
-        opts = IP_OPTS.to_s
+	opts = IP_OPTS.to_s
       end
     else
       opts = ''
     end
 
-    if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
-      INTERP = TclTkIp.new(name, opts)
-    else
-      INTERP_MUTEX = Mutex.new
-      INTERP_ROOT_CHECK = ConditionVariable.new
-      INTERP_THREAD = Thread.new{
-        begin
-          Thread.current[:interp] = interp = TclTkIp.new(name, opts)
-        rescue => e
-          Thread.current[:interp] = e
-          raise e
-        end
-        Thread.current[:status] = nil
-        #sleep
-
-        begin
-          Thread.current[:status] = TclTkLib.mainloop(true)
-        rescue Exception=>e
-          Thread.current[:status] = e
-        ensure
-          INTERP_MUTEX.synchronize{ INTERP_ROOT_CHECK.broadcast }
-        end
-        Thread.current[:status] = TclTkLib.mainloop(false)
-      }
-
-      until INTERP_THREAD[:interp]
-        Thread.pass
-      end
-      # INTERP_THREAD.run
-      raise INTERP_THREAD[:interp] if INTERP_THREAD[:interp].kind_of? Exception
-
-      INTERP = INTERP_THREAD[:interp]
-    end
+    INTERP = TclTkIp.new(name, opts)
 
     def INTERP.__getip
       self
     end
 
     INTERP.instance_eval{
-      # @tk_cmd_tbl = {}.taint
-      @tk_cmd_tbl = Hash.new{|hash, key|
-        fail IndexError, "unknown command ID '#{key}'"
-      }.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_cmd_tbl = {}.taint
       @tk_windows = {}.taint
 
       @tk_table_list = [].taint
@@ -1180,32 +689,18 @@ module TkCore
       @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
+      @cb_entry_class = Class.new{|c|
+	def initialize(ip, cmd)
+	  @ip = ip
+	  @cmd = cmd
+	end
+	attr_reader :ip, :cmd
+	def call(*args)
+	  @ip.cb_eval(@cmd, *args)
+	end
+      }
     }
 
-    def INTERP.cb_entry_class
-      @cb_entry_class
-    end
     def INTERP.tk_cmd_tbl
       @tk_cmd_tbl
     end
@@ -1213,19 +708,6 @@ module TkCore
       @tk_windows
     end
 
-    class Tk_OBJECT_TABLE
-      def initialize(id)
-        @id = id
-        @mutex = Mutex.new
-      end
-      def mutex
-        @mutex
-      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
@@ -1233,21 +715,20 @@ module TkCore
       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)
+      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
     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))
+      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args))
     end
 
     def INTERP.init_ip_env(script = Proc.new)
@@ -1255,22 +736,8 @@ module TkCore
       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, '')
-      }
+      @add_tk_procs << [name, args, body]
+      self._invoke('proc', name, args, body) if args && body
     end
     def INTERP.init_ip_internal
       ip = self
@@ -1279,90 +746,15 @@ module TkCore
     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, '', 
-                      "catch { 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
+    regsub -all {!} $args {\\!} args
+    regsub -all "{" $args "\\{" 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
+	return -code $st $ret
+    } {
+	return $ret
     }
   EOL
-=end
-
-  at_exit{ INTERP.remove_tk_procs(TclTkLib::FINALIZE_PROC_NAME) }
 
   EventFlag = TclTkLib::EventFlag
 
@@ -1374,207 +766,128 @@ module TkCore
     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
+  def TkCore.callback(arg)
+    # arg = tk_split_list(arg)
+    arg = tk_split_simplelist(arg)
+    #_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))
+    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
-    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 >-------"
-        if TkCore::WITH_ENCODING
-          msg.force_encoding('utf-8')
-        else
-          msg.instance_variable_set(:@encoding, 'utf-8')
-        end
-      rescue Exception
-        msg = e.class.inspect + ': ' + e.message + "\n" + 
-              "\n---< backtrace of Ruby side >-----\n" + 
-              e.backtrace.join("\n") + 
-              "\n---< backtrace of Tk side >-------"
+	cb_obj.call(*arg)
+      rescue
+	trace = $!.backtrace
+	raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" + 
+	          "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
       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)
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(cmdid); ret})
-    after_id = tk_call_without_enc("after",ms,cmdid)
-    after_id.instance_variable_set('@cmdid', cmdid)
-    after_id
-  end
-=begin
-  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
+    cmdid = install_cmd(cmd)
+    tk_call("after",ms,cmdid)
 #    return
 #    if false #defined? Thread
 #      Thread.start do
-#       ms = Float(ms)/1000
-#       ms = 10 if ms == 0
-#       sleep ms/1000
-#       cmd.call
+#	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
-=end
 
   def after_idle(cmd=Proc.new)
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(cmdid); ret})
-    after_id = tk_call_without_enc('after','idle',cmdid)
-    after_id.instance_variable_set('@cmdid', cmdid)
-    after_id
+    myid = _curr_cmd_id
+    cmdid = install_cmd(cmd)
+    tk_call('after','idle',cmdid)
   end
-=begin
-  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})
+  def clock_clicks(ms=nil)
+    if ms
+      tk_call('clock','clicks','-milliseconds').to_i
+    else
+      tk_call('clock','clicks').to_i
+    end
+  end
 
-    Thread.critical = crit_bup
+  def clock_format(clk, form=nil)
+    if form
+      tk_call('clock','format',clk,'-format',form).to_i
+    else
+      tk_call('clock','format',clk).to_i
+    end
+  end
 
-    tk_call_without_enc('after','idle',cmdid)
+  def clock_formatGMT(clk, form=nil)
+    if form
+      tk_call('clock','format',clk,'-format',form,'-gmt','1').to_i
+    else
+      tk_call('clock','format',clk,'-gmt','1').to_i
+    end
   end
-=end
 
-  def after_cancel(afterId)
-    tk_call_without_enc('after','cancel',afterId)
-    if (cmdid = afterId.instance_variable_get('@cmdid'))
-      afterId.instance_variable_set('@cmdid', nil)
-      uninstall_cmd(cmdid)
+  def clock_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 clock_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
-    afterId
+  end
+
+  def clock_seconds
+    tk_call('clock','seconds').to_i
   end
 
   def windowingsystem
-    tk_call_without_enc('tk', 'windowingsystem')
+    tk_call('tk', 'windowingsystem')
   end
 
   def scaling(scale=nil)
     if scale
-      tk_call_without_enc('tk', 'scaling', scale)
+      tk_call('tk', 'scaling', scale)
     else
-      Float(number(tk_call_without_enc('tk', 'scaling')))
+      Float(number(tk_call('tk', 'scaling')))
     end
   end
   def scaling_displayof(win, scale=nil)
     if scale
-      tk_call_without_enc('tk', 'scaling', '-displayof', win, scale)
+      tk_call('tk', 'scaling', '-displayof', win, scale)
     else
-      Float(number(tk_call_without_enc('tk', '-displayof', win, 'scaling')))
+      Float(number(tk_call('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
@@ -1583,34 +896,13 @@ module TkCore
   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)
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+    args.push(').to_s"')
+    appsend(interp, async, 'ruby "(', *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
@@ -1619,22 +911,9 @@ module TkCore
   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)
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+    args.push(').to_s"')
+    appsend_displayof(interp, win, async, 'ruby "(', *args)
   end
 
   def info(*args)
@@ -1642,48 +921,7 @@ module TkCore
   end
 
   def mainloop(check_root = true)
-    if !TkCore::WITH_RUBY_VM || TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
-      TclTkLib.mainloop(check_root)
-    else ### Ruby 1.9 !!!!!
-      begin
-        TclTkLib.set_eventloop_window_mode(true)
-        if check_root
-          INTERP_MUTEX.synchronize{
-            INTERP_ROOT_CHECK.wait(INTERP_MUTEX)
-            status = INTERP_THREAD[:status]
-            if status
-              INTERP_THREAD[:status] = nil
-              raise status if status.kind_of?(Exception)
-            end
-          }
-        else
-          INTERP_THREAD.value
-        end
-      ensure
-        TclTkLib.set_eventloop_window_mode(false)
-      end
-    end
-  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. )
-    if !TkCore::WITH_RUBY_VM || TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
-      ### Ruby 1.9 !!!!!!!!!!!
-      TclTkLib.mainloop_thread?
-    else
-      Thread.current == INTERP_THREAD
-    end
-  end
-
-  def mainloop_exist?
-    TclTkLib.mainloop_thread? != nil
-  end
-
-  def is_mainloop?
-    TclTkLib.mainloop_thread? == true
+    TclTkLib.mainloop(check_root)
   end
 
   def mainloop_watchdog(check_root = true)
@@ -1732,238 +970,171 @@ module TkCore
     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))
+  def event_generate(window, context, keys=nil)
+    window = window.path if window.kind_of? TkObject
+    if keys
+      tk_call('event', 'generate', window, 
+	      "<#{tk_event_sequence(context)}>", *hash_kv(keys))
     else
-      tk_call_without_enc('event', 'generate', win, 
-                          "<#{tk_event_sequence(context)}>")
+      tk_call('event', 'generate', window, "<#{tk_event_sequence(context)}>")
     end
-    nil
   end
 
   def messageBox(keys)
-    tk_call('tk_messageBox', *hash_kv(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)))
+    tk_call 'tk_getOpenFile', *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)))
+    tk_call 'tk_getSaveFile', *hash_kv(keys)
   end
 
   def chooseColor(keys = nil)
-    tk_call('tk_chooseColor', *hash_kv(keys))
+    tk_call 'tk_chooseColor', *hash_kv(keys)
   end
 
   def chooseDirectory(keys = nil)
-    tk_call('tk_chooseDirectory', *hash_kv(keys))
+    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
+  def ip_eval(cmd_string)
+    res = INTERP._eval(cmd_string)
     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
+  def ip_invoke(*args)
+    res = INTERP._invoke(*args)
     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
+  def tk_call(*args)
+    puts args.inspect if $DEBUG
+    args.collect! {|x|ruby2tcl(x)}
+    args.compact!
+    args.flatten!
+    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  <<<<<
+      res = INTERP._invoke(*args)   # _invoke returns a TAINTED string
     rescue NameError => err
-      # 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  <<<<<
+        res = INTERP._invoke(*args)   # _invoke returns a TAINTED string
       rescue StandardError => err2
-        fail err2 unless /^invalid command/ =~ err2.message
-        fail err
+	fail err2 unless /^invalid command/ =~ err2
+	fail err
       end
     end
     if  INTERP._return_value() != 0
       fail RuntimeError, res, error_at
     end
-    ### print "==> ", res.inspect, "\n" if $DEBUG
+    print "==> ", res.inspect, "\n" if $DEBUG
     return res
   end
-  private :_tk_call_core
+end
 
-  def tk_call(*args)
-    _tk_call_core(nil, *args)
+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 tk_call_without_enc(*args)
-    _tk_call_core(false, *args)
+  def forget(package)
+    tk_call('package', 'forget', package)
+    nil
   end
 
-  def tk_call_with_enc(*args)
-    _tk_call_core(true, *args)
+  def names
+    tk_split_simplelist(tk_call('package', 'names'))
   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)
+  def provide(package, version=nil)
+    if version
+      tk_call('package', 'provide', package, version)
+      nil
     else
-      tk_split_list(val, depth, false, val_enc)
+      tk_call('package', 'provide', package)
     end
   end
-  #private :_tk_call_to_list_core
 
-  def tk_call_to_list(*args)
-    _tk_call_to_list_core(-1, nil, true, *args)
+  def present(package, version=None)
+    tk_call('package', 'present', package, version)
   end
 
-  def tk_call_to_list_without_enc(*args)
-    _tk_call_to_list_core(-1, false, false, *args)
+  def present_exact(package, version)
+    tk_call('package', 'present', '-exact', package, version)
   end
 
-  def tk_call_to_list_with_enc(*args)
-    _tk_call_to_list_core(-1, true, true, *args)
+  def require(package, version=None)
+    tk_call('package', 'require', package, version)
   end
 
-  def tk_call_to_simplelist(*args)
-    _tk_call_to_list_core(0, nil, true, *args)
+  def require_exact(package, version)
+    tk_call('package', 'require', '-exact', package, version)
   end
 
-  def tk_call_to_simplelist_without_enc(*args)
-    _tk_call_to_list_core(0, false, false, *args)
+  def versions(package)
+    tk_split_simplelist(tk_call('package', 'versions', package))
   end
 
-  def tk_call_to_simplelist_with_enc(*args)
-    _tk_call_to_list_core(0, true, true, *args)
+  def vcompare(version1, version2)
+    Integer(tk_call('package', 'vcompare', version1, version2))
   end
-end
 
+  def vsatisfies(version1, version2)
+    bool(tk_call('package', 'vsatisfies', version1, version2))
+  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
+  TCL_VERSION = INTERP._invoke("info", "tclversion").freeze
+  TCL_PATCHLEVEL = INTERP._invoke("info", "patchlevel").freeze
 
-  TK_VERSION  = INTERP._invoke_without_enc("set", "tk_version").freeze
-  TK_PATCHLEVEL  = INTERP._invoke_without_enc("set", "tk_patchLevel").freeze
+  TK_VERSION  = INTERP._invoke("set", "tk_version").freeze
+  TK_PATCHLEVEL  = INTERP._invoke("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
+  JAPANIZED_TK = (INTERP._invoke("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'))]
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 
+					       'tcl_platform'))]
 
     when :ENV
-      INTERP._invoke_without_enc('global', 'env')
       Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'env'))]
 
     #when :AUTO_PATH   #<=== 
@@ -1973,28 +1144,26 @@ module Tk
     #  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'
+      if INTERP._invoke('info', 'vars', 'tk::Priv') != ""
+	var_nam = 'tk::Priv'
       else
-        var_nam = 'tkPriv'
+	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
+					       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
 
@@ -2003,263 +1172,48 @@ module Tk
     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
-    Tk::Root.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)
+    TkRoot.new
   end
 
   def Tk.bell(nice = false)
     if nice
-      tk_call_without_enc('bell', '-nice')
+      tk_call 'bell', '-nice'
     else
-      tk_call_without_enc('bell')
+      tk_call 'bell'
     end
-    nil
   end
 
   def Tk.bell_on_display(win, nice = false)
     if nice
-      tk_call_without_enc('bell', '-displayof', win, '-nice')
+      tk_call('bell', '-displayof', win, '-nice')
     else
-      tk_call_without_enc('bell', '-displayof', win)
+      tk_call('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
-                                     }))
+    tk_call('destroy', *wins)
   end
 
   def Tk.exit
-    tk_call_without_enc('destroy', '.')
-  end
-
-  ################################################
-
-  def Tk.sleep(ms = nil, id = nil)
-    if id
-      var = (id.kind_of?(TkVariable))? id: TkVarAccess.new(id.to_s)
-    else
-      var = TkVariable.new
-    end
-
-    var.value = tk_call_without_enc('after', ms, proc{ var.value = 0 }) if ms
-    var.thread_wait
-    ms
-  end
-
-  def Tk.wakeup(id)
-    ((id.kind_of?(TkVariable))? id: TkVarAccess.new(id.to_s)).value = 0
-    nil
-  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
+    tk_call('destroy', '.')
   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
+  def Tk.current_grabs
+    tk_split_list(tk_call('grab', 'current'))
   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)
+      window(tk_call('focus'))
     else
-      tk_call_without_enc('focus', win)
+      window(tk_call('focus', '-displayof', display))
     end
   end
 
   def Tk.focus_lastfor(win)
-    window(tk_call_without_enc('focus', '-lastfor', win))
+    window(tk_call('focus', '-lastfor', win))
   end
 
   def Tk.focus_next(win)
@@ -2270,8 +1224,8 @@ module Tk
     TkManageFocus.prev(win)
   end
 
-  def Tk.strictMotif(mode=None)
-    bool(tk_call_without_enc('set', 'tk_strictMotif', mode))
+  def Tk.strictMotif(bool=None)
+    bool(tk_call('set', 'tk_strictMotif', bool))
   end
 
   def Tk.show_kinsoku(mode='both')
@@ -2304,12 +1258,286 @@ module Tk
     end
   end
 
-  def Tk.toUTF8(str, encoding = nil)
-    _toUTF8(str, encoding)
+  def Tk.toUTF8(str,encoding)
+    INTERP._toUTF8(str,encoding)
   end
   
-  def Tk.fromUTF8(str, encoding = nil)
-    _fromUTF8(str, encoding)
+  def Tk.fromUTF8(str,encoding)
+    INTERP._fromUTF8(str,encoding)
+  end
+
+  module Scrollable
+    def xscrollcommand(cmd=Proc.new)
+      configure_cmd 'xscrollcommand', cmd
+    end
+    def yscrollcommand(cmd=Proc.new)
+      configure_cmd 'yscrollcommand', cmd
+    end
+    def xview(*index)
+      v = tk_send('xview', *index)
+      list(v) if index.size == 0
+    end
+    def yview(*index)
+      v = tk_send('yview', *index)
+      list(v) if index.size == 0
+    end
+    def xscrollbar(bar=nil)
+      if bar
+	@xscrollbar = bar
+	@xscrollbar.orient 'horizontal'
+	self.xscrollcommand {|*arg| @xscrollbar.set(*arg)}
+	@xscrollbar.command {|*arg| self.xview(*arg)}
+      end
+      @xscrollbar
+    end
+    def yscrollbar(bar=nil)
+      if bar
+	@yscrollbar = bar
+	@yscrollbar.orient 'vertical'
+	self.yscrollcommand {|*arg| @yscrollbar.set(*arg)}
+	@yscrollbar.command {|*arg| self.yview(*arg)}
+      end
+      @yscrollbar
+    end
+  end
+
+  module Wm
+    include TkComm
+
+    TkCommandNames = ['wm'.freeze].freeze
+
+    def aspect(*args)
+      w = tk_call('wm', 'aspect', path, *args)
+      if args.length == 0
+	list(w) 
+      else
+	self
+      end
+    end
+    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
+    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
+    def colormapwindows(*args)
+      r = tk_call('wm', 'colormapwindows', path, *args)
+      if args.size == 0
+	list(r)
+      else
+	self
+      end
+    end
+    def wm_command(value=nil)
+      if value
+	tk_call('wm', 'command', path, value)
+	self
+      else
+	procedure(tk_call('wm', 'command', path))
+      end
+    end
+    def deiconify(ex = true)
+      tk_call('wm', 'deiconify', path) if ex
+      self
+    end
+    def focusmodel(mode = nil)
+      if mode
+	tk_call 'wm', 'focusmodel', path, mode
+	self
+      else
+	tk_call 'wm', 'focusmodel', path
+      end
+    end
+    def frame
+      tk_call('wm', 'frame', path)
+    end
+    def geometry(geom=nil)
+      if geom
+	tk_call('wm', 'geometry', path, geom)
+	self
+      else
+	tk_call('wm', 'geometry', path)
+      end
+    end
+    def grid(*args)
+      w = tk_call('wm', 'grid', path, *args)
+      if args.size == 0
+	list(w) 
+      else
+	self
+      end
+    end
+    def group(*args)
+      w = tk_call('wm', 'group', path, *args)
+      if args.size == 0
+	window(w) 
+      else
+	self
+      end
+    end
+    def iconbitmap(bmp=nil)
+      if bmp
+	tk_call 'wm', 'iconbitmap', path, bmp
+	self
+      else
+	tk_call 'wm', 'iconbitmap', path
+      end
+    end
+    def iconify(ex = true)
+      tk_call('wm', 'iconify', path) if ex
+      self
+    end
+    def iconmask(bmp=nil)
+      if bmp
+	tk_call 'wm', 'iconmask', path, bmp
+	self
+      else
+	tk_call 'wm', 'iconmask', path
+      end
+    end
+    def iconname(name=nil)
+      if name
+	tk_call 'wm', 'iconname', path, name
+	self
+      else
+	tk_call 'wm', 'iconname', path
+      end
+    end
+    def iconposition(*args)
+      w = tk_call('wm', 'iconposition', path, *args)
+      if args.size == 0
+	list(w) 
+      else
+	self
+      end
+    end
+    def iconwindow(*args)
+      w = tk_call('wm', 'iconwindow', path, *args)
+      if args.size == 0
+	window(w)
+      else
+	self
+      end
+    end
+    def maxsize(*args)
+      w = tk_call('wm', 'maxsize', path, *args)
+      if args.size == 0
+	list(w) 
+      else
+	self
+      end
+    end
+    def minsize(*args)
+      w = tk_call('wm', 'minsize', path, *args)
+      if args.size == 0
+	list(w) 
+      else
+	self
+      end
+    end
+    def overrideredirect(bool=None)
+      if bool == None
+	bool(tk_call('wm', 'overrideredirect', path))
+      else
+	tk_call 'wm', 'overrideredirect', path, bool
+	self
+      end
+    end
+    def positionfrom(who=None)
+      if who == None
+	r = tk_call('wm', 'positionfrom', path)
+	(r == "")? nil: r
+      else
+	tk_call('wm', 'positionfrom', path, who)
+	self
+      end
+    end
+    def protocol(name=nil, cmd=nil)
+      if cmd
+	tk_call('wm', 'protocol', path, name, cmd)
+	self
+      elsif name
+	result = tk_call('wm', 'protocol', path, name)
+	(result == "")? nil : tk_tcl2ruby(result)
+      else
+	tk_split_simplelist(tk_call('wm', 'protocol', path))
+      end
+    end
+    def resizable(*args)
+      w = tk_call('wm', 'resizable', path, *args)
+      if args.length == 0
+	list(w).collect{|e| bool(e)}
+      else
+	self
+      end
+    end
+    def sizefrom(who=None)
+      if who == None
+	r = tk_call('wm', 'sizefrom', path)
+	(r == "")? nil: r
+      else
+	tk_call('wm', 'sizefrom', path, who)
+	self
+      end
+    end
+    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(state=nil)
+      if state
+	tk_call 'wm', 'state', path, state
+	self
+      else
+	tk_call 'wm', 'state', path
+      end
+    end
+    def title(str=nil)
+      if str
+	tk_call('wm', 'title', path, str)
+	self
+      else
+	tk_call('wm', 'title', path)
+      end
+    end
+    def transient(master=nil)
+      if master
+	tk_call('wm', 'transient', path, master)
+	self
+      else
+	window(tk_call('wm', 'transient', path, master))
+      end
+    end
+    def withdraw(ex = true)
+      tk_call('wm', 'withdraw', path) if ex
+      self
+    end
   end
 end
 
@@ -2317,20 +1545,45 @@ 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)
+  class EncodedString < String
+    @@enc_buf = '__rb_encoding_buffer__'
+
+    def self.tk_escape(str)
+      s = '"' + str.gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      TkCore::INTERP.__eval(Kernel.format('global %s; set %s %s', 
+					  @@enc_buf, @@enc_buf, s))
+    end
+
+    def self.new(str, enc = Tk.encoding_system)
+      obj = super(self.tk_escape(str))
+      obj.instance_eval{@enc = enc}
+      obj
+    end
+
+    def self.new_without_escape(str, enc = Tk.encoding_system)
+      obj = super(str)
+      obj.instance_eval{@enc = enc}
+      obj
+    end
+
+    def encoding
+      @enc
+    end
   end
-  def Tk.utf_to_backslash_sequence(str)
-    Tk::EncodedString.utf_to_backslash_sequence(str)
+  def Tk.EncodedString(str, enc = Tk.encoding_system)
+    Tk::EncodedString.new(str, enc)
   end
-  def Tk.utf_to_backslash(str)
-    Tk::EncodedString.utf_to_backslash_sequence(str)
+
+  class UTF8_String < EncodedString
+    def self.new(str)
+      super(str, 'utf-8')
+    end
+    def self.new_without_escape(str)
+      super(str, 'utf-8')
+    end
   end
-  def Tk.to_backslash_sequence(str)
-    Tk::EncodedString.to_backslash_sequence(str)
+  def Tk.UTF8_String(str)
+    Tk::UTF8_String.new(str)
   end
 end
 
@@ -2338,2335 +1591,2180 @@ end
 ###########################################
 #  convert kanji string to/from utf-8
 ###########################################
-if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
+if /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
+  class TclTkIp
+    # from tkencoding.rb by ttate@jaist.ac.jp
+    alias __eval _eval
+    alias __invoke _invoke
+    
+    attr_accessor :encoding
+    
+    def _eval(cmd)
+      if defined? @encoding
+	if cmd.kind_of?(Tk::EncodedString)
+	  _fromUTF8(__eval(_toUTF8(cmd, cmd.encoding)), @encoding)
+	else
+	  _fromUTF8(__eval(_toUTF8(cmd, @encoding)), @encoding)
+	end
+      else
+	__eval(cmd)
+      end
+    end
+
+    def _invoke(*cmds)
+      if defined? @encoding
+	cmds = cmds.collect{|cmd|
+	  if cmd.kind_of?(Tk::EncodedString)
+	    _toUTF8(cmd, cmd.encoding)
+	  else
+	    _toUTF8(cmd, @encoding)
+	  end
+	}
+	_fromUTF8(__invoke(*cmds), @encoding)
+      else
+	__invoke(*cmds)
+	end
+    end
+  end
+
   module Tk
     module Encoding
       extend Encoding
 
       TkCommandNames = ['encoding'.freeze].freeze
 
-      #############################################
-
-      if TkCore::WITH_ENCODING ### Ruby 1.9
-        RubyEncoding = ::Encoding
-
-        # for saving GC cost
-        #ENCNAMES_CMD = ['encoding'.freeze, 'names'.freeze]
-        BINARY_NAME  = 'binary'.freeze
-        UTF8_NAME    = 'utf-8'.freeze
-        DEFAULT_EXTERNAL_NAME = RubyEncoding.default_external.name.freeze
-
-        BINARY  = RubyEncoding.find(BINARY_NAME)
-        UNKNOWN = RubyEncoding.find('ASCII-8BIT')
+      def encoding=(name)
+	TkCore::INTERP.encoding = name
+      end
 
-        ### start of creating ENCODING_TABLE
-        ENCODING_TABLE = TkCore::INTERP.encoding_table
-=begin
-        ENCODING_TABLE = {
-          'binary'       => BINARY, 
-          # 'UNKNOWN-8BIT' => UNKNOWN, 
-        }
+      def encoding
+	TkCore::INTERP.encoding
+      end
 
-        list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0], 
-                                                  ENCNAMES_CMD[1])
-        TkCore::INTERP._split_tklist(list).each{|name|
-          begin
-            enc = RubyEncoding.find(name)
-          rescue ArgumentError
-            case name
-            when 'identity'
-              enc = BINARY
-            when 'shiftjis'
-              enc = RubyEncoding.find('Shift_JIS')
-            when 'unicode'
-              enc = RubyEncoding.find('UTF-8')
-              #if Tk.tk_call('set', 'tcl_platform(byteOrder)') =='littleEndian'
-              #  enc = RubyEncoding.find('UTF-16LE')
-              #else
-              #  enc = RubyEncoding.find('UTF-16BE')
-              #end
-            when 'symbol'
-              # single byte data
-              enc = RubyEncoding.find('ASCII-8BIT') ### ???
-            else
-              # unsupported on Ruby, but supported on Tk
-              enc = TkCore::INTERP.create_dummy_encoding_for_tk(name)
-            end
-          end
-          ENCODING_TABLE[name.freeze] = enc
-        }
-=end
-=begin
-        def ENCODING_TABLE.get_name(enc)
-          orig_enc = enc
-
-          # unles enc, use system default
-          #  1st: Ruby/Tk default encoding
-          #  2nd: Tcl/Tk default encoding
-          #  3rd: Ruby's default_external
-          enc ||= TkCore::INTERP.encoding
-          enc ||= TclTkLib.encoding_system
-          enc ||= DEFAULT_EXTERNAL_NAME
-
-          if enc.kind_of?(RubyEncoding)
-            # Ruby's Encoding object
-            if (name = self.key(enc))
-              return name
-            end
-
-            # Is it new ?
-            list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0], 
-                                                      ENCNAMES_CMD[1])
-            TkComm.simplelist(list).each{|name|
-              if ((enc == RubyEncoding.find(name)) rescue false)
-                # new relation!! update table
-                self[name.freeze] = enc
-                return name
-              end
-            }
-          else
-            # String or Symbol ?
-            if self[name = enc.to_s]
-              return name
-            end
-
-            # Is it new ?
-            if (enc_obj = (RubyEncoding.find(name) rescue false))
-              list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0], 
-                                                        ENCNAMES_CMD[1])
-              if TkComm.simplelist(list).index(name)
-                # Tk's encoding name ?
-                self[name.freeze] = enc_obj  # new relation!! update table
-                return name
-              else
-                # Ruby's encoding name ?
-                if (name = self.key(enc_obj))
-                  return name
-                end
-              end
-            end
-          end
-
-          fail ArgumentError, "unsupported Tk encoding '#{orig_enc}'"
-        end
+      def encoding_names
+	tk_split_simplelist(tk_call('encoding', 'names'))
+      end
 
-        def ENCODING_TABLE.get_obj(enc)
-          # returns the encoding object.
-          # If 'enc' is the encoding name on Tk only, it returns nil.
-          ((obj = self[self.get_name(enc)]).kind_of?(RubyEncoding))? obj: nil
-        end
-=end
-        ### end of creating ENCODING_TABLE
+      def encoding_system
+	tk_call('encoding', 'system')
+      end
 
+      def encoding_system=(enc)
+	tk_call('encoding', 'system', enc)
       end
 
-      #############################################
+      def encoding_convertfrom(str, enc=None)
+	TkCore::INTERP.__invoke('encoding', 'convertfrom', enc, str)
+      end
+      alias encoding_convert_from encoding_convertfrom
 
-      if TkCore::WITH_ENCODING
-        ################################
-        ### Ruby 1.9
-        ################################
-        def force_default_encoding(mode)
-          TkCore::INTERP.force_default_encoding = mode
-        end
+      def encoding_convertto(str, enc=None)
+	TkCore::INTERP.__invoke('encoding', 'convertto', enc, str)
+      end
+      alias encoding_convert_to encoding_convertto
+    end
 
-        def force_default_encoding?
-          TkCore::INTERP.force_default_encoding?
-        end
+    extend Encoding
+  end
 
-        def default_encoding=(enc)
-          TkCore::INTERP.default_encoding = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-        end
+  # estimate encoding
+  case $KCODE
+  when /^e/i  # EUC
+    Tk.encoding = 'euc-jp'
+  when /^s/i  # SJIS
+    Tk.encoding = 'shiftjis'
+  when /^u/i  # UTF8
+    Tk.encoding = 'utf-8'
+  else        # NONE
+    begin
+      Tk.encoding = Tk.encoding_system
+    rescue StandardError, NameError
+      Tk.encoding = 'utf-8'
+    end
+  end
 
-        def encoding=(enc)
-          TkCore::INTERP.encoding = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-        end
+else
+  # dummy methods
+  class TclTkIp
+    alias __eval _eval
+    alias __invoke _invoke
+  end
 
-        def encoding_name
-          Tk::Encoding::ENCODING_TABLE.get_name(TkCore::INTERP.encoding)
-        end
-        def encoding_obj
-          Tk::Encoding::ENCODING_TABLE.get_obj(TkCore::INTERP.encoding)
-        end
-        alias encoding encoding_name
-        alias default_encoding encoding_name
-
-        def tk_encoding_names
-          TkComm.simplelist(TkCore::INTERP._invoke_without_enc(Tk::Encoding::ENCNAMES_CMD[0], Tk::Encoding::ENCNAMES_CMD[1]))
-       end
-        def encoding_names
-          self.tk_encoding_names.find_all{|name|
-            Tk::Encoding::ENCODING_TABLE.get_name(name) rescue false
-          }
-        end
-        def encoding_objs
-          self.tk_encoding_names.map!{|name|
-            Tk::Encoding::ENCODING_TABLE.get_obj(name) rescue nil
-          }.compact
-        end
+  module Tk
+    module Encoding
+      extend Encoding
 
-        def encoding_system=(enc)
-          TclTkLib.encoding_system = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-        end
+      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_system_name
-          Tk::Encoding::ENCODING_TABLE.get_name(TclTkLib.encoding_system)
-        end
-        def encoding_system_obj
-          Tk::Encoding::ENCODING_TABLE.get_obj(TclTkLib.encoding_system)
-        end
-        alias encoding_system encoding_system_name
+      def encoding_convertfrom(str, enc=None)
+	str
+      end
+      alias encoding_convert_from encoding_convertfrom
 
-        ################################
-      else
-        ################################
-        ### Ruby 1.8-
-        ################################
-        def force_default_encoding=(mode)
-          true
-        end
+      def encoding_convertto(str, enc=None)
+	str
+      end
+      alias encoding_convert_to encoding_convertto
+    end
 
-        def force_default_encoding?
-          true
-        end
+    extend Encoding
+  end
+end
 
-        def default_encoding=(enc)
-          TkCore::INTERP.default_encoding = enc
-        end
+module TkBindCore
+  def bind(context, cmd=Proc.new, args=nil)
+    Tk.bind(self, context, cmd, args)
+  end
 
-        def encoding=(enc)
-          TkCore::INTERP.encoding = enc
-        end
+  def bind_append(context, cmd=Proc.new, args=nil)
+    Tk.bind_append(self, context, cmd, args)
+  end
 
-        def encoding_obj
-          TkCore::INTERP.encoding
-        end
-        def encoding_name
-          TkCore::INTERP.encoding
-        end
-        alias encoding encoding_name
-        alias default_encoding encoding_name
+  def bind_remove(context)
+    Tk.bind_remove(self, context)
+  end
 
-        def tk_encoding_names
-          TkComm.simplelist(Tk.tk_call('encoding', 'names'))
-        end
-        def encoding_objs
-          self.tk_encoding_names
-        end
-        def encoding_names
-          self.tk_encoding_names
-        end
+  def bindinfo(context=nil)
+    Tk.bindinfo(self, context)
+  end
+end
 
-        def encoding_system=(enc)
-          TclTkLib.encoding_system = enc
-        end
+class TkBindTag
+  include TkBindCore
 
-        def encoding_system_name
-          TclTkLib.encoding_system
-        end
-        def encoding_system_obj
-          TclTkLib.encoding_system
-        end
-        alias encoding_system encoding_system_name
+  #BTagID_TBL = {}
+  BTagID_TBL = TkCore::INTERP.create_table
+  Tk_BINDTAG_ID = ["btag".freeze, "00000".taint].freeze
 
-        ################################
-      end
+  TkCore::INTERP.init_ip_env{ BTagID_TBL.clear }
 
-      def encoding_convertfrom(str, enc=nil)
-        enc = encoding_system_name unless enc
-        str = str.dup
-        if TkCore::WITH_ENCODING
-          if str.kind_of?(Tk::EncodedString)
-            str.__instance_variable_set('@encoding', nil)
-          else
-            str.instance_variable_set('@encoding', nil)
-          end
-          str.force_encoding('binary')
-        else
-          str.instance_variable_set('@encoding', 'binary')
-        end
-        ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertfrom', 
-                                                 enc, str)
-        if TkCore::WITH_ENCODING
-          ret.force_encoding('utf-8')
-        else
-          Tk::UTF8_String.new(ret)
-        end
-        ret
-      end
-      alias encoding_convert_from encoding_convertfrom
+  def TkBindTag.id2obj(id)
+    BTagID_TBL[id]? BTagID_TBL[id]: id
+  end
 
-      def encoding_convertto(str, enc=nil)
-        # str must be a UTF-8 string
-        enc = encoding_system_name unless enc
-        ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertto', 
-                                                 enc, str)
-        #ret.instance_variable_set('@encoding', 'binary')
-        if TkCore::WITH_ENCODING
-          #ret.force_encoding(Tk::Encoding::ENCODING_TABLE.get_obj('binary'))
-          ret.force_encoding(Tk::Encoding::ENCODING_TABLE.get_obj(enc))
-        end
-        ret
-      end
-      alias encoding_convert_to encoding_convertto
+  def TkBindTag.new_by_name(name, *args, &b)
+    return BTagID_TBL[name] if BTagID_TBL[name]
+    self.new(*args, &b).instance_eval{
+      BTagID_TBL.delete @id
+      @id = name
+      BTagID_TBL[@id] = self
+    }
+  end
 
-      def encoding_dirs
-        # Tcl8.5 feature
-        TkComm.simplelist(Tk.tk_call_without_enc('encoding', 'dirs'))
-      end
+  def initialize(*args, &b)
+    @id = Tk_BINDTAG_ID.join
+    Tk_BINDTAG_ID[1].succ!
+    BTagID_TBL[@id] = self
+    bind(*args, &b) if args != []
+  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
+  ALL = self.new_by_name('all')
 
-    extend Encoding
+  def name
+    @id
   end
 
-  class TclTkIp
-    def force_default_encoding=(mode)
-      @force_default_encoding = (mode)? true: false
-    end
+  def to_eval
+    @id
+  end
 
-    def force_default_encoding?
-      @force_default_encoding ||= false
-    end
+  def inspect
+    Kernel.format "#<TkBindTag: %s>", @id
+  end
+end
 
-    def default_encoding=(name)
-      name = name.name if name.kind_of?(::Encoding) if Tk::WITH_ENCODING
-      @encoding = name
-    end
+class TkBindTagAll<TkBindTag
+  def TkBindTagAll.new(*args, &b)
+    $stderr.puts "Warning: TkBindTagALL is obsolete. Use TkBindTag::ALL\n"
 
-    # from tkencoding.rb by ttate@jaist.ac.jp
-    #attr_accessor :encoding
-    def encoding=(name)
-      self.force_default_encoding = true  # for comaptibility
-      self.default_encoding = name
-    end
+    TkBindTag::ALL.bind(*args, &b) if args != []
+    TkBindTag::ALL
+  end
+end
 
-    def encoding_name
-      (@encoding)? @encoding.dup: nil
-    end
-    alias encoding encoding_name
-    alias default_encoding encoding_name
+class TkDatabaseClass<TkBindTag
+  def self.new(name, *args, &b)
+    return BTagID_TBL[name] if BTagID_TBL[name]
+    super(name, *args, &b)
+  end
 
-    def encoding_obj
-      if Tk::WITH_ENCODING
-        Tk::Encoding.tcl2rb_encoding(@encoding)
-      else
-        (@encoding)? @encoding.dup: nil
-      end
-    end
-
-    alias __toUTF8 _toUTF8
-    alias __fromUTF8 _fromUTF8
-
-    if Object.const_defined?(:Encoding) && ::Encoding.class == Class
-      # with Encoding (Ruby 1.9+)
-      #
-      # use functions on Tcl as default.
-      # but when unsupported encoding on Tcl, use methods on Ruby.
-      #
-      def _toUTF8(str, enc = nil)
-        if enc
-          # use given encoding
-          begin
-            enc_name = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-          rescue
-            # unknown encoding for Tk -> try to convert encoding on Ruby
-            str = str.dup.force_encoding(enc)
-            str.encode!(Tk::Encoding::UTF8_NAME) # modify self !!
-            return str  # if no error, probably succeed converting
-          end
-        end
+  def initialize(name, *args, &b)
+    @id = name
+    BTagID_TBL[@id] = self
+    bind(*args, &b) if args != []
+  end
 
-        enc_name ||= str.instance_variable_get(:@encoding)
+  def inspect
+    Kernel.format "#<TkDatabaseClass: %s>", @id
+  end
+end
 
-        enc_name ||= 
-          Tk::Encoding::ENCODING_TABLE.get_name(str.encoding) rescue nil
+class TkVariable
+  include Tk
+  extend TkCore
 
-        unless enc_name
-          # str.encoding isn't supported by Tk -> try to convert on Ruby
-          begin
-            return str.encode(Tk::Encoding::UTF8_NAME) # new string
-          rescue
-            # error -> ignore, try to use default encoding of Ruby/Tk
-          end
-        end
+  include Comparable
 
-        #enc_name ||= 
-        #  Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding) rescue nil
-        enc_name ||= Tk::Encoding::ENCODING_TABLE.get_name(nil)
+  #TkCommandNames = ['tkwait'.freeze].freeze
+  TkCommandNames = ['vwait'.freeze].freeze
 
-        # is 'binary' encoding?
-        if enc_name == Tk::Encoding::BINARY_NAME
-          return str.dup.force_encoding(Tk::Encoding::BINARY_NAME)
-        end
+  #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
 
-        # force default encoding?
-        if ! str.kind_of?(Tk::EncodedString) && self.force_default_encoding?
-          enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.default_encoding)
-        end
+  TkCore::INTERP.add_tk_procs('rb_var', 'args', 
+	"ruby [format \"TkVariable.callback %%Q!%s!\" $args]")
 
-        encstr = __toUTF8(str, enc_name)
-        encstr.force_encoding(Tk::Encoding::UTF8_NAME)
-        encstr
-      end
-      def _fromUTF8(str, enc = nil)
-        # str must be UTF-8 or binary.
-        enc_name = str.instance_variable_get(:@encoding)
-        enc_name ||= 
-          Tk::Encoding::ENCODING_TABLE.get_name(str.encoding) rescue nil
+  def TkVariable.callback(args)
+    name1,name2,op = tk_split_list(args)
+    if TkVar_CB_TBL[name1]
+      _get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
+    else
+      ''
+    end
+  end
 
-        # is 'binary' encoding?
-        if enc_name == Tk::Encoding::BINARY_NAME
-          return str.dup.force_encoding(Tk::Encoding::BINARY_NAME)
-        end
+  def initialize(val="")
+    @id = Tk_VARIABLE_ID.join
+    Tk_VARIABLE_ID[1].succ!
+    TkVar_ID_TBL[@id] = self
 
-        # get target encoding name (if enc == nil, use default encoding)
-        begin
-          enc_name = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-        rescue
-          # then, enc != nil
-          # unknown encoding for Tk -> try to convert encoding on Ruby
-          str = str.dup.force_encoding(Tk::Encoding::UTF8_NAME)
-          str.encode!(enc) # modify self !!
-          return str  # if no error, probably succeed converting
-        end
+    @trace_var  = nil
+    @trace_elem = nil
+    @trace_opts = nil
 
-        encstr = __fromUTF8(str, enc_name)
-        encstr.force_encoding(Tk::Encoding::ENCODING_TABLE.get_obj(enc_name))
-        encstr
-      end
-      ###
+=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(/[\[\]$"]/, '\\\\\&') + '"'
+      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(/[\[\]$"]/, '\\\\\&') + '"'
+      INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
     else
-      # without Encoding (Ruby 1.8)
-      def _toUTF8(str, encoding = nil)
-        __toUTF8(str, encoding)
-      end
-      def _fromUTF8(str, encoding = nil)
-        __fromUTF8(str, encoding)
-      end
-      ###
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      INTERP._eval(format('global %s; set %s %s', @id, @id, s))
     end
-
-    alias __eval _eval
-    alias __invoke _invoke
-
-    def _eval(cmd)
-      _fromUTF8(__eval(_toUTF8(cmd)))
+=end
+    if  val.kind_of?(Hash)
+      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(/[\[\]$"]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
     end
+  end
 
-    def _invoke(*cmds)
-      _fromUTF8(__invoke(*(cmds.collect{|cmd| _toUTF8(cmd)})))
+  def wait(on_thread = false, check_root = false)
+    if $SAFE >= 4
+      fail SecurityError, "can't wait variable at $SAFE >= 4"
     end
-
-    alias _eval_with_enc _eval
-    alias _invoke_with_enc _invoke
-
-=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
+    if on_thread
+      if check_root
+	INTERP._thread_tkwait('variable', @id)
       else
-        encoding = __invoke('encoding', 'system')
+	INTERP._thread_vwait(@id)
       end
-
-      # convert
-      case encoding
-      when 'utf-8', 'binary'
-        str
+    else 
+      if check_root
+	INTERP._invoke('tkwait', 'variable', @id)
       else
-        __toUTF8(str, encoding)
+	INTERP._invoke('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 _fromUTF8(str, encoding = nil)
-      unless encoding
-        if defined?(@encoding) && @encoding != nil
-          encoding = @encoding.to_s
-        else
-          encoding = __invoke('encoding', 'system')
-        end
-      end
+  def id
+    @id
+  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
+  def value
+    begin
+      INTERP._eval(Kernel.format('global %s; set %s', @id, @id))
+    rescue
+      if INTERP._eval(Kernel.format('global %s; array exists %s', 
+				    @id, @id)) != "1"
+	fail
       else
-        __fromUTF8(str, encoding)
+	Hash[*tk_split_simplelist(INTERP._eval(Kernel.format('global %s; array get %s', @id, @id)))]
       end
     end
-=end
+  end
 
-=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
+  def value=(val)
+    begin
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
+    rescue
+      if INTERP._eval(Kernel.format('global %s; array exists %s', 
+				    @id, @id)) != "1"
+	fail
       else
-        __eval(cmd)
+	if val == []
+	  INTERP._eval(Kernel.format('global %s; unset %s; set %s(0) 0; unset %s(0)', @id, @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(/[\[\]$"]/, '\\\\\&') + '"'
+	  INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s', 
+				     @id, @id, @id, s))
+	elsif  val.kind_of?(Hash)
+	  s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+	                        .gsub(/[\[\]$"]/, '\\\\\&') + '"'
+	  INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s', 
+				     @id, @id, @id, s))
+	else
+	  fail
+	end
       end
     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
+  def [](index)
+    INTERP._eval(Kernel.format('global %s; set %s(%s)', 
+			       @id, @id, _get_eval_string(index)))
+  end
+
+  def []=(index,val)
+    INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id, 
+			       _get_eval_string(index), _get_eval_string(val)))
+  end
+
+  def numeric
+    number(value)
+  end
+  def numeric=(val)
+    case val
+    when Numeric
+      self.value=(val)
+    when TkVariable
+      self.value=(val.numeric)
+    else
+      raise ArgumentError, "Numeric is expected"
     end
-=end
   end
 
-  module TclTkLib
-    class << self
-      def force_default_encoding=(mode)
-        TkCore::INTERP.force_default_encoding = mode
-      end
+  def to_i
+    number(value).to_i
+  end
 
-      def force_default_encoding?
-        TkCore::INTERP.force_default_encoding?
-      end
+  def to_f
+    number(value).to_f
+  end
 
-      def default_encoding=(name)
-        TkCore::INTERP.default_encoding = name
-      end
+  def to_s
+    string(value).to_s
+  end
 
-      alias _encoding encoding
-      alias _encoding= encoding=
-      def encoding=(name)
-        name = name.name if name.kind_of?(::Encoding) if Tk::WITH_ENCODING
-        TkCore::INTERP.encoding = name
-      end
+  def to_sym
+    value.intern
+  end
 
-      def encoding_name
-        TkCore::INTERP.encoding
-      end
-      alias encoding encoding_name
-      alias default_encoding encoding_name
+  def list
+    tk_split_list(value)
+  end
+  alias to_a list
 
-      def encoding_obj
-        if Tk::WITH_ENCODING
-          Tk::Encoding.tcl2rb_encoding(TkCore::INTERP.encoding)
-        else
-          TkCore::INTERP.encoding
-        end
-      end
+  def list=(val)
+    case val
+    when Array
+      self.value=(val)
+    when TkVariable
+      self.value=(val.list)
+    else
+      raise ArgumentError, "Array is expected"
     end
   end
 
-  # estimate encoding
-  unless TkCore::WITH_ENCODING 
-    case $KCODE
-    when /^e/i  # EUC
-      Tk.encoding = 'euc-jp'
-      Tk.encoding_system = 'euc-jp'
-    when /^s/i  # SJIS
+  def inspect
+    Kernel.format "#<TkVariable: %s>", @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
-        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'
+	number(self.value) + other
+      rescue
+	self.value + other.to_s
       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
+  end
+  def -(other)
+    if other.kind_of?(Array)
+      self.to_a - other
+    else
+      number(self.value) - other
+    end
+  end
+  def *(other)
+    begin
+      number(self.value) * other
+    rescue
+      self.value * other
+    end
+  end
+  def /(other)
+    number(self.value) / other
+  end
+  def %(other)
+    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)
+    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
+      self.value == other
+    else
+      false
+    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
+    end
+    if other.kind_of?(Numeric)
       begin
-        Tk.encoding = Tk.encoding_system
-      rescue StandardError, NameError
-        Tk.encoding = 'utf-8'
-        Tk.encoding_system = 'utf-8'
+	return self.numeric <=> other
+      rescue
+	return self.value <=> other.to_s
       end
+    else
+      return self.value <=> other
     end
+  end
 
-  else ### Ruby 1.9 !!!!!!!!!!!!
-    loc_enc_obj = ::Encoding.find(::Encoding.locale_charmap)
-    ext_enc_obj = ::Encoding.default_external
-    tksys_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding_system)
-    # p [Tk.encoding, Tk.encoding_system, loc_enc_obj, ext_enc_obj]
+  def to_eval
+    @id
+  end
 
-=begin
-    if ext_enc_obj == Tk::Encoding::UNKNOWN
-      if defind? DEFAULT_TK_ENCODING
-        if DEFAULT_TK_ENCODING.kind_of?(::Encoding)
-          tk_enc_name    = DEFAULT_TK_ENCODING.name
-          tksys_enc_name = DEFAULT_TK_ENCODING.name
-        else
-          tk_enc_name    = DEFAULT_TK_ENCODING
-          tksys_enc_name = DEFAULT_TK_ENCODING
-        end
-      else
-        tk_enc_name    = loc_enc_obj.name
-        tksys_enc_name = loc_enc_obj.name
-      end
+  def unset(elem=nil)
+    if elem
+      INTERP._eval(Kernel.format('global %s; unset %s(%s)', 
+				 @id, @id, tk_tcl2ruby(elem)))
     else
-      tk_enc_name    = ext_enc_obj.name
-      tksys_enc_name = ext_enc_obj.name
+      INTERP._eval(Kernel.format('global %s; unset %s', @id, @id))
     end
+  end
+  alias remove unset
 
-    # Tk.encoding = tk_enc_name
-    Tk.default_encoding = tk_enc_name
-    Tk.encoding_system = tksys_enc_name
-=end
-
-    if ext_enc_obj == Tk::Encoding::UNKNOWN
-      if loc_enc_obj == Tk::Encoding::UNKNOWN
-        # use Tk.encoding_system
-      else
-        # use locale_charmap
-        begin
-          loc_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(loc_enc_obj)
-          if loc_enc_name && loc_enc_name != tksys_enc_name
-            # use locale_charmap
-            Tk.encoding_system = loc_enc_name
-          else
-            # use Tk.encoding_system
-          end
-        rescue ArgumentError
-          # unsupported encoding on Tk -> use Tk.encoding_system
-        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
+      if @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)
+    @trace_var = [] if @trace_var == nil
+    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
+      Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
     else
-      begin
-        ext_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(ext_enc_obj)
-        if ext_enc_name && ext_enc_name != tksys_enc_name
-          # use default_external
-          Tk.encoding_system = ext_enc_name
-        else
-          # use Tk.encoding_system
-        end
-      rescue ArgumentError
-        # unsupported encoding on Tk -> use Tk.encoding_system
+      newopts = @trace_opts.dup
+      opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      if newopts != @trace_opts
+	Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
+	@trace_opts.replace(newopts)
+	Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
       end
     end
+  end
 
-    # setup Tk.encoding
-    enc_name = nil
-
-    begin
-      default_def = DEFAULT_TK_ENCODING
-      if ::Encoding.find(default_def.to_s) != Tk::Encoding::UNKNOWN
-        enc_name = Tk::Encoding::ENCODING_TABLE.get_name(default_def)
-      end
-    rescue NameError
-      # ignore
-      enc_name = nil
-    rescue ArgumentError
-      enc_name = nil
-      fail ArgumentError, 
-           "DEFAULT_TK_ENCODING has an unknown encoding #{default_def}"
-    end
-
-    unless enc_name
-      if ext_enc_obj == Tk::Encoding::UNKNOWN
-        if loc_enc_obj == Tk::Encoding::UNKNOWN
-          # use Tk.encoding_system
-          enc_name = tksys_enc_name
-        else
-          # use locale_charmap
-          begin
-            loc_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(loc_enc_obj)
-            if loc_enc_name && loc_enc_name != tksys_enc_name
-              # use locale_charmap
-              enc_name = loc_enc_name
-            else
-              # use Tk.encoding_system
-              enc_name = tksys_enc_name
-            end
-          rescue ArgumentError
-            # unsupported encoding on Tk -> use Tk.encoding_system
-            enc_name = tksys_enc_name
-          end
-        end
-      else
-        begin
-          ext_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(ext_enc_obj)
-          if ext_enc_name && ext_enc_name != tksys_enc_name
-            # use default_external
-            enc_name = ext_enc_name
-          else
-            # use Tk.encoding_system
-            enc_name = tksys_enc_name
-          end
-        rescue ArgumentError
-          # unsupported encoding on Tk -> use Tk.encoding_system
-          enc_name = tksys_enc_name
-        end
+  def trace_element(elem, opts, cmd)
+    @trace_elem = {} if @trace_elem == nil
+    @trace_elem[elem] = [] if @trace_elem[elem] == nil
+    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
+      Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
+    else
+      newopts = @trace_opts.dup
+      opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      if newopts != @trace_opts
+	Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
+	@trace_opts.replace(newopts)
+	Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
       end
     end
-
-    Tk.default_encoding = (enc_name)? enc_name: tksys_enc_name
   end
 
-else
-  # dummy methods
-  module Tk
-    module Encoding
-      extend Encoding
+  def trace_vinfo
+    return [] unless @trace_var
+    @trace_var.dup
+  end
+  def trace_vinfo_for_element(elem)
+    return [] unless @trace_elem
+    return [] unless @trace_elem[elem]
+    @trace_elem[elem].dup
+  end
 
-      def force_default_encoding=(mode)
-        nil
+  def trace_vdelete(opts,cmd)
+    return unless @trace_var.kind_of? Array
+    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)}
+    }
+    if idx >= 0
+      @trace_var.delete_at(idx) 
+    else
+      return
+    end
 
-      def force_default_encoding?
-        nil
-      end
+    @trace_elem.each{|elem|
+      @trace_elem[elem].each{|e|
+	e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      }
+    }
 
-      def default_encoding=(enc)
-        nil
-      end
-      def default_encoding
-        nil
+    newopts = ['r','w','u'].find_all{|c| newopts.index(c)}.join('')
+    if newopts != @trace_opts
+      Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
+      @trace_opts.replace(newopts)
+      if @trace_opts != ''
+	Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
       end
+    end
+  end
 
-      def encoding=(name)
-        nil
-      end
-      def encoding
-        nil
-      end
-      def encoding_names
-        nil
-      end
-      def encoding_system
-        nil
-      end
-      def encoding_system=(enc)
-        nil
+  def trace_vdelete_for_element(elem,opts,cmd)
+    return unless @trace_elem.kind_of? Hash
+    return unless @trace_elem[elem].kind_of? Array
+    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
+    end
 
-      def encoding_convertfrom(str, enc=None)
-        str
-      end
-      alias encoding_convert_from encoding_convertfrom
+    newopts = ''
+    @trace_var.each{|e| 
+      e[0].each_byte{|c| newopts += 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)}
+      }
+    }
 
-      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
+    newopts = ['r','w','u'].find_all{|c| newopts.index(c)}.join('')
+    if newopts != @trace_opts
+      Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
+      @trace_opts.replace(newopts)
+      if @trace_opts != ''
+	Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
       end
     end
-
-    extend Encoding
   end
+end
 
-  class TclTkIp
-    attr_accessor :encoding
+class TkVarAccess<TkVariable
+  def self.new(name, *args)
+    return TkVar_ID_TBL[name] if TkVar_ID_TBL[name]
+    super(name, *args)
+  end
 
-    alias __eval _eval
-    alias __invoke _invoke
+  def initialize(varname, val=nil)
+    @id = varname
+    TkVar_ID_TBL[@id] = self
+    if val
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"' #"
+      INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
+    end
+  end
+end
 
-    alias _eval_with_enc _eval
-    alias _invoke_with_enc _invoke
+module Tk
+  begin
+    auto_path = INTERP._invoke('set', 'auto_path')
+  rescue
+    begin
+      auto_path = INTERP._invoke('set', 'env(TCLLIBPATH)')
+    rescue
+      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
 
+module TkSelection
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['selection'.freeze].freeze
 
-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
+  def self.clear(sel=nil)
+    if sel
+      tk_call 'selection', 'clear', '-selection', sel
     else
-      cmd = Proc.new
+      tk_call 'selection', 'clear'
     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
+  def self.clear_on_display(win, sel=nil)
+    if sel
+      tk_call 'selection', 'clear', '-displayof', win, '-selection', sel
     else
-      cmd = Proc.new
+      tk_call 'selection', 'clear', '-displayof', win
     end
-    Tk.bind_append(self, context, cmd, *args)
+  end
+  def clear(sel=nil)
+    TkSelection.clear_on_display(self, sel)
+    self
   end
 
-  def bind_remove(context)
-    Tk.bind_remove(self, context)
+  def self.get(keys=nil)
+    tk_call 'selection', 'get', *hash_kv(keys)
+  end
+  def self.get_on_display(win, keys=nil)
+    tk_call 'selection', 'get', '-displayof', win, *hash_kv(keys)
+  end
+  def get(keys=nil)
+    TkSelection.get_on_display(self, sel)
   end
 
-  def bindinfo(context=nil)
-    Tk.bindinfo(self, context)
+  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 += hash_kv(keys)
+    args += [win, func]
+    tk_call(*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('selection', 'own', '-selection', sel))
+    else
+      window(tk_call('selection', 'own'))
+    end
+  end
+  def self.get_owner_on_display(win, sel=nil)
+    if sel
+      window(tk_call('selection', 'own', '-displayof', win, '-selection', sel))
+    else
+      window(tk_call('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('selection', 'own', *(hash_kv(keys) << win))
+  end
+  def set_owner(keys=nil)
+    TkSelection.set_owner(self, keys)
+    self
   end
 end
 
+module TkKinput
+  include Tk
+  extend Tk
 
-module TkTreatFont
-  def __font_optkeys
-    ['font']
+  TkCommandNames = [
+    'kinput_start'.freeze, 
+    'kinput_send_spot'.freeze, 
+    'kanjiInput'.freeze
+  ].freeze
+
+  def TkKinput.start(window, style=None)
+    tk_call 'kinput_start', window.path, style
+  end
+  def kinput_start(style=None)
+    TkKinput.start(self, style)
   end
-  private :__font_optkeys
 
-  def __pathname
-    self.path
+  def TkKinput.send_spot(window)
+    tk_call 'kinput_send_spot', window.path
+  end
+  def kinput_send_spot
+    TkKinput.send_spot(self)
   end
-  private :__pathname
 
-  ################################
+  def TkKinput.input_start(window, keys=nil)
+    tk_call 'kanjiInput', 'start', window.path, *hash_kv(keys)
+  end
+  def kanji_input_start(keys=nil)
+    TkKinput.input_start(self, keys)
+  end
 
-  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}'"
+  def TkKinput.attribute_config(window, slot, value=None)
+    if slot.kind_of? Hash
+      tk_call 'kanjiInput', 'attribute', window.path, *hash_kv(slot)
+    else
+      tk_call 'kanjiInput', 'attribute', window.path, "-#{slot}", value
     end
+  end
+  def kinput_attribute_config(slot, value=None)
+    TkKinput.attribute_config(self, slot, value)
+  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)
+  def TkKinput.attribute_info(window, slot=nil)
+    if slot
+      conf = tk_split_list(tk_call('kanjiInput', 'attribute', 
+				   window.path, "-#{slot}"))
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_list(tk_call('kanjiInput', 'attribute', 
+			    window.path)).collect{|conf|
+	conf[0] = conf[0][1..-1]
+	conf
       }
-      fonts
     end
   end
-  alias fontobj font_configinfo
-
-  def font_configure(slot)
-    pathname = __pathname
+  def kinput_attribute_info(slot=nil)
+    TkKinput.attribute_info(self, slot)
+  end
 
-    slot = _symbolkey2str(slot)
+  def TkKinput.input_end(window)
+    tk_call 'kanjiInput', 'end', window.path
+  end
+  def kanji_input_end
+    TkKinput.input_end(self)
+  end
+end
 
-    __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)
-              unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-                tk_call(*(__config_cmd << "-#{optkey}" << fnt))
-              else
-                begin
-                  tk_call(*(__config_cmd << "-#{optkey}" << fnt))
-                rescue
-                  # ignore
-                end
-              end
-            end
-          end
-          next
-        end
-      end
+module TkXIM
+  include Tk
+  extend Tk
 
-      lfnt = slot.delete(l_optkey)
-      lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
-      kfnt = slot.delete(k_optkey)
+  TkCommandNames = ['imconfigure'.freeze].freeze
 
-      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])
+  def TkXIM.useinputmethods(window=nil, value=nil)
+    if window
+      if value
+        tk_call 'tk', 'useinputmethods', '-displayof', window.path, value
+      else
+        tk_call 'tk', 'useinputmethods', '-displayof', window.path
       end
-    }
-
-    # configure other (without font) options
-    tk_call(*(__config_cmd.concat(hash_kv(slot)))) if slot != {}
-    self
+    else
+      if value
+        tk_call 'tk', 'useinputmethods', value
+      else
+        tk_call 'tk', 'useinputmethods'
+      end
+    end
   end
 
-  def latinfont_configure(ltn, keys=nil)
-    if ltn.kind_of?(Array)
-      key = ltn[1]
-      ltn = ltn[0]
+  def TkXIM.caret(window, keys=nil)
+    if keys
+      tk_call('tk', 'caret', window, *hash_kv(keys))
+      self
     else
-      key = nil
+      lst = tk_split_list(tk_call('tk', 'caret', window))
+      info = {}
+      while key = lst.shift
+	info[key[1..-1]] = lst.shift
+      end
+      info
     end
+  end
 
-    optkeys = __font_optkeys
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
+  def TkXIM.configure(window, slot, value=None)
+    begin
+      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+        if slot.kind_of? Hash
+          tk_call 'imconfigure', window.path, *hash_kv(slot)
+        else
+          tk_call 'imconfigure', window.path, "-#{slot}", value
+        end
+      end
+    rescue
     end
+  end
 
-    win, tag = __pathname.split(':')
+  def TkXIM.configinfo(window, slot=nil)
+    begin
+      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+        if slot
+          conf = tk_split_list(tk_call('imconfigure', window.path, "-#{slot}"))
+          conf[0] = conf[0][1..-1]
+          conf
+        else
+          tk_split_list(tk_call('imconfigure', window.path)).collect{|conf|
+            conf[0] = conf[0][1..-1]
+            conf
+          }
+        end
+      else
+        []
+      end
+    rescue
+      []
+    end
+  end
 
-    optkeys = [key] if key
+  def useinputmethods(value=nil)
+    TkXIM.useinputmethods(self, value)
+  end
 
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
+  def caret(keys=nil)
+    TkXIM.caret(self, keys=nil)
+  end
 
-      pathname = [win, tag, optkey].join(';')
+  def imconfigure(slot, value=None)
+    TkXIM.configinfo(self, slot, value)
+  end
 
-      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)
-        unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-          tk_call(*(__config_cmd << "-#{optkey}" << ltn))
-        else
-          begin
-            tk_call(*(__config_cmd << "-#{optkey}" << ltn))
-          rescue => e
-            # ignore
-          end
-        end
-        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
+  def imconfiginfo(slot=nil)
+    TkXIM.configinfo(self, slot)
+  end
+end
 
-      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
-    }
-    self
+module TkWinfo
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['winfo'.freeze].freeze
+
+  def TkWinfo.atom(name, win=nil)
+    if win
+      number(tk_call('winfo', 'atom', '-displayof', win, name))
+    else
+      number(tk_call('winfo', 'atom', name))
+    end
+  end
+  def winfo_atom(name)
+    TkWinfo.atom(name, self)
   end
-  alias asciifont_configure latinfont_configure
 
-  def kanjifont_configure(knj, keys=nil)
-    if knj.kind_of?(Array)
-      key = knj[1]
-      knj = knj[0]
+  def TkWinfo.atomname(id, win=nil)
+    if win
+      tk_call('winfo', 'atomname', '-displayof', win, id)
     else
-      key = nil
+      tk_call('winfo', 'atomname', id)
     end
+  end
+  def winfo_atomname(id)
+    TkWinfo.atomname(id, self)
+  end
+
+  def TkWinfo.cells(window)
+    number(tk_call('winfo', 'cells', window.path))
+  end
+  def winfo_cells
+    TkWinfo.cells self
+  end
+
+  def TkWinfo.children(window)
+    c = tk_call('winfo', 'children', window.path)
+    list(c)
+  end
+  def winfo_children
+    TkWinfo.children self
+  end
+
+  def TkWinfo.classname(window)
+    tk_call 'winfo', 'class', window.path
+  end
+  def winfo_classname
+    TkWinfo.classname self
+  end
+  alias winfo_class winfo_classname
+
+  def TkWinfo.colormapfull(window)
+     bool(tk_call('winfo', 'colormapfull', window.path))
+  end
+  def winfo_colormapfull
+    TkWinfo.colormapfull self
+  end
 
-    optkeys = __font_optkeys
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
+  def TkWinfo.containing(rootX, rootY, win=nil)
+    if win
+      window(tk_call('winfo', 'containing', '-displayof', win, rootX, rootY))
+    else
+      window(tk_call('winfo', 'containing', rootX, rootY))
     end
+  end
+  def winfo_containing(x, y)
+    TkWinfo.containing(x, y, self)
+  end
 
-    win, tag = __pathname.split(':')
+  def TkWinfo.depth(window)
+    number(tk_call('winfo', 'depth', window.path))
+  end
+  def winfo_depth
+    TkWinfo.depth self
+  end
 
-    optkeys = [key] if key
+  def TkWinfo.exist?(window)
+    bool(tk_call('winfo', 'exists', window.path))
+  end
+  def winfo_exist?
+    TkWinfo.exist? self
+  end
 
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
+  def TkWinfo.fpixels(window, dist)
+    number(tk_call('winfo', 'fpixels', window.path, dist))
+  end
+  def winfo_fpixels(dist)
+    TkWinfo.fpixels self, dist
+  end
 
-      pathname = [win, tag, optkey].join(';')
+  def TkWinfo.geometry(window)
+    tk_call('winfo', 'geometry', window.path)
+  end
+  def winfo_geometry
+    TkWinfo.geometry self
+  end
 
-      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)
-        unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-          tk_call(*(__config_cmd << "-#{optkey}" << knj))
-        else
-          begin
-            tk_call(*(__config_cmd << "-#{optkey}" << knj))
-          rescue => e
-            # ignore
-          end
-        end
-        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
+  def TkWinfo.height(window)
+    number(tk_call('winfo', 'height', window.path))
+  end
+  def winfo_height
+    TkWinfo.height self
+  end
 
-      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
-    }
-    self
+  def TkWinfo.id(window)
+    tk_call('winfo', 'id', window.path)
+  end
+  def winfo_id
+    TkWinfo.id 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
+  def TkWinfo.interps(window=nil)
+    if window
+      tk_split_simplelist(tk_call('winfo', 'interps',
+				  '-displayof', window.path))
     else
-      if winkey
-        fnt = win.fontobj(winkey).dup
-      else
-        fnt = win.fontobj.dup
-      end
+      tk_split_simplelist(tk_call('winfo', 'interps'))
     end
+  end
+  def winfo_interps
+    TkWinfo.interps self
+  end
 
-    if targetkey
-      fnt.call_font_configure([__pathname, targetkey], *(__config_cmd << {}))
-    else
-      fnt.call_font_configure(__pathname, *(__config_cmd << {}))
-    end
-    self
+  def TkWinfo.mapped?(window)
+    bool(tk_call('winfo', 'ismapped', window.path))
+  end
+  def winfo_mapped?
+    TkWinfo.mapped? 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
+  def TkWinfo.manager(window)
+    tk_call('winfo', 'manager', window.path)
+  end
+  def winfo_manager
+    TkWinfo.manager self
+  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
+  def TkWinfo.appname(window)
+    tk_call('winfo', 'name', window.path)
+  end
+  def winfo_appname
+    TkWinfo.appname 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
+  def TkWinfo.parent(window)
+    window(tk_call('winfo', 'parent', window.path))
+  end
+  def winfo_parent
+    TkWinfo.parent self
+  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
+  def TkWinfo.widget(id, win=nil)
+    if win
+      window(tk_call('winfo', 'pathname', '-displayof', win, id))
     else
-      if winkey
-        fontobj.kanji_replace(win.fontobj(winkey).kanji_font_id)
-      else
-        fontobj.kanji_replace(win.fontobj.kanji_font_id)
-      end
+      window(tk_call('winfo', 'pathname', id))
     end
-    self
   end
-end
+  def winfo_widget(id)
+    TkWinfo.widget id, self
+  end
 
+  def TkWinfo.pixels(window, dist)
+    number(tk_call('winfo', 'pixels', window.path, dist))
+  end
+  def winfo_pixels(dist)
+    TkWinfo.pixels self, dist
+  end
 
-module TkConfigMethod
-  include TkUtil
-  include TkTreatFont
+  def TkWinfo.reqheight(window)
+    number(tk_call('winfo', 'reqheight', window.path))
+  end
+  def winfo_reqheight
+    TkWinfo.reqheight self
+  end
 
-  def TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-    @mode || false
+  def TkWinfo.reqwidth(window)
+    number(tk_call('winfo', 'reqwidth', window.path))
   end
-  def TkConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode)
-    fail SecurityError, "can't change the mode" if $SAFE>=4
-    @mode = (mode)? true: false
+  def winfo_reqwidth
+    TkWinfo.reqwidth self
   end
 
-  def __cget_cmd
-    [self.path, 'cget']
+  def TkWinfo.rgb(window, color)
+    list(tk_call('winfo', 'rgb', window.path, color))
+  end
+  def winfo_rgb(color)
+    TkWinfo.rgb self, color
   end
-  private :__cget_cmd
 
-  def __config_cmd
-    [self.path, 'configure']
+  def TkWinfo.rootx(window)
+    number(tk_call('winfo', 'rootx', window.path))
+  end
+  def winfo_rootx
+    TkWinfo.rootx self
   end
-  private :__config_cmd
 
-  def __confinfo_cmd
-    __config_cmd
+  def TkWinfo.rooty(window)
+    number(tk_call('winfo', 'rooty', window.path))
+  end
+  def winfo_rooty
+    TkWinfo.rooty self
   end
-  private :__confinfo_cmd
 
-  def __configinfo_struct
-    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
-      :default_value=>3, :current_value=>4}
+  def TkWinfo.screen(window)
+    tk_call 'winfo', 'screen', window.path
+  end
+  def winfo_screen
+    TkWinfo.screen self
   end
-  private :__configinfo_struct
 
-  def __optkey_aliases
-    {}
+  def TkWinfo.screencells(window)
+    number(tk_call('winfo', 'screencells', window.path))
+  end
+  def winfo_screencells
+    TkWinfo.screencells self
   end
-  private :__optkey_aliases
 
-  def __numval_optkeys
-    []
+  def TkWinfo.screendepth(window)
+    number(tk_call('winfo', 'screendepth', window.path))
+  end
+  def winfo_screendepth
+    TkWinfo.screendepth self
   end
-  private :__numval_optkeys
 
-  def __numstrval_optkeys
-    []
+  def TkWinfo.screenheight (window)
+    number(tk_call('winfo', 'screenheight', window.path))
+  end
+  def winfo_screenheight
+    TkWinfo.screenheight self
   end
-  private :__numstrval_optkeys
 
-  def __boolval_optkeys
-    ['exportselection', 'jump', 'setgrid', 'takefocus']
+  def TkWinfo.screenmmheight(window)
+    number(tk_call('winfo', 'screenmmheight', window.path))
+  end
+  def winfo_screenmmheight
+    TkWinfo.screenmmheight self
   end
-  private :__boolval_optkeys
 
-  def __strval_optkeys
-    [
-      'text', 'label', 'show', 'data', 'file', 
-      'activebackground', 'activeforeground', 'background', 
-      'disabledforeground', 'disabledbackground', 'foreground', 
-      'highlightbackground', 'highlightcolor', 'insertbackground', 
-      'selectbackground', 'selectforeground', 'troughcolor'
-    ]
+  def TkWinfo.screenmmwidth(window)
+    number(tk_call('winfo', 'screenmmwidth', window.path))
+  end
+  def winfo_screenmmwidth
+    TkWinfo.screenmmwidth self
   end
-  private :__strval_optkeys
 
-  def __listval_optkeys
-    []
+  def TkWinfo.screenvisual(window)
+    tk_call('winfo', 'screenvisual', window.path)
+  end
+  def winfo_screenvisual
+    TkWinfo.screenvisual self
   end
-  private :__listval_optkeys
 
-  def __numlistval_optkeys
-    []
+  def TkWinfo.screenwidth(window)
+    number(tk_call('winfo', 'screenwidth', window.path))
+  end
+  def winfo_screenwidth
+    TkWinfo.screenwidth self
   end
-  private :__numlistval_optkeys
 
-  def __tkvariable_optkeys
-    ['variable', 'textvariable']
+  def TkWinfo.server(window)
+    tk_call 'winfo', 'server', window.path
+  end
+  def winfo_server
+    TkWinfo.server self
   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.
-    {}
+  def TkWinfo.toplevel(window)
+    window(tk_call('winfo', 'toplevel', window.path))
+  end
+  def winfo_toplevel
+    TkWinfo.toplevel self
   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)}".
-    {}
+  def TkWinfo.visual(window)
+    tk_call('winfo', 'visual', window.path)
+  end
+  def winfo_visual
+    TkWinfo.visual self
   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.
-    {}
+  def TkWinfo.visualid(window)
+    tk_call('winfo', 'visualid', window.path)
+  end
+  def winfo_visualid
+    TkWinfo.visualid self
   end
-  private :__methodcall_optkeys
 
-  def __keyonly_optkeys  # { def_key=>undef_key or nil, ... }
-    {}
+  def TkWinfo.visualsavailable(window, includeids=false)
+    if includeids
+      list(tk_call('winfo', 'visualsavailable', window.path, "includeids"))
+    else
+      list(tk_call('winfo', 'visualsavailable', window.path))
+    end
+  end
+  def winfo_visualsavailable(includeids=false)
+    TkWinfo.visualsavailable self, includeids
   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
+  def TkWinfo.vrootheight(window)
+    number(tk_call('winfo', 'vrootheight', window.path))
+  end
+  def winfo_vrootheight
+    TkWinfo.vrootheight self
   end
-  private :__conv_keyonly_opts
 
-  def config_hash_kv(keys, enc_mode = nil, conf = nil)
-    hash_kv(__conv_keyonly_opts(keys), enc_mode, conf)
+  def TkWinfo.vrootwidth(window)
+    number(tk_call('winfo', 'vrootwidth', window.path))
+  end
+  def winfo_vrootwidth
+    TkWinfo.vrootwidth self
   end
 
-  ################################
+  def TkWinfo.vrootx(window)
+    number(tk_call('winfo', 'vrootx', window.path))
+  end
+  def winfo_vrootx
+    TkWinfo.vrootx self
+  end
 
-  def [](id)
-    cget(id)
+  def TkWinfo.vrooty(window)
+    number(tk_call('winfo', 'vrooty', window.path))
+  end
+  def winfo_vrooty
+    TkWinfo.vrooty self
   end
 
-  def []=(id, val)
-    configure(id, val)
-    val
+  def TkWinfo.width(window)
+    number(tk_call('winfo', 'width', window.path))
+  end
+  def winfo_width
+    TkWinfo.width self
   end
 
-  def __cget_core(slot)
-    orig_slot = slot
-    slot = slot.to_s
- 
-   if slot.length == 0
-      fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
-    end
+  def TkWinfo.x(window)
+    number(tk_call('winfo', 'x', window.path))
+  end
+  def winfo_x
+    TkWinfo.x self
+  end
 
-    alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
-    if real_name
-      slot = real_name.to_s
-    end
+  def TkWinfo.y(window)
+    number(tk_call('winfo', 'y', window.path))
+  end
+  def winfo_y
+    TkWinfo.y self
+  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
+  def TkWinfo.viewable(window)
+    bool(tk_call('winfo', 'viewable', window.path))
+  end
+  def winfo_viewable
+    TkWinfo.viewable self
+  end
+
+  def TkWinfo.pointerx(window)
+    number(tk_call('winfo', 'pointerx', window.path))
+  end
+  def winfo_pointerx
+    TkWinfo.pointerx self
+  end
+
+  def TkWinfo.pointery(window)
+    number(tk_call('winfo', 'pointery', window.path))
+  end
+  def winfo_pointery
+    TkWinfo.pointery self
+  end
+
+  def TkWinfo.pointerxy(window)
+    list(tk_call('winfo', 'pointerxy', window.path))
+  end
+  def winfo_pointerxy
+    TkWinfo.pointerxy self
+  end
+end
+
+module TkPack
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['pack'.freeze].freeze
+
+  def configure(win, *args)
+    if args[-1].kind_of?(Hash)
+      keys = args.pop
+    end
+    wins = [win.epath]
+    for i in args
+      wins.push i.epath
     end
+    tk_call "pack", 'configure', *(wins+hash_kv(keys))
+  end
 
-    if ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
-      return self.__send__(method)
+  def forget(*args)
+    tk_call 'pack', 'forget' *args
+  end
+
+  def info(slave)
+    ilist = list(tk_call('pack', 'info', slave.epath))
+    info = {}
+    while key = ilist.shift
+      info[key[1..-1]] = ilist.shift
     end
+    return info
+  end
 
-    case slot
-    when /^(#{__numval_optkeys.join('|')})$/
-      begin
-        number(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
-      rescue
-        nil
-      end
+  def propagate(master, bool=None)
+    if bool == None
+      bool(tk_call('pack', 'propagate', master.epath))
+    else
+      tk_call('pack', 'propagate', master.epath, bool)
+    end
+  end
 
-    when /^(#{__numstrval_optkeys.join('|')})$/
-      num_or_str(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+  def slaves(master)
+    list(tk_call('pack', 'slaves', master.epath))
+  end
 
-    when /^(#{__boolval_optkeys.join('|')})$/
-      begin
-        bool(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
-      rescue
-        nil
-      end
+  module_function :configure, :forget, :info, :propagate, :slaves
+end
 
-    when /^(#{__listval_optkeys.join('|')})$/
-      simplelist(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+module TkGrid
+  include Tk
+  extend Tk
 
-    when /^(#{__numlistval_optkeys.join('|')})$/
-      conf = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
-      if conf =~ /^[0-9+-]/
-        list(conf)
-      else
-        conf
-      end
+  TkCommandNames = ['grid'.freeze].freeze
 
-    when /^(#{__strval_optkeys.join('|')})$/
-      _fromUTF8(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+  def bbox(*args)
+    list(tk_call('grid', 'bbox', *args))
+  end
 
-    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
+  def configure(widget, *args)
+    if args[-1].kind_of?(Hash)
+      keys = args.pop
+    end
+    wins = []
+    args.unshift(widget)
+    for i in args
+      case i
+      when '-', 'x', '^'  # RELATIVE PLACEMENT
+	wins.push(i)
       else
-        fnt
+	wins.push(i.epath)
       end
+    end
+    tk_call "grid", 'configure', *(wins+hash_kv(keys))
+  end
 
-    when /^(#{__tkvariable_optkeys.join('|')})$/
-      v = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
-      (v.empty?)? nil: TkVarAccess.new(v)
+  def columnconfigure(master, index, args)
+    tk_call "grid", 'columnconfigure', master, index, *hash_kv(args)
+  end
 
+  def rowconfigure(master, index, args)
+    tk_call "grid", 'rowconfigure', master, index, *hash_kv(args)
+  end
+
+  def columnconfiginfo(master, index, slot=nil)
+    if slot
+      tk_call('grid', 'columnconfigure', master, index, "-#{slot}").to_i
     else
-      tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{slot}")), true)
+      ilist = list(tk_call('grid', 'columnconfigure', master, index))
+      info = {}
+      while key = ilist.shift
+	info[key[1..-1]] = ilist.shift
+      end
+      info
     end
   end
-  private :__cget_core
 
-  def cget(slot)
-    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      __cget_core(slot)
+  def rowconfiginfo(master, index, slot=nil)
+    if slot
+      tk_call('grid', 'rowconfigure', master, index, "-#{slot}").to_i
     else
-      begin
-        __cget_core(slot)
-      rescue => e
-        if current_configinfo.has_key?(slot.to_s)
-          # error on known option
-          fail e
-        else
-          # unknown option
-          nil
-        end
+      ilist = list(tk_call('grid', 'rowconfigure', master, index))
+      info = {}
+      while key = ilist.shift
+	info[key[1..-1]] = ilist.shift
       end
+      info
     end
   end
-  def cget_strict(slot)
-    # never use TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-    __cget_core(slot)
+
+  def add(widget, *args)
+    configure(widget, *args)
+  end
+
+  def forget(*args)
+    tk_call 'grid', 'forget', *args
+  end
+
+  def info(slave)
+    list(tk_call('grid', 'info', slave))
   end
 
-  def __configure_core(slot, value=None)
+  def location(master, x, y)
+    list(tk_call('grid', 'location', master, x, y))
+  end
+
+  def propagate(master, bool=None)
+    if bool == None
+      bool(tk_call('grid', 'propagate', master.epath))
+    else
+      tk_call('grid', 'propagate', master.epath, bool)
+    end
+  end
+
+  def remove(*args)
+    tk_call 'grid', 'remove', *args
+  end
+
+  def size(master)
+    list(tk_call('grid', 'size', master))
+  end
+
+  def slaves(master, args)
+    list(tk_call('grid', 'slaves', master, *hash_kv(args)))
+  end
+
+  module_function :bbox, :forget, :propagate, :info
+  module_function :remove, :size, :slaves, :location
+  module_function :configure, :columnconfigure, :rowconfigure
+  module_function :columnconfiginfo, :rowconfiginfo
+end
+
+module TkPlace
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['place'.freeze].freeze
+
+  def configure(win, slot, value=None)
     if slot.kind_of? Hash
-      slot = _symbolkey2str(slot)
+      tk_call 'place', 'configure', win.epath, *hash_kv(slot)
+    else
+      tk_call 'place', 'configure', win.epath, "-#{slot}", value
+    end
+  end
 
-      __optkey_aliases.each{|alias_name, real_name|
-        alias_name = alias_name.to_s
-        if slot.has_key?(alias_name)
-          slot[real_name.to_s] = slot.delete(alias_name)
-        end
+  def configinfo(win, slot = nil)
+    # for >= Tk8.4a2 ?
+    if slot
+      conf = tk_split_list(tk_call('place', 'configure', 
+				   win.epath, "-#{slot}") )
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_simplelist(tk_call('place', 'configure', 
+				  win.epath)).collect{|conflist|
+	conf = tk_split_simplelist(conflist)
+	conf[0] = conf[0][1..-1]
+	conf
       }
+    end
+  end
 
-      __methodcall_optkeys.each{|key, method|
-        value = slot.delete(key.to_s)
-        self.__send__(method, value) if value
-      }
+  def forget(win)
+    tk_call 'place', 'forget', win
+  end
 
-      __ruby2val_optkeys.each{|key, method|
-        key = key.to_s
-        slot[key] = method.call(slot[key]) if slot.has_key?(key)
-      }
+  def info(win)
+    ilist = list(tk_call('place', 'info', win.epath))
+    info = {}
+    while key = ilist.shift
+      info[key[1..-1]] = ilist.shift
+    end
+    return info
+  end
 
-      __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
+  def slaves(master)
+    list(tk_call('place', 'slaves', master.epath))
+  end
+
+  module_function :configure, :configinfo, :forget, :info, :slaves
+end
+
+module TkOptionDB
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['option'.freeze].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 '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
+  module_function :add, :clear, :get, :readfile
+
+  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()
+
+    unless f_enc
+      f_enc = i_enc
+    end
+
+    ent = []
+    cline = ''
+    open(file, 'r') {|f|
+      while line = f.gets
+	cline += line.chomp!
+	case cline
+	when /\\$/    # continue
+	  cline.chop!
+	  next
+	when /^!/     # 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)
+	  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
+    readfile(file, pri).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 /^!/     # 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
+  class << @@resource_proc_class
+    private :new
+ 
+    CARRIER    = '.'.freeze
+    METHOD_TBL = TkCore::INTERP.create_table
+    ADD_METHOD = false
+    SAFE_MODE  = 4
+
+    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
 
-      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))))
+    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 = self::METHOD_TBL[id]
+      unless res_proc.kind_of? Proc
+        if id == :new || !(self::METHOD_TBL.has_key?(id) || self::ADD_METHOD)
+          raise NoMethodError, 
+                "not support resource-proc '#{id.id2name}' for #{self.name}"
+        end
+        proc_str = TkOptionDB.get(self::CARRIER, id.id2name, '').strip
+        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 = eval('Proc.new' + proc_str)
+        self::METHOD_TBL[id] = res_proc
       end
+      proc{
+         $SAFE = self::SAFE_MODE
+         res_proc.call(*args)
+      }.call
+    end
+
+    private :__closed_block_check__, :__check_proc_string__, :method_missing
+  end
+  @@resource_proc_class.freeze
 
+  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
-      orig_slot = slot
-      slot = slot.to_s
-      if slot.length == 0
-        fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
-      end
+      fail ArgumentError, "parent must be Resource-Proc class"
+    end
+    carrier = Tk.tk_call('frame', @path, '-class', klass)
 
-      alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
-      if real_name
-        slot = real_name.to_s
+    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 ( 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
+    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
+  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
+      attr_reader :class_eval, :name, :superclass, 
+	:ancestors, :const_defined?, :const_get, :const_set, 
+	:constants, :included_modules, :instance_methods, 
+	:method_defined?, :module_eval, :private_instance_methods, 
+	:protected_instance_methods, :public_instance_methods, 
+	:remove_const, :remove_method, :undef_method, 
+	:to_s, :inspect, :display, :method, :methods, 
+	:instance_eval, :instance_variables, :kind_of?, :is_a?,
+	:private_methods, :protected_methods, :public_methods
+    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
+
+module TkTreatFont
+  def font_configinfo(name = nil)
+    ret = TkFont.used_on(self.path)
+    if ret == nil
+=begin
+      if name
+	ret = name
       else
-        tk_call(*(__config_cmd << "-#{slot}" << value))
+	ret = TkFont.init_widget_font(self.path, self.path, 'configure')
       end
+=end
+      ret = TkFont.init_widget_font(self.path, self.path, 'configure')
     end
-    self
+    ret
   end
-  private :__configure_core
+  alias fontobj font_configinfo
 
-  def __check_available_configure_options(keys)
-    availables = self.current_configinfo.keys
+  def font_configure(slot)
+    slot = _symbolkey2str(slot)
+
+    if slot.key?('font')
+      fnt = slot.delete('font')
+      if fnt.kind_of? TkFont
+	return fnt.call_font_configure(self.path, self.path,'configure',slot)
+      else
+	if fnt 
+	  if (slot.key?('kanjifont') || 
+	      slot.key?('latinfont') || 
+	      slot.key?('asciifont'))
+	    fnt = TkFont.new(fnt)
+
+	    lfnt = slot.delete('latinfont')
+	    lfnt = slot.delete('asciifont') if slot.key?('asciifont')
+	    kfnt = slot.delete('kanjifont')
+
+	    fnt.latin_replace(lfnt) if lfnt
+	    fnt.kanji_replace(kfnt) if kfnt
+	  else
+	    slot['font'] = fnt
+	    tk_call(self.path, 'configure', *hash_kv(slot))
+	  end
+	end
+	return self
+      end
+    end
 
-    # add non-standard keys
-    availables |= __font_optkeys.map{|k|
-      [k.to_s, "latin#{k}", "ascii#{k}", "kanji#{k}"]
-    }.flatten
-    availables |= __methodcall_optkeys.keys.map{|k| k.to_s}
-    availables |= __keyonly_optkeys.keys.map{|k| k.to_s}
+    lfnt = slot.delete('latinfont')
+    lfnt = slot.delete('asciifont') if slot.key?('asciifont')
+    kfnt = slot.delete('kanjifont')
+
+    if lfnt && kfnt
+      return TkFont.new(lfnt, kfnt).call_font_configure(self.path, self.path, 
+							'configure', slot)
+    end
 
-    keys = _symbolkey2str(keys)
-    keys.delete_if{|k, v| !(availables.include?(k))}
+    latinfont_configure(lfnt) if lfnt
+    kanjifont_configure(kfnt) if kfnt
+      
+    tk_call(self.path, 'configure', *hash_kv(slot)) if slot != {}
+    self
   end
 
-  def configure(slot, value=None)
-    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      __configure_core(slot, value)
-    else
-      if slot.kind_of?(Hash)
-        begin
-          __configure_core(slot)
-        rescue
-          slot = __check_available_configure_options(slot)
-          __configure_core(slot) unless slot.empty?
-        end
+  def latinfont_configure(ltn, keys=nil)
+    if (fobj = TkFont.used_on(self.path))
+      fobj = TkFont.new(fobj) # create a new TkFont object
+    elsif Tk::JAPANIZED_TK
+      fobj = fontobj          # create a new TkFont object
+    else
+      tk_call(self.path, 'configure', '-font', ltn)
+      return self
+    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
-        begin
-          __configure_core(slot, value)
-        rescue => e
-          if current_configinfo.has_key?(slot.to_s)
-            # error on known option
-            fail e
-          else
-            # unknown option
-            nil
-          end
-        end
+	fobj.latin_replace(ltn)
       end
     end
-    self
+
+    return fobj.call_font_configure(self.path, self.path, 'configure', {})
   end
+  alias asciifont_configure latinfont_configure
 
-  def configure_cmd(slot, value)
-    configure(slot, install_cmd(value))
-  end
-
-  def __configinfo_core(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 )
-          fnt = conf[__configinfo_struct[:default_value]]
-          if TkFont.is_system_font?(fnt)
-            conf[__configinfo_struct[:default_value]] = TkNamedFont.new(fnt)
-          end
-          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
+  def kanjifont_configure(knj, keys=nil)
+    if (fobj = TkFont.used_on(self.path))
+      fobj = TkFont.new(fobj) # create a new TkFont object
+    elsif Tk::JAPANIZED_TK
+      fobj = fontobj          # create a new TkFont object
+    else
+      tk_call(self.path, 'configure', '-font', knj)
+      return self
+    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
-        if slot
-          slot = slot.to_s
-
-          alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          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
+	fobj.kanji_replace(knj)
+      end
+    end
 
-          conf
+    return fobj.call_font_configure(self.path, self.path, 'configure', {})
+  end
 
-        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
+  def font_copy(window, tag=nil)
+    if tag
+      fnt = window.tagfontobj(tag).dup
+    else
+      fnt = window.fontobj.dup
+    end
+    fnt.call_font_configure(self.path, self.path, 'configure', {})
+    self
+  end
 
-            conf
-          }
+  def latinfont_copy(window, tag=nil)
+    fontobj.dup.call_font_configure(self.path, self.path, 'configure', {})
+    if tag
+      fontobj.latin_replace(window.tagfontobj(tag).latin_font_id)
+    else
+      fontobj.latin_replace(window.fontobj.latin_font_id)
+    end
+    self
+  end
+  alias asciifont_copy latinfont_copy
 
-          __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}$/}
-              fnt = fontconf[__configinfo_struct[:default_value]]
-              if TkFont.is_system_font?(fnt)
-                fontconf[__configinfo_struct[:default_value]] \
-                  = TkNamedFont.new(fnt)
-              end
-              fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
-              ret.push(fontconf)
-            end
-          }
+  def kanjifont_copy(window, tag=nil)
+    fontobj.dup.call_font_configure(self.path, self.path, 'configure', {})
+    if tag
+      fontobj.kanji_replace(window.tagfontobj(tag).kanji_font_id)
+    else
+      fontobj.kanji_replace(window.fontobj.kanji_font_id)
+    end
+    self
+  end
+end
 
-          __methodcall_optkeys.each{|optkey, method|
-            ret << [optkey.to_s, '', '', '', self.__send__(method)]
-          }
+module TkTreatItemFont
+  def __conf_cmd(idx)
+    raise NotImplementedError, "need to define `__conf_cmd'"
+  end
+  def __item_pathname(tagOrId)
+    raise NotImplementedError, "need to define `__item_pathname'"
+  end
+  private :__conf_cmd, :__item_pathname
 
-          ret
-        end
+  def tagfont_configinfo(tagOrId, name = nil)
+    pathname = __item_pathname(tagOrId)
+    ret = TkFont.used_on(pathname)
+    if ret == nil
+=begin
+      if name
+	ret = name
+      else
+	ret = TkFont.init_widget_font(pathname, self.path, 
+				      __conf_cmd(0), __conf_cmd(1), tagOrId)
       end
+=end
+      ret = TkFont.init_widget_font(pathname, self.path, 
+				    __conf_cmd(0), __conf_cmd(1), tagOrId)
+    end
+    ret
+  end
+  alias tagfontobj tagfont_configinfo
 
-    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 )
-          fnt = conf[__configinfo_struct[:default_value]]
-          if TkFont.is_system_font?(fnt)
-            conf[__configinfo_struct[:default_value]] = TkNamedFont.new(fnt)
-          end
-          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
+  def tagfont_configure(tagOrId, slot)
+    pathname = __item_pathname(tagOrId)
+    slot = _symbolkey2str(slot)
+
+    if slot.key?('font')
+      fnt = slot.delete('font')
+      if fnt.kind_of? TkFont
+	return fnt.call_font_configure(pathname, self.path,
+				       __conf_cmd(0), __conf_cmd(1), 
+				       tagOrId, slot)
       else
-        if slot
-          slot = slot.to_s
-
-          alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          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
+	if fnt 
+	  if (slot.key?('kanjifont') || 
+	      slot.key?('latinfont') || 
+	      slot.key?('asciifont'))
+	    fnt = TkFont.new(fnt)
+
+	    lfnt = slot.delete('latinfont')
+	    lfnt = slot.delete('asciifont') if slot.key?('asciifont')
+	    kfnt = slot.delete('kanjifont')
+
+	    fnt.latin_replace(lfnt) if lfnt
+	    fnt.kanji_replace(kfnt) if kfnt
+	  end
+
+	  slot['font'] = fnt
+	  tk_call(self.path, __conf_cmd(0), __conf_cmd(1), 
+		  tagOrId, *hash_kv(slot))
+	end
+	return self
+      end
+    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
-          }
+    lfnt = slot.delete('latinfont')
+    lfnt = slot.delete('asciifont') if slot.key?('asciifont')
+    kfnt = slot.delete('kanjifont')
 
-          __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)
-              fnt = fontconf[__configinfo_struct[:default_value]]
-              if TkFont.is_system_font?(fnt)
-                fontconf[__configinfo_struct[:default_value]] \
-                  = TkNamedFont.new(fnt)
-              end
-              fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
-              ret[optkey] = fontconf
-            end
-          }
+    if lfnt && kfnt
+      return TkFont.new(lfnt, kfnt).call_font_configure(pathname, self.path,
+							__conf_cmd(0), 
+							__conf_cmd(1), 
+							tagOrId, slot)
+    end
 
-          __methodcall_optkeys.each{|optkey, method|
-            ret[optkey.to_s] = ['', '', '', self.__send__(method)]
-          }
+    latintagfont_configure(tagOrId, lfnt) if lfnt
+    kanjitagfont_configure(tagOrId, kfnt) if kfnt
+      
+    tk_call(self.path, __conf_cmd(0), __conf_cmd(1), 
+	    tagOrId, *hash_kv(slot)) if slot != {}
+    self
+  end
 
-          ret
-        end
+  def latintagfont_configure(tagOrId, ltn, keys=nil)
+    pathname = __item_pathname(tagOrId)
+    if (fobj = TkFont.used_on(pathname))
+      fobj = TkFont.new(fobj)    # create a new TkFont object
+    elsif Tk::JAPANIZED_TK
+      fobj = tagfontobj(tagOrId) # create a new TkFont object
+    else
+      tk_call(self.path, __conf_cmd(0), __conf_cmd(1), tagOrId, '-font', ltn)
+      return self
+    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
+
+    return fobj.call_font_configure(pathname, self.path,
+				    __conf_cmd(0), __conf_cmd(1), tagOrId, {})
   end
-  private :__configinfo_core
+  alias asciitagfont_configure latintagfont_configure
 
-  def configinfo(slot = nil)
-    if slot && TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      begin
-        __configinfo_core(slot)
-      rescue
-        Array.new(__configinfo_struct.values.max).unshift(slot.to_s)
-      end
+  def kanjitagfont_configure(tagOrId, knj, keys=nil)
+    pathname = __item_pathname(tagOrId)
+    if (fobj = TkFont.used_on(pathname))
+      fobj = TkFont.new(fobj)    # create a new TkFont object
+    elsif Tk::JAPANIZED_TK
+      fobj = tagfontobj(tagOrId) # create a new TkFont object
     else
-      __configinfo_core(slot)
+      tk_call(self.path, __conf_cmd(0), __conf_cmd(1), tagOrId, '-font', knj)
+      return self
     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}'"
+    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
-        ret = {}
-        configinfo().each{|conf|
-          if ( ! __configinfo_struct[:alias] \
-              || conf.size > __configinfo_struct[:alias] + 1 )
-            ret[conf[0]] = conf[-1]
-          end
-        }
-        ret
+	fobj.kanji_replace(knj)
       end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      configinfo(slot).each{|key, conf| 
-        ret[key] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
     end
+
+    return fobj.call_font_configure(pathname, self.path,
+				    __conf_cmd(0), __conf_cmd(1), tagOrId, {})
+  end
+
+  def tagfont_copy(tagOrId, window, wintag=nil)
+    pathname = __item_pathname(tagOrId)
+    if wintag
+      fnt = window.tagfontobj(wintag).dup
+    else
+      fnt = window.fontobj.dup
+    end
+    fnt.call_font_configure(pathname, self.path, 
+			    __conf_cmd(0), __conf_cmd(1), tagOrId, {})
+    return self
+  end
+
+  def latintagfont_copy(tagOrId, window, wintag=nil)
+    pathname = __item_pathname(tagOrId)
+    tagfontobj(tagOrId).dup.call_font_configure(pathname, self.path, 
+						__conf_cmd(0), __conf_cmd(1), 
+						tagOrId, {})
+    if wintag
+      tagfontobj(tagOrId).
+	latin_replace(window.tagfontobj(wintag).latin_font_id)
+    else
+      tagfontobj(tagOrId).latin_replace(window.fontobj.latin_font_id)
+    end
+    self
+  end
+  alias asciitagfont_copy latintagfont_copy
+
+  def kanjitagfont_copy(tagOrId, window, wintag=nil)
+    pathname = __item_pathname(tagOrId)
+    tagfontobj(tagOrId).dup.call_font_configure(pathname, self.path, 
+						__conf_cmd(0), __conf_cmd(1), 
+						tagOrId, {})
+    if wintag
+      tagfontobj(tagOrId).
+	kanji_replace(window.tagfontobj(wintag).kanji_font_id)
+    else
+      tagfontobj(tagOrId).kanji_replace(window.fontobj.kanji_font_id)
+    end
+    self
   end
 end
 
 class TkObject<TkKernel
-  extend  TkCore
   include Tk
-  include TkConfigMethod
+  include TkTreatFont
   include TkBindCore
 
-### --> definition is moved to TkUtil module
-#  def path
-#    @path
-#  end
+  def path
+    return @path
+  end
 
   def epath
-    @path
+    return @path
   end
 
   def to_eval
@@ -4674,126 +3772,171 @@ class TkObject<TkKernel
   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)
+    tk_call path, cmd, *rest
   end
+  private :tk_send
 
   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
+      configure name, args[0]
     when 0
       begin
-        cget(name)
+	cget name
       rescue
-        if self.kind_of?(TkWindow)
-          fail NameError, 
-               "unknown option '#{id}' for #{self.inspect} (deleted widget?)"
-        else
-          super(id, *args)
-        end
-#        fail NameError, 
-#             "undefined local variable or method `#{name}' for #{self.to_s}", 
-#             error_at
+	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
+      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
     end
   end
 
-=begin
   def [](id)
-    cget(id)
+    cget id
   end
 
   def []=(id, val)
-    configure(id, val)
-    val
+    configure id, val
+  end
+
+  def cget(slot)
+    case slot.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      tk_call path, 'cget', "-#{slot}"
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_call(path, 'cget', "-#{slot}"))
+      fnt = tk_tcl2ruby(tk_call(path, 'cget', "-font"))
+      unless fnt.kind_of?(TkFont)
+	fnt = fontobj(fnt)
+      end
+      if slot == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+	# obsolete; just for compatibility
+	fnt.kanji_font
+      else
+	fnt
+      end
+    else
+      tk_tcl2ruby tk_call(path, 'cget', "-#{slot}")
+    end
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of? Hash
+      if (slot['font'] || slot[:font] || 
+          slot['kanjifont'] || slot[:kanjifont] || 
+	  slot['latinfont'] || slot[:latinfont] || 
+          slot['asciifont'] || slot[:asciifont] )
+	font_configure(slot)
+      elsif slot.size > 0
+	tk_call path, 'configure', *hash_kv(slot)
+      end
+
+    else
+      if (slot == 'font' || slot == :font || 
+          slot == 'kanjifont' || slot == :kanjifont || 
+	  slot == 'latinfont' || slot == :latinfont || 
+          slot == 'asciifont' || slot == :asciifont )
+	if value == None
+	  fontobj
+	else
+	  font_configure({slot=>value})
+	end
+      else
+	tk_call path, 'configure', "-#{slot}", value
+      end
+    end
+    self
+  end
+
+  def configure_cmd(slot, value)
+    configure slot, install_cmd(value)
+  end
+
+  def configinfo(slot = nil)
+    if slot == 'font' || slot == :font || 
+       slot == 'kanjifont' || slot == :kanjifont
+      conf = tk_split_simplelist(tk_send('configure', "-#{slot}") )
+      conf[0] = conf[0][1..-1]
+      conf[4] = fontobj(conf[4])
+      conf
+    else
+      if slot
+	case slot.to_s
+	when 'text', 'label', 'show', 'data', 'file'
+	  conf = tk_split_simplelist(tk_send('configure', "-#{slot}") )
+	else
+	  conf = tk_split_list(tk_send('configure', "-#{slot}") )
+	end
+	conf[0] = conf[0][1..-1]
+	conf
+      else
+	ret = tk_split_simplelist(tk_send('configure') ).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
+	}
+	fontconf = ret.assoc('font')
+	if fontconf
+	  ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+	  fontconf[4] = fontobj(fontconf[4])
+	  ret.push(fontconf)
+	else
+	  ret
+	end
+      end
+    end
   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))
+    if keys
+      tk_call('event', 'generate', path, 
+	      "<#{tk_event_sequence(context)}>", *hash_kv(keys))
     else
-      #tk_call('event', 'generate', path, "<#{tk_event_sequence(context)}>")
-      tk_call_without_enc('event', 'generate', path, 
-                          "<#{tk_event_sequence(context)}>")
+      tk_call('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
+    unless v.kind_of?(TkVariable)
+      fail(ArgumentError, 
+	   Kernel.format("type error (%s); must be TkVariable object", 
+			 v.class))
+    end
     v
   end
   private :tk_trace_variable
 
   def destroy
-    #tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if @var_id
+    # tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if @var_id
   end
 end
 
-
 class TkWindow<TkObject
   include TkWinfo
   extend TkBindCore
-  include Tk::Wm_for_General
 
-  @@WIDGET_INSPECT_FULL = false
-  def TkWindow._widget_inspect_full_?
-    @@WIDGET_INSPECT_FULL
-  end
-  def TkWindow._widget_inspect_full_=(mode)
-    @@WIDGET_INSPECT_FULL = (mode && true) || false
-  end
-
-  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
@@ -4805,19 +3948,19 @@ class TkWindow<TkObject
       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
+      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
+      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
@@ -4831,110 +3974,25 @@ class TkWindow<TkObject
     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)
-        }
-
-        __optkey_aliases.each{|alias_name, real_name|
-          alias_name = alias_name.to_s
-          if keys.has_key?(alias_name)
-            keys[real_name.to_s] = keys.delete(alias_name)
-          end
-        }
-
-        __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)
+        ['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
+          fontkeys[key] = keys.delete(key) if keys.key?(key)
         }
       end
       if without_creating && keys
-        #configure(keys)
-        configure(__conv_keyonly_opts(keys))
+        configure(keys)
       else
-        #create_self(keys)
-        create_self(__conv_keyonly_opts(keys))
+        create_self(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
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
-      else
-        begin
-          tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
-        rescue => e
-          tk_call_without_enc(cmd, @path)
-          keys = __check_available_configure_options(keys)
-          unless keys.empty?
-            begin
-              # try to configure
-              configure(keys)
-            rescue
-              # fail => includes options adaptable when creattion only?
-              begin
-                tk_call_without_enc('destroy', @path)
-              rescue
-                # cannot rescue options error
-                fail e 
-              else
-                # re-create widget
-                tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
-              end
-            end
-          end
-        end
-      end
-    else
-      tk_call_without_enc(cmd, @path)
-    end
+  def create_self
+    fail RuntimeError, "TkWindow is an abstract class"
   end
   private :create_self
 
-  def inspect
-    if @@WIDGET_INSPECT_FULL
-      super
-    else
-      str = super
-      str[0..(str.index(' '))] << '@path=' << @path.inspect << '>'
-    end
-  end
-
-  def exist?
-    TkWinfo.exist?(self)
-  end
-
   def bind_class
     @db_class || self.class()
   end
@@ -4958,12 +4016,7 @@ class TkWindow<TkObject
   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
+    tk_call 'pack', epath, *hash_kv(keys)
     self
   end
 
@@ -4974,69 +4027,48 @@ class TkWindow<TkObject
     else
       keys = {'in'=>target}
     end
-    #tk_call 'pack', epath, *hash_kv(keys)
-    TkPack.configure(self, keys)
+    tk_call 'pack', epath, *hash_kv(keys)
     self
   end
 
-  def pack_forget
-    #tk_call_without_enc('pack', 'forget', epath)
-    TkPack.forget(self)
+  def unpack
+    tk_call 'pack', 'forget', epath
     self
   end
-  alias unpack pack_forget
+  alias pack_forget unpack
 
   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)
+      tk_call 'pack', 'configure', epath, *hash_kv(slot)
     else
-      TkPack.configure(self, slot=>value)
+      tk_call 'pack', 'configure', epath, "-#{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)
+    ilist = list(tk_call('pack', 'info', epath))
+    info = {}
+    while key = ilist.shift
+      info[key[1..-1]] = ilist.shift
+    end
+    return info
   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)
+      bool(tk_call('pack', 'propagate', epath))
     else
-      TkPack.propagate(self, mode)
+      tk_call('pack', 'propagate', epath, mode)
       self
     end
   end
 
   def pack_slaves()
-    #list(tk_call('pack', 'slaves', epath))
-    TkPack.slaves(self)
+    list(tk_call('pack', 'slaves', epath))
   end
 
   def grid(keys = nil)
-    #tk_call 'grid', epath, *hash_kv(keys)
-    if keys
-      TkGrid.configure(self, keys)
-    else
-      TkGrid.configure(self)
-    end
+    tk_call 'grid', epath, *hash_kv(keys)
     self
   end
 
@@ -5047,132 +4079,94 @@ class TkWindow<TkObject
     else
       keys = {'in'=>target}
     end
-    #tk_call 'grid', epath, *hash_kv(keys)
-    TkGrid.configure(self, keys)
+    tk_call 'grid', epath, *hash_kv(keys)
     self
   end
 
-  def grid_anchor(anchor=None)
-    if anchor == None
-      TkGrid.anchor(self)
-    else
-      TkGrid.anchor(self, anchor)
-      self
-    end
-  end
-
-  def grid_forget
-    #tk_call('grid', 'forget', epath)
-    TkGrid.forget(self)
+  def ungrid
+    tk_call 'grid', 'forget', epath
     self
   end
-  alias ungrid grid_forget
+  alias grid_forget ungrid
 
   def grid_bbox(*args)
-    #list(tk_call('grid', 'bbox', epath, *args))
-    TkGrid.bbox(self, *args)
+    list(tk_call('grid', 'bbox', epath, *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)
+      tk_call 'grid', 'configure', epath, *hash_kv(slot)
     else
-      TkGrid.configure(self, slot=>value)
+      tk_call 'grid', 'configure', epath, "-#{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)
+    tk_call('grid', 'columnconfigure', epath, index, *hash_kv(keys))
   end
-  alias grid_columnconfigure grid_columnconfig
-  alias grid_column grid_columnconfig
 
   def grid_rowconfig(index, keys)
-    #tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
-    TkGrid.rowconfigure(self, index, keys)
+    tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
   end
-  alias grid_rowconfigure grid_rowconfig
-  alias grid_row 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)
+    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
   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)
+    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
   end
 
   def grid_info()
-    #list(tk_call('grid', 'info', epath))
-    TkGrid.info(self)
+    list(tk_call('grid', 'info', epath))
   end
 
   def grid_location(x, y)
-    #list(tk_call('grid', 'location', epath, x, y))
-    TkGrid.location(self, x, y)
+    list(tk_call('grid', 'location', epath, 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)
+      bool(tk_call('grid', 'propagate', epath))
     else
-      TkGrid.propagate(self, mode)
+      tk_call('grid', 'propagate', epath, mode)
       self
     end
   end
 
   def grid_remove()
-    #tk_call 'grid', 'remove', epath
-    TkGrid.remove(self)
+    tk_call 'grid', 'remove', epath
     self
   end
 
   def grid_size()
-    #list(tk_call('grid', 'size', epath))
-    TkGrid.size(self)
+    list(tk_call('grid', 'size', epath))
   end
 
   def grid_slaves(args)
-    #list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
-    TkGrid.slaves(self, args)
+    list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
   end
 
-  def place(keys)
-    #tk_call 'place', epath, *hash_kv(keys)
-    TkPlace.configure(self, keys)
+  def place(keys = nil)
+    tk_call 'place', epath, *hash_kv(keys)
     self
   end
 
@@ -5183,144 +4177,122 @@ class TkWindow<TkObject
     else
       keys = {'in'=>target}
     end
-    #tk_call 'place', epath, *hash_kv(keys)
-    TkPlace.configure(self, keys)
+    tk_call 'place', epath, *hash_kv(keys)
     self
   end
 
-  def  place_forget
-    #tk_call 'place', 'forget', epath
-    TkPlace.forget(self)
+  def unplace
+    tk_call 'place', 'forget', epath
     self
   end
-  alias unplace place_forget
+  alias place_forget unplace
 
   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)
+    if slot.kind_of? Hash
+      tk_call 'place', 'configure', epath, *hash_kv(slot)
+    else
+      tk_call 'place', 'configure', epath, "-#{slot}", value
+    end
   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)
+    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
   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)
+    ilist = list(tk_call('place', 'info', epath))
+    info = {}
+    while key = ilist.shift
+      info[key[1..-1]] = ilist.shift
+    end
+    return info
   end
 
   def place_slaves()
-    #list(tk_call('place', 'slaves', epath))
-    TkPlace.slaves(self)
+    list(tk_call('place', 'slaves', epath))
   end
 
-  def set_focus(force=false)
+  def focus(force=false)
     if force
-      tk_call_without_enc('focus', '-force', path)
+      tk_call 'focus', '-force', path
     else
-      tk_call_without_enc('focus', path)
+      tk_call '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)
+  def grab(*args)
+    if !args or args.length == 0
+      tk_call 'grab', 'set', path
+      self
+    elsif args.length == 1
+      case args[0]
+      when 'global', :global
+	#return(tk_call('grab', 'set', '-global', path))
+	tk_call('grab', 'set', '-global', path)
+	return self
+      when 'release', :release
+	#return tk_call('grab', 'release', path)
+	tk_call('grab', 'release', path)
+	return self
+      else
+	val = tk_call('grab', args[0], path)
+      end
+      case args[0]
+      when 'current', :current
+	return window(val)
+      when 'status', :status
+	return val
+      end
+      self
     else
-      return tk_call_without_enc('grab', opt, path)
+      fail ArgumentError, 'wrong # of args'
     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
+  def command(cmd=Proc.new)
+    configure_cmd 'command', cmd
   end
 
-  def colormodel(model=None)
-    tk_call('tk', 'colormodel', path, model)
+  def colormodel model=None
+    tk_call 'tk', 'colormodel', path, model
     self
   end
 
@@ -5337,23 +4309,21 @@ class TkWindow<TkObject
     }
     if defined?(@cmdtbl)
       for id in @cmdtbl
-        uninstall_cmd id
+	uninstall_cmd id
       end
     end
 
     children.each{|path, obj|
-      obj.instance_eval{
-        if defined?(@cmdtbl)
-          for id in @cmdtbl
-            uninstall_cmd id
-          end
-        end
-      }
+      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)
+      tk_call 'destroy', epath
     rescue
     end
     uninstall_win
@@ -5363,7 +4333,6 @@ class TkWindow<TkObject
     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
@@ -5389,31 +4358,21 @@ class TkWindow<TkObject
     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
@@ -5422,24 +4381,23 @@ class TkWindow<TkObject
       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
+	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
@@ -5453,7 +4411,1497 @@ class TkWindow<TkObject
     bindtags(bindtags().unshift(tag))
   end
 end
-TkWidget = TkWindow
+
+class TkRoot<TkWindow
+  include Wm
+
+=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['.']
+    if keys  # wm commands
+      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 create_self
+    @path = '.'
+  end
+  private :create_self
+
+  def path
+    "."
+  end
+
+  def TkRoot.destroy
+    TkCore::INTERP._invoke('destroy', '.')
+  end
+end
+
+class TkToplevel<TkWindow
+  include Wm
+
+  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 _wm_command_option_chk(keys)
+    keys = {} unless keys
+    new_keys = {}
+    wm_cmds = {}
+    keys.each{|k,v|
+      if 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 'toplevel', @path, *hash_kv(keys)
+    else
+      tk_call 'toplevel', @path
+    end
+  end
+  private :create_self
+
+  def specific_class
+    @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)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bind(*args)
+    end
+  end
+  def self.bind_append(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bind_append(*args)
+    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
+
+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 initialize(parent=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)
+    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 'frame', @path, *hash_kv(keys)
+    else
+      tk_call '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)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bind(*args)
+    end
+  end
+  def self.bind_append(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bind_append(*args)
+    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
+
+class TkLabelFrame<TkFrame
+  TkCommandNames = ['labelframe'.freeze].freeze
+  WidgetClassName = 'Labelframe'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'labelframe', @path, *hash_kv(keys)
+    else
+      tk_call 'labelframe', @path
+    end
+  end
+  private :create_self
+end
+TkLabelframe = TkLabelFrame
+
+class TkPanedWindow<TkWindow
+  TkCommandNames = ['panedwindow'.freeze].freeze
+  WidgetClassName = 'Panedwindow'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'panedwindow', @path, *hash_kv(keys)
+    else
+      tk_call '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 += hash_kv(keys)
+    else
+      args.push(keys) if keys
+    end
+    tk_send('add', *args)
+    self
+  end
+
+  def forget(win, *wins)
+    tk_send('forget', win, *wins)
+    self
+  end
+  alias del forget
+  alias delete forget
+  alias remove forget
+
+  def identify(x, y)
+    list(tk_send('identify', x, y))
+  end
+
+  def proxy_coord
+    list(tk_send('proxy', 'coord'))
+  end
+  def proxy_forget
+    tk_send('proxy', 'forget')
+    self
+  end
+  def proxy_place(x, y)
+    tk_send('proxy', 'place', x, y)
+    self
+  end
+
+  def sash_coord(index)
+    list(tk_send('sash', 'coord', index))
+  end
+  def sash_dragto(index)
+    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)
+    tk_tcl2ruby(tk_send('panecget', win, "-#{key}"))
+  end
+
+  def paneconfigure(win, key, value=nil)
+    if key.kind_of? Hash
+      tk_send('paneconfigure', win, *hash_kv(key))
+    else
+      tk_send('paneconfigure', win, "-#{key}", value)
+    end
+    self
+  end
+  alias pane_config paneconfigure
+
+  def paneconfiginfo(win, key=nil)
+    if key
+      conf = tk_split_list(tk_send('paneconfigure', win, "-#{key}"))
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_simplelist(tk_send('paneconfigure', win)).collect{|conflist|
+	conf = tk_split_simplelist(conflist)
+	conf[0] = conf[0][1..-1]
+	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
+	conf
+      }
+    end
+  end
+  alias pane_configinfo paneconfiginfo
+
+  def panes
+    list(tk_send('panes'))
+  end
+end
+TkPanedwindow = TkPanedWindow
+
+class TkLabel<TkWindow
+  TkCommandNames = ['label'.freeze].freeze
+  WidgetClassName = 'Label'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'label', @path, *hash_kv(keys)
+    else
+      tk_call 'label', @path
+    end
+  end
+  private :create_self
+
+  def textvariable(v)
+    configure 'textvariable', tk_trace_variable(v)
+  end
+end
+
+class TkButton<TkLabel
+  TkCommandNames = ['button'.freeze].freeze
+  WidgetClassName = 'Button'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'button', @path, *hash_kv(keys)
+    else
+      tk_call 'button', @path
+    end
+  end
+  private :create_self
+
+  def invoke
+    tk_send 'invoke'
+  end
+  def flash
+    tk_send 'flash'
+    self
+  end
+end
+
+class TkRadioButton<TkButton
+  TkCommandNames = ['radiobutton'.freeze].freeze
+  WidgetClassName = 'Radiobutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'radiobutton', @path, *hash_kv(keys)
+    else
+      tk_call 'radiobutton', @path
+    end
+  end
+  private :create_self
+
+  def deselect
+    tk_send 'deselect'
+    self
+  end
+  def select
+    tk_send 'select'
+    self
+  end
+  def variable(v)
+    configure 'variable', tk_trace_variable(v)
+  end
+end
+TkRadiobutton = TkRadioButton
+
+class TkCheckButton<TkRadioButton
+  TkCommandNames = ['checkbutton'.freeze].freeze
+  WidgetClassName = 'Checkbutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'checkbutton', @path, *hash_kv(keys)
+    else
+      tk_call 'checkbutton', @path
+    end
+  end
+  private :create_self
+
+  def toggle
+    tk_send 'toggle'
+    self
+  end
+end
+TkCheckbutton = TkCheckButton
+
+class TkMessage<TkLabel
+  TkCommandNames = ['message'.freeze].freeze
+  WidgetClassName = 'Message'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'message', @path, *hash_kv(keys)
+    else
+      tk_call 'message', @path
+    end
+  end
+  private :create_self
+end
+
+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')
+	cmd = keys.delete('command')
+	keys['command'] = proc{|val| cmd.call(val.to_f)}
+      end
+      tk_call 'scale', @path, *hash_kv(keys)
+    else
+      tk_call 'scale', @path
+    end
+  end
+  private :create_self
+
+  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('get', x, y))
+  end
+
+  def coords(val=None)
+    tk_split_list(tk_send('coords', val))
+  end
+
+  def identify(x, y)
+    tk_send('identify', x, y)
+  end
+
+  def set(val)
+    tk_send("set", val)
+  end
+
+  def value
+    get
+  end
+
+  def value= (val)
+    set(val)
+  end
+end
+
+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 'scrollbar', @path, *hash_kv(keys)
+    else
+      tk_call 'scrollbar', @path
+    end
+  end
+  private :create_self
+
+  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.set(first, last)}
+      else # 'vertical'
+	w.yscrollcommand proc{|first, last| self.set(first, last)}
+      end
+    }
+    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 delta(deltax=None, deltay=None)
+    number(tk_send('delta', deltax, deltay))
+  end
+
+  def fraction(x=None, y=None)
+    number(tk_send('fraction', x, y))
+  end
+
+  def identify(x, y)
+    tk_send('identify', x, y)
+  end
+
+  def get
+    ary1 = tk_send('get').split
+    ary2 = []
+    for i in ary1
+      ary2.push number(i)
+    end
+    ary2
+  end
+
+  def set(first, last)
+    tk_send "set", first, last
+    self
+  end
+
+  def activate(element=None)
+    tk_send('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
+
+class TkTextWin<TkWindow
+  def create_self
+    fail RuntimeError, "TkTextWin is an abstract class"
+  end
+  private :create_self
+
+  def bbox(index)
+    list(tk_send('bbox', index))
+  end
+  def delete(first, last=None)
+    tk_send 'delete', first, last
+    self
+  end
+  def get(*index)
+    tk_send 'get', *index
+  end
+  def insert(index, *args)
+    tk_send 'insert', index, *args
+    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(index)
+    tk_send 'see', index
+    self
+  end
+end
+
+module TkTreatListItemFont
+  include TkTreatItemFont
+
+  ItemCMD = ['itemconfigure'.freeze, TkComm::None].freeze
+  def __conf_cmd(idx)
+    ItemCMD[idx]
+  end
+
+  def __item_pathname(tagOrId)
+    self.path + ';' + tagOrId.to_s
+  end
+
+  private :__conf_cmd, :__item_pathname
+end
+
+class TkListbox<TkTextWin
+  include TkTreatListItemFont
+  include Scrollable
+
+  TkCommandNames = ['listbox'.freeze].freeze
+  WidgetClassName = 'Listbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'listbox', @path, *hash_kv(keys)
+    else
+      tk_call 'listbox', @path
+    end
+  end
+  private :create_self
+
+  def activate(y)
+    tk_send 'activate', y
+    self
+  end
+  def curselection
+    list(tk_send('curselection'))
+  end
+  def get(*index)
+    v = tk_send('get', *index)
+    if index.size == 1
+      v
+    else
+      tk_split_simplelist(v)
+    end
+  end
+  def nearest(y)
+    tk_send('nearest', y).to_i
+  end
+  def size
+    tk_send('size').to_i
+  end
+  def selection_anchor(index)
+    tk_send 'selection', 'anchor', index
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send 'selection', 'clear', first, last
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send 'selection', 'set', first, last
+    self
+  end
+
+  def index(index)
+    tk_send('index', index).to_i
+  end
+
+  def itemcget(index, key)
+    case key.to_s
+    when 'text', 'label', 'show'
+      tk_send('itemcget', index, "-#{key}")
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('itemcget', index, "-#{key}"))
+      fnt = tk_tcl2ruby(tk_send('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(tk_send('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 'itemconfigure', index, *hash_kv(key)
+      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 key
+      case key.to_s
+      when 'text', 'label', 'show'
+	conf = tk_split_simplelist(tk_send('itemconfigure',index,"-#{key}"))
+      when 'font', 'kanjifont'
+	conf = tk_split_simplelist(tk_send('itemconfigure',index,"-#{key}") )
+	conf[4] = tagfont_configinfo(index, conf[4])
+      else
+	conf = tk_split_list(tk_send('itemconfigure',index,"-#{key}"))
+      end
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      ret = tk_split_simplelist(tk_send('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
+      }
+      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
+  end
+end
+
+module TkTreatMenuEntryFont
+  include TkTreatItemFont
+
+  ItemCMD = ['entryconfigure'.freeze, TkComm::None].freeze
+  def __conf_cmd(idx)
+    ItemCMD[idx]
+  end
+  
+  def __item_pathname(tagOrId)
+    self.path + ';' + tagOrId.to_s
+  end
+
+  private :__conf_cmd, :__item_pathname
+end
+
+class TkMenu<TkWindow
+  include TkTreatMenuEntryFont
+
+  TkCommandNames = ['menu'.freeze].freeze
+  WidgetClassName = 'Menu'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'menu', @path, *hash_kv(keys)
+    else
+      tk_call 'menu', @path
+    end
+  end
+  private :create_self
+
+  def activate(index)
+    tk_send 'activate', index
+    self
+  end
+  def add(type, keys=nil)
+    tk_send 'add', type, *hash_kv(keys)
+    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 index(index)
+    ret = tk_send('index', index)
+    (ret == 'none')? nil: number(ret)
+  end
+  def invoke(index)
+    tk_send 'invoke', index
+  end
+  def insert(index, type, keys=nil)
+    tk_send 'insert', index, type, *hash_kv(keys)
+    self
+  end
+  def delete(index, last=None)
+    tk_send 'delete', index, last
+    self
+  end
+  def popup(x, y, index=None)
+    tk_call('tk_popup', path, x, y, index)
+    self
+  end
+  def post(x, y)
+    tk_send 'post', x, y
+    self
+  end
+  def postcascade(index)
+    tk_send 'postcascade', index
+    self
+  end
+  def postcommand(cmd=Proc.new)
+    configure_cmd 'postcommand', cmd
+    self
+  end
+  def set_focus
+    tk_call('tk_menuSetFocus', path)
+  end
+  def tearoffcommand(cmd=Proc.new)
+    configure_cmd 'tearoffcommand', cmd
+    self
+  end
+  def menutype(index)
+    tk_send 'type', index
+  end
+  def unpost
+    tk_send 'unpost'
+  end
+  def yposition(index)
+    number(tk_send('yposition', index))
+  end
+  def entrycget(index, key)
+    case key.to_s
+    when 'text', 'label', 'show'
+      tk_send 'entrycget', index, "-#{key}"
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('entrycget', index, "-#{key}"))
+      fnt = tk_tcl2ruby(tk_send('entrycget', 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(tk_send('entrycget', 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 'entryconfigure', index, *hash_kv(key)
+      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 key
+      case key.to_s
+      when 'text', 'label', 'show'
+	conf = tk_split_simplelist(tk_send('entryconfigure',index,"-#{key}"))
+      when 'font', 'kanjifont'
+	conf = tk_split_simplelist(tk_send('entryconfigure',index,"-#{key}"))
+	conf[4] = tagfont_configinfo(index, conf[4])
+      else
+	conf = tk_split_list(tk_send('entryconfigure',index,"-#{key}"))
+      end
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      ret = tk_split_simplelist(tk_send('entryconfigure', 
+					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
+      }
+      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
+  end
+end
+
+class TkMenuClone<TkMenu
+  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 @parent.path, 'clone', @path, type
+  end
+end
+
+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)
+    #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 'menubutton', @path, *hash_kv(keys)
+    else
+      tk_call 'menubutton', @path
+    end
+  end
+  private :create_self
+end
+
+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(parent=nil, var=TkVariable.new, firstval=nil, *vals)
+    if parent.kind_of? Hash
+       keys = _symbolkey2str(parent)
+       parent = keys['parent']
+       var = keys['variable'] if keys['variable']
+       firstval, *vals = keys['values']
+    end
+    fail 'variable option must be TkVariable' unless var.kind_of? TkVariable
+    @variable = var
+    firstval = @variable.value unless firstval
+    @variable.value = firstval
+    install_win(if parent then parent.path end)
+    @menu = OptionMenu.new(tk_call('tk_optionMenu', @path, @variable.id, 
+				   firstval, *vals))
+  end
+
+  def value
+    @variable.value
+  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.add(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 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
+end
+
+module TkComposite
+  include Tk
+  extend Tk
+
+  def initialize(parent=nil, *args)
+    @delegates = {} 
+
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+      @frame = TkFrame.new(parent)
+      @delegates['DEFAULT'] = @frame
+      @path = @epath = @frame.path
+      initialize_composite(keys)
+    else
+      @frame = TkFrame.new(parent)
+      @delegates['DEFAULT'] = @frame
+      @path = @epath = @frame.path
+      initialize_composite(*args)
+    end
+  end
+
+  def epath
+    @epath
+  end
+
+  def initialize_composite(*args) end
+  private :initialize_composite
+
+  def delegate(option, *wins)
+    if @delegates[option].kind_of?(Array)
+      for i in wins
+	@delegates[option].push(i)
+      end
+    else
+      @delegates[option] = wins
+    end
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of? Hash
+      slot.each{|slot,value| configure slot, value}
+    else
+      if @delegates and @delegates[slot]
+	for i in @delegates[slot]
+	  if not i
+	    i = @delegates['DEFALUT']
+	    redo
+	  else
+	    last = i.configure(slot, value)
+	  end
+	end
+	last
+      else
+	super
+      end
+    end
+  end
+end
+
+module TkClipboard
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['clipboard'.freeze].freeze
+
+  def self.clear(win=nil)
+    if win
+      tk_call 'clipboard', 'clear', '-displayof', win
+    else
+      tk_call 'clipboard', 'clear'
+    end
+  end
+  def self.clear_on_display(win)
+    tk_call 'clipboard', 'clear', '-displayof', win
+  end
+
+  def self.get(type=nil)
+    if type
+      tk_call 'clipboard', 'get', '-type', type
+    else
+      tk_call 'clipboard', 'get'
+    end
+  end
+  def self.get_on_display(win, type=nil)
+    if type
+      tk_call 'clipboard', 'get', '-displayof', win, '-type', type
+    else
+      tk_call '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 += hash_kv(keys)
+    args += ['--', data]
+    tk_call(*args)
+  end
+  def self.append_on_display(win, data, keys=nil)
+    args = ['clipboard', 'append', '-displayof', win]
+    args += hash_kv(keys)
+    args += ['--', 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
+
+# widget_destroy_hook
+require 'tkvirtevent'
+TkBindTag::ALL.bind(TkVirtualEvent.new('Destroy'), proc{|xpath| 
+		      path = xpath[1..-1]
+		      if (widget = TkCore::INTERP.tk_windows[path])
+			if widget.respond_to?(:__destroy_hook__)
+			  begin
+			    widget.__destroy_hook__
+			  rescue Exception
+			  end
+			end
+		      end
+		    }, 'x%W')
 
 # freeze core modules
 #TclTkLib.freeze
@@ -5465,21 +5913,27 @@ TkWidget = TkWindow
 #TkCore.freeze
 #Tk.freeze
 
-module Tk
-  RELEASE_DATE = '2008-05-23'.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
+# autoload
+autoload :TkCanvas, 'tkcanvas'
+autoload :TkImage, 'tkcanvas'
+autoload :TkBitmapImage, 'tkcanvas'
+autoload :TkPhotoImage, 'tkcanvas'
+autoload :TkEntry, 'tkentry'
+autoload :TkSpinbox, 'tkentry'
+autoload :TkText, 'tktext'
+autoload :TkDialog, 'tkdialog'
+autoload :TkDialog2, 'tkdialog'
+autoload :TkWarning, 'tkdialog'
+autoload :TkWarning2, 'tkdialog'
+autoload :TkMenubar, 'tkmenubar'
+autoload :TkAfter, 'tkafter'
+autoload :TkTimer, 'tkafter'
+autoload :TkPalette, 'tkpalette'
+autoload :TkFont, 'tkfont'
+autoload :TkBgError, 'tkbgerror'
+autoload :TkManageFocus, 'tkmngfocus'
+autoload :TkPalette, 'tkpalette'
+autoload :TkWinDDE, 'tkwinpkg'
+autoload :TkWinRegistry, 'tkwinpkg'
+autoload :TkMacResource, 'tkmacpkg'
+autoload :TkConsole, 'tkconsole'
diff --git a/ext/tk/lib/tk/after.rb b/ext/tk/lib/tk/after.rb
deleted file mode 100644
index 8c58210331..0000000000
--- a/ext/tk/lib/tk/after.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#   tk/after.rb : methods for Tcl/Tk after command
-#
-#   $Id$
-#
-require 'tk/timer'
diff --git a/ext/tk/lib/tk/autoload.rb b/ext/tk/lib/tk/autoload.rb
deleted file mode 100644
index 0773f7708d..0000000000
--- a/ext/tk/lib/tk/autoload.rb
+++ /dev/null
@@ -1,414 +0,0 @@
-#
-#  autoload
-#
-############################################
-#  geometry manager
-module Tk
-  autoload :Grid,             'tk/grid'
-  def Grid(*args); TkGrid.configure(*args); end
-
-  autoload :Pack,             'tk/pack'
-  def Pack(*args); TkPack.configure(*args); end
-
-  autoload :Place,            'tk/place'
-  def Place(*args); TkPlace.configure(*args); end
-end
-
-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
-
-
-############################################
-# classes on Tk module
-module Tk
-  autoload :Button,           'tk/button'
-
-  autoload :Canvas,           'tk/canvas'
-
-  autoload :CheckButton,      'tk/checkbutton'
-  autoload :Checkbutton,      'tk/checkbutton'
-
-  autoload :Entry,            'tk/entry'
-
-  autoload :Frame,            'tk/frame'
-
-  autoload :Label,            'tk/label'
-
-  autoload :LabelFrame,       'tk/labelframe'
-  autoload :Labelframe,       'tk/labelframe'
-
-  autoload :Listbox,          'tk/listbox'
-
-  autoload :Menu,             'tk/menu'
-  autoload :MenuClone,        'tk/menu'
-  autoload :CloneMenu,        'tk/menu'
-  autoload :SystemMenu,       'tk/menu'
-  autoload :SysMenu_Help,     'tk/menu'
-  autoload :SysMenu_System,   'tk/menu'
-  autoload :SysMenu_Apple,    'tk/menu'
-  autoload :Menubutton,       'tk/menu'
-  autoload :MenuButton,       'tk/menu'
-  autoload :OptionMenubutton, 'tk/menu'
-  autoload :OptionMenBbutton, 'tk/menu'
-
-  autoload :Message,          'tk/message'
-
-  autoload :PanedWindow,      'tk/panedwindow'
-  autoload :Panedwindow,      'tk/panedwindow'
-
-  autoload :RadioButton,      'tk/radiobutton'
-  autoload :Radiobutton,      'tk/radiobutton'
-
-  autoload :Root,             'tk/root'
-
-  autoload :Scale,            'tk/scale'
-
-  autoload :Scrollbar,        'tk/scrollbar'
-  autoload :XScrollbar,       'tk/scrollbar'
-  autoload :YScrollbar,       'tk/scrollbar'
-
-  autoload :Spinbox,          'tk/spinbox'
-
-  autoload :Text,             'tk/text'
-
-  autoload :Toplevel,         'tk/toplevel'
-end
-
-
-############################################
-# 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 :Wm_for_General,   'tk/wm'
-
-  autoload :MacResource,      'tk/macpkg'
-
-  autoload :WinDDE,           'tk/winpkg'
-  autoload :WinRegistry,      'tk/winpkg'
-
-  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
-
-
-############################################
-#  toplevel classes/modules (fixed)
-autoload :TkBgError,          'tk/bgerror'
-
-autoload :TkBindTag,          'tk/bindtag'
-autoload :TkBindTagAll,       'tk/bindtag'
-autoload :TkDatabaseClass,    'tk/bindtag'
-
-autoload :TkConsole,          'tk/console'
-
-autoload :TkcItem,            'tk/canvas'
-autoload :TkcArc,             'tk/canvas'
-autoload :TkcBitmap,          'tk/canvas'
-autoload :TkcImage,           'tk/canvas'
-autoload :TkcLine,            'tk/canvas'
-autoload :TkcOval,            'tk/canvas'
-autoload :TkcPolygon,         'tk/canvas'
-autoload :TkcRectangle,       'tk/canvas'
-autoload :TkcText,            'tk/canvas'
-autoload :TkcWindow,          '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 :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 :TkEvent,            'tk/event'
-
-autoload :TkFont,             'tk/font'
-autoload :TkNamedFont,        'tk/font'
-
-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 :TkSystemMenu,       'tk/menu'
-
-autoload :TkMenubar,          'tk/menubar'
-
-autoload :TkMenuSpec,         'tk/menuspec'
-
-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 :TkRoot,             'tk/root'
-
-autoload :TkScrollbox,        'tk/scrollbox'
-
-autoload :TkSelection,        'tk/selection'
-
-autoload :TkTreatTagFont,     'tk/tagfont'
-
-autoload :TkTextImage,        'tk/textimage'
-autoload :TktImage,           'tk/textimage'
-
-autoload :TkTextMark,         'tk/textmark'
-autoload :TkTextNamedMark,    'tk/textmark'
-autoload :TkTextMarkInsert,   'tk/textmark'
-autoload :TkTextMarkCurrent,  'tk/textmark'
-autoload :TkTextMarkAnchor,   'tk/textmark'
-autoload :TktMark,            'tk/textmark'
-autoload :TktNamedMark,       'tk/textmark'
-autoload :TktMarkInsert,      'tk/textmark'
-autoload :TktMarkCurrent,     'tk/textmark'
-autoload :TktMarkAnchor,      'tk/textmark'
-
-autoload :TkTextTag,          'tk/texttag'
-autoload :TkTextNamedTag,     'tk/texttag'
-autoload :TkTextTagSel,       'tk/texttag'
-autoload :TktTag,             'tk/texttag'
-autoload :TktNamedTag,        'tk/texttag'
-autoload :TktTagSel,          'tk/texttag'
-
-autoload :TkTextWindow,       'tk/textwindow'
-autoload :TktWindow,          'tk/textwindow'
-
-autoload :TkAfter,            'tk/timer'
-autoload :TkTimer,            'tk/timer'
-autoload :TkRTTimer,          'tk/timer'
-
-autoload :TkTextWin,          'tk/txtwin_abst'
-
-autoload :TkValidation,       'tk/validation'
-autoload :TkValidateCommand,  'tk/validation'
-
-autoload :TkVariable,         'tk/variable'
-autoload :TkVarAccess,        'tk/variable'
-
-autoload :TkVirtualEvent,     'tk/virtevent'
-autoload :TkNamedVirtualEvent,'tk/virtevent'
-
-autoload :TkWinfo,            'tk/winfo'
-
-autoload :TkXIM,              'tk/xim'
-
-
-############################################
-#  toplevel classes/modules (switchable)
-module Tk
-  @TOPLEVEL_ALIAS_TABLE = {}
-  @TOPLEVEL_ALIAS_TABLE[:Tk] = {
-    :TkButton             => 'tk/button', 
-
-    :TkCanvas             => 'tk/canvas', 
-
-    :TkCheckButton        => 'tk/checkbutton', 
-    :TkCheckbutton        => 'tk/checkbutton', 
-
-    # :TkDialog             => 'tk/dialog', 
-    # :TkDialog2            => 'tk/dialog', 
-    # :TkDialogObj          => 'tk/dialog', 
-    # :TkWarning            => 'tk/dialog', 
-    # :TkWarning2           => 'tk/dialog', 
-    # :TkWarningObj         => 'tk/dialog', 
-
-    :TkEntry              => 'tk/entry', 
-
-    :TkFrame              => 'tk/frame', 
-
-    :TkLabel              => 'tk/label', 
-
-    :TkLabelFrame         => 'tk/labelframe', 
-    :TkLabelframe         => 'tk/labelframe', 
-
-    :TkListbox            => 'tk/listbox', 
-
-    :TkMacResource        => 'tk/macpkg', 
-
-    :TkMenu               => 'tk/menu', 
-    :TkMenuClone          => 'tk/menu', 
-    :TkCloneMenu          => 'tk/menu', 
-    # :TkSystemMenu         => 'tk/menu', 
-    :TkSysMenu_Help       => 'tk/menu', 
-    :TkSysMenu_System     => 'tk/menu', 
-    :TkSysMenu_Apple      => 'tk/menu', 
-    :TkMenubutton         => 'tk/menu', 
-    :TkMenuButton         => 'tk/menu', 
-    :TkOptionMenubutton   => 'tk/menu', 
-    :TkOptionMenuButton   => 'tk/menu', 
-
-    :TkMessage            => 'tk/message', 
-
-    :TkPanedWindow        => 'tk/panedwindow', 
-    :TkPanedwindow        => 'tk/panedwindow', 
-
-    :TkRadioButton        => 'tk/radiobutton', 
-    :TkRadiobutton        => 'tk/radiobutton', 
-
-    # :TkRoot               => 'tk/root', 
-
-    :TkScale              => 'tk/scale', 
-
-    :TkScrollbar          => 'tk/scrollbar', 
-    :TkXScrollbar         => 'tk/scrollbar', 
-    :TkYScrollbar         => 'tk/scrollbar', 
-
-    :TkSpinbox            => 'tk/spinbox', 
-
-    :TkText               => 'tk/text', 
-
-    :TkToplevel           => 'tk/toplevel', 
-
-    :TkWinDDE             => 'tk/winpkg', 
-    :TkWinRegistry        => 'tk/winpkg', 
-  }
-
-  @TOPLEVEL_ALIAS_OWNER = {}
-
-  @TOPLEVEL_ALIAS_SETUP_PROC = {}
-
-  @current_default_widget_set = nil
-end
-
-
-############################################
-#  methods to control default widget set
-############################################
-
-class << Tk
-  def default_widget_set
-    @current_default_widget_set
-  end
-
-  def default_widget_set=(target)
-    target = target.to_sym
-    return target if target == @current_default_widget_set
-
-    if (cmd = @TOPLEVEL_ALIAS_SETUP_PROC[target])
-      cmd.call(target)
-    end
-
-    _replace_toplevel_aliases(target)
-  end
-
-  def __set_toplevel_aliases__(target, obj, *symbols)
-    @TOPLEVEL_ALIAS_TABLE[target = target.to_sym] ||= {}
-    symbols.each{|sym|
-      @TOPLEVEL_ALIAS_TABLE[target][sym = sym.to_sym] = obj
-      # if @current_default_widget_set == target
-      if @TOPLEVEL_ALIAS_OWNER[sym] == target
-        Object.class_eval{remove_const sym} if Object.const_defined?(sym)
-        Object.const_set(sym, obj)
-      end
-    }
-  end
-
-  ###################################
-  private
-  def _replace_toplevel_aliases(target)
-    # check already autoloaded
-    if (table = @TOPLEVEL_ALIAS_TABLE[current = @current_default_widget_set])
-      table.each{|sym, file|
-        if !Object.autoload?(sym) && Object.const_defined?(sym) && 
-            @TOPLEVEL_ALIAS_TABLE[current][sym].kind_of?(String)
-          # autoload -> class
-          @TOPLEVEL_ALIAS_TABLE[current][sym] = Object.const_get(sym)
-        end
-      }
-    end
-
-    # setup autoloads
-    @TOPLEVEL_ALIAS_TABLE[target].each{|sym, file|
-      Object.class_eval{remove_const sym} if Object.const_defined?(sym)
-      if file.kind_of?(String)
-        # file => autoload target file
-        Object.autoload(sym, file)
-      else
-        # file => loaded class object
-        Object.const_set(sym, file)
-      end
-      @TOPLEVEL_ALIAS_OWNER[sym] = target
-    }
-
-    # update current alias
-    @current_default_widget_set = target
-  end
-end
-
-############################################
-# setup default widget set => :Tk
-Tk.default_widget_set = :Tk
-
-
-############################################
-#  depend on the version of Tcl/Tk
-# major, minor, type, type_name, patchlevel = TclTkLib.get_version
-
-############################################
-# Ttk (Tile) support
-=begin
-if major > 8 || 
-    (major == 8 && minor > 5) || 
-    (major == 8 && minor == 5 && type >= TclTkLib::RELEASE_TYPE::BETA) 
-  # Tcl/Tk 8.5 beta or later
-  Object.autoload :Ttk, 'tkextlib/tile'
-  Tk.autoload :Tile, 'tkextlib/tile'
-
-  require 'tk/ttk_selector'
-end
-=end
-Object.autoload :Ttk, 'tkextlib/tile'
-Tk.autoload :Tile, 'tkextlib/tile'
-require 'tk/ttk_selector'
diff --git a/ext/tk/lib/tk/bgerror.rb b/ext/tk/lib/tk/bgerror.rb
deleted file mode 100644
index c82a8e046b..0000000000
--- a/ext/tk/lib/tk/bgerror.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#  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/ext/tk/lib/tk/bindtag.rb b/ext/tk/lib/tk/bindtag.rb
deleted file mode 100644
index 88c8367a88..0000000000
--- a/ext/tk/lib/tk/bindtag.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# 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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    BTagID_TBL.mutex.synchronize{ BTagID_TBL.clear }
-  }
-
-  def TkBindTag.id2obj(id)
-    BTagID_TBL.mutex.synchronize{
-      (BTagID_TBL[id])? BTagID_TBL[id]: id
-    }
-  end
-
-=begin
-  def TkBindTag.new_by_name(name, *args, &b)
-    BTagID_TBL.mutex.synchronize{
-      return BTagID_TBL[name] if BTagID_TBL[name]
-    }
-
-    self.new.instance_eval{
-      BTagID_TBL.mutex.synchronize{
-        BTagID_TBL.delete @id
-        @id = name
-        BTagID_TBL[@id] = self
-      }
-      bind(*args, &b) if args != []
-      self
-    }
-  end
-=end
-  def TkBindTag.new_by_name(name, *args, &b)
-    obj = nil
-    BTagID_TBL.mutex.synchronize{
-      if BTagID_TBL[name]
-        obj = BTagID_TBL[name]
-      else
-        (obj = BTagID_TBL[name] = self.allocate).instance_eval{
-          @id = name
-        }
-      end
-    }
-    bind(*args, &b) if obj && args != []
-    obj
-  end
-
-  def initialize(*args, &b)
-    Tk_BINDTAG_ID.mutex.synchronize{
-      # @id = Tk_BINDTAG_ID.join('')
-      @id = Tk_BINDTAG_ID.join(TkCore::INTERP._ip_id_)
-      Tk_BINDTAG_ID[1].succ!
-    }
-    BTagID_TBL.mutex.synchronize{
-      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
-=begin
-  def self.new(name, *args, &b)
-    BTagID_TBL.mutex.synchronize{
-      return BTagID_TBL[name] if BTagID_TBL[name]
-    }
-    super(name, *args, &b)
-  end
-
-  def initialize(name, *args, &b)
-    @id = name
-    BTagID_TBL.mutex.synchronize{
-      BTagID_TBL[@id] = self
-    }
-    bind(*args, &b) if args != []
-  end
-=end
-  def self.new(name, *args, &b)
-    BTagID_TBL.mutex.synchronize{
-      if BTagID_TBL[name]
-        BTagID_TBL[name]
-      else
-        BTagID_TBL[name] = self.allocate.instance_eval{
-          initialize(name, *args, &b)
-          self
-        }
-      end
-    }
-  end
-
-  def initialize(name, *args, &b)
-    @id = name
-    bind(*args, &b) if args != []
-  end
-
-  def inspect
-    #Kernel.format "#<TkDatabaseClass: %s>", @id
-    '#<TkDatabaseClass: ' + @id + '>'
-  end
-end
diff --git a/ext/tk/lib/tk/button.rb b/ext/tk/lib/tk/button.rb
deleted file mode 100644
index 770a5785bb..0000000000
--- a/ext/tk/lib/tk/button.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# tk/button.rb : treat button widget
-#
-require 'tk'
-require 'tk/label'
-
-class Tk::Button<Tk::Label
-  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
-
-#TkButton = Tk::Button unless Object.const_defined? :TkButton
-Tk.__set_toplevel_aliases__(:Tk, Tk::Button, :TkButton)
diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
deleted file mode 100644
index 36ea008a17..0000000000
--- a/ext/tk/lib/tk/canvas.rb
+++ /dev/null
@@ -1,789 +0,0 @@
-#
-#               tk/canvas.rb - Tk canvas classes
-#                       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 Tk::Canvas<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
-  alias canvas_x canvasx
-  alias canvas_y canvasy
-
-  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)
-    tbl = nil
-    TkcItem::CItemID_TBL.mutex.synchronize{
-      tbl = TkcItem::CItemID_TBL[self.path]
-    }
-    if tbl
-      args.each{|tag|
-        find('withtag', tag).each{|item|
-          if item.kind_of?(TkcItem)
-            TkcItem::CItemID_TBL.mutex.synchronize{
-              tbl.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
-
-#TkCanvas = Tk::Canvas unless Object.const_defined? :TkCanvas
-Tk.__set_toplevel_aliases__(:Tk, Tk::Canvas, :TkCanvas)
-
-
-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.mutex.synchronize{ CItemID_TBL.clear }
-  }
-
-  def TkcItem.type2class(type)
-    CItemTypeToClass[type]
-  end
-
-  def TkcItem.id2obj(canvas, id)
-    cpath = canvas.path
-    CItemID_TBL.mutex.synchronize{
-      if CItemID_TBL[cpath]
-        CItemID_TBL[cpath][id]? CItemID_TBL[cpath][id]: id
-      else
-        id
-      end
-    }
-  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_optkey_aliases(nil).each{|alias_name, real_name|
-        alias_name = alias_name.to_s
-        if keys.has_key?(alias_name)
-          keys[real_name.to_s] = keys.delete(alias_name)
-        end
-      }
-
-      __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?(Tk::Canvas)
-    #  fail ArgumentError, "expect Tk::Canvas for 1st argument"
-    #end
-    @parent = @c = parent
-    @path = parent.path
-
-    @id = create_self(*args) # an integer number as 'canvas item id'
-    CItemID_TBL.mutex.synchronize{
-      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.mutex.synchronize{
-      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/ext/tk/lib/tk/canvastag.rb b/ext/tk/lib/tk/canvastag.rb
deleted file mode 100644
index 49796d80b2..0000000000
--- a/ext/tk/lib/tk/canvastag.rb
+++ /dev/null
@@ -1,434 +0,0 @@
-#
-# 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 cget_strict(option)
-    @c.itemcget_strict(@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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    CTagID_TBL.mutex.synchronize{ CTagID_TBL.clear }
-  }
-
-  def TkcTag.id2obj(canvas, id)
-    cpath = canvas.path
-    CTagID_TBL.mutex.synchronize{
-      if CTagID_TBL[cpath]
-        CTagID_TBL[cpath][id]? CTagID_TBL[cpath][id]: id
-      else 
-        id
-      end
-    }
-  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
-    Tk_CanvasTag_ID.mutex.synchronize{
-      # @path = @id = Tk_CanvasTag_ID.join('')
-      @path = @id = Tk_CanvasTag_ID.join(TkCore::INTERP._ip_id_)
-      Tk_CanvasTag_ID[1].succ!
-    }
-    CTagID_TBL.mutex.synchronize{
-      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
-  def id
-    @id
-  end
-
-  def exist?
-    if @c.find_withtag(@id)
-      true
-    else
-      false
-    end
-  end
-
-  def delete
-    @c.delete @id
-    CTagID_TBL.mutex.synchronize{
-      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, mode=nil, *args)
-    obj = nil
-    CTagID_TBL.mutex.synchronize{
-      if CTagID_TBL[parent.path] && CTagID_TBL[parent.path][name]
-        obj = CTagID_TBL[parent.path][name]
-      else
-        # super(parent, name, *args)
-        (obj = self.allocate).instance_eval{
-          @c = parent
-          @cpath = parent.path
-          @path = @id = name
-          CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-          CTagID_TBL[@cpath][@id] = self
-        }
-      end
-    }
-    if obj && mode
-      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
-    end
-    obj
-  end
-
-  def initialize(parent, name, mode=nil, *args)
-    # dummy:: not called by 'new' method
-
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    @path = @id = name
-
-    if mode
-      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
-    end
-  end
-end
-TkcNamedTag = TkcTagString
-
-class TkcTagAll<TkcTagString
-  def self.new(parent)
-    super(parent, 'all')
-  end
-=begin
-  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.mutex.synchronize{
-      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-      CTagID_TBL[@cpath][@id] = self
-    }
-  end
-=end
-end
-
-class TkcTagCurrent<TkcTagString
-  def self.new(parent)
-    super(parent, 'current')
-  end
-=begin
-  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.mutex.synchronize{
-      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-      CTagID_TBL[@cpath][@id] = self
-    }
-  end
-=end
-end
-
-class TkcGroup<TkcTag
-  (Tk_cGroup_ID = ['tkcg'.freeze, '00000'.taint]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    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
-    Tk_cGroup_ID.mutex.synchronize{
-      # @path = @id = Tk_cGroup_ID.join('')
-      @path = @id = Tk_cGroup_ID.join(TkCore::INTERP._ip_id_)
-      Tk_cGroup_ID[1].succ!
-    }
-    CTagID_TBL.mutex.synchronize{
-      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-      CTagID_TBL[@cpath][@id] = self
-    }
-    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/ext/tk/lib/tk/checkbutton.rb b/ext/tk/lib/tk/checkbutton.rb
deleted file mode 100644
index b1186a87ed..0000000000
--- a/ext/tk/lib/tk/checkbutton.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# tk/checkbutton.rb : treat checkbutton widget
-#
-require 'tk'
-require 'tk/radiobutton'
-
-class Tk::CheckButton<Tk::RadioButton
-  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
-
-Tk::Checkbutton = Tk::CheckButton
-#TkCheckButton = Tk::CheckButton unless Object.const_defined? :TkCheckButton
-#TkCheckbutton = Tk::Checkbutton unless Object.const_defined? :TkCheckbutton
-Tk.__set_toplevel_aliases__(:Tk, Tk::CheckButton, 
-                            :TkCheckButton, :TkCheckbutton)
diff --git a/ext/tk/lib/tk/clipboard.rb b/ext/tk/lib/tk/clipboard.rb
deleted file mode 100644
index d4205a5c28..0000000000
--- a/ext/tk/lib/tk/clipboard.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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/ext/tk/lib/tk/clock.rb b/ext/tk/lib/tk/clock.rb
deleted file mode 100644
index 4e9438f5ab..0000000000
--- a/ext/tk/lib/tk/clock.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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/ext/tk/lib/tk/composite.rb b/ext/tk/lib/tk/composite.rb
deleted file mode 100644
index 883d43c3ea..0000000000
--- a/ext/tk/lib/tk/composite.rb
+++ /dev/null
@@ -1,458 +0,0 @@
-#
-# 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
-      if klass <= TkFrame || klass < Tk::Frame || 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
-        if self.class < TkFrame || self.class.superclass < Tk::Frame || 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
-      if self.class < TkFrame || self.class.superclass < Tk::Frame || 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 = Tk::Frame.new(parent, :class=>base_class_name)
-      # --> use current TkFrame class
-      @frame = TkFrame.new(parent, :class=>base_class_name)
-    else
-      # @frame = Tk::Frame.new(parent)
-      # --> use current TkFrame class
-      @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 inspect
-    str = super
-    str.chop << ' @epath=' << @epath.inspect << '>'
-  end
-
-  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_delegates(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)
-          return wins[-1].cget_strict(opt)
-        end
-      end
-    rescue
-    end
-
-    return None
-  end
-  private :__cget_delegates
-
-  def cget(slot)
-    if (ret = __cget_delegates(slot)) == None
-      super(slot)
-    else
-      ret
-    end
-  end
-
-  def cget_strict(slot)
-    if (ret = __cget_delegates(slot)) == None
-      super(slot)
-    else
-      ret
-    end
-  end
-
-=begin
-  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
-=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/ext/tk/lib/tk/console.rb b/ext/tk/lib/tk/console.rb
deleted file mode 100644
index 26ce262caa..0000000000
--- a/ext/tk/lib/tk/console.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#   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/ext/tk/lib/tk/dialog.rb b/ext/tk/lib/tk/dialog.rb
deleted file mode 100644
index 180da101e3..0000000000
--- a/ext/tk/lib/tk/dialog.rb
+++ /dev/null
@@ -1,326 +0,0 @@
-#
-#   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/ext/tk/lib/tk/encodedstr.rb b/ext/tk/lib/tk/encodedstr.rb
deleted file mode 100644
index 02de0b0d85..0000000000
--- a/ext/tk/lib/tk/encodedstr.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# 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) )
-      enc ||= (self.class::Encoding)?
-                         self.class::Encoding : 
-                         ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
-      if TkCore::WITH_ENCODING
-        unless encobj = Tk::Encoding::ENCODING_TABLE.get_obj(enc)
-          fail ArgumentError, "unsupported Tk encoding '#{enc}'"
-        end
-        self.force_encoding(encobj)
-      else
-        @encoding = enc
-      end
-    end
-
-    if TkCore::WITH_ENCODING
-      alias encoding_obj encoding
-      alias __encoding   encoding
-      def encoding
-        Tk::Encoding::ENCODING_TABLE.get_name(super())
-      end
-    else
-      def encoding
-        @encoding
-      end
-      alias encoding_obj encoding
-    end
-
-    if TkCore::WITH_ENCODING
-      # wrapper methods for compatibility
-      alias __instance_variable_get instance_variable_get
-      alias __instance_variable_set instance_variable_set
-      alias __instance_eval         instance_eval
-      alias __instance_variables    instance_variables
-
-      def instance_variable_get(key)
-        if (key.to_s == '@encoding')
-          self.encoding
-        else
-          super(key)
-        end
-      end
-
-      def instance_variable_set(key, value)
-        if (key.to_s == '@encoding')
-          if value
-            self.force_encoding(value)
-          else
-            self.force_encoding(Tk::Encoding::UNKNOWN)
-          end
-          value
-        else
-          super(key, value)
-        end
-      end
-
-      def instance_eval(*args, &b)
-        old_enc = @encoding = self.encoding
-
-        ret = super(*args, &b)
-
-        if @encoding
-          if @encoding != old_enc
-            # modified by user
-            self.force_encoding(@encoding)
-          end
-          remove_instance_variable(:@encoding)
-        else
-          begin
-            remove_instance_variable(:@encoding)
-            # user sets to nil -> use current default
-            self.force_encoding(Tk.encoding)
-          rescue NameError
-            # removed by user -> ignore, because user don't use @encoding
-          end
-        end
-        ret
-      end
-    end
-
-    def instance_variables
-      ret = super()
-      ret << :@encoding  # fake !!
-      ret
-    end
-  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/ext/tk/lib/tk/entry.rb b/ext/tk/lib/tk/entry.rb
deleted file mode 100644
index 8ce8def1e7..0000000000
--- a/ext/tk/lib/tk/entry.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-#               tk/entry.rb - Tk entry classes
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-
-require 'tk'
-require 'tk/label'
-require 'tk/scrollable'
-require 'tk/validation'
-
-class Tk::Entry<Tk::Label
-  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
-
-#TkEntry = Tk::Entry unless Object.const_defined? :TkEntry
-Tk.__set_toplevel_aliases__(:Tk, Tk::Entry, :TkEntry)
diff --git a/ext/tk/lib/tk/event.rb b/ext/tk/lib/tk/event.rb
deleted file mode 100644
index d8aad6248b..0000000000
--- a/ext/tk/lib/tk/event.rb
+++ /dev/null
@@ -1,542 +0,0 @@
-#
-#  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      =           KEY
-
-      STRING_DATA =           0x80000000  # special flag for 'data' field
-
-      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|Grp::STRING_DATA), 
-      '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 == '??'
-        next if !val || (val == '??' && (flag & Grp::STRING_DATA))
-        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 ], 
-      # ?e
-      [ ?f, ?b, :focus ], 
-      # ?g
-      [ ?h, ?n, :height ], 
-      [ ?i, ?s, :win_hex ], 
-      # ?j
-      [ ?k, ?n, :keycode ], 
-      # ?l
-      [ ?m, ?s, :mode ], 
-      # ?n
-      [ ?o, ?b, :override ], 
-      [ ?p, ?s, :place ], 
-      # ?q
-      # ?r
-      [ ?s, ?x, :state ], 
-      [ ?t, ?n, :time ], 
-      # ?u
-      [ ?v, ?n, :value_mask ], 
-      [ ?w, ?n, :width ], 
-      [ ?x, ?n, :x ], 
-      [ ?y, ?n, :y ], 
-      # ?z
-      [ ?A, ?s, :char ], 
-      [ ?B, ?n, :borderwidth ], 
-      # ?C
-      [ ?D, ?n, :wheel_delta ], 
-      [ ?E, ?b, :send_event ], 
-      # ?F
-      # ?G
-      # ?H
-      # ?I
-      # ?J
-      [ ?K, ?s, :keysym ], 
-      # ?L
-      # ?M
-      [ ?N, ?n, :keysym_num ], 
-      # ?O
-      [ ?P, ?s, :property ], 
-      # ?Q
-      [ ?R, ?s, :rootwin_id ], 
-      [ ?S, ?s, :subwindow ], 
-      [ ?T, ?n, :type ], 
-      # ?U
-      # ?V
-      [ ?W, ?w, :widget ], 
-      [ ?X, ?n, :x_root ], 
-      [ ?Y, ?n, :y_root ], 
-      # ?Z
-      nil
-    ]
-
-    # [ <'%' subst-key str>, <proc type char>, <instance var (accessor) name>]
-    #   the subst-key string will be converted to a bytecode (128+idx).
-    LONGKEY_TBL = [
-      # for example, for %CTT and %CST subst-key on tkdnd-2.0
-      # ['CTT', ?l, :drop_target_type], 
-      # ['CST', ?l, :drop_source_type], 
-    ]
-
-    # [ <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
-    ]
-
-=begin
-    # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-    KEY_TBL.map!{|inf|
-      if inf.kind_of?(Array)
-        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-      end
-      inf
-    }
-
-    PROC_TBL.map!{|inf|
-      if inf.kind_of?(Array)
-        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-      end
-      inf
-    }
-=end
-
-    # 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)
-    # _setup_subst_table(KEY_TBL, LONGKEY_TBL, PROC_TBL) # if use longname-keys
-
-    #
-    # 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.map!{|arg| klass._sym2subst(arg)}
-      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/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb
deleted file mode 100644
index 62d628c132..0000000000
--- a/ext/tk/lib/tk/font.rb
+++ /dev/null
@@ -1,2344 +0,0 @@
-#
-#  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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  Tk_FontNameTBL = TkCore::INTERP.create_table
-  Tk_FontUseTBL  = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{ 
-    Tk_FontNameTBL.mutex.synchronize{ Tk_FontNameTBL.clear }
-    Tk_FontUseTBL.mutex.synchronize{ 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
-
-  # system font names
-  SYSTEM_FONT_NAMES = []
-  def SYSTEM_FONT_NAMES.add(font_names)
-    (@mutex ||= Mutex.new).synchronize{
-      self.replace(self | font_names.map{|name| name.to_s})
-    }
-  end
-  def SYSTEM_FONT_NAMES.include?(name)
-    (@mutex ||= Mutex.new).synchronize{
-      super(name.to_s)
-    }
-  end
-
-  # set default font
-  case Tk::TK_VERSION
-  when /^4\..*/
-    DEFAULT_LATIN_FONT_NAME = 'a14'.freeze
-    DEFAULT_KANJI_FONT_NAME = 'k14'.freeze
-
-  when /^8\.[0-4]/
-    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
-
-  when /^8\.[5-9]/, /^9\..*/
-    if tk_call('font', 'names') =~ /\bTkDefaultFont\b/
-      DEFAULT_LATIN_FONT_NAME = 'TkDefaultFont'.freeze
-      DEFAULT_KANJI_FONT_NAME = 'TkDefaultFont'.freeze
-    else
-      DEFAULT_LATIN_FONT_NAME = 'Helvetica'.freeze
-      DEFAULT_KANJI_FONT_NAME = 'mincho'.freeze
-    end
-
-  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
-    alias font_id font
-    alias name font
-    alias to_s font
-
-    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.is_system_font?(fnt)
-    # true  --> system font which is available on the current system
-    # false --> not system font (or unknown system font)
-    # nil   --> system font name, but not available on the current system
-    fnt = fnt.to_s
-    SYSTEM_FONT_NAMES.include?(fnt) && self.names.index(fnt) && true
-  end
-
-  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_hash(fnt, option=nil)
-    Hash[TkFont.actual_hash(fnt, option)]
-  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.actual_hash_displayof(fnt, option=nil)
-    Hash[TkFont.actual_hash_displayof(fnt, option)]
-  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_hash(fnt, option=nil)
-    if option
-      val = TkFont.metrics(fnt, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[TkFont.metrics(fnt)]
-    h.keys.each{|k| 
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  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.metrics_hash_displayof(fnt, win, option=nil)
-    if option
-      val = TkFont.metrics_displayof(fnt, win, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[TkFont.metrics_displayof(fnt, win, option)]
-    h.keys.each{|k| 
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  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.mutex.synchronize{
-        Tk_FontNameTBL.each_value{|obj| r.push(obj)}
-      }
-      #r | []
-      r.uniq
-
-    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)
-    name = name.to_s
-    if name =~ /^(@font[0-9]+)(|c|l|k)$/
-      Tk_FontNameTBL.mutex.synchronize{
-        Tk_FontNameTBL[$1]
-      }
-    else
-      Tk_FontNameTBL.mutex.synchronize{
-        Tk_FontNameTBL[name]
-      }
-    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\.[0-4]/
-      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 == []
-          if TkFont.is_system_font?(fnt)
-            TkNamedFont.new(fnt).call_font_configure([path, key], *args)
-          else
-            TkFont.new(fnt).call_font_configure([path, key], *args)
-          end
-        else
-          TkFont.new(compound[0], 
-                     compound[1]).call_font_configure([path, key], *args)
-        end
-      end
-
-    when /^8\.[5-9]/, /^9\..*/
-      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
-        if TkFont.is_system_font?(fnt)
-          TkNamedFont.new(fnt).call_font_configure([path, key], *args)
-        else
-          TkFont.new(fnt).call_font_configure([path, key], *args)
-        end
-      end
-    end
-  end
-
-  def TkFont.used_on(path=nil)
-    Tk_FontUseTBL.mutex.synchronize{
-      if path
-        Tk_FontUseTBL[path]
-      else
-        # Tk_FontUseTBL.values | []
-        Tk_FontUseTBL.values.uniq
-      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
-    Tk_FontID.mutex.synchronize{
-      @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
-      Tk_FontID[1].succ!
-    }
-    Tk_FontNameTBL.mutex.synchronize{
-      Tk_FontNameTBL[@id] = self
-    }
-
-    # @latin_desscendant = nil
-    # @kanji_desscendant = nil
-    @descendant = [nil, nil] # [latin, kanji]
-
-    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 == ''
-
-    Tk_FontID.mutex.synchronize{
-      # @id = Tk_FontID.join('')
-      @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
-      Tk_FontID[1].succ!
-    }
-    Tk_FontNameTBL.mutex.synchronize{
-      Tk_FontNameTBL[@id] = self
-    }
-
-    # @latin_desscendant = nil
-    # @kanji_desscendant = nil
-    @descendant = [nil, nil] # [latin, kanji]
-
-    # @latinfont = @id + 'l'
-    # @kanjifont = @id + 'k'
-    # @compoundfont = @id + 'c'
-    # @fontslot = {}
-
-    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}
-      # @fontslot.clear
-      # @fontslot['font'] = @latinfont
-      # @fontslot['kanjifont'] = @kanjifont
-    else
-      @compoundfont = @latinfont
-      @fontslot = {'font'=>@latinfont}
-      # @fontslot.clear
-      # @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}
-      # @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}
-      # @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))
-    begin
-      tk_call(*args)
-    rescue => e
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        fail e
-      end
-    end
-    Tk_FontUseTBL.mutex.synchronize{
-      Tk_FontUseTBL[[win, tag, optkey].join(';')] = self
-    }
-    self
-  end
-
-  def used
-    ret = []
-    table = nil
-    Tk_FontUseTBL.mutex.synchronize{
-      table = Tk_FontUseTBL.clone # to avoid deadlock
-    }
-    table.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 winobj.kind_of?(TkText) || winobj.kind_of?(Tk::Text)
-          if optkey
-            ret.push([winobj, winobj.tagid2obj(tag), optkey])
-          else
-            ret.push([winobj, winobj.tagid2obj(tag)])
-          end
-        #elsif winobj.kind_of? TkCanvas
-        elsif winobj.kind_of?(TkCanvas) || winobj.kind_of?(Tk::Canvas)
-          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
-        elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
-          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
-  alias name font
-  alias to_s font
-
-  def latin_font_id
-    @latinfont
-  end
-
-  def latin_font
-    # @latinfont
-    if @descendant[0] # [0] -> latin
-      @descendant[0]
-    else
-      @descendant[0] = DescendantFont.new(self, 'latin')
-    end
-=begin
-    if @latin_descendant
-      @latin_descendant
-    else
-      @latin_descendant = DescendantFont.new(self, 'latin')
-    end
-=end
-  end
-  alias latinfont latin_font
-
-  def kanji_font_id
-    @kanjifont
-  end
-
-  def kanji_font
-    # @kanjifont
-    if @descendant[1] # [1] -> kanji
-      @descendant[1]
-    else
-      @descendant[1] = DescendantFont.new(self, 'kanji')
-    end
-=begin
-    if @kanji_descendant
-      @kanji_descendant
-    else
-      @kanji_descendant = DescendantFont.new(self, 'kanji')
-    end
-=end
-  end
-  alias kanjifont kanji_font
-
-  def actual(option=nil)
-    actual_core(@compoundfont, nil, option)
-  end
-  def actual_hash(option=nil)
-    Hash[actual(option)]
-  end
-
-  def actual_displayof(win, option=nil)
-    win = '.' unless win
-    actual_core(@compoundfont, win, option)
-  end
-  def actual_hash_displayof(win, option=nil)
-    Hash[actual_displayof(win, option)]
-  end
-
-  def latin_actual(option=nil)
-    if @latinfont == nil
-      actual_core(@compoundfont, nil, option) # use @compoundfont
-    else
-      actual_core(@latinfont, nil, option)
-    end
-  end
-  def latin_actual_hash(option=nil)
-    Hash[latin_actual(option)]
-  end
-
-  def latin_actual_displayof(win, option=nil)
-    win = '.' unless win
-    if @latinfont == nil
-      actual_core(@compoundfont, win, option) # use @compoundfont
-    else
-      actual_core(@latinfont, win, option)
-    end
-  end
-  def latin_actual_hash_displayof(win, option=nil)
-    Hash[latin_actual_displayof(win, option)]
-  end
-
-  def kanji_actual(option=nil)
-    #if JAPANIZED_TK
-    if @kanjifont == nil
-      actual_core(@compoundfont, nil, option) # use @compoundfont
-    elsif @kanjifont != ""
-      actual_core(@kanjifont, nil, option)
-    else
-      actual_core_tk4x(nil, nil, option)
-    end
-  end
-  def kanji_actual_hash(option=nil)
-    Hash[kanji_actual(option)]
-  end
-
-  def kanji_actual_displayof(win, option=nil)
-    #if JAPANIZED_TK
-    if @kanjifont == nil
-      actual_core(@compoundfont, nil, option) # use @compoundfont
-    elsif @kanjifont != ""
-      win = '.' unless win
-      actual_core(@kanjifont, win, option)
-    else
-      actual_core_tk4x(nil, win, option)
-    end
-  end
-  def kanji_actual_hash_displayof(win, option=nil)
-    Hash[kanji_actual_displayof(win, option)]
-  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 latin_current_configinfo(slot=nil)
-    Hash[latin_configinfo(slot)]
-  end
-
-  def kanji_configure(slot, value=None)
-    #if JAPANIZED_TK
-    if @kanjifont == nil
-      configure_core(@compoundfont, slot, value) # use @compoundfont
-    elsif @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 == nil
-      configure_core(@compoundfont, slot) # use @compoundfont
-    elsif @kanjifont != ""
-      configinfo_core(@kanjifont, slot)
-    else
-      #[]
-      configinfo(slot)
-    end
-  end
-  def kanji_current_configinfo(slot=nil)
-    Hash[kanji_configinfo(slot)]
-  end
-
-  def replace(ltn, knj=None)
-    knj = ltn if knj == None
-    latin_replace(ltn)
-    kanji_replace(knj)
-    self
-  end
-
-  def latin_replace(ltn)
-    if @latinfont
-      latin_replace_core(ltn)
-      reset_pointadjust
-    else
-      # not compound font -> copy properties of ltn
-      latinkeys = {}
-      begin
-        actual_core(ltn).each{|key,val| latinkeys[key] = val}
-      rescue
-        latinkeys = {}
-      end
-      begin
-        tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
-      rescue
-        # not exist? (deleted?) -> create font
-        tk_call('font', 'create', @compoundfont, *hash_kv(latinkeys))
-      end
-    end
-
-    self
-  end
-
-  def kanji_replace(knj)
-    return self unless @kanjifont  # ignore
-    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_hash(option=nil)
-    if option
-      val = metrics(option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[metrics(option)]
-    h.keys.each{|k| 
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def metrics_displayof(win, option=nil)
-    win = '.' unless win
-    metrics_core(@compoundfont, win, option)
-  end
-  def metrics_hash_displayof(win, option=nil)
-    if option
-      val = metrics_displayof(win, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[metrics_displayof(win, option)]
-    h.keys.each{|k| 
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def latin_metrics(option=nil)
-    if @latinfont == nil
-      metrics_core(@compoundfont, nil, option) # use @compoundfont
-    else
-      metrics_core(@latinfont, nil, option)
-    end
-  end
-  def latin_metrics_hash(option=nil)
-    if option
-      val = latin_metrics(option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[latin_metrics(option)]
-    h.keys.each{|k| 
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def latin_metrics_displayof(win, option=nil)
-    win = '.' unless win
-    if @latinfont == nil
-      metrics_core(@compoundfont, win, option) # use @compoundfont
-    else
-      metrics_core(@latinfont, win, option)
-    end
-  end
-  def latin_metrics_hash_displayof(win, option=nil)
-    if option
-      val = latin_metrics_displayof(win, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[latin_metrics_displayof(win, option)]
-    h.keys.each{|k| 
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def kanji_metrics(option=nil)
-    if @latinfont == nil
-      metrics_core(@compoundfont, nil, option) # use @compoundfont
-    elsif JAPANIZED_TK
-      metrics_core(@kanjifont, nil, option)
-    else
-      metrics_core_tk4x(nil, nil, option)
-    end
-  end
-  def kanji_metrics_hash(option=nil)
-    if option
-      val = kanji_metrics(option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[kanji_metrics(option)]
-    h.keys.each{|k| 
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def kanji_metrics_displayof(win, option=nil)
-    win = '.' unless win
-    if @latinfont == nil
-      metrics_core(@compoundfont, win, option) # use @compoundfont
-    elsif JAPANIZED_TK
-      metrics_core(@kanjifont, win, option)
-    else
-      metrics_core_tk4x(nil, win, option)
-    end
-  end
-  def kanji_metrics_hash_displayof(win, option=nil)
-    if option
-      val = kanji_metrics_displayof(win, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[kanji_metrics_displayof(win, option)]
-    h.keys.each{|k| 
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  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.mutex.synchronize{
-      TkFont::Tk_FontNameTBL.delete(@id)
-    }
-    TkFont::Tk_FontUseTBL.mutex.synchronize{
-      TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
-    }
-  end
-
-  def delete_core_tk8x
-    begin
-      tk_call('font', 'delete', @latinfont) if @latinfont
-    rescue
-    end
-    begin
-      tk_call('font', 'delete', @kanjifont) if @kanjifont
-    rescue
-    end
-    begin
-      tk_call('font', 'delete', @compoundfont) if @compoundfont
-    rescue
-    end
-    TkFont::Tk_FontNameTBL.mutex.synchronize{
-      TkFont::Tk_FontNameTBL.delete(@id)
-    }
-    TkFont::Tk_FontUseTBL.mutex.synchronize{
-      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
-    table = nil
-    TkFont::Tk_FontUseTBL.mutex.synchronize{
-      table = TkFont::Tk_FontUseTBL.clone
-    }
-    table.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
-            if winobj.kind_of?(TkText) || winobj.kind_of?(Tk::Text)
-              tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @latinfont)
-            #elsif winobj.kind_of? TkCanvas
-            elsif winobj.kind_of?(TkCanvas) || winobj.kind_of?(Tk::Canvas)
-              tk_call(win, 'itemconfigure', tag, "-#{optkey}", @latinfont)
-            #elsif winobj.kind_of? TkMenu
-            elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
-              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.mutex.synchronize{
-            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
-    table = nil
-    TkFont::Tk_FontUseTBL.mutex.synchronize{
-      table = TkFont::Tk_FontUseTBL.clone
-    }
-    table.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
-            if winobj.kind_of?(TkText) || winobj.kind_of?(Tk::Text)
-              tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @kanjifont)
-            #elsif winobj.kind_of? TkCanvas
-            elsif winobj.kind_of?(TkCanvas) || winobj.kind_of?(Tk::Canvas)
-              tk_call(win, 'itemconfigure', tag, "-#{optkey}", @kanjifont)
-            #elsif winobj.kind_of? TkMenu
-            elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
-              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
-          Tk_FontUseTBL.mutex.synchronize{
-            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
-      begin
-        tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
-      rescue
-        # not exist? (deleted?) -> create font
-        tk_call('font', 'create', @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]
-=begin
-        if key == '-fixed'  # boolean value
-          r.push [key[1..-1], bool(l.shift)]
-        else
-          r.push [key[1..-1], l.shift.to_i]
-        end
-=end
-      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
-
-class TkNamedFont < TkFont
-  # for built-in named fonts
-  def TkNamedFont.find(name)
-    name = name.to_s
-    unless (obj = Tk_FontNameTBL[name])
-      obj = self.new(name) if TkFont.is_system_font?(name)
-    end
-    obj
-  end
-
-  def TkNamedFont.new(name, keys=nil)
-    name = name.to_s
-    obj = nil
-    Tk_FontNameTBL.mutex.synchronize{
-      unless (obj = Tk_FontNameTBL[name])
-        (obj = self.allocate).instance_eval{
-          @id = @compoundfont = name.to_s
-          @latinfont = nil
-          @kanjifont = nil
-          @descendant = [self, self] # [latin, kanji] : dummy
-          Tk_FontNameTBL[@id] = self
-        }
-      end
-    }
-    obj.instance_eval{ initialize(name, keys) }
-    obj
-  end
-
-  ###########################
-  private
-  ###########################
-  def initialize(name, keys=nil)
-    @id = @compoundfont = name.to_s
-
-    # if not exist named font, create it.
-    begin
-      if keys
-        tk_call('font', 'configure', @compoundfont, keys)
-      else
-        tk_call('font', 'configure', @compoundfont)
-      end
-    rescue
-      # the named font doesn't exist -> create
-      if keys
-        tk_call('font', 'create', @compoundfont, keys)
-      else
-        tk_call('font', 'create', @compoundfont)
-      end
-    end
-  end
-
-  def create_latinfont(fnt)
-    # ignore
-  end
-  def create_kanjifont(fnt)
-    # ignore
-  end
-  def create_compoundfont(ltn, knj, keys)
-    # ignore
-  end
-
-  ###########################
-  public
-  ###########################
-  def latin_font_id
-    @compoundfont
-  end
-  def kanji_font_id
-    @compoundfont
-  end
-end
-
-#######################################
-# define system font names
-#######################################
-if Tk::TCL_MAJOR_VERSION > 8 || 
-    (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
-  # add standard fonts of Tcl/Tk 8.5+
-  TkFont::SYSTEM_FONT_NAMES.add [
-    'TkDefaultFont', 'TkTextFont', 'TkFixedFont', 'TkMenuFont', 
-    'TkHeadingFont', 'TkCaptionFont', 'TkSmallCaptionFont', 
-    'TkIconFont', 'TkTooltipFont'
-  ]
-end
-
-# platform-specific fonts
-#  -- windows
-TkFont::SYSTEM_FONT_NAMES.add [
-  'ansifixed', 'ansi', 'device', 'oemfixed', 'systemfixed', 'system'
-]
-
-#  --  macintosh, macosx
-TkFont::SYSTEM_FONT_NAMES.add ['system', 'application']
-
-if Tk::TCL_MAJOR_VERSION > 8 || 
-    (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
-  TkFont::SYSTEM_FONT_NAMES.add ['menu']
-end
-
-#  --  macosx (Aqua theme)
-if Tk::TCL_MAJOR_VERSION > 8 || 
-    (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
-  TkFont::SYSTEM_FONT_NAMES.add [
-    'systemSystemFont', 'systemEmphasizedSystemFont', 
-    'systemSmallSystemFont', 'systemSmallEmphasizedSystemFont', 
-    'systemApplicationFont', 'systemLabelFont', 'systemViewsFont', 
-    'systemMenuTitleFont', 'systemMenuItemFont', 'systemMenuItemMarkFont', 
-    'systemMenuItemCmdKeyFont', 'systemWindowTitleFont', 
-    'systemPushButtonFont', 'systemUtilityWindowTitleFont', 
-    'systemAlertHeaderFont', 'systemToolbarFont', 'systemMiniSystemFont', 
-    'systemDetailSystemFont', 'systemDetailEmphasizedSystemFont'
-  ]
-end
diff --git a/ext/tk/lib/tk/frame.rb b/ext/tk/lib/tk/frame.rb
deleted file mode 100644
index 263b160f29..0000000000
--- a/ext/tk/lib/tk/frame.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# tk/frame.rb : treat frame widget
-#
-require 'tk'
-
-class Tk::Frame<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
-
-#TkFrame = Tk::Frame unless Object.const_defined? :TkFrame
-Tk.__set_toplevel_aliases__(:Tk, Tk::Frame, :TkFrame)
diff --git a/ext/tk/lib/tk/grid.rb b/ext/tk/lib/tk/grid.rb
deleted file mode 100644
index 0dfd7263a7..0000000000
--- a/ext/tk/lib/tk/grid.rb
+++ /dev/null
@@ -1,265 +0,0 @@
-#
-# 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
-
-=begin
-  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
-=end
-  def configure(*args)
-    if args[-1].kind_of?(Hash)
-      opts = args.pop
-    else
-      opts = {}
-    end
-    fail ArgumentError, 'no widget is given' if args.empty?
-    params = []
-    args.flatten(1).each{|win|
-      case win
-      when '-', ?-              # RELATIVE PLACEMENT (increase columnspan)
-        params.push('-')
-      when /^-+$/             # RELATIVE PLACEMENT (increase columnspan)
-        params.concat(win.to_s.split(//))
-      when '^', ?^              # RELATIVE PLACEMENT (increase rowspan)
-        params.push('^')
-      when /^\^+$/             # RELATIVE PLACEMENT (increase rowspan)
-        params.concat(win.to_s.split(//))
-      when 'x', :x, ?x, nil, '' # RELATIVE PLACEMENT (empty column)
-        params.push('x')
-      when /^x+$/             # RELATIVE PLACEMENT (empty column)
-        params.concat(win.to_s.split(//))
-      else
-        params.push(_epath(win))
-      end
-    }
-    opts.each{|k, v|
-      params.push("-#{k}")
-      params.push(_epath(v))  # have to use 'epath' (hash_kv() is unavailable)
-    }
-    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
-  alias column columnconfigure
-
-  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
-  alias row rowconfigure
-
-  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 :anchor, :bbox, :add, :forget, :propagate, :info
-  module_function :remove, :size, :slaves, :location
-  module_function :grid, :configure, :columnconfigure, :rowconfigure
-  module_function :column, :row, :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/ext/tk/lib/tk/image.rb b/ext/tk/lib/tk/image.rb
deleted file mode 100644
index dffdc19644..0000000000
--- a/ext/tk/lib/tk/image.rb
+++ /dev/null
@@ -1,275 +0,0 @@
-#
-# 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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk_IMGTBL.mutex.synchronize{ 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 = nil
-          Tk_IMGTBL.mutex.synchronize{
-            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
-    (obj = self.allocate).instance_eval{
-      Tk_IMGTBL.mutex.synchronize{
-        initialize(keys)
-        Tk_IMGTBL[@path] = self
-      }
-    }
-    obj
-  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
-      Tk_Image_ID.mutex.synchronize{
-        # @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
-  end
-
-  def delete
-    Tk_IMGTBL.mutex.synchronize{
-      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_IMGTBL.mutex.synchronize{
-      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_strict(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 cget(option)
-    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      cget_strict(option)
-    else
-      begin
-        cget_strict(option)
-      rescue => e
-        if current_configinfo.has_key?(option.to_s)
-          # error on known option
-          fail e
-        else
-          # unknown option
-          nil
-        end
-      end
-    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/ext/tk/lib/tk/itemconfig.rb b/ext/tk/lib/tk/itemconfig.rb
deleted file mode 100644
index 9c6a98d0f8..0000000000
--- a/ext/tk/lib/tk/itemconfig.rb
+++ /dev/null
@@ -1,1215 +0,0 @@
-#
-# tk/itemconfig.rb : control item/tag configuration of widget
-#
-require 'tk'
-require 'tkutil'
-require 'tk/itemfont.rb'
-
-module TkItemConfigOptkeys
-  include TkUtil
-
-  def __item_optkey_aliases(id)
-    {}
-  end
-  private :__item_optkey_aliases
-
-  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 TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-    @mode || false
-  end
-  def TkItemConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode)
-    fail SecurityError, "can't change the mode" if $SAFE>=4
-    @mode = (mode)? true: false
-  end
-
-  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_core(tagOrId, option)
-    orig_opt = option
-    option = option.to_s
-
-    if option.length == 0
-      fail ArgumentError, "Invalid option `#{orig_opt.inspect}'"
-    end
-
-    alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == option}
-    if real_name
-      option = real_name.to_s
-    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
-  private :__itemcget_core
-
-  def itemcget(tagOrId, option)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      __itemcget_core(tagOrId, option)
-    else
-      begin
-        __itemcget_core(tagOrId, option)
-      rescue => e
-        begin
-          if __current_itemconfiginfo(tagOrId).has_key?(option.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  end
-  def itemcget_strict(tagOrId, option)
-    # never use TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-    __itemcget_core(tagOrId, option)
-  end
-
-  def __itemconfigure_core(tagOrId, slot, value=None)
-    if slot.kind_of? Hash
-      slot = _symbolkey2str(slot)
-
-      __item_optkey_aliases(tagid(tagOrId)).each{|alias_name, real_name|
-        alias_name = alias_name.to_s
-        if slot.has_key?(alias_name)
-          slot[real_name.to_s] = slot.delete(alias_name)
-        end
-      }
-
-      __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
-
-      alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-      if real_name
-        slot = real_name.to_s
-      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
-  private :__itemconfigure_core
-
-  def __check_available_itemconfigure_options(tagOrId, keys)
-    id = tagid(tagOrId)
-
-    availables = self.__current_itemconfiginfo(id).keys
-
-    # add non-standard keys
-    availables |= __font_optkeys.map{|k|
-      [k.to_s, "latin#{k}", "ascii#{k}", "kanji#{k}"]
-    }.flatten
-    availables |= __item_methodcall_optkeys(id).keys.map{|k| k.to_s}
-    availables |= __item_keyonly_optkeys(id).keys.map{|k| k.to_s}
-
-    keys = _symbolkey2str(keys)
-
-    keys.delete_if{|k, v| !(availables.include?(k))}
-  end
-
-  def itemconfigure(tagOrId, slot, value=None)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      __itemconfigure_core(tagOrId, slot, value)
-    else
-      if slot.kind_of?(Hash)
-        begin
-          __itemconfigure_core(tagOrId, slot)
-        rescue
-          slot = __check_available_itemconfigure_options(tagOrId, slot)
-          __itemconfigure_core(tagOrId, slot) unless slot.empty?
-        end
-      else
-        begin
-          __itemconfigure_core(tagOrId, slot, value)
-        rescue => e
-          begin
-            if __current_itemconfiginfo(tagOrId).has_key?(slot.to_s)
-              # not tag error & option is known -> error on known option
-              fail e
-            else
-              # not tag error & option is unknown
-              nil
-            end
-          rescue
-            fail e  # tag error
-          end
-        end
-      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 )
-          fnt = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-          if TkFont.is_system_font?(fnt)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
-          end
-          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
-
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          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}$/}
-              fnt = fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              if TkFont.is_system_font?(fnt)
-                fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
-              end
-              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 )
-          fnt = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-          if TkFont.is_system_font?(fnt)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
-          end
-          conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(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
-
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          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)
-              fnt = fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              if TkFont.is_system_font?(fnt)
-                fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
-              end
-              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)
-    if slot && TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      begin
-        __itemconfiginfo_core(tagOrId, slot)
-      rescue => e
-        begin
-          __itemconfiginfo_core(tagOrId)
-          # not tag error -> option is unknown
-          Array.new(__item_configinfo_struct.values.max).unshift(slot.to_s)
-        rescue
-          fail e  # tag error
-        end
-      end
-    else
-      __itemconfiginfo_core(tagOrId, slot)
-    end
-  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
-
-  def current_itemconfiginfo(tagOrId, slot = nil)
-    __current_itemconfiginfo(tagOrId, slot)
-  end
-end
diff --git a/ext/tk/lib/tk/itemfont.rb b/ext/tk/lib/tk/itemfont.rb
deleted file mode 100644
index 4c5c917c57..0000000000
--- a/ext/tk/lib/tk/itemfont.rb
+++ /dev/null
@@ -1,327 +0,0 @@
-#
-# 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
-              fnt = hash_kv(fnt) if fnt.kind_of?(Hash)
-              unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-                tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
-              else
-                begin
-                  tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
-                rescue => e
-                  # ignore
-                end
-              end
-            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
-        ltn = hash_kv(ltn) if ltn.kind_of?(Hash)
-        unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
-        else
-          begin
-            tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
-          rescue => e
-            # ignore
-          end
-        end
-        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
-        knj = hash_kv(knj) if knj.kind_of?(Hash)
-        unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
-        else
-          begin
-            tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
-          rescue => e
-            # ignore
-          end
-        end
-        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/ext/tk/lib/tk/kinput.rb b/ext/tk/lib/tk/kinput.rb
deleted file mode 100644
index a29dbcdb72..0000000000
--- a/ext/tk/lib/tk/kinput.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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/ext/tk/lib/tk/label.rb b/ext/tk/lib/tk/label.rb
deleted file mode 100644
index 80b3d778f1..0000000000
--- a/ext/tk/lib/tk/label.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# tk/label.rb : treat label widget
-#
-require 'tk'
-
-class Tk::Label<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
-
-#TkLabel = Tk::Label unless Object.const_defined? :TkLabel
-Tk.__set_toplevel_aliases__(:Tk, Tk::Label, :TkLabel)
diff --git a/ext/tk/lib/tk/labelframe.rb b/ext/tk/lib/tk/labelframe.rb
deleted file mode 100644
index 995b5b7e72..0000000000
--- a/ext/tk/lib/tk/labelframe.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# tk/labelframe.rb : treat labelframe widget
-#
-require 'tk'
-require 'tk/frame'
-
-class Tk::LabelFrame<Tk::Frame
-  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
-
-Tk::Labelframe = Tk::LabelFrame
-#TkLabelFrame = Tk::LabelFrame unless Object.const_defined? :TkLabelFrame
-#TkLabelframe = Tk::Labelframe unless Object.const_defined? :TkLabelframe
-Tk.__set_toplevel_aliases__(:Tk, Tk::LabelFrame, :TkLabelFrame, :TkLabelframe)
diff --git a/ext/tk/lib/tk/listbox.rb b/ext/tk/lib/tk/listbox.rb
deleted file mode 100644
index bb039ffb0e..0000000000
--- a/ext/tk/lib/tk/listbox.rb
+++ /dev/null
@@ -1,282 +0,0 @@
-#
-# 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 Tk::Listbox<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
-
-#TkListbox = Tk::Listbox unless Object.const_defined? :TkListbox
-Tk.__set_toplevel_aliases__(:Tk, Tk::Listbox, :TkListbox)
diff --git a/ext/tk/lib/tk/macpkg.rb b/ext/tk/lib/tk/macpkg.rb
deleted file mode 100644
index 67b0a4bb60..0000000000
--- a/ext/tk/lib/tk/macpkg.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#   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 Tk::MacResource
-end
-#TkMacResource = Tk::MacResource
-Tk.__set_toplevel_aliases__(:Tk, Tk::MacResource, :TkMacResource)
-
-module Tk::MacResource
-  extend Tk
-  extend Tk::MacResource
-
-  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/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
deleted file mode 100644
index 3ae0548dd1..0000000000
--- a/ext/tk/lib/tk/menu.rb
+++ /dev/null
@@ -1,681 +0,0 @@
-#
-# 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 entrycget_strict itemcget_strict
-  alias entryconfigure itemconfigure
-  alias entryconfiginfo itemconfiginfo
-  alias current_entryconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-class Tk::Menu<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?
-      Tk::MenuClone.new(self, parent, type)
-    else
-      Tk::MenuClone.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 xposition(index)
-    number(tk_send_without_enc('xposition', _get_eval_enc_str(index)))
-  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
-
-#TkMenu = Tk::Menu unless Object.const_defined? :TkMenu
-Tk.__set_toplevel_aliases__(:Tk, Tk::Menu, :TkMenu)
-
-
-class Tk::MenuClone<Tk::Menu
-=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
-Tk::CloneMenu = Tk::MenuClone
-#TkMenuClone = Tk::MenuClone unless Object.const_defined? :TkMenuClone
-#TkCloneMenu = Tk::CloneMenu unless Object.const_defined? :TkCloneMenu
-Tk.__set_toplevel_aliases__(:Tk, Tk::MenuClone, :TkMenuClone, :TkCloneMenu)
-
-module Tk::SystemMenu
-  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
-TkSystemMenu = Tk::SystemMenu
-
-
-class Tk::SysMenu_Help<Tk::Menu
-  # for all platform
-  include Tk::SystemMenu
-  SYSMENU_NAME = 'help'
-end
-#TkSysMenu_Help = Tk::SysMenu_Help unless Object.const_defined? :TkSysMenu_Help
-Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Help, :TkSysMenu_Help)
-
-
-class Tk::SysMenu_System<Tk::Menu
-  # for Windows
-  include Tk::SystemMenu
-  SYSMENU_NAME = 'system'
-end
-#TkSysMenu_System = Tk::SysMenu_System unless Object.const_defined? :TkSysMenu_System
-Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_System, :TkSysMenu_System)
-
-
-class Tk::SysMenu_Apple<Tk::Menu
-  # for Machintosh
-  include Tk::SystemMenu
-  SYSMENU_NAME = 'apple'
-end
-#TkSysMenu_Apple = Tk::SysMenu_Apple unless Object.const_defined? :TkSysMenu_Apple
-Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Apple, :TkSysMenu_Apple)
-
-
-class Tk::Menubutton<Tk::Label
-  TkCommandNames = ['menubutton'.freeze].freeze
-  WidgetClassName = 'Menubutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  def create_self(keys)
-    if keys and keys != None
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        # tk_call_without_enc('menubutton', @path, *hash_kv(keys, true))
-        tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                            *hash_kv(keys, true))
-      else
-        begin
-          tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                              *hash_kv(keys, true))
-        rescue
-          tk_call_without_enc(self.class::TkCommandNames[0], @path)
-          keys = __check_available_configure_options(keys)
-          unless keys.empty?
-            tk_call_without_enc('destroy', @path) rescue nil
-            tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                                *hash_kv(keys, true))
-          end
-        end
-      end
-    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
-Tk::MenuButton = Tk::Menubutton
-#TkMenubutton = Tk::Menubutton unless Object.const_defined? :TkMenubutton
-#TkMenuButton = Tk::MenuButton unless Object.const_defined? :TkMenuButton
-Tk.__set_toplevel_aliases__(:Tk, Tk::Menubutton, :TkMenubutton, :TkMenuButton)
-
-
-class Tk::OptionMenubutton<Tk::Menubutton
-  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 xposition(index)
-    @menu.xposition(index)
-  end
-  def yposition(index)
-    @menu.yposition(index)
-  end
-  def menu
-    @menu
-  end
-  def menucget(key)
-    @menu.cget(key)
-  end
-  def menucget_strict(key)
-    @menu.cget_strict(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 entrycget_strict(index, key)
-    @menu.entrycget_strict(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
-
-Tk::OptionMenuButton = Tk::OptionMenubutton
-#TkOptionMenubutton = Tk::OptionMenubutton unless Object.const_defined? :TkOptionMenubutton
-#TkOptionMenuButton = Tk::OptionMenuButton unless Object.const_defined? :TkOptionMenuButton
-Tk.__set_toplevel_aliases__(:Tk, Tk::OptionMenubutton, 
-                            :TkOptionMenubutton, :TkOptionMenuButton)
diff --git a/ext/tk/lib/tk/menubar.rb b/ext/tk/lib/tk/menubar.rb
deleted file mode 100644
index ef9da809b9..0000000000
--- a/ext/tk/lib/tk/menubar.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# 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<Tk::Frame
-  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/ext/tk/lib/tk/menuspec.rb b/ext/tk/lib/tk/menuspec.rb
deleted file mode 100644
index 2a2eb9ba3c..0000000000
--- a/ext/tk/lib/tk/menuspec.rb
+++ /dev/null
@@ -1,275 +0,0 @@
-#
-# 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 = Tk::Menu.new(parent, :widgetname=>menu_name, :tearoff=>tearoff)
-      # --> use current TkMenu class
-      menu = TkMenu.new(parent, :widgetname=>menu_name, :tearoff=>tearoff)
-    else
-      #menu = Tk::Menu.new(parent, :tearoff=>tearoff)
-      # --> use current TkMenu class
-      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?(Tk::Root) || parent.kind_of?(Tk::Toplevel)
-      true 
-    elsif parent.current_configinfo.has_key?('menu')
-      true
-    else
-      false
-    end
-  end
-  private :_use_menubar?
-
-  def _create_menu_for_menubar(parent)
-    #unless (mbar = parent.menu).kind_of?(TkMenu)
-    # --> use current TkMenu class
-    mbar = parent.menu
-    unless mbar.kind_of?(Tk::Menu) || mbar.kind_of?(TkMenu)
-      #mbar = Tk::Menu.new(parent, :tearoff=>false)
-      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 = Tk::Menubutton.new(parent)
-      # --> use current TkMenubutton class
-      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/ext/tk/lib/tk/message.rb b/ext/tk/lib/tk/message.rb
deleted file mode 100644
index 946b68c704..0000000000
--- a/ext/tk/lib/tk/message.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# tk/message.rb : treat message widget
-#
-require 'tk'
-require 'tk/label'
-
-class Tk::Message<Tk::Label
-  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
-
-#TkMessage = Tk::Message unless Object.const_defined? :TkMessage
-Tk.__set_toplevel_aliases__(:Tk, Tk::Message, :TkMessage)
diff --git a/ext/tk/lib/tk/mngfocus.rb b/ext/tk/lib/tk/mngfocus.rb
deleted file mode 100644
index 1a2049c8a8..0000000000
--- a/ext/tk/lib/tk/mngfocus.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#   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/ext/tk/lib/tk/msgcat.rb b/ext/tk/lib/tk/msgcat.rb
deleted file mode 100644
index 162953f425..0000000000
--- a/ext/tk/lib/tk/msgcat.rb
+++ /dev/null
@@ -1,296 +0,0 @@
-#
-#   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 >-------"
-        if TkCore::WITH_ENCODING
-          msg.force_encoding('utf-8')
-        else
-          msg.instance_variable_set(:@encoding, 'utf-8')
-        end
-      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/ext/tk/lib/tk/namespace.rb b/ext/tk/lib/tk/namespace.rb
deleted file mode 100644
index 20a8d65215..0000000000
--- a/ext/tk/lib/tk/namespace.rb
+++ /dev/null
@@ -1,551 +0,0 @@
-#
-#   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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  Tk_NsCode_RetObjID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    Tk_Namespace_ID_TBL.mutex.synchronize{ Tk_Namespace_ID_TBL.clear }
-    Tk_NsCode_RetObjID_TBL.mutex.synchronize{ Tk_NsCode_RetObjID_TBL.clear }
-  }
-
-  def TkNamespace.id2obj(id)
-    Tk_Namespace_ID_TBL.mutex.synchronize{
-      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)
-        Tk_Namespace_ID_TBL.mutex.synchronize{
-          if TkNamespace::Tk_Namespace_ID_TBL.key?(ns)
-            TkNamespace::Tk_Namespace_ID_TBL[ns]
-          else
-            ns
-          end
-        }
-      else
-        super(slot)
-      end
-    end
-    def cget_strict(slot)
-      if slot == :namespace || slot == 'namespace'
-        ns = super(slot)
-        Tk_Namespace_ID_TBL.mutex.synchronize{
-          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)
-          Tk_Namespace_ID_TBL.mutex.synchronize{
-            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
-          Tk_Namespace_ID_TBL.mutex.synchronize{
-            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']
-          Tk_Namespace_ID_TBL.mutex.synchronize{
-            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
-      Tk_Namespace_ID.mutex.synchronize{
-        # 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.mutex.synchronize{
-      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
-      Tk_Namespace_ID_TBL.mutex.synchronize{
-        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|
-        if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-          obj = ScopeArgs.new(@fullname,*args)
-          ret = obj.instance_exec(obj, script)
-        else
-          ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
-        end
-        id = ret.object_id
-        TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
-        id
-      }
-    elsif script.kind_of?(Proc)
-      cmd = proc{|*args|
-        if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-          obj = ScopeArgs.new(@fullname,*args)
-          ret = obj.instance_exec(obj, &script)
-        else
-          ret = ScopeArgs.new(@fullname,*args).instance_eval(&script)
-        end
-        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
-    Tk_Namespace_ID_TBL.mutex.synchronize{
-      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|
-      Tk_Namespace_ID_TBL.mutex.synchronize{
-        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(namespace).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)
-    Tk_Namespace_ID_TBL.mutex.synchronize{
-      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/ext/tk/lib/tk/optiondb.rb b/ext/tk/lib/tk/optiondb.rb
deleted file mode 100644
index 186811d37d..0000000000
--- a/ext/tk/lib/tk/optiondb.rb
+++ /dev/null
@@ -1,377 +0,0 @@
-#
-# tk/optiondb.rb : treat option database
-#
-require 'tk'
-
-module TkOptionDB
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['option'.freeze].freeze
-  (CmdClassID = ['CMD_CLASS'.freeze, '00000'.taint]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    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
-      CmdClassID.mutex.synchronize{
-        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_exec, :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(){
-      TkOptionDB.new_proc_class(klass, func, safe, add, self, &b)
-    }
-  end
-  module_function :new_proc_class_random
-end
-TkOption = TkOptionDB
-TkResourceDB = TkOptionDB
diff --git a/ext/tk/lib/tk/optionobj.rb b/ext/tk/lib/tk/optionobj.rb
deleted file mode 100644
index 8fe7e0ee5a..0000000000
--- a/ext/tk/lib/tk/optionobj.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-#
-# 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/ext/tk/lib/tk/pack.rb b/ext/tk/lib/tk/pack.rb
deleted file mode 100644
index 220a38e524..0000000000
--- a/ext/tk/lib/tk/pack.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# tk/pack.rb : control pack geometry manager
-#
-require 'tk'
-
-module TkPack
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['pack'.freeze].freeze
-
-=begin
-  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
-=end
-  def configure(*args)
-    if args[-1].kind_of?(Hash)
-      opts = args.pop
-    else
-      opts = {}
-    end
-    fail ArgumentError, 'no widget is given' if args.empty?
-    params = []
-    args.flatten(1).each{|win| params.push(_epath(win))}
-    opts.each{|k, v|
-      params.push("-#{k}")
-      params.push(_epath(v))  # have to use 'epath' (hash_kv() is unavailable)
-    }
-    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/ext/tk/lib/tk/package.rb b/ext/tk/lib/tk/package.rb
deleted file mode 100644
index 0c329732f5..0000000000
--- a/ext/tk/lib/tk/package.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# 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
-
-  def prefer(setting = None)
-    tk_call('package', 'prefer', setting)
-  end
-end
diff --git a/ext/tk/lib/tk/palette.rb b/ext/tk/lib/tk/palette.rb
deleted file mode 100644
index 2d08d50f6a..0000000000
--- a/ext/tk/lib/tk/palette.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-#   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[0].to_a.flatten if args[0].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/ext/tk/lib/tk/panedwindow.rb b/ext/tk/lib/tk/panedwindow.rb
deleted file mode 100644
index 030144e677..0000000000
--- a/ext/tk/lib/tk/panedwindow.rb
+++ /dev/null
@@ -1,258 +0,0 @@
-#
-# tk/panedwindow.rb : treat panedwindow
-#
-require 'tk'
-
-class Tk::PanedWindow<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_strict(win, key)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    tk_tcl2ruby(tk_send_without_enc('panecget', win, "-#{key}"))
-  end
-  def panecget(win, key)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      panecget_strict(win, key)
-    else
-      begin
-        panecget_strict(win, key)
-      rescue => e
-        begin
-          if current_paneconfiginfo(win).has_key?(option.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  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
-
-Tk::Panedwindow = Tk::PanedWindow
-#TkPanedWindow = Tk::PanedWindow unless Object.const_defined? :TkPanedWindow
-#TkPanedwindow = Tk::Panedwindow unless Object.const_defined? :TkPanedwindow
-Tk.__set_toplevel_aliases__(:Tk, Tk::PanedWindow, 
-                            :TkPanedWindow, :TkPanedwindow)
diff --git a/ext/tk/lib/tk/place.rb b/ext/tk/lib/tk/place.rb
deleted file mode 100644
index f7ebdfcbd6..0000000000
--- a/ext/tk/lib/tk/place.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# 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/ext/tk/lib/tk/radiobutton.rb b/ext/tk/lib/tk/radiobutton.rb
deleted file mode 100644
index 1f864ec06b..0000000000
--- a/ext/tk/lib/tk/radiobutton.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# tk/radiobutton.rb : treat radiobutton widget
-#
-require 'tk'
-require 'tk/button'
-
-class Tk::RadioButton<Tk::Button
-  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
-
-Tk::Radiobutton = Tk::RadioButton
-#TkRadioButton = Tk::RadioButton unless Object.const_defined? :TkRadioButton
-#TkRadiobutton = Tk::Radiobutton unless Object.const_defined? :TkRadiobutton
-Tk.__set_toplevel_aliases__(:Tk, Tk::RadioButton, 
-                            :TkRadioButton, :TkRadiobutton)
diff --git a/ext/tk/lib/tk/root.rb b/ext/tk/lib/tk/root.rb
deleted file mode 100644
index 7237b4c614..0000000000
--- a/ext/tk/lib/tk/root.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# tk/root.rb : treat root widget
-#
-require 'tk'
-require 'tk/wm'
-require 'tk/menuspec'
-
-class Tk::Root<TkWindow
-  include Wm
-  include TkMenuSpec
-
-  def __methodcall_optkeys  # { key=>method, ... }
-    TOPLEVEL_METHODCALL_OPTKEYS
-  end
-  private :__methodcall_optkeys
-
-  def Root.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
-
-    if block_given?
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        root.instance_exec(root, &b)
-      else
-        root.instance_eval(&b)
-      end
-    end
-    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 Root.destroy
-    TkCore::INTERP._invoke('destroy', '.')
-  end
-end
-
-TkRoot = Tk::Root unless Object.const_defined? :TkRoot
diff --git a/ext/tk/lib/tk/scale.rb b/ext/tk/lib/tk/scale.rb
deleted file mode 100644
index 7e758d92f4..0000000000
--- a/ext/tk/lib/tk/scale.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# tk/scale.rb : treat scale widget
-#
-require 'tk'
-
-class Tk::Scale<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
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        #tk_call_without_enc('scale', @path, *hash_kv(keys, true))
-        tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                            *hash_kv(keys, true))
-      else
-        begin
-          tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                              *hash_kv(keys, true))
-        rescue
-          tk_call_without_enc(self.class::TkCommandNames[0], @path)
-          keys = __check_available_configure_options(keys)
-          unless keys.empty?
-            begin
-              tk_call_without_enc('destroy', @path)
-            rescue
-              # cannot destroy
-              configure(keys)
-            else
-              # re-create widget
-              tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                                  *hash_kv(keys, true))
-            end
-          end
-        end
-      end
-    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
-
-#TkScale = Tk::Scale unless Object.const_defined? :TkScale
-Tk.__set_toplevel_aliases__(:Tk, Tk::Scale, :TkScale)
diff --git a/ext/tk/lib/tk/scrollable.rb b/ext/tk/lib/tk/scrollable.rb
deleted file mode 100644
index 96959b7a4b..0000000000
--- a/ext/tk/lib/tk/scrollable.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# 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/ext/tk/lib/tk/scrollbar.rb b/ext/tk/lib/tk/scrollbar.rb
deleted file mode 100644
index 87db46a9f9..0000000000
--- a/ext/tk/lib/tk/scrollbar.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-#
-# tk/scrollbar.rb : treat scrollbar widget
-#
-require 'tk'
-
-class Tk::Scrollbar<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
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        #tk_call_without_enc('scrollbar', @path, *hash_kv(keys, true))
-        tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                            *hash_kv(keys, true))
-      else
-        begin
-          tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                              *hash_kv(keys, true))
-        rescue
-          tk_call_without_enc(self.class::TkCommandNames[0], @path)
-          keys = __check_available_configure_options(keys)
-          unless keys.empty?
-            begin
-              tk_call_without_enc('destroy', @path)
-            rescue
-              # cannot destroy
-              configure(keys)
-            else
-              # re-create widget
-              tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                                  *hash_kv(keys, true))
-            end
-          end
-        end
-      end
-    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
-
-  def moveto(fraction)
-    tk_send_without_enc('moveto', fraction)
-    self
-  end
-
-  def scroll(*args)
-    tk_send_without_enc('scroll', *args)
-    self
-  end
-
-  def scroll_units(num)
-    scroll(num, 'units')
-    self
-  end
-
-  def scroll_pages(num)
-    scroll(num, 'pages')
-    self
-  end
-end
-
-#TkScrollbar = Tk::Scrollbar unless Object.const_defined? :TkScrollbar
-Tk.__set_toplevel_aliases__(:Tk, Tk::Scrollbar, :TkScrollbar)
-
-
-class Tk::XScrollbar<Tk::Scrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'horizontal'
-    super(keys)
-  end
-  private :create_self
-end
-
-#TkXScrollbar = Tk::XScrollbar unless Object.const_defined? :TkXScrollbar
-Tk.__set_toplevel_aliases__(:Tk, Tk::XScrollbar, :TkXScrollbar)
-
-
-class Tk::YScrollbar<Tk::Scrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'vertical'
-    super(keys)
-  end
-  private :create_self
-end
-
-#TkYScrollbar = Tk::YScrollbar unless Object.const_defined? :TkYScrollbar
-Tk.__set_toplevel_aliases__(:Tk, Tk::YScrollbar, :TkYScrollbar)
diff --git a/ext/tk/lib/tk/scrollbox.rb b/ext/tk/lib/tk/scrollbox.rb
deleted file mode 100644
index d20742a666..0000000000
--- a/ext/tk/lib/tk/scrollbox.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#               tk/scrollbox.rb - Tk Listbox with Scrollbar
-#                                 as an example of Composite Widget
-#                       by Yukihiro Matsumoto <matz@netlab.co.jp>
-#
-require 'tk'
-require 'tk/listbox'
-
-class TkScrollbox<Tk::Listbox
-  include TkComposite
-  def initialize_composite(keys=nil)
-    #list = Tk::Listbox.new(@frame)
-    # -> use current TkListbox class
-    list = TkListbox.new(@frame)
-    #scroll = Tk::Scrollbar.new(@frame)
-    # -> use current TkScrollbar class
-    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/ext/tk/lib/tk/selection.rb b/ext/tk/lib/tk/selection.rb
deleted file mode 100644
index 5caa6ef8ef..0000000000
--- a/ext/tk/lib/tk/selection.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# 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/ext/tk/lib/tk/spinbox.rb b/ext/tk/lib/tk/spinbox.rb
deleted file mode 100644
index 34dc1904f7..0000000000
--- a/ext/tk/lib/tk/spinbox.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-#               tk/spinbox.rb - Tk spinbox classes
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-#
-require 'tk'
-require 'tk/entry'
-
-class Tk::Spinbox<Tk::Entry
-  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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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
-
-#TkSpinbox = Tk::Spinbox unless Object.const_defined? :TkSpinbox
-Tk.__set_toplevel_aliases__(:Tk, Tk::Spinbox, :TkSpinbox)
diff --git a/ext/tk/lib/tk/tagfont.rb b/ext/tk/lib/tk/tagfont.rb
deleted file mode 100644
index a1807395d2..0000000000
--- a/ext/tk/lib/tk/tagfont.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/ext/tk/lib/tk/text.rb b/ext/tk/lib/tk/text.rb
deleted file mode 100644
index 4ec82bed1d..0000000000
--- a/ext/tk/lib/tk/text.rb
+++ /dev/null
@@ -1,1596 +0,0 @@
-#
-#               tk/text.rb - Tk text classes
-#                       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_cget_strict(tagOrId, option)
-    itemcget_strict(['tag', tagOrId], option)
-  end
-  def tag_configure(tagOrId, slot, value=None)
-    itemconfigure(['tag', tagOrId], slot, value)
-  end
-  def tag_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['tag', tagOrId], slot)
-  end
-  def current_tag_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['tag', tagOrId], slot)
-  end
-
-  def window_cget(tagOrId, option)
-    itemcget(['window', tagOrId], option)
-  end
-  def window_cget_strict(tagOrId, option)
-    itemcget_strict(['window', tagOrId], option)
-  end
-  def window_configure(tagOrId, slot, value=None)
-    itemconfigure(['window', tagOrId], slot, value)
-  end
-  def window_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['window', tagOrId], slot)
-  end
-  def current_window_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['window', tagOrId], slot)
-  end
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-class Tk::Text<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/
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod)
-      else
-        Tk::Text::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/
-        Tk::Text::IndexString.new(String.new(id) << ' - ' << mod)
-      elsif mod =~ /^\s*[-]\s+(\d.*)$/
-        Tk::Text::IndexString.new(String.new(id) << ' - -' << $1)
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod)
-      end
-    end
-
-    def chars(mod)
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' chars')
-      else
-        Tk::Text::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
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display chars')
-      else
-        Tk::Text::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
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any chars')
-      else
-        Tk::Text::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
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' indices')
-      else
-        Tk::Text::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
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display indices')
-      else
-        Tk::Text::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
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any indices')
-      else
-        Tk::Text::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
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' lines')
-      else
-        Tk::Text::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
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display_lines')
-      else
-        Tk::Text::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
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any_lines')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any lines')
-      end
-    end
-    alias any_line any_lines
-
-    def linestart
-      Tk::Text::IndexString.new(String.new(id) << ' linestart')
-    end
-    def lineend
-      Tk::Text::IndexString.new(String.new(id) << ' lineend')
-    end
-
-    def display_linestart
-      # Tk8.5 feature
-      Tk::Text::IndexString.new(String.new(id) << ' display linestart')
-    end
-    def display_lineend
-      # Tk8.5 feature
-      Tk::Text::IndexString.new(String.new(id) << ' display lineend')
-    end
-
-    def wordstart
-      Tk::Text::IndexString.new(String.new(id) << ' wordstart')
-    end
-    def wordend
-      Tk::Text::IndexString.new(String.new(id) << ' wordend')
-    end
-
-    def display_wordstart
-      # Tk8.5 feature
-      Tk::Text::IndexString.new(String.new(id) << ' display wordstart')
-    end
-    def display_wordend
-      # Tk8.5 feature
-      Tk::Text::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
-    if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-      obj.instance_exec(obj, &block) if defined? yield
-    else
-      obj.instance_eval(&block) if defined? yield
-    end
-    obj
-  end
-
-  def init_instance_variable
-    @cmdtbl = []
-    @tags = {}
-  end
-
-  def __destroy_hook__
-    TkTextTag::TTagID_TBL.mutex.synchronize{
-      TkTextTag::TTagID_TBL.delete(@path)
-    }
-    TkTextTag::TMarkID_TBL.mutex.synchronize{
-      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)
-    Tk::Text::IndexString.at(x, y)
-  end
-
-  def at(x, y)
-    Tk::Text::IndexString.at(x, y)
-  end
-
-  def index(idx)
-    Tk::Text::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_strict(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_cget(index, slot)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      image_cget_strict(index, slot)
-    else
-      begin
-        image_cget_strict(index, slot)
-      rescue => e
-        begin
-          if current_image_configinfo(index).has_key?(slot.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    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)}))
-    TkTextTag::TTagID_TBL.mutex.synchronize{
-      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 [Tk::Text::IndexString.new(key), Tk::Text::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|
-      Tk::Text::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|
-      Tk::Text::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 TkCore::WITH_ENCODING ### Ruby 1.9 !!!!!!!!!!!!!
-      return txt.length
-    end
-    ###########################
-
-    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
-      Tk::Text::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
-      Tk::Text::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(Tk::Text::IndexString.new(str[i..(idx-1)]))
-        i = idx + 1
-      else
-        result.push(Tk::Text::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
-
-#TkText = Tk::Text unless Object.const_defined? :TkText
-Tk.__set_toplevel_aliases__(:Tk, Tk::Text, :TkText)
-
-
-#######################################
-
-class Tk::Text::Peer < Tk::Text
-  # Tk8.5 feature
-  def initialize(text, parent=nil, keys={})
-    unless text.kind_of?(Tk::Text)
-      fail ArgumentError, "Tk::Text 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/ext/tk/lib/tk/textimage.rb b/ext/tk/lib/tk/textimage.rb
deleted file mode 100644
index fb306a9c17..0000000000
--- a/ext/tk/lib/tk/textimage.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# tk/textimage.rb - treat Tk text image object
-#
-require 'tk'
-require 'tk/text'
-
-class TkTextImage<TkObject
-  include Tk::Text::IndexModMethods
-
-  def initialize(parent, index, keys)
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text 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
-    Tk::Text::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 cget_strict(slot)
-    @t.image_cget_strict(@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
-
-TktImage = TkTextImage
diff --git a/ext/tk/lib/tk/textmark.rb b/ext/tk/lib/tk/textmark.rb
deleted file mode 100644
index 72c1ce1ab4..0000000000
--- a/ext/tk/lib/tk/textmark.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-#
-# tk/textmark.rb - methods for treating text marks
-#
-require 'tk'
-require 'tk/text'
-
-class TkTextMark<TkObject
-  include Tk::Text::IndexModMethods
-
-  TMarkID_TBL = TkCore::INTERP.create_table
-
-  (Tk_TextMark_ID = ['mark'.freeze, '00000'.taint]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TMarkID_TBL.mutex.synchronize{ TMarkID_TBL.clear }
-  }
-
-  def TkTextMark.id2obj(text, id)
-    tpath = text.path
-    TMarkID_TBL.mutex.synchronize{
-      if TMarkID_TBL[tpath]
-        TMarkID_TBL[tpath][id]? TMarkID_TBL[tpath][id]: id
-      else
-        id 
-      end
-    }
-  end
-
-  def initialize(parent, index)
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    Tk_TextMark_ID.mutex.synchronize{
-      # @path = @id = Tk_TextMark_ID.join('')
-      @path = @id = Tk_TextMark_ID.join(TkCore::INTERP._ip_id_).freeze
-      Tk_TextMark_ID[1].succ!
-    }
-    TMarkID_TBL.mutex.synchronize{
-      TMarkID_TBL[@id] = self
-      TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
-      TMarkID_TBL[@tpath][@id] = self
-    }
-    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
-                        _get_eval_enc_str(index))
-    @t._addtag id, self
-  end
-
-  def id
-    Tk::Text::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 Tk::Text::IndexModMethods module
-  def +(mod)
-    return chars(mod) if mod.kind_of?(Numeric)
-
-    mod = mod.to_s
-    if mod =~ /^\s*[+-]?\d/
-      Tk::Text::IndexString.new(@id + ' + ' + mod)
-    else
-      Tk::Text::IndexString.new(@id + ' ' + mod)
-    end
-  end
-
-  def -(mod)
-    return chars(-mod) if mod.kind_of?(Numeric)
-
-    mod = mod.to_s
-    if mod =~ /^\s*[+-]?\d/
-      Tk::Text::IndexString.new(@id + ' - ' + mod)
-    elsif mod =~ /^\s*[-]\s+(\d.*)$/
-      Tk::Text::IndexString.new(@id + ' - -' + $1)
-    else
-      Tk::Text::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
-TktMark = TkTextMark
-
-class TkTextNamedMark<TkTextMark
-  def self.new(parent, name, index=nil)
-    TMarkID_TBL.mutex.synchronize{
-      if TMarkID_TBL[parent.path] && TMarkID_TBL[parent.path][name]
-        obj = TMarkID_TBL[parent.path][name]
-      else
-        # super(parent, name, *args)
-        (obj = self.allocate).instance_eval{
-          @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]
-          @t._addtag @id, self
-        }
-        obj
-      end
-
-      if obj && index
-        tk_call_without_enc(parent.path, 'mark', 'set', name, 
-                            _get_eval_enc_str(index))
-      end
-      obj
-    }
-  end
-
-  def initialize(parent, name, index=nil)
-    # dummy:: not called by 'new' method
-
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = name
-    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
-                        _get_eval_enc_str(index)) if index
-    @t._addtag @id, self
-  end
-end
-TktNamedMark = TkTextNamedMark
-
-class TkTextMarkInsert<TkTextNamedMark
-  def self.new(parent,*args)
-    super(parent, 'insert', *args)
-  end
-end
-TktMarkInsert = TkTextMarkInsert
-
-class TkTextMarkCurrent<TkTextNamedMark
-  def self.new(parent,*args)
-    super(parent, 'current', *args)
-  end
-end
-TktMarkCurrent = TkTextMarkCurrent
-
-class TkTextMarkAnchor<TkTextNamedMark
-  def self.new(parent,*args)
-    super(parent, 'anchor', *args)
-  end
-end
-TktMarkAnchor = TkTextMarkAnchor
diff --git a/ext/tk/lib/tk/texttag.rb b/ext/tk/lib/tk/texttag.rb
deleted file mode 100644
index b08d923ea1..0000000000
--- a/ext/tk/lib/tk/texttag.rb
+++ /dev/null
@@ -1,318 +0,0 @@
-#
-# tk/texttag.rb - methods for treating text tags
-#
-require 'tk'
-require 'tk/text'
-require 'tk/tagfont'
-
-class TkTextTag<TkObject
-  include TkTreatTagFont
-  include Tk::Text::IndexModMethods
-
-  TTagID_TBL = TkCore::INTERP.create_table
-
-  (Tk_TextTag_ID = ['tag'.freeze, '00000'.taint]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TTagID_TBL.mutex.synchronize{ TTagID_TBL.clear }
-  }
-
-  def TkTextTag.id2obj(text, id)
-    tpath = text.path
-    TTagID_TBL.mutex.synchronize{
-      if TTagID_TBL[tpath]
-        TTagID_TBL[tpath][id]? TTagID_TBL[tpath][id]: id
-      else 
-        id
-      end
-    }
-  end
-
-  def initialize(parent, *args)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    Tk_TextTag_ID.mutex.synchronize{
-      # @path = @id = Tk_TextTag_ID.join('')
-      @path = @id = Tk_TextTag_ID.join(TkCore::INTERP._ip_id_).freeze
-      Tk_TextTag_ID[1].succ!
-    }
-    TTagID_TBL.mutex.synchronize{
-      TTagID_TBL[@id] = self
-      TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
-      TTagID_TBL[@tpath][@id] = self
-    }
-    #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
-    Tk::Text::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
-    Tk::Text::IndexString.new(@id + '.first')
-  end
-
-  def last
-    Tk::Text::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 [Tk::Text::IndexString.new(key), Tk::Text::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|
-      Tk::Text::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|
-      Tk::Text::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
-  def cget_strict(key)
-    @t.tag_cget_strict @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.mutex.synchronize{
-      TTagID_TBL[@tpath].delete(@id) if TTagID_TBL[@tpath]
-    }
-    self
-  end
-end
-TktTag = TkTextTag
-
-class TkTextNamedTag<TkTextTag
-  def self.new(parent, name, *args)
-    tagobj = nil
-    TTagID_TBL.mutex.synchronize{
-      if TTagID_TBL[parent.path] && TTagID_TBL[parent.path][name]
-        tagobj = TTagID_TBL[parent.path][name]
-      else
-        # super(parent, name, *args)
-        (tagobj = self.allocate).instance_eval{
-          @parent = @t = parent
-          @tpath = parent.path
-          @path = @id = name
-          TTagID_TBL[@id] = self
-          TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
-          TTagID_TBL[@tpath][@id] = self unless TTagID_TBL[@tpath][@id]
-          @t._addtag @id, self
-        }
-      end
-    }
-
-    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
-
-    tagobj
-  end
-
-  def initialize(parent, name, *args)
-    # dummy:: not called by 'new' method
-
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = name
-
-    #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
-TktNamedTag = TkTextNamedTag
-
-class TkTextTagSel<TkTextNamedTag
-  def self.new(parent, *args)
-    super(parent, 'sel', *args)
-  end
-end
-TktTagSel = TkTextTagSel
diff --git a/ext/tk/lib/tk/textwindow.rb b/ext/tk/lib/tk/textwindow.rb
deleted file mode 100644
index 004422e4f3..0000000000
--- a/ext/tk/lib/tk/textwindow.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# tk/textwindow.rb - treat Tk text window object
-#
-require 'tk'
-require 'tk/text'
-
-class TkTextWindow<TkObject
-  include Tk::Text::IndexModMethods
-
-  def initialize(parent, index, keys = {})
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text 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
-    Tk::Text::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 cget_strict(slot)
-    @t.window_cget_strict(@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
-
-TktWindow = TkTextWindow
diff --git a/ext/tk/lib/tk/timer.rb b/ext/tk/lib/tk/timer.rb
deleted file mode 100644
index 91840d0575..0000000000
--- a/ext/tk/lib/tk/timer.rb
+++ /dev/null
@@ -1,669 +0,0 @@
-#
-#   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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    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}"
-    @current_args = args
-    @current_script = [sleep, @after_script]
-    @after_id = tk_call_without_enc('after', 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
-      __at_end__
-      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
-        __at_end__
-        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)
-    Tk_CBID.mutex.synchronize{
-      # @id = Tk_CBID.join('')
-      @id = Tk_CBID.join(TkCore::INTERP._ip_id_)
-      Tk_CBID[1].succ!
-    }
-
-    @wait_var = TkVariable.new(0)
-
-    @at_end_proc = nil
-
-    @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 __at_end__
-    @at_end_proc.call(self) if @at_end_proc
-    @wait_var.value = 0  # for wait
-  end
-  private :__at_end__
-
-  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
-    __at_end__
-    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 at_end(*arg, &b)
-    if arg.empty?
-      if b 
-        @at_end_proc = b
-      else 
-        # no proc
-        return @at_end_proc 
-      end
-    else
-      fail ArgumentError, "wrong number of arguments" if arg.length != 1 || b
-      @at_end_proc = arg[0]
-    end
-    self
-  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
-      __at_end__
-      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
-        __at_end__
-        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/ext/tk/lib/tk/toplevel.rb b/ext/tk/lib/tk/toplevel.rb
deleted file mode 100644
index bd6e8307f5..0000000000
--- a/ext/tk/lib/tk/toplevel.rb
+++ /dev/null
@@ -1,262 +0,0 @@
-#
-# tk/toplevel.rb : treat toplevel widget
-#
-require 'tk'
-require 'tk/wm'
-require 'tk/menuspec'
-
-class Tk::Toplevel<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| # k is a String
-      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
-        keys['class'] = @classname = @classname.id
-      elsif @classname
-        @db_class = TkDatabaseClass.new(@classname)
-        keys['class'] = @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
-      keys['class'] = @classname = @classname.id
-    elsif @classname
-      @db_class = TkDatabaseClass.new(@classname)
-      keys['class'] = @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
-
-#TkToplevel = Tk::Toplevel unless Object.const_defined? :TkToplevel
-Tk.__set_toplevel_aliases__(:Tk, Tk::Toplevel, :TkToplevel)
diff --git a/ext/tk/lib/tk/ttk_selector.rb b/ext/tk/lib/tk/ttk_selector.rb
deleted file mode 100644
index 72ed637a38..0000000000
--- a/ext/tk/lib/tk/ttk_selector.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#  ttk_selector
-#
-######################################
-#  toplevel classes/modules
-module Tk
-  @TOPLEVEL_ALIAS_TABLE[:Ttk] = {
-    :TkButton       => 'tkextlib/tile/tbutton', 
-
-    :TkCheckbutton  => 'tkextlib/tile/tcheckbutton', 
-    :TkCheckButton  => 'tkextlib/tile/tcheckbutton', 
-
-    # :TkDialog       => 'tkextlib/tile/dialog', 
-
-    :TkEntry        => 'tkextlib/tile/tentry', 
-
-    :TkCombobox     => 'tkextlib/tile/tcombobox', 
-
-    :TkFrame        => 'tkextlib/tile/tframe', 
-
-    :TkLabel        => 'tkextlib/tile/tlabel', 
-
-    :TkLabelframe   => 'tkextlib/tile/tlabelframe', 
-    :TkLabelFrame   => 'tkextlib/tile/tlabelframe', 
-
-    :TkMenubutton   => 'tkextlib/tile/tmenubutton', 
-    :TkMenuButton   => 'tkextlib/tile/tmenubutton', 
-
-    :TkNotebook     => 'tkextlib/tile/tnotebook', 
-
-    # :TkPaned        => 'tkextlib/tile/tpaned', 
-    :TkPanedwindow  => 'tkextlib/tile/tpaned', 
-    :TkPanedWindow  => 'tkextlib/tile/tpaned', 
-
-    :TkProgressbar  => 'tkextlib/tile/tprogressbar', 
-
-    :TkRadiobutton  => 'tkextlib/tile/tradiobutton', 
-    :TkRadioButton  => 'tkextlib/tile/tradiobutton', 
-
-    :TkScale        => 'tkextlib/tile/tscale', 
-    # :TkProgress     => 'tkextlib/tile/tscale', 
-
-    :TkScrollbar    => 'tkextlib/tile/tscrollbar', 
-    :TkXScrollbar   => 'tkextlib/tile/tscrollbar', 
-    :TkYScrollbar   => 'tkextlib/tile/tscrollbar', 
-
-    :TkSeparator    => 'tkextlib/tile/tseparator', 
-
-    :TkSizeGrip     => 'tkextlib/tile/sizegrip', 
-    :TkSizegrip     => 'tkextlib/tile/sizegrip', 
-
-    # :TkSquare       => 'tkextlib/tile/tsquare', 
-
-    :TkTreeview     => 'tkextlib/tile/treeview', 
-  }
-  @TOPLEVEL_ALIAS_TABLE[:Tile] = @TOPLEVEL_ALIAS_TABLE[:Ttk]
-
-  ################################################
-  # register some Ttk widgets as default
-  # (Ttk is a standard library on Tcl/Tk8.5+)
-  @TOPLEVEL_ALIAS_TABLE[:Ttk].each{|sym, file|
-    unless Object.autoload?(sym) || Object.const_defined?(sym)
-      Object.autoload(sym, file)
-    end
-  }
-
-  ################################################
-
-  @TOPLEVEL_ALIAS_SETUP_PROC[:Tile] = 
-    @TOPLEVEL_ALIAS_SETUP_PROC[:Ttk] = proc{|mod|
-    unless Tk.autoload?(:Tile) || Tk.const_defined?(:Tile) 
-      Object.autoload :Ttk, 'tkextlib/tile'
-      Tk.autoload :Tile, 'tkextlib/tile'
-    end
-  }
-end
diff --git a/ext/tk/lib/tk/txtwin_abst.rb b/ext/tk/lib/tk/txtwin_abst.rb
deleted file mode 100644
index 540f806d17..0000000000
--- a/ext/tk/lib/tk/txtwin_abst.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/ext/tk/lib/tk/validation.rb b/ext/tk/lib/tk/validation.rb
deleted file mode 100644
index 60bd433cdc..0000000000
--- a/ext/tk/lib/tk/validation.rb
+++ /dev/null
@@ -1,397 +0,0 @@
-#
-#  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(' '))
-          keys[key] = klass.new(cmd, *args)
-        # 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(' '))
-          keys[key] = klass.new(cmd, *args)
-        # 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
-    ]
-
-=begin
-    # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-    KEY_TBL.map!{|inf|
-      if inf.kind_of?(Array)
-        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-      end
-      inf
-    }
-
-    PROC_TBL.map!{|inf|
-      if inf.kind_of?(Array)
-        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-      end
-      inf
-    }
-=end
-
-    _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.map!{|arg| klass._sym2subst(arg)}
-      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/ext/tk/lib/tk/variable.rb b/ext/tk/lib/tk/variable.rb
deleted file mode 100644
index f738a96ee7..0000000000
--- a/ext/tk/lib/tk/variable.rb
+++ /dev/null
@@ -1,1765 +0,0 @@
-#
-# 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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-  TkCore::INTERP.init_ip_env{
-    TkVar_CB_TBL.mutex.synchronize{ TkVar_CB_TBL.clear }
-    TkVar_ID_TBL.mutex.synchronize{ TkVar_ID_TBL.clear }
-  }
-
-  major, minor, type, type_name, patchlevel = TclTkLib.get_version
-  USE_OLD_TRACE_OPTION_STYLE = (major < 8) || (major == 8 && minor < 4)
-
-  #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 cb_obj = TkVar_CB_TBL[id]
-      #_get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
-      begin
-        _get_eval_string(cb_obj.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 >-------"
-          if TkCore::WITH_ENCODING
-            msg.force_encoding('utf-8')
-          else
-            msg.instance_variable_set(:@encoding, 'utf-8')
-          end
-        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
-      Tk_VARIABLE_ID.mutex.synchronize{
-        @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.mutex.synchronize{
-      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 _check_trace_opt(opts)
-    if opts.kind_of?(Array)
-      opt_str = opts.map{|s| s.to_s}.join(' ')
-    else
-      opt_str = opts.to_s
-    end
-
-    fail ArgumentError, 'null trace option' if opt_str.empty?
-
-    if opt_str =~ /[^arwu\s]/
-      # new format (Tcl/Tk8.4+?)
-      if opts.kind_of?(Array)
-        opt_ary = opts.map{|opt| opt.to_s.strip}
-      else
-        opt_ary = opt_str.split(/\s+|\|/)
-        opt_ary.delete('')
-      end
-      if USE_OLD_TRACE_OPTION_STYLE
-        opt_ary.uniq.map{|opt|
-          case opt
-          when 'array'
-            'a'
-          when 'read'
-            'r'
-          when 'write'
-            'w'
-          when 'unset'
-            'u'
-          else
-            fail ArgumentError, "unsupported trace option '#{opt}' on Tcl/Tk#{Tk::TCL_PATCHLEVEL}"
-          end
-        }.join
-      else
-        opt_ary
-      end
-    else
-      # old format
-      opt_ary = opt_str.delete('^arwu').split(//).uniq
-      if USE_OLD_TRACE_OPTION_STYLE
-        opt_ary.join
-      else
-        opt_ary.map{|c|
-          case c
-          when 'a'
-            'array'
-          when 'r'
-            'read'
-          when 'w'
-            'write'
-          when 'u'
-            'unset'
-          end
-        }
-      end
-    end
-  end
-  private :_check_trace_opt
-
-  def trace(opts, cmd = Proc.new)
-    opts = _check_trace_opt(opts)
-    (@trace_var ||= []).unshift([opts,cmd])
-
-    if @trace_opts == nil
-      TkVar_CB_TBL[@id] = self
-      @trace_opts = opts
-      if USE_OLD_TRACE_OPTION_STYLE
-        Tk.tk_call_without_enc('trace', 'variable', 
-                               @id, @trace_opts, 'rb_var ' << @id)
-      else
-        Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                               @id, @trace_opts, 'rb_var ' << @id)
-      end
-    else
-      newopts = @trace_opts.dup
-      if USE_OLD_TRACE_OPTION_STYLE
-        opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        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)
-        end
-      else
-        newopts |= opts
-        unless (newopts - @trace_opts).empty?
-          Tk.tk_call_without_enc('trace', 'remove', 'variable', 
-                                 @id, @trace_opts, 'rb_var ' << @id)
-          @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        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
-
-    opts = _check_trace_opt(opts)
-
-    ((@trace_elem ||= {})[elem] ||= []).unshift([opts,cmd])
-
-    if @trace_opts == nil
-      TkVar_CB_TBL[@id] = self
-      @trace_opts = opts
-      if USE_OLD_TRACE_OPTION_STYLE
-        Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                               @id, @trace_opts, 'rb_var ' << @id)
-      else
-        Tk.tk_call_without_enc('trace', 'variable', 
-                               @id, @trace_opts, 'rb_var ' << @id)
-      end
-    else
-      newopts = @trace_opts.dup
-      if USE_OLD_TRACE_OPTION_STYLE
-        opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        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)
-        end
-      else
-        newopts |= opts
-        unless (newopts - @trace_opts).empty?
-          Tk.tk_call_without_enc('trace', 'remove', 'variable', 
-                                 @id, @trace_opts, 'rb_var ' << @id)
-          @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    end
-
-    self
-  end
-
-  def trace_info
-    return [] unless @trace_var
-    @trace_var.dup
-  end
-  alias trace_vinfo trace_info
-
-  def trace_info_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
-  alias trace_vinfo_for_element trace_info_for_element
-
-  def trace_remove(opts,cmd)
-    return self unless @trace_var.kind_of? Array
-
-    opts = _check_trace_opt(opts)
-
-    idx = -1
-    if USE_OLD_TRACE_OPTION_STYLE
-      newopts = ''
-      @trace_var.each_with_index{|e, i|
-        if idx < 0 && e[1] == cmd
-          diff = false
-          ['a', 'r', 'w', 'u'].each{|c|
-            break if (diff = e[0].index(c) ^ opts.index(c))
-          }
-          unless diff
-            #find
-            idx = i
-            next
-          end
-        end
-        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-      }
-    else
-      newopts = []
-      @trace_var.each_with_index{|e, i|
-        if idx < 0 && e[1] == cmd && 
-            e[0].size == opts.size && (e[0] - opts).empty?
-          # find
-          idx = i
-          next
-        end
-        newopts |= e[0]
-      }
-    end
-
-    if idx >= 0
-      @trace_var.delete_at(idx) 
-    else
-      return self
-    end
-
-    (@trace_elem ||= {}).each{|elem|
-      @trace_elem[elem].each{|e|
-        if USE_OLD_TRACE_OPTION_STYLE
-          e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        else
-          newopts |= e[0]
-        end
-      }
-    }
-
-    if USE_OLD_TRACE_OPTION_STYLE
-      diff = false
-      @trace_opts.each_byte{|c| break if (diff = ! newopts.index(c))}
-      if diff
-        Tk.tk_call_without_enc('trace', 'vdelete', 
-                               @id, @trace_opts, 'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        unless @trace_opts.empty?
-          Tk.tk_call_without_enc('trace', 'variable', 
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    else
-      unless (@trace_opts - newopts).empty?
-        Tk.tk_call_without_enc('trace', 'remove', 'variable', 
-                               @id, @trace_opts, 'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        unless @trace_opts.empty?
-          Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    end
-
-    self
-  end
-  alias trace_delete  trace_remove
-  alias trace_vdelete trace_remove
-
-  def trace_remove_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 = _check_trace_opt(opts)
-
-    idx = -1
-    if USE_OLD_TRACE_OPTION_STYLE
-      @trace_elem[elem].each_with_index{|e, i|
-        if idx < 0 && e[1] == cmd
-          diff = false
-          ['a', 'r', 'w', 'u'].each{|c|
-            break if (diff = e[0].index(c) ^ opts.index(c))
-          }
-          unless diff
-            #find
-            idx = i
-            next
-          end
-        end
-      }
-    else
-      @trace_elem[elem].each_with_index{|e, i|
-        if idx < 0 && e[1] == cmd && 
-            e[0].size == opts.size && (e[0] - opts).empty?
-          # find
-          idx = i
-          next
-        end
-      }
-    end
-
-    if idx >= 0
-      @trace_elem[elem].delete_at(idx)
-    else
-      return self
-    end
-
-    if USE_OLD_TRACE_OPTION_STYLE
-      newopts = ''
-      @trace_var.each{|e| 
-        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-      }
-      @trace_elem.each{|elem|
-        @trace_elem[elem].each{|e|
-          e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        }
-      }
-    else
-      newopts = []
-      @trace_var.each{|e|
-        newopts |= e[0]
-      }
-      @trace_elem.each{|elem|
-        @trace_elem[elem].each{|e|
-          e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        }
-      }
-    end
-
-    if USE_OLD_TRACE_OPTION_STYLE
-      diff = false
-      @trace_opts.each_byte{|c| break if (diff = ! newopts.index(c))}
-      if diff
-        Tk.tk_call_without_enc('trace', 'vdelete', 
-                               @id, @trace_opts, 'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        unless @trace_opts.empty?
-          Tk.tk_call_without_enc('trace', 'variable', 
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    else
-      unless (@trace_opts - newopts).empty?
-        Tk.tk_call_without_enc('trace', 'remove', 'variable', 
-                               @id, @trace_opts, 'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        unless @trace_opts.empty?
-          Tk.tk_call_without_enc('trace', 'add', 'variable', 
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    end
-
-    self
-  end
-  alias trace_delete_for_element  trace_remove_for_element
-  alias trace_vdelete_for_element trace_remove_for_element
-end
-
-class TkVarAccess<TkVariable
-  def self.new(name, *args)
-    if name.kind_of?(TkVariable)
-      name.value = args[0] unless args.empty?
-      return name 
-    end
-
-    name = name.to_s
-    v = nil
-    TkVar_ID_TBL.mutex.synchronize{
-      if v = TkVar_ID_TBL[name]
-        v.value = args[0] unless args.empty?
-        return v
-      else
-        (v = self.allocate).instance_eval{
-          @id = name
-          TkVar_ID_TBL[@id] = self
-          @var = @id
-        }
-      end
-    }
-
-    v.instance_eval{ initialize(name, *args) }
-    v
-  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
-
-    name = name.to_s
-    v = nil
-    TkVar_ID_TBL.mutex.synchronize{
-      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
-      else
-        (v = self.allocate).instance_eval{
-          @id = name
-          TkVar_ID_TBL[@id] = self
-          @var = @id
-        }
-      end
-    }
-
-    INTERP._invoke_without_enc('global', name)
-    if args.empty? && INTERP._invoke_without_enc('array', 'exist', name) == '0'
-      v.instance_eval{ initialize(name, {}) }  # force creating
-    else
-      v.instance_eval{ initialize(name, *args) }
-    end
-    v
-  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/ext/tk/lib/tk/virtevent.rb b/ext/tk/lib/tk/virtevent.rb
deleted file mode 100644
index ae31ac1f8f..0000000000
--- a/ext/tk/lib/tk/virtevent.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-#   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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkVirtualEventTBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    TkVirtualEventTBL.mutex.synchronize{ TkVirtualEventTBL.clear }
-  }
-
-  class PreDefVirtEvent<self
-    def self.new(event, *sequences)
-      if event =~ /^<(<.*>)>$/
-        event = $1
-      elsif event !~ /^<.*>$/
-        event = '<' + event + '>'
-      end
-      TkVirtualEvent::TkVirtualEventTBL.mutex.synchronize{
-        if TkVirtualEvent::TkVirtualEventTBL.has_key?(event)
-          TkVirtualEvent::TkVirtualEventTBL[event]
-        else
-          # super(event, *sequences)
-          (obj = self.allocate).instance_eval{
-            initialize(event, *sequences)
-            TkVirtualEvent::TkVirtualEventTBL[@id] = self
-          }
-        end
-      }
-    end
-
-    def initialize(event, *sequences)
-      @path = @id = event
-      _add_sequences(sequences)
-    end
-  end
-
-  def TkVirtualEvent.getobj(event)
-    obj = nil
-    TkVirtualEventTBL.mutex.synchronize{
-      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)
-    TkVirtualEventID.mutex.synchronize{
-      # @path = @id = '<' + TkVirtualEventID.join('') + '>'
-      @path = @id = '<' + TkVirtualEventID.join(TkCore::INTERP._ip_id_) + '>'
-      TkVirtualEventID[1].succ!
-    }
-    _add_sequences(sequences)
-  end
-
-  def _add_sequences(seq_ary)
-    unless seq_ary.empty?
-      tk_call_without_enc('event', 'add', "<#{@id}>", 
-                          *(seq_ary.collect{|seq| 
-                              "<#{tk_event_sequence(seq)}>"
-                            }) )
-    end
-    self
-  end
-  private :_add_sequences
-
-  def add(*sequences)
-    if sequences != []
-      _add_sequences(sequences)
-      TkVirtualEventTBL.mutex.synchronize{
-        TkVirtualEventTBL[@id] = self
-      }
-    end
-    self
-  end
-
-  def delete(*sequences)
-    if sequences == []
-      tk_call_without_enc('event', 'delete', "<#{@id}>")
-      TkVirtualEventTBL.mutex.synchronize{
-        TkVirtualEventTBL.delete(@id)
-      }
-    else
-      tk_call_without_enc('event', 'delete', "<#{@id}>", 
-                          *(sequences.collect{|seq| 
-                              "<#{tk_event_sequence(seq)}>"
-                            }) )
-      if tk_call_without_enc('event','info',"<#{@id}>").empty?
-        TkVirtualEventTBL.mutex.synchronize{
-          TkVirtualEventTBL.delete(@id)
-        }
-      end
-    end
-    self
-  end
-
-  def info
-    tk_call_without_enc('event','info',"<#{@id}>").split(/\s+/).collect!{|seq|
-      lst = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
-        case (subseq)
-        when /^<<[^<>]+>>$/
-          TkVirtualEvent.getobj(subseq[1..-2])
-        when /^<[^<>]+>$/
-          subseq[1..-2]
-        else
-          subseq.split('')
-        end
-      }.flatten
-      (lst.size == 1) ? lst[0] : lst
-    }
-  end
-end
-
-TkNamedVirtualEvent = TkVirtualEvent::PreDefVirtEvent
diff --git a/ext/tk/lib/tk/winfo.rb b/ext/tk/lib/tk/winfo.rb
deleted file mode 100644
index c649b4a0c9..0000000000
--- a/ext/tk/lib/tk/winfo.rb
+++ /dev/null
@@ -1,392 +0,0 @@
-#
-# 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/ext/tk/lib/tk/winpkg.rb b/ext/tk/lib/tk/winpkg.rb
deleted file mode 100644
index 89fb391c77..0000000000
--- a/ext/tk/lib/tk/winpkg.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-#   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 Tk::WinDDE
-end
-#TkWinDDE = Tk::WinDDE
-Tk.__set_toplevel_aliases__(:Tk, Tk::WinDDE, :TkWinDDE)
-
-module Tk::WinDDE
-  extend Tk
-  extend Tk::WinDDE
-
-  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 Tk::WinRegistry
-end
-#TkWinRegistry = Tk::WinRegistry
-Tk.__set_toplevel_aliases__(:Tk, Tk::WinRegistry, :TkWinRegistry)
-
-module Tk::WinRegistry
-  extend Tk
-  extend Tk::WinRegistry
-
-  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/ext/tk/lib/tk/wm.rb b/ext/tk/lib/tk/wm.rb
deleted file mode 100644
index 0394296189..0000000000
--- a/ext/tk/lib/tk/wm.rb
+++ /dev/null
@@ -1,552 +0,0 @@
-#
-# tk/wm.rb : methods for wm command
-#
-require 'tk'
-
-module Tk
-  module Wm
-    #include TkComm
-    extend TkCore
-
-    TkCommandNames = ['wm'.freeze].freeze
-
-    TOPLEVEL_METHODCALL_OPTKEYS = {}
-
-    def Wm.aspect(win, *args)
-      if args.length == 0
-        list(tk_call_without_enc('wm', 'aspect', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call('wm', 'aspect', win.epath, *args)
-        win
-      end
-    end
-    def aspect(*args)
-      Wm.aspect(self, *args)
-    end
-    alias wm_aspect aspect
-    TOPLEVEL_METHODCALL_OPTKEYS['aspect'] = 'aspect'
-
-    def Wm.attributes(win, slot=nil,value=TkComm::None)
-      if slot == nil
-        lst = tk_split_list(tk_call('wm', 'attributes', win.epath))
-        info = {}
-        while key = lst.shift
-          info[key[1..-1]] = lst.shift
-        end
-        info
-      elsif slot.kind_of? Hash
-        tk_call('wm', 'attributes', win.epath, *hash_kv(slot))
-        win
-      elsif value == TkComm::None
-        tk_call('wm', 'attributes', win.epath, "-#{slot}")
-      else
-        tk_call('wm', 'attributes', win.epath, "-#{slot}", value)
-        win
-      end
-    end
-    def attributes(slot=nil,value=TkComm::None)
-      Wm.attributes(self, slot, value)
-    end
-    alias wm_attributes attributes
-    TOPLEVEL_METHODCALL_OPTKEYS['attributes'] = 'attributes'
-
-    def Wm.client(win, name=TkComm::None)
-      if name == TkComm::None
-        tk_call('wm', 'client', win.epath)
-      else
-        name = '' if name == nil
-        tk_call('wm', 'client', win.epath, name)
-        win
-      end
-    end
-    def client(name=TkComm::None)
-      Wm.client(self, name)
-    end
-    alias wm_client client
-    TOPLEVEL_METHODCALL_OPTKEYS['client'] = 'client'
-
-    def Wm.colormapwindows(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'colormapwindows', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'colormapwindows', win.epath, *args)
-        win
-      end
-    end
-    def colormapwindows(*args)
-      Wm.colormapwindows(self, *args)
-    end
-    alias wm_colormapwindows colormapwindows
-    TOPLEVEL_METHODCALL_OPTKEYS['colormapwindows'] = 'colormapwindows'
-
-    def Wm.command(win, value=nil)
-      if value
-        tk_call('wm', 'command', epath, value)
-        win
-      else
-        #procedure(tk_call('wm', 'command', epath))
-        tk_call('wm', 'command', epath)
-      end
-    end
-    def wm_command(value=nil)
-      Wm.command(self, value)
-    end
-    TOPLEVEL_METHODCALL_OPTKEYS['wm_command'] = 'wm_command'
-
-    def Wm.deiconify(win, ex = true)
-      if ex
-        tk_call_without_enc('wm', 'deiconify', win.epath)
-      else
-        Wm.iconify(win)
-      end
-      win
-    end
-    def deiconify(ex = true)
-      Wm.deiconify(self, ex)
-    end
-    alias wm_deiconify deiconify
-
-    def Wm.focusmodel(win, mode = nil)
-      if mode
-        tk_call_without_enc('wm', 'focusmodel', win.epath, mode)
-        win
-      else
-        tk_call_without_enc('wm', 'focusmodel', win.epath)
-      end
-    end
-    def focusmodel(mode = nil)
-      Wm.focusmodel(self, mode)
-    end
-    alias wm_focusmodel focusmodel
-    TOPLEVEL_METHODCALL_OPTKEYS['focusmodel'] = 'focusmodel'
-
-    def Wm.forget(win)
-      # Tcl/Tk 8.5+ 
-      # work with dockable frames
-      tk_call_without_enc('wm', 'forget', win.epath)
-      win
-    end
-    def wm_forget
-      Wm.forget(self)
-    end
-
-    def Wm.frame(win)
-      tk_call_without_enc('wm', 'frame', win.epath)
-    end
-    def frame
-      Wm.frame(self)
-    end
-    alias wm_frame frame
-
-    def Wm.geometry(win, geom=nil)
-      if geom
-        tk_call_without_enc('wm', 'geometry', win.epath, geom)
-        win
-      else
-        tk_call_without_enc('wm', 'geometry', win.epath)
-      end
-    end
-    def geometry(geom=nil)
-      Wm.geometry(self, geom)
-    end
-    alias wm_geometry geometry
-    TOPLEVEL_METHODCALL_OPTKEYS['geometry'] = 'geometry'
-
-    def Wm.grid(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'grid', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'grid', win.epath, *args)
-        win
-      end
-    end
-    def wm_grid(*args)
-      Wm.grid(self, *args)
-    end
-    TOPLEVEL_METHODCALL_OPTKEYS['wm_grid'] = 'wm_grid'
-
-    def Wm.group(win, leader = nil)
-      if leader
-        tk_call('wm', 'group', win.epath, leader)
-        win
-      else
-        window(tk_call('wm', 'group', win.epath))
-      end
-    end
-    def group(leader = nil)
-      Wm.group(self, leader)
-    end
-    alias wm_group group
-    TOPLEVEL_METHODCALL_OPTKEYS['group'] = 'group'
-
-    def Wm.iconbitmap(win, bmp=nil)
-      if bmp
-        tk_call_without_enc('wm', 'iconbitmap', win.epath, bmp)
-        win
-      else
-        image_obj(tk_call_without_enc('wm', 'iconbitmap', win.epath))
-      end
-    end
-    def iconbitmap(bmp=nil)
-      Wm.iconbitmap(self, bmp)
-    end
-    alias wm_iconbitmap iconbitmap
-    TOPLEVEL_METHODCALL_OPTKEYS['iconbitmap'] = 'iconbitmap'
-
-    def Wm.iconphoto(win, *imgs)
-      if imgs.empty?
-        win.instance_eval{
-          @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', win.epath, *imgs)
-      win.instance_eval{ @wm_iconphoto = imgs  }
-      win
-    end
-    def iconphoto(*imgs)
-      Wm.iconphoto(self, *imgs)
-    end
-    alias wm_iconphoto iconphoto
-    TOPLEVEL_METHODCALL_OPTKEYS['iconphoto'] = 'iconphoto'
-
-    def Wm.iconphoto_default(win, *imgs)
-      imgs = imgs[0] if imgs.length == 1 && imgs[0].kind_of?(Array)
-      tk_call_without_enc('wm', 'iconphoto', win.epath, '-default', *imgs)
-      win
-    end
-    def iconphoto_default(*imgs)
-      Wm.iconphoto_default(self, *imgs)
-    end
-    alias wm_iconphoto_default iconphoto_default
-
-    def Wm.iconify(win, ex = true)
-      if ex
-        tk_call_without_enc('wm', 'iconify', win.epath)
-      else
-        Wm.deiconify(win)
-      end
-      win
-    end
-    def iconify(ex = true)
-      Wm.iconify(self, ex)
-    end
-    alias wm_iconify iconify
-
-    def Wm.iconmask(win, bmp=nil)
-      if bmp
-        tk_call_without_enc('wm', 'iconmask', win.epath, bmp)
-        win
-      else
-        image_obj(tk_call_without_enc('wm', 'iconmask', win.epath))
-      end
-    end
-    def iconmask(bmp=nil)
-      Wm.iconmask(self, bmp)
-    end
-    alias wm_iconmask iconmask
-    TOPLEVEL_METHODCALL_OPTKEYS['iconmask'] = 'iconmask'
-
-    def Wm.iconname(win, name=nil)
-      if name
-        tk_call('wm', 'iconname', win.epath, name)
-        win
-      else
-        tk_call('wm', 'iconname', win.epath)
-      end
-    end
-    def iconname(name=nil)
-      Wm.iconname(self, name)
-    end
-    alias wm_iconname iconname
-    TOPLEVEL_METHODCALL_OPTKEYS['iconname'] = 'iconname'
-
-    def Wm.iconposition(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'iconposition', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'iconposition', win.epath, *args)
-        win
-      end
-    end
-    def iconposition(*args)
-      Wm.iconposition(self, *args)
-    end
-    alias wm_iconposition iconposition
-    TOPLEVEL_METHODCALL_OPTKEYS['iconposition'] = 'iconposition'
-
-    def Wm.iconwindow(win, iconwin = nil)
-      if iconwin
-        tk_call_without_enc('wm', 'iconwindow', win.epath, iconwin)
-        win
-      else
-        w = tk_call_without_enc('wm', 'iconwindow', win.epath)
-        (w == '')? nil: window(w)
-      end
-    end
-    def iconwindow(iconwin = nil)
-      Wm.iconwindow(self, iconwin)
-    end
-    alias wm_iconwindow iconwindow
-    TOPLEVEL_METHODCALL_OPTKEYS['iconwindow'] = 'iconwindow'
-
-    def Wm.manage(win)
-      # Tcl/Tk 8.5+ feature
-      tk_call_without_enc('wm', 'manage', win.epath)
-      win
-    end
-    def wm_manage
-      Wm.manage(self)
-    end
-=begin
-    def Wm.manage(win, use_id = nil)
-      # Tcl/Tk 8.5+ feature
-      # --------------------------------------------------------------
-      # In the future release, I want to support to embed the 'win' 
-      # into the container which has window-id 'use-id'.
-      # It may give users frexibility on controlling their GUI. 
-      # However, it may be difficult for current Tcl/Tk (Tcl/Tk8.5.1), 
-      # because it seems to require to modify Tcl/Tk's source code.
-      # --------------------------------------------------------------
-      if use_id
-        tk_call_without_enc('wm', 'manage', win.epath, '-use', use_id)
-      else
-        tk_call_without_enc('wm', 'manage', win.epath)
-      end
-      win
-    end
-=end
-
-    def Wm.maxsize(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'maxsize', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'maxsize', win.epath, *args)
-        win
-      end
-    end
-    def maxsize(*args)
-      Wm.maxsize(self, *args)
-    end
-    alias wm_maxsize maxsize
-    TOPLEVEL_METHODCALL_OPTKEYS['maxsize'] = 'maxsize'
-
-    def Wm.minsize(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'minsize', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'minsize', win.path, *args)
-        win
-      end
-    end
-    def minsize(*args)
-      Wm.minsize(self, *args)
-    end
-    alias wm_minsize minsize
-    TOPLEVEL_METHODCALL_OPTKEYS['minsize'] = 'minsize'
-
-    def Wm.overrideredirect(win, mode=TkComm::None)
-      if mode == TkComm::None
-        bool(tk_call_without_enc('wm', 'overrideredirect', win.epath))
-      else
-        tk_call_without_enc('wm', 'overrideredirect', win.epath, mode)
-        win
-      end
-    end
-    def overrideredirect(mode=TkComm::None)
-      Wm.overrideredirect(self, mode)
-    end
-    alias wm_overrideredirect overrideredirect
-    TOPLEVEL_METHODCALL_OPTKEYS['overrideredirect'] = 'overrideredirect'
-
-    def Wm.positionfrom(win, who=TkComm::None)
-      if who == TkComm::None
-        r = tk_call_without_enc('wm', 'positionfrom', win.epath)
-        (r == "")? nil: r
-      else
-        tk_call_without_enc('wm', 'positionfrom', win.epath, who)
-        win
-      end
-    end
-    def positionfrom(who=TkComm::None)
-      Wm.positionfrom(self, who)
-    end
-    alias wm_positionfrom positionfrom
-    TOPLEVEL_METHODCALL_OPTKEYS['positionfrom'] = 'positionfrom'
-
-    def Wm.protocol(win, name=nil, cmd=nil, &b)
-      if cmd
-        tk_call_without_enc('wm', 'protocol', win.epath, name, cmd)
-        win
-      elsif b
-        tk_call_without_enc('wm', 'protocol', win.epath, name, proc(&b))
-        win
-      elsif name
-        result = tk_call_without_enc('wm', 'protocol', win.epath, name)
-        (result == "")? nil : tk_tcl2ruby(result)
-      else
-        tk_split_simplelist(tk_call_without_enc('wm', 'protocol', win.epath))
-      end
-    end
-    def protocol(name=nil, cmd=nil, &b)
-      Wm.protocol(self, name, cmd, &b)
-    end
-    alias wm_protocol protocol
-
-    def Wm.protocols(win, kv=nil)
-      unless kv
-        ret = {}
-        Wm.protocol(win).each{|name|
-          ret[name] = Wm.protocol(win, name)
-        }
-        return ret
-      end
-
-      unless kv.kind_of?(Hash)
-        fail ArgumentError, 'expect a hash of protocol=>command'
-      end
-      kv.each{|k, v| Wm.protocol(win, k, v)}
-      win
-    end
-    def protocols(kv=nil)
-      Wm.protocols(self, kv)
-    end
-    alias wm_protocols protocols
-    TOPLEVEL_METHODCALL_OPTKEYS['protocols'] = 'protocols'
-
-    def Wm.resizable(win, *args)
-      if args.length == 0
-        list(tk_call_without_enc('wm', 'resizable', win.epath)).map!{|e| bool(e)}
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'resizable', win.epath, *args)
-        win
-      end
-    end
-    def resizable(*args)
-      Wm.resizable(self, *args)
-    end
-    alias wm_resizable resizable
-    TOPLEVEL_METHODCALL_OPTKEYS['resizable'] = 'resizable'
-
-    def Wm.sizefrom(win, who=TkComm::None)
-      if who == TkComm::None
-        r = tk_call_without_enc('wm', 'sizefrom', win.epath)
-        (r == "")? nil: r
-      else
-        tk_call_without_enc('wm', 'sizefrom', win.epath, who)
-        win
-      end
-    end
-    def sizefrom(who=TkComm::None)
-      Wm.sizefrom(self, who)
-    end
-    alias wm_sizefrom sizefrom
-    TOPLEVEL_METHODCALL_OPTKEYS['sizefrom'] = 'sizefrom'
-
-    def Wm.stackorder(win)
-      list(tk_call('wm', 'stackorder', win.epath))
-    end
-    def stackorder
-      Wm.stackorder(self)
-    end
-    alias wm_stackorder stackorder
-
-    def Wm.stackorder_isabove(win, target)
-      bool(tk_call('wm', 'stackorder', win.epath, 'isabove', target))
-    end
-    def Wm.stackorder_is_above(win, target)
-      Wm.stackorder_isabove(win, target)
-    end
-    def stackorder_isabove(target)
-      Wm.stackorder_isabove(self, target)
-    end
-    alias stackorder_is_above stackorder_isabove
-    alias wm_stackorder_isabove stackorder_isabove
-    alias wm_stackorder_is_above stackorder_isabove
-
-    def Wm.stackorder_isbelow(win, target)
-      bool(tk_call('wm', 'stackorder', win.epath, 'isbelow', target))
-    end
-    def Wm.stackorder_is_below(win, target)
-      Wm.stackorder_isbelow(win, target)
-    end
-    def stackorder_isbelow(target)
-      Wm.stackorder_isbelow(self, target)
-    end
-    alias stackorder_is_below stackorder_isbelow
-    alias wm_stackorder_isbelow stackorder_isbelow
-    alias wm_stackorder_is_below stackorder_isbelow
-
-    def Wm.state(win, st=nil)
-      if st
-        tk_call_without_enc('wm', 'state', win.epath, st)
-        win
-      else
-        tk_call_without_enc('wm', 'state', win.epath)
-      end
-    end
-    def state(st=nil)
-      Wm.state(self, st)
-    end
-    alias wm_state state
-    TOPLEVEL_METHODCALL_OPTKEYS['state'] = 'state'
-
-    def Wm.title(win, str=nil)
-      if str
-        tk_call('wm', 'title', win.epath, str)
-        win
-      else
-        tk_call('wm', 'title', win.epath)
-      end
-    end
-    def title(str=nil)
-      Wm.title(self, str)
-    end
-    alias wm_title title
-    TOPLEVEL_METHODCALL_OPTKEYS['title'] = 'title'
-
-    def Wm.transient(win, master=nil)
-      if master
-        tk_call_without_enc('wm', 'transient', win.epath, master)
-        win
-      else
-        window(tk_call_without_enc('wm', 'transient', win.epath))
-      end
-    end
-    def transient(master=nil)
-      Wm.transient(self, master)
-    end
-    alias wm_transient transient
-    TOPLEVEL_METHODCALL_OPTKEYS['transient'] = 'transient'
-
-    def Wm.withdraw(win, ex = true)
-      if ex
-        tk_call_without_enc('wm', 'withdraw', win.epath)
-      else
-        Wm.deiconify(win)
-      end
-      win
-    end
-    def withdraw(ex = true)
-      Wm.withdraw(self, ex)
-    end
-    alias wm_withdraw withdraw
-  end
-
-  module Wm_for_General
-    Wm.instance_methods.each{|m|
-      if (m = m.to_s) =~ /^wm_(.*)$/
-        eval "def #{m}(*args, &b); Tk::Wm.#{$1}(self, *args, &b); end"
-      end
-    }
-  end
-end
diff --git a/ext/tk/lib/tk/xim.rb b/ext/tk/lib/tk/xim.rb
deleted file mode 100644
index 0ac8559bb9..0000000000
--- a/ext/tk/lib/tk/xim.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# 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/ext/tk/lib/tkafter.rb b/ext/tk/lib/tkafter.rb
index f65945884c..53e78b8808 100644
--- a/ext/tk/lib/tkafter.rb
+++ b/ext/tk/lib/tkafter.rb
@@ -1,4 +1,414 @@
 #
-#   tkafter.rb - load tk/after.rb
+#   tkafter.rb : methods for Tcl/Tk after command
 #
-require 'tk/timer'
+#   $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 {ruby [format "TkTimer.callback %%Q!%s!" $id]} ret]] != 0} {
+	return -code $st $ret
+    } {
+	return $ret
+    }
+  EOL
+
+
+  ###############################
+  # class methods
+  ###############################
+  def self.callback(obj_id)
+    @after_id = nil
+    ex_obj = Tk_CBTBL[obj_id]
+    return "" if ex_obj == nil; # canceled
+    ex_obj.cb_call
+  end
+
+  def self.info
+    tk_call('after', 'info').split(' ').collect!{|id|
+      ret = Tk_CBTBL.find{|key,val| val.after_id == id}
+      (ret == nil)? id: ret[1]
+    }
+  end
+
+  ###############################
+  # instance methods
+  ###############################
+  def do_callback
+    @in_callback = true
+    begin
+      @return_value = @current_proc.call(self)
+    rescue Exception => e
+      if @cancel_on_exception
+	cancel
+	@return_value = e
+	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)
+    @after_script = "rb_after #{@id}"
+    @after_id = tk_call('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
+      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)
+    @id = Tk_CBID.join
+    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 = true
+
+    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)
+    @cancel_on_exception = mode
+    self
+  end
+
+  def running?
+    @running
+  end
+
+  def loop_rest
+    @do_loop
+  end
+
+  def loop_rest=(rest)
+    @do_loop = rest
+    self
+  end
+
+  def set_procs(interval, loop_exec, *procs)
+    if !interval == 'idle' \
+       && !interval.kind_of?(Integer) && !interval.kind_of?(Proc)
+      fail Kernel.format("%s need to be Integer or Proc", interval.inspect)
+    end
+    @sleep_time = interval
+
+    @loop_proc = []
+    procs.each{|e|
+      if e.kind_of? Proc
+	@loop_proc.push([e])
+      else
+	@loop_proc.push(e)
+      end
+    }
+    @proc_max = @loop_proc.size
+    @current_pos = 0
+
+    @do_loop = 0
+    if loop_exec
+      if loop_exec.kind_of?(Integer) && loop_exec < 0
+	@loop_exec = -1
+      elsif loop_exec == nil || loop_exec == false || loop_exec == 0
+	@loop_exec = 1
+      else
+	if not loop_exec.kind_of?(Integer)
+	  fail Kernel.format("%s need to be Integer", loop_exec.inspect)
+	end
+	@loop_exec = loop_exec
+      end
+      @do_loop = @loop_exec
+    end
+
+    self
+  end
+
+  def add_procs(*procs)
+    procs.each{|e|
+      if e.kind_of? Proc
+	@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
+	@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, init_proc, *init_args)
+    if !sleep == 'idle' && !sleep.kind_of?(Integer)
+      fail Kernel.format("%s need to be Integer", sleep.inspect)
+    end
+    @init_sleep = sleep
+    @init_proc = init_proc
+    @init_args = init_args
+    self
+  end
+
+  def start(*init_args)
+    return nil if @running
+
+    Tk_CBTBL[@id] = self
+    @do_loop = @loop_exec
+    @current_pos = 0
+
+    argc = init_args.size
+    if argc > 0
+      sleep = init_args.shift
+      if !sleep == 'idle' && !sleep.kind_of?(Integer)
+	fail Kernel.format("%s need to be Integer", sleep.inspect)
+      end
+      @init_sleep = sleep
+    end
+    @init_proc = init_args.shift if argc > 1
+    @init_args = init_args if argc > 0
+
+    @current_sleep = @init_sleep
+    @running = true
+    if @init_proc
+      if not @init_proc.kind_of? Proc
+	fail Kernel.format("%s need to be Proc", @init_proc.inspect)
+      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
+    @set_next = false if @in_callback
+
+    self
+  end
+
+  def restart(*restart_args)
+    cancel if @running
+    if restart_args == []
+      start(@init_sleep, @init_proc, *@init_args)
+    else
+      start(*restart_args)
+    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
+    sleep, cmd = @current_script
+    fail RuntimeError, "no procedure to continue" unless cmd
+    if wait
+      if not wait.kind_of? Integer
+	fail RuntimeError, Kernel.format("%s need to be Integer", wait.inspect)
+      end
+      sleep = wait
+    end
+    Tk_CBTBL[@id] = self
+    @running = true
+    @after_id = tk_call('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('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
diff --git a/ext/tk/lib/tkbgerror.rb b/ext/tk/lib/tkbgerror.rb
index deba7a57fa..760a3901b3 100644
--- a/ext/tk/lib/tkbgerror.rb
+++ b/ext/tk/lib/tkbgerror.rb
@@ -1,4 +1,29 @@
 #
-#   tkbgerror.rb - load tk/bgerror.rb
+#  tkbgerror -- bgerror ( tkerror ) module
+#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk/bgerror'
+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/ext/tk/lib/tkcanvas.rb b/ext/tk/lib/tkcanvas.rb
index 9524614291..32b5ac7af8 100644
--- a/ext/tk/lib/tkcanvas.rb
+++ b/ext/tk/lib/tkcanvas.rb
@@ -1,4 +1,1014 @@
 #
-#   tkcanvas.rb - load tk/canvas.rb
-#
-require 'tk/canvas'
+#		tkcanvas.rb - Tk canvas classes
+#			$Date$
+#			by Yukihiro Matsumoto <matz@caelum.co.jp>
+#			$Date$
+#			by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+
+require "tk"
+require 'tkfont'
+
+module TkTreatCItemFont
+  include TkTreatItemFont
+
+  ItemCMD = ['itemconfigure'.freeze, TkComm::None].freeze
+  def __conf_cmd(idx)
+    ItemCMD[idx]
+  end
+
+  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 :__conf_cmd, :__item_pathname
+end
+
+class TkCanvas<TkWindow
+  include TkTreatCItemFont
+  include 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 'canvas', @path, *hash_kv(keys)
+    else
+      tk_call 'canvas', @path
+    end
+  end
+  private :create_self
+
+  def tagid(tag)
+    if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
+      tag.id
+    else
+      tag
+    end
+  end
+  private :tagid
+
+  def addtag(tag, mode, *args)
+    tk_send '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('bbox', tagid(tagOrId), *tags.collect{|t| tagid(t)}))
+  end
+
+  def itembind(tag, context, cmd=Proc.new, args=nil)
+    _bind([path, "bind", tagid(tag)], context, cmd, args)
+    self
+  end
+
+  def itembind_append(tag, context, cmd=Proc.new, args=nil)
+    _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(x, *args)
+    tk_tcl2ruby(tk_send('canvasx', x, *args))
+  end
+  def canvasy(y, *args)
+    tk_tcl2ruby(tk_send('canvasy', y, *args))
+  end
+
+  def coords(tag, *args)
+    if args == []
+      tk_split_list(tk_send('coords', tagid(tag)))
+    else
+      tk_send('coords', tagid(tag), *(args.flatten))
+    end
+  end
+
+  def dchars(tag, first, last=None)
+    tk_send 'dchars', tagid(tag), first, last
+    self
+  end
+
+  def delete(*args)
+    if TkcItem::CItemID_TBL[self.path]
+      find('withtag', *args).each{|item| 
+	TkcItem::CItemID_TBL[self.path].delete(item.id)
+      }
+    end
+    tk_send 'delete', *args.collect{|t| tagid(t)}
+    self
+  end
+  alias remove delete
+
+  def dtag(tag, tag_to_del=None)
+    tk_send 'dtag', tagid(tag), tag_to_del
+    self
+  end
+
+  def find(mode, *args)
+    list(tk_send('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 'focus', tagid(tagOrId)
+      self
+    else
+      ret = tk_send('focus')
+      if ret == ""
+	nil
+      else
+	TkcItem.id2obj(self, ret)
+      end
+    end
+  end
+
+  def gettags(tagOrId)
+    list(tk_send('gettags', tagid(tagOrId))).collect{|tag|
+      TkcTag.id2obj(self, tag)
+    }
+  end
+
+  def icursor(tagOrId, index)
+    tk_send 'icursor', tagid(tagOrId), index
+    self
+  end
+
+  def index(tagOrId, index)
+    number(tk_send('index', tagid(tagOrId), index))
+  end
+
+  def insert(tagOrId, index, string)
+    tk_send 'insert', tagid(tagOrId), index, string
+    self
+  end
+
+  def itemcget(tagOrId, option)
+    case option.to_s
+    when 'dash', 'activedash', 'disableddash'
+      conf = tk_send('itemcget', tagid(tagOrId), "-#{option}")
+      if conf =~ /^[0-9]/
+	list(conf)
+      else
+	conf
+      end
+    when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+      tk_send 'itemcget', tagid(tagOrId), "-#{option}"
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('itemcget', tagid(tagOrId), "-#{option}"))
+      fnt = tk_tcl2ruby(tk_send('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 tk_send('itemcget', tagid(tagOrId), "-#{option}")
+    end
+  end
+
+  def itemconfigure(tagOrId, key, value=None)
+    if key.kind_of? Hash
+      key = _symbolkey2str(key)
+      if ( key['font'] || key['kanjifont'] \
+	  || key['latinfont'] || key['asciifont'] )
+	tagfont_configure(tagid(tagOrId), key.dup)
+      else
+	tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(key)
+      end
+
+    else
+      if ( 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
+	tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", 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 key
+      case key.to_s
+      when 'dash', 'activedash', 'disableddash'
+	conf = tk_split_simplelist(tk_send('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(tk_send('itemconfigure', 
+					   tagid(tagOrId), "-#{key}"))
+      when 'font', 'kanjifont'
+	conf = tk_split_simplelist(tk_send('itemconfigure',
+					   tagid(tagOrId),"-#{key}") )
+	conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
+      else
+	conf = tk_split_list(tk_send('itemconfigure', 
+				     tagid(tagOrId), "-#{key}"))
+      end
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      ret = tk_split_simplelist(tk_send('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
+      }
+      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)
+      else
+	ret
+      end
+    end
+  end
+
+  def lower(tag, below=None)
+    tk_send 'lower', tagid(tag), tagid(below)
+    self
+  end
+
+  def move(tag, x, y)
+    tk_send 'move', tagid(tag), x, y
+    self
+  end
+
+  def postscript(keys)
+    tk_send "postscript", *hash_kv(keys)
+  end
+
+  def raise(tag, above=None)
+    tk_send 'raise', tagid(tag), tagid(above)
+    self
+  end
+
+  def scale(tag, x, y, xs, ys)
+    tk_send 'scale', tagid(tag), x, y, xs, ys
+    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 select(mode, *args)
+    r = tk_send('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
+
+module TkcTagAccess
+  include TkComm
+  include TkTreatTagFont
+
+  def addtag(tag)
+    @c.addtag(tag, 'with', @id)
+    self
+  end
+
+  def bbox
+    @c.bbox(@id)
+  end
+
+  def bind(seq, cmd=Proc.new, args=nil)
+    @c.itembind @id, seq, cmd, args
+    self
+  end
+
+  def bind_append(seq, cmd=Proc.new, args=nil)
+    @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 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
+
+  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(index)
+    @c.index @id, index
+  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)
+    if not parent.kind_of?(TkCanvas)
+      fail Kernel.format("%s need to be TkCanvas", parent.inspect)
+    end
+    @c = parent
+    @cpath = parent.path
+    @path = @id = Tk_CanvasTag_ID.join
+    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+    CTagID_TBL[@cpath][@id] = self
+    Tk_CanvasTag_ID[1].succ!
+    if mode
+      tk_call @c.path, "addtag", @id, mode, *args
+    end
+  end
+  def id
+    @id
+  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)
+    if not parent.kind_of?(TkCanvas)
+      fail Kernel.format("%s need to be TkCanvas", parent.inspect)
+    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 @c.path, "addtag", @id, mode, *args
+    end
+  end
+end
+TkcNamedTag = TkcTagString
+
+class TkcTagAll<TkcTag
+  def initialize(parent)
+    if not parent.kind_of?(TkCanvas)
+      fail Kernel.format("%s need to be TkCanvas", parent.inspect)
+    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)
+    if not parent.kind_of?(TkCanvas)
+      fail Kernel.format("%s need to be TkCanvas", parent.inspect)
+    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)
+    if not parent.kind_of?(TkCanvas)
+      fail Kernel.format("%s need to be TkCanvas", parent.inspect)
+    end
+    @c = parent
+    @cpath = parent.path
+    @path = @id = Tk_cGroup_ID.join
+    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+    CTagID_TBL[@cpath][@id] = self
+    Tk_cGroup_ID[1].succ!
+    add(*args) if args != []
+  end
+  private :create_self
+  
+  def include(*tags)
+    for i in tags
+      i.addtag @id
+    end
+    self
+  end
+
+  def exclude(*tags)
+    for i in tags
+      i.delete @id
+    end
+    self
+  end
+end
+
+class TkcItem<TkObject
+  include TkcTagAccess
+
+  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 initialize(parent, *args)
+    if not parent.kind_of?(TkCanvas)
+      fail Kernel.format("%s need to be TkCanvas", parent.inspect)
+    end
+    @parent = @c = parent
+    @path = parent.path
+    fontkeys = {}
+    if args.size == 1 && args[0].kind_of?(Hash)
+      args[0] = _symbolkey2str(args[0])
+      coords = args[0].delete('coords')
+      if not coords.kind_of?(Array)
+        fail "coords parameter must be given by an Array"
+      end
+      args[0,0] = coords.flatten
+    end
+    if args[-1].kind_of? Hash
+      keys = _symbolkey2str(args.pop)
+      ['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
+	fontkeys[key] = keys.delete(key) if keys.key?(key)
+      }
+      args += hash_kv(keys)
+    end
+    @id = create_self(*args).to_i ;# 'canvas item id' is integer number
+    CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
+    CItemID_TBL[@path][@id] = self
+    configure(fontkeys) unless fontkeys.empty?
+
+######## old version
+#    if args[-1].kind_of? Hash
+#      keys = args.pop
+#    end
+#    @id = create_self(*args).to_i ;# 'canvas item id' is integer number
+#    CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
+#    CItemID_TBL[@path][@id] = self
+#    if keys
+#      # tk_call @path, 'itemconfigure', @id, *hash_kv(keys)
+#      configure(keys) if keys
+#    end
+########
+  end
+  def create_self(*args); end
+  private :create_self
+
+  def id
+    @id
+  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
+  CItemTypeToClass['arc'] = self
+  def create_self(*args)
+    tk_call(@path, 'create', 'arc', *args)
+  end
+  private :create_self
+end
+
+class TkcBitmap<TkcItem
+  CItemTypeToClass['bitmap'] = self
+  def create_self(*args)
+    tk_call(@path, 'create', 'bitmap', *args)
+  end
+  private :create_self
+end
+
+class TkcImage<TkcItem
+  CItemTypeToClass['image'] = self
+  def create_self(*args)
+    tk_call(@path, 'create', 'image', *args)
+  end
+  private :create_self
+end
+
+class TkcLine<TkcItem
+  CItemTypeToClass['line'] = self
+  def create_self(*args)
+    tk_call(@path, 'create', 'line', *args)
+  end
+  private :create_self
+end
+
+class TkcOval<TkcItem
+  CItemTypeToClass['oval'] = self
+  def create_self(*args)
+    tk_call(@path, 'create', 'oval', *args)
+  end
+  private :create_self
+end
+
+class TkcPolygon<TkcItem
+  CItemTypeToClass['polygon'] = self
+  def create_self(*args)
+    tk_call(@path, 'create', 'polygon', *args)
+  end
+  private :create_self
+end
+
+class TkcRectangle<TkcItem
+  CItemTypeToClass['rectangle'] = self
+  def create_self(*args)
+    tk_call(@path, 'create', 'rectangle', *args)
+  end
+  private :create_self
+end
+
+class TkcText<TkcItem
+  CItemTypeToClass['text'] = self
+  def create_self(*args)
+    tk_call(@path, 'create', 'text', *args)
+  end
+  private :create_self
+end
+
+class TkcWindow<TkcItem
+  CItemTypeToClass['window'] = self
+  def create_self(*args)
+    tk_call(@path, 'create', 'window', *args)
+  end
+  private :create_self
+end
+
+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 initialize(keys=nil)
+    @path = Tk_Image_ID.join
+    Tk_Image_ID[1].succ!
+    tk_call 'image', 'create', @type, @path, *hash_kv(keys)
+    Tk_IMGTBL[@path] = self
+  end
+
+  def delete
+    Tk_IMGTBL.delete(@id) if @id
+    tk_call('image', 'delete', @path)
+    self
+  end
+  def height
+    number(tk_call('image', 'height', @path))
+  end
+  def inuse
+    bool(tk_call('image', 'inuse', @path))
+  end
+  def itemtype
+    tk_call('image', 'type', @path)
+  end
+  def width
+    number(tk_call('image', 'width', @path))
+  end
+
+  def TkImage.names
+    Tk.tk_call('image', 'names').split.collect!{|id|
+      (Tk_IMGTBL[id])? Tk_IMGTBL[id] : id
+    }
+  end
+
+  def TkImage.types
+    Tk.tk_call('image', 'types').split
+  end
+end
+
+class TkBitmapImage<TkImage
+  def initialize(*args)
+    @type = 'bitmap'
+    super
+  end
+end
+
+class TkPhotoImage<TkImage
+  def initialize(*args)
+    @type = 'photo'
+    super
+  end
+
+  def blank
+    tk_send 'blank'
+    self
+  end
+
+  def cget(option)
+    case option.to_s
+    when 'data', 'file'
+      tk_send 'cget', option
+    else
+      tk_tcl2ruby tk_send('cget', option)
+    end
+  end
+
+  def copy(source, *opts)
+    args = opts.collect{|term|
+      if term.kind_of?(String) && term.include?(?\s)
+	term.split
+      else
+	term
+      end
+    }.flatten
+
+    tk_send 'copy', source, *args
+
+    self
+  end
+
+  def data(keys=nil)
+    tk_send('data', *hash_kv(keys))
+  end
+
+  def get(x, y)
+    tk_send('get', x, y).split.collect{|n| n.to_i}
+  end
+
+  def put(data, *to)
+    if to == []
+      tk_send 'put', data
+    else
+      tk_send 'put', data, '-to', *to
+    end
+    self
+  end
+
+  def read(file, *opts)
+    args = opts.collect{|term|
+      if term.kind_of?(String) && term.include?(?\s)
+	term.split
+      else
+	term
+      end
+    }.flatten
+  
+    tk_send 'read', file, *args
+
+    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)
+    args = opts.collect{|term|
+      if term.kind_of?(String) && term.include?(?\s)
+	term.split
+      else
+	term
+      end
+    }.flatten
+  
+    tk_send 'write', file, *args
+
+    self
+  end
+end
diff --git a/ext/tk/lib/tkclass.rb b/ext/tk/lib/tkclass.rb
index 87f5acc453..9ea275e560 100644
--- a/ext/tk/lib/tkclass.rb
+++ b/ext/tk/lib/tkclass.rb
@@ -1,9 +1,9 @@
 #
-#               tkclass.rb - Tk classes
-#                       Date: 2000/11/27 09:23:36
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+#		tkclass.rb - Tk classes
+#			Date: 2000/11/27 09:23:36
+#			by Yukihiro Matsumoto <matz@caelum.co.jp>
 #
-#                       $Id$
+#			$Id$
 
 require "tk"
 
diff --git a/ext/tk/lib/tkconsole.rb b/ext/tk/lib/tkconsole.rb
index 9960ddb8ac..d97df159fc 100644
--- a/ext/tk/lib/tkconsole.rb
+++ b/ext/tk/lib/tkconsole.rb
@@ -1,4 +1,28 @@
 #
-#   tkconsole.rb - load tk/console.rb
+#   tkconsole.rb : control the console on system without a real console
 #
-require 'tk/console'
+require 'tk'
+
+module TkConsole
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['console'.freeze].freeze
+
+  def self.title(str=None)
+    tk_call 'console', str
+  end
+  def self.hide
+    tk_call 'console', 'hide'
+  end
+  def self.show
+    tk_call 'console', 'show'
+  end
+  def self.eval(tcl_script)
+    #
+    # supports a Tcl script only
+    # I have no idea to support a Ruby script seamlessly.
+    #
+    tk_call 'console', 'eval', tcl_script
+  end
+end
diff --git a/ext/tk/lib/tkdialog.rb b/ext/tk/lib/tkdialog.rb
index bec5e5d29a..a581f3becc 100644
--- a/ext/tk/lib/tkdialog.rb
+++ b/ext/tk/lib/tkdialog.rb
@@ -1,4 +1,276 @@
+require "tk"
+
+class TkDialog2 < 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(' '))
+    }
+    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 != ""
+  end
+  private :_set_button_config
+
+  # initialize tk_dialog
+  def create_self(keys)
+    @var = TkVariable.new
+
+    @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 = nil
+
+    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 == ""
+      @default_button = keys['default'] if keys.key? 'default'
+      @buttons = keys['buttons'] if keys.key? 'buttons'
+
+      @command = keys['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 = @buttons.collect{|s|
+      if s.kind_of? Array
+	s = s.join(' ')
+      end
+      if s.include? ?\s
+	'{' + s + '}'
+      else
+	s
+      end
+    }
+
+    if @message_config.kind_of? Hash
+      @config << Kernel.format("%s.msg configure %s;", 
+			       @path, hash_kv(@message_config).join(' '))
+    end
+
+    if @msgframe_config.kind_of? Hash
+      @config << Kernel.format("%s.top configure %s;", 
+			       @path, hash_kv(@msgframe_config).join(' '))
+    end
+
+    if @btnframe_config.kind_of? Hash
+      @config << Kernel.format("%s.bot configure %s;", 
+			       @path, hash_kv(@btnframe_config).join(' '))
+    end
+
+    if @bitmap_config.kind_of? Hash
+      @config << Kernel.format("%s.bitmap configure %s;", 
+			       @path, hash_kv(@bitmap_config).join(' '))
+    end
+
+    _set_button_config(@button_configs) if @button_configs
+
+    if @command.kind_of? Proc
+      @command.call(self)
+    end
+  end
+  private :create_self
+
+  def show
+    if @default_button.kind_of? String
+      default_button = @buttons.index(@default_button)
+    else
+      default_button = @default_button
+    end
+    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(' ')+']}')
+  end
+
+  def value
+    return @var.value.to_i
+  end
+  ######################################################
+  #                                                    #
+  # these methods must 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
+end
+
+
 #
-#   tkdialog.rb - load tk/dialog.rb
+# TkDialog : with showing at initialize
 #
-require 'tk/dialog'
+class TkDialog < TkDialog2
+  def self.show(*args)
+    self.new(*args)
+  end
+
+  def initialize(*args)
+    super(*args)
+    show
+  end
+end
+
+
+#
+# dialog for warning
+#
+class TkWarning2 < TkDialog2
+  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
+
+class TkWarning < TkWarning2
+  def self.show(*args)
+    self.new(*args)
+  end
+  def initialize(*args)
+    super(*args)
+    show
+  end
+end
diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb
index 2dcfcab5da..fe9a7b6277 100644
--- a/ext/tk/lib/tkentry.rb
+++ b/ext/tk/lib/tkentry.rb
@@ -1,4 +1,292 @@
 #
-#   tkentry.rb - load tk/entry.rb
-#
-require 'tk/entry'
+#		tkentry.rb - Tk entry classes
+#			$Date$
+#			by Yukihiro Matsumoto <matz@caelum.co.jp>
+
+require 'tk.rb'
+
+class TkEntry<TkLabel
+  include Scrollable
+
+  TkCommandNames = ['entry'.freeze].freeze
+  WidgetClassName = 'Entry'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  class ValidateCmd
+    include TkComm
+
+    module Action
+      Insert = 1
+      Delete = 0
+      Others = -1
+      Focus  = -1
+      Forced = -1
+      Textvariable = -1
+      TextVariable = -1
+    end
+
+    class ValidateArgs
+      VARG_KEY  = 'disvPSVW'
+      VARG_TYPE = 'nxeseesw'
+
+      def self.scan_args(arg_str, arg_val)
+	enc = Tk.encoding
+	arg_cnv = []
+	arg_str.strip.split(/\s+/).each_with_index{|kwd,idx|
+	  if kwd =~ /^%(.)$/
+	    if num = VARG_KEY.index($1)
+	      case VARG_TYPE[num]
+	      when ?n
+		arg_cnv << TkComm::number(arg_val[idx])
+	      when ?s
+		arg_cnv << TkComm::string(arg_val[idx])
+	      when ?e
+		if enc
+		  arg_cnv << Tk.fromUTF8(TkComm::string(arg_val[idx]), enc)
+		else
+		  arg_cnv << TkComm::string(arg_val[idx])
+		end
+	      when ?w
+		arg_cnv << TkComm::window(arg_val[idx])
+	      when ?x
+		idx = TkComm::number(arg_val[idx])
+		if idx < 0
+		  arg_cnv << nil
+		else
+		  arg_cnv << idx
+		end
+	      else
+		arg_cnv << arg_val[idx]
+	      end
+	    else
+	      arg_cnv << arg_val[idx]
+	    end
+	  else
+	    arg_cnv << arg_val[idx]
+	  end
+	}
+	arg_cnv
+      end
+
+      def initialize(d,i,s,v,pp,ss,vv,ww)
+	@action = d
+	@index = i
+	@current = s
+	@type = v
+	@value = pp
+	@string = ss
+	@triggered = vv
+	@widget = ww
+      end
+      attr :action
+      attr :index
+      attr :current
+      attr :type
+      attr :value
+      attr :string
+      attr :triggered
+      attr :widget
+    end
+
+    def initialize(cmd = Proc.new, args=nil)
+      if args
+	@id = 
+	  install_cmd(proc{|*arg|
+			TkUtil.eval_cmd(proc{|*v| (cmd.call(*v))? '1': '0'}, 
+					*ValidateArgs.scan_args(args, arg))
+		      }) + " " + args
+      else
+	args = ' %d %i %s %v %P %S %V %W'
+	@id = 
+	  install_cmd(proc{|*arg|
+			TkUtil.eval_cmd(proc{|*v| (cmd.call(*v))? '1': '0'}, 
+					ValidateArgs.new(*ValidateArgs \
+							 .scan_args(args,arg)))
+	  }) + args
+      end
+    end
+
+    def to_eval
+      @id
+    end
+  end
+
+  def create_self(keys)
+    tk_call 'entry', @path
+    if keys and keys != None
+      configure(keys)
+    end
+  end
+  private :create_self
+
+  def configure(slot, value=None)
+    if slot.kind_of? Hash
+      slot = _symbolkey2str(slot)
+      if slot['vcmd'].kind_of? Array
+	cmd, *args = slot['vcmd']
+	slot['vcmd'] = ValidateCmd.new(cmd, args.join(' '))
+      elsif slot['vcmd'].kind_of? Proc
+	slot['vcmd'] = ValidateCmd.new(slot['vcmd'])
+      end
+      if slot['validatecommand'].kind_of? Array
+	cmd, *args = slot['validatecommand']
+	slot['validatecommand'] = ValidateCmd.new(cmd, args.join(' '))
+      elsif slot['validatecommand'].kind_of? Proc
+	slot['validatecommand'] = ValidateCmd.new(slot['validatecommand'])
+      end
+      if slot['invcmd'].kind_of? Array
+	cmd, *args = slot['invcmd']
+	slot['invcmd'] = ValidateCmd.new(cmd, args.join(' '))
+      elsif slot['invcmd'].kind_of? Proc
+	slot['invcmd'] = ValidateCmd.new(slot['invcmd'])
+      end
+      if slot['invalidcommand'].kind_of? Array
+	cmd, *args = slot['invalidcommand']
+	slot['invalidcommand'] = ValidateCmd.new(cmd, args.join(' '))
+      elsif slot['invalidcommand'].kind_of? Proc
+	slot['invalidcommand'] = ValidateCmd.new(slot['invalidcommand'])
+      end
+      super(slot)
+    else
+      if (slot == 'vcmd' || slot == :vcmd || 
+          slot == 'validatecommand' || slot == :validatecommand || 
+	  slot == 'invcmd' || slot == :invcmd || 
+          slot == 'invalidcommand' || slot == :invalidcommand)
+	if value.kind_of? Array
+	  cmd, *args = value
+	  value = ValidateCmd.new(cmd, args.join(' '))
+	elsif value.kind_of? Proc
+	  value = ValidateCmd.new(value)
+	end
+      end
+      super(slot, value)
+    end
+    self
+  end
+
+  def bbox(index)
+    list(tk_send('bbox', index))
+  end
+  def cursor
+    number(tk_send('index', 'insert'))
+  end
+  def cursor=(index)
+    tk_send 'icursor', index
+    self
+  end
+  def index(index)
+    number(tk_send('index', index))
+  end
+  def insert(pos,text)
+    tk_send 'insert', pos, text
+    self
+  end
+  def delete(first, last=None)
+    tk_send 'delete', first, last
+    self
+  end
+  def mark(pos)
+    tk_send 'scan', 'mark', pos
+    self
+  end
+  def dragto(pos)
+    tk_send 'scan', 'dragto', pos
+    self
+  end
+  def selection_adjust(index)
+    tk_send 'selection', 'adjust', index
+    self
+  end
+  def selection_clear
+    tk_send 'selection', 'clear'
+    self
+  end
+  def selection_from(index)
+    tk_send 'selection', 'from', index
+    self
+  end
+  def selection_present()
+    bool(tk_send('selection', 'present'))
+  end
+  def selection_range(s, e)
+    tk_send 'selection', 'range', s, e
+    self
+  end
+  def selection_to(index)
+    tk_send 'selection', 'to', index
+    self
+  end
+
+  def invoke_validate
+    bool(tk_send('validate'))
+  end
+  def validate(mode = nil)
+    if mode
+      configure 'validate', mode
+    else
+      invoke_validate
+    end
+  end
+
+  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
+  alias vcmd validatecommand
+
+  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
+  alias invcmd invalidcommand
+
+  def value
+    tk_send 'get'
+  end
+  def value= (val)
+    tk_send 'delete', 0, 'end'
+    tk_send 'insert', 0, val
+  end
+end
+
+class TkSpinbox<TkEntry
+  TkCommandNames = ['spinbox'.freeze].freeze
+  WidgetClassName = 'Spinbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    tk_call 'spinbox', @path
+    if keys and keys != None
+      configure(keys)
+    end
+  end
+  private :create_self
+
+  def identify(x, y)
+    tk_send 'identify', x, y
+  end
+
+  def spinup
+    tk_send 'invoke', 'spinup'
+    self
+  end
+
+  def spindown
+    tk_send 'invoke', 'spindown'
+    self
+  end
+
+  def set(str)
+    tk_send 'set', str
+  end
+end
diff --git a/ext/tk/lib/tkextlib/ICONS.rb b/ext/tk/lib/tkextlib/ICONS.rb
deleted file mode 100644
index 18d84c05e9..0000000000
--- a/ext/tk/lib/tkextlib/ICONS.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/ICONS/icons.rb b/ext/tk/lib/tkextlib/ICONS/icons.rb
deleted file mode 100644
index b430bae55d..0000000000
--- a/ext/tk/lib/tkextlib/ICONS/icons.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/ICONS/setup.rb b/ext/tk/lib/tkextlib/ICONS/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/ICONS/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/SUPPORT_STATUS b/ext/tk/lib/tkextlib/SUPPORT_STATUS
deleted file mode 100644
index cfbe274c86..0000000000
--- a/ext/tk/lib/tkextlib/SUPPORT_STATUS
+++ /dev/null
@@ -1,196 +0,0 @@
-
-  [ 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.8.0/8.5.1
-                     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/ext/tk/lib/tkextlib/blt.rb b/ext/tk/lib/tkextlib/blt.rb
deleted file mode 100644
index 115eb927ba..0000000000
--- a/ext/tk/lib/tkextlib/blt.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/barchart.rb b/ext/tk/lib/tkextlib/blt/barchart.rb
deleted file mode 100644
index cb481c5889..0000000000
--- a/ext/tk/lib/tkextlib/blt/barchart.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/bitmap.rb b/ext/tk/lib/tkextlib/blt/bitmap.rb
deleted file mode 100644
index 23c6d2d064..0000000000
--- a/ext/tk/lib/tkextlib/blt/bitmap.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-#  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]).instance_eval{
-      @mutex = Mutex.new
-      def mutex; @mutex; end
-      freeze
-    }
-
-    TkCore::INTERP.init_ip_env{
-      BITMAP_ID_TBL.mutex.synchronize{ BITMAP_ID_TBL.clear }
-    }
-
-    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
-        BITMAP_ID.mutex.synchronize{
-          @id = BITMAP_ID.join(TkCore::INTERP._ip_id_)
-          BITMAP_ID[1].succ!
-        }
-        BITMAP_ID_TBL.mutex.synchronize{
-          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/ext/tk/lib/tkextlib/blt/busy.rb b/ext/tk/lib/tkextlib/blt/busy.rb
deleted file mode 100644
index 2f807fcd9c..0000000000
--- a/ext/tk/lib/tkextlib/blt/busy.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-#  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?(Tk::Toplevel)
-          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/ext/tk/lib/tkextlib/blt/component.rb b/ext/tk/lib/tkextlib/blt/component.rb
deleted file mode 100644
index b2005b2f2b..0000000000
--- a/ext/tk/lib/tkextlib/blt/component.rb
+++ /dev/null
@@ -1,2145 +0,0 @@
-#
-#  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_cget_strict(id, option)
-      ret = itemcget_strict(['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_cget_strict(option)
-      itemcget_strict('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_cget_strict(id, option)
-      itemcget_strict(['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_cget_strict(id, option)
-      itemcget_strict(['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_cget_strict(id, option)
-      itemcget_strict(['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_cget_strict(option)
-      itemcget_strict('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_cget_strict(option)
-      itemcget_strict('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_cget_strict(id, option)
-      itemcget_strict(['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_cget_strict(option)
-      itemcget_strict('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_cget_strict(id, option)
-      itemcget_strict(['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 __itemcget_strict itemcget_strict
-    alias __itemconfiginfo itemconfiginfo
-    alias __current_itemconfiginfo current_itemconfiginfo
-    private :__itemcget, :__itemconfiginfo, :__current_itemconfiginfo
-
-    def itemcget_strict(tagOrId, option)
-      ret = __itemcget(tagid(tagOrId), option)
-      if option == 'bindtags' || option == :bindtags
-        ret.collect{|tag| TkBindTag.id2obj(tag)}
-      else
-        ret
-      end
-    end
-    def itemcget(tagOrId, option)
-      unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        itemcget_strict(tagOrId, option)
-      else
-        begin
-          itemcget_strict(tagOrId, option)
-        rescue => e
-          begin
-            if current_itemconfiginfo(tagOrId).has_key?(option.to_s)
-              # error on known option
-              fail e
-            else
-              # unknown option
-              nil
-            end
-          rescue
-            fail e  # tag error
-          end
-        end
-      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, :itemcget_strict
-    private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-    #################
-
-    class Axis < TkObject
-      (OBJ_ID = ['blt_chart_axis'.freeze, '00000'.taint]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      AxisID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        AxisID_TBL.mutex.synchronize{ AxisID_TBL.clear }
-      }
-
-      def self.id2obj(chart, id)
-        cpath = chart.path
-        AxisID_TBL.mutex.synchronize{
-          return id unless AxisID_TBL[cpath]
-          AxisID_TBL[cpath][id]? AxisID_TBL[cpath][id]: id
-        }
-      end
-
-      def self.new(chart, axis=nil, keys={})
-        if axis.kind_of?(Hash)
-          keys = axis
-          axis = nil
-        end
-        if keys
-          keys = _symbolkey2str(keys)
-          not_create = keys.delete('without_creating')
-        else
-          not_create = false
-        end
-
-        obj = nil
-        AxisID_TBL.mutex.synchronize{
-          chart_path = chart.path
-          AxisID_TBL[chart_path] ||= {}
-          if axis && AxisID_TBL[chart_path][axis]
-            obj = AxisID_TBL[chart_path][axis]
-          else
-            (obj = self.allocate).instance_eval{
-              if axis
-                @axis = @id = axis.to_s
-              else
-                OBJ_ID.mutex.synchronize{
-                  @axis = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-                  OBJ_ID[1].succ!
-                }
-              end
-              @path = @id
-              @parent = @chart = chart
-              @cpath = @chart.path
-              Axis::AxisID_TBL[@cpath][@axis] = self
-              unless not_create
-                tk_call(@chart, 'axis', 'create', @axis, keys)
-                return obj
-              end
-            }
-          end
-        }
-
-        obj.configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, axis=nil, keys={})
-        # dummy:: not called by 'new' method
-
-        if axis.kind_of?(Hash)
-          keys = axis
-          axis = nil
-        end
-        if axis
-          @axis = @id = axis.to_s
-        else
-          OBJ_ID.mutex.synchronize{
-            @axis = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-            OBJ_ID[1].succ!
-          }
-        end
-        @path = @id
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # Axis::AxisID_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 cget_strict(option)
-        @chart.axis_cget_strict(@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
-      CrosshairsID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        CrosshairsID_TBL.mutex.synchronize{ CrosshairsID_TBL.clear }
-      }
-
-      def self.new(chart, keys={})
-        obj = nil
-        CrosshairsID_TBL.mutex.synchronize{
-          unless (obj = CrosshairsID_TBL[chart.path])
-            (obj = self.allocate).instance_eval{
-              @parent = @chart = chart
-              @cpath = @chart.path
-              @path = @id = 'crosshairs'
-              Crosshairs::CrosshairsID_TBL[@cpath] = self
-            }
-          end
-        }
-        chart.crosshair_configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, keys={})
-        # dummy:: not called by 'new' method
-
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # Crosshairs::CrosshairsID_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 cget_strict(option)
-        @chart.crosshair_cget_strict(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.mutex.synchronize{ ElementID_TBL.clear }
-      }
-
-      (OBJ_ID = ['blt_chart_element'.freeze, '00000'.taint]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      def Element.type2class(type)
-        ElementTypeToClass[type]
-      end
-
-      def Element.id2obj(chart, id)
-        cpath = chart.path
-        ElementID_TBL.mutex.synchronize{
-          return id unless ElementID_TBL[cpath]
-          ElementID_TBL[cpath][id]? ElementID_TBL[cpath][id]: id
-        }
-      end
-
-      def self.new(chart, element=nil, keys={})
-        if element.kind_of?(Hash)
-          keys = element
-          element = nil
-        end
-        if keys
-          keys = _symbolkey2str(keys)
-          not_create = keys.delete('without_creating')
-        else
-          not_create = false
-        end
-
-        obj = nil
-        ElementID_TBL.mutex.synchronize{
-          chart_path = chart.path
-          ElementID_TBL[chart_path] ||= {}
-          if element && ElementID_TBL[chart_path][element]
-            obj = ElementID_TBL[chart_path][element]
-          else
-            (obj = self.allocate).instance_eval{
-              if element
-                @element = @id = element.to_s
-              else
-                OBJ_ID.mutex.synchronize{
-                  @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::ElementID_TBL[@cpath][@element] = self
-              unless not_create
-                tk_call(@chart, @typename, 'create', @element, keys)
-                return obj
-              end
-            }
-          end
-        }
-
-        obj.configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, element=nil, keys={})
-        # dummy:: not called by 'new' method
-
-        if element.kind_of?(Hash)
-          keys = element
-          element = nil
-        end
-        if element
-          @element = @id = element.to_s
-        else
-          OBJ_ID.mutex.synchronize{
-            @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::ElementID_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 cget_strict(option)
-        @chart.__send__(@typename + '_cget_strict', @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
-      GridLineID_TBL = TkCore::INTERP.create_table
-      TkCore::INTERP.init_ip_env{
-        GridLineID_TBL.mutex.synchronize{ GridLineID_TBL.clear }
-      }
-
-      def self.new(chart, keys={})
-        obj = nil
-        GridLineID_TBL.mutex.synchronize{
-          unless (obj = GridLineID_TBL[chart.path])
-            (obj = self.allocate).instance_eval{
-              @parent = @chart = chart
-              @cpath = @chart.path
-              @path = @id = 'grid'
-              GridLine::GridLineID_TBL[@cpath] = self
-            }
-          end
-        }
-        chart.gridline_configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, keys={})
-        # dummy:: not called by 'new' method
-
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # GridLine::GridLineID_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 cget_strict(option)
-        @chart.gridline_cget_strict(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
-      LegendID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        LegendID_TBL.mutex.synchronize{ LegendID_TBL.clear }
-      }
-
-      def self.new(chart, keys={})
-        obj = nil
-        LegenedID_TBL.mutex.synchronize{
-          unless (obj = LegenedID_TBL[chart.path])
-            (obj = self.allocate).instance_eval{
-              @parent = @chart = chart
-              @cpath = @chart.path
-              @path = @id = 'crosshairs'
-              Legend::LegenedID_TBL[@cpath] = self
-            }
-          end
-        }
-        chart.legend_configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, keys={})
-        # dummy:: not called by 'new' method
-
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # Legend::LegendID_TBL[@cpath] = self
-        @chart.legend_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 cget_strict(option)
-        @chart.legend_cget_strict(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]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      PenID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        PenID_TBL.mutex.synchronize{ PenID_TBL.clear }
-      }
-
-      def self.id2obj(chart, id)
-        cpath = chart.path
-        PenID_TBL.mutex.synchronize{
-          return id unless PenID_TBL[cpath]
-          PenID_TBL[cpath][id]? PenID_TBL[cpath][id]: id
-        }
-      end
-
-      def self.new(chart, pen=nil, keys={})
-        if pen.kind_of?(Hash)
-          keys = pen
-          pen = nil
-        end
-        if keys
-          keys = _symbolkey2str(keys)
-          not_create = keys.delete('without_creating')
-        else
-          not_create = false
-        end
-
-        obj = nil
-        PenID_TBL.mutex.synchronize{
-          chart_path = chart.path
-          PenID_TBL[chart_path] ||= {}
-          if pen && PenID_TBL[chart_path][pen]
-            obj = PenID_TBL[chart_path][pen]
-          else
-            (obj = self.allocate).instance_eval{
-              if pen
-                @pen = @id = pen.to_s
-              else
-                OBJ_ID.mutex.synchronize{
-                  @pen = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-                  OBJ_ID[1].succ!
-                }
-              end
-              @path = @id
-              @parent = @chart = chart
-              @cpath = @chart.path
-              Pen::PenID_TBL[@cpath][@pen] = self
-              unless not_create
-                tk_call(@chart, 'pen', 'create', @pen, keys)
-                return obj
-              end
-            }
-          end
-        }
-
-        obj.configure(keys) if obj && ! keys.empty?
-        obj
-      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
-          OBJ_ID.mutex.synchronize{
-            @pen = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-            OBJ_ID[1].succ!
-          }
-        end
-        @path = @id
-        @parent = @chart = chart
-        @cpath = @chart.path
-        Pen::PenID_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 cget_strict(option)
-        @chart.pen_cget_strict(@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
-      PostscriptID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        PostscriptID_TBL.mutex.synchronize{ PostscriptID_TBL.clear }
-      }
-
-      def self.new(chart, keys={})
-        obj = nil
-        PostscriptID_TBL.mutex.synchronize{
-          unless (obj = PostscriptID_TBL[chart.path])
-            (obj = self.allocate).instance_eval{
-              @parent = @chart = chart
-              @cpath = @chart.path
-              @path = @id = 'postscript'
-              Postscript::PostscriptID_TBL[@cpath] = self
-            }
-          end
-        }
-        chart.postscript_configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, keys={})
-        # dummy:: not called by 'new' method
-
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # Postscript::PostscriptID_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 cget_strict(option)
-        @chart.postscript_cget_strict(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.mutex.synchronize{ MarkerID_TBL.clear }
-      }
-
-      def Marker.type2class(type)
-        MarkerTypeToClass[type]
-      end
-
-      def Marker.id2obj(chart, id)
-        cpath = chart.path
-        MarkerID_TBL.mutex.synchronize{
-          if MarkerID_TBL[cpath]
-            MarkerID_TBL[cpath][id]? MarkerID_TBL[cpath][id]: id
-          else
-            id
-          end
-        }
-      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_optkey_aliases(nil).each{|alias_name, real_name|
-            alias_name = alias_name.to_s
-            if keys.has_key?(alias_name)
-              keys[real_name.to_s] = keys.delete(alias_name)
-            end
-          }
-
-          __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
-          Tk::BLT::PlotComponent::Marker::MarkerID_TBL.mutex.synchronize{
-            Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] ||= {}
-            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'
-        Tk::BLT::PlotComponent::Marker::MarkerID_TBL.mutex.synchronize{
-          Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] ||= {}
-          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 cget_strict(option)
-        @chart.marker_cget_strict(@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::AxisID_TBL.delete(@path)
-      Crosshairs::CrosshairsID_TBL.delete(@path)
-      Element::ElementID_TBL.delete(@path)
-      GridLine::GridLineID_TBL.delete(@path)
-      Legend::LegendID_TBL.delete(@path)
-      Pen::PenID_TBL.delete(@path)
-      Postscript::PostscriptID_TBL.delete(@path)
-      Marker::MarkerID_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_cget_strict(option)
-      itemcget_strict('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_cget_strict(option)
-      itemcget_strict('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_cget_strict(option)
-      itemcget_strict('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_cget_strict(option)
-      itemcget_strict('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/ext/tk/lib/tkextlib/blt/container.rb b/ext/tk/lib/tkextlib/blt/container.rb
deleted file mode 100644
index cdbec21f25..0000000000
--- a/ext/tk/lib/tkextlib/blt/container.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/cutbuffer.rb b/ext/tk/lib/tkextlib/blt/cutbuffer.rb
deleted file mode 100644
index 1cc39dfb94..0000000000
--- a/ext/tk/lib/tkextlib/blt/cutbuffer.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/dragdrop.rb b/ext/tk/lib/tkextlib/blt/dragdrop.rb
deleted file mode 100644
index 201548504a..0000000000
--- a/ext/tk/lib/tkextlib/blt/dragdrop.rb
+++ /dev/null
@@ -1,268 +0,0 @@
-#
-#  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
-        ]
-
-=begin
-        # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-        KEY_TBL.map!{|inf|
-          if inf.kind_of?(Array)
-            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-            inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-          end
-          inf
-        }
-
-        PROC_TBL.map!{|inf|
-          if inf.kind_of?(Array)
-            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          end
-          inf
-        }
-=end
-
-        _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
-        ]
-
-=begin
-        # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-        KEY_TBL.map!{|inf|
-          if inf.kind_of?(Array)
-            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-            inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-          end
-          inf
-        }
-
-        PROC_TBL.map!{|inf|
-          if inf.kind_of?(Array)
-            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          end
-          inf
-        }
-=end
-
-        _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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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/ext/tk/lib/tkextlib/blt/eps.rb b/ext/tk/lib/tkextlib/blt/eps.rb
deleted file mode 100644
index 0dba87a7cc..0000000000
--- a/ext/tk/lib/tkextlib/blt/eps.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  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 Tk::Canvas
-  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/ext/tk/lib/tkextlib/blt/graph.rb b/ext/tk/lib/tkextlib/blt/graph.rb
deleted file mode 100644
index 9ae99bff5c..0000000000
--- a/ext/tk/lib/tkextlib/blt/graph.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/htext.rb b/ext/tk/lib/tkextlib/blt/htext.rb
deleted file mode 100644
index 0d9cb30185..0000000000
--- a/ext/tk/lib/tkextlib/blt/htext.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-#  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_cget_strict itemcget_strict
-    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/ext/tk/lib/tkextlib/blt/setup.rb b/ext/tk/lib/tkextlib/blt/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/blt/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/spline.rb b/ext/tk/lib/tkextlib/blt/spline.rb
deleted file mode 100644
index 9f75a0b217..0000000000
--- a/ext/tk/lib/tkextlib/blt/spline.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/stripchart.rb b/ext/tk/lib/tkextlib/blt/stripchart.rb
deleted file mode 100644
index fe5afbb095..0000000000
--- a/ext/tk/lib/tkextlib/blt/stripchart.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/table.rb b/ext/tk/lib/tkextlib/blt/table.rb
deleted file mode 100644
index dfa10269ed..0000000000
--- a/ext/tk/lib/tkextlib/blt/table.rb
+++ /dev/null
@@ -1,399 +0,0 @@
-#
-#  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_cget_strict(*args)
-        Tk::BLT::Table.cget_strict(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_itemcget_strict(*args)
-        Tk::BLT::Table.itemcget_strict(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 __itemcget_strict itemcget_strict
-  alias __itemconfigure itemconfigure
-  alias __itemconfiginfo itemconfiginfo
-  alias __current_itemconfiginfo current_itemconfiginfo
-
-  private :__itemcget, :__itemcget_strict
-  private :__itemconfigure, :__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 cget_strict(container, option)
-    __itemcget_strict([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 itemcget_strict(container, item, option)
-    __itemcget_strict([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/ext/tk/lib/tkextlib/blt/tabnotebook.rb b/ext/tk/lib/tkextlib/blt/tabnotebook.rb
deleted file mode 100644
index 508fa2b82f..0000000000
--- a/ext/tk/lib/tkextlib/blt/tabnotebook.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/tabset.rb b/ext/tk/lib/tkextlib/blt/tabset.rb
deleted file mode 100644
index ca81ad8f95..0000000000
--- a/ext/tk/lib/tkextlib/blt/tabset.rb
+++ /dev/null
@@ -1,430 +0,0 @@
-#
-#  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]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      TkCore::INTERP.init_ip_env{
-        TabID_TBL.mutex.synchronize{ TabID_TBL.clear }
-      }
-
-      def self.id2obj(tabset, id)
-        tpath = tabset.path
-        TabID_TBL.mutex.synchronize{
-          if TabID_TBL[tpath]
-            TabID_TBL[tpath][id]? TabID_TBL[tpath]: id
-          else
-            id
-          end
-        }
-      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
-        obj = nil
-        TabID_TBL.mutex.synchronize{
-          if name && TabID_TBL[parent.path] && TabID_TBL[parent.path][name]
-            obj = TabID_TBL[parent.path][name]
-            obj.configure if keys && ! keys.empty?
-          else
-            (obj = self.allocate).instance_eval{
-              initialize(parent, pos, name, keys)
-              TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
-              TabID_TBL[@tpath][@id] = self
-            }
-          end
-        }
-        obj
-      end
-
-      def initialize(parent, pos, name, keys)
-        @t = parent
-        @tpath = parent.path
-        if name
-          @path = @id = name
-          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)
-          else
-            pos = 'end' unless pos
-            tk_call(@tpath, 'insert', pos, @id, keys)
-          end
-        else
-          TabsetTab_ID.mutex.synchronize{
-            @path = @id = TabsetTab_ID.join(TkCore::INTERP._ip_id_)
-            TabsetTab_ID[1].succ!
-          }
-          pos = 'end' unless pos
-          tk_call(@tpath, 'insert', pos, @id, keys)
-        end
-      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 cget_strict(*args)
-        @t.tab_cget_strict(@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.mutex.synchronize{
-          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.mutex.synchronize{
-        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_cget_strict itemcget_strict
-    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.mutex.synchronize{
-          TabID_TBL[@path].delete(first.id)
-        }
-      end
-      # middle tabs of the range are unknown
-      if last.kind_of?(Tk::BLT::Tabset::Tab)
-        TabID_TBL.mutex.synchronize{
-          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/ext/tk/lib/tkextlib/blt/ted.rb b/ext/tk/lib/tkextlib/blt/ted.rb
deleted file mode 100644
index 670265fc78..0000000000
--- a/ext/tk/lib/tkextlib/blt/ted.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#  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, :itemcget_strict
-      private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-      def cget(master, option)
-        itemcget(master, option)
-      end
-      def cget_strict(master, option)
-        itemcget_strict(master, option)
-      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/ext/tk/lib/tkextlib/blt/tile.rb b/ext/tk/lib/tkextlib/blt/tile.rb
deleted file mode 100644
index 5f5242f299..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/tile/button.rb b/ext/tk/lib/tkextlib/blt/tile/button.rb
deleted file mode 100644
index 2e0863cfbe..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/button.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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 < Tk::Button
-      TkCommandNames = ['::blt::tile::button'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb b/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
deleted file mode 100644
index da230b5925..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#  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 < Tk::CheckButton
-      TkCommandNames = ['::blt::tile::checkbutton'.freeze].freeze
-    end
-    Checkbutton = CheckButton
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/frame.rb b/ext/tk/lib/tkextlib/blt/tile/frame.rb
deleted file mode 100644
index 5434af4b72..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/frame.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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 < Tk::Frame
-      TkCommandNames = ['::blt::tile::frame'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/label.rb b/ext/tk/lib/tkextlib/blt/tile/label.rb
deleted file mode 100644
index f370c1403b..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/label.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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 < Tk::Label
-      TkCommandNames = ['::blt::tile::label'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb b/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
deleted file mode 100644
index 814f9a5cc4..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#  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 < Tk::RadioButton
-      TkCommandNames = ['::blt::tile::radiobutton'.freeze].freeze
-    end
-    Radiobutton = RadioButton
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb b/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
deleted file mode 100644
index 2ae871d518..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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 < Tk::Scrollbar
-      TkCommandNames = ['::blt::tile::scrollbar'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/toplevel.rb b/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
deleted file mode 100644
index 76d5f86b1b..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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 < Tk::Toplevel
-      TkCommandNames = ['::blt::tile::toplevel'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tree.rb b/ext/tk/lib/tkextlib/blt/tree.rb
deleted file mode 100644
index 77b85f1717..0000000000
--- a/ext/tk/lib/tkextlib/blt/tree.rb
+++ /dev/null
@@ -1,1058 +0,0 @@
-#
-#  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.mutex.synchronize{ TreeNodeID_TBL.clear }
-      }
-
-      def self.id2obj(tree, id)
-        tpath = tree.path
-        TreeNodeID_TBL.mutex.synchronize{
-          if TreeNodeID_TBL[tpath]
-            if TreeNodeID_TBL[tpath][id]
-              TreeNodeID_TBL[tpath][id]
-            else
-              begin
-                # self.new(tree, nil, 'node'=>Integer(id))
-                id = Integer(id)
-                if bool(tk_call(@tpath, 'exists', id))
-                  (obj = self.allocate).instance_eval{
-                    @parent = @tree = tree
-                    @tpath = tpath
-                    @path = @id = id
-                    TreeNodeID_TBL[@tpath] = {} unless TreeNodeID_TBL[@tpath]
-                    TreeNodeID_TBL[@tpath][@id] = self
-                  }
-                  obj
-                else
-                  id
-                end
-              rescue
-                id
-              end
-            end
-          else
-            id
-          end
-        }
-      end
-
-      def self.new(tree, parent, keys={})
-        keys = _symbolkey2str(keys)
-        tpath = tree.path
-
-        TreeNodeID_TBL.mutex.synchronize{
-          TreeNodeID_TBL[tpath] ||= {}
-          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
-
-          (obj = self.allocate).instance_eval{
-            initialize(tree, parent, keys)
-            TreeNodeID_TBL[tpath][@id] = self
-          }
-          obj
-        }
-      end
-
-      def initialize(tree, parent, keys={})
-        @parent = @tree = tree
-        @tpath = @parent.path
-
-        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
-          parent = tk_call(@tpath, 'root') unless parent
-          @path = @id = tk_call(@tpath, 'insert', parent, keys)
-        end
-      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.mutex.synchronize{ TreeTagID_TBL.clear }
-      }
-
-      (TreeTag_ID = ['blt_tree_tag'.freeze, '00000'.taint]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      def self.id2obj(tree, id)
-        tpath = tree.path
-        TreeTagID_TBL.mutex.synchronize{
-          if TreeTagID_TBL[tpath]
-            if TreeTagID_TBL[tpath][id]
-              TreeTagID_TBL[tpath][id]
-            else
-              begin
-                # self.new(tree, id)
-                (obj = self.allocate).instance_eval{
-                  @parent = @tree = tree
-                  @tpath = @parent.path
-                  @path = @id = id.dup.freeze if id
-                  TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-                  TreeTagID_TBL[@tpath][@id] = self
-                }
-                obj
-              rescue
-                id
-              end
-            end
-          else
-            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
-          TreeTag_ID.mutex.synchronize{
-            @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_)
-            TreeTag_ID[1].succ!
-          }
-        end
-        TreeTagID_TBL.mutex.synchronize{
-          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.mutex.synchronize{
-          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.mutex.synchronize{ NotifyID_TBL.clear }
-      }
-
-      def self.id2obj(tree, id)
-        tpath = tree.path
-        NotifyID_TBL.mutex.synchronize{
-          if NotifyID_TBL[tpath]
-            if NotifyID_TBL[tpath][id]
-              NotifyID_TBL[tpath][id]
-            else
-              (obj = self.allocate).instance_eval{
-                @parent = @tree = tree
-                @tpath = @parent.path
-                @path = @id = id
-                NotifyID_TBL[@tpath] ||= {}
-                NotifyID_TBL[@tpath][@id] = self
-              }
-              obj
-            end
-          else
-            return id
-          end
-        }
-      end
-
-      def self.new(tree, *args, &b)
-        NotifyID_TBL.mutex.synchronize{
-          if tree.kind_of?(Array)
-            # not create
-            tpath = tree[0].path            
-            NotifyID_TBL[tpath] ||= {}
-            unless (obj = NotifyID_TBL[tpath][tree[1]])
-              (NotifyID_TBL[tpath][tree[1]] = 
-                 obj = self.allocate).instance_eval{
-                @parent = @tree = tree[0]
-                @tpath = @parent.path
-                @path = @id = tree[1]
-              }
-            end
-            return obj
-          end
-
-          (obj = self.allocate).instance_eval{
-            initialize(tree, *args, &b)
-            NotifyID_TBL[@tpath] ||= {}
-            NotifyID_TBL[@tpath][@id] = self
-          }
-          return obj
-        }
-      end
-
-      def initialize(tree, *args, &b)
-        @parent = @tree = tree
-        @tpath = @parent.path
-
-        # 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.mutex.synchronize{
-          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.mutex.synchronize{ TraceID_TBL.clear }
-      }
-
-      def self.id2obj(tree, id)
-        tpath = tree.path
-        TraceID_TBL.mutex.synchronize{
-          if TraceID_TBL[tpath]
-            if TraceID_TBL[tpath][id]
-              TraceID_TBL[tpath][id]
-            else
-              begin
-                # self.new([tree, id])
-                (obj = self.allocate).instance_eval{
-                  @parent = @tree = tree
-                  @tpath = @parent.path
-                  @path = @id = node  # == traceID
-                  TraceID_TBL[@tpath] ||= {}
-                  TraceID_TBL[@tpath][@id] = self
-                }
-                obj
-              rescue
-                id
-              end
-            end
-          else
-            id
-          end
-        }
-      end
-
-      def self.new(tree, *args, &b)
-        TraceID_TBL.mutex.synchronize{
-          if tree.kind_of?(Array)
-            # not create
-            tpath = tree[0].path
-            TraceID_TBL[tpath] ||= {}
-            unless (obj = TraceID_TBL[tpath][tree[1]])
-              (TraceID_TBL[tpath][tree[1]] = 
-                 obj = self.allocate).instance_eval{
-                @parent = @tree = tree
-                @tpath = @parent.path
-                @path = @id = tree[1]  # == traceID
-              }
-            end
-            return obj
-          end
-
-          # super(true, tree, *args, &b)
-          (obj = self.allocate).instance_eval{
-            initialize(tree, *args, &b)
-            TraceID_TBL[@tpath] ||= {}
-            TraceID_TBL[@tpath][@id] = self
-          }
-          return obj
-        }
-      end
-
-      def initialize(tree, node, key, opts, cmd=nil, &b)
-        @parent = @tree = tree
-        @tpath = @parent.path
-
-        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.mutex.synchronize{
-          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]).instance_eval{
-      @mutex = Mutex.new
-      def mutex; @mutex; end
-      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.mutex.synchronize{
-        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)
-      TreeID_TBL.mutex.synchronize{
-        if name && TreeID_TBL[name]
-          TreeID_TBL[name] 
-        else
-          (obj = self.allocate).instance_eval{
-            initialize(name)
-            TreeID_TBL[@id] = self
-          }
-          obj
-        end
-      }
-    end
-
-    def initialzie(name = nil)
-      if name
-        @path = @id = name
-      else
-        Tree_ID.mutex.synchronize{
-          @path = @id = Tree_ID.join(TkCore::INTERP._ip_id_)
-          Tree_ID[1].succ!
-        }
-      end
-
-      tk_call('::blt::tree', 'create', @id)
-    end
-
-    def __destroy_hook__
-      Tk::BLT::Tree::Node::TreeNodeID_TBL.mutex.synchronize{
-        Tk::BLT::Tree::Node::TreeNodeID_TBL.delete(@path)
-      }
-      Tk::BLT::Tree::Tag::TreeTagID_TBL.mutex.synchronize{
-        Tk::BLT::Tree::Tag::TreeTagID_TBL.delete(@path)
-      }
-      Tk::BLT::Tree::Notify::NotifyID_TBL.mutex.synchronize{
-        Tk::BLT::Tree::Notify::NotifyID_TBL.delete(@path)
-      }
-      Tk::BLT::Tree::Trace::TraceID_TBL.mutex.synchronize{
-        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)}))
-      Tk::BLT::Tree::Node::TreeNodeID_TBL.mutex.synchronize{
-        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.mutex.synchronize{
-          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.mutex.synchronize{
-        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)
-      Tk::BLT::Tree::Trace::TraceID_TBL.mutex.synchronize{
-        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/ext/tk/lib/tkextlib/blt/treeview.rb b/ext/tk/lib/tkextlib/blt/treeview.rb
deleted file mode 100644
index c5a5697186..0000000000
--- a/ext/tk/lib/tkextlib/blt/treeview.rb
+++ /dev/null
@@ -1,1272 +0,0 @@
-#
-#  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_cget_strict(name, option)
-    itemcget_strict(['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_cget_strict(option)
-    itemcget_strict('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_cget_strict(option)
-    ret = itemcget_strict('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_cget_strict(option)
-    itemcget_strict('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_cget_strict(option)
-    itemcget_strict('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, :itemcget_strict
-  private :itemconfigure, :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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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.mutex.synchronize{
-      Tk::BLT::Treeview::Node::TreeNodeID_TBL.delete(@path)
-    }
-    Tk::BLT::Treeview::Tag::TreeTagID_TBL.mutex.synchronize{
-      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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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(' '))
-      FindExecFlagValue.new(cmd, *args)
-    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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TreeNodeID_TBL.mutex.synchronize{ TreeNodeID_TBL.clear }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    TreeNodeID_TBL.mutex.synchronize{
-      if TreeNodeID_TBL[tpath]
-        if TreeNodeID_TBL[tpath][id]
-          TreeNodeID_TBL[tpath][id]
-        else
-          begin
-            # self.new(tree, nil, nil, 'node'=>Integer(id))
-            unless (tk_call(@tpath, 'get', id)).empty?
-              id = Integer(id)
-              (obj = self.allocate).instance_eval{
-                @parent = @tree = tree
-                @tpath = @parent.path
-                @path = @id = id
-                TreeNodeID_TBL[@tpath] ||= {}
-                TreeNodeID_TBL[@tpath][@id] = self
-              }
-              obj
-            else
-              id
-            end
-          rescue
-            id
-          end
-        end
-      else
-        id
-      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
-
-    TreeNodeID_TBL.mutex.synchronize{
-      TreeNodeID_TBL[tpath] ||= {}
-      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)
-      (obj = self.allocate).instance_eval{
-        initialize(tree, pos, parent, keys)
-        TreeNodeID_TBL[tpath][@id] = self
-      }
-      obj
-    }
-  end
-
-  def initialize(tree, pos, parent, keys)
-    @parent = @tree = tree
-    @tpath = @parent.path
-
-    if (id = keys['node'])
-      # if tk_call(@tpath, 'get', id).empty?
-      #   fail RuntimeError, "not exist the node '#{id}'"
-      # end
-      @path = @id = id
-      tk_call(@tpath, 'move', @id, pos, tagid(parent)) if parent
-      configure(keys) if keys && ! keys.empty?
-    else
-      name = nil
-      TreeNode_ID.mutex.synchronize{
-        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
-  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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TreeTagID_TBL.mutex.synchronize{ TreeTagID_TBL.clear }
-  }
-
-  def self.id2obj(tree, name)
-    tpath = tree.path
-    TreeTagID_TBL.mutex.synchronize{
-      if TreeTagID_TBL[tpath]
-        if TreeTagID_TBL[tpath][name]
-          TreeTagID_TBL[tpath][name]
-        else
-          #self.new(tree, name)
-          (obj = self.allocate).instance_eval{
-            @parent = @tree = tree
-            @tpath = @parent.path
-            @path = @id = name
-            TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-            TreeTagID_TBL[@tpath][@id] = self
-          }
-          obj
-        end
-      else
-        id
-      end
-    }
-  end
-
-  def self.new_by_name(tree, name, *ids)
-    TreeTagID_TBL.mutex.synchronize{
-      unless (obj = TreeTagID_TBL[tree.path][name])
-        (obj = self.allocate).instance_eval{
-          initialize(tree, name, ids)
-          TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-          TreeTagID_TBL[@tpath][@id] = self
-        }
-      end
-      obj
-    }
-  end
-
-  def self.new(tree, *ids)
-    TreeTagID_TBL.mutex.synchronize{
-      (obj = self.allocate).instance_eval{
-        if tree.kind_of?(Array)
-          initialize(tree[0], tree[1], ids)
-        else
-          initialize(tree, nil, ids)
-        end
-        TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-        TreeTagID_TBL[@tpath][@id] = self
-      }
-      obj
-    }
-  end
-
-  def initialize(tree, name, ids)
-    @parent = @tree = tree
-    @tpath = @parent.path
-
-    if name
-      @path = @id = name
-    else
-      TreeTag_ID.mutex.synchronize{
-        @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_).freeze
-        TreeTag_ID[1].succ!
-      }
-    end
-
-    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/ext/tk/lib/tkextlib/blt/unix_dnd.rb b/ext/tk/lib/tkextlib/blt/unix_dnd.rb
deleted file mode 100644
index 445002d7a5..0000000000
--- a/ext/tk/lib/tkextlib/blt/unix_dnd.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-#  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, :itemcget_strict
-      private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-      def cget(win, option)
-        itemcget(['cget', win], option)
-      end
-      def cget_strict(win, option)
-        itemcget_strict(['cget', win], option)
-      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 token_cget(win, option)
-        itemcget(['token', 'cget', win], option)
-      end
-      def token_cget_strict(win, option)
-        itemcget_strict(['token', 'cget', win], option)
-      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/ext/tk/lib/tkextlib/blt/vector.rb b/ext/tk/lib/tkextlib/blt/vector.rb
deleted file mode 100644
index 76c12a24e8..0000000000
--- a/ext/tk/lib/tkextlib/blt/vector.rb
+++ /dev/null
@@ -1,256 +0,0 @@
-#
-#  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)
-      list = simplelist(tk_call('::blt::vector', 'names', pat))
-      TkVar_ID_TBL.mutex.synchronize{
-        list.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.mutex.synchronize{
-        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)
-      TkVar_ID_TBL.mutex.synchronize{
-        if TkVar_ID_TBL[name]
-          TkVar_ID_TBL[name]
-        else
-          (obj = self.allocate).instance_eval{
-            initialize(name)
-            TkVar_ID_TBL[@id] = self
-          }
-          obj
-        end
-      }
-    end
-
-    def initialize(vec_name)
-      @id = vec_name
-
-      @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/ext/tk/lib/tkextlib/blt/watch.rb b/ext/tk/lib/tkextlib/blt/watch.rb
deleted file mode 100644
index 219ff78e97..0000000000
--- a/ext/tk/lib/tkextlib/blt/watch.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-#  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]).instance_eval{
-      @mutex = Mutex.new
-      def mutex; @mutex; end
-      freeze
-    }
-
-    TkCore::INTERP.init_ip_env{
-      WATCH_ID_TBL.mutex.synchronize{ WATCH_ID_TBL.clear }
-    }
-
-    def self.names(state = None)
-      lst = tk_split_list(tk_call('::blt::watch', 'names', state))
-      WATCH_ID_TBL.mutex.synchronize{
-        lst.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
-        BLT_WATCH_ID.mutex.synchronize{
-          @id = BLT_WATCH_ID.join(TkCore::INTERP._ip_id_)
-          BLT_WATCH_ID[1].succ!
-        }
-      end
-
-      @path = @id
-
-      WATCH_ID_TBL.mutex.synchronize{
-        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_strict(key)
-      key = key.to_s
-      begin
-        info.assoc(key)[1]
-      rescue
-        fail ArgumentError, "unknown option '#{key}'"
-      end
-    end
-    def cget(key)
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        cget_strict(key)
-      else
-        begin
-          cget_strict(key)
-        rescue => e
-          if current_configinfo.has_key?(key.to_s)
-            # error on known option
-            fail e
-          else
-            # unknown option
-            nil
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/win_printer.rb b/ext/tk/lib/tkextlib/blt/win_printer.rb
deleted file mode 100644
index 7ac6a0dcfc..0000000000
--- a/ext/tk/lib/tkextlib/blt/win_printer.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/blt/winop.rb b/ext/tk/lib/tkextlib/blt/winop.rb
deleted file mode 100644
index e371d28ab7..0000000000
--- a/ext/tk/lib/tkextlib/blt/winop.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget.rb b/ext/tk/lib/tkextlib/bwidget.rb
deleted file mode 100644
index 62631d8b54..0000000000
--- a/ext/tk/lib/tkextlib/bwidget.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb b/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
deleted file mode 100644
index 770e5e9ef1..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/bitmap.rb b/ext/tk/lib/tkextlib/bwidget/bitmap.rb
deleted file mode 100644
index 6cfde203e8..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/bitmap.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/button.rb b/ext/tk/lib/tkextlib/bwidget/button.rb
deleted file mode 100644
index 8f3087d098..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/button.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  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 < Tk::Button
-    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/ext/tk/lib/tkextlib/bwidget/buttonbox.rb b/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
deleted file mode 100644
index 8d6d212189..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-#  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?(Tk::Button)
-      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)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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?(Tk::Button)
-      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)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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/ext/tk/lib/tkextlib/bwidget/combobox.rb b/ext/tk/lib/tkextlib/bwidget/combobox.rb
deleted file mode 100644
index 1c58a4ccb0..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/combobox.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  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'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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/ext/tk/lib/tkextlib/bwidget/dialog.rb b/ext/tk/lib/tkextlib/bwidget/dialog.rb
deleted file mode 100644
index 291ca4a962..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dialog.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-#
-#  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_strict(slot)
-    if slot.to_s == 'relative'
-      super('parent')
-    else
-      super(slot)
-    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?(Tk::Button)
-      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)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_frame(&b)
-    win = window(tk_send('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_buttonbox(&b)
-    win = window(@path + '.bbox')
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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/ext/tk/lib/tkextlib/bwidget/dragsite.rb b/ext/tk/lib/tkextlib/bwidget/dragsite.rb
deleted file mode 100644
index 4d4de1780c..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dragsite.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/dropsite.rb b/ext/tk/lib/tkextlib/bwidget/dropsite.rb
deleted file mode 100644
index e5e98fbc51..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dropsite.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb b/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
deleted file mode 100644
index 846e58062d..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-#  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_strict(slot)
-    slot = slot.to_s
-    info = {}
-    self.current_configinfo.each{|k,v| info[k.to_s] = v if k.to_s == slot}
-    fail RuntimeError, "unknown option \"-#{slot}\""  if info.empty?
-    info.values[0]
-  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/ext/tk/lib/tkextlib/bwidget/entry.rb b/ext/tk/lib/tkextlib/bwidget/entry.rb
deleted file mode 100644
index a56890f4e3..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/entry.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#  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 < Tk::Entry
-    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/ext/tk/lib/tkextlib/bwidget/label.rb b/ext/tk/lib/tkextlib/bwidget/label.rb
deleted file mode 100644
index 88a504aa50..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/label.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-#  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 < Tk::Label
-    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/ext/tk/lib/tkextlib/bwidget/labelentry.rb b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
deleted file mode 100644
index 95b40946a6..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/labelentry.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-#  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 < Tk::Entry
-    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/ext/tk/lib/tkextlib/bwidget/labelframe.rb b/ext/tk/lib/tkextlib/bwidget/labelframe.rb
deleted file mode 100644
index dc221806e4..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/labelframe.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  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'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/listbox.rb b/ext/tk/lib/tkextlib/bwidget/listbox.rb
deleted file mode 100644
index 093fcb6fb3..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/listbox.rb
+++ /dev/null
@@ -1,358 +0,0 @@
-#
-#  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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    ListItem_TBL.mutex.synchronize{ ListItem_TBL.clear }
-  }
-
-  def self.id2obj(lbox, id)
-    lpath = lbox.path
-    ListItem_TBL.mutex.synchronize{
-      if ListItem_TBL[lpath]
-        ListItem_TBL[lpath][id]? ListItem_TBL[lpath][id]: id
-      else
-        id
-      end
-    }
-  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
-      ListItem_ID.mutex.synchronize{
-        @path = @id = ListItem_ID.join(TkCore::INTERP._ip_id_)
-        ListItem_ID[1].succ!
-      }
-    end
-
-    ListItem_TBL.mutex.synchronize{
-      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 cget_strict(key)
-    @listbox.itemcget_strict(@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/ext/tk/lib/tkextlib/bwidget/mainframe.rb b/ext/tk/lib/tkextlib/bwidget/mainframe.rb
deleted file mode 100644
index de66eaf81e..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/mainframe.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-#  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)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def add_toolbar(&b)
-    win = window(tk_send('addtoolbar'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_frame(&b)
-    win = window(tk_send('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_indicator(idx, &b)
-    win = window(tk_send('getindicator', idx))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_menu(menu_id, &b)
-    win = window(tk_send('getmenu', menu_id))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_toolbar(idx, &b)
-    win = window(tk_send('gettoolbar', idx))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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/ext/tk/lib/tkextlib/bwidget/messagedlg.rb b/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
deleted file mode 100644
index b88461baf7..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-#  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 cget_strict(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
-    # return the index of the pressed button, or nil if it is destroyed
-    ret = num_or_str(tk_call(self.class::TkCommandNames[0], 
-                             @path, *hash_kv(@keys)))
-    (ret < 0)? nil: ret
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/notebook.rb b/ext/tk/lib/tkextlib/bwidget/notebook.rb
deleted file mode 100644
index 423943619c..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/notebook.rb
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-#  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)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb b/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
deleted file mode 100644
index fbc2c11255..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-#  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)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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/ext/tk/lib/tkextlib/bwidget/panedwindow.rb b/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
deleted file mode 100644
index 4d979fd523..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  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))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/panelframe.rb b/ext/tk/lib/tkextlib/bwidget/panelframe.rb
deleted file mode 100644
index 84bae0768b..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/panelframe.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  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'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def items
-    list(tk_send('items'))
-  end
-
-  def remove(*wins)
-    tk_send('remove', *wins)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/passwddlg.rb b/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
deleted file mode 100644
index 0b635d97bb..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/progressbar.rb b/ext/tk/lib/tkextlib/bwidget/progressbar.rb
deleted file mode 100644
index 0253ce2ada..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/progressbar.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/progressdlg.rb b/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
deleted file mode 100644
index 32600255d5..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  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
-
-  def create
-    window(tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys)))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb b/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
deleted file mode 100644
index 010c960ec5..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  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'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def see(win, vert=None, horiz=None)
-    tk_send_without_enc('see', win, vert, horiz)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb b/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
deleted file mode 100644
index 3599fd8459..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  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'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def set_widget(win)
-    tk_send_without_enc('setwidget', win)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/scrollview.rb b/ext/tk/lib/tkextlib/bwidget/scrollview.rb
deleted file mode 100644
index 0546af2c43..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/scrollview.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/selectcolor.rb b/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
deleted file mode 100644
index 0f9014f8de..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-#  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
-      class Dialog < Tk::BWidget::SelectColor
-      end
-      class Menubutton < Tk::Menubutton
-      end
-      MenuButton = Menubutton
-    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
-
-class Tk::BWidget::SelectColor::Dialog
-  def create_self(keys)
-    super(keys)
-    @keys['type'] = 'dialog'
-  end
-
-  def create
-    @keys['type'] = 'dialog'  # 'dialog' type returns color
-    tk_call(Tk::BWidget::SelectColor::TkCommandNames[0], 
-            @path, *hash_kv(@keys))
-  end
-end
-
-class Tk::BWidget::SelectColor::Menubutton
-  def create_self(keys)
-    keys = {} unless keys
-    keys = _symbolkey2str(keys)
-    keys['type'] = 'menubutton'  # 'toolbar' type returns widget path
-    window(tk_call(Tk::BWidget::SelectColor::TkCommandNames[0], 
-                   @path, *hash_kv(keys)))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/selectfont.rb b/ext/tk/lib/tkextlib/bwidget/selectfont.rb
deleted file mode 100644
index e53eb3b5bc..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/selectfont.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-#  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'  # 'dialog' type returns font name
-    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'  # 'toolbar' type returns widget path
-    window(tk_call(Tk::BWidget::SelectFont::TkCommandNames[0], 
-                   @path, *hash_kv(keys)))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/separator.rb b/ext/tk/lib/tkextlib/bwidget/separator.rb
deleted file mode 100644
index d9c3458e51..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/separator.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/setup.rb b/ext/tk/lib/tkextlib/bwidget/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/bwidget/spinbox.rb b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
deleted file mode 100644
index 48358baa5c..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/spinbox.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-#  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 < Tk::Entry
-    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/ext/tk/lib/tkextlib/bwidget/statusbar.rb b/ext/tk/lib/tkextlib/bwidget/statusbar.rb
deleted file mode 100644
index 39c678d37e..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/statusbar.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  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'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def items
-    list(tk_send('items'))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/titleframe.rb b/ext/tk/lib/tkextlib/bwidget/titleframe.rb
deleted file mode 100644
index 68534e66e9..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/titleframe.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/tree.rb b/ext/tk/lib/tkextlib/bwidget/tree.rb
deleted file mode 100644
index aed4512a73..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/tree.rb
+++ /dev/null
@@ -1,453 +0,0 @@
-#
-#  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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TreeNode_TBL.mutex.synchronize{ TreeNode_TBL.clear }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    TreeNode_TBL.mutex.synchronize{
-      if TreeNode_TBL[tpath]
-        TreeNode_TBL[tpath][id]? TreeNode_TBL[tpath][id]: id
-      else
-        id
-      end
-    }
-  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
-      TreeNode_ID.mutex.synchronize{
-        @path = @id = TreeNode_ID.join(TkCore::INTERP._ip_id_)
-        TreeNode_ID[1].succ!
-      }
-    end
-
-    TreeNode_TBL.mutex.synchronize{
-      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 cget_strict(key)
-    @tree.itemcget_strict(@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/ext/tk/lib/tkextlib/bwidget/widget.rb b/ext/tk/lib/tkextlib/bwidget/widget.rb
deleted file mode 100644
index a93364b567..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/widget.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-#  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_strict(slot)
-    slot = slot.to_s
-    info = {}
-    self.current_configinfo.each{|k,v| info[k.to_s] = v if k.to_s == slot}
-    fail RuntimeError, "unknown option \"-#{slot}\""  if info.empty?
-    info.values[0]
-  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))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    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_strict(win, subwidget)
-    tk_call('Widget::subcget', win, subwidget)
-  end
-  def self.sub_cget(win, subwidget)
-    self.sub_cget_strict(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/ext/tk/lib/tkextlib/itcl.rb b/ext/tk/lib/tkextlib/itcl.rb
deleted file mode 100644
index 1d6ecf04f2..0000000000
--- a/ext/tk/lib/tkextlib/itcl.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  [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/ext/tk/lib/tkextlib/itcl/incr_tcl.rb b/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
deleted file mode 100644
index 2b75d62eb9..0000000000
--- a/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-#
-#  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]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-      ITCL_OBJ_TBL = {}.taint
-
-      def initialize(*args)
-        if (@klass = self.class::ITCL_CLASSNAME).empty?
-          fail RuntimeError, 'unknown itcl class (abstract class?)'
-        end
-        Tk::Itcl::ItclObject::ITCL_OBJ_ID.mutex.synchronize{
-          @id = Tk::Itcl::ItclObject::TCL_OBJ_ID.join(TkCore::INTERP._ip_id_)
-          Tk::Itcl::ItclObject::ITCL_OBJ_ID[1].succ!
-        }
-        @path = @id
-      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/ext/tk/lib/tkextlib/itcl/setup.rb b/ext/tk/lib/tkextlib/itcl/setup.rb
deleted file mode 100644
index 5be0588703..0000000000
--- a/ext/tk/lib/tkextlib/itcl/setup.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/itk.rb b/ext/tk/lib/tkextlib/itk.rb
deleted file mode 100644
index 7492bd3eb4..0000000000
--- a/ext/tk/lib/tkextlib/itk.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  [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/ext/tk/lib/tkextlib/itk/incr_tk.rb b/ext/tk/lib/tkextlib/itk/incr_tk.rb
deleted file mode 100644
index e06deb552c..0000000000
--- a/ext/tk/lib/tkextlib/itk/incr_tk.rb
+++ /dev/null
@@ -1,446 +0,0 @@
-#
-#  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]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      TkCore::INTERP.init_ip_env{
-        ComponentID_TBL.mutex.synchronize{ ComponentID_TBL.clear }
-      }
-
-      def self.id2obj(master, id)
-        if master.kind_of?(TkObject)
-          master = master.path
-        else
-          master = master.to_s
-        end
-        ComponentID_TBL.mutex.synchronize{
-          if ComponentID_TBL.key?(master)
-            (ComponentID_TBL[master].key?(id))? ComponentID_TBL[master][id]: id
-          else
-            id
-          end
-        }
-      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
-          Itk_Component_ID.mutex.synchronize{
-            component = Itk_Component_ID.join(TkCore::INTERP._ip_id_)
-            Itk_Component_ID[1].succ!
-          }
-        end
-
-        ComponentID_TBL.mutex.synchronize{
-          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.mutex.synchronize{
-          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/ext/tk/lib/tkextlib/itk/setup.rb b/ext/tk/lib/tkextlib/itk/setup.rb
deleted file mode 100644
index e47b64adae..0000000000
--- a/ext/tk/lib/tkextlib/itk/setup.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets.rb b/ext/tk/lib/tkextlib/iwidgets.rb
deleted file mode 100644
index ebd4cf7507..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-#  [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/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb b/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
deleted file mode 100644
index 05d58c386f..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-#  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 buttoncget_strict itemcget_strict
-  alias buttonconfigure itemconfigure
-  alias buttonconfiginfo itemconfiginfo
-  alias current_buttonconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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/ext/tk/lib/tkextlib/iwidgets/calendar.rb b/ext/tk/lib/tkextlib/iwidgets/calendar.rb
deleted file mode 100644
index 8495f0e29b..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/calendar.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-#  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 ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
deleted file mode 100644
index fa5e90ad05..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
deleted file mode 100644
index bbf507677c..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/checkbox.rb b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
deleted file mode 100644
index c85d356c55..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-#  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 buttoncget_strict itemcget_strict
-  alias buttonconfigure itemconfigure
-  alias buttonconfiginfo itemconfiginfo
-  alias current_buttonconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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_tags
-    simplelist(tk_call_without_enc(@path, 'get'))
-  end
-
-  def get_objs
-    simplelist(tk_call_without_enc(@path, 'get')).collect{|id|
-      Tk::Itk::Component.id2obj(self, id)
-    }
-  end
-
-  def get(idx=nil)
-    if idx
-      bool(tk_call_without_enc(@path, 'get', index(idx)))
-    else
-      get_tags
-    end
-  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/ext/tk/lib/tkextlib/iwidgets/combobox.rb b/ext/tk/lib/tkextlib/iwidgets/combobox.rb
deleted file mode 100644
index a6d54d78fa..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/combobox.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/dateentry.rb b/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
deleted file mode 100644
index 0a8897f50d..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/datefield.rb b/ext/tk/lib/tkextlib/iwidgets/datefield.rb
deleted file mode 100644
index 632f3334dc..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/datefield.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/dialog.rb b/ext/tk/lib/tkextlib/iwidgets/dialog.rb
deleted file mode 100644
index 8540eae1b5..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/dialog.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb b/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
deleted file mode 100644
index 8d43cc07ab..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-#  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 buttoncget_strict itemcget_strict
-  alias buttonconfigure itemconfigure
-  alias buttonconfiginfo itemconfiginfo
-  alias current_buttonconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
deleted file mode 100644
index 9bc063ba69..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/entryfield.rb b/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
deleted file mode 100644
index d53df216bf..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-#
-#  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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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/ext/tk/lib/tkextlib/iwidgets/extbutton.rb b/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
deleted file mode 100644
index 158d9d474a..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
deleted file mode 100644
index 501f4c90a0..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
deleted file mode 100644
index 14388be7c4..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/feedback.rb b/ext/tk/lib/tkextlib/iwidgets/feedback.rb
deleted file mode 100644
index 0a25237a24..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/feedback.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
deleted file mode 100644
index 7b331d0b40..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
deleted file mode 100644
index 50f459e56d..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/finddialog.rb b/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
deleted file mode 100644
index 75e219c37e..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb b/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
deleted file mode 100644
index d9220fecbf..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
+++ /dev/null
@@ -1,365 +0,0 @@
-#
-#  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 ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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 ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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 Tk::Text 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/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb b/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
deleted file mode 100644
index 77b0e090cd..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb b/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
deleted file mode 100644
index e77e85045d..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
deleted file mode 100644
index 99387710cb..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb b/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
deleted file mode 100644
index 4b2541b997..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/menubar.rb b/ext/tk/lib/tkextlib/iwidgets/menubar.rb
deleted file mode 100644
index 5aaefbe50d..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/menubar.rb
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-#  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 menucget_strict itemcget_strict
-  alias menuconfigure itemconfigure
-  alias menuconfiginfo itemconfiginfo
-  alias current_menuconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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/ext/tk/lib/tkextlib/iwidgets/messagebox.rb b/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
deleted file mode 100644
index 98ac32900c..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-#  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 typecget_strict itemcget_strict
-  alias typeconfigure itemconfigure
-  alias typeconfiginfo itemconfiginfo
-  alias current_typeconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb b/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
deleted file mode 100644
index c19b83e517..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/notebook.rb b/ext/tk/lib/tkextlib/iwidgets/notebook.rb
deleted file mode 100644
index 03b50633df..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/notebook.rb
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-#  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 pagecget_strict itemcget_strict
-  alias pageconfigure itemconfigure
-  alias pageconfiginfo itemconfiginfo
-  alias current_pageconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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
-      idx = num_or_str(tk_send_without_enc('view'))
-      if idx.kind_of?(Fixnum) && idx < 0
-        nil
-      else
-        idx
-      end
-    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(index, what='pages')
-    view('scroll', index, what)
-  end
-  alias xview_scroll view_scroll
-  alias yview_scroll view_scroll
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb b/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
deleted file mode 100644
index 0c74440be7..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb b/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
deleted file mode 100644
index 3bf73d69fe..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-#  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 panecget_strict itemcget_strict
-  alias paneconfigure itemconfigure
-  alias paneconfiginfo itemconfiginfo
-  alias current_paneconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb b/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
deleted file mode 100644
index 620b14b5d5..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb b/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
deleted file mode 100644
index c21007ca6c..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/radiobox.rb b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
deleted file mode 100644
index e9d9521252..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-#  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 buttoncget_strict itemcget_strict
-  alias buttonconfigure itemconfigure
-  alias buttonconfiginfo itemconfiginfo
-  alias current_buttonconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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_tag
-    ((tag = tk_call_without_enc(@path, 'get')).empty?)? nil: tag
-  end
-  alias get get_tag
-
-  def get_obj
-    (tag = get_tag)? Tk::Itk::Component.id2obj(self, tag): nil
-  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/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb b/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
deleted file mode 100644
index bddef50841..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
deleted file mode 100644
index 67ad67d07e..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
+++ /dev/null
@@ -1,353 +0,0 @@
-#
-#  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.respond_to?(id)
-      @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)
-    tbl = nil
-    TkcItem::CItemID_TBL.mutex.synchronize{
-      tbl = TkcItem::CItemID_TBL[self.path]
-    }
-    if tbl
-      find('withtag', *args).each{|item| 
-        if item.kind_of?(TkcItem)
-          TkcItem::CItemID_TBL.mutex.synchronize{
-            tbl.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/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
deleted file mode 100644
index 8b47460357..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
deleted file mode 100644
index 9b69ef07fe..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
deleted file mode 100644
index 7543d557e3..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-#
-#  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.respond_to?(id)
-      @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/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
deleted file mode 100644
index d6436d202a..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
+++ /dev/null
@@ -1,564 +0,0 @@
-#
-#  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.respond_to?(id)
-      @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_strict(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_cget(index, slot)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      image_cget_strict(index, slot)
-    else
-      begin
-        image_cget_strict(index, slot)
-      rescue => e
-        begin
-          if current_image_configinfo.has_key?(slot.to_s)
-            # error on known option
-            fail e
-          else
-            # unknown option
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    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 TkCore::WITH_ENCODING ### Ruby 1.9 !!!!!!!!!!!!!
-      return txt.length
-    end
-    ###########################
-
-    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/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
deleted file mode 100644
index eef093d314..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
deleted file mode 100644
index bf9b5ec30a..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-#  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 Tk::Listbox ( 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/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
deleted file mode 100644
index f772ecf8c2..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-#  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 Tk::Listbox ( 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/ext/tk/lib/tkextlib/iwidgets/setup.rb b/ext/tk/lib/tkextlib/iwidgets/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/shell.rb b/ext/tk/lib/tkextlib/iwidgets/shell.rb
deleted file mode 100644
index dabf2e6f25..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/shell.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/spindate.rb b/ext/tk/lib/tkextlib/iwidgets/spindate.rb
deleted file mode 100644
index 2c98eb4629..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spindate.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/spinint.rb b/ext/tk/lib/tkextlib/iwidgets/spinint.rb
deleted file mode 100644
index 5eb944d081..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spinint.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/spinner.rb b/ext/tk/lib/tkextlib/iwidgets/spinner.rb
deleted file mode 100644
index aeee5c9038..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spinner.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-#  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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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/ext/tk/lib/tkextlib/iwidgets/spintime.rb b/ext/tk/lib/tkextlib/iwidgets/spintime.rb
deleted file mode 100644
index 0ff683ab56..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spintime.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb b/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
deleted file mode 100644
index dbb90e5102..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-#  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 pagecget_strict itemcget_strict
-  alias pageconfigure itemconfigure
-  alias pageconfiginfo itemconfiginfo
-  alias current_pageconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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 show_tab(idx)
-    @tabset.show_tab(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
-      idx = num_or_str(tk_send_without_enc('view'))
-      if idx.kind_of?(Fixnum) && idx < 0
-        nil
-      else
-        idx
-      end
-    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, what='pages')
-    view('scroll', index, what)
-  end
-  alias xview_scroll view_scroll
-  alias yview_scroll view_scroll
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/tabset.rb b/ext/tk/lib/tkextlib/iwidgets/tabset.rb
deleted file mode 100644
index 300ba9dee0..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/tabset.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-#  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 tabcget_strict itemcget_strict
-  alias tabconfigure itemconfigure
-  alias tabconfiginfo itemconfiginfo
-  alias current_tabconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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
-
-  def show_tab(idx)
-    if index(idx) == 0
-      self.start = 0
-      return
-    end
-
-    reutrn unless @canvas ||= self.winfo_children[0]
-
-    delta = 1 if (delta = cget(:gap)) == 'overlap' ||
-                   (delta = self.winfo_pixels(delta) + 1) <= 0
-
-    case cget(:tabpos)
-    when 's', 'n'
-      if (head = tabcget(idx, :left)) < 0
-        self.start -= head
-        return
-      end
-      tabs_size = @canvas.winfo_width
-      tab_start, tab_end = @canvas . 
-        find_overlapping(head, 0, head + delta, @canvas.winfo_height) . 
-        find_all{|id| @canvas.itemtype(id) == TkcPolygon} . 
-        map!{|id| bbox = @canvas.bbox(id); [bbox[0], bbox[2]]} . max
-
-    when 'e', 'w'
-      if (head = tabcget(idx, :top)) < 0
-        self.start -= head
-        return
-      end
-      tabs_size = @canvas.winfo_height
-      tab_start, tab_end = @canvas . 
-        find_overlapping(0, head, @canvas.winfo_width, head + delta) . 
-        find_all{|id| @canvas.itemtype(id) == TkcPolygon} . 
-        map!{|id| bbox = @canvas.bbox(id); [bbox[1], bbox[3]]} . max
-    end
-
-    if (size = tab_end - tab_start + 1) > tabs_size
-      self.start -= tab_start
-    elsif head + size > tabs_size
-      self.start -= head + size - tabs_size
-    end
-
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/timeentry.rb b/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
deleted file mode 100644
index 588da77dc8..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/timefield.rb b/ext/tk/lib/tkextlib/iwidgets/timefield.rb
deleted file mode 100644
index 28e1504797..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/timefield.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/toolbar.rb b/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
deleted file mode 100644
index 17cfa62156..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/iwidgets/watch.rb b/ext/tk/lib/tkextlib/iwidgets/watch.rb
deleted file mode 100644
index ab2b687cf9..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/watch.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/pkg_checker.rb b/ext/tk/lib/tkextlib/pkg_checker.rb
deleted file mode 100755
index 5002ed7ff8..0000000000
--- a/ext/tk/lib/tkextlib/pkg_checker.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/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/ext/tk/lib/tkextlib/setup.rb b/ext/tk/lib/tkextlib/setup.rb
deleted file mode 100644
index 12867e8f9c..0000000000
--- a/ext/tk/lib/tkextlib/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib.rb b/ext/tk/lib/tkextlib/tcllib.rb
deleted file mode 100644
index c6138f4275..0000000000
--- a/ext/tk/lib/tkextlib/tcllib.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/README b/ext/tk/lib/tkextlib/tcllib/README
deleted file mode 100644
index 953239befa..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/README
+++ /dev/null
@@ -1,135 +0,0 @@
-
- [ 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/ext/tk/lib/tkextlib/tcllib/autoscroll.rb b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
deleted file mode 100644
index 7db3c2e2b7..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-#  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 Tk::Scrollbar
-  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/ext/tk/lib/tkextlib/tcllib/ctext.rb b/ext/tk/lib/tkextlib/tcllib/ctext.rb
deleted file mode 100644
index 9014037f3d..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ctext.rb
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-#  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 < Tk::Text
-      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/ext/tk/lib/tkextlib/tcllib/cursor.rb b/ext/tk/lib/tkextlib/tcllib/cursor.rb
deleted file mode 100644
index 9bb828e8dd..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/cursor.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/datefield.rb b/ext/tk/lib/tkextlib/tcllib/datefield.rb
deleted file mode 100644
index 2244dd7a9a..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/datefield.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  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 < Tk::Entry
-      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/ext/tk/lib/tkextlib/tcllib/dialog.rb b/ext/tk/lib/tkextlib/tcllib/dialog.rb
deleted file mode 100644
index 825621b5a1..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/dialog.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/getstring.rb b/ext/tk/lib/tkextlib/tcllib/getstring.rb
deleted file mode 100644
index fc5d8b26d9..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/getstring.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-#  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_strict(slot)
-    slot = slot.to_s
-    if slot == 'text'
-      @text
-    else
-      @keys[slot]
-    end
-  end
-  def cget(slot)
-    cget_strict(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
-        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/ext/tk/lib/tkextlib/tcllib/history.rb b/ext/tk/lib/tkextlib/tcllib/history.rb
deleted file mode 100644
index a01a4ebfcc..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/history.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/ico.rb b/ext/tk/lib/tkextlib/tcllib/ico.rb
deleted file mode 100644
index 8c92926a4c..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ico.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-#  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
-      Tk_Image_ID.mutex.synchronize{
-        @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/ext/tk/lib/tkextlib/tcllib/ip_entry.rb b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
deleted file mode 100644
index c4b8240c04..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-#  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 < Tk::Entry
-      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/ext/tk/lib/tkextlib/tcllib/panelframe.rb b/ext/tk/lib/tkextlib/tcllib/panelframe.rb
deleted file mode 100644
index 2a4562e779..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/panelframe.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
deleted file mode 100644
index 06ab20f3e6..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/plotchart.rb
+++ /dev/null
@@ -1,886 +0,0 @@
-#
-#  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 < Tk::Canvas
-    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?(Tk::Canvas)
-          @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.mutex.synchronize{
-        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 < Tk::Canvas
-    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?(Tk::Canvas)
-          @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.mutex.synchronize{
-        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 < Tk::Canvas
-    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?(Tk::Canvas)
-          @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 < Tk::Canvas
-    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?(Tk::Canvas)
-          @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 < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze, 
-      '::Plotchart::createPiechart'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent] [, keys])
-      if args[0].kind_of?(Tk::Canvas)
-        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 < Tk::Canvas
-    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?(Tk::Canvas)
-          @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.mutex.synchronize{
-        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 < Tk::Canvas
-    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?(Tk::Canvas)
-          @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 < Tk::Canvas
-    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?(Tk::Canvas)
-          @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]).instance_eval{
-      @mutex = Mutex.new
-      def mutex; @mutex; end
-      freeze
-    }
-    TkCore::INTERP.init_ip_env{
-      SeriesID_TBL.mutex.synchronize{ SeriesID_TBL.clear }
-    }
-
-    def self.id2obj(chart, id)
-      path = chart.path
-      SeriesID_TBL.mutex.synchronize{
-        if SeriesID_TBL[path]
-          SeriesID_TBL[path][id]? SeriesID_TBL[path][id]: id
-        else
-          id
-        end
-      }
-    end
-
-    def initialize(chart, keys=nil)
-      @parent = @chart_obj = chart
-      @ppath = @chart_obj.path
-      Series_ID.mutex.synchronize{
-        @path = @series = @id = Series_ID.join(TkCore::INTERP._ip_id_)
-        Series_ID[1].succ!
-      }
-      SeriesID_TBL.mutex.synchronize{
-        SeriesID_TBL[@ppath] ||= {}
-        SeriesID_TBL[@ppath][@id] = self
-      }
-      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/ext/tk/lib/tkextlib/tcllib/ruler.rb b/ext/tk/lib/tkextlib/tcllib/ruler.rb
deleted file mode 100644
index 88ffb2c912..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ruler.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/screenruler.rb b/ext/tk/lib/tkextlib/tcllib/screenruler.rb
deleted file mode 100644
index 1b4067e2f0..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/screenruler.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/scrollwin.rb b/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
deleted file mode 100644
index 717728e34a..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/setup.rb b/ext/tk/lib/tkextlib/tcllib/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/style.rb b/ext/tk/lib/tkextlib/tcllib/style.rb
deleted file mode 100644
index dac6916e46..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/style.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/superframe.rb b/ext/tk/lib/tkextlib/tcllib/superframe.rb
deleted file mode 100644
index 35da37efbf..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/superframe.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/swaplist.rb b/ext/tk/lib/tkextlib/tcllib/swaplist.rb
deleted file mode 100644
index 1c813e36da..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/swaplist.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-#  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_strict(slot)
-    slot = slot.to_s
-    if slot == 'complete_list'
-      @complete_list
-    elsif slot == 'selected_list'
-      @selected_list
-    else
-      @keys[slot]
-    end
-  end
-  def cget(slot)
-    cget_strict(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
-        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/ext/tk/lib/tkextlib/tcllib/tablelist.rb b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
deleted file mode 100644
index efeb8fbbac..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tablelist.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
deleted file mode 100644
index d7a6c97210..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
+++ /dev/null
@@ -1,782 +0,0 @@
-#
-#  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_cget_strict(tagOrId, option)
-    itemcget_strict(['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 cellcget_strict cell_cget_strict
-  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_cget_strict(tagOrId, option)
-    itemcget_strict(['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 columncget_strict column_cget_strict
-  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_cget_strict(tagOrId, option)
-    itemcget_strict(['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 rowcget_strict row_cget_strict
-  alias rowconfigure row_configure
-  alias rowconfiginfo row_configinfo
-  alias current_rowconfiginfo current_row_configinfo
-
-  private :itemcget, :itemcget_strict
-  private :itemconfigure, :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/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
deleted file mode 100644
index 0cb4eb735d..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
deleted file mode 100644
index b366e0198b..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
+++ /dev/null
@@ -1,314 +0,0 @@
-#
-#  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.mutex.synchronize{
-        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.mutex.synchronize{
-        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.mutex.synchronize{
-        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/ext/tk/lib/tkextlib/tcllib/tooltip.rb b/ext/tk/lib/tkextlib/tcllib/tooltip.rb
deleted file mode 100644
index 4301b39fd3..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tooltip.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tcllib/widget.rb b/ext/tk/lib/tkextlib/tcllib/widget.rb
deleted file mode 100644
index ed69f67ce6..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/widget.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tclx.rb b/ext/tk/lib/tkextlib/tclx.rb
deleted file mode 100644
index 3a4ff27644..0000000000
--- a/ext/tk/lib/tkextlib/tclx.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tclx/setup.rb b/ext/tk/lib/tkextlib/tclx/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/tclx/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tclx/tclx.rb b/ext/tk/lib/tkextlib/tclx/tclx.rb
deleted file mode 100644
index 5a908fcd0b..0000000000
--- a/ext/tk/lib/tkextlib/tclx/tclx.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tile.rb b/ext/tk/lib/tkextlib/tile.rb
deleted file mode 100644
index 60ea012cc0..0000000000
--- a/ext/tk/lib/tkextlib/tile.rb
+++ /dev/null
@@ -1,419 +0,0 @@
-#
-#  Tile theme engin (tile widget set) support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/ttk_selector'
-
-# 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')
-if Tk::TK_MAJOR_VERSION > 8 || 
-    (Tk::TK_MAJOR_VERSION == 8 && Tk::TK_MINOR_VERSION >= 5)
-  TkPackage.require('tile') # for compatibility (version check of 'tile')
-  verstr = TkPackage.require('Ttk')
-else
-  verstr = TkPackage.require('tile')
-end
-
-ver = verstr.split('.')
-if ver[0].to_i == 0
-  # Tile extension package
-  if 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[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
-  elsif ver[1].to_i <= 7
-    module Tk
-      module Tile
-        USE_TILE_NAMESPACE = false
-        USE_TTK_NAMESPACE  = true
-        TILE_SPEC_VERSION_ID = 7
-      end
-    end
-  else
-    # version 0.8 or later
-    module Tk
-      module Tile
-        USE_TILE_NAMESPACE = false
-        USE_TTK_NAMESPACE  = true
-        TILE_SPEC_VERSION_ID = 8
-      end
-    end
-  end
-
-  module Tk::Tile
-    PACKAGE_NAME = 'tile'.freeze
-  end
-else
-  # Ttk package merged Tcl/Tk core (Tcl/Tk 8.5+)
-  module Tk
-    module Tile
-      USE_TILE_NAMESPACE = false
-      USE_TTK_NAMESPACE  = true
-      TILE_SPEC_VERSION_ID = 8
-
-      PACKAGE_NAME = 'Ttk'.freeze
-    end
-  end
-end
-
-# autoload
-module Tk
-  module Tile
-    TkComm::TkExtlibAutoloadModule.unshift(self)
-
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require(PACKAGE_NAME)
-      rescue
-        ''
-      end
-    end
-
-    def self.__Import_Tile_Widgets__!
-      warn 'Warning: "Tk::Tile::__Import_Tile_Widgets__!" is obsolete.' <<
-           ' To control default widget set, use "Tk.default_widget_set = :Ttk"'
-      Tk.tk_call('namespace', 'import', '-force', 'ttk::*')
-    end
-
-    def self.__define_LoadImages_proc_for_compatibility__!
-      # Ttk 8.5 (Tile 0.8) lost 'LoadImages' utility procedure.
-      # So, some old scripts doen't work, because those scripts use the 
-      # procedure to define local styles. 
-      # Of course, rewriting such Tcl/Tk scripts isn't difficult for 
-      # Tcl/Tk users. However, it may be troublesome for Ruby/Tk users 
-      # who use such Tcl/Tk scripts as it is.
-      # This method may help Ruby/Tk users who don't want to modify old 
-      # Tcl/Tk scripts for the latest version of Ttk (Tile) extension.
-      # This method defines a comaptible 'LoadImages' procedure on the 
-      # Tcl/Tk interpreter working under Ruby/Tk. 
-      # Please give attention to use this method. It may conflict with 
-      # some definitions on Tcl/Tk scripts. 
-      klass_name = self.name
-      proc_name = 'LoadImages'
-      if Tk::Tile::USE_TTK_NAMESPACE
-        ns_list = ['::tile']
-        if Tk.info(:commands, "::ttk::#{proc_name}").empty?
-          ns_list << '::ttk'
-        end
-      else # Tk::Tile::USE_TILE_NAMESPACE
-        ns_list = ['::ttk']
-        if Tk.info(:commands, "::tile::#{proc_name}").empty?
-          ns_list << '::tile'
-        end
-      end
-
-      ns_list.each{|ns|
-        cmd = "#{ns}::#{proc_name}"
-        unless Tk.info(:commands, cmd).empty?
-          #fail RuntimeError, "can't define '#{cmd}' command (already exist)"
-
-          # do nothing !!!
-          warn "Warning: can't define '#{cmd}' command (already exist)" if $DEBUG
-          next
-        end
-        TkNamespace.eval(ns){
-          TkCore::INTERP.add_tk_procs(proc_name, 'imgdir {patterns {*.gif}}', 
-                                      <<-'EOS')
-            foreach pattern $patterns {
-              foreach file [glob -directory $imgdir $pattern] {
-                set img [file tail [file rootname $file]]
-                if {![info exists images($img)]} {
-                  set images($img) [image create photo -file $file]
-                }
-              }
-            }
-            return [array get images]
-          EOS
-        }
-      }
-    end
-
-    def self.load_images(imgdir, pat=nil)
-      if Tk::Tile::TILE_SPEC_VERSION_ID < 8
-        if Tk::Tile::USE_TTK_NAMESPACE
-          cmd = '::ttk::LoadImages'
-        else # Tk::Tile::USE_TILE_NAMESPACE
-          cmd = '::tile::LoadImages'
-        end
-        pat ||= TkComm::None
-        images = Hash[*TkComm.simplelist(Tk.tk_call(cmd, imgdir, pat))]
-        images.keys.each{|k|
-          images[k] = TkPhotoImage.new(:imagename=>images[k], 
-                                       :without_creating=>true)
-        }
-      else ## TILE_SPEC_VERSION_ID >= 8
-        pat ||= '*.gif'
-        if pat.kind_of?(Array)
-          pat_list = pat
-        else
-          pat_list = [ pat ]
-        end
-        Dir.chdir(imgdir){
-          pat_list.each{|pat|
-            Dir.glob(pat).each{|f|
-              img = File.basename(f, '.*')
-              unless TkComm.bool(Tk.info('exists', "images(#{img})"))
-                Tk.tk_call('set', "images(#{img})", 
-                           Tk.tk_call('image', 'create', 'photo', '-file', f))
-              end
-            }
-          }
-        }
-        images = Hash[*TkComm.simplelist(Tk.tk_call('array', 'get', 'images'))]
-        images.keys.each{|k|
-          images[k] = TkPhotoImage.new(:imagename=>images[k], 
-                                       :without_creating=>true)
-        }
-      end
-
-      images
-    end
-
-    def self.style(*args)
-      args.map!{|arg| TkComm._get_eval_string(arg)}.join('.')
-    end
-
-    def self.themes(glob_ptn = nil)
-      if TILE_SPEC_VERSION_ID < 8 && Tk.info(:commands, '::ttk::themes').empty?
-        fail RuntimeError, 'not support glob option' if glob_ptn
-        cmd = ['::tile::availableThemes']
-      else
-        glob_ptn = '*' unless glob_ptn
-        cmd = ['::ttk::themes', glob_ptn]
-      end
-
-      begin
-        TkComm.simplelist(Tk.tk_call_without_enc(*cmd))
-      rescue
-        TkComm.simplelist(Tk.tk_call('lsearch', '-all', '-inline', 
-                                     Tk::Tile::Style.theme_names, 
-                                     glob_ptn))
-      end
-    end
-
-    def self.set_theme(theme)
-      if TILE_SPEC_VERSION_ID < 8 && Tk.info(:commands, '::ttk::setTheme').empty?
-        cmd = '::tile::setTheme'
-      else
-        cmd = '::ttk::setTheme'
-      end
-
-      begin
-        Tk.tk_call_without_enc(cmd, theme)
-      rescue
-        Tk::Tile::Style.theme_use(theme)
-      end
-    end
-
-    module KeyNav
-      if Tk::Tile::TILE_SPEC_VERSION_ID < 8
-        def self.enableMnemonics(w)
-          Tk.tk_call('::keynav::enableMnemonics', w)
-        end
-        def self.defaultButton(w)
-          Tk.tk_call('::keynav::defaultButton', w)
-        end
-      else # dummy
-        def self.enableMnemonics(w)
-          ""
-        end
-        def self.defaultButton(w)
-          ""
-        end
-      end
-    end
-
-    module Font
-      Default      = 'TkDefaultFont'
-      Text         = 'TkTextFont'
-      Heading      = 'TkHeadingFont'
-      Caption      = 'TkCaptionFont'
-      Tooltip      = 'TkTooltipFont'
-
-      Fixed        = 'TkFixedFont'
-      Menu         = 'TkMenuFont'
-      SmallCaption = 'TkSmallCaptionFont'
-      Icon         = 'TkIconFont'
-
-      TkFont::SYSTEM_FONT_NAMES.add [
-        'TkDefaultFont', 'TkTextFont', 'TkHeadingFont', 
-        'TkCaptionFont', 'TkTooltipFont', 'TkFixedFont', 
-        'TkMenuFont', 'TkSmallCaptionFont', '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 ttk_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
-      alias tile_instate ttk_instate
-
-      def ttk_state(state=nil)
-        if state
-          tk_send('state', state)
-        else
-          list(tk_send('state'))
-        end
-      end
-      alias tile_state ttk_state
-
-      def ttk_identify(x, y)
-        ret = tk_send_without_enc('identify', x, y)
-        (ret.empty?)? nil: ret
-      end
-      alias tile_identify ttk_identify
-
-      # remove instate/state/identify method 
-      # to avoid the conflict with widget options
-      if Tk.const_defined?(:USE_OBSOLETE_TILE_STATE_METHOD) && Tk::USE_OBSOLETE_TILE_STATE_METHOD
-        alias instate  ttk_instate
-        alias state    ttk_state
-        alias identify ttk_identify
-      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 :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 :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 :PanedWindow,   'tkextlib/tile/tpaned'
-    autoload :Panedwindow,   '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 :XScrollbar,    'tkextlib/tile/tscrollbar'
-    autoload :YScrollbar,    'tkextlib/tile/tscrollbar'
-
-    autoload :TSeparator,    'tkextlib/tile/tseparator'
-    autoload :Separator,     'tkextlib/tile/tseparator'
-
-    autoload :TSquare,       'tkextlib/tile/tsquare'
-    autoload :Square,        'tkextlib/tile/tsquare'
-
-    autoload :SizeGrip,      'tkextlib/tile/sizegrip'
-    autoload :Sizegrip,      'tkextlib/tile/sizegrip'
-
-    autoload :Treeview,      'tkextlib/tile/treeview'
-
-    autoload :Style,         'tkextlib/tile/style'
-  end
-end
-
-Ttk = Tk::Tile
diff --git a/ext/tk/lib/tkextlib/tile/dialog.rb b/ext/tk/lib/tkextlib/tile/dialog.rb
deleted file mode 100644
index ef2d1fe577..0000000000
--- a/ext/tk/lib/tkextlib/tile/dialog.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-#  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_strict(slot)
-    @keys[slot.to_s]
-  end
-  def cget(slot)
-    @keys[slot.to_s]
-  end
-=begin
-  def cget(slot)
-    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      cget_strict(slot)
-    else
-      cget_strict(slot) rescue nil
-    end
-  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
-        @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/ext/tk/lib/tkextlib/tile/setup.rb b/ext/tk/lib/tkextlib/tile/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/tile/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tile/sizegrip.rb b/ext/tk/lib/tkextlib/tile/sizegrip.rb
deleted file mode 100644
index c5068919a4..0000000000
--- a/ext/tk/lib/tkextlib/tile/sizegrip.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#  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
-    Sizegrip = SizeGrip
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Sizegrip, :TkSizegrip, :TkSizeGrip)
-
-
-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/ext/tk/lib/tkextlib/tile/style.rb b/ext/tk/lib/tkextlib/tile/style.rb
deleted file mode 100644
index ca7ee99c32..0000000000
--- a/ext/tk/lib/tkextlib/tile/style.rb
+++ /dev/null
@@ -1,316 +0,0 @@
-#
-#  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
-  if Tk::Tile::TILE_SPEC_VERSION_ID < 8
-    TkCommandNames = ['style'.freeze].freeze
-
-    # --- Tk::Tile::Style.__define_wrapper_proc_for_compatibility__! ---
-    # On Ttk (Tile) extension, 'style' command has imcompatible changes 
-    # depend on the version of the extention. It requires modifying the 
-    # Tcl/Tk scripts to define local styles. The rule for modification 
-    # is a simple one. But, if users want to keep compatibility between 
-    # versions of the extension, they will have to contrive to do that. 
-    # It may be troublesome, especially for Ruby/Tk users.
-    # This method may help such work. This method make some definitions 
-    # on the Tcl/Tk interpreter to work with different version of style 
-    # command format. Please give attention to use this method. It may 
-    # conflict with some definitions on Tcl/Tk scripts. 
-    if Tk::Tile::TILE_SPEC_VERSION_ID < 7
-      def __define_wrapper_proc_for_compatibility__!
-        __define_themes_and_setTheme_proc__!
-
-        unless Tk.info(:commands, '::ttk::style').empty?
-          # fail RuntimeError,
-          #      "can't define '::ttk::style' command (already exist)"
-
-          # do nothing !!!
-          warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
-          return
-        end
-        TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
-        if [string equal [lrange $args 0 1] {element create}] {
-          if [string equal [lindex $args 3] image] {
-            set spec [lindex $args 4]
-            set map  [lrange $spec 1 end]
-            if [llength $map] {
-              # return [eval [concat [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
-              return [uplevel 1 [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]
-            }
-          }
-        }
-        # return [eval "::style $args"]
-        return [uplevel 1 ::style $args]
-      EOS
-        #########################
-      end
-    else ### TILE_SPEC_VERSION_ID == 7
-      def __define_wrapper_proc_for_compatibility__!
-        __define_themes_and_setTheme_proc__!
-
-        unless Tk.info(:commands, '::ttk::style').empty?
-          # fail RuntimeError,
-          #     "can't define '::ttk::style' command (already exist)"
-
-          # do nothing !!!
-          warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
-          return
-        end
-        TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
-        if [string equal [lrange $args 0 1] {element create}] {
-          if [string equal [lindex $args 3] image] {
-            set spec [lindex $args 4]
-            set map  [lrange $spec 1 end]
-            if [llength $map] {
-              # return [eval [concat [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
-              return [uplevel 1 [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
-            }
-          }
-        } elseif [string equal [lindex $args 0] default] {
-          # return [eval "::style [lreplace $args 0 0 configure]"]
-          return [uplevel 1 ::style [lreplace $args 0 0 configure]]
-        }
-        # return [eval "::style $args"]
-        return [uplevel 1 ::style $args]
-      EOS
-        #########################
-      end
-    end
-  else ### TILE_SPEC_VERSION_ID >= 8
-    TkCommandNames = ['::ttk::style'.freeze].freeze
-
-    def __define_wrapper_proc_for_compatibility__!
-      __define_themes_and_setTheme_proc__!
-
-      unless Tk.info(:commands, '::style').empty?
-        # fail RuntimeError, "can't define '::style' command (already exist)"
-
-        # do nothing !!!
-        warn "Warning: can't define '::style' command (already exist)" if $DEBUG
-        return
-      end
-      TkCore::INTERP.add_tk_procs('::style', 'args', <<-'EOS')
-        if [string equal [lrange $args 0 1] {element create}] {
-          if [string equal [lindex $args 3] image] {
-            set name [lindex $args 4]
-            set opts [lrange $args 5 end]
-            set idx [lsearch $opts -map]
-            if {$idx >= 0 && [expr $idx % 2 == 0]} {
-             # return [eval [concat [list ::ttk::style element create [lindex $args 2] image [concat $name [lindex $opts [expr $idx + 1]]]] [lreplace $opts $idx [expr $idx + 1]]]]
-              return [uplevel 1 [list ::ttk::style element create [lindex $args 2] image [concat $name [lindex $opts [expr $idx + 1]]]] [lreplace $opts $idx [expr $idx + 1]]]
-            }
-          }
-        } elseif [string equal [lindex $args 0] default] {
-          # return [eval "::ttk::style [lreplace $args 0 0 configure]"]
-          return [uplevel 1 ::ttk::style [lreplace $args 0 0 configure]]
-        }
-        # return [eval "::ttk::style $args"]
-        return [uplevel 1 ::ttk::style $args]
-      EOS
-      #########################
-    end
-  end
-
-  def __define_themes_and_setTheme_proc__!
-    TkCore::INTERP.add_tk_procs('::ttk::themes', '{ptn *}', <<-'EOS')
-      #set themes [list]
-      set themes [::ttk::style theme names]
-      foreach pkg [lsearch -inline -all -glob [package names] ttk::theme::$ptn] {
-          set theme [namespace tail $pkg]
-          if {[lsearch -exact $themes $theme] < 0} {
-              lappend themes $theme
-          }
-      }
-      foreach pkg [lsearch -inline -all -glob [package names] tile::theme::$ptn] {
-          set theme [namespace tail $pkg]
-          if {[lsearch -exact $themes $theme] < 0} {
-              lappend themes $theme
-          }
-      }
-      return $themes
-    EOS
-    #########################
-    TkCore::INTERP.add_tk_procs('::ttk::setTheme', 'theme', <<-'EOS')
-      variable currentTheme
-      if {[lsearch -exact [::ttk::style theme names] $theme] < 0} {
-          package require [lsearch -inline -regexp [package names] (ttk|tile)::theme::$theme]
-      }
-      ::ttk::style theme use $theme
-      set currentTheme $theme
-    EOS
-  end
-  private :__define_themes_and_setTheme_proc__!
-
-  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(TkCommandNames[0], sub_cmd, style, *hash_kv(keys))
-    else
-      tk_call(TkCommandNames[0], 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
-      if keys.kind_of?(Hash)
-        tk_call(TkCommandNames[0], 'map', style, *hash_kv(keys))
-      else
-        simplelist(tk_call(TkCommandNames[0], 'map', style, '-' << keys.to_s))
-      end
-    else
-      ret = {}
-      Hash[*(simplelist(tk_call(TkCommandNames[0], 'map', style)))].each{|k, v|
-        ret[k[1..-1]] = list(v)
-      }
-      ret
-    end
-  end
-  alias map_configure map
-
-  def map_configinfo(style=nil, key=None)
-    style = '.' unless style
-    map(style, key)
-  end
-
-  def map_default_configinfo(key=None)
-    map('.', key)
-  end
-
-  def lookup(style, opt, state=None, fallback_value=None)
-    tk_call(TkCommandNames[0], '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(TkCommandNames[0], 'layout', style, spec)
-    else
-      _style_layout(list(tk_call(TkCommandNames[0], 'layout', style)))
-    end
-  end
-
-  def element_create(name, type, *args)
-    if type == 'image' || type == :image
-      element_create_image(name, *args)
-    else
-      tk_call(TkCommandNames[0], 'element', 'create', name, type, *args)
-    end
-  end
-
-  def element_create_image(name, *args)
-    fail ArgumentError, 'Must supply a base image' unless (spec = args.shift)
-    if (opts = args.shift)
-      if opts.kind_of?(Hash)
-        opts = _symbolkey2str(opts)
-      else
-        fail ArgumentError, 'bad option'
-      end
-    end
-    fail ArgumentError, 'too many arguments' unless args.empty?
-
-    if spec.kind_of?(Array)
-      # probably, command format is tile 0.8+ (Tcl/Tk8.5+) style
-      if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
-        if opts
-          tk_call(TkCommandNames[0], 
-                  'element', 'create', name, 'image', spec, opts)
-        else
-          tk_call(TkCommandNames[0], 'element', 'create', name, 'image', spec)
-        end
-      else
-        fail ArgumentError, 'illegal arguments' if opts.key?('map')
-        base = spec.shift
-        opts['map'] = spec
-        tk_call(TkCommandNames[0], 
-                'element', 'create', name, 'image', base, opts)
-      end
-    else
-      # probably, command format is tile 0.7.8 or older style
-      if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
-        spec = [spec, *(opts.delete('map'))] if opts.key?('map')
-      end
-      if opts
-        tk_call(TkCommandNames[0], 
-                'element', 'create', name, 'image', spec, opts)
-      else
-        tk_call(TkCommandNames[0], 'element', 'create', name, 'image', spec)
-      end
-    end
-  end
-
-  def element_names()
-    list(tk_call(TkCommandNames[0], 'element', 'names'))
-  end
-
-  def element_options(elem)
-    simplelist(tk_call(TkCommandNames[0], 'element', 'options', elem))
-  end
-
-  def theme_create(name, keys=nil)
-    name = name.to_s
-    if keys && keys != None
-      tk_call(TkCommandNames[0], 'theme', 'create', name, *hash_kv(keys))
-    else
-      tk_call(TkCommandNames[0], 'theme', 'create', name)
-    end
-    name
-  end
-
-  def theme_settings(name, cmd=nil, &b)
-    name = name.to_s
-    cmd = Proc.new(&b) if !cmd && b
-    tk_call(TkCommandNames[0], 'theme', 'settings', name, cmd)
-    name
-  end
-
-  def theme_names()
-    list(tk_call(TkCommandNames[0], 'theme', 'names'))
-  end
-
-  def theme_use(name)
-    name = name.to_s
-    tk_call(TkCommandNames[0], 'theme', 'use', name)
-    name
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tile/tbutton.rb b/ext/tk/lib/tkextlib/tile/tbutton.rb
deleted file mode 100644
index 5d7db10fe9..0000000000
--- a/ext/tk/lib/tkextlib/tile/tbutton.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  tbutton widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TButton < Tk::Button
-    end
-    Button = TButton
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Button, :TkButton)
-
-
-class Tk::Tile::TButton < Tk::Button
-  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/ext/tk/lib/tkextlib/tile/tcheckbutton.rb b/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
deleted file mode 100644
index 172225fcec..0000000000
--- a/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  tcheckbutton widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TCheckButton < Tk::CheckButton
-    end
-    TCheckbutton = TCheckButton
-    CheckButton  = TCheckButton
-    Checkbutton  = TCheckButton
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Checkbutton, 
-                            :TkCheckbutton, :TkCheckButton)
-
-
-class Tk::Tile::TCheckButton < Tk::CheckButton
-  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/ext/tk/lib/tkextlib/tile/tcombobox.rb b/ext/tk/lib/tkextlib/tile/tcombobox.rb
deleted file mode 100644
index b64372f1c9..0000000000
--- a/ext/tk/lib/tkextlib/tile/tcombobox.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  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
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Combobox, :TkCombobox)
-
-
-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/ext/tk/lib/tkextlib/tile/tentry.rb b/ext/tk/lib/tkextlib/tile/tentry.rb
deleted file mode 100644
index 0bea98dcd9..0000000000
--- a/ext/tk/lib/tkextlib/tile/tentry.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  tentry widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TEntry < Tk::Entry
-    end
-    Entry = TEntry
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Entry, :TkEntry)
-
-
-class Tk::Tile::TEntry < Tk::Entry
-  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 __optkey_aliases
-    {:vcmd=>:validatecommand, :invcmd=>:invalidcommand}
-  end
-  private :__optkey_aliases
-
-  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/ext/tk/lib/tkextlib/tile/tframe.rb b/ext/tk/lib/tkextlib/tile/tframe.rb
deleted file mode 100644
index 3b5f98bb6e..0000000000
--- a/ext/tk/lib/tkextlib/tile/tframe.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  tframe widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TFrame < Tk::Frame
-    end
-    Frame = TFrame
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Frame, :TkFrame)
-
-
-class Tk::Tile::TFrame < Tk::Frame
-  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/ext/tk/lib/tkextlib/tile/tlabel.rb b/ext/tk/lib/tkextlib/tile/tlabel.rb
deleted file mode 100644
index 7d074d3842..0000000000
--- a/ext/tk/lib/tkextlib/tile/tlabel.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  tlabel widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TLabel < Tk::Label
-    end
-    Label = TLabel
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Label, :TkLabel)
-
-
-class Tk::Tile::TLabel < Tk::Label
-  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/ext/tk/lib/tkextlib/tile/tlabelframe.rb b/ext/tk/lib/tkextlib/tile/tlabelframe.rb
deleted file mode 100644
index cff66d8658..0000000000
--- a/ext/tk/lib/tkextlib/tile/tlabelframe.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  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
-    TLabelFrame = TLabelframe
-    Labelframe  = TLabelframe
-    LabelFrame  = TLabelframe
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Labelframe, 
-                            :TkLabelframe, :TkLabelFrame)
-
-
-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/ext/tk/lib/tkextlib/tile/tmenubutton.rb b/ext/tk/lib/tkextlib/tile/tmenubutton.rb
deleted file mode 100644
index 7c6ab28e52..0000000000
--- a/ext/tk/lib/tkextlib/tile/tmenubutton.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  tmenubutton widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TMenubutton < Tk::Menubutton
-    end
-    TMenuButton = TMenubutton
-    Menubutton  = TMenubutton
-    MenuButton  = TMenubutton
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Menubutton, 
-                            :TkMenubutton, :TkMenuButton)
-
-
-class Tk::Tile::TMenubutton < Tk::Menubutton
-  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/ext/tk/lib/tkextlib/tile/tnotebook.rb b/ext/tk/lib/tkextlib/tile/tnotebook.rb
deleted file mode 100644
index 4d65e363da..0000000000
--- a/ext/tk/lib/tkextlib/tile/tnotebook.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-#  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
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Notebook, :TkNotebook)
-
-
-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 tabcget_strict itemcget_strict
-  alias tabconfigure itemconfigure
-  alias tabconfiginfo itemconfiginfo
-  alias current_tabconfiginfo current_itemconfiginfo
-
-  def tabcget_strict(tagOrId, option)
-    tabconfigure(tagOrId, option)[-1]
-  end
-  def tabcget(tagOrId, option)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      tabcget_strict(tagOrId, option)
-    else
-      begin
-        tabcget_strict(tagOrId, option)
-      rescue => e
-        begin
-          if current_tabconfiginfo(tagOrId).has_key?(option.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  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('add', _epath(child), *hash_kv(keys))
-    else
-      tk_send('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/ext/tk/lib/tkextlib/tile/tpaned.rb b/ext/tk/lib/tkextlib/tile/tpaned.rb
deleted file mode 100644
index d96ff43973..0000000000
--- a/ext/tk/lib/tkextlib/tile/tpaned.rb
+++ /dev/null
@@ -1,231 +0,0 @@
-#
-#  tpaned widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TPaned < TkWindow
-    end
-    PanedWindow = Panedwindow = Paned = TPaned
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Panedwindow, 
-                            :TkPanedwindow, :TkPanedWindow)
-
-
-class Tk::Tile::TPaned < TkWindow
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    if Tk::Tile::TILE_SPEC_VERSION_ID < 8
-      TkCommandNames = ['::ttk::paned'.freeze].freeze
-    else
-      TkCommandNames = ['::ttk::panedwindow'.freeze].freeze
-    end
-  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(*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 == []
-      opts = hash_kv(keys)
-    else
-      args.push(keys) if keys
-      opts = []
-    end
-
-    args.each{|win|
-      tk_send_without_enc('add', _epath(win), *opts)
-    }
-    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_strict(pane, slot)
-    pane = _epath(pane)
-    tk_tcl2ruby(tk_send_without_enc('pane', pane, "-#{slot}"))
-  end
-  alias pane_cget_strict panecget_strict
-
-  def panecget(pane, slot)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      panecget_strict(pane, slot)
-    else
-      begin
-        panecget_strict(pane, slot)
-      rescue => e
-        begin
-          if current_paneconfiginfo(pane).has_key?(slot.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  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/ext/tk/lib/tkextlib/tile/tprogressbar.rb b/ext/tk/lib/tkextlib/tile/tprogressbar.rb
deleted file mode 100644
index f786d370dd..0000000000
--- a/ext/tk/lib/tkextlib/tile/tprogressbar.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  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
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Progressbar, :TkProgressbar)
-
-
-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/ext/tk/lib/tkextlib/tile/tradiobutton.rb b/ext/tk/lib/tkextlib/tile/tradiobutton.rb
deleted file mode 100644
index d653a6d256..0000000000
--- a/ext/tk/lib/tkextlib/tile/tradiobutton.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  tradiobutton widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TRadioButton < Tk::RadioButton
-    end
-    TRadiobutton = TRadioButton
-    RadioButton  = TRadioButton
-    Radiobutton  = TRadioButton
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Radiobutton, 
-                            :TkRadiobutton, :TkRadioButton)
-
-
-class Tk::Tile::TRadioButton < Tk::RadioButton
-  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/ext/tk/lib/tkextlib/tile/treeview.rb b/ext/tk/lib/tkextlib/tile/treeview.rb
deleted file mode 100644
index c978a1a07b..0000000000
--- a/ext/tk/lib/tkextlib/tile/treeview.rb
+++ /dev/null
@@ -1,1238 +0,0 @@
-#
-#  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
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Treeview, :TkTreeview)
-
-
-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
-
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          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
-
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          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]) + ['minwidth']
-    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]) + ['stretch']
-    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 __itemcget_strict itemcget_strict
-  alias __itemconfigure itemconfigure
-  alias __itemconfiginfo itemconfiginfo
-  alias __current_itemconfiginfo current_itemconfiginfo
-
-  private :__itemcget, :__itemcget_strict
-  private :__itemconfigure, :__itemconfiginfo, :__current_itemconfiginfo
-
-  # Treeview Item
-  def itemcget(tagOrId, option)
-    __itemcget([:item, tagOrId], option)
-  end
-  def itemcget_strict(tagOrId, option)
-    __itemcget_strict([: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 columncget_strict(tagOrId, option)
-    __itemcget_strict([: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_cget_strict columncget_strict
-  alias column_configure columnconfigure
-  alias column_configinfo columnconfiginfo
-  alias current_column_configinfo current_columnconfiginfo
-
-  # Treeview Heading
-  def headingcget_strict(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_strict([:heading, tagOrId], option)
-    end
-  end
-  def headingcget(tagOrId, option)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      headingcget_strict(tagOrId, option)
-    else
-      begin
-        headingcget_strict(tagOrId, option)
-      rescue => e
-        begin
-          if current_headingconfiginfo(tagOrId).has_key?(option.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    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_cget_strict headingcget_strict
-  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 tagcget_strict(tagOrId, option)
-    __itemcget_strict([: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_cget_strict tagcget_strict
-  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.mutex.synchronize{
-      Tk::Tile::Treeview::Item::ItemID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      if Tk::Tile::Treeview::Item::ItemID_TBL[tpath]
-        (Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id])? \
-             Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def self.assign(tree, id)
-    tpath = tree.path
-    obj = nil
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      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
-      }
-      Tk::Tile::Treeview::Item::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)
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      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 cget_strict(option)
-    @t.itemcget_strict(@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
-    obj = nil
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      if Tk::Tile::Treeview::Item::ItemID_TBL[tpath] &&
-          Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
-        obj = Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
-      else
-        #super(tree, keys)
-        (obj = self.allocate).instance_eval{
-          @parent = @t = tree
-          @tpath = tree.path
-          @path = @id = ''
-          Tk::Tile::Treeview::Item::ItemID_TBL[@tpath] ||= {}
-          Tk::Tile::Treeview::Item::ItemID_TBL[@tpath][@id] = self
-        }
-      end
-    }
-    obj.configure(keys) if keys && ! keys.empty?
-    obj
-  end
-
-  def initialize(tree, keys = {})
-    # dummy:: not called by 'new' method
-    @parent = @t = tree
-    @tpath = tree.path
-    @path = @id = ''
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      Tk::Tile::Treeview::Item::ItemID_TBL[@tpath] ||= {}
-      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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk::Tile::Treeview::Tag::TagID_TBL.mutex.synchronize{
-      Tk::Tile::Treeview::Tag::TagID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::Tile::Treeview::Tag::TagID_TBL.mutex.synchronize{
-      if Tk::Tile::Treeview::Tag::TagID_TBL[tpath]
-        (Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id])? \
-               Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(tree, keys=nil)
-    @parent = @t = tree
-    @tpath = tree.path
-    Tag_ID.mutex.synchronize{
-      @path = @id = Tag_ID.join(TkCore::INTERP._ip_id_)
-      Tag_ID[1].succ!
-    }
-    TagID_TBL.mutex.synchronize{
-      TagID_TBL[@tpath] = {} unless TagID_TBL[@tpath]
-      TagID_TBL[@tpath][@id] = self
-    }
-    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 cget_strict(option)
-    @t.tagcget_strict(@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.mutex.synchronize{
-      Tk::Tile::Treeview::Item::ItemID_TBL.delete(@path)
-    }
-    Tk::Tile::Treeview::Tag::ItemID_TBL.mutex.synchronize{
-      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/ext/tk/lib/tkextlib/tile/tscale.rb b/ext/tk/lib/tkextlib/tile/tscale.rb
deleted file mode 100644
index 2c46fd9bd4..0000000000
--- a/ext/tk/lib/tkextlib/tile/tscale.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-#  tscale & tprogress widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TScale < Tk::Scale
-    end
-    Scale = TScale
-
-    class TProgress < TScale
-    end
-    Progress = TProgress
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scale, :TkScale)
-
-
-class Tk::Tile::TScale < Tk::Scale
-  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/ext/tk/lib/tkextlib/tile/tscrollbar.rb b/ext/tk/lib/tkextlib/tile/tscrollbar.rb
deleted file mode 100644
index 163b8f4713..0000000000
--- a/ext/tk/lib/tkextlib/tile/tscrollbar.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  tscrollbar widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TScrollbar < Tk::Scrollbar
-    end
-    Scrollbar = TScrollbar
-  end
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scrollbar, :TkScrollbar)
-
-
-class Tk::Tile::TScrollbar < Tk::Scrollbar
-  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
-
-class Tk::Tile::XScrollbar < Tk::Tile::TScrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'horizontal'
-    super(keys)
-  end
-  private :create_self
-end
-
-class Tk::Tile::YScrollbar < Tk::Tile::TScrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'vertical'
-    super(keys)
-  end
-  private :create_self
-end
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::XScrollbar, :TkXScrollbar)
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::YScrollbar, :TkYScrollbar)
diff --git a/ext/tk/lib/tkextlib/tile/tseparator.rb b/ext/tk/lib/tkextlib/tile/tseparator.rb
deleted file mode 100644
index 30fae2c525..0000000000
--- a/ext/tk/lib/tkextlib/tile/tseparator.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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
-
-Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Separator, :TkSeparator)
-
-
-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/ext/tk/lib/tkextlib/tile/tsquare.rb b/ext/tk/lib/tkextlib/tile/tsquare.rb
deleted file mode 100644
index 600b55e4e7..0000000000
--- a/ext/tk/lib/tkextlib/tile/tsquare.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkDND.rb b/ext/tk/lib/tkextlib/tkDND.rb
deleted file mode 100644
index 5d52e34418..0000000000
--- a/ext/tk/lib/tkextlib/tkDND.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkDND/setup.rb b/ext/tk/lib/tkextlib/tkDND/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/tkDND/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkDND/shape.rb b/ext/tk/lib/tkextlib/tkDND/shape.rb
deleted file mode 100644
index d44068ed33..0000000000
--- a/ext/tk/lib/tkextlib/tkDND/shape.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-#  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
-      class << self
-        def package_version
-          Tk.tk_call('set', 'shape_version')
-        end
-        alias shape_version package_version
-
-        def package_patchlevel
-          Tk.tk_call('set', 'shape_patchLevel')
-        end
-        alias shape_patchlevel package_patchlevel
-
-        def version
-          tk_call('shape', 'version')
-        end
-        alias xshape_version version
-      end
-
-      ############################
-
-      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/ext/tk/lib/tkextlib/tkDND/tkdnd.rb b/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
deleted file mode 100644
index 9a9b2dc42c..0000000000
--- a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-#
-#  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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      # 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/ext/tk/lib/tkextlib/tkHTML.rb b/ext/tk/lib/tkextlib/tkHTML.rb
deleted file mode 100644
index 5fddde72ff..0000000000
--- a/ext/tk/lib/tkextlib/tkHTML.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb b/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
deleted file mode 100644
index d893a83cf2..0000000000
--- a/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
+++ /dev/null
@@ -1,453 +0,0 @@
-#
-#  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.mutex.synchronize{ 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
-    HtmlClip_TBL.mutex.synchronize{
-      return HtmlClip_TBL[ppath] if HtmlClip_TBL[ppath]
-    }
-
-    widgetname = keys.delete('widgetname')
-    if widgetname =~ /^(.*)\.[^.]+$/
-      ppath2 = $1
-      if ppath2[0] != ?.
-        ppath2 = ppath + '.' + ppath2
-      end
-      HtmlClip_TBL.mutex.synchronize{
-        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.mutex.synchronize{
-      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/ext/tk/lib/tkextlib/tkHTML/setup.rb b/ext/tk/lib/tkextlib/tkHTML/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/tkHTML/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg.rb b/ext/tk/lib/tkextlib/tkimg.rb
deleted file mode 100644
index c01359d3ef..0000000000
--- a/ext/tk/lib/tkextlib/tkimg.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/README b/ext/tk/lib/tkextlib/tkimg/README
deleted file mode 100644
index 65d36365d0..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/README
+++ /dev/null
@@ -1,26 +0,0 @@
-
- [ 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/ext/tk/lib/tkextlib/tkimg/bmp.rb b/ext/tk/lib/tkextlib/tkimg/bmp.rb
deleted file mode 100644
index ea90181aa3..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/bmp.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/gif.rb b/ext/tk/lib/tkextlib/tkimg/gif.rb
deleted file mode 100644
index d542d47561..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/gif.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/ico.rb b/ext/tk/lib/tkextlib/tkimg/ico.rb
deleted file mode 100644
index e79bdf45e9..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/ico.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/jpeg.rb b/ext/tk/lib/tkextlib/tkimg/jpeg.rb
deleted file mode 100644
index 2126120161..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/jpeg.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/pcx.rb b/ext/tk/lib/tkextlib/tkimg/pcx.rb
deleted file mode 100644
index 6831f4d35b..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/pcx.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/pixmap.rb b/ext/tk/lib/tkextlib/tkimg/pixmap.rb
deleted file mode 100644
index bd1b870af7..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/pixmap.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/png.rb b/ext/tk/lib/tkextlib/tkimg/png.rb
deleted file mode 100644
index 5c829f48d2..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/png.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/ppm.rb b/ext/tk/lib/tkextlib/tkimg/ppm.rb
deleted file mode 100644
index eacfae467d..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/ppm.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/ps.rb b/ext/tk/lib/tkextlib/tkimg/ps.rb
deleted file mode 100644
index 68e9178ac0..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/ps.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/setup.rb b/ext/tk/lib/tkextlib/tkimg/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/sgi.rb b/ext/tk/lib/tkextlib/tkimg/sgi.rb
deleted file mode 100644
index ec7038bf0e..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/sgi.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/sun.rb b/ext/tk/lib/tkextlib/tkimg/sun.rb
deleted file mode 100644
index 651f946497..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/sun.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/tga.rb b/ext/tk/lib/tkextlib/tkimg/tga.rb
deleted file mode 100644
index 1eae407c0a..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/tga.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/tiff.rb b/ext/tk/lib/tkextlib/tkimg/tiff.rb
deleted file mode 100644
index ed271c2600..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/tiff.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/window.rb b/ext/tk/lib/tkextlib/tkimg/window.rb
deleted file mode 100644
index 3b5906fab6..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/window.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/xbm.rb b/ext/tk/lib/tkextlib/tkimg/xbm.rb
deleted file mode 100644
index f4bea030be..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/xbm.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tkimg/xpm.rb b/ext/tk/lib/tkextlib/tkimg/xpm.rb
deleted file mode 100644
index 5119c8710b..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/xpm.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tktable.rb b/ext/tk/lib/tkextlib/tktable.rb
deleted file mode 100644
index 385eb13497..0000000000
--- a/ext/tk/lib/tkextlib/tktable.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tktable/setup.rb b/ext/tk/lib/tkextlib/tktable/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/tktable/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tktable/tktable.rb b/ext/tk/lib/tkextlib/tktable/tktable.rb
deleted file mode 100644
index f6cf24b40f..0000000000
--- a/ext/tk/lib/tkextlib/tktable/tktable.rb
+++ /dev/null
@@ -1,957 +0,0 @@
-#
-#  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_cget_strict(tagOrId, option)
-    itemcget_strict(['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_cget_strict(tagOrId, option)
-    itemcget_strict(['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, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-#####################################################
-
-class Tk::TkTable::CellTag
-  include TkTreatTagFont
-
-  CellTagID_TBL = TkCore::INTERP.create_table
-
-  (CellTag_ID = ['tktbl:celltag'.freeze, '00000'.taint]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    CellTagID_TBL.mutex.synchronize{ CellTagID_TBL.clear }
-  }
-
-  def self.id2obj(table, id)
-    tpath = table.path
-    CellTagID_TBL.mutex.synchronize{
-      if CellTagID_TBL[tpath]
-        CellTagID_TBL[tpath][id]? CellTagID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys=nil)
-    @parent = @t = parent
-    @tpath - parent.path
-    CellTag_ID.mutex.synchronize{
-      @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
-      CellTag_ID[1].succ!
-    }
-    CellTagID_TBL.mutex.synchronize{
-      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-      CellTagID_TBL[@tpath][@id] = self
-    }
-    configure(keys) if keys
-  end
-
-  def id
-    @id
-  end
-
-  def destroy
-    tk_call(@tpath, 'tag', 'delete', @id)
-    CellTagID_TBL.mutex.synchronize{
-      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 cget_strict(key)
-    @t.tag_cget_strict(@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)
-    obj = nil
-    CellTagID_TBL.mutex.synchronize{
-      if CellTagID_TBL[parent.path] && CellTagID_TBL[parent.path][name]
-        obj = CellTagID_TBL[parent.path][name]
-      else
-        #super(parent, name, keys)
-        (obj = self.allocate).instance_eval{
-          @parent = @t = parent
-          @tpath = parent.path
-          @path = @id = name
-          CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-          CellTagID_TBL[@tpath][@id] = self
-        }
-      end
-    }
-    obj.configure(keys) if keys && ! keys.empty?
-    obj
-  end
-
-  def initialize(parent, name, keys=nil)
-    # dummy:: not called by 'new' method
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = name
-    CellTagID_TBL.mutex.synchronize{
-      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-      CellTagID_TBL[@tpath][@id] = self
-    }
-    configure(keys) if keys && ! keys.empty?
-  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.mutex.synchronize{
-      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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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)
-    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
-      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))
-    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
-      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/ext/tk/lib/tkextlib/tktrans.rb b/ext/tk/lib/tkextlib/tktrans.rb
deleted file mode 100644
index c5de5be5e6..0000000000
--- a/ext/tk/lib/tkextlib/tktrans.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tktrans/setup.rb b/ext/tk/lib/tkextlib/tktrans/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/tktrans/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/tktrans/tktrans.rb b/ext/tk/lib/tkextlib/tktrans/tktrans.rb
deleted file mode 100644
index e051c09211..0000000000
--- a/ext/tk/lib/tkextlib/tktrans/tktrans.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#  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 Tk::Root
-  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 Tk::Toplevel
-  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/ext/tk/lib/tkextlib/treectrl.rb b/ext/tk/lib/tkextlib/treectrl.rb
deleted file mode 100644
index 1944fb83e3..0000000000
--- a/ext/tk/lib/tkextlib/treectrl.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/treectrl/setup.rb b/ext/tk/lib/tkextlib/treectrl/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/treectrl/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
deleted file mode 100644
index e10e6e299e..0000000000
--- a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
+++ /dev/null
@@ -1,2461 +0,0 @@
-#
-#  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
-  ]
-
-=begin
-  # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-  KEY_TBL.map!{|inf|
-    if inf.kind_of?(Array)
-      inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-      inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-    end
-    inf
-  }
-
-  PROC_TBL.map!{|inf|
-    if inf.kind_of?(Array)
-      inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-    end
-    inf
-  }
-=end
-
-  # 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_cget_strict(tagOrId, option)
-    itemcget_strict(['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_dragcget_strict(option)
-    itemcget_strict(['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_cget_strict(option)
-    itemcget_strict('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_cget_strict(option)
-    itemcget_strict('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_cget_strict(tagOrId, option)
-    itemcget_strict(['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_cget_strict(tagOrId, option)
-    itemcget_strict(['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_cget_strict(item, column, elem, option)
-    itemcget_strict([['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_cget_strict(option)
-    itemcget_strict('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}>"
-    # "notify" doesn't have cget subcommand.
-    current_itemconfiginfo(['notify', [win, pattern]])[option.to_s]
-  end
-  def notify_cget_strict(win, pattern, option)
-    pattern = "<#{pattern}>"
-    # "notify" doesn't have cget subcommand.
-    info = current_itemconfiginfo(['notify', [win, pattern]])
-    option = option.to_s
-    unless info.has_key?(option)
-      fail RuntimeError, "unknown option \"#{option}\""
-    else
-      info[option]
-    end
-  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
-  def current_notify_configinfo(tagOrId, slot=nil)
-    pattern = "<#{pattern}>"
-    current_itemconfiginfo(['notify', [win, pattern]], slot)
-  end
-
-  def style_cget(tagOrId, option)
-    itemcget(['style', tagOrId], option)
-  end
-  def style_cget_strict(tagOrId, option)
-    itemcget_strict(['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, :itemcget_strict
-  private :itemconfigure, :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.mutex.synchronize{
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.delete(@path)
-    }
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.delete(@path)
-    }
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.delete(@path)
-    }
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      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)
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      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)
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      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)}
-    # table is already locked
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].delete(item)
-  end
-  private :_erase_children
-
-  def item_delete(first, last=None)
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      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)
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath]
-        Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id]? \
-                   Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys={})
-    @tree = parent
-    @tpath = parent.path
-
-    keys = _symbolkey2str(keys)
-
-    Tk::TreeCtrl::Column::TreeCtrlColumnID.mutex.synchronize{
-      @path = @id = 
-        keys.delete('tag') ||
-        Tk::TreeCtrl::Column::TreeCtrlColumnID.join(TkCore::INTERP._ip_id_)
-      Tk::TreeCtrl::Column::TreeCtrlColumnID[1].succ!
-    }
-
-    keys['tag'] = @id
-
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] ||= {} 
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath][@id] = self
-    }
-
-    @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 cget_strict(opt)
-    @tree.column_cget_strict(@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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-  TreeCtrlElemTypeToClass = {}
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.clear
-    }
-  }
-
-  def self.type2class(type)
-    TreeCtrlElemTypeToClass[type] || type
-  end
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath]
-        Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id]? \
-                 Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, type, keys=nil)
-    @tree = parent
-    @tpath = parent.path
-    @type = type.to_s
-    Tk::TreeCtrl::Element::TreeCtrlElementID.mutex.synchronize{
-      @path = @id = 
-        Tk::TreeCtrl::Element::TreeCtrlElementID.join(TkCore::INTERP._ip_id_)
-      Tk::TreeCtrl::Element::TreeCtrlElementID[1].succ!
-    }
-
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] ||= {} 
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath][@id] = self
-    }
-
-    @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 cget_strict(opt)
-    @tree.element_cget_strict(@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.mutex.synchronize{
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath]
-        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id]? \
-                        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys={})
-    @tree = parent
-    @tpath = parent.path
-    @path = @id = @tree.item_create(keys)
-
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] ||= {} 
-      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 cget_strict(opt)
-    @tree.item_cget_strict(@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_cget_strict(opt)
-    @tree.item_element_cget_strict(@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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath]
-        Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id]? \
-                     Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys=nil)
-    @tree = parent
-    @tpath = parent.path
-
-    Tk::TreeCtrl::Style::TreeCtrlStyleID.mutex.synchronize{
-      @path = @id = 
-        Tk::TreeCtrl::Style::TreeCtrlStyleID.join(TkCore::INTERP._ip_id_)
-      Tk::TreeCtrl::Style::TreeCtrlStyleID[1].succ!
-    }
-
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] ||= {} 
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath][@id] = self
-    }
-
-    @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 cget_strict(opt)
-    @tree.style_cget_strict(@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/ext/tk/lib/tkextlib/trofs.rb b/ext/tk/lib/tkextlib/trofs.rb
deleted file mode 100644
index 5914e5165f..0000000000
--- a/ext/tk/lib/tkextlib/trofs.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/trofs/setup.rb b/ext/tk/lib/tkextlib/trofs/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/trofs/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/trofs/trofs.rb b/ext/tk/lib/tkextlib/trofs/trofs.rb
deleted file mode 100644
index 7a2606a275..0000000000
--- a/ext/tk/lib/tkextlib/trofs/trofs.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/version.rb b/ext/tk/lib/tkextlib/version.rb
deleted file mode 100644
index 434ed11a2e..0000000000
--- a/ext/tk/lib/tkextlib/version.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# release date of tkextlib
-#
-module Tk
-  Tkextlib_RELEASE_DATE = '2008-05-23'.freeze
-end
diff --git a/ext/tk/lib/tkextlib/vu.rb b/ext/tk/lib/tkextlib/vu.rb
deleted file mode 100644
index d2234eb2a8..0000000000
--- a/ext/tk/lib/tkextlib/vu.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/vu/bargraph.rb b/ext/tk/lib/tkextlib/vu/bargraph.rb
deleted file mode 100644
index 27ff3c7cd0..0000000000
--- a/ext/tk/lib/tkextlib/vu/bargraph.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#  ::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/ext/tk/lib/tkextlib/vu/charts.rb b/ext/tk/lib/tkextlib/vu/charts.rb
deleted file mode 100644
index ee4298fa1c..0000000000
--- a/ext/tk/lib/tkextlib/vu/charts.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/vu/dial.rb b/ext/tk/lib/tkextlib/vu/dial.rb
deleted file mode 100644
index e27a38ae42..0000000000
--- a/ext/tk/lib/tkextlib/vu/dial.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-#  ::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/ext/tk/lib/tkextlib/vu/pie.rb b/ext/tk/lib/tkextlib/vu/pie.rb
deleted file mode 100644
index c1fb6857bf..0000000000
--- a/ext/tk/lib/tkextlib/vu/pie.rb
+++ /dev/null
@@ -1,282 +0,0 @@
-#
-#  ::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]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    SliceID_TBL.mutex.synchronize{ SliceID_TBL.clear }
-  }
-
-  def self.id2obj(pie, id)
-    pie_path = pie.path
-    SliceID_TBL.mutex.synchronize{
-      if SliceID_TBL[pie_path]
-        SliceID_TBL[pie_path][id]? SliceID_TBL[pie_path][id]: id
-      else
-        id
-      end
-    }
-  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
-    Pie_Slice_ID.mutex.synchronize{
-      @path = @id = Pie_Slice_ID.join(TkCore::INTERP._ip_id_)
-      Pie_Slice_ID[1].succ!
-    }
-    SliceID_TBL.mutex.synchronize{
-      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
-
-  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 cget_strict(slot)
-    @pie.itemcget_strict(@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)
-    obj = nil
-    SliceID_TBL.mutex.synchronize{
-      if SliceID_TBL[parent.path] && SliceID_TBL[parent.path][name]
-        obj = SliceID_TBL[parent.path][name]
-      else
-        #super(parent, name, *args)
-        unless parent.kind_of?(Tk::Vu::Pie)
-          fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
-        end
-        obj = self.allocate
-        obj.instance_eval{
-          @parent = @pie = parent
-          @ppath = parent.path
-          @path = @id = name.to_s
-          SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
-          SliceID_TBL[@ppath][@id] = self
-        }
-      end
-    }
-    obj.instance_eval{
-      if args[-1].kind_of?(Hash)
-        keys = args.unshift
-      end
-      @pie.set(@id, *args)
-      configure(keys)
-    }
-
-    obj
-  end
-
-  def initialize(parent, name, *args)
-    # dummy:: not called by 'new' method
-    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.mutex.synchronize{
-      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/ext/tk/lib/tkextlib/vu/setup.rb b/ext/tk/lib/tkextlib/vu/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/vu/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/vu/spinbox.rb b/ext/tk/lib/tkextlib/vu/spinbox.rb
deleted file mode 100644
index a7e40ea319..0000000000
--- a/ext/tk/lib/tkextlib/vu/spinbox.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-#  ::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 = Tk::Spinbox
-  end
-end
diff --git a/ext/tk/lib/tkextlib/winico.rb b/ext/tk/lib/tkextlib/winico.rb
deleted file mode 100644
index ce7b8eac5c..0000000000
--- a/ext/tk/lib/tkextlib/winico.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/winico/setup.rb b/ext/tk/lib/tkextlib/winico/setup.rb
deleted file mode 100644
index ce0f0bd4d4..0000000000
--- a/ext/tk/lib/tkextlib/winico/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/ext/tk/lib/tkextlib/winico/winico.rb b/ext/tk/lib/tkextlib/winico/winico.rb
deleted file mode 100644
index 00316fd441..0000000000
--- a/ext/tk/lib/tkextlib/winico/winico.rb
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-#  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.mutex.synchronize{ WinicoID_TBL.clear }
-  }
-
-  def self.id2obj(id)
-    WinicoID_TBL.mutex.synchronize{
-      (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.mutex.synchronize{
-      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.mutex.synchronize{
-      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| 
-            Tk::Winico::WinicoID_TBL.mutex.synchronize{
-              if Tk::Winico::WinicoID_TBL.key?(id)
-                obj = Tk::Winico::WinicoID_TBL[id]
-              else
-                # Tk::Winico.new(nil, nil, id)
-                obj = Tk::Winico.allocate
-                obj.instance_eval{ @path = @id = id }
-                Tk::Winico::WinicoID_TBL[id] = obj
-              end
-              obj
-            }
-          } ], 
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _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(' '))
-        keys[k] = Winico_callback.new(cmd, *args)
-       # 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(' '))
-        keys[k] = Winico_callback.new(cmd, *args)
-      # 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/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb
index 38a96633de..ff7bbc74e4 100644
--- a/ext/tk/lib/tkfont.rb
+++ b/ext/tk/lib/tkfont.rb
@@ -1,4 +1,1390 @@
 #
-#   tkfont.rb - load tk/font.rb
+#  tkfont.rb - the class to treat fonts on Ruby/Tk
 #
-require 'tk/font'
+#                               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
+  }
+
+  # 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)')
+	  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)')
+	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
+      rescue
+	ltn = 'Helvetica'
+	knj = 'mincho'
+      end
+
+      knj = ltn
+    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
+      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=None)
+      @compound.__send__(@type + '_configure', slot, value)
+    end
+
+    def method_missing(id, *args)
+      @compound.__send__(@type + '_' + id.id2name, *args)
+    end
+  end
+
+
+  ###################################
+  # class methods
+  ###################################
+  def TkFont.families(window=nil)
+    case (Tk::TK_VERSION)
+    when /^4\.*/
+      ['fixed']
+
+    when /^8\.*/
+      if window
+	tk_split_simplelist(tk_call('font', 'families', '-displayof', window))
+      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
+    keys = {}
+    font.configinfo.each{|key,value| keys[key] = value }
+    TkFont.new(font.latin_font_id, font.kanji_font_id, keys)
+  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(path, *args)
+    case (Tk::TK_VERSION)
+    when /^4\.*/
+      conf = tk_split_simplelist(tk_call(*args)).
+	find_all{|prop| prop[0..5]=='-font ' || prop[0..10]=='-kanjifont '}.
+	collect{|prop| tk_split_simplelist(prop)}
+      if font_inf = conf.assoc('-font')
+	ltn = font_inf[4]
+	ltn = nil if ltn == []
+      else 
+	#ltn = nil
+	raise RuntimeError, "unknown option '-font'"
+      end
+      if font_inf = conf.assoc('-kanjifont')
+	knj = font_inf[4]
+	knj = nil if knj == []
+      else
+	knj = nil
+      end
+      TkFont.new(ltn, knj).call_font_configure(path, *(args + [{}]))
+
+    when /^8\.*/
+      font_prop = tk_split_simplelist(tk_call(*args)).find{|prop| 
+	prop[0..5] == '-font '
+      }
+      unless font_prop
+	raise RuntimeError, "unknown option '-font'"
+      end
+      fnt = tk_split_simplelist(font_prop)[4]
+      if fnt == ""
+	TkFont.new(nil, nil).call_font_configure(path, *(args + [{}]))
+      else
+	begin
+	  compound = tk_split_simplelist(
+            Hash[*tk_split_simplelist(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 + [{}]))
+	  TkFont.new(fnt).call_font_configure(path, *(args + [{}]))
+	else
+	  TkFont.new(compound[0], compound[1]) \
+	  .call_font_configure(path, *(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 initialize(ltn=nil, knj=nil, keys=nil)
+    @id = Tk_FontID.join
+    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
+      knj = ltn if JAPANIZED_TK && !knj
+    else
+      ltn = DEFAULT_LATIN_FONT_NAME
+      knj = DEFAULT_KANJI_FONT_NAME if JAPANIZED_TK && !knj
+    end
+
+    create_compoundfont(ltn, knj, keys)
+  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)
+    create_latinfont(ltn)
+    create_kanjifont(knj)
+
+    @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
+	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
+
+      @fontslot = {'font'=>@compoundfont}
+      tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+    end
+  end
+
+  def actual_core_tk4x(font, window=nil, option=nil)
+    # dummy
+    if option
+      ""
+    else
+      [['family',[]], ['size',[]], ['weight',[]], ['slant',[]], 
+	['underline',[]], ['overstrike',[]], ['charset',[]], 
+	['pointadjust',[]]]
+    end
+  end
+
+  def actual_core_tk8x(font, window=nil, option=nil)
+    if option == 'compound'
+      ""
+    elsif option
+      if window
+	tk_call('font', 'actual', font, "-displayof", window, "-#{option}")
+      else
+	tk_call('font', 'actual', font, "-#{option}")
+      end
+    else
+      l = tk_split_simplelist(if window
+			 	 tk_call('font', 'actual', font, 
+					             "-displayof", window)
+			      else
+			  	 tk_call('font', 'actual', font)
+			      end)
+      r = []
+      while key=l.shift
+	if key == '-compound'
+	  l.shift
+	else
+	  r.push [key[1..-1], l.shift]
+	end
+      end
+      r
+    end
+  end
+
+  def configure_core_tk4x(font, slot, value=None)
+    #""
+    self
+  end
+
+  def configinfo_core_tk4x(font, option=nil)
+    # dummy
+    if option
+      ""
+    else
+      [['family',[]], ['size',[]], ['weight',[]], ['slant',[]], 
+	['underline',[]], ['overstrike',[]], ['charset',[]], 
+	['pointadjust',[]]]
+    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 option == 'compound'
+      ""
+    elsif option
+      tk_call('font', 'configure', font, "-#{option}")
+    else
+      l = tk_split_simplelist(tk_call('font', 'configure', font))
+      r = []
+      while key=l.shift
+	if key == '-compound'
+	  l.shift
+	else
+	  r.push [key[1..-1], l.shift]
+	end
+      end
+      r
+    end
+  end
+
+  def delete_core_tk4x
+    Tk_FontNameTBL.delete(@id)
+    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
+    Tk_FontNameTBL.delete(@id)
+    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
+    Tk_FontUseTBL.dup.each{|w, fobj|
+      if self == fobj
+	begin
+	  if w.include?(';')
+	    win, tag = w.split(';')
+	    winobj = tk_tcl2ruby(win)
+#	    winobj.tagfont_configure(tag, {'font'=>@latinfont})
+	    if winobj.kind_of? TkText
+	      tk_call(win, 'tag', 'configure', tag, '-font', @latinfont)
+	    elsif winobj.kind_of? TkCanvas
+	      tk_call(win, 'itemconfigure', tag, '-font', @latinfont)
+	    elsif winobj.kind_of? TkMenu
+	      tk_call(win, 'entryconfigure', tag, '-font', @latinfont)
+	    else
+	      raise RuntimeError, "unknown widget type"
+	    end
+	  else
+#	    tk_tcl2ruby(w).font_configure('font'=>@latinfont)
+	    tk_call(w, 'configure', '-font', @latinfont)
+	  end
+	rescue
+	  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
+    Tk_FontUseTBL.dup.each{|w, fobj|
+      if self == fobj
+	begin
+	  if w.include?(';')
+	    win, tag = w.split(';')
+	    winobj = tk_tcl2ruby(win)
+#	    winobj.tagfont_configure(tag, {'kanjifont'=>@kanjifont})
+	    if winobj.kind_of? TkText
+	      tk_call(win, 'tag', 'configure', tag, '-kanjifont', @kanjifont)
+	    elsif winobj.kind_of? TkCanvas
+	      tk_call(win, 'itemconfigure', tag, '-kanjifont', @kanjifont)
+	    elsif winobj.kind_of? TkMenu
+	      tk_call(win, 'entryconfigure', tag, '-kanjifont', @latinfont)
+	    else
+	      raise RuntimeError, "unknown widget type"
+	    end
+	  else
+#	    tk_tcl2ruby(w).font_configure('kanjifont'=>@kanjifont)
+	    tk_call(w, 'configure', '-kanjifont', @kanjifont)
+	  end
+	rescue
+	  Tk_FontUseTBL.delete(w)
+	end
+      end
+    }
+    self
+  end
+
+  def latin_replace_core_tk8x(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 = 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)
+    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 = 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(window, text)
+    0
+  end
+
+  def measure_core_tk8x(window, text)
+    if window
+      number(tk_call('font', 'measure', @compoundfont, 
+		     '-displayof', window, text))
+    else
+      number(tk_call('font', 'measure', @compoundfont, text))
+    end
+  end
+
+  def metrics_core_tk4x(font, window, option=nil)
+    # dummy
+    if option
+      ""
+    else
+      [['ascent',[]], ['descent',[]], ['linespace',[]], ['fixed',[]]]
+    end
+  end
+
+  def metrics_core_tk8x(font, window, option=nil)
+    if option
+      if window
+	number(tk_call('font', 'metrics', font, 
+		       "-displayof", window, "-#{option}"))
+      else
+	number(tk_call('font', 'metrics', font, "-#{option}"))
+      end
+    else
+      l = tk_split_list(if window
+			  tk_call('font','metrics',font,"-displayof",window)
+			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 create_latinfont    create_latinfont_tk4x
+    alias create_kanjifont    create_kanjifont_tk4x
+    alias create_compoundfont create_compoundfont_tk4x
+    alias actual_core         actual_core_tk4x
+    alias configure_core      configure_core_tk4x
+    alias configinfo_core     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-4]/
+    alias create_latinfont    create_latinfont_tk8x
+    alias create_kanjifont    create_kanjifont_tk8x
+    alias create_compoundfont create_compoundfont_tk8x
+    alias actual_core         actual_core_tk8x
+    alias configure_core      configure_core_tk8x
+    alias configinfo_core     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
+
+  when /^8\.*/
+    alias create_latinfont    create_latinfont_tk8x
+    alias create_kanjifont    create_kanjifont_tk8x
+    alias create_compoundfont create_compoundfont_tk8x
+    alias actual_core         actual_core_tk8x
+    alias configure_core      configure_core_tk8x
+    alias configinfo_core     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
+
+  ###################################
+  public
+  ###################################
+  def method_missing(id, *args)
+    name = id.id2name
+    case args.length
+    when 1
+      configure name, args[0]
+    when 0
+      begin
+	configinfo name
+      rescue
+	fail NameError, "undefined local variable or method `#{name}' for #{self.to_s}", error_at
+      end
+    else
+      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
+    end
+  end
+
+  def call_font_configure(path, *args)
+    args += hash_kv(args.pop.update(@fontslot))
+    tk_call(*args)
+    Tk_FontUseTBL[path] = self
+    self
+  end
+
+  def used
+    ret = []
+    Tk_FontUseTBL.each{|key,value|
+      if key.include?(';')
+	win, tag = key.split(';')
+	winobj = tk_tcl2ruby(win)
+	if winobj.kind_of? TkText
+	  ret.push([winobj, winobj.tagid2obj(tag)])
+	elsif winobj.kind_of? TkCanvas
+	  if (tagobj = TkcTag.id2obj(winobj, tag)).kind_of? TkcTag
+	    ret.push([winobj, tagobj])
+	  elsif (tagobj = TkcItem.id2obj(tag)).kind_of? TkcItem
+	    ret.push([winobj, tagobj])
+	  else
+	    ret.push([winobj, tag])
+	  end
+	elsif winobj.kind_of? TkMenu
+	  ret.push([winobj, tag])
+	else
+	  ret.push([win, tag])
+	end
+      else
+	ret.push(tk_tcl2ruby(key)) if value == self
+      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(window, option=nil)
+    window = '.' unless window
+    actual_core(@compoundfont, window, option)
+  end
+
+  def latin_actual(option=nil)
+    actual_core(@latinfont, nil, option)
+  end
+
+  def latin_actual_displayof(window, option=nil)
+    window = '.' unless window
+    actual_core(@latinfont, window, 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(window, option=nil)
+    #if JAPANIZED_TK
+    if @kanjifont != ""
+      window = '.' unless window
+      actual_core(@kanjifont, window, option)
+    else
+      actual_core_tk4x(nil, window, option)
+    end
+  end
+
+  def [](slot)
+    configinfo slot
+  end
+
+  def []=(slot, val)
+    configure slot, val
+  end
+
+  def configure(slot, value=None)
+    configure_core(@compoundfont, slot, value)
+    self
+  end
+
+  def configinfo(slot=nil)
+    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)
+    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(nil, text)
+  end
+
+  def measure_displayof(window, text)
+    window = '.' unless window
+    measure_core(window, text)
+  end
+
+  def metrics(option=nil)
+    metrics_core(@compoundfont, nil, option)
+  end
+
+  def metrics_displayof(window, option=nil)
+    window = '.' unless window
+    metrics_core(@compoundfont, window, option)
+  end
+
+  def latin_metrics(option=nil)
+    metrics_core(@latinfont, nil, option)
+  end
+
+  def latin_metrics_displayof(window, option=nil)
+    window = '.' unless window
+    metrics_core(@latinfont, window, 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(window, option=nil)
+    if JAPANIZED_TK
+      window = '.' unless window
+      metrics_core(@kanjifont, window, option)
+    else
+      metrics_core_tk4x(nil, window, 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
+
+  ###################################
+  # 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
+
+  ###################################
+  def dup
+    src = self
+    obj = super()
+    obj.instance_eval{ initialize(src) }
+    obj
+  end
+  def clone
+    src = self
+    obj = super()
+    obj.instance_eval{ initialize(src) }
+    obj
+  end
+end
+
+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(window, wintag=nil)
+    @parent.tagfont_copy(@id, window, wintag)
+    self
+  end
+
+  def latinfont_copy(window, wintag=nil)
+    @parent.latintagfont_copy(@id, window, wintag)
+    self
+  end
+  alias asciifont_copy latinfont_copy
+
+  def kanjifont_copy(window, wintag=nil)
+    @parent.kanjitagfont_copy(@id, window, wintag)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkmacpkg.rb b/ext/tk/lib/tkmacpkg.rb
index 35560e78ce..3bac5e6c3e 100644
--- a/ext/tk/lib/tkmacpkg.rb
+++ b/ext/tk/lib/tkmacpkg.rb
@@ -1,4 +1,56 @@
 #
-#   tkmacpkg.rb - load tk/macpkg.rb
+#   tkmacpkg.rb : methods for Tcl/Tk packages for Macintosh
+#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk/macpkg'
+#     ATTENTION !!
+#         This is NOT TESTED. Because I have no test-environment.
+#
+#
+require 'tk'
+
+module TkMacResource
+  extend Tk
+  extend TkMacResource
+
+  TkCommandNames = ['resource'.freeze].freeze
+
+  tk_call('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/ext/tk/lib/tkmenubar.rb b/ext/tk/lib/tkmenubar.rb
index 70214fda1a..0d29571eb7 100644
--- a/ext/tk/lib/tkmenubar.rb
+++ b/ext/tk/lib/tkmenubar.rb
@@ -1,4 +1,143 @@
 #
-#   tkmenubar.rb - load tk/menubar.rb
+# tkmenubar.rb
 #
-require 'tk/menubar'
+# 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')
+
+# The format of the menu_spec is:
+# [
+#   [
+#     [button text, underline, accelerator],
+#     [menu label, command, underline, accelerator],
+#     '---', # separator
+#     ...
+#   ],
+#   ...
+# ]
+
+# underline and accelerator are optional parameters.
+# Hashes are OK instead of Arrays.
+
+# 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"
+
+class TkMenubar<TkFrame
+  
+  include TkComposite
+  
+  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 = []
+    
+    if spec
+      for menu_info in spec
+	add_menu(menu_info)
+      end
+    end
+    
+    if options
+      for key, value in options
+	configure(key, value)
+      end
+    end
+  end
+
+  def add_menu(menu_info)
+    btn_info = menu_info.shift
+    mbtn = TkMenubutton.new(@frame)
+    
+    if btn_info.kind_of?(Hash)
+      for key, value in btn_info
+	mbtn.configure(key, value)
+      end
+    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]
+    else
+      mbtn.configure('text', btn_info)
+    end
+    
+    menu = TkMenu.new(mbtn)
+    
+    for item_info in menu_info
+      if item_info.kind_of?(Hash)
+	menu.add('command', item_info)
+      elsif item_info.kind_of?(Array)
+	options = {}
+	options['label'] = item_info[0] if item_info[0]
+	options['command'] = item_info[1] if item_info[1]
+	options['underline'] = item_info[2] if item_info[2]
+	options['accelerator'] = item_info[3] if item_info[3]
+	menu.add('command', options)
+      elsif /^-+$/ =~ item_info
+	menu.add('sep')
+      else
+	menu.add('command', 'label' => item_info)
+      end
+    end
+    
+    mbtn.menu(menu)
+    @menus.push([mbtn, menu])
+    delegate('tearoff', menu)
+    delegate('foreground', mbtn, menu)
+    delegate('background', mbtn, menu)
+    delegate('disabledforeground', mbtn, menu)
+    delegate('activeforeground', mbtn, menu)
+    delegate('activebackground', mbtn, menu)
+    delegate('font', mbtn, menu)
+    delegate('kanjifont', mbtn, menu)
+    mbtn.pack('side' => 'left')
+  end
+  
+  def [](index)
+    return @menus[index]
+  end
+end
diff --git a/ext/tk/lib/tkmngfocus.rb b/ext/tk/lib/tkmngfocus.rb
index fe70950e8e..461525009f 100644
--- a/ext/tk/lib/tkmngfocus.rb
+++ b/ext/tk/lib/tkmngfocus.rb
@@ -1,4 +1,33 @@
 #
-#   tkmngfocus.rb - load tk/mngfocus.rb
+#   tkmngfocus.rb : methods for Tcl/Tk standard library 'focus.tcl'
+#                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk/mngfocus'
+require 'tk'
+
+module TkManageFocus
+  extend Tk
+
+  TkCommandNames = [
+    'tk_focusFollowMouse'.freeze, 
+    'tk_focusNext'.freeze, 
+    'tk_focusPrev'.freeze
+  ].freeze
+
+  def TkManageFocus.followsMouse
+    tk_call 'tk_focusFollowsMouse'
+  end
+
+  def TkManageFocus.next(window)
+    tk_tcl2ruby(tk_call('tk_focusNext', window))
+  end
+  def focusNext
+    TkManageFocus.next(self)
+  end
+
+  def TkManageFocus.prev(window)
+    tk_tcl2ruby(tk_call('tk_focusPrev', window))
+  end
+  def focusPrev
+    TkManageFocus.prev(self)
+  end
+end
diff --git a/ext/tk/lib/tkpalette.rb b/ext/tk/lib/tkpalette.rb
index 56b203bbb9..dc2fd47e5c 100644
--- a/ext/tk/lib/tkpalette.rb
+++ b/ext/tk/lib/tkpalette.rb
@@ -1,4 +1,54 @@
 #
-#   tkpalette.rb - load tk/palette.rb
+#   tkpalette.rb : methods for Tcl/Tk standard library 'palette.tcl'
+#                     1998/06/21 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk/palette'
+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(window, colors)
+    if not colors.kind_of?(Hash)
+      fail "2nd arg need to be Hash"
+    end
+
+    colors.each{|key, value|
+      begin
+	if window.cget(key) == tk_call('set', "tkPalette(#{key})")
+	  window[key] = colors[key]
+	end
+      rescue
+	# ignore
+      end
+    }
+
+    TkWinfo.children(window).each{|w| TkPalette.recolorTree(w, colors)}
+  end
+
+  def recolorTree(colors)
+    TkPalette.recolorTree(self, colors)
+  end
+end
diff --git a/ext/tk/lib/tkscrollbox.rb b/ext/tk/lib/tkscrollbox.rb
index 6093b2e4e7..3f1191c740 100644
--- a/ext/tk/lib/tkscrollbox.rb
+++ b/ext/tk/lib/tkscrollbox.rb
@@ -1,4 +1,30 @@
 #
-#   tkscrollbox.rb - load tk/scrollbox.rb
-#
-require 'tk/scrollbox'
+#		tkscrollbox.rb - Tk Listbox with Scrollbar
+#                                 as an example of Composite Widget
+#			$Date$
+#			by Yukihiro Matsumoto <matz@netlab.co.jp>
+
+require 'tk.rb'
+
+class TkScrollbox<TkListbox
+  include TkComposite
+  def initialize_composite(keys=nil)
+    list = TkListbox.new(@frame)
+    scroll = TkScrollbar.new(@frame)
+    @path = list.path
+
+    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'
+
+    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/ext/tk/lib/tktext.rb b/ext/tk/lib/tktext.rb
index 97ad62a3ea..44dc6cc3b8 100644
--- a/ext/tk/lib/tktext.rb
+++ b/ext/tk/lib/tktext.rb
@@ -1,4 +1,1302 @@
 #
-#   tktext.rb - load tk/text.rb
-#
-require 'tk/text'
+#		tktext.rb - Tk text classes
+#			$Date$
+#			by Yukihiro Matsumoto <matz@caelum.co.jp>
+
+require 'tk.rb'
+require 'tkfont'
+
+module TkTreatTextTagFont
+  include TkTreatItemFont
+
+  ItemCMD = ['tag'.freeze, 'configure'.freeze].freeze
+  def __conf_cmd(idx)
+    ItemCMD[idx]
+  end
+
+  def __item_pathname(tagOrId)
+    if tagOrId.kind_of?(TkTextTag)
+      self.path + ';' + tagOrId.id
+    else
+      self.path + ';' + tagOrId
+    end
+  end
+
+  private :__conf_cmd, :__item_pathname
+end
+
+class TkText<TkTextWin
+  ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
+  include TkTreatTextTagFont
+  include Scrollable
+
+  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__
+    TTagID_TBL.delete(@path)
+    TMarkID_TBL.delete(@path)
+  end
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'text', @path, *hash_kv(keys)
+    else
+      tk_call 'text', @path
+    end
+    init_instance_variable
+  end
+  private :create_self
+
+  def index(index)
+    tk_send 'index', index
+  end
+
+  def value
+    tk_send 'get', "1.0", "end - 1 char"
+  end
+
+  def value= (val)
+    tk_send 'delete', "1.0", 'end'
+    tk_send 'insert', "1.0", val
+  end
+
+  def _addcmd(cmd)
+    @cmdtbl.push cmd
+  end
+
+  def _addtag(name, obj)
+    @tags[name] = obj
+  end
+
+  def tagid2obj(tagid)
+    if @tags[tagid]
+      @tags[tagid]
+    else
+      tagid
+    end
+  end
+
+  def tag_names(index=None)
+    tk_split_simplelist(tk_send('tag', 'names', index)).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def mark_names
+    tk_split_simplelist(tk_send('mark', 'names')).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def mark_gravity(mark, direction=nil)
+    if direction
+      tk_send 'mark', 'gravity', mark, direction
+      self
+    else
+      tk_send 'mark', 'gravity', mark
+    end
+  end
+
+  def mark_set(mark, index)
+    tk_send 'mark', 'set', mark, index
+    self
+  end
+  alias set_mark mark_set
+
+  def mark_unset(*marks)
+    tk_send 'mark', 'unset', *marks
+    self
+  end
+  alias unset_mark mark_unset
+
+  def mark_next(index)
+    tagid2obj(tk_send('mark', 'next', index))
+  end
+  alias next_mark mark_next
+
+  def mark_previous(index)
+    tagid2obj(tk_send('mark', 'previous', index))
+  end
+  alias previous_mark mark_previous
+
+  def image_cget(index, slot)
+    case slot.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      tk_send('image', 'cget', index, "-#{slot}")
+    else
+      tk_tcl2ruby(tk_send('image', 'cget', index, "-#{slot}"))
+    end
+  end
+
+  def image_configure(index, slot, value=None)
+    if slot.kind_of? Hash
+      tk_send('image', 'configure', index, *hash_kv(slot))
+    else
+      tk_send('image', 'configure', index, "-#{slot}", value)
+    end
+    self
+  end
+
+  def image_configinfo(index, slot = nil)
+    if slot
+      case slot.to_s
+      when 'text', 'label', 'show', 'data', 'file'
+	conf = tk_split_simplelist(tk_send('image', 'configure', 
+					   index, "-#{slot}"))
+      else
+	conf = tk_split_list(tk_send('image', 'configure', 
+				     index, "-#{slot}"))
+      end
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_simplelist(tk_send('image', 'configure', 
+				  index)).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
+      }
+    end
+  end
+
+  def image_names
+    tk_split_simplelist(tk_send('image', 'names')).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def set_insert(index)
+    tk_send 'mark', 'set', 'insert', index
+    self
+  end
+
+  def set_current(index)
+    tk_send 'mark', 'set', 'current', index
+    self
+  end
+
+  def insert(index, chars, *tags)
+    if tags[0].kind_of? Array
+      # multiple chars-taglist argument
+      args = [chars]
+      while tags.size > 0
+	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
+      super index, chars, tags.collect{|x|_get_eval_string(x)}.join(' ')
+    end
+  end
+
+  def destroy
+    @tags = {} unless @tags
+    @tags.each_value do |t|
+      t.destroy
+    end
+    super
+  end
+
+  def backspace
+    self.delete 'insert'
+  end
+
+  def compare(idx1, op, idx2)
+    bool(tk_send('compare', idx1, op, idx2))
+  end
+
+  def debug
+    bool(tk_send('debug'))
+  end
+  def debug=(boolean)
+    tk_send 'debug', boolean
+    self
+  end
+  def bbox(index)
+    list(tk_send('bbox', index))
+  end
+
+  def dlineinfo(index)
+    list(tk_send('dlineinfo', index))
+  end
+
+  def modified?
+    bool(tk_send('edit', 'modified'))
+  end
+  def modified(mode)
+    tk_send('edit', 'modified', mode)
+    self
+  end
+  def edit_redo
+    tk_send('edit', 'redo')
+    self
+  end
+  def edit_reset
+    tk_send('edit', 'reset')
+    self
+  end
+  def edit_separator
+    tk_send('edit', 'separator')
+    self
+  end
+  def edit_undo
+    tk_send('edit', 'undo')
+    self
+  end
+
+  def yview_pickplace(*what)
+    tk_send 'yview', '-pickplace', *what
+    self
+  end
+
+  def xview_pickplace(*what)
+    tk_send 'xview', '-pickplace', *what
+    self
+  end
+
+  def text_copy
+    # Tk8.4 feature
+    tk_call('tk_textCopy', @path)
+  end
+
+  def text_cut
+    # Tk8.4 feature
+    tk_call('tk_textCut', @path)
+  end
+
+  def text_paste
+    # Tk8.4 feature
+    tk_call('tk_textPaste', @path)
+  end
+
+  def tag_add(tag, index1, index2=None)
+    tk_send 'tag', 'add', tag, index1, index2
+    self
+  end
+  alias addtag tag_add
+  alias add_tag tag_add
+
+  def tag_delete(*tags)
+    tk_send 'tag', 'delete', *tags
+    if TkTextTag::TTagID_TBL[@path]
+      tags.each{|tag|
+	if tag.kind_of? TkTextTag
+	  TTagID_TBL[@path].delete(tag.id) 
+	else
+	  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=nil)
+    _bind([@path, 'tag', 'bind', tag], seq, cmd, args)
+    self
+  end
+
+  def tag_bind_append(tag, seq, cmd=Proc.new, args=nil)
+    _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
+
+  def tag_cget(tag, key)
+    case key.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      tk_call(@path, 'tag', 'cget', tag, "-#{key}")
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('tag', 'cget', tag, "-#{key}"))
+      fnt = tk_tcl2ruby(tk_send('tag', 'cget', 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(tk_call(@path, 'tag', 'cget', 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 'tag', 'configure', tag, *hash_kv(key)
+      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 'tag', 'configure', tag, "-#{key}", val
+      end
+    end
+    self
+  end
+
+  def tag_configinfo(tag, key=nil)
+    if key
+      case key.to_s
+      when 'text', 'label', 'show', 'data', 'file'
+	conf = tk_split_simplelist(tk_send('tag','configure',tag,"-#{key}"))
+      when 'font', 'kanjifont'
+	conf = tk_split_simplelist(tk_send('tag','configure',tag,"-#{key}") )
+	conf[4] = tagfont_configinfo(tag, conf[4])
+      else
+	conf = tk_split_list(tk_send('tag','configure',tag,"-#{key}"))
+      end
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      ret = tk_split_simplelist(tk_send('tag', 'configure', 
+					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
+      }
+      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
+  end
+
+  def tag_raise(tag, above=None)
+    tk_send 'tag', 'raise', tag, above
+    self
+  end
+
+  def tag_lower(tag, below=None)
+    tk_send 'tag', 'lower', tag, below
+    self
+  end
+
+  def tag_remove(tag, *index)
+    tk_send 'tag', 'remove', tag, *index
+    self
+  end
+
+  def tag_ranges(tag)
+    l = tk_split_simplelist(tk_send('tag', 'ranges', tag))
+    r = []
+    while key=l.shift
+      r.push [key, l.shift]
+    end
+    r
+  end
+
+  def tag_nextrange(tag, first, last=None)
+    tk_split_list(tk_send('tag', 'nextrange', tag, first, last))
+  end
+
+  def tag_prevrange(tag, first, last=None)
+    tk_split_list(tk_send('tag', 'prevrange', tag, first, last))
+  end
+
+  def window_cget(index, slot)
+    case slot.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      tk_send('window', 'cget', index, "-#{slot}")
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('window', 'cget', index, "-#{slot}"))
+      fnt = tk_tcl2ruby(tk_send('window', 'cget', 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(tk_send('window', 'cget', 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
+	tk_send('window', 'configure', index, *hash_kv(slot))
+      else
+	tk_send('window', 'configure', index, "-#{slot}", value)
+      end
+    end
+    self
+  end
+
+  def window_configinfo(win, slot = nil)
+    if slot
+      case slot.to_s
+      when 'text', 'label', 'show', 'data', 'file'
+	conf = tk_split_simplelist(tk_send('window', 'configure', 
+					   win, "-#{slot}"))
+      else
+	conf = tk_split_list(tk_send('window', 'configure', 
+				     win, "-#{slot}"))
+      end
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_simplelist(tk_send('window', 'configure', 
+				  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
+      }
+    end
+  end
+
+  def window_names
+    tk_split_simplelist(tk_send('window', 'names')).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('kstring', 'length', txt).to_i
+    else
+      begin
+	tk_call('encoding', 'convertto', 'ascii', txt).length
+      rescue StandardError, NameError
+	# sorry, I have no plan
+	txt.length
+      end
+    end
+  end
+  private :_ktext_length
+
+  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)
+    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)
+	end
+	i = idx + 1
+      end
+
+      # retrieve index
+      idx = str.index(/ /, i)
+      if idx
+	result.push str[i..(idx-1)]
+	i = idx + 1
+      else
+	result.push 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 TkTextTag<TkObject
+  include TkTreatTagFont
+
+  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)
+    if not parent.kind_of?(TkText)
+      fail Kernel.format("%s need to be TkText", parent.inspect)
+    end
+    @parent = @t = parent
+    @tpath = parent.path
+    @path = @id = Tk_TextTag_ID.join
+    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 != [] then
+      keys = args.pop
+      if keys.kind_of? Hash then
+	add(*args) if args != []
+	configure(keys)
+      else
+	args.push keys
+	add(*args)
+      end
+    end
+    @t._addtag id, self
+  end
+
+  def id
+    @id
+  end
+
+  def first
+    @id + '.first'
+  end
+
+  def last
+    @id + '.last'
+  end
+
+  def add(*index)
+    tk_call @t.path, 'tag', 'add', @id, *index
+    self
+  end
+
+  def remove(*index)
+    tk_call @t.path, 'tag', 'remove', @id, *index
+    self
+  end
+
+  def ranges
+    l = tk_split_simplelist(tk_call(@t.path, 'tag', 'ranges', @id))
+    r = []
+    while key=l.shift
+      r.push [key, l.shift]
+    end
+    r
+  end
+
+  def nextrange(first, last=None)
+    tk_split_list(tk_call(@t.path, 'tag', 'nextrange', @id, first, last))
+  end
+
+  def prevrange(first, last=None)
+    tk_split_list(tk_call(@t.path, 'tag', 'prevrange', @id, first, last))
+  end
+
+  def [](key)
+    cget key
+  end
+
+  def []=(key,val)
+    configure key, val
+  end
+
+  def cget(key)
+    case key.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      tk_call @t.path, 'tag', 'cget', @id, "-#{key}"
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_call(@t.path, 'tag', 'cget', @id, "-#{key}"))
+      fnt = tk_tcl2ruby(tk_call(@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(tk_call(@t.path, 'tag', 'cget', @id, "-#{key}"))
+    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 bind(seq, cmd=Proc.new, args=nil)
+    _bind([@t.path, 'tag', 'bind', @id], seq, cmd, args)
+    self
+  end
+
+  def bind_append(seq, cmd=Proc.new, args=nil)
+    _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 @t.path, 'tag', 'raise', @id, above
+    self
+  end
+
+  def lower(below=None)
+    tk_call @t.path, 'tag', 'lower', @id, below
+    self
+  end
+
+  def destroy
+    tk_call @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 != [] then
+	keys = args.pop
+	if keys.kind_of? Hash then
+	  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)
+    if not parent.kind_of?(TkText)
+      fail Kernel.format("%s need to be TkText", parent.inspect)
+    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 != [] then
+      keys = args.pop
+      if keys.kind_of? Hash then
+	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
+
+class TkTextMark<TkObject
+  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)
+    if not parent.kind_of?(TkText)
+      fail Kernel.format("%s need to be TkText", parent.inspect)
+    end
+    @parent = @t = parent
+    @tpath = parent.path
+    @path = @id = Tk_TextMark_ID.join
+    TMarkID_TBL[@id] = self
+    TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
+    TMarkID_TBL[@tpath][@id] = self
+    Tk_TextMark_ID[1].succ!
+    tk_call @t.path, 'mark', 'set', @id, index
+    @t._addtag id, self
+  end
+
+  def id
+    @id
+  end
+
+  def +(mod)
+    @id + ' + ' + mod
+  end
+  def -(mod)
+    @id + ' - ' + mod
+  end
+
+  def set(where)
+    tk_call @t.path, 'mark', 'set', @id, where
+    self
+  end
+
+  def unset
+    tk_call @t.path, 'mark', 'unset', @id
+    self
+  end
+  alias destroy unset
+
+  def gravity
+    tk_call @t.path, 'mark', 'gravity', @id
+  end
+
+  def gravity=(direction)
+    tk_call @t.path, 'mark', 'gravity', @id, direction
+    self
+  end
+
+  def next(index = nil)
+    if index
+      @t.tagid2obj(tk_call(@t.path, 'mark', 'next', index))
+    else
+      @t.tagid2obj(tk_call(@t.path, 'mark', 'next', @id))
+    end
+  end
+
+  def previous(index = nil)
+    if index
+      @t.tagid2obj(tk_call(@t.path, 'mark', 'previous', index))
+    else
+      @t.tagid2obj(tk_call(@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)
+    if not parent.kind_of?(TkText)
+      fail Kernel.format("%s need to be TkText", parent.inspect)
+    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 @t.path, 'mark', 'set', @id, 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<TkTextMark
+  def self.new(parent,*args)
+    super(parent, 'current', *args)
+  end
+end
+
+class TkTextMarkAnchor<TkTextMark
+  def self.new(parent,*args)
+    super(parent, 'anchor', *args)
+  end
+end
+
+class TkTextWindow<TkObject
+  def initialize(parent, index, keys)
+    if not parent.kind_of?(TkText)
+      fail Kernel.format("%s need to be TkText", parent.inspect)
+    end
+    @t = parent
+    if index == 'end'
+      @path = TkTextMark.new(@t, tk_call(@t.path, 'index', 'end - 1 chars'))
+    elsif index.kind_of? TkTextMark
+      if tk_call(@t.path,'index',index.path) == tk_call(@t.path,'index','end')
+	@path = TkTextMark.new(@t, tk_call(@t.path, 'index', 'end - 1 chars'))
+      else
+	@path = TkTextMark.new(@t, tk_call(@t.path, 'index', index.path))
+      end
+    else
+      @path = TkTextMark.new(@t, tk_call(@t.path, 'index', index))
+    end
+    @path.gravity = 'left'
+    @index = @path.path
+    keys = _symbolkey2str(keys)
+    @id = keys['window']
+    if keys['create']
+      @p_create = keys['create']
+      if @p_create.kind_of? Proc
+	keys['create'] = install_cmd(proc{@id = @p_create.call; @id.path})
+      end
+    end
+    tk_call @t.path, 'window', 'create', @index, *hash_kv(keys)
+  end
+
+  def [](slot)
+    cget(slot)
+  end
+  def []=(slot, value)
+    configure(slot, value)
+  end
+
+  def cget(slot)
+    @t.window_cget(@index, slot)
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of? Hash
+      slot = _symbolkey2str(slot)
+      @id = slot['window'] if slot['window']
+      if slot['create']
+	self.create=value
+	slot['create']=nil
+      end
+      if slot.size > 0
+	tk_call(@t.path, 'window', 'configure', @index, *hash_kv(slot))
+      end
+    else
+      @id = value if slot == 'window' || slot == :window
+      if slot == 'create' || slot == :create
+	self.create=value
+      else
+	tk_call(@t.path, 'window', 'configure', @index, "-#{slot}", value)
+      end
+    end
+    self
+  end
+
+  def configinfo(slot = nil)
+    @t.window_configinfo(@index, slot)
+  end
+
+  def window
+    @id
+  end
+
+  def window=(value)
+    tk_call @t.path, 'window', 'configure', @index, '-window', value
+    @id = value
+  end
+
+  def create
+    @p_create
+  end
+
+  def create=(value)
+    @p_create = value
+    if @p_create.kind_of? Proc
+      value = install_cmd(proc{@id = @p_create.call})
+    end
+    tk_call @t.path, 'window', 'configure', @index, '-create', value
+  end
+end
+
+class TkTextImage<TkObject
+  def initialize(parent, index, keys)
+    if not parent.kind_of?(TkText)
+      fail Kernel.format("%s need to be TkText", parent.inspect)
+    end
+    @t = parent
+    if index == 'end'
+      @path = TkTextMark.new(@t, tk_call(@t.path, 'index', 'end - 1 chars'))
+    elsif index.kind_of? TkTextMark
+      if tk_call(@t.path,'index',index.path) == tk_call(@t.path,'index','end')
+	@path = TkTextMark.new(@t, tk_call(@t.path, 'index', 'end - 1 chars'))
+      else
+	@path = TkTextMark.new(@t, tk_call(@t.path, 'index', index.path))
+      end
+    else
+      @path = TkTextMark.new(@t, tk_call(@t.path, 'index', index))
+    end
+    @path.gravity = 'left'
+    @index = @path.path
+    @id = tk_call(@t.path, 'image', 'create', @index, *hash_kv(keys))
+  end
+
+  def [](slot)
+    cget(slot)
+  end
+  def []=(slot, value)
+    configure(slot, 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 image
+    img = tk_call(@t.path, 'image', 'configure', @index, '-image')
+    TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
+  end
+
+  def image=(value)
+    tk_call @t.path, 'image', 'configure', @index, '-image', value
+    self
+  end
+end
diff --git a/ext/tk/lib/tkvirtevent.rb b/ext/tk/lib/tkvirtevent.rb
index f4fae19a0a..ccd3448434 100644
--- a/ext/tk/lib/tkvirtevent.rb
+++ b/ext/tk/lib/tkvirtevent.rb
@@ -1,4 +1,85 @@
 #
-#   tkvirtevent.rb - load tk/virtevent.rb
+#   tkvirtevent.rb : treats virtual events
+#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk/virtevent'
+require 'tk'
+
+class TkVirtualEvent<TkObject
+  extend Tk
+
+  TkCommandNames = ['event'.freeze].freeze
+
+  TkVirtualEventID = ["<VirtEvent".freeze, "00000".taint, ">".freeze].freeze
+  TkVirtualEventTBL = TkCore::INTERP.create_table
+
+  TkCore::INTERP.init_ip_env{ TkVirtualEventTBL.clear }
+
+  class PreDefVirtEvent<self
+    def initialize(event)
+      @path = @id = event
+      TkVirtualEvent::TkVirtualEventTBL[@id] = self
+    end
+  end
+
+  def TkVirtualEvent.getobj(event)
+    obj = TkVirtualEventTBL[event]
+    if obj
+      obj
+    else
+      if tk_call('event', 'info').index("<#{event}>")
+	PreDefVirtEvent.new(event)
+      else
+	fail ArgumentError, "undefined virtual event '<#{event}>'"
+      end
+    end
+  end
+
+  def TkVirtualEvent.info
+    tk_call('event', 'info').split(/\s+/).collect!{|seq|
+      TkVirtualEvent.getobj(seq[1..-2])
+    }
+  end
+
+  def initialize(*sequences)
+    @path = @id = TkVirtualEventID.join
+    TkVirtualEventID[1].succ!
+    add(*sequences)
+  end
+
+  def add(*sequences)
+    if sequences != []
+      tk_call('event', 'add', "<#{@id}>", 
+	      *(sequences.collect{|seq| "<#{tk_event_sequence(seq)}>"}) )
+      TkVirtualEventTBL[@id] = self
+    end
+    self
+  end
+
+  def delete(*sequences)
+    if sequences == []
+      tk_call('event', 'delete', "<#{@id}>")
+      TkVirtualEventTBL.delete(@id)
+    else
+      tk_call('event', 'delete', "<#{@id}>", 
+	      *(sequences.collect{|seq| "<#{tk_event_sequence(seq)}>"}) )
+      TkVirtualEventTBL.delete(@id) if info == []
+    end
+    self
+  end
+
+  def info
+    tk_call('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
diff --git a/ext/tk/lib/tkwinpkg.rb b/ext/tk/lib/tkwinpkg.rb
index 83371c546d..7762b3a596 100644
--- a/ext/tk/lib/tkwinpkg.rb
+++ b/ext/tk/lib/tkwinpkg.rb
@@ -1,4 +1,84 @@
 #
-#   tkwinpkg.rb - load tk/winpkg.rb
+#   tkwinpkg.rb : methods for Tcl/Tk packages for Microsoft Windows
+#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk/winpkg'
+#     ATTENTION !!
+#         This is NOT TESTED. Because I have no test-environment.
+#
+#
+require 'tk'
+
+module TkWinDDE
+  extend Tk
+  extend TkWinDDE
+
+  TkCommandNames = ['dde'.freeze].freeze
+
+  tk_call('package', 'require', 'dde')
+
+  def servername(topic=nil)
+    tk_call('dde', 'servername', topic)
+  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 services(service, topic)
+    tk_call('dde', 'services', service, topic)
+  end
+
+  def eval(topic, cmd, *args)
+    tk_call('dde', 'eval', 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
+
+  tk_call('package', 'require', 'registry')
+
+  def delete(keynam, valnam=nil)
+    tk_call('registry', 'delete', keynam, valnam)
+  end
+
+  def get(keynam, valnam)
+    tk_call('registry', 'get', keynam, valnam)
+  end
+
+  def keys(keynam)
+    tk_split_simplelist(tk_call('registry', 'keys', keynam))
+  end
+
+  def set(keynam, valnam=nil, data=nil, dattype=nil)
+    tk_call('registry', 'set', keynam, valnam, data, dattype)
+  end
+
+  def type(keynam, valnam)
+    tk_call('registry', 'type', keynam, valnam)
+  end
+
+  def values(keynam)
+    tk_split_simplelist(tk_call('registry', 'values', keynam))
+  end
+
+  module_function :delete, :get, :keys, :set, :type, :values
+end
diff --git a/ext/tk/sample/24hr_clock.rb b/ext/tk/sample/24hr_clock.rb
deleted file mode 100644
index 60d8072c57..0000000000
--- a/ext/tk/sample/24hr_clock.rb
+++ /dev/null
@@ -1,286 +0,0 @@
-#!/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/ext/tk/sample/binding_sample.rb b/ext/tk/sample/binding_sample.rb
deleted file mode 100644
index 693cc7de2f..0000000000
--- a/ext/tk/sample/binding_sample.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/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/ext/tk/sample/bindtag_sample.rb b/ext/tk/sample/bindtag_sample.rb
deleted file mode 100644
index 8c93b4a260..0000000000
--- a/ext/tk/sample/bindtag_sample.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/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/ext/tk/sample/binstr_usage.rb b/ext/tk/sample/binstr_usage.rb
deleted file mode 100644
index be8399ba51..0000000000
--- a/ext/tk/sample/binstr_usage.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/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=[File.dirname(__FILE__), '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(:palette=>256)
-ph3.put(ph2.data)
-
-ph4 = TkPhotoImage.new()
-ph4.put(ph2.data(:grayscale=>true))
-
-#p [b_str.encoding, b_str.rb_encoding]
-
-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)
-TkButton.new(:parent=>f, :image=>ph4, :command=>proc{exit}).pack(:side=>:left)
-
-Tk.mainloop
diff --git a/ext/tk/sample/btn_with_frame.rb b/ext/tk/sample/btn_with_frame.rb
deleted file mode 100644
index d04c95a289..0000000000
--- a/ext/tk/sample/btn_with_frame.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-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/ext/tk/sample/cd_timer.rb b/ext/tk/sample/cd_timer.rb
deleted file mode 100644
index 9154e89bfe..0000000000
--- a/ext/tk/sample/cd_timer.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/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/ext/tk/sample/cmd_res_test.rb b/ext/tk/sample/cmd_res_test.rb
deleted file mode 100644
index 6e954f26ee..0000000000
--- a/ext/tk/sample/cmd_res_test.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-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/ext/tk/sample/cmd_resource b/ext/tk/sample/cmd_resource
deleted file mode 100644
index 9cc4915546..0000000000
--- a/ext/tk/sample/cmd_resource
+++ /dev/null
@@ -1,5 +0,0 @@
-*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/ext/tk/sample/demos-en/README.1st b/ext/tk/sample/demos-en/README.1st
deleted file mode 100644
index e031f123d2..0000000000
--- a/ext/tk/sample/demos-en/README.1st
+++ /dev/null
@@ -1,18 +0,0 @@
-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/ext/tk/sample/demos-en/README.tkencoding b/ext/tk/sample/demos-en/README.tkencoding
index f576bc593e..8fcb494c03 100644
--- a/ext/tk/sample/demos-en/README.tkencoding
+++ b/ext/tk/sample/demos-en/README.tkencoding
@@ -1,8 +1,3 @@
-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>
diff --git a/ext/tk/sample/demos-en/anilabel.rb b/ext/tk/sample/demos-en/anilabel.rb
deleted file mode 100644
index 0b9bc7357e..0000000000
--- a/ext/tk/sample/demos-en/anilabel.rb
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# 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)
-}
-
-base_frame = TkFrame.new($anilabel_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  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(base_frame) {|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(base_frame,  :text=>'Scrolling Texts')
-f_right = TkLabelFrame.new(base_frame, :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/ext/tk/sample/demos-en/aniwave.rb b/ext/tk/sample/demos-en/aniwave.rb
deleted file mode 100644
index 63a04a7b98..0000000000
--- a/ext/tk/sample/demos-en/aniwave.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# 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)
-}
-
-base_frame = TkFrame.new($aniwave_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  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(base_frame) {|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] }
-    n = 305
-    @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(base_frame, :left).move
diff --git a/ext/tk/sample/demos-en/arrow.rb b/ext/tk/sample/demos-en/arrow.rb
index 055cd2af3c..8ee13254ea 100644
--- a/ext/tk/sample/demos-en/arrow.rb
+++ b/ext/tk/sample/demos-en/arrow.rb
@@ -13,7 +13,7 @@
 # interactively.
 #
 # Arguments:
-# c -           Name of the canvas widget.
+# c -		Name of the canvas widget.
 
 def arrowSetup(c)
   v = $demo_arrowInfo
@@ -29,67 +29,59 @@ def arrowSetup(c)
   # 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) )
+	      { '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')
+	      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) )
+		   {'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) )
+		   {'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) )
+		   {'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])
+	      '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])
+	      '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])
+	      '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)
+	      '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)
+	      '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)
+	      '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)
+	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
 
-  if $tk_version =~ /^4.*/
-    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-*-*-*-*-*-*')
-  else
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
-                'font'=>'Helvetica 18')
-    TkcText.new(c, v.x1, 330, 
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
-                'anchor'=>'w', 'font'=>'Helvetica 18')
-  end
+  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
@@ -107,16 +99,14 @@ $arrow_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame, '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."){
+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(base_frame) {|frame|
+$arrow_buttons = TkFrame.new($arrow_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -134,15 +124,15 @@ $arrow_buttons = TkFrame.new(base_frame) {|frame|
 $arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # canvas 
-$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350, 
-                             'relief'=>'sunken', 'borderwidth'=>2)
+$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
+			       :x1, :x2, :y, :smallTips, :count, 
+			       :bigLineStyle, :boxStyle, :activeStyle).new
 end
 $demo_arrowInfo.a = 8
 $demo_arrowInfo.b = 10
@@ -160,7 +150,7 @@ if TkWinfo.depth($arrow_canvas) > 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)}
+    '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
@@ -171,16 +161,16 @@ $arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_ar
 $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}})
+		       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}})
+		       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}})
+		       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")
+		  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
 $arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
 
 # arrowMove1 --
@@ -189,8 +179,8 @@ $arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
 # for the line and arrowhead.
 #
 # Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
+# c -		The name of the canvas window.
+# x, y -	The coordinates of the mouse.
 
 def arrowMove1(c,x,y)
   v = $demo_arrowInfo
@@ -209,8 +199,8 @@ end
 # parameters for the line and arrowhead.
 #
 # Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
+# c -		The name of the canvas window.
+# x, y -	The coordinates of the mouse.
 
 def arrowMove2(c,x,y)
   v = $demo_arrowInfo
@@ -233,8 +223,8 @@ end
 # controlling parameters for the line and arrowhead.
 #
 # Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
+# c -		The name of the canvas window.
+# x, y -	The coordinates of the mouse.
 
 def arrowMove3(c,x,y)
   v = $demo_arrowInfo
diff --git a/ext/tk/sample/demos-en/bind.rb b/ext/tk/sample/demos-en/bind.rb
index 665592a2bc..5d30d228f0 100644
--- a/ext/tk/sample/demos-en/bind.rb
+++ b/ext/tk/sample/demos-en/bind.rb
@@ -19,10 +19,8 @@ $bind_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($bind_demo).pack(:fill=>:both, :expand=>true)
-
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($bind_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -45,14 +43,14 @@ def tag_binding_for_bind_demo(tag, enter_style, leave_style)
 end
 
 # text 
-txt = TkText.new(base_frame){|t|
+TkText.new($bind_demo){|t|
   # 
   setgrid 'true'
-  #width  60
-  #height 24
+  width  60
+  height 24
   font $font
   wrap 'word'
-  TkScrollbar.new(base_frame) {|s|
+  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}
@@ -69,7 +67,7 @@ txt = TkText.new(base_frame){|t|
     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.
 
 "
@@ -78,50 +76,35 @@ txt = TkText.new(base_frame){|t|
   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)) )
+	 (d3 = TkTextTag.new(t)) )
   insert('end', "\n\n")
   insert('end', '4. An editor for arrow-head shapes for line items.', 
-         (d4 = TkTextTag.new(t)) )
+	 (d4 = TkTextTag.new(t)) )
   insert('end', "\n\n")
   insert('end', '5. A ruler with facilities for editing tab stops.', 
-         (d5 = TkTextTag.new(t)) )
+	 (d5 = TkTextTag.new(t)) )
   insert('end', "\n\n")
   insert('end', 
-         '6. A grid that demonstrates how canvases can be scrolled.', 
-         (d6 = TkTextTag.new(t)) )
+	 '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_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'items.rb'].join(File::Separator)}`})
   d2.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`})
   d3.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`})
   d4.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`})
   d5.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`})
   d6.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`})
 
   TkTextMarkInsert.new(t, '0.0')
   configure('state','disabled')
 }
-
-txt.width  60
-txt.height 24
diff --git a/ext/tk/sample/demos-en/bitmap.rb b/ext/tk/sample/demos-en/bitmap.rb
index 133adb0543..c81e4ac595 100644
--- a/ext/tk/sample/demos-en/bitmap.rb
+++ b/ext/tk/sample/demos-en/bitmap.rb
@@ -9,19 +9,19 @@
 # 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.
+# 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')
-        Tk::Label.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
+	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
   }
@@ -40,16 +40,14 @@ $bitmap_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame,'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."){
+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(base_frame) {|frame|
+$bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -67,7 +65,7 @@ $bitmap_buttons = TkFrame.new(base_frame) {|frame|
 $bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame 
-TkFrame.new(base_frame){|f|
+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/ext/tk/sample/demos-en/browse2 b/ext/tk/sample/demos-en/browse2
index edad04dbcb..304a5f547e 100644
--- a/ext/tk/sample/demos-en/browse2
+++ b/ext/tk/sample/demos-en/browse2
@@ -39,11 +39,11 @@ class Browse
     }
 
     # Set up bindings for the browser.
-    base.bind('Destroy', proc{
+    base.bind('Control-c', 
+	      proc{
+		base.destroy
 		Browse::BROWSE_WIN_COUNTER.value = \
-		                Browse::BROWSE_WIN_COUNTER.to_i - 1
-	      })
-    base.bind('Control-c', proc{base.destroy})
+		                Browse::BROWSE_WIN_COUNTER.to_i - 1})
     list.bind('Double-Button-1', 
 	 proc{TkSelection.get.each{|f| self.browse dir, f}})
   end
diff --git a/ext/tk/sample/demos-en/button.rb b/ext/tk/sample/demos-en/button.rb
index 5c03bd499b..6614d99c92 100644
--- a/ext/tk/sample/demos-en/button.rb
+++ b/ext/tk/sample/demos-en/button.rb
@@ -29,7 +29,7 @@ msg = TkLabel.new($button_demo) {
 msg.pack('side'=>'top')
 
 # frame 
-$button_buttons = Tk::Frame.new($button_demo) {|frame|
+$button_buttons = TkFrame.new($button_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
diff --git a/ext/tk/sample/demos-en/check.rb b/ext/tk/sample/demos-en/check.rb
index 2951962a79..b5def6a89b 100644
--- a/ext/tk/sample/demos-en/check.rb
+++ b/ext/tk/sample/demos-en/check.rb
@@ -19,10 +19,8 @@ $check_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($check_demo).pack(:fill=>:both, :expand=>true)
-
 # label 
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($check_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -36,7 +34,7 @@ brakes = TkVariable.new(0)
 sober  = TkVariable.new(0)
 
 # frame 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($check_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -56,8 +54,8 @@ TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'See Variables'
     command proc{
-      showVars(base_frame, 
-               ['wipers', wipers], ['brakes', brakes], ['sober', sober])
+      showVars($check_demo, 
+	       ['wipers', wipers], ['brakes', brakes], ['sober', sober])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 
@@ -65,8 +63,8 @@ TkFrame.new(base_frame) {|frame|
 
 
 # checkbutton
-[ TkCheckButton.new(base_frame, 'text'=>'Wipers  OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'Brakes  OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'Driver Sober', 'variable'=>sober)
+[ 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/ext/tk/sample/demos-en/check2.rb b/ext/tk/sample/demos-en/check2.rb
deleted file mode 100644
index faea748a87..0000000000
--- a/ext/tk/sample/demos-en/check2.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# 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)
-}
-
-base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  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(base_frame) {|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(base_frame, :text=>'Safety Check', :variable=>safety, 
-                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none', 
-                  :tristatevalue=>'partial'){
-  pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-[ TkCheckButton.new(base_frame, 'text'=>'Wipers OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'Brakes OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, '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/ext/tk/sample/demos-en/clrpick.rb b/ext/tk/sample/demos-en/clrpick.rb
index 431439d55d..72c52a4394 100644
--- a/ext/tk/sample/demos-en/clrpick.rb
+++ b/ext/tk/sample/demos-en/clrpick.rb
@@ -4,8 +4,6 @@
 #
 # widget demo prompts the user to select a color (called by 'widget')
 #
-#  Note: don't support ttk_wrapper. work with standard widgets only.
-#
 
 # toplevel widget
 if defined?($clrpick_demo) && $clrpick_demo
@@ -20,18 +18,13 @@ $clrpick_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($clrpick_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-Tk::Label.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')
+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|
-Tk::Frame.new($clrpick_demo) {|frame|
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
+TkFrame.new($clrpick_demo) {|frame|
+  TkButton.new(frame) {
     text 'Dismiss'
     command proc{
       tmppath = $clrpick_demo
@@ -40,23 +33,20 @@ Tk::Frame.new($clrpick_demo) {|frame|
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
+  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|
-Tk::Button.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
+TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
   command(proc{setColor $clrpick_demo, b, 'background', 
-              ['background', 'highlightbackground']})
+	      ['background', 'highlightbackground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }
 
-# TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
+TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
   command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }
@@ -65,7 +55,7 @@ def setColor(w,button,name,options)
   w.grab
   initialColor = button[name]
   color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w, 
-                         'initialcolor'=>initialColor)
+			 'initialcolor'=>initialColor)
   if color != ""
     setColor_helper(w,options,color)
   end
diff --git a/ext/tk/sample/demos-en/colors.rb b/ext/tk/sample/demos-en/colors.rb
index 4300a660ae..66fb0afa36 100644
--- a/ext/tk/sample/demos-en/colors.rb
+++ b/ext/tk/sample/demos-en/colors.rb
@@ -20,10 +20,8 @@ $colors_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($colors_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($colors_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -32,7 +30,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($colors_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -51,7 +49,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame
 colors_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
+TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
   s = TkScrollbar.new(w)
   colors_lbox = TkListbox.new(w) {
     setgrid 1
@@ -64,15 +62,7 @@ TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
   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})
-colors_lbox.bind('Double-1', proc{
-                   begin
-                     TkPalette.setPalette TkSelection.get
-                   rescue => e
-                     p e
-                     Tk.tk_call_without_enc('destroy', '.___tk_set_palette')
-                   end
-                 })
+colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
 
 ins_data = [
   'gray60','gray70','gray80','gray85','gray90','gray95',
diff --git a/ext/tk/sample/demos-en/combo.rb b/ext/tk/sample/demos-en/combo.rb
deleted file mode 100644
index 0907d9e8ec..0000000000
--- a/ext/tk/sample/demos-en/combo.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# combo.rb --
-#
-# This demonstration script creates several combobox widgets.
-#
-# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($combo_demo) && $combo_demo
-  $combo_demo.destroy 
-  $combo_demo = nil
-end
-
-$combo_demo = TkToplevel.new {|w|
-  title("Combobox Demonstration")
-  iconname("combo")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left, 
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Three different combo-boxes are displayed below. \
-You can add characters to the first \
-one by pointing, clicking and typing, just as with an entry; pressing \
-Return will cause the current value to be added to the list that is \
-selectable from the drop-down list, and you can choose other values \
-by pressing the Down key, using the arrow keys to pick another one, \
-and pressing Return again. The second combo-box is fixed to a \
-particular value, and cannot be modified at all. The third one only \
-allows you to select values from its drop-down list of Australian \
-cities.
-EOL
-
-## variables
-firstValue  = TkVariable.new
-secondValue = TkVariable.new
-ozCity      = TkVariable.new
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'See Variables', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{
-                           showVars(base_frame, 
-                                    ['firstVariable', firstValue], 
-                                    ['secondVariable', secondValue], 
-                                    ['ozCity', ozCity])
-                         }), 
-         Ttk::Button.new(frame, :text=>'See Code', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'combo'}), 
-         Ttk::Button.new(frame, :text=>'Dismiss', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $combo_demo.destroy
-                           $combo_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-australianCities = [
-  'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 'Brisbane', 
-  'Hobart', 'Darwin', 'Alice Springs'
-]
-
-
-secondValue.value = 'unchangable'
-ozCity.value = 'Sydney'
-
-Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
-          Ttk::Combobox.new(f, :textvariable=>firstValue){|b|
-            b.bind('Return', '%W'){|w|
-              w.values <<= w.value unless w.values.include?(w.value)
-            }
-          }.pack(:pady=>5, :padx=>10)
-        }, 
-
-        Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
-          Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
-            pack(:pady=>5, :padx=>10)
-        }, 
-
-        Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
-          Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly, 
-                            :values=>australianCities) .
-            pack(:pady=>5, :padx=>10)
-        }, 
-
-        :side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-en/cscroll.rb b/ext/tk/sample/demos-en/cscroll.rb
index 259ed3bd8c..2f2be60da2 100644
--- a/ext/tk/sample/demos-en/cscroll.rb
+++ b/ext/tk/sample/demos-en/cscroll.rb
@@ -19,16 +19,14 @@ $cscroll_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame, '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."){
+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(base_frame) {|frame|
+$cscroll_buttons = TkFrame.new($cscroll_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -47,43 +45,43 @@ $cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame 
 unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new(base_frame) {
+  $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(base_frame, 
-                               'relief'=>'sunken', 'borderwidth'=>2,
-                               'scrollregion'=>['-11c', '-11c', '50c', '20c']
-                               ) {|c|
+# 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')
+	 'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
   end
 
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
+  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')
+	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     end
   }
 
-  TkScrollbar.new(base_frame, 'orient'=>'horiz', 
-                  'command'=>proc{|*args| c.xview(*args)}) {|hs|
+  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')
+	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     end
   }
 }
@@ -94,9 +92,9 @@ bg = $cscroll_canvas.configinfo('bg')[4]
   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')
+		     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
     TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c", 
-                'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
+		'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
     y += 3
   }
 }
@@ -107,7 +105,7 @@ $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')
+		     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
 
 def scrollEnter(c)
   id = c.find_withtag('current')[0].id
diff --git a/ext/tk/sample/demos-en/ctext.rb b/ext/tk/sample/demos-en/ctext.rb
index 01374b0321..13f8de7218 100644
--- a/ext/tk/sample/demos-en/ctext.rb
+++ b/ext/tk/sample/demos-en/ctext.rb
@@ -19,11 +19,9 @@ $ctext_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame, '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:
+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.
@@ -35,7 +33,7 @@ TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
 }
 
 # frame
-$ctext_buttons = TkFrame.new(base_frame) {|frame|
+$ctext_buttons = TkFrame.new($ctext_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -53,55 +51,46 @@ $ctext_buttons = TkFrame.new(base_frame) {|frame|
 $ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # canvas 
-$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat', 
-                             'borderwidth'=>0, 'width'=>500, 'height'=>350)
+$ctext_canvas = TkCanvas.new($ctext_demo, 'relief'=>'flat', 
+			     'borderwidth'=>0, 'width'=>500, 'height'=>350)
 $ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
 
 # font 
-if $tk_version =~ /^4.*/
-  textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-else
-  textFont = 'Helvetica 24'
-end
+textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
 
 # canvas 
 TkcRectangle.new($ctext_canvas, 245, 195, 255, 205, 
-                 'outline'=>'black', 'fill'=>'red')
-
-ctag_text_param = {
-  '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', 'justify'=>'left'
-}
-if $tk_version =~ /^4.*/
-  ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-else
-  ctag_text_param['font'] = 'Helvetica 24'
-end
+		 'outline'=>'black', 'fill'=>'red')
 
 $ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
+$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")
+	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")
+		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")
+		"%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)
+			  'outline'=>'black', 'fill'=>color, 'width'=>1)
   item.bind('1', proc{$ctag_text.configure option, value})
   w.addtag_withtag('config', item)
 end
@@ -119,16 +108,11 @@ 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')
+			'outline'=>'black', 'fill'=>'red')
 item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
+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.
@@ -139,20 +123,15 @@ 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
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
+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)})
+		       proc{$ctext_canvas\
+			     .itemconfigure('current', 
+					    'fill'=>$textConfigFill)})
 
 $textConfigFill = ''
 
diff --git a/ext/tk/sample/demos-en/dialog1.rb b/ext/tk/sample/demos-en/dialog1.rb
index af476ecd05..374fedc985 100644
--- a/ext/tk/sample/demos-en/dialog1.rb
+++ b/ext/tk/sample/demos-en/dialog1.rb
@@ -22,7 +22,7 @@ class TkDialog_Demo1 < TkDialog
   end
 
   def buttons
-    # ["Dismiss", "", "Show Code"]
+    ["Dismiss", "", "Show Code"]
     ["OK", "Cancel", "Show Code"]
   end
 end
diff --git a/ext/tk/sample/demos-en/dialog2.rb b/ext/tk/sample/demos-en/dialog2.rb
index efc4b714da..21bf25c88d 100644
--- a/ext/tk/sample/demos-en/dialog2.rb
+++ b/ext/tk/sample/demos-en/dialog2.rb
@@ -27,9 +27,9 @@ class TkDialog_Demo2 < TkDialog
 end
 
 ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
-                          'prev_command'=>proc{|dialog|
-                            Tk.after 100, proc{dialog.grab('global')}
-                          }).value
+			  'prev_command'=>proc{|dialog|
+			    Tk.after 100, proc{dialog.grab('global')}
+			  }).value
 case ret
 when 0
   print "\You pressed OK\n"
diff --git a/ext/tk/sample/demos-en/entry1.rb b/ext/tk/sample/demos-en/entry1.rb
index 6f5b10fb71..29bc693395 100644
--- a/ext/tk/sample/demos-en/entry1.rb
+++ b/ext/tk/sample/demos-en/entry1.rb
@@ -15,10 +15,8 @@ $entry1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($entry1_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($entry1_demo) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -27,7 +25,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($entry1_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -44,9 +42,9 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # 
-e1 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e2 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e3 = TkEntry.new(base_frame, 'relief'=>'sunken')
+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')}
 
 # 
diff --git a/ext/tk/sample/demos-en/entry2.rb b/ext/tk/sample/demos-en/entry2.rb
index d67d04b56d..d4e58d7dd5 100644
--- a/ext/tk/sample/demos-en/entry2.rb
+++ b/ext/tk/sample/demos-en/entry2.rb
@@ -19,10 +19,8 @@ $entry2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($entry2_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($entry2_demo) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -31,7 +29,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($entry2_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -48,7 +46,7 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
+TkFrame.new($entry2_demo, 'borderwidth'=>10) {|w|
   # entry 1
   s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
   e1 = TkEntry.new(w, 'relief'=>'sunken') {
diff --git a/ext/tk/sample/demos-en/entry3.rb b/ext/tk/sample/demos-en/entry3.rb
index f7df3a5653..44f788225c 100644
--- a/ext/tk/sample/demos-en/entry3.rb
+++ b/ext/tk/sample/demos-en/entry3.rb
@@ -17,11 +17,9 @@ $entry3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'5i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+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 \
@@ -30,23 +28,23 @@ 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 \
-invalid character or if trying to type over a character that is not \
+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(base_frame){|f|
+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)
+		 $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)
+		 showCode 'entry3'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
 # focusAndFlash --
@@ -56,50 +54,32 @@ TkFrame.new(base_frame){|f|
 # 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
+# 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
-  if fg && !fg.empty? && bg && !bg.empty?
-    TkTimer.new(200, count, 
-                proc{widget.configure(:foreground=>bg, :background=>fg)}, 
-                proc{widget.configure(:foreground=>fg, :background=>bg)}
-                ).start
-  else
-    # TkTimer.new(150, 3){Tk.bell}.start
-    Tk.bell
-    TkTimer.new(200, count,
-                proc{widget.configure(:foreground=>'white',
-                                      :background=>'black')},
-                proc{widget.configure(:foreground=>'black',
-                                      :background=>'white')}
-                ).at_end{begin
-                           widget.configure(:foreground=>fg,
-                                            :background=>bg)
-                         rescue
-                           # ignore
-                         end}.start
-  end
+  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(base_frame, :text=>"Integer Entry")
+l1 = TkLabelFrame.new($entry3_demo, :text=>"Integer Entry")
 TkEntry.new(l1, :validate=>:focus, 
-            :vcmd=>[
-              proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-            ]) {|e|
-  fg = e.foreground
-  bg = e.background
-  invalidcommand [proc{|w| focusAndFlash(w, fg, bg)}, '%W']
+	    :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(base_frame, :text=>"Length-Constrained Entry")
+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')
+	    :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
@@ -121,7 +101,7 @@ Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
 # Skip over fixed characters in a phone-number string when moving left.
 #
 # Arguments:
-# widget -      The entry widget containing the phone-number.
+# widget -	The entry widget containing the phone-number.
 def phoneSkipLeft(widget)
   idx = widget.index('insert')
   if idx == 8
@@ -141,7 +121,7 @@ end
 # Skip over fixed characters in a phone-number string when moving right.
 #
 # Arguments:
-# widget -      The entry widget containing the phone-number.
+# 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')
@@ -165,53 +145,51 @@ end
 #
 # widget - entry widget to validate
 # vmode -  The widget's validation mode
-# idx -    The index where replacement is to occur
+# 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.
+#	   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})})
+				      :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(base_frame, :text=>"US Phone-Number Entry")
+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|
+	    :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
+	 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(base_frame, :text=>"Password Entry")
+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')
+	    :vcmd=>[
+	      proc{|s| s.length <= 8}, 
+	      '%P'
+	    ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 
-TkFrame.new(base_frame){|f|
+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)
diff --git a/ext/tk/sample/demos-en/filebox.rb b/ext/tk/sample/demos-en/filebox.rb
index 676c347409..7caaaf0ede 100644
--- a/ext/tk/sample/demos-en/filebox.rb
+++ b/ext/tk/sample/demos-en/filebox.rb
@@ -17,14 +17,12 @@ $filebox_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($filebox_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame,'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')
+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(base_frame) {|frame|
+TkFrame.new($filebox_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -42,7 +40,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame
 ['open', 'save'].each{|type|
-  TkFrame.new(base_frame) {|f|
+  TkFrame.new($filebox_demo) {|f|
     TkLabel.new(f, 'text'=>"Select a file to #{type}: ", 'anchor'=>'e')\
     .pack('side'=>'left')
 
@@ -50,7 +48,7 @@ TkFrame.new(base_frame) {|frame|
       pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
 
       TkButton.new(f, 'text'=>'Browse ...', 
-                   'command'=>proc{fileDialog base_frame,e,type})\
+		   'command'=>proc{fileDialog $filebox_demo,e,type})\
       .pack('side'=>'left')
     }
 
@@ -60,10 +58,10 @@ TkFrame.new(base_frame) {|frame|
 
 $tk_strictMotif = TkVarAccess.new('tk_strictMotif')
 if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new(base_frame, 
-                    'text'=>'Use Motif Style Dialog', 
-                    'variable'=>$tk_strictMotif, 
-                    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
+  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)
@@ -87,16 +85,13 @@ def fileDialog(w,ent,operation)
     file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
   else
     file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w, 
-                          'initialfile'=>'Untitled', 
-                          'defaultextension'=>'.txt')
+			  'initialfile'=>'Untitled', 
+			  'defaultextension'=>'.txt')
   end
   if file != ""
     ent.delete 0, 'end'
     ent.insert 0, file
-    # ent.xview 'end'
-    Tk.update_idletasks # need this for Tk::Tile::Entry
-                        # (to find right position of 'xview').
-    ent.xview(ent.index('end'))
+    ent.xview 'end'
   end
 end
 
diff --git a/ext/tk/sample/demos-en/floor.rb b/ext/tk/sample/demos-en/floor.rb
index 7023f2a72e..db4d59fe73 100644
--- a/ext/tk/sample/demos-en/floor.rb
+++ b/ext/tk/sample/demos-en/floor.rb
@@ -12,8 +12,8 @@
 # visible.
 #
 # Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
+# w -		Name of the canvas window.
+# active -	Number of active floor (1, 2, or 3).
 
 def floorDisplay(w,active)
   return if $activeFloor == active
@@ -63,7 +63,7 @@ end
 # highlighted.
 #
 # Arguments:
-# w  -          The name of the canvas window.
+# w  -		The name of the canvas window.
 
 def newRoom(w)
   id = w.find_withtag('current')[0]
@@ -76,8 +76,8 @@ end
 # It highlights the current room and unhighlights any previous room.
 #
 # Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
+# w -		The canvas window displaying the floorplan.
+# args -	Not used.
 
 def roomChanged(w,*args)
   w.delete('highlight')
@@ -94,24 +94,24 @@ end
 # 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.
+# 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)
+		 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'])
@@ -218,17 +218,17 @@ end
 # 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.
+# 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)
+		 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'])
@@ -273,17 +273,17 @@ end
 # 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.
+# 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)
+		 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)
+		 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'])
@@ -303,7 +303,7 @@ def floor_bg3(w,fill,outline)
   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'])
+	      'fill'=>outline, 'tags'=>['floor3','bg'])
 end
 
 # floor_fg1 --
@@ -312,321 +312,321 @@ end
 # floor (office outlines and numbers).
 #
 # Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
+# 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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
@@ -793,327 +793,327 @@ end
 # floor (office outlines and numbers).
 #
 # Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
+# 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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
@@ -1275,215 +1275,215 @@ end
 # floor (office outlines and numbers).
 #
 # Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
+# 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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
@@ -1590,16 +1590,14 @@ $floor_demo = TkToplevel.new {|w|
   minsize(100,100)
 }
 
-base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame, '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."){
+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(base_frame) {|frame|
+$floor_buttons = TkFrame.new($floor_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -1622,17 +1620,17 @@ $floorItems = {}
 
 # canvas 
 if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
+  $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(base_frame, 'orient'=>'horiz', 
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
+			       '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(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+    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')
     }
@@ -1641,7 +1639,7 @@ if $tk_version =~ /^4\.[01]/
   $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
 
 else
-  TkFrame.new(base_frame) {|f|
+  TkFrame.new($floor_demo) {|f|
     pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
 
     h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
@@ -1649,28 +1647,28 @@ else
 
     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')
+				   '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')
+	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     }
 
     v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	   '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)})
+    v.command(proc{|*args| c.yview(*args)})
+    h.command(proc{|*args| c.xview(*args)})
   }
 end
 
@@ -1679,7 +1677,7 @@ end
 
 $currentRoom = TkVariable.new
 $floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken', 
-                           'bd'=>2, 'textvariable'=>$currentRoom)
+			   'bd'=>2, 'textvariable'=>$currentRoom)
 
 # Choose colors, then fill in the floorplan.
 
@@ -1716,7 +1714,7 @@ $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')
+		   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/ext/tk/sample/demos-en/floor2.rb b/ext/tk/sample/demos-en/floor2.rb
deleted file mode 100644
index 88b07aeee4..0000000000
--- a/ext/tk/sample/demos-en/floor2.rb
+++ /dev/null
@@ -1,1722 +0,0 @@
-%# 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)
-}
-
-base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, '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(base_frame) {|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(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor2_canvas = TkCanvas.new($floor2_canvas_frame, 
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, '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(base_frame, '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(base_frame) {|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/ext/tk/sample/demos-en/form.rb b/ext/tk/sample/demos-en/form.rb
index 3119752b1c..dbb14302dc 100644
--- a/ext/tk/sample/demos-en/form.rb
+++ b/ext/tk/sample/demos-en/form.rb
@@ -15,10 +15,8 @@ $form_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($form_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($form_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -27,7 +25,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top', 'fill'=>'x')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($form_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -46,7 +44,7 @@ TkFrame.new(base_frame) {|frame|
 # entry 
 form_data = []
 (1..5).each{|i|
-  f = TkFrame.new(base_frame, 'bd'=>2)
+  f = TkFrame.new($form_demo, 'bd'=>2)
   e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
   l = TkLabel.new(f)
   e.pack('side'=>'right')
diff --git a/ext/tk/sample/demos-en/goldberg.rb b/ext/tk/sample/demos-en/goldberg.rb
deleted file mode 100644
index c6fa37c09c..0000000000
--- a/ext/tk/sample/demos-en/goldberg.rb
+++ /dev/null
@@ -1,2006 +0,0 @@
-#
-# 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)
-}
-
-base_frame = TkFrame.new($goldberg_demo).pack(:fill=>:both, :expand=>true)
-
-=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') {
-    msg = Tk::Label.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']) {
-    Tk::Button.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']) {
-    Tk::Button.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}, 
-    @show = Tk::Button.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 = Tk::Button.new(@parent, :text=>'Start', :bd=>6, 
-                          :command=>proc{do_button(0)})
-    if font = @start['font']
-      @start.font(font.weight('bold'))
-    end
-
-    @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(base_frame)
diff --git a/ext/tk/sample/demos-en/hello b/ext/tk/sample/demos-en/hello
index 5e86ad7e3e..f06eabe518 100644
--- a/ext/tk/sample/demos-en/hello
+++ b/ext/tk/sample/demos-en/hello
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 require 'tk'
 
-#unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
-#  require 'tkencoding'
-#end
+unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
+  require 'tkencoding'
+end
 
 TkButton.new(nil,
 	'text'=>"Hello Ruby world!",
diff --git a/ext/tk/sample/demos-en/hscale.rb b/ext/tk/sample/demos-en/hscale.rb
index e660216967..14e395b61a 100644
--- a/ext/tk/sample/demos-en/hscale.rb
+++ b/ext/tk/sample/demos-en/hscale.rb
@@ -11,9 +11,8 @@ $hscale_demo = TkToplevel.new {|w|
 }
 positionWindow($hscale_demo)
 
-base_frame = TkFrame.new($hscale_demo).pack(:fill=>:both, :expand=>true)
 
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($hscale_demo) {
   font $font
   wraplength '3.5i'
   justify 'left'
@@ -21,7 +20,7 @@ msg = TkLabel.new(base_frame) {
 }
 msg.pack('side'=>'top')
 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($hscale_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc {
@@ -37,18 +36,7 @@ TkFrame.new(base_frame) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-
-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
-
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($hscale_demo) {|frame|
   canvas = TkCanvas.new(frame) {|c|
     width 50
     height 50
@@ -73,3 +61,14 @@ TkFrame.new(base_frame) {|frame|
   }.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/ext/tk/sample/demos-en/icon.rb b/ext/tk/sample/demos-en/icon.rb
index a3921d2333..7557257ef4 100644
--- a/ext/tk/sample/demos-en/icon.rb
+++ b/ext/tk/sample/demos-en/icon.rb
@@ -19,10 +19,8 @@ $icon_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($icon_demo) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -31,7 +29,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($icon_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -50,53 +48,45 @@ TkFrame.new(base_frame) {|frame|
 
 # image 
 flagup = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
+TkBitmapImage.new('file'=>[$demo_dir,
                            'images','flagup.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..','images','flagup.xbm'].join(File::Separator))
+		  'maskfile'=>\
+		  [$demo_dir,'images','flagup.xbm'].join(File::Separator))
 flagdown = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
+TkBitmapImage.new('file'=>[$demo_dir,
                            'images','flagdown.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$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(base_frame, 'borderwidth'=>10){|w|
+TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
   TkFrame.new(w) {|f|
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                    'images','letters.xbm'].join(File::Separator)
+    TkRadioButton.new(f){
+      bitmap '@' + [$demo_dir,'images','letters.xbm'].join(File::Separator)
       variable letters
       value 'full'
     }.pack('side'=>'top', 'expand'=>'yes')
 
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                     'images','noletter.xbm'].join(File::Separator)
+    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) {
-  Tk::CheckButton.new(w) {
+  TkCheckButton.new(w) {
     image flagdown
     selectimage flagup
     indicatoron 0
     selectcolor self['background']
   }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
 
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    bitmap '@' + [$demo_dir,'..',
-                   'images','letters.xbm'].join(File::Separator)
+  TkCheckButton.new(w) {
+    bitmap '@' + [$demo_dir,'images','letters.xbm'].join(File::Separator)
     indicatoron 0
     selectcolor 'SeaGreen1'
   }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
diff --git a/ext/tk/sample/demos-en/image1.rb b/ext/tk/sample/demos-en/image1.rb
index a9072bb308..8d39b20049 100644
--- a/ext/tk/sample/demos-en/image1.rb
+++ b/ext/tk/sample/demos-en/image1.rb
@@ -18,10 +18,8 @@ $image1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($image1_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($image1_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -30,7 +28,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($image1_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -49,17 +47,14 @@ TkFrame.new(base_frame) {|frame|
 
 # image
 image1a = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
+TkPhotoImage.new('file'=>[$demo_dir,
                           'images','earth.gif'].join(File::Separator))
 image1b = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
+TkPhotoImage.new('file'=>[$demo_dir,
                           'images','earthris.gif'].join(File::Separator))
 
 # label
-#[ TkLabel.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-#  TkLabel.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-#].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-[ Tk::Label.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  Tk::Label.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
+[ 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/ext/tk/sample/demos-en/image2.rb b/ext/tk/sample/demos-en/image2.rb
index 1975dd6b02..9924195675 100644
--- a/ext/tk/sample/demos-en/image2.rb
+++ b/ext/tk/sample/demos-en/image2.rb
@@ -19,10 +19,8 @@ $image2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($image2_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -31,7 +29,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($image2_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -48,28 +46,28 @@ TkFrame.new(base_frame) {|frame|
 
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-# create variable
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
+# ÊÑ¿ôÀ¸À®
+$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
 
 # image
 $image2a = TkPhotoImage.new
 
 #
-TkLabel.new(base_frame, 'text'=>'Directory:')\
+TkLabel.new($image2_demo, 'text'=>'Directory:')\
 .pack('side'=>'top', 'anchor'=>'w')
 
-image2_e = TkEntry.new(base_frame) {
+image2_e = TkEntry.new($image2_demo) {
   width 30
   textvariable $dirName
 }.pack('side'=>'top', 'anchor'=>'w')
 
-TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
+TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20)\
 .pack('side'=>'top', 'anchor'=>'w')
 
-TkLabel.new(base_frame, 'text'=>'File:')\
+TkLabel.new($image2_demo, 'text'=>'File:')\
 .pack('side'=>'top', 'anchor'=>'w')
 
-TkFrame.new(base_frame){|w|
+TkFrame.new($image2_demo){|w|
   s = TkScrollbar.new(w)
   l = TkListbox.new(w) {
     width 20
@@ -88,9 +86,9 @@ TkFrame.new(base_frame){|w|
 }.pack('side'=>'top', 'anchor'=>'w')
 
 # image 
-[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
-  TkLabel.new(base_frame, 'text'=>'Image:'),
-  TkLabel.new(base_frame, 'image'=>$image2a)
+[ 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')}
 
 # 
diff --git a/ext/tk/sample/demos-en/image3.rb b/ext/tk/sample/demos-en/image3.rb
index 43afab7ecd..d997ef7772 100644
--- a/ext/tk/sample/demos-en/image3.rb
+++ b/ext/tk/sample/demos-en/image3.rb
@@ -19,29 +19,26 @@ $image3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-
 # 
-def loadDir3(w)
+def loadDir(w)
   w.delete(0,'end')
   Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
     w.insert('end',File.basename(f))
   }
 end
 
-# selectAndLoadDir3 --
+# 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 selectAndLoadDir3(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName.value, 
-                           :parent=>w, :mustexist=>true)
+# w -			Name of the toplevel window of the demo.
+def selectAndLoadDir(w, lbox)
+  dir = Tk.chooseDirectory(:initialdir=>$dirName, :parent=>w, :mustexist=>true)
   if dir.length > 0
     $dirName.value = dir 
-    loadDir3(lbox)
+    loadDir(lbox)
   end
 end
 
@@ -51,7 +48,7 @@ end
 
 
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($image3_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -60,7 +57,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($image3_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -78,7 +75,7 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # variable
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
+$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
 
 # image
 begin
@@ -88,38 +85,37 @@ end
 $image3a = TkPhotoImage.new
 
 #
-image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
+image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
 
-image3_df = TkLabelFrame.new(base_frame, :text=>'Directory:')
+image3_df = TkLabelFrame.new($image3_demo, :text=>'Directory:')
 
-image3_ff = TkLabelFrame.new(base_frame, :text=>'File:', 
-                             :padx=>'2m', :pady=>'2m')
+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))
+					     :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{loadDir3(image3_lbx)})
+  bind('Return', proc{loadDir(image3_lbx)})
 }
 
 TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.", 
-             :command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
+	     :command=>proc{selectAndLoadDir(image3_ent, image3_lbx)}) {
   pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
 }
 
-image3_if = TkLabelFrame.new(base_frame, :text=>'Image:') {|f|
-  # TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-  Tk::Label.new(f, :image=>$image3a).pack(:padx=>'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)
+	:sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
 Tk.grid(image3_ff, image3_if, 
-        :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+	:sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
 TkGrid.columnconfigure(image3_f, 1, :weight=>1)
 
diff --git a/ext/tk/sample/demos-en/images/earth.gif b/ext/tk/sample/demos-en/images/earth.gif
new file mode 100644
index 0000000000..3ae4a9ce01
--- /dev/null
+++ b/ext/tk/sample/demos-en/images/earth.gif
diff --git a/ext/tk/sample/demos-en/images/earthris.gif b/ext/tk/sample/demos-en/images/earthris.gif
new file mode 100644
index 0000000000..48f08c4421
--- /dev/null
+++ b/ext/tk/sample/demos-en/images/earthris.gif
diff --git a/ext/tk/sample/images/face.xbm b/ext/tk/sample/demos-en/images/face.xbm
index 03d829f4d1..03d829f4d1 100644
--- a/ext/tk/sample/images/face.xbm
+++ b/ext/tk/sample/demos-en/images/face.xbm
diff --git a/ext/tk/sample/images/flagdown.xbm b/ext/tk/sample/demos-en/images/flagdown.xbm
index 55abc51825..55abc51825 100644
--- a/ext/tk/sample/images/flagdown.xbm
+++ b/ext/tk/sample/demos-en/images/flagdown.xbm
diff --git a/ext/tk/sample/images/flagup.xbm b/ext/tk/sample/demos-en/images/flagup.xbm
index 6eb0d846a3..6eb0d846a3 100644
--- a/ext/tk/sample/images/flagup.xbm
+++ b/ext/tk/sample/demos-en/images/flagup.xbm
diff --git a/ext/tk/sample/images/gray25.xbm b/ext/tk/sample/demos-en/images/gray25.xbm
index b234b3cb0b..b234b3cb0b 100644
--- a/ext/tk/sample/images/gray25.xbm
+++ b/ext/tk/sample/demos-en/images/gray25.xbm
diff --git a/ext/tk/sample/images/grey.25 b/ext/tk/sample/demos-en/images/grey.25
index b234b3cb0b..b234b3cb0b 100644
--- a/ext/tk/sample/images/grey.25
+++ b/ext/tk/sample/demos-en/images/grey.25
diff --git a/ext/tk/sample/images/grey.5 b/ext/tk/sample/demos-en/images/grey.5
index 37688893f0..37688893f0 100644
--- a/ext/tk/sample/images/grey.5
+++ b/ext/tk/sample/demos-en/images/grey.5
diff --git a/ext/tk/sample/images/letters.xbm b/ext/tk/sample/demos-en/images/letters.xbm
index 0f12568d1a..0f12568d1a 100644
--- a/ext/tk/sample/images/letters.xbm
+++ b/ext/tk/sample/demos-en/images/letters.xbm
diff --git a/ext/tk/sample/images/noletter.xbm b/ext/tk/sample/demos-en/images/noletter.xbm
index 5774124efe..5774124efe 100644
--- a/ext/tk/sample/images/noletter.xbm
+++ b/ext/tk/sample/demos-en/images/noletter.xbm
diff --git a/ext/tk/sample/images/pattern.xbm b/ext/tk/sample/demos-en/images/pattern.xbm
index df31baf789..df31baf789 100644
--- a/ext/tk/sample/images/pattern.xbm
+++ b/ext/tk/sample/demos-en/images/pattern.xbm
diff --git a/ext/tk/sample/demos-en/images/tcllogo.gif b/ext/tk/sample/demos-en/images/tcllogo.gif
new file mode 100644
index 0000000000..3fc7720b17
--- /dev/null
+++ b/ext/tk/sample/demos-en/images/tcllogo.gif
diff --git a/ext/tk/sample/demos-en/images/teapot.ppm b/ext/tk/sample/demos-en/images/teapot.ppm
new file mode 100644
index 0000000000..78afefbf82
--- /dev/null
+++ b/ext/tk/sample/demos-en/images/teapot.ppm
@@ -0,0 +1,56 @@
+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
+ˆ`O~[NqUM[-	‰HUGJUGJVGJVGJVHJWHJWHJWHKWHKXHKXHKXHKXHKXHKXIKXIKXIKXIKXIKh>!Y0
+
+L&C!:4
+�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
+

+\À\À\À\À\À\À\À\À\À B B
+$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
+\À\À\À\À\À B'D+E$(1J/jH1NCJUGJYIKUGJ\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀXHK]KKbNLfOLiQLkRMmSMoTMqUMxXN\N†_OŒbP’fP˜hQ�kQ¡mR¥oR§pS¦pR˜hQ¢mR¥oR¨pSªqS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rSªrSªrSªrS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS¬rS¬rS¬rS¬rS¬rS¬rS¬rS¬sS¬sS­sS­sS­sS­sS­sS­sS®sS®sS®sS®sS®tS¯tS°tS°uS±uS±uT±uT²uT²uT²uT´vTµwT´vT³vT²uT¯tS¢mR¯tS±uT±uS®tS«rS§pR¢mR�kQ—hQ‘ePŠaPƒ^O\N{ZNvXNqUMpTMnSMlRM�P%\À\À\À\À B#C*E$.E- .!G$Y:%d<"SFJYIKZIKNCJ\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀPDJZIK_LKdNLgPLjQLlRMnSMpTMqUMuWMyYN€\O†`O�cP’fP—hQœjQ¡mR¥oR¨qS«rS«rSªrS mR

+!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ç£|쩂ſt명æ¦�ÞŸ{Õ—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ËŒiljgÆ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ÌŽlljgÃ…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
+|>
+
++,!.! "`E6†iYŒlZ�o\“q]•s^�^J™va›wb�ycŸzd {e¤}foTMqUMsVMuWNwXNyYN{ZN|ZN~[N\O�]O‚]Oƒ^O…_O†_O‡`Oˆ`O‰aOŠaP‹bPŒbPŒcP�cPŽcPŽdP�dP�dP�dP�eP‘eP‘eP‘eP’eP’eP’eP’eP’fP’fP’fP“fP’fP’fP’fP’eP’eP’eP‘eP‘eP‘eP�eP�dP�dP�dPŽdPŽcP�cPŒcPŒbP‹bPŠaP‰aOˆ`O‡`O†_O…_Oƒ^O‚]O�]O\O~[N|[N{ZNyYNwXN®ƒi¬ƒiª‚i¨�i¦€hŒhR‰fQ†dQ‚bP•wfx]Oˆpdkbtd_m`]OEDG?A;:@.S….S….S….S….S…/S…/S…/S…/S…/S…/S…/S…/S…TxªTxªTxªTxªTxªTx«Tx«Tx«Ty«/S†GlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlž…ªÜ…ªÜ…ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlž…ªÜ…ªÜ£Ö£Ö£Ö£Ö¤Ö¤Ö¤Ö¤Ö¤ÖEi›€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤×€¤×€¤×€¤×€¥×€¥×€¥×Bg™Bg™Bg™Bg™Bg™&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Af˜Af˜%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|%I|%I|%I|%I|
++,YA5jPBpSD‹l[�o]’q^–t`‚_Kšwbœycžze {f¡}g¤h¨�i”lSrVMtWMvWNxXNyYN{ZN|[N~[N\O�]O‚]Oƒ^O„_O…_O†`O‡`Oˆ`O‰aPŠaP‹bP‹bPŒbP�cP�cPŽcPŽcP�dP�dP�dP�dP�dP�dP�dP�dP�eP�eP�eP�eP�eP�dP�dP�dP�dP�dP�dP�dPŽcPŽcP�cP�cPŒbP‹bP‹bPŠaP‰aOˆ`O‡`O†`O…_O„^Oƒ^O‚]O€]O\O~[N|[N{ZNyYNxXN°…j®„j¬„jªƒj¨‚j¦€jŒhSŠgS†eRƒcR|`QŒsf…oe}jcrd`k_]LCDC=@,,3(4F(4F.S….S…/S…/S…/S…/S…/S…/S…/S…TxªTxªTxªTxªTxªTxªTx«Tx«Tx«Ty«Ty«Ty«…ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlž†ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžChšChš¤Ö€¤Ö€¤Ö€¤Ö€¤ÖEi›Ei›Ei›€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤×€¤×€¤×€¤×Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Bg™Bg™&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜&J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|%I|%I|%I|#5H71O;3V?4iOBoSDsVF�o]{[I^Kƒ`L…bN‡dOŸ{f }g¢~h¥€j’kT•mU˜oVšqW�rWwXNxXNzYN{ZN}[N~[N\O€]O‚]Oƒ^O„^O…_O…_O†`O‡`Oˆ`O‰aO‰aPŠaP‹bP‹bPŒbPŒbPŒcP�cP�cP�cPŽcPŽcPŽcPŽcPŽcPŽcPŽcPŽcPŽcPŽcP�cP�cP�cPŒcPŒbP‹bP‹bP‹bPŠaP‰aP‰aOˆ`O‡`O†_O…_O„_O„^Oƒ^O�]O€\O\N~[N|ZN{ZNyYN›oTšoT™oT—nT¬„lªƒl¨‚l�jUŒiTŠhT†fT€cS�vi‰rg�nfyidqdah^^HBD?<@)+3OZkMYk(5F(5F(5F/S…/S…/S…/S…/S…TxªTxªTxªTxªTxªTxªTx«Tx«Ty«Ty«Ty«Ty«Uy«†ªÜ†ªÜ†ªÜ†ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlž†ªÜ†ªÜ†ªÜ†ªÜ†ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžDhšDhšDhšChš&K}&K}&K}&K}&K}&K}ChšChšCgšCgšCgšCgšCgšCgšCg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™&J|&J|&J|&J|&J|&J|Bg™Bg™Bg™Bf™Bf™Bf™Bf™Bf™Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜&J|&J|&J|&J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|A99N?;L:2T>4gNBlRD‡k\‹n^z[J~^L�aN…cO‡dP‰fQŠgRŒhT�jU’lV•nW˜pXšrX�sY¶‹q¸�qºŽr¼�r½�r¿�s©z[©z[ªz[«{[¬{[¬{ZÅ“rÅ’qÅ’qÅ’pÅ’pÅ‘o­yV­xV¬xU¬wT¬wTŠaPŠbP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bPŠaPŠaPŠaP‰aP‰aOˆaOˆ`O‡`O‡`O†_O…_O„^Oƒ^O‚^O‚]O�]O€\O~\N}[N|ZNzYN�pTœpU›pUšpU˜oV—oV•nV“mV‘lV�kVŒjVˆhVƒfU~cU�uj†qh~mfugdkaad\^E@D98?$(2minffm^blV^lMYk(5F(5F/S…TxªTxªTxªTxªTxªTxªTxªTx«Tx«Ty«Ty«Ty«Uy«Uy«†ªÜ†ªÜ†ªÜ†ªÜ†ªÜ†ªÜ†ªÜ†ªÜHlžHlžHlžHlžHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸ'K}'K}'K}'K}'K}'K}'K}'K}'K}&K}&K}ChšChšChšChšChšChšChšCgšCgšCgšCgšCgšCgšCg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™&J|Cg™Cg™Cg™Cg™Cg™Bg™Bg™Bg™Bg™Bg™Bg™Bf™Bf™Bf™Bf™Bf™Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜&J|&J|&J|&J|&J|&J|&J|%J|%J|%J|%J|%J|%J|%J|Ae˜Ae˜;GY<68I=:I82Q=4XA6~fZ„j\‰m^�p`|]L€`NƒcP†eQˆgS¡j£€l¦‚m©„n•oX˜qYšrZ�t[¶Œr¸�sº�s¼�t½�t¾‘t¨z]©{]ª{]«{\«{\¬{\¬{[Ä“sÄ“rÄ’rÄ’qÄ’pÄ‘p¬yWÄ�oÃ�nÃ�mÃ�lÂŽlÂŽkÁ�kˆaOˆaOˆaOˆaOˆaOˆaOˆaOˆ`Oˆ`O‡`O‡`O‡`O†`O†_O…_O…_O„_O„^Oƒ^O‚]O�]O€]O\O~\N}[N|ZN¶‰l¶‰lµˆmœqV›qVšqV™pW˜pW–oW¬…nª…n§„n¤‚nŸ€n›~n€eW‘xlŠtk‚piykfodcf_`JDG@>C*,5$1MYk�tr~tstmolinadmX_lNZkMZkTxªTxªTxªTxªTx«Tx«Tx«Ty«Ty«Ty«Uy«Uy«Uy«†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†«Ý†«Ý†«Ý†«ÝHlŸHlŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸ†«Ý†«Ý†«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«ÝHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸ'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}DhšDhšDhšDhšChšChšChšChšChšChšChšCgšCgšCgšCgšCgšCgšCg™Cg™Cg™Cg™Cg™&J}&J}&J}Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Bg™Bg™Bg™Bg™Bg™Bg™Bf™Bf™Bf™Bf™Bf˜Bf˜Bf˜Bf˜Bf˜&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Af˜Af˜Af˜Af˜;GY;GY;GY1'!D:9N?;N;3]I?zdY€h[†l^‹oa�sc“ue€bQ„dR‡fT l¢�m¦ƒn©…o«‡p®ˆq±Šr³‹sžv] w]¹�u»�u¼‘u¾‘u¿’v¨{^©{^ª|^«|]«|]«{\¬{\¬{[¬{[¬zZ«zZ«yY«yX«xXÂ�oÂ�nÂ�nÁŽmÁŽm¨uT¨uS§tS§tS§tR¦sR¦sQ…_O…_O…_O„^O„^Oƒ^Oƒ^O‚^O‚]O�]O€]O¢rS¡rS¡rS¸‰k·‰l·‰l¶‰m¶‰mµ‰m´‰n³‰n›qWšqX™qX®‡o­‡o«†p¨…p¤ƒp �pœp—}o{cXv`Vp]U}nishfhaba\_DAF::B$)4

+., 7(8'A1&F4(L8*oXIw]Jpdasfcvhexkg{mi~oj€qll\Xn^Yp`Zpa[qa\rb]rc^sc^sd_ue`wf`xgayhayhayhb�x�y‘y‘y‘y‘y�y�~ywgbvfateasd`qd`pc`nb_la_€ut|ssxqrunpZUXVRWROUMMSHIRIC@967-/3'+0(*-ACF?AD;=@#%(



+.+>1(B3)B2&F4'E4)gTGlXJs^OzcTzaPqfethgvjhbVTcWUdXVeYWfZXg[Yh\Zi]Zi][j^\€us€ususts~tt~tt}tt|st{stut~tt|sszrsyqrwpquoqsmpqloXTXTQWPOULLSSJEA<:=99757335./2113)+.'),)+.8:="(
+"6*#5*">2)>0&A2'C3(I8-^OFbRHfUJjXMq^RwcVzfYfRDfQCdN@zdTqijrjksklrklrklrklqjmpjmpjmojmojmnimmimkhliflscYm`Xg\VbYT^VRE>;A<:>98:77645:873220/0,-/)+.*,/#%( &
+
+&3#.$-% .% .& /&!,#,#@70A71XNHXNHWNHWNHZRLYQLYQLXQLWQLWPLUOLSNLQMKOLJMJJ0//.-.,,-&(+"(!'			
+
+%' %$#" ! !$
+
+
+						



+
+

+* 															

+








	;?E7CU;HY=I[
diff --git a/ext/tk/sample/demos-en/items.rb b/ext/tk/sample/demos-en/items.rb
index 3fd44fd4f4..8447430694 100644
--- a/ext/tk/sample/demos-en/items.rb
+++ b/ext/tk/sample/demos-en/items.rb
@@ -19,10 +19,8 @@ $items_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($items_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame) {
+TkLabel.new($items_demo) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -30,7 +28,7 @@ TkLabel.new(base_frame) {
 }.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($items_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -48,7 +46,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame
 cvs = nil
-TkFrame.new(base_frame) {|cf|
+TkFrame.new($items_demo) {|cf|
   # canvas 
   cvs = TkCanvas.new(cf) {|c|
     focus
@@ -76,11 +74,11 @@ TkFrame.new(base_frame) {|cf|
 
     else
       c.grid('in'=>cf, 'row'=>0, 'column'=>0, 
-             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	     'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
       vs.grid('row'=>0, 'column'=>1, 
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
       hs.grid('row'=>1, 'column'=>0, 
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
       TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
       TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
 
@@ -96,13 +94,8 @@ 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)
 
-if $tk_version =~ /^4.*/
-  font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-  font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
-else
-  font1 = 'Helvetica 12'
-  font2 = 'Helvetica 24 bold'
-end
+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'
@@ -121,129 +114,129 @@ $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 )
+	    '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 )
+	    '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 )
+	    '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 )
+	    'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round', 
+	    'tags'=>$tag_item )
 
 TkcText.new(cvs, '15c', '.2c', 
-            'text'=>'Curves (smoothed lines)', 'anchor'=>'n')
+	    '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 )
+	    '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 )
+	    '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 )
+	    '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 )
+	       '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)
+	       '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, '..',
+	       '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 )
+	       '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)
+		 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
 TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c', 
-                 'fill'=>green, 'tags'=>$tag_item )
+		 '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 )
+		 '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)
+		 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
 TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c', 
-                 'fill'=>green, 'tags'=>$tag_item )
+		 '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 )
+		 '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 )
+	    '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 )
+	    '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, '..',
+	      'stipple'=>'@' + [$demo_dir, 
                                 'images', 'grey.5'].join(File::Separator),
-              'text'=>'Stippled characters', 'tags'=>$tag_item )
+	      '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 )
+	      '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)
+	   '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)
+#	   '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, '..',
+	   'outline'=>blue, 'start'=>135, 'extent'=>270, 
+	   'outlinestipple'=>'@'+[$demo_dir, 
                                   'images','gray25.xbm'].join(File::Separator),
-           'tags'=>$tag_item)
+	   '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)
+	   '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)
+	   '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)
+#	      'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
+#	      'tags'=>$tag_item)
 TkcBitmap.new(cvs, '13c','20c',
-              'bitmap'=>'@' + [$demo_dir, '..',
+	      'bitmap'=>'@' + [$demo_dir, 
                                'images', 'face.xbm'].join(File::Separator),
-              'tags'=>$tag_item)
+	      'tags'=>$tag_item)
 #TkcBitmap.new(cvs, '17c','18.5c',
-#             'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
-#             'tags'=>$tag_item)
+#	      '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)
+	      '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)
+#	      'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
+#	      'tags'=>$tag_item)
 # 
 TkcBitmap.new(cvs, '17c','21.5c') {
-  bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
+  bitmap '@' + [$demo_dir, 'images', 'letters.xbm'].join(File::Separator)
   tags $tag_item
 }
 #TkcBitmap.new(cvs, '17c','21.5c') {
@@ -256,17 +249,17 @@ TkButton.new(cvs) {|b|
   text 'Press Me'
   command proc{butPress cvs, red}
   TkcWindow.new(cvs, '21c','18c', 
-                'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
+		'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)
+		'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
 }
 TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c', 
-            'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
+	    'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
   TkcWindow.new(cvs, '28.5c','17.5c', 
-                'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
+		'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')
@@ -331,7 +324,7 @@ def itemStroke(c,x,y)
   if $areaX1 != x && $areaY1 != y
     c.delete 'area'
     c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y, 
-                                              '-outline', 'black')
+					      '-outline', 'black')
     $areaX2 = x
     $areaY2 = y
   end
@@ -376,6 +369,6 @@ end
 
 def butPress(w,color)
   i = TkcText.new(w, '25c', '18.1c', 
-                  'text'=>'Ouch!!', 'fill'=>color, 'anchor'=>'n')
+		  'text'=>'Ouch!!', 'fill'=>color, 'anchor'=>'n')
   Tk.after(500, proc{w.delete i})
 end
diff --git a/ext/tk/sample/demos-en/knightstour.rb b/ext/tk/sample/demos-en/knightstour.rb
deleted file mode 100644
index 618fce5f02..0000000000
--- a/ext/tk/sample/demos-en/knightstour.rb
+++ /dev/null
@@ -1,271 +0,0 @@
-# Based on the widget demo of Tcl/Tk8.5.2
-# The following is the original copyright text.
-#----------------------------------------------------------------------------
-# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-#	Calculate a Knight's tour of a chessboard.
-#
-#	This uses Warnsdorff's rule to calculate the next square each
-#	time. This specifies that the next square should be the one that
-#	has the least number of available moves.
-#
-#	Using this rule it is possible to get to a position where
-#	there are no squares available to move into. In this implementation
-#	this occurs when the starting square is d6.
-#
-#	To solve this fault an enhancement to the rule is that if we
-#	have a choice of squares with an equal score, we should choose
-#	the one nearest the edge of the board.
-#
-#	If the call to the Edgemost function is commented out you can see
-#	this occur.
-#
-#	You can drag the knight to a specific square to start if you wish.
-#	If you let it repeat then it will choose random start positions
-#	for each new tour.
-#----------------------------------------------------------------------------
-require 'tk'
-
-class Knights_Tour
-  # Return a list of accessible squares from a given square
-  def valid_moves(square)
-    moves = []
-    [
-      [-1,-2], [-2,-1], [-2,1], [-1,2], [1,2], [2,1], [2,-1], [1,-2]
-    ].each{|col_delta, row_delta|
-      col = (square % 8) + col_delta
-      row = (square.div(8)) + row_delta
-      moves << (row * 8 + col) if row > -1 && row < 8 && col > -1 && col < 8
-    }
-    moves
-  end
-
-  # Return the number of available moves for this square
-  def check_square(square)
-    valid_moves(square).find_all{|pos| ! @visited.include?(pos)}.length
-  end
-
-  # Select the next square to move to. Returns -1 if there are no available
-  # squares remaining that we can move to.
-  def next_square(square)
-    minimum = 9
-    nxt = -1
-    valid_moves(square).each{|pos|
-      unless @visited.include?(pos)
-        cnt = check_square(pos)
-        if cnt < minimum
-          minimum = cnt
-          nxt = pos
-        elsif cnt == minimum
-          nxt = edgemost(nxt, pos)
-        end
-      end
-    }
-    nxt
-  end
-
-  # Select the square nearest the edge of the board
-  def edgemost(nxt, pos)
-    col_A = 3 - ((3.5 - nxt % 8).abs.to_i)
-    col_B = 3 - ((3.5 - pos % 8).abs.to_i)
-    row_A = 3 - ((3.5 - nxt.div(8)).abs.to_i)
-    row_B = 3 - ((3.5 - pos.div(8)).abs.to_i)
-    (col_A * row_A < col_B * row_B)? nxt : pos
-  end
-
-  # Display a square number as a standard chess square notation.
-  def _N(square)
-    '%c%d' % [(97 + square % 8), (square.div(8) + 1)]
-  end
-
-  # Perform a Knight's move and schedule the next move.
-  def move_piece(last, square)
-    @log.insert(:end, "#{@visited.length}. #{_N last} -> #{_N square}\n", '')
-    @log.see(:end)
-    @board.itemconfigure(1+last, :state=>:normal, :outline=>'black')
-    @board.itemconfigure(1+square, :state=>:normal, :outline=>'red')
-    @knight.coords(@board.coords(1+square)[0..1])
-    @visited << square
-    if (nxt = next_square(square)) != -1
-      @after_id = Tk.after(@delay.numeric){move_piece(square, nxt) rescue nil}
-    else
-      @start_btn.state :normal
-      if @visited.length == 64
-        if @initial == square
-          @log.insert :end, 'Closed tour!'
-        else
-          @log.insert :end, "Success\n", {}
-          Tk.after(@delay.numeric * 2){tour(rand(64))} if @continuous.bool
-        end
-      else
-        @log.insert :end, "FAILED!\n", {}
-      end
-    end
-  end
-
-  # Begin a new tour of the board given a random start position
-  def tour(square = nil)
-    @visited.clear
-    @log.clear
-    @start_btn.state :disabled
-    1.upto(64){|n|
-      @board.itemconfigure(n, :state=>:disabled, :outline=>'black')
-    }
-    unless square
-      square = @board.find_closest(*(@knight.coords << 0 << 65))[0].to_i - 1
-    end
-    @initial = square
-    Tk.after_idle{ move_piece(@initial, @initial) rescue nil }
-  end
-
-  def _stop
-    Tk.after_cancel(@after_id) rescue nil
-  end
-
-  def _exit
-    _stop
-    $knightstour.destroy
-  end
-
-  def set_delay(new)
-    @delay.numeric = new.to_i
-  end
-
-  def drag_start(w, x, y)
-    w.dtag('selected')
-    w.addtag('selected', :withtag, 'current')
-    @dragging = [x, y]
-  end
-
-  def drag_motion(w, x, y)
-    return unless @dragging
-    w.move('selected', x - @dragging[0], y - @dragging[1])
-    @dragging = [x, y]
-  end
-
-  def drag_end(w, x, y)
-    square = w.find_closest(x, y, 0, 65)
-    w.coords('selected', w.coords(square)[0..1])
-    w.dtag('selected')
-    @dragging = nil
-  end
-
-  def make_SeeDismiss
-    ## See Code / Dismiss
-    frame = Ttk::Frame.new($knightstour)
-    sep = Ttk::Separator.new(frame)
-    Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-    TkGrid('x', 
-           Ttk::Button.new(frame, :text=>'See Code', 
-                           :image=>$image['view'], :compound=>:left, 
-                           :command=>proc{showCode 'knightstour'}), 
-           Ttk::Button.new(frame, :text=>'Dismiss', 
-                           :image=>$image['delete'], :compound=>:left, 
-                           :command=>proc{
-                             $knightstour.destroy
-                             $knightstour = nil
-                           }), 
-           :padx=>4, :pady=>4)
-    frame.grid_columnconfigure(0, :weight=>1)
-    frame
-  end
-
-  def create_gui(parent = nil)
-    $knightstour.destroy rescue nil
-    $knightstour = Tk::Toplevel.new(parent, :title=>"Knight's tour")
-    $knightstour.withdraw
-    base_f = Ttk::Frame.new($knightstour)
-    @board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
-    @log = Tk::Text.new(base_f, :width=>12, :height=>1, 
-                        :font=>'Arial 8', :background=>'white')
-    scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
-
-    @visited = []
-    @delay = TkVariable.new(600)
-    @continuous = TkVariable.new(false)
-
-    tool_f = Ttk::Frame.new($knightstour)
-    label = Ttk::Label.new(tool_f, :text=>'Speed')
-    scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay, 
-                           :command=>proc{|n| set_delay(n)})
-    check = Ttk::Checkbutton.new(tool_f, :text=>'Repeat', 
-                                 :variable=>@continuous)
-    @start_btn = Ttk::Button.new(tool_f, :text=>'Start', 
-                                 :command=>proc{tour()})
-    @exit_btn = Ttk::Button.new(tool_f, :text=>'Exit', 
-                                :command=>proc{_exit()})
-
-    7.downto(0){|row|
-      0.upto(7){|col|
-        if ((col & 1) ^ (row & 1)).zero?
-          fill  = 'bisque'
-          dfill = 'bisque3'
-        else
-          fill  = 'tan3'
-          dfill = 'tan4'
-        end
-        coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
-        @board.create(TkcRectangle, coords, 
-                      :fill=>fill, :disabledfill=>dfill,
-                      :width=>2, :state=>:disabled)
-      }
-    }
-
-    @knight_font = TkFont.new(:size=>-24)
-    @knight = TkcText.new(@board, 0, 0, :font=>@knight_font, 
-                          :text=>Tk::UTF8_String.new('\u265e'), 
-                          :anchor=>'nw', # :tags=>'knight', 
-                          :fill=>'black', :activefill=>'#600000')
-    @knight.coords(@board.coords(rand(64)+1)[0..1])
-    @knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
-    @knight.bind('Motion', '%W %x %y'){|w,x,y| drag_motion(w,x,y)}
-    @knight.bind('ButtonRelease-1', '%W %x %y'){|w,x,y| drag_end(w,x,y)}
-
-    Tk.grid(@board, @log, scr, :sticky=>'news')
-    base_f.grid_rowconfigure(0, :weight=>1)
-    base_f.grid_columnconfigure(0, :weight=>1)
-
-    Tk.grid(base_f, '-', '-', '-', '-', '-', :sticky=>'news')
-    widgets = [label, scale, check, @start_btn]
-    sg = nil
-    unless $RubyTk_WidgetDemo
-      widgets << @exit_btn
-      if Tk.windowingsystem != 'aqua'
-        #widgets.unshift(Ttk::SizeGrip.new(tool_f))
-        Ttk::SizeGrip.new(tool_f).pack(:side=>:right, :anchor=>'se')
-      end
-    end
-    Tk.pack(widgets, :side=>:right)
-    if Tk.windowingsystem == 'aqua'
-      TkPack.configure(widgets, :padx=>[4, 4], :pady=>[12, 12])
-      TkPack.configure(widgets[0], :padx=>[4, 24])
-      TkPack.configure(widgets[-1], :padx=>[16, 4])
-    end
-
-    Tk.grid(tool_f, '-', '-', '-', '-', '-', :sticky=>'ew')
-
-    if $RubyTk_WidgetDemo
-      Tk.grid(make_SeeDismiss(), '-', '-', '-', '-', '-', :sticky=>'ew')
-    end
-
-    $knightstour.grid_rowconfigure(0, :weight=>1)
-    $knightstour.grid_columnconfigure(0, :weight=>1)
-
-    $knightstour.bind('Control-F2'){TkConsole.show}
-    $knightstour.bind('Return'){@start_btn.invoke}
-    $knightstour.bind('Escape'){@exit_btn.invoke}
-    $knightstour.bind('Destroy'){ _stop }
-    $knightstour.protocol('WM_DELETE_WINDOW'){ _exit }
-
-    $knightstour.deiconify
-    $knightstour.tkwait_destroy
-  end
-
-  def initialize(parent = nil)
-    create_gui(parent)
-  end
-end
-
-Tk.root.withdraw unless $RubyTk_WidgetDemo
-Thread.new{Tk.mainloop} if __FILE__ == $0
-Knights_Tour.new
diff --git a/ext/tk/sample/demos-en/label.rb b/ext/tk/sample/demos-en/label.rb
index 91e41e4a22..ef1bfa6f8a 100644
--- a/ext/tk/sample/demos-en/label.rb
+++ b/ext/tk/sample/demos-en/label.rb
@@ -19,10 +19,8 @@ $label_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($label_demo).pack(:fill=>:both, :expand=>true)
-
 # label 
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($label_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -31,7 +29,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($label_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -49,21 +47,20 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # label demo 
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
+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')}
+				  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
 
 # label 
 [ TkLabel.new(f_left, 'text'=>'First label'),
   TkLabel.new(f_left, 'text'=>'Second label, raised', 
-              'relief'=>'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) {
-Tk::Label.new(f_right) {
-  bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
+TkLabel.new(f_right) {
+  bitmap('@' + [$demo_dir,'images','face.xbm'].join(File::Separator))
   borderwidth 2
   relief 'sunken'
 }.pack('side'=>'top')
diff --git a/ext/tk/sample/demos-en/labelframe.rb b/ext/tk/sample/demos-en/labelframe.rb
index c912ff4c52..8636a4a9b9 100644
--- a/ext/tk/sample/demos-en/labelframe.rb
+++ b/ext/tk/sample/demos-en/labelframe.rb
@@ -17,12 +17,10 @@ $labelframe_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
-
 # Some information
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+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, \
@@ -31,32 +29,32 @@ which supports a 'labelframe' widget.
 EOL
 
 # The bottom buttons
-TkFrame.new(base_frame){|f|
+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)
+		 $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)
+		 showCode 'labelframe'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
 # Demo area
-w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both, 
-                                       :expand=>true)
+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|
+		 :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) {
+		      :variable=>v, :value=>i) {
       pack(:side=>:top, :fill=>:x, :pady=>2)
     }
   }
@@ -79,7 +77,7 @@ end
 
 TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
   TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy, 
-                    :text=>"Use this option.", :padx=>0) {|cb|
+		    :text=>"Use this option.", :padx=>0) {|cb|
     command proc{lfEnableButtons(f)}
     f.labelwidget(cb)
   }
diff --git a/ext/tk/sample/demos-en/mclist.rb b/ext/tk/sample/demos-en/mclist.rb
deleted file mode 100644
index a849eba515..0000000000
--- a/ext/tk/sample/demos-en/mclist.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# mclist.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget configured as a multi-column listbox.
-#
-# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($mclist_demo) && $mclist_demo
-  $mclist_demo.destroy 
-  $mclist_demo = nil
-end
-
-$mclist_demo = TkToplevel.new {|w|
-  title("Multi-Column List")
-  iconname("mclist")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', 
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6], 
-               :text=><<EOL).pack(:fill=>:x)
-Ttk is the new Tk themed widget set. \
-One of the widgets it includes is a tree widget, \
-which can be configured to display multiple columns of informational data \
-without displaying the tree itself. \
-This is a simple way to build a listbox that has multiple columns. \
-Clicking on the heading for a column will sort the data by that column. \
-You can also change the width of the columns \
-by dragging the boundary between them.
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'See Code', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'mclist'}), 
-         Ttk::Button.new(frame, :text=>'Dismiss', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $mclist_demo.destroy
-                           $mclist_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-container = Ttk::Frame.new(base_frame)
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency), 
-                          :show=>:headings)
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-container.pack(:fill=>:both, :expand=>true)
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
-
-## The data we're going to insert
-data = [
-  ['Argentina', 	'Buenos Aires', 	'ARS'], 
-  ['Australia',		'Canberra',		'AUD'], 
-  ['Brazil', 		'Brazilia', 		'BRL'], 
-  ['Canada', 		'Ottawa', 		'CAD'], 
-  ['China',		'Beijing', 		'CNY'], 
-  ['France',		'Paris', 		'EUR'], 
-  ['Germany', 		'Berlin',		'EUR'], 
-  ['India', 		'New Delhi',		'INR'], 
-  ['Italy', 		'Rome', 		'EUR'], 
-  ['Japan', 		'Tokyo', 		'JPY'], 
-  ['Mexico', 		'Mexico City', 		'MXN'], 
-  ['Russia', 		'Moscow', 		'RUB'], 
-  ['South Africa',	'Pretoria', 		'ZAR'], 
-  ['United Kingdom', 	'London', 		'GBP'], 
-  ['United States', 	'Washington, D.C.', 	'USD'],
-]
-
-## Code to insert the data nicely
-font = Ttk::Style.lookup(tree[:style], :font)
-cols = %w(country capital currency)
-cols.zip(%w(Country Capital Currency)).each{|col, name|
-  tree.heading_configure(col, :text=>name, 
-                         :command=>proc{sort_by(tree, col, false)})
-  tree.column_configure(col, :width=>TkFont.measure(font, name))
-}
-
-data.each{|country, capital, currency|
-  #tree.insert('', :end, :values=>[country, capital, currency])
-  tree.insert(nil, :end, :values=>[country, capital, currency])
-  cols.zip([country, capital, currency]).each{|col, val|
-    len = TkFont.measure(font, "#{val}  ")
-    if tree.column_cget(col, :width) < len
-      tree.column_configure(col, :width=>len)
-    end
-  }
-}
-
-## Code to do the sorting of the tree contents when clicked on
-def sort_by(tree, col, direction)
-  tree.children(nil).map!{|row| [tree.get(row, col), row.id]} . 
-    sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) . 
-    each_with_index{|info, idx| tree.move(info[1], nil, idx)}
-
-  tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
-end
diff --git a/ext/tk/sample/demos-en/menu.rb b/ext/tk/sample/demos-en/menu.rb
index bf6c22cb9d..7ea3fd2ebb 100644
--- a/ext/tk/sample/demos-en/menu.rb
+++ b/ext/tk/sample/demos-en/menu.rb
@@ -15,22 +15,13 @@ $menu_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($menu_demo).pack(:fill=>:both, :expand=>true)
-
-# menu frame
-$menu_frame = TkFrame.new(base_frame, 'relief'=>'raised', 'bd'=>2)
+# 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(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
+TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+  if $tk_platform['platform'] == 'macintosh'
     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.")
@@ -38,7 +29,7 @@ TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 }.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($menu_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -71,8 +62,7 @@ TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
   }
 }
 
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem == "classic" || windowingsystem == "aqua"
+if $tk_platform['platform'] == 'macintosh'
   modifier = 'Command'
 elsif $tk_platform['platform'] == 'windows'
   modifier = 'Control'
@@ -87,8 +77,8 @@ TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
     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}")
+	  'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+	  'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
       $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
     }
   }
@@ -99,17 +89,17 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
   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)
+	'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)
+	'command'=>proc{print "Goodbye\n"}, 
+	'accelerator'=>"#{modifier}+G", 'underline'=>6)
     $menu_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
 
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
       cascade_menu.add('cascade', 'label'=>'Check buttons', 
-                       'menu'=>cascade_check, 'underline'=>0)
+		       'menu'=>cascade_check, 'underline'=>0)
       oil = TkVariable.new(0)
       add('check', 'label'=>'Oil checked', 'variable'=>oil)
       trans = TkVariable.new(0)
@@ -120,18 +110,18 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
       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])} )
+	  'command'=>proc{showVars($menu_demo, 
+				   ['oil', oil], 
+				   ['trans', trans], 
+				   ['brakes', brakes], 
+				   ['lights', lights])} )
       invoke 1
       invoke 3
     }
 
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
       cascade_menu.add('cascade', 'label'=>'Radio buttons', 
-                       'menu'=>cascade_radio, 'underline'=>0)
+		       '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)
@@ -145,9 +135,9 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
       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])} )
+	  'command'=>proc{showVars($menu_demo, 
+				   ['pointSize', pointSize], 
+				   ['style', style])} )
       invoke 1
       invoke 7
     }
@@ -159,15 +149,14 @@ TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
   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')} )
+	'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"})
+	  'command'=>proc{print "You invoked the #{icon} bitmap\n"})
     }
   }
 }
@@ -179,7 +168,7 @@ TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
     [ '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"})
+	  'command'=>proc{print "You invoked \"#{i}\"\n"})
     }
   }
 }
@@ -190,7 +179,7 @@ TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
     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"})
+	  'command'=>proc{print "You invoked \"#{c}\"\n"})
     }
   }
 }
diff --git a/ext/tk/sample/demos-en/menu84.rb b/ext/tk/sample/demos-en/menu84.rb
index 4029ce5541..82e29f6475 100644
--- a/ext/tk/sample/demos-en/menu84.rb
+++ b/ext/tk/sample/demos-en/menu84.rb
@@ -15,8 +15,6 @@ $menu84_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($menu84_demo).pack(:fill=>:both, :expand=>true)
-
 begin
   windowingsystem = Tk.windowingsystem()
 rescue
@@ -24,7 +22,7 @@ rescue
 end
 
 # label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+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.")
@@ -35,17 +33,17 @@ TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 
 
 menustatus = TkVariable.new("    ")
-TkFrame.new(base_frame) {|frame|
+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')
+	      '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(base_frame) {|frame|
+TkFrame.new($menu84_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -93,8 +91,8 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   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}")
+	'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+	'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
     $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
   }
 }
@@ -112,7 +110,7 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 
   TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
     m.add('cascade', 'label'=>'Check buttons', 
-          'menu'=>cascade_check, 'underline'=>0)
+	  'menu'=>cascade_check, 'underline'=>0)
     oil = TkVariable.new(0)
     add('check', 'label'=>'Oil checked', 'variable'=>oil)
     trans = TkVariable.new(0)
@@ -123,18 +121,18 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
     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])} )
+	'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)
+	  '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)
@@ -148,9 +146,9 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
     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])} )
+	'command'=>proc{showVars($menu84_demo, 
+				 ['pointSize', pointSize], 
+				 ['style', style])} )
     invoke 1
     invoke 7
   }
@@ -159,15 +157,14 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 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),
+      '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')} )
+				   '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"})
+	'command'=>proc{print "You invoked the #{icon} bitmap\n"})
   }
 
   entryconfigure(2, :columnbreak=>true)
@@ -178,38 +175,38 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   [ '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"})
+	'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'=>'')
-                   })
+		   '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"})
+	'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')
+	      begin
+		label = w.entrycget('active', 'label')
+	      rescue
+		label = "    "
+	      end
+	      menustatus.value = label
+	      Tk.update(true)
+	    }, '%W')
diff --git a/ext/tk/sample/demos-en/menubu.rb b/ext/tk/sample/demos-en/menubu.rb
index b37367e515..42a5931dd1 100644
--- a/ext/tk/sample/demos-en/menubu.rb
+++ b/ext/tk/sample/demos-en/menubu.rb
@@ -37,18 +37,16 @@ $menubu_demo = TkToplevel.new {|w|
 
 positionWindow($menubu_demo)
 
-base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
-
 # version check
 if $tk_version.to_f < 8.0
 
 # label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+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(base_frame) {|frame|
+TkFrame.new($menubu_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -60,13 +58,13 @@ TkFrame.new(base_frame) {|frame|
 
   TkButton.new(frame) {
     text 'Show Code'
-    command proc{showCode 'menubu'}
+    command proc{showCode 'menu'}
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 else ; # Tk8.x
 
-body = TkFrame.new(base_frame)
+body = TkFrame.new($menubu_demo)
 body.pack('expand'=>'yes', 'fill'=>'both')
 
 below = TkMenubutton.new(body) {
@@ -161,7 +159,7 @@ center = TkFrame.new(body) {
   grid('row'=>1, 'column'=>1, 'sticky'=>'news')
 }
 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($menubu_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc {
@@ -189,7 +187,7 @@ TkFrame.new(center) {|f|
   menubuttonoptions = TkVariable.new
   mbutton = TkMenubutton.new(f)
   options = optionMenu(mbutton, menubuttonoptions, 
-                       'one', 'two', 'three')
+		       'one', 'two', 'three')
   mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
   paletteColor = TkVariable.new
   colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
diff --git a/ext/tk/sample/demos-en/msgbox.rb b/ext/tk/sample/demos-en/msgbox.rb
index 62b1f2b985..4152477e67 100644
--- a/ext/tk/sample/demos-en/msgbox.rb
+++ b/ext/tk/sample/demos-en/msgbox.rb
@@ -18,14 +18,12 @@ $msgbox_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($msgbox_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame, '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')
+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(base_frame) {|frame|
+TkFrame.new($msgbox_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -47,12 +45,12 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_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')
+			'pady'=>'.5c', 'padx'=>'.5c')
 $msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
-                        'pady'=>'.5c', 'padx'=>'.5c')
+			'pady'=>'.5c', 'padx'=>'.5c')
 
 TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
 TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
@@ -61,9 +59,9 @@ TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
 $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')
+		    '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')
@@ -74,17 +72,17 @@ $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')
+		    '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")
+			 '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}\"")
+		'message'=>"You have selected  \"#{button}\"")
 end
 
diff --git a/ext/tk/sample/demos-en/msgbox2.rb b/ext/tk/sample/demos-en/msgbox2.rb
deleted file mode 100644
index 6fe6c778b3..0000000000
--- a/ext/tk/sample/demos-en/msgbox2.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# msgbox2.rb
-#
-# This demonstration script creates message boxes of various type
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($msgbox2_demo) && $msgbox2_demo
-  $msgbox2_demo.destroy 
-  $msgbox2_demo = nil
-end
-
-# demo toplevel widget
-$msgbox2_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, '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 with both of a message and a detail.").pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $msgbox2_demo
-      $msgbox2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'msgbox2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Message Box'
-    command proc{showMessageBox $msgbox2_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$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'=>"\"#{$msgboxType.value}\" Type MessageBox",
-                         'detail'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon. Please click one of the following button.")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w, 
-                'message'=>"You have selected  \"#{button}\"")
-end
-
diff --git a/ext/tk/sample/demos-en/paned1.rb b/ext/tk/sample/demos-en/paned1.rb
index 26941b84a8..8c25de0ef3 100644
--- a/ext/tk/sample/demos-en/paned1.rb
+++ b/ext/tk/sample/demos-en/paned1.rb
@@ -16,32 +16,30 @@ $paned1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+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(base_frame){|f|
+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)
+		 $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)
+		 showCode 'paned1'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
-TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
-  add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'), 
-      Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
-
+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/ext/tk/sample/demos-en/paned2.rb b/ext/tk/sample/demos-en/paned2.rb
index 0e62013886..c8c5abb470 100644
--- a/ext/tk/sample/demos-en/paned2.rb
+++ b/ext/tk/sample/demos-en/paned2.rb
@@ -16,27 +16,25 @@ $paned2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+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(base_frame){|f|
+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)
+		 $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)
+		 showCode 'paned2'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
 paneList = TkVariable.new  # define as normal variable (not array)
@@ -63,32 +61,32 @@ paneList.value = [         # ruby's array --> tcl's list
 ]
 
 # Create the pane itself
-TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
+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)
-        }
+	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)
+      TkFrame.new(f) {|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/ext/tk/sample/demos-en/patch_1.1c1 b/ext/tk/sample/demos-en/patch_1.1c1
new file mode 100644
index 0000000000..d3952e71eb
--- /dev/null
+++ b/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/ext/tk/sample/demos-en/pendulum.rb b/ext/tk/sample/demos-en/pendulum.rb
deleted file mode 100644
index 5f7d361170..0000000000
--- a/ext/tk/sample/demos-en/pendulum.rb
+++ /dev/null
@@ -1,240 +0,0 @@
-#
-# 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)
-}
-
-base_frame = TkFrame.new($pendulum_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  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(base_frame) {|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, :orient=>:horizontal).pack(:fill=>:both, :expand=>true)
-#    @pane.add(@lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation'))
-#    @pane.add(@lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space'))
-    @lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation')
-    @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
-
-    # 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.to_i, y.to_i)}, 
-              '%x %y')
-    btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
-    btag.bind('ButtonRelease-1', 
-              proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start }, 
-              '%x %y')
-
-    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
-
-    @k.bind('Configure', proc{|h, w| 
-              h = h.to_i
-              w = w.to_i
-              @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')
-
-    # add
-    Tk.update
-    @pane.add(@lf1)
-    @pane.add(@lf2)
-
-    # init display
-    showPendulum
-
-    # 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
-    unless @psw && @psh
-      @psw = @k.width/2
-      @psh = @k.height/2
-    end
-    @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(base_frame)
diff --git a/ext/tk/sample/demos-en/plot.rb b/ext/tk/sample/demos-en/plot.rb
index 628c9df584..fb887011a7 100644
--- a/ext/tk/sample/demos-en/plot.rb
+++ b/ext/tk/sample/demos-en/plot.rb
@@ -19,16 +19,14 @@ $plot_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame, '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."){
+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(base_frame) {|frame|
+$plot_buttons = TkFrame.new($plot_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -49,46 +47,46 @@ $plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
 
 # canvas 
-$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
+$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')
+	    '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')
+	      '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')
+	      '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')
+		     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
   item.addtag 'point'
 end
 
 $plot_canvas.itembind('point', 'Any-Enter', 
-                      proc{$plot_canvas.itemconfigure 'current','fill','red'})
+		      proc{$plot_canvas.itemconfigure 'current','fill','red'})
 $plot_canvas.itembind('point', 'Any-Leave', 
-                      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
+		      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
 $plot_canvas.itembind('point', '1', 
-                      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
+		      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
 $plot_canvas.itembind('point', 'ButtonRelease-1', 
-                      proc{$plot_canvas.dtag 'selected'})
+		      proc{$plot_canvas.dtag 'selected'})
 $plot_canvas.bind('B1-Motion', 
-                  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
+		  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
 
 $plot = {'lastX'=>0, 'lastY'=>0}
 
@@ -97,8 +95,8 @@ $plot = {'lastX'=>0, 'lastY'=>0}
 # 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.
+# w -		The canvas window.
+# x, y -	The coordinates of the mouse press.
 
 def plotDown (w, x, y)
   w.dtag 'selected'
@@ -113,8 +111,8 @@ end
 # current item.
 #
 # Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse.
+# 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']
diff --git a/ext/tk/sample/demos-en/puzzle.rb b/ext/tk/sample/demos-en/puzzle.rb
index 43c61f519f..d206efe34b 100644
--- a/ext/tk/sample/demos-en/puzzle.rb
+++ b/ext/tk/sample/demos-en/puzzle.rb
@@ -19,10 +19,8 @@ $puzzle_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($puzzle_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -31,7 +29,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($puzzle_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -54,27 +52,18 @@ TkFrame.new(base_frame) {|frame|
 # scrollbar widget and using its trough color.
 begin
   if Tk.windowingsystem() == 'aqua'
-    frameWidth  = 168
-    frameHeight = 168
-  elsif Tk.default_widget_set == :Ttk
-    frameWidth  = 148
-    frameHeight = 124
+    frameSize = 160
   else
-    frameWidth  = 120
-    frameHeight = 120
+    frameSize = 120
   end
 rescue
-  frameWidth  = 120
-  frameHeight = 120
+  frameSize = 120
 end
-
-# depend_on_button_width = true
-depend_on_button_width = false
  
-s = TkScrollbar.new(base_frame)
-base = TkFrame.new(base_frame) {
-  width  frameWidth
-  height frameHeight
+s = TkScrollbar.new($puzzle_demo)
+base = TkFrame.new($puzzle_demo) {
+  width  frameSize
+  height frameSize
   borderwidth 2
   relief 'sunken'
   bg s['troughcolor']
@@ -98,11 +87,8 @@ order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
     text num
     highlightthickness 0
     command def_puzzleswitch_proc(w, num)
-    if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
-      base.width = w.winfo_reqwidth * 4
-    end
   }.place('relx'=>$xpos[num], 'rely'=>$ypos[num], 
-          'relwidth'=>0.25, 'relheight'=>0.25)
+	  'relwidth'=>0.25, 'relheight'=>0.25)
 }
 $xpos['space'] = 0.75
 $ypos['space'] = 0.75
@@ -119,9 +105,9 @@ def puzzleSwitch(w, num)
       && ($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)))
+	&& ($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
diff --git a/ext/tk/sample/demos-en/radio.rb b/ext/tk/sample/demos-en/radio.rb
index 25cfac2134..96cdc4c54a 100644
--- a/ext/tk/sample/demos-en/radio.rb
+++ b/ext/tk/sample/demos-en/radio.rb
@@ -19,10 +19,8 @@ $radio_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($radio_demo).pack(:fill=>:both, :expand=>true)
-
 # label 
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($radio_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -35,7 +33,7 @@ size = TkVariable.new
 color = TkVariable.new
 
 # frame 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($radio_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -54,14 +52,14 @@ TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'See Variables'
     command proc{
-      showVars(base_frame, ['size', size], ['color', color])
+      showVars($radio_demo, ['size', size], ['color', color])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame 
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_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')
 
diff --git a/ext/tk/sample/demos-en/radio2.rb b/ext/tk/sample/demos-en/radio2.rb
index 6c02aef0cf..aefd81bdca 100644
--- a/ext/tk/sample/demos-en/radio2.rb
+++ b/ext/tk/sample/demos-en/radio2.rb
@@ -1,4 +1,4 @@
-# radio2.rb
+# radio.rb
 #
 # This demonstration script creates a toplevel window containing
 # several radiobutton widgets.
@@ -14,15 +14,13 @@ end
 
 # demo toplevel widget
 $radio2_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 2")
-  iconname("radio2")
+  title("Radiobutton Demonstration")
+  iconname("radio")
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
-
 # label 
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($radio2_demo) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -36,7 +34,7 @@ color = TkVariable.new
 align = TkVariable.new
 
 # frame 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($radio2_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -49,25 +47,25 @@ TkFrame.new(base_frame) {|frame|
 
   TkButton.new(frame) {
     text 'Show Code'
-    command proc{showCode 'radio2'}
+    command proc{showCode 'radio'}
   }.pack('side'=>'left', 'expand'=>'yes')
 
   TkButton.new(frame) {
     text 'See Variables'
     command proc{
-      showVars(base_frame, 
-               ['size', size], ['color', color], ['compound', align])
+      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(base_frame, 'text'=>'Point Size', 
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'Color', 
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment', 
-                           'pady'=>2, 'padx'=>2)
+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')
@@ -92,16 +90,15 @@ f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
   }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
 }
 
-# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead', 
-label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead', 
-                    'compound'=>'left')
+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)})
+		    'value'=>lower, 'indicatoron'=>0, 'width'=>7, 
+		    'command'=>proc{label.compound(align.value)})
 }
 
 Tk.grid('x', abtn[0])
diff --git a/ext/tk/sample/demos-en/radio3.rb b/ext/tk/sample/demos-en/radio3.rb
deleted file mode 100644
index 9c9d75ef4a..0000000000
--- a/ext/tk/sample/demos-en/radio3.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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)
-}
-
-base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
-
-# label 
-msg = TkLabel.new(base_frame) {
-  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(base_frame) {|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(base_frame, ['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(base_frame, 'text'=>'Point Size', 
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'Color', 
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, '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(base_frame, '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', 
-label = Tk::Label.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/ext/tk/sample/demos-en/rolodex-j b/ext/tk/sample/demos-en/rolodex-j
new file mode 100644
index 0000000000..27e2bc9da0
--- /dev/null
+++ b/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/ext/tk/sample/demos-en/ruler.rb b/ext/tk/sample/demos-en/ruler.rb
index 26cd4f3b1c..f5e7add516 100644
--- a/ext/tk/sample/demos-en/ruler.rb
+++ b/ext/tk/sample/demos-en/ruler.rb
@@ -11,8 +11,8 @@
 # represent a tab stop.
 #
 # Arguments:
-# c -           The canvas window.
-# x, y -        Coordinates at which to create the tab stop.
+# c -		The canvas window.
+# x, y -	Coordinates at which to create the tab stop.
 
 def rulerMkTab(c,x,y)
   v = $demo_rulerInfo
@@ -32,16 +32,14 @@ $ruler_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-TkLabel.new(base_frame, '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."){
+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(base_frame) {|frame|
+$ruler_buttons = TkFrame.new($ruler_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -59,14 +57,14 @@ $ruler_buttons = TkFrame.new(base_frame) {|frame|
 $ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # canvas 
-$ruler_canvas = TkCanvas.new(base_frame, 'width'=>'14.8c', 'height'=>'2.5c')
+$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
+			       :top, :bottom, :size, :normalStyle, 
+			       :activeStyle, :deleteStyle).new
 end
 $demo_rulerInfo.grid = '.25c'
 $demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
@@ -78,17 +76,15 @@ $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)}
+    '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)}
+    '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)
+	    '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)
@@ -101,22 +97,22 @@ TkcLine.new($ruler_canvas,
 $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]) )
+		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') ) )
+		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')
+		       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')
+		   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
 $ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
 
 # rulerNewTab --
@@ -124,8 +120,8 @@ $ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
 # 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.
+# c -		The canvas window.
+# x, y -	The coordinates of the tab stop.
 
 def rulerNewTab(c,x,y)
   v = $demo_rulerInfo
@@ -142,9 +138,9 @@ end
 # 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).
+# 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
@@ -161,8 +157,8 @@ end
 # it is about to be dragged out of the ruler.
 #
 # Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
+# c -		The canvas widget.
+# x, y -	The coordinates of the mouse.
 
 def rulerMoveTab(c,x,y)
   v = $demo_rulerInfo
@@ -189,8 +185,8 @@ end
 # it was dragged out of the ruler.
 #
 # Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
+# c -		The canvas widget.
+# x, y -	The coordinates of the mouse.
 
 def rulerReleaseTab(c)
   v = $demo_rulerInfo
diff --git a/ext/tk/sample/demos-en/sayings.rb b/ext/tk/sample/demos-en/sayings.rb
index 06ec7c1e75..4ba3097bed 100644
--- a/ext/tk/sample/demos-en/sayings.rb
+++ b/ext/tk/sample/demos-en/sayings.rb
@@ -20,10 +20,8 @@ $sayings_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($sayings_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($sayings_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -32,7 +30,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($sayings_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -51,7 +49,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame
 sayings_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
+TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
   sv = TkScrollbar.new(w)
   sh = TkScrollbar.new(w, 'orient'=>'horizontal')
   sayings_lbox = TkListbox.new(w) {
@@ -71,11 +69,11 @@ TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
 
   else
     sayings_lbox.grid('row'=>0, 'column'=>0, 
-                      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+		      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     sv.grid('row'=>0, 'column'=>1, 
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	    'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     sh.grid('row'=>1, 'column'=>0, 
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	    'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
     TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
   end
diff --git a/ext/tk/sample/demos-en/search.rb b/ext/tk/sample/demos-en/search.rb
index e1fc565e9d..2b27cdbb42 100644
--- a/ext/tk/sample/demos-en/search.rb
+++ b/ext/tk/sample/demos-en/search.rb
@@ -13,9 +13,9 @@
 # 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.
+# 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')
@@ -31,10 +31,10 @@ end
 # 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.
+# 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')
@@ -55,15 +55,15 @@ end
 # 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.
+# 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)
+	      -1, cmd1, cmd2).start(sleep1)
 end
 
 # toplevel widget
@@ -79,10 +79,8 @@ $search_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($search_demo).pack(:fill=>:both, :expand=>true)
-
 # frame
-$search_buttons = TkFrame.new(base_frame) {|frame|
+$search_buttons = TkFrame.new($search_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -100,88 +98,95 @@ $search_buttons = TkFrame.new(base_frame) {|frame|
 $search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame
-TkFrame.new(base_frame) {|f|
+TkFrame.new($search_demo) {|f|
   TkLabel.new(f, 'text'=>'File name:', 
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
+	      'width'=>13, 'anchor'=>'w').pack('side'=>'left')
   $search_fileName = TkVariable.new
   TkEntry.new(f, 'width'=>40, 
-              'textvariable'=>$search_fileName) {
+	      'textvariable'=>$search_fileName) {
     pack('side'=>'left')
     bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
-                        $search_string_entry.focus})
+	                $search_string_entry.focus})
     focus
   }
   TkButton.new(f, 'text'=>'Load File', 
-               'command'=>proc{textLoadFile($search_text, 
-                                            $search_fileName.value)})\
+	       'command'=>proc{textLoadFile($search_text, 
+					    $search_fileName.value)})\
   .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
 }.pack('side'=>'top', 'fill'=>'x')
 
-TkFrame.new(base_frame) {|f|
+TkFrame.new($search_demo) {|f|
   TkLabel.new(f, 'text'=>'Search string:', 
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
+	      'width'=>13, 'anchor'=>'w').pack('side'=>'left')
   $search_searchString = TkVariable.new
   $search_string_entry = TkEntry.new(f, 'width'=>40, 
-                                     'textvariable'=>$search_searchString) {
+				     'textvariable'=>$search_searchString) {
     pack('side'=>'left')
     bind('Return', proc{textSearch($search_text, $search_searchString.value, 
-                                   $search_Tag)})
+				   $search_Tag)})
   }
   TkButton.new(f, 'text'=>'Highlight', 
-               'command'=>proc{textSearch($search_text, 
-                                          $search_searchString.value, 
-                                          $search_Tag)}) {
+	       '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(base_frame, 'setgrid'=>true, 'wrap'=>'word') {|t|
+$search_text = TkText.new($search_demo, 'setgrid'=>true) {|t|
   $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
+  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 )
+	       begin
+		 $search_Tag.configure('background'=>'#ce5555', 
+				       'foreground'=>'white')
+	       rescue
+	       end
+	     },
+	     800, 
+	     proc{
+	       begin
+		 $search_Tag.configure('background'=>'', 'foreground'=>'')
+	       rescue
+	       end
+	     },
+	     200 )
 else
   textToggle(proc{
-               $search_Tag.configure('background'=>'black', 
-                                     'foreground'=>'white')
-             },
-             800, 
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
+	       begin
+		 $search_Tag.configure('background'=>'black', 
+				       'foreground'=>'white')
+	       rescue
+	       end
+	     },
+	     800, 
+	     proc{
+	       begin
+		 $search_Tag.configure('background'=>'', 'foreground'=>'')
+	       rescue
+	       end
+	     },
+	     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.insert('end', "\
-The current directory to load a file is \"#{Dir.pwd}\".\
-")
+$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 = ''
 
-$search_text.width = 60
-$search_text.height = 20
diff --git a/ext/tk/sample/demos-en/spin.rb b/ext/tk/sample/demos-en/spin.rb
index c2a3a8949b..5d32454170 100644
--- a/ext/tk/sample/demos-en/spin.rb
+++ b/ext/tk/sample/demos-en/spin.rb
@@ -15,11 +15,9 @@ $spin_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'5i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+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 \
@@ -36,17 +34,17 @@ this demo doesn't work. Please use later version of Tk \
 which supports a 'spinbox' widget.
 EOL
 
-TkFrame.new(base_frame){|f|
+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)
+		 $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)
+		 showCode 'spin'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
 australianCities = [
@@ -55,11 +53,11 @@ australianCities = [
 ]
 
 [
-  TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key, 
-                :validatecommand=>[
-                  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-                ]), 
-  TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5, 
-                :format=>'%05.2f', :width=>10), 
-  TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
+  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/ext/tk/sample/demos-en/states.rb b/ext/tk/sample/demos-en/states.rb
index add0e84800..d38c1245af 100644
--- a/ext/tk/sample/demos-en/states.rb
+++ b/ext/tk/sample/demos-en/states.rb
@@ -19,10 +19,8 @@ $states_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($states_demo).pack(:fill=>:both, :expand=>true)
-
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($states_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -31,7 +29,7 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($states_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -50,7 +48,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame
 states_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
+TkFrame.new($states_demo, 'borderwidth'=>'.5c') {|w|
   s = TkScrollbar.new(w)
   states_lbox = TkListbox.new(w) {
     setgrid 1
diff --git a/ext/tk/sample/demos-en/style.rb b/ext/tk/sample/demos-en/style.rb
index c2fed23926..8bf9c09662 100644
--- a/ext/tk/sample/demos-en/style.rb
+++ b/ext/tk/sample/demos-en/style.rb
@@ -19,10 +19,8 @@ $style_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($style_demo).pack(:fill=>:both, :expand=>true)
-
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($style_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -39,14 +37,13 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # text 
-txt = TkText.new(base_frame){|t|
+TkText.new($style_demo){|t|
   # 
   setgrid 'true'
-  #width  70
-  #height 32
+  width  70
+  height 32
   wrap 'word'
-  font $font
-  TkScrollbar.new(base_frame) {|s|
+  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}
@@ -54,20 +51,11 @@ txt = TkText.new(base_frame){|t|
   pack('expand'=>'yes', 'fill'=>'both')
 
   # 
-  family = 'Courier'
-
-  if $tk_version =~ /^4.*/
-    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_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-*', 'kanjifont'=>$kanji_font)
     style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-  else
-    style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic])
-    style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold])
-    style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold])
-    style_tag_small = TkTextTag.new(t, 'font'=>'Times 8 bold')
-  end
 ###
 #  case($tk_version)
 #  when /^4.*/
@@ -77,13 +65,13 @@ txt = TkText.new(base_frame){|t|
 #    unless $style_demo_do_first
 #      $style_demo_do_first = true
 #      Tk.tk_call('font', 'create', '@bigascii', 
-#                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
+#		 '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
 #      Tk.tk_call('font', 'create', '@smallascii', 
-#                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
+#		 '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
 #      Tk.tk_call('font', 'create', '@cBigFont', 
-#                '-compound', '@bigascii @msg_knj')
+#		 '-compound', '@bigascii @msg_knj')
 #      Tk.tk_call('font', 'create', '@cSmallFont', 
-#                '-compound', '@smallascii @kanji')
+#		 '-compound', '@smallascii @kanji')
 #    end
 #    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
 #    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
@@ -97,42 +85,37 @@ txt = TkText.new(base_frame){|t|
     style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
   else
     style_tag_color1 = TkTextTag.new(t, 'background'=>'black', 
-                                     'foreground'=>'white')
+				     'foreground'=>'white')
     style_tag_color2 = TkTextTag.new(t, 'background'=>'black', 
-                                     'foreground'=>'white')
+				     'foreground'=>'white')
     style_tag_raised = TkTextTag.new(t, 'background'=>'white', 
-                                     'relief'=>'raised', 'borderwidth'=>1)
+				     'relief'=>'raised', 'borderwidth'=>1)
     style_tag_sunken = TkTextTag.new(t, 'background'=>'white', 
-                                     'relief'=>'sunken', 'borderwidth'=>1)
+				     'relief'=>'sunken', 'borderwidth'=>1)
   end
 
-  # 
+  # ¥Æ¥­¥¹¥È¥¿¥°ÀßÄê (¤½¤Î¾)
   if $tk_version =~ /^4\.[01]/
     style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-                                        'borderwidth'=>0, 
-                                        'bgstipple'=>'gray25')
+					'borderwidth'=>0, 
+					'bgstipple'=>'gray25')
   else
     style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-                                        'borderwidth'=>0, 
-                                        'bgstipple'=>'gray12')
+					'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')
-  if $tk_version =~ /^4.*/
-    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-*-*-*-*-*-*')
-  else
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>[family, 10])
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>[family, 10])
-  end
+  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')
+				    'rmargin'=>'10m')
   style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
-                                    'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
+				    'lmargin1'=>'12m', 'lmargin2'=>'6m',
+				    'rmargin'=>'10m')
 
   # 
   insert('end', 'Text widgets like this one allow you to display information in a
@@ -149,8 +132,7 @@ available display styles are:
   insert('end', "  You can choose any X font, ")
   insert('end', "large", style_tag_verybig)
   insert('end', " or ")
-  insert('end', "small", style_tag_small)
-  insert('end', ".\n")
+  insert('end', "small.\n")
   insert('end', "\n2. Color.", style_tag_big)
   insert('end', "  You can change either the ")
   insert('end', "background", style_tag_color1)
@@ -227,5 +209,3 @@ available display styles are:
 
 }
 
-txt.width 70
-txt.height 32
diff --git a/ext/tk/sample/demos-en/tcolor b/ext/tk/sample/demos-en/tcolor
index 3c63d6730d..6d023f0f8b 100644
--- a/ext/tk/sample/demos-en/tcolor
+++ b/ext/tk/sample/demos-en/tcolor
@@ -1,28 +1,30 @@
 #!/usr/bin/env ruby
 #
 # tcolor --
-#   simple color editor which supports RGB, HSB and CYM color space
+# ¤³¤Î¥¹¥¯¥ê¥×¥È¤Ï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"
 
 
-# use TkVariable instance for the variable which is changed by Tk interpreter
+# 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("")
+$name = TkVariable.new("")
+# $command = TkVariable.new("print(%%,\"\n\")")
+$command = TkVariable.new("")
 $label1 = TkVariable.new("label1")
 $label2 = TkVariable.new("label2")
 $label3 = TkVariable.new("label3")
@@ -34,7 +36,7 @@ if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
 end
 
 
-# methods for events
+# ³Æ¥¤¥Ù¥ó¥ÈÍѤΥ᥽¥Ã¥É
 
 def rgbToHsv(red,green,blue)
 
@@ -121,14 +123,9 @@ def hsbToRgb(hue,sat,value)
 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)
+  eval(newCmd)
 end
 
 
@@ -137,8 +134,6 @@ def tc_scaleChanged
     return 
   end
 
-  $master = :scale if $master == nil
-
   scale1 = $root.middle.middle.scale1
   scale2 = $root.middle.middle.scale2
   scale3 = $root.middle.middle.scale3
@@ -163,13 +158,11 @@ def tc_scaleChanged
     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
+  Tk.update(TRUE)
 end
 
 
@@ -203,8 +196,6 @@ 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]
@@ -213,27 +204,27 @@ def tc_loadNamedColor(name)
   else
     case name.length
     when 4
-      fmt = /#(.{1})(.{1})(.{1})/
+      format = /#(.{1})(.{1})(.{1})/
       shift = 12
     when 7
-      fmt = /#(.{2})(.{2})(.{2})/
+      format = /#(.{2})(.{2})(.{2})/
       shift = 8
     when 10
-      fmt = /#(.{3})(.{3})(.{3})/
+      format = /#(.{3})(.{3})(.{3})/
       shift = 4
     when 13
-      fmt = /#(.{4})(.{4})(.{4})/
+      format = /#(.{4})(.{4})(.{4})/
       shift = 0
     else
       raise(eException,"syntax error in color name \"#{name}\"")
     end
-    name.scan(fmt){|strlist|
+    name.scan(format){|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 = strlist[0].to_i
+      $green = strlist[1].to_i
+      $blue = strlist[2].to_i
     }
     $red = $red << shift
     $green = $green << shift
@@ -246,8 +237,6 @@ def tc_loadNamedColor(name)
   if $autoUpdate.to_i == 1
     doUpdate
   end
-  Tk.update(true)
-  $master = nil if $master == :name
 end
 
 
@@ -270,7 +259,10 @@ def changeColorSpace(space)
 end
 
 
-# menu
+
+
+
+# tcolorÍѤΥá¥Ë¥å¡¼
 
 class TkColorMenuFrame<TkFrame
   def initialize(parent)
@@ -278,10 +270,10 @@ class TkColorMenuFrame<TkFrame
 	  "relief"=>"raised",
 	  "borderwidth"=>"2")
 
-    # File menubutton
+    # File¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤ÎÀ¸À®
     @file = TkMenubutton.new(self){|button|
 
-      # File menu
+      # File¥á¥Ë¥å¡¼¤ÎºîÀ®
       @file_menu = TkMenu.new(button){
 	add "radio",
 	  "label" => "RGB color space",
@@ -319,7 +311,7 @@ class TkColorMenuFrame<TkFrame
 	  "command" => proc{exit}
       }
       
-      # assign File menu to File button
+      # File¥á¥Ë¥å¡¼¤ÈFile¥Ü¥¿¥ó¤ò´ØÏ¢ÉÕ¤±¤ë
       menu @file_menu
 
       text "File"
@@ -331,7 +323,7 @@ class TkColorMenuFrame<TkFrame
 end
 
 
-# bottom frame
+# ²¼Éô¤Î¥Õ¥ì¡¼¥à¤Î¤¿¤á¤Î¥¯¥é¥¹
 class TkColorBotFrame<TkFrame
   def initialize(parent)
     super(parent,
@@ -357,7 +349,7 @@ class TkColorBotFrame<TkFrame
 end    
 
 
-# left side frame of middle level
+# ÃæÃʺ¸¤Î¥Õ¥ì¡¼¥à
 class TkColorMiddleLeftFrame<TkFrame
   def initialize(parent)
     super(parent)
@@ -401,8 +393,9 @@ class TkColorMiddleLeftFrame<TkFrame
 end
 
 
-# middle frame of middle level
+# ÃæÃÊÃæ±û¤Î¥Õ¥ì¡¼¥à
 class TkColorMiddleMiddleFrame<TkFrame
+  # @scale1,@scale2,@scale3¤ò³°Éô¤«¤é»²¾È¤Î¤ßµö²Ä¤¹¤ë¡£(Êѹ¹ÉÔ²Ä)
   attr_reader :scale1, :scale2, :scale3
 
   def initialize(parent)
@@ -477,7 +470,7 @@ end
 
 
 
-# middle level frame
+# ÃæÃʤΥե졼¥à
 class TkColorMiddleFrame<TkFrame
   attr_reader :left, :middle, :right
 
@@ -520,7 +513,7 @@ end
 
 
 $root = TkColor.new
-changeColorSpace :rgb
 
-# start eventloop
+# ¥¤¥Ù¥ó¥È¤òÂԤİ٤˥롼¥×¤ËÆþ¤ë¡£
+changeColorSpace :rgb
 Tk.mainloop
diff --git a/ext/tk/sample/demos-en/tcolor.bak b/ext/tk/sample/demos-en/tcolor.bak
new file mode 100644
index 0000000000..5464aebae2
--- /dev/null
+++ b/ext/tk/sample/demos-en/tcolor.bak
@@ -0,0 +1,513 @@
+#!/usr/local/bin/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)
+$red = 65535
+$green = 0
+$blue = 0
+$color = "#ffff00000000"
+$updating = TkVariable.new(0)
+$autoUpdate = TkVariable.new(1)
+$name = TkVariable.new("")
+# $command = TkVariable.new("print(%%,\"\n\")")
+$command = TkVariable.new("")
+$label1 = TkVariable.new("label1")
+$label2 = TkVariable.new("label2")
+$label3 = TkVariable.new("label3")
+
+
+# ³Æ¥¤¥Ù¥ó¥ÈÍѤΥ᥽¥Ã¥É
+
+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 doUpdate 
+  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
+  eval(newCmd)
+end
+
+
+def tc_scaleChanged
+  if( $updating.to_i == 1 )
+    return 
+  end
+
+  scale1 = $root.middle.middle.scale1
+  scale2 = $root.middle.middle.scale2
+  scale3 = $root.middle.middle.scale3
+
+  case $colorSpace.to_i
+  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)
+  $root.middle.right.set_color($color)
+  if( $autoUpdate.to_i == 1 )
+    doUpdate
+  end
+  Tk.update(TRUE)
+end
+
+
+def tc_setScales
+  $updating.value = 1
+
+  scale1 = $root.middle.middle.scale1
+  scale2 = $root.middle.middle.scale2
+  scale3 = $root.middle.middle.scale3
+  
+  case $colorSpace.to_i
+  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)
+  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
+      format = /#(.{1})(.{1})(.{1})/
+      shift = 12
+    when 7
+      format = /#(.{2})(.{2})(.{2})/
+      shift = 8
+    when 10
+      format = /#(.{3})(.{3})(.{3})/
+      shift = 4
+    when 13
+      format = /#(.{4})(.{4})(.{4})/
+      shift = 0
+    else
+      raise(eException,"syntax error in color name \"#{name}\"")
+    end
+    name.scan(format){|strlist|
+      if strlist.length != 3
+	raise(eException,"syntax error in color name \"#{name}\"")
+      end
+      $red = strlist[0].to_i
+      $green = strlist[1].to_i
+      $blue = strlist[2].to_i
+    }
+    $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
+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" => "Qutomatic 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
+    super
+    @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/ext/tk/sample/demos-en/text.rb b/ext/tk/sample/demos-en/text.rb
index 3ce8cdfda8..2ed53e6938 100644
--- a/ext/tk/sample/demos-en/text.rb
+++ b/ext/tk/sample/demos-en/text.rb
@@ -19,8 +19,6 @@ $text_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($text_demo).pack(:fill=>:both, :expand=>true)
-
 # version check
 if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
   undo_support = false
@@ -29,7 +27,7 @@ else
 end
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($text_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -46,7 +44,7 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # text 
-TkText.new(base_frame){|t|
+TkText.new($text_demo){|t|
   relief 'sunken'
   bd 2
   setgrid 1
@@ -55,7 +53,7 @@ TkText.new(base_frame){|t|
     undo true
     autoseparators true
   end
-  TkScrollbar.new(base_frame) {|s|
+  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}
@@ -104,16 +102,16 @@ 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."
+	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
 }
 
diff --git a/ext/tk/sample/demos-en/textpeer.rb b/ext/tk/sample/demos-en/textpeer.rb
deleted file mode 100644
index c25ce15e5c..0000000000
--- a/ext/tk/sample/demos-en/textpeer.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# text widget peering demo (called by 'widget')
-#
-# based on Tcl/Tk8.5.0 widget demos
-
-if defined?($textpeer_demo) && $textpeer_demo
-  $textpeer_demo.destroy 
-  $textpeer_demo = nil
-end
-
-# demo toplevel widget
-$textpeer_demo = TkToplevel.new {|w|
-  title("Text Wdget Peering Demonstration")
-  iconname("textpeer")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($textpeer_demo).pack(:fill=>:both, :expand=>true)
-
-count = [0]
-
-## Define a widget that we peer from; it won't ever actually be shown though
-first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
-first.insert :end,"This is a coupled pair of text widgets; they are peers to "
-first.insert :end,"each other. They have the same underlying data model, but "
-first.insert :end,"can show different locations, have different current edit "
-first.insert :end,"locations, and have different selections. You can also "
-first.insert :end,"create additional peers of any of these text widgets using "
-first.insert :end,"the Make Peer button beside the text widget to clone, and "
-first.insert :end,"delete a particular peer widget using the Delete Peer "
-first.insert :end,"button."
-
-Tk.update_idletasks  ## for 'first' widget
-
-## Procedures to make and kill clones; most of this is just so that the demo
-## looks nice...
-def makeClone(count, win, txt)
-  cnt = (count[0] += 1)
-  peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
-  sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
-  peer.yscrollbar sbar
-  b1 = TkButton.new(win, :widgetname=>"clone#{cnt}", :text=>'Make Peer', 
-                    :command=>proc{makeClone(count, win, peer)})
-  b2 = TkButton.new(win, :widgetname=>"kill#{cnt}", :text=>'Delete Peer', 
-                    :command=>proc{killClone(win, cnt)})
-  row = cnt * 2
-  TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
-  TkGrid.configure('^',  '^',  b2, :sticky=>'nsew', :row=>(row+=1))
-  TkGrid.configure(b1,  b2, :sticky=>'new')
-  TkGrid.rowconfigure(win,  b2, :weight=>1)
-end
-
-def killClone(win, cnt)
-  Tk.destroy("#{win.path}.text#{cnt}",  "#{win.path}.sb#{cnt}", 
-             "#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
-end
-
-## Now set up the GUI
-makeClone(count, base_frame, first)
-makeClone(count, base_frame, first)
-first.destroy
-
-## See Code / Dismiss buttons
-TkFrame.new(base_frame){|f|
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $textpeer_demo.destroy
-                 $textpeer_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'textpeer'
-               }).pack(:side=>:left, :expand=>true)
-
-  TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
-}
-TkGrid.columnconfigure(base_frame, 0, :weight=>1)
diff --git a/ext/tk/sample/demos-en/toolbar.rb b/ext/tk/sample/demos-en/toolbar.rb
deleted file mode 100644
index 5cf863717b..0000000000
--- a/ext/tk/sample/demos-en/toolbar.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-# toolbar.rb --
-#
-# This demonstration script creates a toolbar that can be torn off.
-#
-# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($toolbar_demo) && $toolbar_demo
-  $toolbar_demo.destroy 
-  $toolbar_demo = nil
-end
-
-$toolbar_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("toolbar")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
-
-if Tk.windowingsystem != 'aqua'
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', 
-                       :text=>Tk::UTF8_String.new(<<EOL))
-This is a demonstration of how to do \
-a toolbar that is styled correctly \
-and which can be torn off (this feature reqrires Tcl/Tk8.5). \
-The buttons are configured to be \\u201Ctoolbar style\\u201D buttons by \
-telling them that they are to use the Toolbutton style. At the left \
-end of the toolbar is a simple marker that the cursor changes to a \
-movement icon over; drag that away from the toolbar to tear off the \
-whole toolbar into a separate toplevel widget. When the dragged-off \
-toolbar is no longer needed, just close it like any normal toplevel \
-and it will reattach to the window it was torn off from.
-EOL
-else
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', 
-                       :text=>Tk::UTF8_String.new(<<EOL))
-This is a demonstration of how to do \
-a toolbar that is styled correctly. The buttons are configured to \
-be \\u201Ctoolbar style\\u201D buttons by telling them that they are \
-to use the Toolbutton style.
-EOL
-end
-
-## Set up the toolbar hull
-tbar_base = Tk::Frame.new(base_frame, # Must be a starndard Tk frame!
-                          :widgetname=>'toolbar') # for window title
-sep = Ttk::Separator.new(base_frame)
-to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
-if Tk.windowingsystem != 'aqua'
-  to  = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to2 = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to.pack(:fill=>:y, :expand=>true, :padx=>2, :side=>:left)
-  to2.pack(:fill=>:y, :expand=>true, :side=>:left)
-end
-
-contents = Ttk::Frame.new(tbar_base)
-Tk.grid(to_base, contents, :sticky=>'nsew')
-tbar_base.grid_columnconfigure(contents, :weight=>1)
-contents.grid_columnconfigure(1000, :weight=>1)
-
-if Tk.windowingsystem != 'aqua'
-  ## Bindings so that the toolbar can be torn off and reattached
-  to_base.bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to.     bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to2.    bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  def tbar_base.tearoff(w, x, y)
-    on_win = TkWinfo.containing(x, y)
-    return unless (on_win && on_win.path =~ /^#{@path}(\.|$)/)
-    self.grid_remove
-    w.grid_remove
-    self.wm_manage
-    # self.wm_title('Toolbar') # if you don't want to use its widget name as a window title.
-    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(self) }
-  end
-  def tbar_base.untearoff(w)
-    self.wm_forget
-    w.grid
-    self.grid
-  end
-end
-
-## Some content for the rest of the toplevel
-text = TkText.new(base_frame, :width=>40, :height=>10)
-
-## Toolbar contents
-tb_btn = Ttk::Button.new(tbar_base, :text=>'Button', :style=>'Toolbutton', 
-                         :command=>proc{text.insert(:end, "Button Pressed\n")})
-tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'Check', :style=>'Toolbutton', 
-                              :variable=>(check = TkVariable.new), 
-                              :command=>proc{
-                                text.insert(:end, "Check is #{check.value}\n")
-                              })
-tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'Menu')
-tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families, 
-                             :state=>:readonly)
-tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
-menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
-menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
-menu.add(:command, :label=>'Example', 
-         :command=>proc{text.insert(:end, "Example\n")})
-tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
-
-## Arrange contents
-Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo, 
-        :in=>contents, :padx=>2, :sticky=>'ns')
-Tk.grid(tbar_base, :sticky=>'ew')
-Tk.grid(sep, :sticky=>'ew')
-Tk.grid(msg, :sticky=>'ew')
-Tk.grid(text, :sticky=>'nsew')
-base_frame.grid_rowconfigure(text, :weight=>1)
-base_frame.grid_columnconfigure(text, :weight=>1)
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'See Code', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'toolbar'}), 
-         Ttk::Button.new(frame, :text=>'Dismiss', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $toolbar_demo.destroy
-                           $toolbar_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  Tk.grid(frame, :sticky=>'ew')
-}
diff --git a/ext/tk/sample/demos-en/tree.rb b/ext/tk/sample/demos-en/tree.rb
deleted file mode 100644
index 0c7f0e71a2..0000000000
--- a/ext/tk/sample/demos-en/tree.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# tree.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget.
-#
-# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($tree_demo) && $tree_demo
-  $tree_demo.destroy 
-  $tree_demo = nil
-end
-
-$tree_demo = TkToplevel.new {|w|
-  title("Directory Browser")
-  iconname("tree")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', 
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6], 
-               :text=><<EOL).pack(:fill=>:x)
-Ttk is the new Tk themed widget set. \
-One of the widgets it includes is a tree widget, \
-which allows the user to browse a hierarchical data-set such as a filesystem. \
-The tree widget not only allows for the tree part itself, \
-but it also supports an arbitrary number of additional columns \
-which can show additional data (in this case, the size of the files \
-found in your filesystem). \
-You can also change the width of the columns \
-by dragging the boundary between them.
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'See Code', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'tree'}), 
-         Ttk::Button.new(frame, :text=>'Dismiss', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $tree_demo.destroy
-                           $tree_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-## Code to populate the roots of the tree (can be more than one on Windows)
-def populate_roots(tree)
-  TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
-    populate_tree(tree, tree.insert(nil, :end, :text=>dir, 
-                                    :values=>[dir, 'directory']))
-  }
-end
-
-## Code to populate a node of the tree
-def populate_tree(tree, node)
-  return if tree.get(node, :type) != 'directory'
-
-  path = tree.get(node, :fullpath)
-  tree.delete(tree.children(node))
-  Dir.glob("#{path}/*").sort.each{|f|
-    type = File.ftype(f)
-    id = tree.insert(node, :end, 
-                     :text=>File.basename(f), :values=>[f, type]).id
-    if type == 'directory'
-      ## Make it so that this node is openable
-      tree.insert(id, 0, :text=>'dummy')
-      tree.itemconfigure(id, :text=>File.basename(f))
-    elsif type == 'file'
-      size = File.size(f)
-      if size >= 1024*1024*1024
-        size = '%.1f GB' % (size.to_f/1024/1024/1024)
-      elsif size >= 1024*1024
-        size = '%.1f MB' % (size.to_f/1024/1024)
-      elsif size >= 1024
-        size = '%.1f KB' % (size.to_f/1024)
-      else
-        size = '%.1f bytes' % (size.to_f/1024)
-      end
-      tree.set(id, :size, size)
-    end
-  }
-
-  # Stop this code from rerunning on the current node
-  tree.set(node, :type, 'processed_directory')
-end
-
-## Create the tree and set it up
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size), 
-                         :displaycolumns=>['size'])
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-tree.heading_configure('#0', :text=>'Directory Structure')
-tree.heading_configure('size', :text=>'File Size')
-tree.column_configure('size', :stretch=>0, :width=>70)
-populate_roots(tree)
-tree.bind('<TreeviewOpen>', '%W'){|w| populate_tree(w, w.focus_item)}
-
-## Arrange the tree and its scrollbars in the toplevel
-container = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-container.lower
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
diff --git a/ext/tk/sample/demos-en/ttkbut.rb b/ext/tk/sample/demos-en/ttkbut.rb
deleted file mode 100644
index b5780f589a..0000000000
--- a/ext/tk/sample/demos-en/ttkbut.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-# ttkbut.rb
-#
-# This demonstration script creates a toplevel window containing several
-# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
-# radiobuttons.
-#
-# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkbut_demo) && $ttkbut_demo
-  $ttkbut_demo.destroy 
-  $ttkbut_demo = nil
-end
-
-$ttkbut_demo = TkToplevel.new {|w|
-  title("Simple Ttk Widgets")
-  iconname("ttkbut")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left, 
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk is the new Tk themed widget set. This is a Ttk themed label, \
-and below are three groups of Ttk widgets in Ttk labelframes. \
-The first group are all buttons that set the current application theme \
-when pressed. The second group contains three sets of checkbuttons, \
-with a separator widget between the sets. Note that the "Enabled" \
-button controls whether all the other themed widgets in this toplevel are \
-in the disabled state. The third group has a collection of linked \
-radiobuttons.
-EOL
-
-## Add buttons for setting the theme
-buttons = Ttk::Labelframe.new(base_frame, :text=>'Buttons')
-# Ttk::Style.theme_names.each{|theme|
-#   Ttk::Button.new(buttons, :text=>theme, 
-#                   :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
-# }
-Ttk.themes.each{|theme|
-  Ttk::Button.new(buttons, :text=>theme, 
-                  :command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
-}
-
-## Helper procedure for the top checkbutton
-def setState(root, value, *excepts)
-  return if excepts.member?(root)
-
-  ## Non-Ttk widgets (e.g. the toplevel) will fail, so make it silent
-  begin
-    root.state = value
-  rescue
-  end
-
-  ## Recursively invoke on all children of this root that are in the same
-  ## toplevel widget
-  root.winfo_children.each{|w|
-    setState(w, value, *excepts) if w.winfo_toplevel == root.winfo_toplevel
-  }
-end
-
-## Set up the checkbutton group
-checks = Ttk::Labelframe.new(base_frame, :text=>'Checkbuttons')
-enabled = TkVariable.new(true)
-e = Ttk::Checkbutton.new(checks, :text=>'Enabled', :variable=>enabled, 
-                         :command=>proc{
-                           setState($ttkbut_demo, 
-                                    ((enabled.bool)? "!disabled" : "disabled"),
-                                    e)
-                         })
-
-## See ttk_widget(n) for other possible state flags
-sep1 = Ttk::Separator.new(checks)
-sep2 = Ttk::Separator.new(checks)
-
-cheese  = TkVariable.new
-tomato  = TkVariable.new
-basil   = TkVariable.new
-oregano = TkVariable.new
-
-c1 = Ttk::Checkbutton.new(checks, :text=>'Cheese',  :variable=>cheese)
-c2 = Ttk::Checkbutton.new(checks, :text=>'Tomato',  :variable=>tomato)
-c3 = Ttk::Checkbutton.new(checks, :text=>'Basil',   :variable=>basil)
-c4 = Ttk::Checkbutton.new(checks, :text=>'Oregano', :variable=>oregano)
-
-Tk.pack(e, sep1, c1, c2, sep2, c3, c4, :fill=>:x, :pady=>2)
-
-## Set up the radiobutton group
-radios = Ttk::Labelframe.new(base_frame, :text=>'Radiobuttons')
-
-happyness = TkVariable.new
-
-r1 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Great', :value=>'great')
-r2 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Good', :value=>'good')
-r3 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Ok', :value=>'ok')
-r4 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Poor', :value=>'poor')
-r5 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Awful', :value=>'awful')
-
-Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'See Variables', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{
-                           showVars(base_frame, ['enabled', enabled], 
-                                    ['cheese', cheese], ['tomato', tomato], 
-                                    ['basil', basil], ['oregano', oregano], 
-                                    ['happyness', happyness])
-                         }), 
-         Ttk::Button.new(frame, :text=>'See Code', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttkbut'}), 
-         Ttk::Button.new(frame, :text=>'Dismiss', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           tmppath = $ttkbut_demo
-                           $ttkbut_demo = nil
-                           $showVarsWin[tmppath.path] = nil
-                           tmppath.destroy
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x, :expand=>true)
-}
-
-## Arrange things neatly
-f = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-Tk.grid(buttons, checks, radios, :in=>f, :sticky=>'nwe', :pady=>2, :padx=>3)
-f.grid_columnconfigure([0, 1, 2], :weight=>1, :uniform=>:yes)
diff --git a/ext/tk/sample/demos-en/ttkmenu.rb b/ext/tk/sample/demos-en/ttkmenu.rb
deleted file mode 100644
index 75ecdb09c4..0000000000
--- a/ext/tk/sample/demos-en/ttkmenu.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# ttkmenu.rb --
-#
-# This demonstration script creates a toplevel window containing several Ttk
-# menubutton widgets.
-#
-# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkmenu_demo) && $ttkmenu_demo
-  $ttkmenu_demo.destroy 
-  $ttkmenu_demo = nil
-end
-
-$ttkmenu_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("ttkmenu")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left, 
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk is the new Tk themed widget set, \
-and one widget that is available in themed form is the menubutton. \
-Below are some themed menu buttons \
-that allow you to pick the current theme in use. \
-Notice how picking a theme changes the way \
-that the menu buttons themselves look, \
-and that the central menu button is styled differently \
-(in a way that is normally suitable for toolbars). \
-However, there are no themed menus; the standard Tk menus were judged \
-to have a sufficiently good look-and-feel on all platforms, \
-especially as they are implemented as native controls in many places.
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new($ttkmenu_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'See Code', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttkmenu'}), 
-         Ttk::Button.new(frame, :text=>'Dismiss', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $ttkmenu_demo.destroy
-                           $ttkmenu_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-b1 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:above)
-b2 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:left)
-b3 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:right)
-b4 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:flush,
-                         :style=>Ttk::Menubutton.style('Toolbutton'))
-b5 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:below)
-
-b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
-b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
-b3.menu(m3 = Tk::Menu.new(b3, :tearoff=>false))
-b4.menu(m4 = Tk::Menu.new(b4, :tearoff=>false))
-b5.menu(m5 = Tk::Menu.new(b5, :tearoff=>false))
-
-Ttk.themes.each{|theme|
-  m1.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m2.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m3.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m4.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m5.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-}
-
-f = Ttk::Frame.new(base_frame).pack(:fill=>:x)
-f1 = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-
-f.grid_anchor(:center)
-TkGrid('x', b1, 'x', :in=>f, :padx=>3, :pady=>2)
-TkGrid(b2,  b4, b3,  :in=>f, :padx=>3, :pady=>2)
-TkGrid('x', b5, 'x', :in=>f, :padx=>3, :pady=>2)
diff --git a/ext/tk/sample/demos-en/ttknote.rb b/ext/tk/sample/demos-en/ttknote.rb
deleted file mode 100644
index c2a22b447a..0000000000
--- a/ext/tk/sample/demos-en/ttknote.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-# ttknote.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# notebook widget.
-#
-# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttknote_demo) && $ttknote_demo
-  $ttknote_demo.destroy 
-  $ttknote_demo = nil
-end
-
-$ttknote_demo = TkToplevel.new {|w|
-  title("Ttk Notebook Widget")
-  iconname("ttknote")
-  positionWindow(w)
-}
-
-## See Code / Dismiss
-Ttk::Frame.new($ttknote_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'See Code', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttknote'}), 
-         Ttk::Button.new(frame, :text=>'Dismiss', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $ttknote_demo.destroy
-                           $ttknote_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
-
-## Make the notebook and set up Ctrl+Tab traversal
-notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true, 
-                                              :padx=>2, :pady=>3)
-notebook.enable_traversal
-
-## Popuplate the first pane
-f_msg = Ttk::Frame.new(notebook)
-msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'4i', 
-                       :justify=>:left, :anchor=>'n', :text=><<EOL)
-Ttk is the new Tk themed widget set. \
-One of the widgets it includes is the notebook widget, \
-which provides a set of tabs that allow the selection of a group of panels, \
-each with distinct content. \
-They are a feature of many modern user interfaces. \
-Not only can the tabs be selected with the mouse, \
-but they can also be switched between using Ctrl+Tab \
-when the notebook page heading itself is selected. \
-Note that the second tab is disabled, and cannot be selected.
-EOL
-neat = TkVariable.new
-after_id = nil
-msg_b = Ttk::Button.new(f_msg, :text=>'Neat!', :underline=>0, 
-                        :command=>proc{
-                          neat.value = 'Yeah, I know...'
-                          Tk.after_cancel(after_id) if after_id
-                          after_id = Tk.after(500){neat.value = ''}
-                        })
-msg_b.winfo_toplevel.bind('Alt-n'){ msg_b.focus; msg_b.invoke }
-msg_l = Ttk::Label.new(f_msg, :textvariable=>neat)
-notebook.add(f_msg, :text=>'Description', :underline=>0, :padding=>2)
-Tk.grid(msg_m, '-', :sticky=>'new', :pady=>2)
-Tk.grid(msg_b, msg_l, :pady=>[2, 4])
-f_msg.grid_rowconfigure(1, :weight=>1)
-f_msg.grid_columnconfigure([0, 1], :weight=>1, :uniform=>1)
-
-## Populate the second pane. Note that the content doesn't really matter
-f_disabled = Ttk::Frame.new(notebook)
-notebook.add(f_disabled, :text=>'Disabled', :state=>:disabled)
-
-## Popuplate the third pane
-f_editor = Ttk::Frame.new(notebook)
-notebook.add(f_editor, :text=>'Text Editor', :underline=>0)
-editor_t = Tk::Text.new(f_editor, :width=>40, :height=>10, :wrap=>:char)
-if Tk.windowingsystem != 'aqua'
-  editor_s = editor_t.yscrollbar(Ttk::Scrollbar.new(f_editor))
-else
-  editor_s = editor_t.yscrollbar(Tk::Scrollbar.new(f_editor))
-end
-editor_s.pack(:side=>:right, :fill=>:y, :padx=>[0,2], :pady=>2)
-editor_t.pack(:fill=>:both, :expand=>true, :padx=>[2,0], :pady=>2)
diff --git a/ext/tk/sample/demos-en/ttkpane.rb b/ext/tk/sample/demos-en/ttkpane.rb
deleted file mode 100644
index 56df613db4..0000000000
--- a/ext/tk/sample/demos-en/ttkpane.rb
+++ /dev/null
@@ -1,213 +0,0 @@
-# ttkpane.rb --
-#
-# This demonstration script creates a Ttk pane with some content.
-#
-# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkpane_demo) && $ttkpane_demo
-  $ttkpane_demo.destroy 
-  $ttkpane_demo = nil
-end
-
-$ttkpane_demo = TkToplevel.new {|w|
-  title("Themed Nested Panes")
-  iconname("ttkpane")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left, 
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-This demonstration shows off a nested set of themed paned windows. \
-Their sizes can be changed by grabbing the area \
-between each contained pane and dragging the divider.
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'See Code', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttkpane'}), 
-         Ttk::Button.new(frame, :text=>'Dismiss', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $ttkpane_demo.destroy
-                           $ttkpane_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-outer = Ttk::Panedwindow.new(frame, :orient=>:horizontal)
-outer.add(in_left = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-outer.add(in_right = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'Button'))
-in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'Clocks'))
-in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'Progress'))
-in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'Text'))
-if Tk.windowingsystem == 'aqua'
-  [left_top, left_bot, right_top, right_bot].each{|w| w.padding(3) }
-end
-
-# Fill the button pane
-Ttk::Button.new(left_top, :text=>'Press Me', 
-                :command=>proc{
-                  Tk.messageBox(:type=>'ok', :icon=>'info', :message=>'Ouch!', 
-                                :detail=>'That hurt...', :parent=>base_frame, 
-                                :title=>'Button Pressed')
-                }).pack(:padx=>2, :pady=>5)
-
-
-zones_list = [
-  [':Europe/Berlin'], 
-  [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'], 
-  [':Africa/Johannesburg'], 
-  [':Europe/London'], 
-  [':America/Los_Angeles'], 
-  [':Europe/Moscow'],
-  [':America/New_York'], 
-  [':Asia/Singapore'], 
-  [':Australia/Sydney'], 
-  [':Asia/Tokyo'], 
-]
-
-zones = []
-
-# Check tzinfo support
-if $tk_major_ver > 8 || ($tk_major_ver == 8 && $tk_minor_ver >= 5)
-  tzinfo = :tcl
-
-  # Force a pre-load of all the timezones needed; otherwise can end up
-  # poor-looking synch problems!
-  zones_list.each{|list|
-    list.each{|zone|
-      begin
-        Tk.tk_call('clock', 'format', '0', '-timezone', zone)
-      rescue RuntimeError
-        # ignore
-      else
-        zones << [zone, zone[%r<[^/:]+$>].tr('_', ' ')]
-        break
-      end
-    }
-  }
-
-else
-  begin
-    require 'tzinfo'
-    tzinfo = :tzinfo
-  rescue Exception
-    begin
-      require 'tzfile'
-      tzinfo = :tzfile
-    rescue Exception
-      tzinfo = nil
-    end
-  end
-
-  case tzinfo
-  when :tzinfo
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZInfo::Timezone.get(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  when :tzfile
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZFile.create(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  else
-    [ -7, -4, -2, -1, 0, +1, +3, +8, +9, +10 ].each{|zone|
-      zones << [zone, 'UTC%+03d00' % zone]
-    }
-  end
-end
-
-time = TkVariable.new_hash
-
-case tzinfo
-when :tcl
-  update_proc = proc{|now, tz, label|
-    time[label] = Tk.tk_call('clock', 'format', now.tv_sec, 
-                             '-timezone', tz, '-format', '%T')
-  }
-when :tzinfo
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.utc_to_local(now).strftime('%H:%M:%S')
-  }
-when :tzfile
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.at(now.tv_sec).strftime('%H:%M:%S')
-  }
-else
-  update_proc = proc{|now, tz, label|
-    time[label] = (now + (tz * 3600)).strftime('%H:%M:%S')
-  }
-end
-
-# Fill the clocks pane
-zones.each_with_index{|(zone, label), idx|
-  Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
-  Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
-  Ttk::Label.new(left_bot, :textvariable=>time.ref(label), 
-                 :anchor=>'w').pack(:fill=>:x)
-}
-
-# Timer start
-every = proc{
-  now = Time.now.utc
-  zones.each{|zone, label| update_proc.call(now, zone, label) }
-}
-TkRTTimer.new(1000, -1, every).start(0, every)
-
-# Fill the progress pane
-Ttk::Progressbar.new(right_top, :mode=>:indeterminate).pack(:fill=>:both, :expand=>true).start
-
-# Fill the text pane
-if Tk.windowingsystem != 'aqua'
-  # The trick with the ttk::frame makes the text widget look like it fits with
-  # the current Ttk theme despite not being a themed widget itself. It is done
-  # by styling the frame like an entry, turning off the border in the text
-  # widget, and putting the text widget in the frame with enough space to allow
-  # the surrounding border to show through (2 pixels seems to be enough).
-  f = Ttk::Frame.new(right_bot, :style=>Ttk::Entry)
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  txt.pack(:fill=>:both, :expand=>true, :in=>f, :pady=>2, :padx=>2)
-  scr = txt.yscrollbar(Ttk::Scrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  f.pack(:fill=>:both, :expand=>true)
-  outer.pack(:fill=>:both, :expand=>true)
-else
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  scr = txt.yscrollbar(TkScrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  txt.pack(:fill=>:both, :expand=>true, :in=>right_bot)
-  outer.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>[6, 10])
-end
diff --git a/ext/tk/sample/demos-en/ttkprogress.rb b/ext/tk/sample/demos-en/ttkprogress.rb
deleted file mode 100644
index 3eb9a64a4a..0000000000
--- a/ext/tk/sample/demos-en/ttkprogress.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# ttkprogress.rb --
-#
-# This demonstration script creates several progress bar widgets.
-#
-# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkprogress_demo) && $ttkprogress_demo
-  $ttkprogress_demo.destroy 
-  $ttkprogress_demo = nil
-end
-
-$ttkprogress_demo = TkToplevel.new {|w|
-  title("Progress Bar Demonstration")
-  iconname("ttkprogress")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left, 
-               :text=>Tk::UTF8_String.new(<<EOL)).pack(:side=>:top, :fill=>:x)
-Below are two progress bars. \
-The top one is a \\u201Cdeterminate\\u201D progress bar, \
-which is used for showing how far through a defined task the program has got. \
-The bottom one is an \\u201Cindeterminate\\u201D progress bar, \
-which is used to show that the program is busy \
-but does not know how long for. Both are run here in self-animated mode, \
-which can be turned on and off using the buttons underneath.
-EOL
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'See Code', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttkprogress'}), 
-         Ttk::Button.new(frame, :text=>'Dismiss', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $ttkprogress_demo.destroy
-                           $ttkprogress_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
-p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
-
-start = Ttk::Button.new(frame, :text=>'Start Progress', 
-                        :command=>proc{ p1.start; p2.start })
-stop  = Ttk::Button.new(frame, :text=>'Stop Progress', 
-                        :command=>proc{ p1.stop; p2.stop })
-
-Tk.grid(p1, '-', :pady=>5, :padx=>10)
-Tk.grid(p2, '-', :pady=>5, :padx=>10)
-Tk.grid(start, stop, :padx=>10, :pady=>5)
-start.grid_configure(:sticky=>'e')
-stop.grid_configure(:sticky=>'w')
-frame.grid_columnconfigure(:all, :weight=>1)
-
diff --git a/ext/tk/sample/demos-en/twind.rb b/ext/tk/sample/demos-en/twind.rb
index 65ee712ff7..c841b7c317 100644
--- a/ext/tk/sample/demos-en/twind.rb
+++ b/ext/tk/sample/demos-en/twind.rb
@@ -19,10 +19,8 @@ $twind_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($twind_demo).pack(:fill=>:both, :expand=>true)
-
 # frame
-$twind_buttons = TkFrame.new(base_frame) {|frame|
+$twind_buttons = TkFrame.new($twind_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc{
@@ -41,13 +39,13 @@ $twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame
 $twind_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2, 
-            'relief'=>'sunken') {|f|
+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|
+			  'width'=>'70', 'height'=>35, 'wrap'=>'word', 
+			  'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
     TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
+      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')
@@ -55,16 +53,16 @@ TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
 
 # 
 $tag_center = TkTextTag.new($twind_text, 
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
+			    'justify' =>'center',
+			    'spacing1'=>'5m',
+			    'spacing3'=>'5m'  )
 $tag_buttons = TkTextTag.new($twind_text, 
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
+			     '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\", ")
@@ -72,42 +70,42 @@ $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'
-                 })
+		 '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'
-                 })
+		 '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'
-                 })
+		 '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'
-                 })
+		 '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 ")
@@ -125,27 +123,27 @@ $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 )
+		 '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 )
+		 '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', 
@@ -153,13 +151,13 @@ TkTextWindow.new($twind_text, 'end',
   '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 )
+		   'window'=>TkButton.new($twind_text) {
+		     text twind_color
+		     cursor 'top_left_arrow'
+		     command proc{$twind_text.bg twind_color}
+		   },
+		   'padx'=>3, 
+		   'pady'=>2 )
 }
 
 # 
@@ -208,48 +206,44 @@ def textWindPlot (t)
     cursor 'top_left_arrow'
   }
 
-  if $tk_version =~ /^4.*/
-    font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  else
-    font = 'Helvetica 18'
-  end
+  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')
+	      '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')
+		'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')
+		'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')
+		       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
     item.addtag 'point'
   end
 
   $twind_plot.itembind('point', 'Any-Enter', 
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
+			proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
   $twind_plot.itembind('point', 'Any-Leave', 
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
+			proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
   $twind_plot.itembind('point', '1', 
-                        proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
+			proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
   $twind_plot.itembind('point', 'ButtonRelease-1', 
-                        proc{$twind_plot.dtag 'selected'})
+			proc{$twind_plot.dtag 'selected'})
   $twind_plot.bind('B1-Motion', 
-                    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
+		    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
   while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
     $twind_text.delete $mark_plot
   end
diff --git a/ext/tk/sample/demos-en/twind2.rb b/ext/tk/sample/demos-en/twind2.rb
deleted file mode 100644
index 43990c1151..0000000000
--- a/ext/tk/sample/demos-en/twind2.rb
+++ /dev/null
@@ -1,384 +0,0 @@
-#
-# 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)
-}
-
-base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-$twind2_buttons = TkFrame.new(base_frame) {|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(base_frame, '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/ext/tk/sample/demos-en/unicodeout.rb b/ext/tk/sample/demos-en/unicodeout.rb
index 9c230a2536..7bb951c93c 100644
--- a/ext/tk/sample/demos-en/unicodeout.rb
+++ b/ext/tk/sample/demos-en/unicodeout.rb
@@ -16,11 +16,9 @@ $unicodeout_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'5.4i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+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 \
@@ -38,22 +36,22 @@ The strings are converted to the encoded string objects \
 And the Tk::UTF8_String objects are passed to the label widgets. 
 EOL
 
-TkFrame.new(base_frame){|f|
+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)
+		 $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)
+		 showCode 'unicodeout'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
-wait_msg = TkLabel.new(base_frame, 
-                       :text=>"Please wait while loading fonts...", 
-                       :font=>"Helvetica 12 italic").pack
+wait_msg = TkLabel.new($unicodeout_demo, 
+		       :text=>"Please wait while loading fonts...", 
+		       :font=>"Helvetica 12 italic").pack
 
 class Unicodeout_SampleFrame < TkFrame
   @@font = $font
@@ -65,23 +63,23 @@ class Unicodeout_SampleFrame < TkFrame
   # @@font = 'Newspaper 12'
   # @@font = '{New century schoolbook} 12'
 
-  def initialize(base)
-    super(base)
+  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)
+		    :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)
+		    :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(base_frame)
+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
@@ -92,23 +90,23 @@ $unicodeout_demo.cursor('watch')
 Tk.update
 
 f.add_sample('Arabic', 
-             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94', 
-             '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
+	     '\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')
+	     '\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')
+	     '\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')
+	     '\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')
+	     '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ', 
+	     '\u044F\u0437\u044B\u043A')
 
 wait_msg.destroy
 $unicodeout_demo.cursor(oldCursor)
diff --git a/ext/tk/sample/demos-en/vscale.rb b/ext/tk/sample/demos-en/vscale.rb
index b05ed12072..636b85813b 100644
--- a/ext/tk/sample/demos-en/vscale.rb
+++ b/ext/tk/sample/demos-en/vscale.rb
@@ -15,9 +15,7 @@ $vscale_demo = TkToplevel.new {|w|
 }
 positionWindow($vscale_demo)
 
-base_frame = TkFrame.new($vscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($vscale_demo) {
   font $font
   wraplength '3.5i'
   justify 'left'
@@ -25,7 +23,7 @@ msg = TkLabel.new(base_frame) {
 }
 msg.pack('side'=>'top', 'padx'=>'.5c')
 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($vscale_demo) {|frame|
   TkButton.new(frame) {
     text 'Dismiss'
     command proc {
@@ -41,17 +39,7 @@ TkFrame.new(base_frame) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-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
-
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($vscale_demo) {|frame|
   borderwidth 10
   canvas = TkCanvas.new(frame) {|c|
     width 50
@@ -77,3 +65,14 @@ TkFrame.new(base_frame) {|frame|
   }.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/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget
index 9a0605d8b9..aa702883de 100644
--- a/ext/tk/sample/demos-en/widget
+++ b/ext/tk/sample/demos-en/widget
@@ -10,11 +10,14 @@
 # as needed.
 
 require 'tk'
-# require 'tkafter'
 
-### $DEBUG=1 ##########
+#unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
+#  require 'tkencoding'
+#end
+
+require 'tkafter'
 
-$RubyTk_WidgetDemo = true
+### $DEBUG=1 ##########
 
 #----------------------------------------------------------------
 # The code below create the main window, consisting of a menu bar
@@ -23,104 +26,28 @@ $RubyTk_WidgetDemo = true
 #----------------------------------------------------------------
 
 # widget demo directory
-# $demo_dir = File.dirname($0)
-$demo_dir = File.dirname(__FILE__)
+$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
+$font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
 
 # 
-if $tk_major_ver >= 8
-  $root.add_menubar([[['File', 0], 
-                        ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                        '---', 
-                        ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                      ]])
-else
-  TkMenubar.new($root, 
-                [[['File', 0], 
-                    ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                    '---', 
-                    ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                  ]]).pack('side'=>'top', 'fill'=>'x')
-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('Control-q', proc{exit})
 
 =begin
 TkFrame.new($root){|frame|
@@ -140,7 +67,7 @@ if $tk_version =~ /^4\.[01]/
   scr = TkScrollbar.new($root, 'orient'=>'vertical')
   txt = TkText.new($root) {
     wrap 'word'
-    width 70
+    width 60
     height 30
     font $font
     setgrid 'yes'
@@ -152,12 +79,12 @@ if $tk_version =~ /^4\.[01]/
 else
   textFrame = TkFrame.new($root)
   scr = TkScrollbar.new($root, 'orient'=>'vertical', 
-                        'highlightthickness'=>0, 'takefocus'=>1) {
+			'highlightthickness'=>0, 'takefocus'=>1) {
     pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
   }
   txt = TkText.new($root) {
     wrap 'word'
-    width 70
+    width 60
     height 30
     font $font
     setgrid 'yes'
@@ -165,7 +92,6 @@ else
     padx 4
     pady 2
     takefocus 0
-    bd 1
     yscrollcommand proc{|first,last| scr.set first,last}
   }
   scr.command(proc{|*args| txt.yview(*args)})
@@ -175,18 +101,13 @@ else
   textFrame.pack('expand'=>'yes', 'fill'=>'both')
 
   statusBar = TkFrame.new($root) {|f|
-    if $tk_version =~ /^4.*/
-      statusfont = '-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-    else
-      statusfont = 'Helvetica 10'
-    end
     $statusBarLabel = \
     TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-                'font'=>statusfont) \
-        .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
+		'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'=>statusfont) \
-        .pack('side'=>'left', 'padx'=>2)
+		'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+	.pack('side'=>'left', 'padx'=>2)
   }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
 end
 
@@ -194,11 +115,7 @@ end
 # section titles and demo descriptions.  Also define the bindings for
 # tags.
   
-if $tk_version =~ /^4.*/
-  tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
-else
-  tag_title = TkTextTag.new(txt, 'font'=>'Helvetica 18 bold')
-end
+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
@@ -206,55 +123,55 @@ end
 
 tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
 
-if TkWinfo.depth($root) == 1
+if TkWinfo.depth($root) == '1'
   tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-                           'underline'=>1)
+			   'underline'=>1)
   $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-                              'underline'=>1)
+			      '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)
+			   'foreground'=>'blue', 'underline'=>1)
   $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-                              'foreground'=>'#303080', 'underline'=>1)
+			      'foreground'=>'#303080', 'underline'=>1)
 #  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1, 
-#                         'background'=>'SeaGreen3')
+#			  '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')
+	      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')
+		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'=>"")
-              })
+	      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')
+		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.
 
@@ -267,10 +184,7 @@ 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. \
-Don't worry about breaking the source code. \
-Your modifications are not reflected on the original file. \
-Please try many kind of changes. 
+with the modified code.
 
 Some demo scripts require the recent version of Tk library \
 (e.g. Tk8.4 or later) \
@@ -279,20 +193,6 @@ 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.
 
-If your Tk supports Ttk (Tile) extension (included or installed), \
-please try the demo of Ttk extension (sample/tkextlib/tile/demo.rb) too.
-( Probably, Ttk extension \
-#{
-begin
-  require 'tkextlib/tile'
-  "is already installed on your environment"
-rescue
-  "is not installed on your environment yet"
-end
-}\
-. )
-Ttk extension is a standard feature of Tk8.5 or later.
-
 
 EOT
 
@@ -306,27 +206,21 @@ 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', "5. Radiobuttons (select one of a group).\n", tag_demo, "demo-radio")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. Radiobuttons (if supported).\n", tag_demo, "demo-radio3")
+txt.insert('end', "6. Radiobuttons (if supported 'compound' option).\n", tag_demo, "demo-radio2")
 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', "7. 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', "8. 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', "9. 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', "10. 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', "11. 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', "15. The simple Themed Tk widgets (require Tile/Ttk extension)\n", tag_demo, "demo-ttkbut")
+txt.insert('end', "12. Labelled frames (if supported)\n", tag_demo, "demo-labelframe")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -338,10 +232,6 @@ txt.insert('end', "2. Colors: change the color scheme for the application.\n", "
 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', "4. A multi-column list of contries. (require Tile/Ttk extension)\n", tag_demo, "demo-mclist")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. A directory browser tree. (require Tile/Ttk extension)\n", tag_demo, "demo-tree")
-txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 txt.insert('end', "Entries and Spin-boxes\n", tag_title)
@@ -351,14 +241,12 @@ 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")
+	   "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. Combo-boxes. (require Tile/Ttk extension)\n", tag_demo, "demo-combo")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. Simple Rolodex-like form.\n", tag_demo, "demo-form")
+txt.insert('end', "5. Simple Rolodex-like form.\n", tag_demo, "demo-form")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -372,11 +260,7 @@ 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', "7. Peering text widgets. (if supported)\n", tag_demo, "demo-textpeer")
+txt.insert('end', "5. A search tool built with a text widget.\n", tag_demo, "demo-search")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -394,47 +278,33 @@ txt.insert('end', "5. A ruler with adjustable tab stops.\n", tag_demo, "demo-rul
 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', "9. A Knight's tour of the chess board. (require Tile/Ttk extension)\n", tag_demo, "demo-knightstour")
+txt.insert('end', "7. A simple scrollable canvas.\n", tag_demo, "demo-cscroll")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
-txt.insert('end', "Scales and Progress Bars\n", tag_title)
+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', "3. Progress bar. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttkprogress")
-txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
-txt.insert('end', "Paned Windows and Notebooks\n", tag_title)
+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', "3. Themed nested panes. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttkpane")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Notebook widget. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttknote")
-txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
-txt.insert('end', "Menus and Toolbars\n", tag_title)
+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', "4. Themed menu buttons. (require Tile/Ttk extension)\n", tag_demo, "demo-ttkmenu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Themed toolbar. (require Tile/Ttk extension)\n", tag_demo, "demo-toolbar")
+txt.insert('end', "3. Menubuttons\n", tag_demo, "demo-menubu")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -442,25 +312,12 @@ 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. Message boxes with detail text. (if supported)\n", tag_demo, "demo-msgbox2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. File selection dialog.\n", tag_demo, "demo-filebox")
+txt.insert('end', "2. File selection dialog.\n", tag_demo, "demo-filebox")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Color picker.\n", tag_demo, "demo-clrpick")
+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")
@@ -478,7 +335,7 @@ scr.focus
 # new demo window.
 #
 # Arguments:
-# w -           The name of the window to position.
+# w -		The name of the window to position.
 
 def positionWindow(w)
   w.geometry('+300+300')
@@ -489,11 +346,11 @@ end
 # 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.
+# w -		Name of new window to create for display.
+# args -	Any number of names of variables.
 
 $showVarsWin = {}
-def showVars1(parent, *args)
+def showVars (parent, *args)
   if $showVarsWin[parent.path]
     begin
       $showVarsWin[parent.path].destroy 
@@ -502,16 +359,11 @@ def showVars1(parent, *args)
   end
   w = TkToplevel.new(parent) {|w|
     title "Variable values"
-    base = TkFrame.new(w).pack(:fill=>:both, :expand=>true)
-    TkLabel.new(base) {
+    TkLabel.new(w) {
       text "Variable values:"
       width 20
       anchor 'center'
-      if $tk_version =~ /^4.*/
-        font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
-      else
-        font 'Helvetica 14'
-      end
+      font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
     }.pack('side'=>'top', 'fill'=>'x')
     len = 1
     args.each{|vnam,vbody|
@@ -519,13 +371,13 @@ def showVars1(parent, *args)
     }
     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')
+	#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(base) {
+    TkButton.new(w) {
       text "OK"
       command proc{w.destroy}
     }.pack('side'=>'bottom', 'pady'=>2)
@@ -533,198 +385,32 @@ def showVars1(parent, *args)
   $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) {|top|
-    title "Variable values"
-
-    base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
-
-    TkLabelFrame.new(base, :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(base, :text=>"OK", :width=>8, :default=>:active, 
-                 :command=>proc{top.destroy}){|b|
-      top.bind('Return', proc{b.invoke})
-      top.bind('Escape', proc{b.invoke})
-
-      b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
-    }
-    base.grid_columnconfig(0, :weight=>1)
-    base.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, file=nil)
-  #eval(code)
-  #_null_binding.pseudo_toplevel_eval{ eval(code) }
-  #Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }
-  Thread.new{
-    _null_binding.pseudo_toplevel_eval{
-      begin
-        if file
-          eval(code, binding, "(eval:#{file})")
-        else
-          eval(code)
-        end
-      rescue Exception=>e
-        #p e
-        TkBgError.show(e.class.inspect + ': ' + e.message + "\n" +
-                         "\n---< backtrace of Ruby side >-----\n" +
-                         e.backtrace.join("\n") +
-                         "\n---< backtrace of Tk side >-------")
-      end
-    }
-  }
-  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
+# index -	The index of the character that the user clicked on.
 
-  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, tag[5..-1] + '.rb')
-  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-/}
+def invoke (txt, index)
+  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
   return unless tag
-  current_cursor = txt.cget('cursor')
+  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
+  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
   Tk.update
 #  txt.cursor('xterm')
-  txt.cursor(current_cursor)
+  txt.cursor(cursor)
 
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
+  $tag_visited.add("#{index} linestart +1 chars", "#{index} 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.
+#	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)
@@ -736,7 +422,7 @@ def showStatus (txt, index)
   else
     demoname = tag[5..-1]
     $statusBarLabel.configure('text', 
-                             "Run the \"#{demoname}\" sample program")
+			     "Run the \"#{demoname}\" sample program")
     newcursor = 'hand2'
   end
   txt.configure('cursor'=>newcursor) if cursor != newcursor
@@ -747,100 +433,76 @@ end
 # 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.
+# w -		The name of the demonstration's window, which can be
+#		used to derive the name of the file containing its code.
 
-def showCode1(demo)
+def showCode (demo)
   file = "#{demo}.rb"
   $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
+  if $code_window == nil || TkWinfo.exist?($code_window) == '0'
     $code_window = TkToplevel.new(nil)
     f = TkFrame.new($code_window)
-
     TkButton.new(f) {
       text "Dismiss"
       command proc{
-        $code_window.destroy
-        $code_window = nil
+	$code_window.destroy
+	$code_window = nil
       }
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2, 'padx'=>25)
+    }.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'), '<viewer>')}
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
-
-    TkLabel.new(f,'text'=>'line:').pack('side'=>'left')
-    linenum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-    TkLabel.new(f,'text'=>'  pos:').pack('side'=>'left')
-    posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
+      command proc{eval($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}
+	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')
+	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)
+	TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+	TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
       }
     end
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
   else
     $code_window.deiconify
     $code_window.raise
   end
-
   $code_window.title("Demo code: #{file}")
   $code_window.iconname(file)
 #  fid = open(file, 'r')
@@ -851,234 +513,19 @@ def showCode1(demo)
   #$code_mark = TkTextMark.new($code_text, '1.0')
   #$code_text.set_insert('1.0')
   TkTextMarkInsert.new($code_text,'1.0')
-
-  $set_linenum.call($code_text)
-
-  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)
-
-    lf = TkFrame.new(bf)
-    TkLabel.new(lf, :text=>'line:').pack(:side=>:left)
-    linenum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-    TkLabel.new(lf, :text=>'  pos:').pack(:side=>:left)
-    posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    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'), '<viewer>')
-                         }, 
-                         :image=>$image['refresh'], :compound=>:left)
-
-    TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
-    bf.grid_columnconfigure(1, :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)
-    }
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-    btag.bind('Configure', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  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')
-
-  $set_linenum.call($code_text)
-
   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.7.0-en\n\n" + 
-                           "based on demos of Tk8.1 -- 8.5  " + 
-                           "( Copyright of Tcl/Tk demos:: " + 
-                           "(c) 1996-1997 Sun Microsystems, Inc. / " + 
-                           "(c) 1997-2000 Ajuba Solutions, Inc. / " + 
-                           "(c) 2001-2007 Donal K. Fellows / " + 
-                           "(c) 2002-2007 Daniel A. Steffen )\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}")
+		'message'=>"Ruby/Tk widget demonstration Ver.1.3.2-en\n\n( based on Tk 8.1 Copyright (c) 1996-1997 Sun Microsystems, Inc. )\n\nRunning Version :: Ruby#{VERSION}/Tk#{$tk_version}")
 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, cmd + '.rb')
-}
-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/ext/tk/sample/demos-jp/README.1st b/ext/tk/sample/demos-jp/README.1st
deleted file mode 100644
index 60b278d7b6..0000000000
--- a/ext/tk/sample/demos-jp/README.1st
+++ /dev/null
@@ -1,20 +0,0 @@
-¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï 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/ext/tk/sample/demos-jp/anilabel.rb b/ext/tk/sample/demos-jp/anilabel.rb
deleted file mode 100644
index aee57f9f6a..0000000000
--- a/ext/tk/sample/demos-jp/anilabel.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# 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)
-}
-
-base_frame = TkFrame.new($anilabel_demo).pack(:fill=>:both, :expand=>true)
-
-# label À¸À®
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "²¼¤Ë¤Ï4¤Ä¤Î¥¢¥Ë¥á¡¼¥·¥ç¥ó¥é¥Ù¥ë¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£º¸Â¦¤Ë¤¢¤ë¥é¥Ù¥ë¤Ï¡¢ÆâÉô¤Î¥Æ¥­¥¹¥È¥á¥Ã¥»¡¼¥¸¤ò¥¹¥¯¥í¡¼¥ë¤·¤¿¤è¤¦¤Ë¸«¤»¤ë¤³¤È¤ÇÆ°¤­¤òÉÕ¤±¤Æ¤¤¤Þ¤¹¡£±¦Â¦¤Î¥é¥Ù¥ë¤Ï¡¢É½¼¨¤¹¤ë¥¤¥á¡¼¥¸¤òÊѲ½¤µ¤»¤ë¤³¤È¤ÇÆ°¤­¤òÍ¿¤¨¤Æ¤¤¤Þ¤¹¡£"
-}
-msg.pack('side'=>'top')
-
-# frame À¸À®
-TkFrame.new(base_frame) {|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(base_frame,  :text=>'Scrolling Texts')
-f_right = TkLabelFrame.new(base_frame, :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/ext/tk/sample/demos-jp/aniwave.rb b/ext/tk/sample/demos-jp/aniwave.rb
deleted file mode 100644
index 8fa14f65fe..0000000000
--- a/ext/tk/sample/demos-jp/aniwave.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# 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)
-}
-
-base_frame = TkFrame.new($aniwave_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text '¤³¤Î¥Ç¥â¤Ç¤Ï¡¢¥é¥¤¥ó¥¢¥¤¥Æ¥à¤¬°ì¤Ä¤À¤±ÉÁ¤«¤ì¤¿¥­¥ã¥ó¥Ð¥¹¥¦¥£¥¸¥§¥Ã¥È¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥¢¥Ë¥á¡¼¥·¥ç¥ó½èÍý¤Ï¡¢¤½¤Î¥é¥¤¥ó¥¢¥¤¥Æ¥à¤ÎºÂɸÃͤòÊѹ¹¤¹¤ë¤³¤È¤Ç¼Â¸½¤·¤Æ¤¤¤Þ¤¹¡£'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|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] }
-    n = 305
-    @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(base_frame, :left).move
diff --git a/ext/tk/sample/demos-jp/arrow.rb b/ext/tk/sample/demos-jp/arrow.rb
index 3c49e67b09..3640798db1 100644
--- a/ext/tk/sample/demos-jp/arrow.rb
+++ b/ext/tk/sample/demos-jp/arrow.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # arrowhead widget demo (called by 'widget')
 #
@@ -10,7 +9,7 @@
 # interactively.
 #
 # Arguments:
-# c -           Name of the canvas widget.
+# c -		Name of the canvas widget.
 
 def arrowSetup(c)
   v = $demo_arrowInfo
@@ -26,67 +25,59 @@ def arrowSetup(c)
   # 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) )
+	      { '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')
+	      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) )
+		   {'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) )
+		   {'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) )
+		   {'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])
+	      '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])
+	      '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])
+	      '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)
+	      '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)
+	      '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)
+	      '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)
+	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
 
-  if $tk_version =~ /^4.*/
-    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-*-*-*-*-*-*')
-  else
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
-                'font'=>'Helvetica 18')
-    TkcText.new(c, v.x1, 330, 
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
-                'anchor'=>'w', 'font'=>'Helvetica 18')
-  end
+  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
@@ -104,19 +95,16 @@ $arrow_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
-            'text'=>"¤³¤Î widget ¤Ç¡¢¥­¥ã¥ó¥Ð¥¹¤Ç»È¤ï¤ì¤ë¥é¥¤¥ó¤Ë¤Ä¤¤¤ÆÍÍ¡¹¤ÊÉý¤äÌð°õ¤ÎƬ¤Î·Á¤ò»î¤·¤Æ¤ß¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Àþ¤ÎÉý¤äÌð°õ¤Î·Á¤òÊѤ¨¤ë¤Ë¤Ï¡¢³ÈÂ礵¤ì¤¿Ìð°õ¤Ë¤Ä¤¤¤Æ¤¤¤ë 3¤Ä¤Î»Í³Ñ¤ò¥É¥é¥Ã¥°¤·¤Æ¤¯¤À¤µ¤¤¡£±¦Â¦¤ÎÌð°õ¤ÏÉáÄ̤ÎÂ礭¤µ¤Ç¤Î¥µ¥ó¥×¥ë¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£²¼¤Î¥Æ¥­¥¹¥È¤Ï¥é¥¤¥ó¥¢¥¤¥Æ¥à¤ËÂФ¹¤ëÀßÄꥪ¥×¥·¥ç¥ó¤Ç¤¹¡£"){
+TkLabel.new($arrow_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+	    'text'=>"¤³¤Î widget ¤Ç¡¢¥­¥ã¥ó¥Ð¥¹¤Ç»È¤ï¤ì¤ë¥é¥¤¥ó¤Ë¤Ä¤¤¤ÆÍÍ¡¹¤ÊÉý¤äÌð°õ¤ÎƬ¤Î·Á¤ò»î¤·¤Æ¤ß¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Àþ¤ÎÉý¤äÌð°õ¤Î·Á¤òÊѤ¨¤ë¤Ë¤Ï¡¢³ÈÂ礵¤ì¤¿Ìð°õ¤Ë¤Ä¤¤¤Æ¤¤¤ë 3¤Ä¤Î»Í³Ñ¤ò¥É¥é¥Ã¥°¤·¤Æ¤¯¤À¤µ¤¤¡£±¦Â¦¤ÎÌð°õ¤ÏÉáÄ̤ÎÂ礭¤µ¤Ç¤Î¥µ¥ó¥×¥ë¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£²¼¤Î¥Æ¥­¥¹¥È¤Ï¥é¥¤¥ó¥¢¥¤¥Æ¥à¤ËÂФ¹¤ëÀßÄꥪ¥×¥·¥ç¥ó¤Ç¤¹¡£"){
   pack('side'=>'top')
 }
 
 # frame À¸À®
-$arrow_buttons = TkFrame.new(base_frame) {|frame|
+$arrow_buttons = TkFrame.new($arrow_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $arrow_demo
       $arrow_demo = nil
@@ -132,15 +120,15 @@ $arrow_buttons = TkFrame.new(base_frame) {|frame|
 $arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # canvas ÀßÄê
-$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350, 
-                             'relief'=>'sunken', 'borderwidth'=>2)
+$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
+			       :x1, :x2, :y, :smallTips, :count, 
+			       :bigLineStyle, :boxStyle, :activeStyle).new
 end
 $demo_arrowInfo.a = 8
 $demo_arrowInfo.b = 10
@@ -158,7 +146,7 @@ if TkWinfo.depth($arrow_canvas) > 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)}
+    '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
@@ -169,16 +157,16 @@ $arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_ar
 $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}})
+		       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}})
+		       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}})
+		       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")
+		  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
 $arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
 
 # arrowMove1 --
@@ -187,8 +175,8 @@ $arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
 # for the line and arrowhead.
 #
 # Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
+# c -		The name of the canvas window.
+# x, y -	The coordinates of the mouse.
 
 def arrowMove1(c,x,y)
   v = $demo_arrowInfo
@@ -207,8 +195,8 @@ end
 # parameters for the line and arrowhead.
 #
 # Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
+# c -		The name of the canvas window.
+# x, y -	The coordinates of the mouse.
 
 def arrowMove2(c,x,y)
   v = $demo_arrowInfo
@@ -231,8 +219,8 @@ end
 # controlling parameters for the line and arrowhead.
 #
 # Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
+# c -		The name of the canvas window.
+# x, y -	The coordinates of the mouse.
 
 def arrowMove3(c,x,y)
   v = $demo_arrowInfo
diff --git a/ext/tk/sample/demos-jp/bind.rb b/ext/tk/sample/demos-jp/bind.rb
index a1bcfdd2e7..1f221a6293 100644
--- a/ext/tk/sample/demos-jp/bind.rb
+++ b/ext/tk/sample/demos-jp/bind.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # text (tag bindings) widget demo (called by 'widget')
 #
@@ -16,13 +15,10 @@ $bind_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($bind_demo).pack(:fill=>:both, :expand=>true)
-
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($bind_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $bind_demo
       $bind_demo = nil
@@ -43,14 +39,14 @@ def tag_binding_for_bind_demo(tag, enter_style, leave_style)
 end
 
 # text À¸À®
-txt = TkText.new(base_frame){|t|
+TkText.new($bind_demo){|t|
   # À¸À®
   setgrid 'true'
-  #width  60
-  #height 24
+  width  60
+  height 24
   font $font
   wrap 'word'
-  TkScrollbar.new(base_frame) {|s|
+  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}
@@ -76,50 +72,35 @@ txt = TkText.new(base_frame){|t|
   insert('end', '2. ´Êñ¤Ê 2¼¡¸µ¤Î¥×¥í¥Ã¥È¡£¥Ç¡¼¥¿¤òɽ¤¹ÅÀ¤òÆ°¤«¤¹¤³¤È¤¬¤Ç¤­¤ë¡£', (d2 = TkTextTag.new(t)) )
   insert('end', "\n\n")
   insert('end', '3. ¥Æ¥­¥¹¥È¥¢¥¤¥Æ¥à¤Î¥¢¥ó¥«¡¼¤È¹Ô·¤¨¡£', 
-         (d3 = TkTextTag.new(t)) )
+	 (d3 = TkTextTag.new(t)) )
   insert('end', "\n\n")
   insert('end', '4. ¥é¥¤¥ó¥¢¥¤¥Æ¥à¤Î¤¿¤á¤ÎÌð°õ¤ÎƬ¤Î·Á¤Î¥¨¥Ç¥£¥¿¡£', 
-         (d4 = TkTextTag.new(t)) )
+	 (d4 = TkTextTag.new(t)) )
   insert('end', "\n\n")
   insert('end', '5. ¥¿¥Ö¥¹¥È¥Ã¥×¤òÊѹ¹¤¹¤ë¤¿¤á¤Îµ¡Ç½¤Ä¤­¤Î¥ë¡¼¥é¡¼¡£', 
-         (d5 = TkTextTag.new(t)) )
+	 (d5 = TkTextTag.new(t)) )
   insert('end', "\n\n")
   insert('end', 
-         '6. ¥­¥ã¥ó¥Ð¥¹¤¬¤É¤¦¤ä¤Ã¤Æ¥¹¥¯¥í¡¼¥ë¤¹¤ë¤Î¤«¤ò¼¨¤¹¥°¥ê¥Ã¥É¡£', 
-         (d6 = TkTextTag.new(t)) )
+	 '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_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'items.rb'].join(File::Separator)}`})
   d2.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`})
   d3.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`})
   d4.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`})
   d5.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`})
   d6.bind('1', 
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
-          })
+	  proc{eval `cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`})
 
   TkTextMarkInsert.new(t, '0.0')
   configure('state','disabled')
 }
-
-txt.width  60
-txt.height 24
diff --git a/ext/tk/sample/demos-jp/bitmap.rb b/ext/tk/sample/demos-jp/bitmap.rb
index b6b0e54bbe..a400862881 100644
--- a/ext/tk/sample/demos-jp/bitmap.rb
+++ b/ext/tk/sample/demos-jp/bitmap.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # bitmap widget demo (called by 'widget')
 #
@@ -7,19 +6,19 @@
 # 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.
+# 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')
-        Tk::Label.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
+	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
   }
@@ -38,19 +37,16 @@ $bitmap_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left', 
-            'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¡¢Tk ¤ËÁȤ߹þ¤Þ¤ì¤¿¤¹¤Ù¤Æ¤Î¥Ó¥Ã¥È¥Þ¥Ã¥×¤¬¡¢¤½¤ì¤é¤Î̾Á°¤È¶¦¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Tcl ¤Î¥¹¥¯¥ê¥×¥ÈÃæ¤Ç¤Ï¡¢¤½¤ì¤¾¤ì¤Î̾Á°¤òÍѤ¤¤Æ»²¾È¤·¤Þ¤¹¡£"){
+TkLabel.new($bitmap_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left', 
+	    'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¡¢Tk ¤ËÁȤ߹þ¤Þ¤ì¤¿¤¹¤Ù¤Æ¤Î¥Ó¥Ã¥È¥Þ¥Ã¥×¤¬¡¢¤½¤ì¤é¤Î̾Á°¤È¶¦¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Tcl ¤Î¥¹¥¯¥ê¥×¥ÈÃæ¤Ç¤Ï¡¢¤½¤ì¤¾¤ì¤Î̾Á°¤òÍѤ¤¤Æ»²¾È¤·¤Þ¤¹¡£"){
   pack('side'=>'top')
 }
 
 # frame À¸À®
-$bitmap_buttons = TkFrame.new(base_frame) {|frame|
+$bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $bitmap_demo
       $bitmap_demo = nil
@@ -66,7 +62,7 @@ $bitmap_buttons = TkFrame.new(base_frame) {|frame|
 $bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ÀßÄê
-TkFrame.new(base_frame){|f|
+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/ext/tk/sample/demos-jp/browse2 b/ext/tk/sample/demos-jp/browse2
index edad04dbcb..304a5f547e 100644
--- a/ext/tk/sample/demos-jp/browse2
+++ b/ext/tk/sample/demos-jp/browse2
@@ -39,11 +39,11 @@ class Browse
     }
 
     # Set up bindings for the browser.
-    base.bind('Destroy', proc{
+    base.bind('Control-c', 
+	      proc{
+		base.destroy
 		Browse::BROWSE_WIN_COUNTER.value = \
-		                Browse::BROWSE_WIN_COUNTER.to_i - 1
-	      })
-    base.bind('Control-c', proc{base.destroy})
+		                Browse::BROWSE_WIN_COUNTER.to_i - 1})
     list.bind('Double-Button-1', 
 	 proc{TkSelection.get.each{|f| self.browse dir, f}})
   end
diff --git a/ext/tk/sample/demos-jp/button.rb b/ext/tk/sample/demos-jp/button.rb
index 18e42008c9..33247261f2 100644
--- a/ext/tk/sample/demos-jp/button.rb
+++ b/ext/tk/sample/demos-jp/button.rb
@@ -1,8 +1,6 @@
-# -*- coding: euc-jp -*-
 #
 # button widget demo (called by 'widget')
 #
-#
 
 # toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
 if defined?($button_demo) && $button_demo
@@ -27,10 +25,9 @@ msg = TkLabel.new($button_demo) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-$button_buttons = Tk::Frame.new($button_demo) {|frame|
+$button_buttons = TkFrame.new($button_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $button_demo
       $button_demo = nil
diff --git a/ext/tk/sample/demos-jp/check.rb b/ext/tk/sample/demos-jp/check.rb
index b953e7f623..50c21fac0e 100644
--- a/ext/tk/sample/demos-jp/check.rb
+++ b/ext/tk/sample/demos-jp/check.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # checkbutton widget demo (called by 'widget')
 #
@@ -16,14 +15,12 @@ $check_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($check_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($check_demo) {
   font $font
   wraplength '4i'
   justify 'left'
-  text "²¼¤Ë¤Ï 3 ¤Ä¤Î¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥¯¥ê¥Ã¥¯¤¹¤ë¤È¥Ü¥¿¥ó¤ÎÁªÂò¾õÂÖ¤¬ÊѤï¤ê¡¢Tcl ÊÑ¿ô ( TkVariable ¥ª¥Ö¥¸¥§¥¯¥È¤Ç¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹ ) ¤Ë¤½¤Î¥Ü¥¿¥ó¤Î¾õÂÖ¤ò¼¨¤¹ÃͤòÀßÄꤷ¤Þ¤¹¡£¸½ºß¤ÎÊÑ¿ô¤ÎÃͤò¸«¤ë¤Ë¤Ï¡ÖÊÑ¿ô»²¾È¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£"
+  text "²¼¤Ë¤Ï 3 ¤Ä¤Î¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥¯¥ê¥Ã¥¯¤¹¤ë¤È¥Ü¥¿¥ó¤ÎÁªÂò¾õÂÖ¤¬ÊѤï¤ê¡¢Tcl ÊÑ¿ô¤Ë¤½¤Î¥Ü¥¿¥ó¤Î¾õÂÖ¤ò¼¨¤¹ÃͤòÀßÄꤷ¤Þ¤¹¡£¸½ºß¤ÎÊÑ¿ô¤ÎÃͤò¸«¤ë¤Ë¤Ï¡ÖÊÑ¿ô»²¾È¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£"
 }
 msg.pack('side'=>'top')
 
@@ -33,10 +30,9 @@ brakes = TkVariable.new(0)
 sober  = TkVariable.new(0)
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($check_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $check_demo
       $check_demo = nil
@@ -54,8 +50,8 @@ TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'ÊÑ¿ô»²¾È'
     command proc{
-      showVars(base_frame, 
-               ['wipers', wipers], ['brakes', brakes], ['sober', sober])
+      showVars($check_demo, 
+	       ['wipers', wipers], ['brakes', brakes], ['sober', sober])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 
@@ -63,8 +59,8 @@ TkFrame.new(base_frame) {|frame|
 
 
 # checkbutton À¸À®
-[ TkCheckButton.new(base_frame, 'text'=>'¥ï¥¤¥Ñ¡¼ OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'¥Ö¥ì¡¼¥­ OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'±¿Å¾¼ê ÁÇÌÌ', 'variable'=>sober)
+[ 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/ext/tk/sample/demos-jp/check2.rb b/ext/tk/sample/demos-jp/check2.rb
deleted file mode 100644
index 7f7cb9e932..0000000000
--- a/ext/tk/sample/demos-jp/check2.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# 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)
-}
-
-base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
-
-# label À¸À®
-msg = TkLabel.new(base_frame) {
-  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(base_frame) {|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(base_frame, :text=>'°ÂÁ´À­¸¡ºº', :variable=>safety, 
-                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none', 
-                  :tristatevalue=>'partial'){
-  pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-[ TkCheckButton.new(base_frame, 'text'=>'¥ï¥¤¥Ñ¡¼ OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'¥Ö¥ì¡¼¥­ OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, '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/ext/tk/sample/demos-jp/clrpick.rb b/ext/tk/sample/demos-jp/clrpick.rb
index ce6b99ab94..55cfd9c7c6 100644
--- a/ext/tk/sample/demos-jp/clrpick.rb
+++ b/ext/tk/sample/demos-jp/clrpick.rb
@@ -1,9 +1,6 @@
-# -*- coding: euc-jp -*-
 #
 # widget demo prompts the user to select a color (called by 'widget')
 #
-#  Note: don't support ttk_wrapper. work with standard widgets only.
-#
 
 # toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
 if defined?($clrpick_demo) && $clrpick_demo
@@ -19,17 +16,13 @@ $clrpick_demo = TkToplevel.new {|w|
 }
 
 # label À¸À®
-#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"°Ê²¼¤Î¥Ü¥¿¥ó¤ò²¡¤·¤Æ¡¢¤³¤Î¥¦¥£¥ó¥É¥¦¾å¤Ë¤¢¤ë¥¦¥£¥¸¥§¥Ã¥È¤ÎÁ°·Ê¿§¤ÈÇØ·Ê¿§¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£").pack('side'=>'top')
+TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+	    'text'=>"°Ê²¼¤Î¥Ü¥¿¥ó¤ò²¡¤·¤Æ¡¢¤³¤Î¥¦¥£¥ó¥É¥¦¾å¤Ë¤¢¤ë¥¦¥£¥¸¥§¥Ã¥È¤ÎÁ°·Ê¿§¤ÈÇØ·Ê¿§¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£").pack('side'=>'top')
 
 # frame À¸À®
-# TkFrame.new($clrpick_demo) {|frame|
-Tk::Frame.new($clrpick_demo) {|frame|
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+TkFrame.new($clrpick_demo) {|frame|
+  TkButton.new(frame) {
+    text 'λ²ò'
     command proc{
       tmppath = $clrpick_demo
       $clrpick_demo = nil
@@ -37,23 +30,20 @@ Tk::Frame.new($clrpick_demo) {|frame|
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
+  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|
-Tk::Button.new($clrpick_demo, 'text'=>'ÇØ·Ê¿§¤òÀßÄê ...') {|b|
+TkButton.new($clrpick_demo, 'text'=>'ÇØ·Ê¿§¤òÀßÄê ...') {|b|
   command(proc{setColor $clrpick_demo, b, 'background', 
-              ['background', 'highlightbackground']})
+	      ['background', 'highlightbackground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }
 
-# TkButton.new($clrpick_demo, 'text'=>'Á°·Ê¿§¤òÀßÄê ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'Á°·Ê¿§¤òÀßÄê ...') {|b|
+TkButton.new($clrpick_demo, 'text'=>'Á°·Ê¿§¤òÀßÄê ...') {|b|
   command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }
@@ -62,7 +52,7 @@ def setColor(w,button,name,options)
   w.grab
   initialColor = button[name]
   color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w, 
-                         'initialcolor'=>initialColor)
+			 'initialcolor'=>initialColor)
   if color != ""
     setColor_helper(w,options,color)
   end
diff --git a/ext/tk/sample/demos-jp/colors.rb b/ext/tk/sample/demos-jp/colors.rb
index 91817a947b..f9a5983e75 100644
--- a/ext/tk/sample/demos-jp/colors.rb
+++ b/ext/tk/sample/demos-jp/colors.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # listbox widget demo 'colors' (called by 'widget')
 #
@@ -16,10 +15,8 @@ $colors_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($colors_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($colors_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($colors_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $colors_demo
       $colors_demo = nil
@@ -48,7 +44,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame À¸À®
 colors_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
+TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
   s = TkScrollbar.new(w)
   colors_lbox = TkListbox.new(w) {
     setgrid 1
@@ -61,15 +57,7 @@ TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
   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})
-colors_lbox.bind('Double-1', proc{
-                   begin
-                     TkPalette.setPalette TkSelection.get
-                   rescue => e
-                     p e
-                     Tk.tk_call_without_enc('destroy', '.___tk_set_palette')
-                   end
-                   })
+colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
 
 ins_data = [
   'gray60','gray70','gray80','gray85','gray90','gray95',
diff --git a/ext/tk/sample/demos-jp/combo.rb b/ext/tk/sample/demos-jp/combo.rb
deleted file mode 100644
index da00d712ba..0000000000
--- a/ext/tk/sample/demos-jp/combo.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# combo.rb --
-#
-# This demonstration script creates several combobox widgets.
-#
-# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($combo_demo) && $combo_demo
-  $combo_demo.destroy 
-  $combo_demo = nil
-end
-
-$combo_demo = TkToplevel.new {|w|
-  title("Combobox Demonstration")
-  iconname("combo")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left, 
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-°Ê²¼¤Ç¤Ï3¼ïÎà¤Î¥³¥ó¥Ü¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥\
-ºÇ½é¤Î¤â¤Î¤Ï¡¤¥¨¥ó¥È¥ê¥¦¥£¥¸¥§¥Ã¥È¤ÈƱ¤¸Íͤˡ¤\
-¥Ý¥¤¥ó¥È¤·¤¿¤ê¡¤¥¯¥ê¥Ã¥¯¤·¤¿¤ê¡¤¥¿¥¤¥×¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥\
-¤Þ¤¿¡¤Return¥­¡¼¤òÆþÎϤ¹¤ì¤Ð¸½ºß¤ÎÃͤ¬¥ê¥¹¥È¤ËÄɲ䵤졤\
-¥É¥í¥Ã¥×¥À¥¦¥ó¥ê¥¹¥È¤«¤éÁªÂò¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡¥\
-¢­(²¼¸þ¤­Ìð°õ)¥­¡¼¤ò²¡¤·¤Æɽ¼¨¤µ¤ì¤¿¥ê¥¹¥È¤«¤é\
-Ìð°õ¥­¡¼¤Ç¾¤Î¸õÊä¤òÁª¤ó¤ÇReturn¥­¡¼¤ò²¡¤»¤Ð¡¤ÃͤòÁªÂò¤Ç¤­¤Þ¤¹¡¥\
-2ÈÖÌܤΥ³¥ó¥Ü¥Ü¥Ã¥¯¥¹¤ÏÆÃÄê¤ÎÃͤ˸ÇÄꤵ¤ì¤Æ¤ª¤ê¡¤°ìÀÚÊѹ¹¤Ç¤­¤Þ¤»¤ó¡¥\
-3ÈÖÌܤΤâ¤Î¤Ï¥ª¡¼¥¹¥È¥é¥ê¥¢¤ÎÅԻԤΥɥí¥Ã¥×¥À¥¦¥ó¥ê¥¹¥È¤«¤é\
-ÁªÂò¤¹¤ë¤³¤È¤À¤±¤¬²Äǽ¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
-EOL
-
-## variables
-firstValue  = TkVariable.new
-secondValue = TkVariable.new
-ozCity      = TkVariable.new
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'ÊÑ¿ô»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{
-                           showVars(base_frame, 
-                                    ['firstVariable', firstValue], 
-                                    ['secondVariable', secondValue], 
-                                    ['ozCity', ozCity])
-                         }), 
-         Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'combo'}), 
-         Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $combo_demo.destroy
-                           $combo_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-australianCities = [
-  '¥­¥ã¥ó¥Ù¥é', '¥·¥É¥Ë¡¼', '¥á¥ë¥Ü¥ë¥ó', '¥Ñ¡¼¥¹', '¥¢¥Ç¥ì¡¼¥É', 
-  '¥Ö¥ê¥¹¥Ù¡¼¥ó', '¥Û¥Ð¡¼¥È', '¥À¡¼¥¦¥£¥ó', '¥¢¥ê¥¹ ¥¹¥×¥ê¥ó¥°¥¹'
-]
-
-
-secondValue.value = 'Êѹ¹ÉÔ²Ä'
-ozCity.value = '¥·¥É¥Ë¡¼'
-
-Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
-          Ttk::Combobox.new(f, :textvariable=>firstValue){|b|
-            b.bind('Return', '%W'){|w|
-              w.values <<= w.value unless w.values.include?(w.value)
-            }
-          }.pack(:pady=>5, :padx=>10)
-        }, 
-
-        Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
-          Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
-            pack(:pady=>5, :padx=>10)
-        }, 
-
-        Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
-          Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly, 
-                            :values=>australianCities) .
-            pack(:pady=>5, :padx=>10)
-        }, 
-
-        :side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-jp/cscroll.rb b/ext/tk/sample/demos-jp/cscroll.rb
index 845952679a..7f5ffa2f02 100644
--- a/ext/tk/sample/demos-jp/cscroll.rb
+++ b/ext/tk/sample/demos-jp/cscroll.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # simple scrollable canvas widget demo (called by 'widget')
 #
@@ -16,19 +15,16 @@ $cscroll_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 
-            'justify'=>'left', 'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤ä¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó2 ¤Ç¥¹¥¯¥í¡¼¥ë¤Ç¤­¤ë¥­¥ã¥ó¥Ð¥¹ widget ¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£»Í³Ñ¤Î¾å¤Ç¥Ü¥¿¥ó1 ¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬É¸½à½ÐÎϤ˽ÐÎϤµ¤ì¤Þ¤¹¡£"){
+TkLabel.new($cscroll_demo, 'font'=>$font, 'wraplength'=>'4i', 
+	    'justify'=>'left', 'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤ä¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó2 ¤Ç¥¹¥¯¥í¡¼¥ë¤Ç¤­¤ë¥­¥ã¥ó¥Ð¥¹ widget ¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£»Í³Ñ¤Î¾å¤Ç¥Ü¥¿¥ó1 ¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬É¸½à½ÐÎϤ˽ÐÎϤµ¤ì¤Þ¤¹¡£"){
   pack('side'=>'top')
 }
 
 # frame À¸À®
-$cscroll_buttons = TkFrame.new(base_frame) {|frame|
+$cscroll_buttons = TkFrame.new($cscroll_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $cscroll_demo
       $cscroll_demo = nil
@@ -45,7 +41,7 @@ $cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame ÀßÄê
 unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new(base_frame) {
+  $cscroll_grid = TkFrame.new($cscroll_demo) {
     pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
   }
   TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
@@ -53,35 +49,35 @@ unless $tk_version =~ /^4\.[01]/
 end
 
 # canvas ÀßÄê
-$cscroll_canvas = TkCanvas.new(base_frame, 
-                               'relief'=>'sunken', 'borderwidth'=>2,
-                               'scrollregion'=>['-11c', '-11c', '50c', '20c']
-                               ) {|c|
+$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')
+	 'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
   end
 
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
+  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')
+	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     end
   }
 
-  TkScrollbar.new(base_frame, 'orient'=>'horiz', 
-                  'command'=>proc{|*args| c.xview(*args)}) {|hs|
+  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')
+	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     end
   }
 }
@@ -92,9 +88,9 @@ bg = $cscroll_canvas.configinfo('bg')[4]
   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')
+		     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
     TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c", 
-                'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
+		'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
     y += 3
   }
 }
@@ -105,7 +101,7 @@ $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')
+		     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
 
 def scrollEnter(c)
   id = c.find_withtag('current')[0].id
diff --git a/ext/tk/sample/demos-jp/ctext.rb b/ext/tk/sample/demos-jp/ctext.rb
index 05ca732cfd..6d9355e2f8 100644
--- a/ext/tk/sample/demos-jp/ctext.rb
+++ b/ext/tk/sample/demos-jp/ctext.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # Canvas Text widget demo (called by 'widget')
 #
@@ -16,11 +15,9 @@ $ctext_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
-            'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥­¥ã¥ó¥Ð¥¹widget¤Î¥Æ¥­¥¹¥Èµ¡Ç½¤ò¥Ç¥â¤¹¤ë¤¿¤á¤Î¥Æ¥­¥¹¥Èʸ»úÎó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Þ¥¦¥¹¤ò»Í³Ñ¤ÎÃæ¤Ë»ý¤Ã¤Æ¤¤¤­¡¢¥¯¥ê¥Ã¥¯¤¹¤ë¤È°ÌÃÖ¤®¤áÍѤÎÅÀ¤«¤é¤ÎÁêÂаÌÃÖ¤òÊѤ¨¤¿¤ê¡¢¹Ô·¤¨¤òÊѤ¨¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿°Ê²¼¤Î¤è¤¦¤ÊÊÔ½¸¤Î¤¿¤á¤Î´Êñ¤Ê¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
+TkLabel.new($ctext_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+	    'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥­¥ã¥ó¥Ð¥¹widget¤Î¥Æ¥­¥¹¥Èµ¡Ç½¤ò¥Ç¥â¤¹¤ë¤¿¤á¤Î¥Æ¥­¥¹¥Èʸ»úÎó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Þ¥¦¥¹¤ò»Í³Ñ¤ÎÃæ¤Ë»ý¤Ã¤Æ¤¤¤­¡¢¥¯¥ê¥Ã¥¯¤¹¤ë¤È°ÌÃÖ¤®¤áÍѤÎÅÀ¤«¤é¤ÎÁêÂаÌÃÖ¤òÊѤ¨¤¿¤ê¡¢¹Ô·¤¨¤òÊѤ¨¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿°Ê²¼¤Î¤è¤¦¤ÊÊÔ½¸¤Î¤¿¤á¤Î´Êñ¤Ê¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
 
   1. ¥Þ¥¦¥¹¤ò»ý¤Ã¤Æ¤¤¤­¡¢¥¯¥ê¥Ã¥¯¤·¡¢ÆþÎϤǤ­¤Þ¤¹¡£
   2. ¥Ü¥¿¥ó1¤ÇÁªÂò¤Ç¤­¤Þ¤¹¡£
@@ -31,10 +28,9 @@ TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
 }
 
 # frame À¸À®
-$ctext_buttons = TkFrame.new(base_frame) {|frame|
+$ctext_buttons = TkFrame.new($ctext_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $ctext_demo
       $ctext_demo = nil
@@ -50,55 +46,46 @@ $ctext_buttons = TkFrame.new(base_frame) {|frame|
 $ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # canvas À¸À®
-$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat', 
-                             'borderwidth'=>0, 'width'=>500, 'height'=>350)
+$ctext_canvas = TkCanvas.new($ctext_demo, 'relief'=>'flat', 
+			     'borderwidth'=>0, 'width'=>500, 'height'=>350)
 $ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
 
 # font ÀßÄê
-if $tk_version =~ /^4.*/
-  textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-else
-  textFont = 'Helvetica 24'
-end
+textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
 
 # canvas ÀßÄê
 TkcRectangle.new($ctext_canvas, 245, 195, 255, 205, 
-                 'outline'=>'black', 'fill'=>'red')
+		 'outline'=>'black', 'fill'=>'red')
 
-ctag_text_param = {
-  'text'=>"¤³¤ì¤Ï¥­¥ã¥ó¥Ð¥¹widget¤Î¥Æ¥­¥¹¥Èµ¡Ç½¤ò¥Ç¥â¤¹¤ë¤¿¤á¤Îʸ»úÎó¤Ç¤¹¡£\n¾å¤Ç½Ò¤Ù¤¿¤è¤¦¤ÊÊÔ½¸¤ò²Äǽ¤È¤¹¤ë¤¿¤á¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ò»Ü¤·¤Æ¤¤¤Þ¤¹¡£",
-  'width'=>440, 'anchor'=>'n', 'justify'=>'left'
-}
-if $tk_version =~ /^4.*/
-  ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-  ctag_text_param['kanjifont'] = '-*-r-*--24-*-jisx0208.1983-0'
-else
-  ctag_text_param['font'] = 'Helvetica 24'
-end
 $ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
+$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, 
+			       'text'=>"¤³¤ì¤Ï¥­¥ã¥ó¥Ð¥¹widget¤Î¥Æ¥­¥¹¥Èµ¡Ç½¤ò¥Ç¥â¤¹¤ë¤¿¤á¤Îʸ»úÎó¤Ç¤¹¡£¥Þ¥¦¥¹¤ò»ý¤Ã¤Æ¤¤¤­¡¢¥¯¥ê¥Ã¥¯¤·¤ÆÆþÎϤǤ­¤Þ¤¹¡£ÁªÂò¤·¤Æ¥³¥ó¥È¥í¡¼¥ë-D¤Ç¾Ãµî¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£",
+			       '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")
+	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")
+		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")
+		"%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)
+			  'outline'=>'black', 'fill'=>color, 'width'=>1)
   item.bind('1', proc{$ctag_text.configure option, value})
   w.addtag_withtag('config', item)
 end
@@ -116,16 +103,11 @@ 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')
+			'outline'=>'black', 'fill'=>'red')
 item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
+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.
@@ -136,20 +118,15 @@ 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
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
+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)})
+		       proc{$ctext_canvas\
+			     .itemconfigure('current', 
+					    'fill'=>$textConfigFill)})
 
 $textConfigFill = ''
 
diff --git a/ext/tk/sample/demos-jp/dialog1.rb b/ext/tk/sample/demos-jp/dialog1.rb
index 07e50306ab..5b578a981d 100644
--- a/ext/tk/sample/demos-jp/dialog1.rb
+++ b/ext/tk/sample/demos-jp/dialog1.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # a dialog box with a local grab (called by 'widget')
 #
@@ -35,5 +34,5 @@ when 0
 when 1
   print "¤¢¤Ê¤¿¤Ï¡Ö¥­¥ã¥ó¥»¥ë¡×¤ò²¡¤·¤Þ¤·¤¿¤Í¡£\n"
 when 2
-  showCode 'dialog1'
+  showCode dialog1
 end
diff --git a/ext/tk/sample/demos-jp/dialog2.rb b/ext/tk/sample/demos-jp/dialog2.rb
index f747f8d6a8..4819f18a03 100644
--- a/ext/tk/sample/demos-jp/dialog2.rb
+++ b/ext/tk/sample/demos-jp/dialog2.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # a dialog box with a global grab (called by 'widget')
 #
@@ -29,15 +28,15 @@ class TkDialog_Demo2 < TkDialog
 end
 
 ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
-                          'prev_command'=>proc{|dialog|
-                            Tk.after 100, proc{dialog.grab('global')}
-                          }).value
+			  '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'
+  showCode dialog2
 end
 
diff --git a/ext/tk/sample/demos-jp/entry1.rb b/ext/tk/sample/demos-jp/entry1.rb
index 2be29c18d3..273b6728df 100644
--- a/ext/tk/sample/demos-jp/entry1.rb
+++ b/ext/tk/sample/demos-jp/entry1.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # entry (no scrollbars) widget demo (called by 'widget')
 #
@@ -16,10 +15,8 @@ $entry1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($entry1_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($entry1_demo) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($entry1_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $entry1_demo
       $entry1_demo = nil
@@ -46,9 +42,9 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # entry À¸À®
-e1 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e2 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e3 = TkEntry.new(base_frame, 'relief'=>'sunken')
+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')}
 
 # ½é´üÃÍÁÞÆþ
diff --git a/ext/tk/sample/demos-jp/entry2.rb b/ext/tk/sample/demos-jp/entry2.rb
index 2675b5d324..7efac005f0 100644
--- a/ext/tk/sample/demos-jp/entry2.rb
+++ b/ext/tk/sample/demos-jp/entry2.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # entry (with scrollbars) widget demo (called by 'widget')
 #
@@ -16,10 +15,8 @@ $entry2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($entry2_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($entry2_demo) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($entry2_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $entry2_demo
       $entry2_demo = nil
@@ -46,7 +42,7 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame À¸À®
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
+TkFrame.new($entry2_demo, 'borderwidth'=>10) {|w|
   # entry 1
   s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
   e1 = TkEntry.new(w, 'relief'=>'sunken') {
diff --git a/ext/tk/sample/demos-jp/entry3.rb b/ext/tk/sample/demos-jp/entry3.rb
index 6b9cd4cf37..9bf3f62097 100644
--- a/ext/tk/sample/demos-jp/entry3.rb
+++ b/ext/tk/sample/demos-jp/entry3.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 # entry3.rb --
 #
 # This demonstration script creates several entry widgets whose
@@ -18,11 +17,9 @@ $entry3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'5i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+TkLabel.new($entry3_demo, 
+	    :font=>$font, :wraplength=>'5i', :justify=>:left, 
+	    :text=><<EOL).pack(:side=>:top)
 °Ê²¼¤Ë¤Ï£´¼ïÎà¤Î¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥³Æ¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤Ï¡¤\
 ¥Þ¥¦¥¹¥¯¥ê¥Ã¥¯¤ÇÁªÂò¤·Ê¸»ú¤òÂǤÁ¹þ¤à¤³¤È¤¬²Äǽ¤Ç¤¹¤¬¡¤¤½¤ì¤¾¤ì¤¬¤É¤Î¤è¤¦¤Ê\
 ÆþÎϤò¼õ¤±ÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤Ë¤ÏÀ©Ìó¤¬Àߤ±¤é¤ì¤Æ¤¤¤Þ¤¹¡¥\
@@ -41,17 +38,17 @@ TkLabel.new(base_frame,
 ÆþÎϤµ¤ì¤¿Ê¸»ú¤Ï¥¢¥¹¥¿¥ê¥¹¥¯µ­¹æ¤ËÃÖ¤­´¹¤¨¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡¥
 EOL
 
-TkFrame.new(base_frame){|f|
+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{
+		 $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)
+		 showCode 'entry3'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
 # focusAndFlash --
@@ -61,50 +58,32 @@ TkFrame.new(base_frame){|f|
 # 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
+# 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
-  if fg && !fg.empty? && bg && !bg.empty?
-    TkTimer.new(200, count, 
-                proc{widget.configure(:foreground=>bg, :background=>fg)}, 
-                proc{widget.configure(:foreground=>fg, :background=>bg)}
-                ).start
-  else
-    # TkTimer.new(150, 3){Tk.bell}.start
-    Tk.bell
-    TkTimer.new(200, count, 
-                proc{widget.configure(:foreground=>'white', 
-                                      :background=>'black')}, 
-                proc{widget.configure(:foreground=>'black', 
-                                      :background=>'white')}
-                ).at_end{begin
-                           widget.configure(:foreground=>fg, 
-                                            :background=>bg)
-                         rescue
-                           # ignore
-                         end}.start
-  end
+  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(base_frame, :text=>"À°¿ô¥¨¥ó¥È¥ê")
+l1 = TkLabelFrame.new($entry3_demo, :text=>"À°¿ô¥¨¥ó¥È¥ê")
 TkEntry.new(l1, :validate=>:focus, 
-            :vcmd=>[
-              proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-            ]) {|e|
-  fg = e.foreground
-  bg = e.background
-  invalidcommand [proc{|w| focusAndFlash(w, fg, bg)}, '%W']
+	    :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(base_frame, :text=>"ŤµÀ©ÌóÉÕ¤­¥¨¥ó¥È¥ê")
+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')
+	    :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
@@ -126,7 +105,7 @@ Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
 # Skip over fixed characters in a phone-number string when moving left.
 #
 # Arguments:
-# widget -      The entry widget containing the phone-number.
+# widget -	The entry widget containing the phone-number.
 def phoneSkipLeft(widget)
   idx = widget.index('insert')
   if idx == 8
@@ -146,7 +125,7 @@ end
 # Skip over fixed characters in a phone-number string when moving right.
 #
 # Arguments:
-# widget -      The entry widget containing the phone-number.
+# 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')
@@ -170,53 +149,51 @@ end
 #
 # widget - entry widget to validate
 # vmode -  The widget's validation mode
-# idx -    The index where replacement is to occur
+# 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.
+#	   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})})
+				      :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(base_frame, :text=>"ÊƹñÅÅÏÃÈֹ楨¥ó¥È¥ê")
+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|
+	    :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
+	 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(base_frame, :text=>"¥Ñ¥¹¥ï¡¼¥É¥¨¥ó¥È¥ê")
+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')
+	    :vcmd=>[
+	      proc{|s| s.length <= 8}, 
+	      '%P'
+	    ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
 
-TkFrame.new(base_frame){|f|
+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)
diff --git a/ext/tk/sample/demos-jp/filebox.rb b/ext/tk/sample/demos-jp/filebox.rb
index b8846d08a0..1754596706 100644
--- a/ext/tk/sample/demos-jp/filebox.rb
+++ b/ext/tk/sample/demos-jp/filebox.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # widget demo prompts the user to select a file (called by 'widget')
 #
@@ -16,17 +15,14 @@ $filebox_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($filebox_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"¥¨¥ó¥È¥ê¤Ë¥Õ¥¡¥¤¥ë̾¤òľÀÜÆþÎϤ¹¤ë¤«¡¢\"Browse\" ¥Ü¥¿¥ó¤ò²¡¤·¤Æ¥Õ¥¡¥¤¥ëÁªÂò¥À¥¤¥¢¥í¥°¤«¤é¥Õ¥¡¥¤¥ë̾¤òÁª¤ó¤Ç²¼¤µ¤¤¡£").pack('side'=>'top')
+TkLabel.new($filebox_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+	    'text'=>"¥¨¥ó¥È¥ê¤Ë¥Õ¥¡¥¤¥ë̾¤òľÀÜÆþÎϤ¹¤ë¤«¡¢\"Browse\" ¥Ü¥¿¥ó¤ò²¡¤·¤Æ¥Õ¥¡¥¤¥ëÁªÂò¥À¥¤¥¢¥í¥°¤«¤é¥Õ¥¡¥¤¥ë̾¤òÁª¤ó¤Ç²¼¤µ¤¤¡£").pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($filebox_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $filebox_demo
       $filebox_demo = nil
@@ -42,7 +38,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame À¸À®
 ['³«¤¯', 'Êݸ'].each{|type|
-  TkFrame.new(base_frame) {|f|
+  TkFrame.new($filebox_demo) {|f|
     TkLabel.new(f, 'text'=>"¥Õ¥¡¥¤¥ë¤ò#{type}: ", 'anchor'=>'e')\
     .pack('side'=>'left')
 
@@ -50,7 +46,7 @@ TkFrame.new(base_frame) {|frame|
       pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
 
       TkButton.new(f, 'text'=>'Browse ...', 
-                   'command'=>proc{fileDialog base_frame,e,type})\
+		   'command'=>proc{fileDialog $filebox_demo,e,type})\
       .pack('side'=>'left')
     }
 
@@ -60,10 +56,10 @@ TkFrame.new(base_frame) {|frame|
 
 $tk_strictMotif = TkVarAccess.new('tk_strictMotif')
 if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new(base_frame, 
-                    'text'=>'Motif¥¹¥¿¥¤¥ë¤Î¥À¥¤¥¢¥í¥°¤òÍѤ¤¤ë', 
-                    'variable'=>$tk_strictMotif, 
-                    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
+  TkCheckButton.new($filebox_demo, 
+		    'text'=>'Motif¥¹¥¿¥¤¥ë¤Î¥À¥¤¥¢¥í¥°¤òÍѤ¤¤ë', 
+		    'variable'=>$tk_strictMotif, 
+		    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
 end
 
 def fileDialog(w,ent,operation)
@@ -87,16 +83,13 @@ def fileDialog(w,ent,operation)
     file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
   else
     file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w, 
-                          'initialfile'=>'Untitled', 
-                          'defaultextension'=>'.txt')
+			  'initialfile'=>'Untitled', 
+			  'defaultextension'=>'.txt')
   end
   if file != ""
     ent.delete 0, 'end'
     ent.insert 0, file
-    # ent.xview 'end'
-    Tk.update_idletasks # need this for Tk::Tile::Entry
-                        # (to find right position of 'xview').
-    ent.xview(ent.index('end'))
+    ent.xview 'end'
   end
 end
 
diff --git a/ext/tk/sample/demos-jp/floor.rb b/ext/tk/sample/demos-jp/floor.rb
index a2ec2e9969..bb655d5b55 100644
--- a/ext/tk/sample/demos-jp/floor.rb
+++ b/ext/tk/sample/demos-jp/floor.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # floorDisplay widget demo (called by 'widget')
 #
@@ -9,8 +8,8 @@
 # visible.
 #
 # Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
+# w -		Name of the canvas window.
+# active -	Number of active floor (1, 2, or 3).
 
 def floorDisplay(w,active)
   return if $activeFloor == active
@@ -60,7 +59,7 @@ end
 # highlighted.
 #
 # Arguments:
-# w  -          The name of the canvas window.
+# w  -		The name of the canvas window.
 
 def newRoom(w)
   id = w.find_withtag('current')[0]
@@ -73,8 +72,8 @@ end
 # It highlights the current room and unhighlights any previous room.
 #
 # Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
+# w -		The canvas window displaying the floorplan.
+# args -	Not used.
 
 def roomChanged(w,*args)
   w.delete('highlight')
@@ -91,24 +90,24 @@ end
 # 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.
+# 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)
+		 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'])
@@ -215,17 +214,17 @@ end
 # 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.
+# 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)
+		 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'])
@@ -270,17 +269,17 @@ end
 # 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.
+# 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)
+		 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)
+		 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'])
@@ -300,7 +299,7 @@ def floor_bg3(w,fill,outline)
   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'])
+	      'fill'=>outline, 'tags'=>['floor3','bg'])
 end
 
 # floor_fg1 --
@@ -309,321 +308,321 @@ end
 # floor (office outlines and numbers).
 #
 # Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
+# 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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor1','label'])
   i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
-                     'fill'=>'', 'tags'=>['floor1','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
@@ -790,327 +789,327 @@ end
 # floor (office outlines and numbers).
 #
 # Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
+# 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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor2','label'])
   i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-                     'fill'=>'', 'tags'=>['floor2','room'])
+		     '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'])
+	      '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'])
@@ -1272,215 +1271,215 @@ end
 # floor (office outlines and numbers).
 #
 # Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
+# 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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      'anchor'=>'c', 'tags'=>['floor3','label'])
   i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
-                     'fill'=>'', 'tags'=>['floor3','room'])
+		     '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'])
+	      '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'])
+		     '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'])
+	      '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'])
+		     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'])
+	      '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'])
+		     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'])
+	      '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'])
@@ -1587,19 +1586,16 @@ $floor_demo = TkToplevel.new {|w|
   minsize(100,100)
 }
 
-base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
-            'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥Ç¥£¥¸¥¿¥ë¥¨¥¯¥¤¥Ã¥×¥á¥ó¥È¼Ò¤Î¥¦¥§¥¹¥¿¥ó¥ê¥µ¡¼¥Á¥é¥Ü¥é¥È¥ê (DECWRL) ¤Î´Ö¼è¤ê¤¬½ñ¤«¤ì¤¿¥­¥ã¥ó¥Ð¥¹ widget ¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï 3³¬·ú¤Æ¤Ç¡¢¾ï¤Ë¤½¤Î¤¦¤Á¤Î1³¬Ê¬¤¬ÁªÂò¡¢¤Ä¤Þ¤ê¤½¤Î´Ö¼è¤ê¤¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤ë³¬¤òÁªÂò¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¾å¤Ç¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¦¥¹¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë³¬¤Î¾å¤òÆ°¤¯¤È¡¢¤½¤Î²¼¤Ë¤¢¤ëÉô²°¤Î¿§¤¬ÊѤï¤ê¡¢Éô²°Èֹ椬¡ÖÉô²°ÈÖ¹æ:¡×¥¨¥ó¥È¥ê¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢¥¨¥ó¥È¥ê¤ËÉô²°ÈÖ¹æ¤ò½ñ¤¯¤È¤½¤ÎÉô²°¤Î¿§¤¬ÊѤï¤ê¤Þ¤¹¡£"){
+TkLabel.new($floor_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
+	    'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥Ç¥£¥¸¥¿¥ë¥¨¥¯¥¤¥Ã¥×¥á¥ó¥È¼Ò¤Î¥¦¥§¥¹¥¿¥ó¥ê¥µ¡¼¥Á¥é¥Ü¥é¥È¥ê (DECWRL) ¤Î´Ö¼è¤ê¤¬½ñ¤«¤ì¤¿¥­¥ã¥ó¥Ð¥¹ widget ¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï 3³¬·ú¤Æ¤Ç¡¢¾ï¤Ë¤½¤Î¤¦¤Á¤Î1³¬Ê¬¤¬ÁªÂò¡¢¤Ä¤Þ¤ê¤½¤Î´Ö¼è¤ê¤¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤ë³¬¤òÁªÂò¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¾å¤Ç¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¦¥¹¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë³¬¤Î¾å¤òÆ°¤¯¤È¡¢¤½¤Î²¼¤Ë¤¢¤ëÉô²°¤Î¿§¤¬ÊѤï¤ê¡¢Éô²°Èֹ椬¡ÖÉô²°ÈÖ¹æ:¡×¥¨¥ó¥È¥ê¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢¥¨¥ó¥È¥ê¤ËÉô²°ÈÖ¹æ¤ò½ñ¤¯¤È¤½¤ÎÉô²°¤Î¿§¤¬ÊѤï¤ê¤Þ¤¹¡£"){
   pack('side'=>'top')
 }
 
 # frame À¸À®
-$floor_buttons = TkFrame.new(base_frame) {|frame|
+$floor_buttons = TkFrame.new($floor_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $floor_demo
       $floor_demo = nil
@@ -1620,17 +1616,17 @@ $floorItems = {}
 
 # canvas ÀßÄê
 if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
+  $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(base_frame, 'orient'=>'horiz', 
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
+			       '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(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+    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')
     }
@@ -1639,7 +1635,7 @@ if $tk_version =~ /^4\.[01]/
   $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
 
 else
-  TkFrame.new(base_frame) {|f|
+  TkFrame.new($floor_demo) {|f|
     pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
 
     h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
@@ -1647,28 +1643,28 @@ else
 
     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')
+				   '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')
+	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     }
 
     v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	   '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)})
+    v.command(proc{|*args| c.yview(*args)})
+    h.command(proc{|*args| c.xview(*args)})
   }
 end
 
@@ -1677,7 +1673,7 @@ end
 
 $currentRoom = TkVariable.new
 $floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken', 
-                           'bd'=>2, 'textvariable'=>$currentRoom)
+			   'bd'=>2, 'textvariable'=>$currentRoom)
 
 # Choose colors, then fill in the floorplan.
 
@@ -1714,7 +1710,7 @@ $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')
+		   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/ext/tk/sample/demos-jp/floor2.rb b/ext/tk/sample/demos-jp/floor2.rb
deleted file mode 100644
index d4381c5543..0000000000
--- a/ext/tk/sample/demos-jp/floor2.rb
+++ /dev/null
@@ -1,1719 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# 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)
-}
-
-base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
-
-# label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
-            'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥Ç¥£¥¸¥¿¥ë¥¨¥¯¥¤¥Ã¥×¥á¥ó¥È¼Ò¤Î¥¦¥§¥¹¥¿¥ó¥ê¥µ¡¼¥Á¥é¥Ü¥é¥È¥ê (DECWRL) ¤Î´Ö¼è¤ê¤¬½ñ¤«¤ì¤¿¥­¥ã¥ó¥Ð¥¹ widget ¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï 3³¬·ú¤Æ¤Ç¡¢¾ï¤Ë¤½¤Î¤¦¤Á¤Î1³¬Ê¬¤¬ÁªÂò¡¢¤Ä¤Þ¤ê¤½¤Î´Ö¼è¤ê¤¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤ë³¬¤òÁªÂò¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¾å¤Ç¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¦¥¹¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë³¬¤Î¾å¤òÆ°¤¯¤È¡¢¤½¤Î²¼¤Ë¤¢¤ëÉô²°¤Î¿§¤¬ÊѤï¤ê¡¢Éô²°Èֹ椬¡ÖÉô²°ÈÖ¹æ:¡×¥¨¥ó¥È¥ê¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢¥¨¥ó¥È¥ê¤ËÉô²°ÈÖ¹æ¤ò½ñ¤¯¤È¤½¤ÎÉô²°¤Î¿§¤¬ÊѤï¤ê¤Þ¤¹¡£"){
-  pack('side'=>'top')
-}
-
-# frame À¸À®
-$floor2_buttons = TkFrame.new(base_frame) {|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(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor2_canvas = TkCanvas.new($floor2_canvas_frame, 
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, '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(base_frame, '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(base_frame) {|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/ext/tk/sample/demos-jp/form.rb b/ext/tk/sample/demos-jp/form.rb
index 4de7056764..35baeed46b 100644
--- a/ext/tk/sample/demos-jp/form.rb
+++ b/ext/tk/sample/demos-jp/form.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # form widget demo (called by 'widget')
 #
@@ -16,10 +15,8 @@ $form_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($form_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($form_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top', 'fill'=>'x')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($form_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $form_demo
       $form_demo = nil
@@ -48,7 +44,7 @@ TkFrame.new(base_frame) {|frame|
 # entry À¸À®
 form_data = []
 (1..5).each{|i|
-  f = TkFrame.new(base_frame, 'bd'=>2)
+  f = TkFrame.new($form_demo, 'bd'=>2)
   e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
   l = TkLabel.new(f)
   e.pack('side'=>'right')
diff --git a/ext/tk/sample/demos-jp/goldberg.rb b/ext/tk/sample/demos-jp/goldberg.rb
deleted file mode 100644
index a81c7ec70c..0000000000
--- a/ext/tk/sample/demos-jp/goldberg.rb
+++ /dev/null
@@ -1,2011 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# 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)
-}
-
-base_frame = TkFrame.new($goldberg_demo).pack(:fill=>:both, :expand=>true)
-
-=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') {
-    msg = Tk::Label.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']) {
-    Tk::Button.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']) {
-    Tk::Button.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}, 
-    @show = Tk::Button.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 = Tk::Button.new(@parent, :text=>'Start', :bd=>6, 
-                          :command=>proc{do_button(0)})
-    if font = @start['font']
-      @start.font(font.weight('bold'))
-    end
-
-    @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(base_frame)
diff --git a/ext/tk/sample/demos-jp/hello b/ext/tk/sample/demos-jp/hello
index 08f154d499..859ebd950e 100644
--- a/ext/tk/sample/demos-jp/hello
+++ b/ext/tk/sample/demos-jp/hello
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
 require 'tk'
 
 TkButton.new(nil,
diff --git a/ext/tk/sample/demos-jp/hscale.rb b/ext/tk/sample/demos-jp/hscale.rb
index 5615aa50bd..4333239c73 100644
--- a/ext/tk/sample/demos-jp/hscale.rb
+++ b/ext/tk/sample/demos-jp/hscale.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 require "tkcanvas"
 
 if defined?($hscale_demo) && $hscale_deom
@@ -12,9 +11,8 @@ $hscale_demo = TkToplevel.new {|w|
 }
 positionWindow($hscale_demo)
 
-base_frame = TkFrame.new($hscale_demo).pack(:fill=>:both, :expand=>true)
 
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($hscale_demo) {
   font $font
   wraplength '3.5i'
   justify 'left'
@@ -24,10 +22,9 @@ msg = TkLabel.new(base_frame) {
 }
 msg.pack('side'=>'top')
 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($hscale_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc {
       tmppath = $hscale_demo
       $hscale_demo = nil
@@ -41,17 +38,7 @@ TkFrame.new(base_frame) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-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
-
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($hscale_demo) {|frame|
   canvas = TkCanvas.new(frame) {|c|
     width 50
     height 50
@@ -76,3 +63,14 @@ TkFrame.new(base_frame) {|frame|
   }.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/ext/tk/sample/demos-jp/icon.rb b/ext/tk/sample/demos-jp/icon.rb
index a2ca6651dc..9b39d33847 100644
--- a/ext/tk/sample/demos-jp/icon.rb
+++ b/ext/tk/sample/demos-jp/icon.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # iconic button widget demo (called by 'widget')
 #
@@ -16,10 +15,8 @@ $icon_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($icon_demo) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($icon_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $icon_demo
       $icon_demo = nil
@@ -48,53 +44,45 @@ TkFrame.new(base_frame) {|frame|
 
 # image À¸À®
 flagup = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagup.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..','images','flagup.xbm'].join(File::Separator))
+TkBitmapImage.new('file'=>[$demo_dir,
+                           'images','flagup.bmp'].join(File::Separator),
+		  'maskfile'=>\
+		  [$demo_dir,'images','flagup.bmp'].join(File::Separator))
 flagdown = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagdown.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..',
-                    'images','flagdown.xbm'].join(File::Separator))
+TkBitmapImage.new('file'=>[$demo_dir,
+                           'images','flagdown.bmp'].join(File::Separator),
+		  'maskfile'=>\
+		  [$demo_dir,'images','flagdown.bmp'].join(File::Separator))
 
 # ÊÑ¿ôÀ¸À®
 letters = TkVariable.new
 
 # frame À¸À®
-TkFrame.new(base_frame, 'borderwidth'=>10){|w|
+TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
   TkFrame.new(w) {|f|
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                     'images','letters.xbm'].join(File::Separator)
+    TkRadioButton.new(f){
+      bitmap '@' + [$demo_dir,'images','letters.bmp'].join(File::Separator)
       variable letters
       value 'full'
     }.pack('side'=>'top', 'expand'=>'yes')
 
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                     'images','noletter.xbm'].join(File::Separator)
+    TkRadioButton.new(f){
+      bitmap '@' + [$demo_dir,'images','noletter.bmp'].join(File::Separator)
       variable letters
       value 'empty'
     }.pack('side'=>'top', 'expand'=>'yes')
 
   }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
 
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
+  TkCheckButton.new(w) {
     image flagdown
     selectimage flagup
     indicatoron 0
     selectcolor self['background']
   }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
 
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    bitmap '@' + [$demo_dir,'..',
-                   'images','letters.xbm'].join(File::Separator)
+  TkCheckButton.new(w) {
+    bitmap '@' + [$demo_dir,'images','letters.bmp'].join(File::Separator)
     indicatoron 0
     selectcolor 'SeaGreen1'
   }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
diff --git a/ext/tk/sample/demos-jp/image1.rb b/ext/tk/sample/demos-jp/image1.rb
index d9435cc1a2..bfe47c47af 100644
--- a/ext/tk/sample/demos-jp/image1.rb
+++ b/ext/tk/sample/demos-jp/image1.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # two image widgets demo (called by 'widget')
 #
@@ -16,10 +15,8 @@ $image1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($image1_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($image1_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($image1_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $image1_demo
       $image1_demo = nil
@@ -48,17 +44,14 @@ TkFrame.new(base_frame) {|frame|
 
 # image À¸À®
 image1a = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
+TkPhotoImage.new('file'=>[$demo_dir,
                           'images','earth.gif'].join(File::Separator))
 image1b = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
+TkPhotoImage.new('file'=>[$demo_dir,
                           'images','earthris.gif'].join(File::Separator))
 
 # label À¸À®
-#[ TkLabel.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-#  TkLabel.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-#].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-[ Tk::Label.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  Tk::Label.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
+[ 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/ext/tk/sample/demos-jp/image2.rb b/ext/tk/sample/demos-jp/image2.rb
index 1bb2c9e9c3..07f9b17ebe 100644
--- a/ext/tk/sample/demos-jp/image2.rb
+++ b/ext/tk/sample/demos-jp/image2.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # widget demo 'load image' (called by 'widget')
 #
@@ -16,10 +15,8 @@ $image2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($image2_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($image2_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $image2_demo
       $image2_demo = nil
@@ -47,27 +43,27 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # ÊÑ¿ôÀ¸À®
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
+$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
 
 # image À¸À®
 $image2a = TkPhotoImage.new
 
 # ¥Õ¥¡¥¤¥ë̾ÆþÎÏÉô
-TkLabel.new(base_frame, 'text'=>'¥Ç¥£¥ì¥¯¥È¥ê:')\
+TkLabel.new($image2_demo, 'text'=>'¥Ç¥£¥ì¥¯¥È¥ê:')\
 .pack('side'=>'top', 'anchor'=>'w')
 
-image2_e = TkEntry.new(base_frame) {
+image2_e = TkEntry.new($image2_demo) {
   width 30
   textvariable $dirName
 }.pack('side'=>'top', 'anchor'=>'w')
 
-TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
+TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20)\
 .pack('side'=>'top', 'anchor'=>'w')
 
-TkLabel.new(base_frame, 'text'=>'¥Õ¥¡¥¤¥ë:')\
+TkLabel.new($image2_demo, 'text'=>'¥Õ¥¡¥¤¥ë:')\
 .pack('side'=>'top', 'anchor'=>'w')
 
-TkFrame.new(base_frame){|w|
+TkFrame.new($image2_demo){|w|
   s = TkScrollbar.new(w)
   l = TkListbox.new(w) {
     width 20
@@ -86,10 +82,9 @@ TkFrame.new(base_frame){|w|
 }.pack('side'=>'top', 'anchor'=>'w')
 
 # image ÇÛÃÖ
-[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
-  TkLabel.new(base_frame, 'text'=>'²èÁü:'),
-  # TkLabel.new(base_frame, 'image'=>$image2a)
-  Tk::Label.new(base_frame, 'image'=>$image2a)
+[ 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')}
 
 # ¥á¥½¥Ã¥ÉÄêµÁ
diff --git a/ext/tk/sample/demos-jp/image3.rb b/ext/tk/sample/demos-jp/image3.rb
index 12b8aafd8e..84257a2b32 100644
--- a/ext/tk/sample/demos-jp/image3.rb
+++ b/ext/tk/sample/demos-jp/image3.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 # image3.rb
 #
 # This demonstration script creates a simple collection of widgets
@@ -20,39 +19,36 @@ $image3_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-
 # 
-def loadDir3(w)
+def loadDir(w)
   w.delete(0,'end')
   Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
     w.insert('end',File.basename(f))
   }
 end
 
-# selectAndLoadDir3 --
+# 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 selectAndLoadDir3(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName.value, 
-                           :parent=>w, :mustexist=>true)
+# w -			Name of the toplevel window of the demo.
+def selectAndLoadDir(w, lbox)
+  dir = Tk.chooseDirectory(:initialdir=>$dirName, :parent=>w, :mustexist=>true)
   if dir.length > 0
     $dirName.value = dir 
-    loadDir3(lbox)
+    loadDir(lbox)
   end
 end
 
-def loadImage3(w,x,y)
+def loadImage(w,x,y)
   $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
 end
 
 
 # label
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($image3_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -61,10 +57,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($image3_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $image3_demo
       $image3_demo = nil
@@ -80,7 +75,7 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # variable
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
+$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
 
 # image
 begin
@@ -90,38 +85,37 @@ end
 $image3a = TkPhotoImage.new
 
 #
-image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
+image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
 
-image3_df = TkLabelFrame.new(base_frame, :text=>'¥Ç¥£¥ì¥¯¥È¥ê:')
+image3_df = TkLabelFrame.new($image3_demo, :text=>'¥Ç¥£¥ì¥¯¥È¥ê:')
 
-image3_ff = TkLabelFrame.new(base_frame, :text=>'¥Õ¥¡¥¤¥ë:', 
-                             :padx=>'2m', :pady=>'2m')
+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))
+					     :expand=>true))
   insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
-  bind('Double-1', proc{|x,y| loadImage3(self, x, y)}, '%x %y')
+  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{loadDir3(image3_lbx)})
+  bind('Return', proc{loadDir(image3_lbx)})
 }
 
 TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"¥Ç¥£¥ì¥¯¥È¥êÁªÂò", 
-             :command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
+	     :command=>proc{selectAndLoadDir(image3_ent, image3_lbx)}) {
   pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
 }
 
-image3_if = TkLabelFrame.new(base_frame, :text=>'¥¤¥á¡¼¥¸:') {|f|
-  # TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-  Tk::Label.new(f, :image=>$image3a).pack(:padx=>'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)
+	:sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
 Tk.grid(image3_ff, image3_if, 
-        :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+	:sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
 TkGrid.columnconfigure(image3_f, 1, :weight=>1)
 
diff --git a/ext/tk/sample/demos-jp/images/earth.gif b/ext/tk/sample/demos-jp/images/earth.gif
new file mode 100644
index 0000000000..3ae4a9ce01
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/earth.gif
diff --git a/ext/tk/sample/demos-jp/images/earthris.gif b/ext/tk/sample/demos-jp/images/earthris.gif
new file mode 100644
index 0000000000..48f08c4421
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/earthris.gif
diff --git a/ext/tk/sample/demos-jp/images/face.bmp b/ext/tk/sample/demos-jp/images/face.bmp
new file mode 100644
index 0000000000..03d829f4d1
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/face.bmp
@@ -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/ext/tk/sample/demos-jp/images/flagdown.bmp b/ext/tk/sample/demos-jp/images/flagdown.bmp
new file mode 100644
index 0000000000..55abc51825
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/flagdown.bmp
@@ -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/ext/tk/sample/demos-jp/images/flagup.bmp b/ext/tk/sample/demos-jp/images/flagup.bmp
new file mode 100644
index 0000000000..6eb0d846a3
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/flagup.bmp
@@ -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/ext/tk/sample/demos-jp/images/gray25.bmp b/ext/tk/sample/demos-jp/images/gray25.bmp
new file mode 100644
index 0000000000..b234b3cb0b
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/gray25.bmp
@@ -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/ext/tk/sample/demos-jp/images/grey.25 b/ext/tk/sample/demos-jp/images/grey.25
new file mode 100644
index 0000000000..b234b3cb0b
--- /dev/null
+++ b/ext/tk/sample/demos-jp/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/ext/tk/sample/demos-jp/images/grey.5 b/ext/tk/sample/demos-jp/images/grey.5
new file mode 100644
index 0000000000..37688893f0
--- /dev/null
+++ b/ext/tk/sample/demos-jp/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/ext/tk/sample/demos-jp/images/letters.bmp b/ext/tk/sample/demos-jp/images/letters.bmp
new file mode 100644
index 0000000000..0f12568d1a
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/letters.bmp
@@ -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/ext/tk/sample/demos-jp/images/noletter.bmp b/ext/tk/sample/demos-jp/images/noletter.bmp
new file mode 100644
index 0000000000..5774124efe
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/noletter.bmp
@@ -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/ext/tk/sample/demos-jp/images/pattern.bmp b/ext/tk/sample/demos-jp/images/pattern.bmp
new file mode 100644
index 0000000000..df31baf789
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/pattern.bmp
@@ -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/ext/tk/sample/demos-jp/images/tcllogo.gif b/ext/tk/sample/demos-jp/images/tcllogo.gif
new file mode 100644
index 0000000000..3fc7720b17
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/tcllogo.gif
diff --git a/ext/tk/sample/demos-jp/images/teapot.ppm b/ext/tk/sample/demos-jp/images/teapot.ppm
new file mode 100644
index 0000000000..78afefbf82
--- /dev/null
+++ b/ext/tk/sample/demos-jp/images/teapot.ppm
@@ -0,0 +1,56 @@
+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
+ˆ`O~[NqUM[-	‰HUGJUGJVGJVGJVHJWHJWHJWHKWHKXHKXHKXHKXHKXHKXIKXIKXIKXIKXIKh>!Y0
+
+L&C!:4
+�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
+

+\À\À\À\À\À\À\À\À\À B B
+$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
+\À\À\À\À\À B'D+E$(1J/jH1NCJUGJYIKUGJ\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀXHK]KKbNLfOLiQLkRMmSMoTMqUMxXN\N†_OŒbP’fP˜hQ�kQ¡mR¥oR§pS¦pR˜hQ¢mR¥oR¨pSªqS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rSªrSªrSªrS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS«rS¬rS¬rS¬rS¬rS¬rS¬rS¬rS¬sS¬sS­sS­sS­sS­sS­sS­sS®sS®sS®sS®sS®tS¯tS°tS°uS±uS±uT±uT²uT²uT²uT´vTµwT´vT³vT²uT¯tS¢mR¯tS±uT±uS®tS«rS§pR¢mR�kQ—hQ‘ePŠaPƒ^O\N{ZNvXNqUMpTMnSMlRM�P%\À\À\À\À B#C*E$.E- .!G$Y:%d<"SFJYIKZIKNCJ\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀPDJZIK_LKdNLgPLjQLlRMnSMpTMqUMuWMyYN€\O†`O�cP’fP—hQœjQ¡mR¥oR¨qS«rS«rSªrS mR

+!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ç£|쩂ſt명æ¦�ÞŸ{Õ—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ËŒiljgÆ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ÌŽlljgÃ…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
+|>
+
++,!.! "`E6†iYŒlZ�o\“q]•s^�^J™va›wb�ycŸzd {e¤}foTMqUMsVMuWNwXNyYN{ZN|ZN~[N\O�]O‚]Oƒ^O…_O†_O‡`Oˆ`O‰aOŠaP‹bPŒbPŒcP�cPŽcPŽdP�dP�dP�dP�eP‘eP‘eP‘eP’eP’eP’eP’eP’fP’fP’fP“fP’fP’fP’fP’eP’eP’eP‘eP‘eP‘eP�eP�dP�dP�dPŽdPŽcP�cPŒcPŒbP‹bPŠaP‰aOˆ`O‡`O†_O…_Oƒ^O‚]O�]O\O~[N|[N{ZNyYNwXN®ƒi¬ƒiª‚i¨�i¦€hŒhR‰fQ†dQ‚bP•wfx]Oˆpdkbtd_m`]OEDG?A;:@.S….S….S….S….S…/S…/S…/S…/S…/S…/S…/S…/S…TxªTxªTxªTxªTxªTx«Tx«Tx«Ty«/S†GlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlž…ªÜ…ªÜ…ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlž…ªÜ…ªÜ£Ö£Ö£Ö£Ö¤Ö¤Ö¤Ö¤Ö¤ÖEi›€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤×€¤×€¤×€¤×€¥×€¥×€¥×Bg™Bg™Bg™Bg™Bg™&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Af˜Af˜%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|%I|%I|%I|%I|
++,YA5jPBpSD‹l[�o]’q^–t`‚_Kšwbœycžze {f¡}g¤h¨�i”lSrVMtWMvWNxXNyYN{ZN|[N~[N\O�]O‚]Oƒ^O„_O…_O†`O‡`Oˆ`O‰aPŠaP‹bP‹bPŒbP�cP�cPŽcPŽcP�dP�dP�dP�dP�dP�dP�dP�dP�eP�eP�eP�eP�eP�dP�dP�dP�dP�dP�dP�dPŽcPŽcP�cP�cPŒbP‹bP‹bPŠaP‰aOˆ`O‡`O†`O…_O„^Oƒ^O‚]O€]O\O~[N|[N{ZNyYNxXN°…j®„j¬„jªƒj¨‚j¦€jŒhSŠgS†eRƒcR|`QŒsf…oe}jcrd`k_]LCDC=@,,3(4F(4F.S….S…/S…/S…/S…/S…/S…/S…/S…TxªTxªTxªTxªTxªTxªTx«Tx«Tx«Ty«Ty«Ty«…ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlž†ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžChšChš¤Ö€¤Ö€¤Ö€¤Ö€¤ÖEi›Ei›Ei›€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤Ö€¤×€¤×€¤×€¤×Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Bg™Bg™&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜&J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|%I|%I|%I|#5H71O;3V?4iOBoSDsVF�o]{[I^Kƒ`L…bN‡dOŸ{f }g¢~h¥€j’kT•mU˜oVšqW�rWwXNxXNzYN{ZN}[N~[N\O€]O‚]Oƒ^O„^O…_O…_O†`O‡`Oˆ`O‰aO‰aPŠaP‹bP‹bPŒbPŒbPŒcP�cP�cP�cPŽcPŽcPŽcPŽcPŽcPŽcPŽcPŽcPŽcPŽcP�cP�cP�cPŒcPŒbP‹bP‹bP‹bPŠaP‰aP‰aOˆ`O‡`O†_O…_O„_O„^Oƒ^O�]O€\O\N~[N|ZN{ZNyYN›oTšoT™oT—nT¬„lªƒl¨‚l�jUŒiTŠhT†fT€cS�vi‰rg�nfyidqdah^^HBD?<@)+3OZkMYk(5F(5F(5F/S…/S…/S…/S…/S…TxªTxªTxªTxªTxªTxªTx«Tx«Ty«Ty«Ty«Ty«Uy«†ªÜ†ªÜ†ªÜ†ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlž†ªÜ†ªÜ†ªÜ†ªÜ†ªÜHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžHlžDhšDhšDhšChš&K}&K}&K}&K}&K}&K}ChšChšCgšCgšCgšCgšCgšCgšCg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™&J|&J|&J|&J|&J|&J|Bg™Bg™Bg™Bf™Bf™Bf™Bf™Bf™Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜&J|&J|&J|&J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|A99N?;L:2T>4gNBlRD‡k\‹n^z[J~^L�aN…cO‡dP‰fQŠgRŒhT�jU’lV•nW˜pXšrX�sY¶‹q¸�qºŽr¼�r½�r¿�s©z[©z[ªz[«{[¬{[¬{ZÅ“rÅ’qÅ’qÅ’pÅ’pÅ‘o­yV­xV¬xU¬wT¬wTŠaPŠbP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bP‹bPŠaPŠaPŠaP‰aP‰aOˆaOˆ`O‡`O‡`O†_O…_O„^Oƒ^O‚^O‚]O�]O€\O~\N}[N|ZNzYN�pTœpU›pUšpU˜oV—oV•nV“mV‘lV�kVŒjVˆhVƒfU~cU�uj†qh~mfugdkaad\^E@D98?$(2minffm^blV^lMYk(5F(5F/S…TxªTxªTxªTxªTxªTxªTxªTx«Tx«Ty«Ty«Ty«Uy«Uy«†ªÜ†ªÜ†ªÜ†ªÜ†ªÜ†ªÜ†ªÜ†ªÜHlžHlžHlžHlžHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸHlŸ'K}'K}'K}'K}'K}'K}'K}'K}'K}&K}&K}ChšChšChšChšChšChšChšCgšCgšCgšCgšCgšCgšCg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™&J|Cg™Cg™Cg™Cg™Cg™Bg™Bg™Bg™Bg™Bg™Bg™Bf™Bf™Bf™Bf™Bf™Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜Bf˜&J|&J|&J|&J|&J|&J|&J|%J|%J|%J|%J|%J|%J|%J|Ae˜Ae˜;GY<68I=:I82Q=4XA6~fZ„j\‰m^�p`|]L€`NƒcP†eQˆgS¡j£€l¦‚m©„n•oX˜qYšrZ�t[¶Œr¸�sº�s¼�t½�t¾‘t¨z]©{]ª{]«{\«{\¬{\¬{[Ä“sÄ“rÄ’rÄ’qÄ’pÄ‘p¬yWÄ�oÃ�nÃ�mÃ�lÂŽlÂŽkÁ�kˆaOˆaOˆaOˆaOˆaOˆaOˆaOˆ`Oˆ`O‡`O‡`O‡`O†`O†_O…_O…_O„_O„^Oƒ^O‚]O�]O€]O\O~\N}[N|ZN¶‰l¶‰lµˆmœqV›qVšqV™pW˜pW–oW¬…nª…n§„n¤‚nŸ€n›~n€eW‘xlŠtk‚piykfodcf_`JDG@>C*,5$1MYk�tr~tstmolinadmX_lNZkMZkTxªTxªTxªTxªTx«Tx«Tx«Ty«Ty«Ty«Uy«Uy«Uy«†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†ªÝ†«Ý†«Ý†«Ý†«ÝHlŸHlŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸ†«Ý†«Ý†«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«Ý‡«ÝHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸHmŸ'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}DhšDhšDhšDhšChšChšChšChšChšChšChšCgšCgšCgšCgšCgšCgšCg™Cg™Cg™Cg™Cg™&J}&J}&J}Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Cg™Bg™Bg™Bg™Bg™Bg™Bg™Bf™Bf™Bf™Bf™Bf˜Bf˜Bf˜Bf˜Bf˜&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Af˜Af˜Af˜Af˜;GY;GY;GY1'!D:9N?;N;3]I?zdY€h[†l^‹oa�sc“ue€bQ„dR‡fT l¢�m¦ƒn©…o«‡p®ˆq±Šr³‹sžv] w]¹�u»�u¼‘u¾‘u¿’v¨{^©{^ª|^«|]«|]«{\¬{\¬{[¬{[¬zZ«zZ«yY«yX«xXÂ�oÂ�nÂ�nÁŽmÁŽm¨uT¨uS§tS§tS§tR¦sR¦sQ…_O…_O…_O„^O„^Oƒ^Oƒ^O‚^O‚]O�]O€]O¢rS¡rS¡rS¸‰k·‰l·‰l¶‰m¶‰mµ‰m´‰n³‰n›qWšqX™qX®‡o­‡o«†p¨…p¤ƒp �pœp—}o{cXv`Vp]U}nishfhaba\_DAF::B$)4

+., 7(8'A1&F4(L8*oXIw]Jpdasfcvhexkg{mi~oj€qll\Xn^Yp`Zpa[qa\rb]rc^sc^sd_ue`wf`xgayhayhayhb�x�y‘y‘y‘y‘y�y�~ywgbvfateasd`qd`pc`nb_la_€ut|ssxqrunpZUXVRWROUMMSHIRIC@967-/3'+0(*-ACF?AD;=@#%(



+.+>1(B3)B2&F4'E4)gTGlXJs^OzcTzaPqfethgvjhbVTcWUdXVeYWfZXg[Yh\Zi]Zi][j^\€us€ususts~tt~tt}tt|st{stut~tt|sszrsyqrwpquoqsmpqloXTXTQWPOULLSSJEA<:=99757335./2113)+.'),)+.8:="(
+"6*#5*">2)>0&A2'C3(I8-^OFbRHfUJjXMq^RwcVzfYfRDfQCdN@zdTqijrjksklrklrklrklqjmpjmpjmojmojmnimmimkhliflscYm`Xg\VbYT^VRE>;A<:>98:77645:873220/0,-/)+.*,/#%( &
+
+&3#.$-% .% .& /&!,#,#@70A71XNHXNHWNHWNHZRLYQLYQLXQLWQLWPLUOLSNLQMKOLJMJJ0//.-.,,-&(+"(!'			
+
+%' %$#" ! !$
+
+
+						



+
+

+* 															

+








	;?E7CU;HY=I[
diff --git a/ext/tk/sample/demos-jp/items.rb b/ext/tk/sample/demos-jp/items.rb
index 64ceeff3ec..e1007c5a8d 100644
--- a/ext/tk/sample/demos-jp/items.rb
+++ b/ext/tk/sample/demos-jp/items.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # canvas item types widget demo (called by 'widget')
 #
@@ -16,10 +15,8 @@ $items_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($items_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame) {
+TkLabel.new($items_demo) {
   font $font
   wraplength '5i'
   justify 'left'
@@ -27,10 +24,9 @@ TkLabel.new(base_frame) {
 }.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($items_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $items_demo
       $items_demo = nil
@@ -46,7 +42,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame À¸À®
 cvs = nil
-TkFrame.new(base_frame) {|cf|
+TkFrame.new($items_demo) {|cf|
   # canvas À¸À®
   cvs = TkCanvas.new(cf) {|c|
     focus
@@ -74,11 +70,11 @@ TkFrame.new(base_frame) {|cf|
 
     else
       c.grid('in'=>cf, 'row'=>0, 'column'=>0, 
-             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	     'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
       vs.grid('row'=>0, 'column'=>1, 
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
       hs.grid('row'=>1, 'column'=>0, 
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
       TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
       TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
 
@@ -94,13 +90,8 @@ 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)
 
-if $tk_version =~ /^4.*/
-  font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-  font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
-else
-  font1 = 'Helvetica 12'
-  font2 = 'Helvetica 24 bold'
-end
+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'
@@ -119,129 +110,131 @@ $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 )
+	    '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 )
+	    '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 )
+	    'stipple'=>'@'+[$demo_dir,
+	                    'images','gray25.bmp'].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 )
+	    'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round', 
+	    'tags'=>$tag_item )
 
 TkcText.new(cvs, '15c', '.2c', 
-            'text'=>'¶ÊÀþ (³ê¤é¤«¤Ë¤Ä¤Ê¤¤¤ÀľÀþ)', 'anchor'=>'n')
+	    'text'=>'¶ÊÀþ (³ê¤é¤«¤Ë¤Ä¤Ê¤¤¤ÀľÀþ)', 'anchor'=>'n')
 TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c', 
-            'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
+	    '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 )
+	    '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 )
+	    '16.5c','4.5c','13.5c','7.5c','12c','6c',
+	    'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round', 
+	    'stipple'=>'@'+[$demo_dir, 
+	                    'images', 'gray25.bmp'].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 )
+	       '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)
+	       '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 )
+	       '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
+	       '7.5c','22c','7.5c', 
+	       'stipple'=>'@' + [$demo_dir, 
+                                 'images', 'gray25.bmp'].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)
+		 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
 TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c', 
-                 'fill'=>green, 'tags'=>$tag_item )
+		 '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 )
+		 'stipple'=>'@'+[$demo_dir,
+	                         'images','gray25.bmp'].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)
+		 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
 TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c', 
-                 'fill'=>green, 'tags'=>$tag_item )
+		 '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 )
+		 'stipple'=>'@'+[$demo_dir,
+	                         'images','gray25.bmp'].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 )
+	    '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 )
+	    '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, '..',
+	      'stipple'=>'@' + [$demo_dir, 
                                 'images', 'grey.5'].join(File::Separator),
-              'text'=>'Stippled characters', 'tags'=>$tag_item )
+	      '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 )
+	      '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)
+	   '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)
+#	   '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)
+	   'outline'=>blue, 'start'=>135, 'extent'=>270, 
+	   'outlinestipple'=>'@'+[$demo_dir, 
+                                  'images','gray25.bmp'].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)
+	   '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)
+	   '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)
+#	      '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)
+	      'bitmap'=>'@' + [$demo_dir, 
+                               'images', 'face.bmp'].join(File::Separator),
+	      'tags'=>$tag_item)
 #TkcBitmap.new(cvs, '17c','18.5c',
-#             'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
-#             'tags'=>$tag_item)
+#	      '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)
+	      'bitmap'=>'@' + [$demo_dir, 
+	                       'images', 'noletter.bmp'].join(File::Separator),
+	      'tags'=>$tag_item)
 #TkcBitmap.new(cvs, '17c','21.5c',
-#             'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
-#             'tags'=>$tag_item)
+#	      'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
+#	      'tags'=>$tag_item)
 # ¢­¤Î·Á¼°¤Ç¤â²Äǽ
 TkcBitmap.new(cvs, '17c','21.5c') {
-  bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
+  bitmap '@' + [$demo_dir, 'images', 'letters.bmp'].join(File::Separator)
   tags $tag_item
 }
 #TkcBitmap.new(cvs, '17c','21.5c') {
@@ -254,17 +247,17 @@ TkButton.new(cvs) {|b|
   text '²¡¤·¤Æ¤Í'
   command proc{butPress cvs, red}
   TkcWindow.new(cvs, '21c','18c', 
-                'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
+		'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)
+		'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
 }
 TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c', 
-            'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
+	    'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
   TkcWindow.new(cvs, '28.5c','17.5c', 
-                'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
+		'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')
@@ -329,7 +322,7 @@ def itemStroke(c,x,y)
   if $areaX1 != x && $areaY1 != y
     c.delete 'area'
     c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y, 
-                                              '-outline', 'black')
+					      '-outline', 'black')
     $areaX2 = x
     $areaY2 = y
   end
@@ -364,7 +357,7 @@ end
 def itemDrag(c,x,y)
   x = c.canvasx(x)
   y = c.canvasy(y)
-  c.move('current', x - $lastX, y - $lastY)
+  c.move 'current', x - $lastX, y - $lastY
   $lastX = x
   $lastY = y
 end
@@ -374,6 +367,6 @@ end
 
 def butPress(w,color)
   i = TkcText.new(w, '25c', '18.1c', 
-                  'text'=>'¤¤¤Æ¤Æ!!', 'fill'=>color, 'anchor'=>'n')
+		  'text'=>'¤¤¤Æ¤Æ!!', 'fill'=>color, 'anchor'=>'n')
   Tk.after(500, proc{w.delete i})
 end
diff --git a/ext/tk/sample/demos-jp/ixset2 b/ext/tk/sample/demos-jp/ixset2
index 5b816e40b1..8947daa4b4 100644
--- a/ext/tk/sample/demos-jp/ixset2
+++ b/ext/tk/sample/demos-jp/ixset2
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
 #
 # ixset --
 # A nice interface to "xset" to change X server settings
diff --git a/ext/tk/sample/demos-jp/knightstour.rb b/ext/tk/sample/demos-jp/knightstour.rb
deleted file mode 100644
index d4595ea441..0000000000
--- a/ext/tk/sample/demos-jp/knightstour.rb
+++ /dev/null
@@ -1,273 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# Based on the widget demo of Tcl/Tk8.5.2
-# The following is the original copyright text.
-#----------------------------------------------------------------------------
-# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-#	Calculate a Knight's tour of a chessboard.
-#
-#	This uses Warnsdorff's rule to calculate the next square each
-#	time. This specifies that the next square should be the one that
-#	has the least number of available moves.
-#
-#	Using this rule it is possible to get to a position where
-#	there are no squares available to move into. In this implementation
-#	this occurs when the starting square is d6.
-#
-#	To solve this fault an enhancement to the rule is that if we
-#	have a choice of squares with an equal score, we should choose
-#	the one nearest the edge of the board.
-#
-#	If the call to the Edgemost function is commented out you can see
-#	this occur.
-#
-#	You can drag the knight to a specific square to start if you wish.
-#	If you let it repeat then it will choose random start positions
-#	for each new tour.
-#----------------------------------------------------------------------------
-require 'tk'
-
-class Knights_Tour
-  # Return a list of accessible squares from a given square
-  def valid_moves(square)
-    moves = []
-    [
-      [-1,-2], [-2,-1], [-2,1], [-1,2], [1,2], [2,1], [2,-1], [1,-2]
-    ].each{|col_delta, row_delta|
-      col = (square % 8) + col_delta
-      row = (square.div(8)) + row_delta
-      moves << (row * 8 + col) if row > -1 && row < 8 && col > -1 && col < 8
-    }
-    moves
-  end
-
-  # Return the number of available moves for this square
-  def check_square(square)
-    valid_moves(square).find_all{|pos| ! @visited.include?(pos)}.length
-  end
-
-  # Select the next square to move to. Returns -1 if there are no available
-  # squares remaining that we can move to.
-  def next_square(square)
-    minimum = 9
-    nxt = -1
-    valid_moves(square).each{|pos|
-      unless @visited.include?(pos)
-        cnt = check_square(pos)
-        if cnt < minimum
-          minimum = cnt
-          nxt = pos
-        elsif cnt == minimum
-          nxt = edgemost(nxt, pos)
-        end
-      end
-    }
-    nxt
-  end
-
-  # Select the square nearest the edge of the board
-  def edgemost(nxt, pos)
-    col_A = 3 - ((3.5 - nxt % 8).abs.to_i)
-    col_B = 3 - ((3.5 - pos % 8).abs.to_i)
-    row_A = 3 - ((3.5 - nxt.div(8)).abs.to_i)
-    row_B = 3 - ((3.5 - pos.div(8)).abs.to_i)
-    (col_A * row_A < col_B * row_B)? nxt : pos
-  end
-
-  # Display a square number as a standard chess square notation.
-  def _N(square)
-    '%c%d' % [(97 + square % 8), (square.div(8) + 1)]
-  end
-
-  # Perform a Knight's move and schedule the next move.
-  def move_piece(last, square)
-    @log.insert(:end, "#{@visited.length}. #{_N last} -> #{_N square}\n", '')
-    @log.see(:end)
-    @board.itemconfigure(1+last, :state=>:normal, :outline=>'black')
-    @board.itemconfigure(1+square, :state=>:normal, :outline=>'red')
-    @knight.coords(@board.coords(1+square)[0..1])
-    @visited << square
-    if (nxt = next_square(square)) != -1
-      @after_id = Tk.after(@delay.numeric){move_piece(square, nxt) rescue nil}
-    else
-      @start_btn.state :normal
-      if @visited.length == 64
-        if @initial == square
-          @log.insert :end, '¼þÍ·(closed tour)À®¸ù¡ª'
-        else
-          @log.insert :end, "À®¸ù\n", {}
-          Tk.after(@delay.numeric * 2){tour(rand(64))} if @continuous.bool
-        end
-      else
-        @log.insert :end, "¼ºÇÔ¡ª\n", {}
-      end
-    end
-  end
-
-  # Begin a new tour of the board given a random start position
-  def tour(square = nil)
-    @visited.clear
-    @log.clear
-    @start_btn.state :disabled
-    1.upto(64){|n|
-      @board.itemconfigure(n, :state=>:disabled, :outline=>'black')
-    }
-    unless square
-      square = @board.find_closest(*(@knight.coords << 0 << 65))[0].to_i - 1
-    end
-    @initial = square
-    Tk.after_idle{ move_piece(@initial, @initial) rescue nil }
-  end
-
-  def _stop
-    Tk.after_cancel(@after_id) rescue nil
-  end
-
-  def _exit
-    _stop
-    $knightstour.destroy
-  end
-
-  def set_delay(new)
-    @delay.numeric = new.to_i
-  end
-
-  def drag_start(w, x, y)
-    w.dtag('selected')
-    w.addtag('selected', :withtag, 'current')
-    @dragging = [x, y]
-  end
-
-  def drag_motion(w, x, y)
-    return unless @dragging
-    w.move('selected', x - @dragging[0], y - @dragging[1])
-    @dragging = [x, y]
-  end
-
-  def drag_end(w, x, y)
-    square = w.find_closest(x, y, 0, 65)
-    w.coords('selected', w.coords(square)[0..1])
-    w.dtag('selected')
-    @dragging = nil
-  end
-
-  def make_SeeDismiss
-    ## See Code / Dismiss
-    frame = Ttk::Frame.new($knightstour)
-    sep = Ttk::Separator.new(frame)
-    Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-    TkGrid('x', 
-           Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                           :image=>$image['view'], :compound=>:left, 
-                           :command=>proc{showCode 'knightstour'}), 
-           Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                           :image=>$image['delete'], :compound=>:left, 
-                           :command=>proc{
-                             $knightstour.destroy
-                             $knightstour = nil
-                           }), 
-           :padx=>4, :pady=>4)
-    frame.grid_columnconfigure(0, :weight=>1)
-    frame
-  end
-
-  def create_gui(parent = nil)
-    $knightstour.destroy rescue nil
-    $knightstour = Tk::Toplevel.new(parent, :title=>"Knight's tour")
-    $knightstour.withdraw
-    base_f = Ttk::Frame.new($knightstour)
-    @board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
-    @log = Tk::Text.new(base_f, :width=>12, :height=>1, 
-                        :font=>'Arial 8', :background=>'white')
-    scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
-
-    @visited = []
-    @delay = TkVariable.new(600)
-    @continuous = TkVariable.new(false)
-
-    tool_f = Ttk::Frame.new($knightstour)
-    label = Ttk::Label.new(tool_f, :text=>'¼Â¹Ô®ÅÙ')
-    scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay, 
-                           :command=>proc{|n| set_delay(n)})
-    check = Ttk::Checkbutton.new(tool_f, :text=>'È¿Éü', 
-                                 :variable=>@continuous)
-    @start_btn = Ttk::Button.new(tool_f, :text=>'³«»Ï', 
-                                 :command=>proc{tour()})
-    @exit_btn = Ttk::Button.new(tool_f, :text=>'½ªÎ»', 
-                                :command=>proc{_exit()})
-
-    7.downto(0){|row|
-      0.upto(7){|col|
-        if ((col & 1) ^ (row & 1)).zero?
-          fill  = 'bisque'
-          dfill = 'bisque3'
-        else
-          fill  = 'tan3'
-          dfill = 'tan4'
-        end
-        coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
-        @board.create(TkcRectangle, coords, 
-                      :fill=>fill, :disabledfill=>dfill,
-                      :width=>2, :state=>:disabled)
-      }
-    }
-
-    @knight_font = TkFont.new(:size=>-24)
-    @knight = TkcText.new(@board, 0, 0, :font=>@knight_font, 
-                          :text=>Tk::UTF8_String.new('\u265e'), 
-                          :anchor=>'nw', # :tags=>'knight', 
-                          :fill=>'black', :activefill=>'#600000')
-    @knight.coords(@board.coords(rand(64)+1)[0..1])
-    @knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
-    @knight.bind('Motion', '%W %x %y'){|w,x,y| drag_motion(w,x,y)}
-    @knight.bind('ButtonRelease-1', '%W %x %y'){|w,x,y| drag_end(w,x,y)}
-
-    Tk.grid(@board, @log, scr, :sticky=>'news')
-    base_f.grid_rowconfigure(0, :weight=>1)
-    base_f.grid_columnconfigure(0, :weight=>1)
-
-    Tk.grid(base_f, '-', '-', '-', '-', '-', :sticky=>'news')
-    widgets = [label, scale, check, @start_btn]
-    sg = nil
-    unless $RubyTk_WidgetDemo
-      widgets << @exit_btn
-      if Tk.windowingsystem != 'aqua'
-        #widgets.unshift(Ttk::SizeGrip.new(tool_f))
-        Ttk::SizeGrip.new(tool_f).pack(:side=>:right, :anchor=>'se')
-      end
-    end
-    Tk.pack(widgets, :side=>:right)
-    if Tk.windowingsystem == 'aqua'
-      TkPack.configure(widgets, :padx=>[4, 4], :pady=>[12, 12])
-      TkPack.configure(widgets[0], :padx=>[4, 24])
-      TkPack.configure(widgets[-1], :padx=>[16, 4])
-    end
-
-    Tk.grid(tool_f, '-', '-', '-', '-', '-', :sticky=>'ew')
-
-    if $RubyTk_WidgetDemo
-      Tk.grid(make_SeeDismiss(), '-', '-', '-', '-', '-', :sticky=>'ew')
-    end
-
-    $knightstour.grid_rowconfigure(0, :weight=>1)
-    $knightstour.grid_columnconfigure(0, :weight=>1)
-
-    $knightstour.bind('Control-F2'){TkConsole.show}
-    $knightstour.bind('Return'){@start_btn.invoke}
-    $knightstour.bind('Escape'){@exit_btn.invoke}
-    $knightstour.bind('Destroy'){ _stop }
-    $knightstour.protocol('WM_DELETE_WINDOW'){ _exit }
-
-    $knightstour.deiconify
-    $knightstour.tkwait_destroy
-  end
-
-  def initialize(parent = nil)
-    create_gui(parent)
-  end
-end
-
-Tk.root.withdraw unless $RubyTk_WidgetDemo
-Thread.new{Tk.mainloop} if __FILE__ == $0
-Knights_Tour.new
diff --git a/ext/tk/sample/demos-jp/label.rb b/ext/tk/sample/demos-jp/label.rb
index 2e6b3e7e57..80ab5f3d8f 100644
--- a/ext/tk/sample/demos-jp/label.rb
+++ b/ext/tk/sample/demos-jp/label.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # label widget demo (called by 'widget')
 #
@@ -16,10 +15,8 @@ $label_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($label_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($label_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($label_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $label_demo
       $label_demo = nil
@@ -47,21 +43,20 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # label demo Íѥե졼¥àÀ¸À®
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
+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')}
+				  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
 
 # label À¸À®
 [ TkLabel.new(f_left, 'text'=>'ºÇ½é¤Î¥é¥Ù¥ë'),
   TkLabel.new(f_left, 'text'=>'2 ÈÖÌÜ¡£¤Á¤ç¤Ã¤ÈÉ⤭¾å¤¬¤é¤»¤Æ¤ß¤Þ¤·¤¿', 
-              'relief'=>'raised'),
+	      '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) {
-Tk::Label.new(f_right) {
-  bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
+TkLabel.new(f_right) {
+  bitmap('@' + [$demo_dir,'images','face.bmp'].join(File::Separator))
   borderwidth 2
   relief 'sunken'
 }.pack('side'=>'top')
diff --git a/ext/tk/sample/demos-jp/labelframe.rb b/ext/tk/sample/demos-jp/labelframe.rb
index 11b0d27308..044fcd23ae 100644
--- a/ext/tk/sample/demos-jp/labelframe.rb
+++ b/ext/tk/sample/demos-jp/labelframe.rb
@@ -1,5 +1,3 @@
-# -*- coding: euc-jp -*-
-#
 # labelframe.rb
 #
 # This demonstration script creates a toplevel window containing
@@ -19,12 +17,10 @@ $labelframe_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
-
 # Some information
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+TkLabel.new($labelframe_demo, 
+	    :font=>$font, :wraplength=>'4i', :justify=>:left, 
+	    :text=><<EOL).pack(:side=>:top)
 TkLabelFrame ¥¦¥£¥¸¥§¥Ã¥È¤Ï´ØÏ¢¤¹¤ë widget 
 ·²¤ò¤Þ¤È¤á¤Æ¼è¤ê°·¤¦¤¿¤á¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£¥é
 ¥Ù¥ë¤ÏÄ̾ï¤Îʸ»úÎó¤Ç¤â²¿¤é¤«¤Î¥¦¥£¥¸¥§¥Ã¥È
@@ -38,32 +34,32 @@ labelframe ¥¦¥£¥¸¥§¥Ã¥È¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤
 EOL
 
 # The bottom buttons
-TkFrame.new(base_frame){|f|
+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{
+		 $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)
+		 showCode 'labelframe'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
 # Demo area
-w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both, 
-                                       :expand=>true)
+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|
+		 :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) {
+		      :variable=>v, :value=>i) {
       pack(:side=>:top, :fill=>:x, :pady=>2)
     }
   }
@@ -86,7 +82,7 @@ end
 
 TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
   TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy, 
-                    :text=>"¥ª¥×¥·¥ç¥ó¤ò»ÈÍÑ", :padx=>0) {|cb|
+		    :text=>"¥ª¥×¥·¥ç¥ó¤ò»ÈÍÑ", :padx=>0) {|cb|
     command proc{lfEnableButtons(f)}
     f.labelwidget(cb)
   }
diff --git a/ext/tk/sample/demos-jp/mclist.rb b/ext/tk/sample/demos-jp/mclist.rb
deleted file mode 100644
index a7834d2668..0000000000
--- a/ext/tk/sample/demos-jp/mclist.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# mclist.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget configured as a multi-column listbox.
-#
-# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($mclist_demo) && $mclist_demo
-  $mclist_demo.destroy 
-  $mclist_demo = nil
-end
-
-$mclist_demo = TkToplevel.new {|w|
-  title("Multi-Column List")
-  iconname("mclist")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', 
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6], 
-               :text=><<EOL).pack(:fill=>:x)
-Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
-Ttk::Treeview¥¦¥£¥¸¥§¥Ã¥È¤Ï\
-Ttk¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤Ë´Þ¤Þ¤ì¤ë¥¦¥£¥¸¥§¥Ã¥È¤Î°ì¤Ä¤Ç¡¤\
-¤½¤ì¤¬ÊÝ»ý¤¹¤ëÌÚ¹½Â¤¤Î¥Ç¡¼¥¿¤½¤Î¤â¤Î¤Þ¤Ç¤Ïɽ¼¨¤¹¤ë¤³¤È¤Ê¤¯¡¤\
-¼¨¤·¤¿¤¤¾ðÊó¤ò¥Þ¥ë¥Á¥«¥é¥à¤Çɽ¼¨¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥
-¤³¤Î¥µ¥ó¥×¥ë¤Ï¡¤Ê£¿ô¤Î¥«¥é¥à¤ò»ý¤Ã¤¿¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤òºîÀ®¤¹¤ë´Êñ¤ÊÎã¤Ç¤¹¡¥
-³Æ¥«¥é¥à¤Î¥¿¥¤¥È¥ë(heading)¤ò¥¯¥ê¥Ã¥¯¤¹¤ì¤Ð¡¤\
-¤½¤Î¥«¥é¥à¤Î¾ðÊó¤Ë´ð¤Å¤¤¤Æ¥ê¥¹¥È¤ÎʤÙÂؤ¨¤¬¤Ê¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡¥\
-¤Þ¤¿¡¤¥«¥é¥à¤Î¥¿¥¤¥È¥ë´Ö¤Î¶èÀÚ¤êÉôʬ¤ò¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¡¤\
-¥«¥é¥à¤ÎÉý¤òÊѹ¹¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'mclist'}), 
-         Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $mclist_demo.destroy
-                           $mclist_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-container = Ttk::Frame.new(base_frame)
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency), 
-                          :show=>:headings)
-if Tk.windowingsystem != 'aquq'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-container.pack(:fill=>:both, :expand=>true)
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
-
-## The data we're going to insert
-data = [
-  ['¥¢¥ë¥¼¥ó¥Á¥ó', 	'¥Ö¥¨¥Î¥¹¥¢¥¤¥ì¥¹', 	'ARS'], 
-  ['¥ª¡¼¥¹¥È¥é¥ê¥¢',	'¥­¥ã¥ó¥Ù¥é',		'AUD'], 
-  ['¥Ö¥é¥¸¥ë', 		'¥Ö¥é¥¸¥ê¥¢', 		'BRL'], 
-  ['¥«¥Ê¥À', 		'¥ª¥¿¥ï', 		'CAD'], 
-  ['Ãæ¹ñ',		'Ë̵þ', 		'CNY'], 
-  ['¥Õ¥é¥ó¥¹',		'¥Ñ¥ê', 		'EUR'], 
-  ['¥É¥¤¥Ä', 		'¥Ù¥ë¥ê¥ó',		'EUR'], 
-  ['¥¤¥ó¥É', 		'¥Ë¥å¡¼¥Ç¥ê¡¼',		'INR'], 
-  ['¥¤¥¿¥ê¥¢', 		'¥í¡¼¥Þ', 		'EUR'], 
-  ['ÆüËÜ', 		'Åìµþ', 		'JPY'], 
-  ['¥á¥­¥·¥³', 		'¥á¥­¥·¥³¥·¥Æ¥£', 	'MXN'], 
-  ['¥í¥·¥¢', 		'¥â¥¹¥¯¥ï', 		'RUB'], 
-  ['Æ¥Õ¥ê¥«',	'¥×¥ì¥È¥ê¥¢', 		'ZAR'], 
-  ['±Ñ¹ñ', 		'¥í¥ó¥É¥ó', 		'GBP'], 
-  ['¥¢¥á¥ê¥«', 		'¥ï¥·¥ó¥È¥ó D.C.', 	'USD'],
-]
-
-## Code to insert the data nicely
-font = Ttk::Style.lookup(tree[:style], :font)
-cols = %w(country capital currency)
-cols.zip(%w(¹ñ̾ ¼óÅÔ Ä̲ß)).each{|col, name|
-  tree.heading_configure(col, :text=>name, 
-                         :command=>proc{sort_by(tree, col, false)})
-  tree.column_configure(col, :width=>TkFont.measure(font, name))
-}
-
-data.each{|country, capital, currency|
-  #tree.insert('', :end, :values=>[country, capital, currency])
-  tree.insert(nil, :end, :values=>[country, capital, currency])
-  cols.zip([country, capital, currency]).each{|col, val|
-    len = TkFont.measure(font, "#{val}  ")
-    if tree.column_cget(col, :width) < len
-      tree.column_configure(col, :width=>len)
-    end
-  }
-}
-
-## Code to do the sorting of the tree contents when clicked on
-def sort_by(tree, col, direction)
-  tree.children(nil).map!{|row| [tree.get(row, col), row.id]} . 
-    sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) . 
-    each_with_index{|info, idx| tree.move(info[1], nil, idx)}
-
-  tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
-end
diff --git a/ext/tk/sample/demos-jp/menu.rb b/ext/tk/sample/demos-jp/menu.rb
index c3d95176b4..fb32623cc8 100644
--- a/ext/tk/sample/demos-jp/menu.rb
+++ b/ext/tk/sample/demos-jp/menu.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # menus widget demo (called by 'widget')
 #
@@ -16,22 +15,13 @@ $menu_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($menu_demo).pack(:fill=>:both, :expand=>true)
-
 # menu frame À¸À®
-$menu_frame = TkFrame.new(base_frame, 'relief'=>'raised', 'bd'=>2)
+$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(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
+TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+  if $tk_platform['platform'] == 'macintosh'
     text("¤³¤Î¥¦¥£¥ó¥É¥¦¤ÏÍÍ¡¹¤Ê¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Command-X ¤òÆþÎϤ¹¤ë¤È¡¢X¤¬¥³¥Þ¥ó¥É¥­¡¼µ­¹æ¤Ë³¤¤¤Æɽ¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ê¤é¤Ð¡¢¥¢¥¯¥»¥é¥ì¡¼¥¿¤ò»È¤Ã¤¿¹àÌܵ¯Æ°¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼Í×ÁÇÃæ¡¢ºÇ¸å¤Î¤â¤Î¤Ï¡¢¤½¤Î¥á¥Ë¥å¡¼¤ÎºÇ½é¤Î¹àÌܤòÁªÂò¤¹¤ë¤³¤È¤ÇÆÈΩ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£")
   else
     text("¤³¤Î¥¦¥£¥ó¥É¥¦¤ÏÍÍ¡¹¤Ê¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Alt-X ¤òÆþÎϤ¹¤ë¤È¡¢X¤¬¥á¥Ë¥å¡¼¤Ë¥¢¥ó¥À¡¼¥é¥¤¥óÉÕ¤­¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ê¤é¤Ð¡¢¥­¡¼¥Ü¡¼¥É¤«¤é¤Î»ØÄ꤬¤Ç¤­¤Þ¤¹¡£Ìð°õ¥­¡¼¤Ç¥á¥Ë¥å¡¼¤Î¥È¥é¥Ð¡¼¥¹¤â²Äǽ¤Ç¤¹¡£¥á¥Ë¥å¡¼¤¬»ØÄꤵ¤ì¤¿ºÝ¤Ë¤Ï¡¢¥¹¥Ú¡¼¥¹¥­¡¼¤Ç¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¢¤ë¤¤¤Ï¡¢¥¢¥ó¥À¡¼¥é¥¤¥óÉÕ¤­¤Îʸ»ú¤òÆþÎϤ¹¤ë¤³¤È¤Ç¤â¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼¤Î¥¨¥ó¥È¥ê¤¬¥¢¥¯¥»¥é¥ì¡¼¥¿¤ò»ý¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥¢¥¯¥»¥é¥ì¡¼¥¿¤òÆþÎϤ¹¤ë¤³¤È¤Ç¥á¥Ë¥å¡¼¤ò»ØÄꤹ¤ë¤³¤È¤Ê¤·¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼Í×ÁÇÃæ¡¢ºÇ¸å¤Î¤â¤Î¤Ï¡¢¤½¤Î¥á¥Ë¥å¡¼¤ÎºÇ½é¤Î¹àÌܤòÁªÂò¤¹¤ë¤³¤È¤ÇÆÈΩ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£")
@@ -39,10 +29,9 @@ TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 }.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($menu_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $menu_demo
       $menu_demo = nil
@@ -73,8 +62,7 @@ TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
   }
 }
 
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem == "classic" || windowingsystem == "aqua"
+if $tk_platform['platform'] == 'macintosh'
   modifier = 'Command'
 elsif $tk_platform['platform'] == 'windows'
   modifier = 'Control'
@@ -90,8 +78,8 @@ TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
     ['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}")
+	  'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+	  'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
       $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
     }
   }
@@ -102,18 +90,17 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
   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)
+	'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)
+	'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|
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
       cascade_menu.add('cascade', 'label'=>'Check buttons(¥Á¥§¥Ã¥¯¥Ü¥¿¥ó)', 
-                       'menu'=>cascade_check, 'underline'=>0)
+		       'menu'=>cascade_check, 'underline'=>0)
       oil = TkVariable.new(0)
       add('check', 'label'=>'¥ª¥¤¥ëÅÀ¸¡', 'variable'=>oil)
       trans = TkVariable.new(0)
@@ -124,19 +111,18 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
       add('check', 'label'=>'¥é¥¤¥ÈÅÀ¸¡', 'variable'=>lights)
       add('separator')
       add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨', 
-          'command'=>proc{showVars($menu_demo, 
-                                   ['¥ª¥¤¥ëÅÀ¸¡', oil], 
-                                   ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', trans], 
-                                   ['¥Ö¥ì¡¼¥­ÅÀ¸¡', brakes], 
-                                   ['¥é¥¤¥ÈÅÀ¸¡', lights])} )
+	  'command'=>proc{showVars($menu_demo, 
+				   ['¥ª¥¤¥ëÅÀ¸¡', oil], 
+				   ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', trans], 
+				   ['¥Ö¥ì¡¼¥­ÅÀ¸¡', brakes], 
+				   ['¥é¥¤¥ÈÅÀ¸¡', lights])} )
       invoke 1
       invoke 3
     }
 
-    #TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
       cascade_menu.add('cascade', 'label'=>'Radio buttons(¥é¥¸¥ª¥Ü¥¿¥ó)', 
-                       'menu'=>cascade_radio, 'underline'=>0)
+		       'menu'=>cascade_radio, 'underline'=>0)
       pointSize = TkVariable.new
       add('radio', 'label'=>'10 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>10)
       add('radio', 'label'=>'14 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>14)
@@ -150,9 +136,9 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
       add('radio', 'label'=>'¥¤¥¿¥ê¥Ã¥¯', 'variable'=>style, 'value'=>'italic')
       add('separator')
       add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨', 
-          'command'=>proc{showVars($menu_demo, 
-                                   ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize], 
-                                   ['¥¹¥¿¥¤¥ë', style])} )
+	  'command'=>proc{showVars($menu_demo, 
+				   ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize], 
+				   ['¥¹¥¿¥¤¥ë', style])} )
       invoke 1
       invoke 7
     }
@@ -164,15 +150,14 @@ TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
   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'=>'λ²ò')} )
+	'bitmap'=>'@'+[$demo_dir,'images','pattern.bmp'].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"})
+	  'command'=>proc{print "You invoked the #{icon} bitmap\n"})
     }
   }
 }
@@ -184,7 +169,7 @@ TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
     [ '¥¨¥ó¥È¥ê','Ê̤Υ¨¥ó¥È¥ê','²¿¤â¤·¤Ê¤¤','¤Û¤È¤ó¤É²¿¤â¤·¤Ê¤¤',
       '¿ÍÀ¸¤ò°ÕµÁ¤¢¤ë¤â¤Î¤Ë' ].each{|i|
       add('command', 'label'=>i, 
-          'command'=>proc{print "You invoked \"#{i}\"\n"})
+	  'command'=>proc{print "You invoked \"#{i}\"\n"})
     }
   }
 }
@@ -195,7 +180,7 @@ TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
     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"})
+	  'command'=>proc{print "You invoked \"#{c}\"\n"})
     }
   }
 }
diff --git a/ext/tk/sample/demos-jp/menu84.rb b/ext/tk/sample/demos-jp/menu84.rb
index a631bacd43..ea5fdf6487 100644
--- a/ext/tk/sample/demos-jp/menu84.rb
+++ b/ext/tk/sample/demos-jp/menu84.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # menus widget demo (called by 'widget')
 #
@@ -16,8 +15,6 @@ $menu84_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($menu84_demo).pack(:fill=>:both, :expand=>true)
-
 begin
   windowingsystem = Tk.windowingsystem()
 rescue
@@ -25,7 +22,7 @@ rescue
 end
 
 # label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+TkLabel.new($menu84_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
   if $tk_platform['platform'] == 'macintosh' ||
       windowingsystem == "classic" || windowingsystem == "aqua"
     text("¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤ò»ý¤Ä¥á¥Ë¥å¡¼¥Ð¡¼¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£Command+x ('x'¤Ï¥³¥Þ¥ó¥É¥­¡¼¥·¥ó¥Ü¥ë¤Ë³¤±¤Æɽ¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ç¤¹) ¤È¥¿¥¤¥×¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¤â¹àÌܤε¡Ç½¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ºÇ¸å¤Î¥á¥Ë¥å¡¼¤Ï¡¢¥Þ¥¦¥¹¤Ç¥¦¥£¥ó¥É¥¦¤Î³°¤Ë¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢ÆÈΩ¤·¤¿¥Ñ¥ì¥Ã¥È¤È¤Ê¤ë¤è¤¦¤ËÀÚ¤êÊü¤¹¤³¤È¤¬²Äǽ¤Ç¤¹¡£")
@@ -36,20 +33,19 @@ TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 
 
 menustatus = TkVariable.new("    ")
-TkFrame.new(base_frame) {|frame|
+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')
+	      '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(base_frame) {|frame|
+TkFrame.new($menu84_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $menu84_demo
       $menu84_demo = nil
@@ -72,8 +68,8 @@ 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('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..." ¹àÌܤε¡Ç½¤ÏÆäËÄêµÁ¤µ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£'})
@@ -95,8 +91,8 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   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}")
+	'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+	'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
     $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
   }
 }
@@ -114,7 +110,7 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 
   TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
     m.add('cascade', 'label'=>'Check button', 
-          'menu'=>cascade_check, 'underline'=>0)
+	  'menu'=>cascade_check, 'underline'=>0)
     oil = TkVariable.new(0)
     add('check', 'label'=>'¥ª¥¤¥ë¸¡ºº', 'variable'=>oil)
     trans = TkVariable.new(0)
@@ -125,18 +121,18 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
     add('check', 'label'=>'¥é¥¤¥È¸¡ºº', 'variable'=>lights)
     add('separator')
     add('command', 'label'=>'Show current values', 
-        'command'=>proc{showVars($menu84_demo, 
-                                 ['¥ª¥¤¥ë', oil], 
-                                 ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥ó', trans], 
-                                 ['¥Ö¥ì¡¼¥­', brakes], 
-                                 ['¥é¥¤¥È', lights])} )
+	'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)
+	  '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)
@@ -150,9 +146,9 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
     add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
     add('separator')
     add('command', 'label'=>'¸½ºßÃͤÎɽ¼¨', 
-        'command'=>proc{showVars($menu84_demo, 
-                                 ['pointSize', pointSize], 
-                                 ['style', style])} )
+	'command'=>proc{showVars($menu84_demo, 
+				 ['pointSize', pointSize], 
+				 ['style', style])} )
     invoke 1
     invoke 7
   }
@@ -161,15 +157,14 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
 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),
+      'bitmap'=>'@'+[$demo_dir,'images','pattern.bmp'].join(File::Separator),
       'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
-                                   'text'=>'¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥á¥Ë¥å¡¼¹àÌܤϡ¢Ê¸»úÎó¤ÎÂå¤ï¤ê¤Ë¥Ó¥Ã¥È¥Þ¥Ã¥×¥¤¥á¡¼¥¸¤Ç¹àÌܤòɽ¼¨¤·¤¿¤â¤Î¤Ç¤¹¡£¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï¡¢¤Û¤«¤Î¥á¥Ë¥å¡¼¹àÌܤȤδ֤ÇÆä˰㤤¤¬¤¢¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£',
-                                   'bitmap'=>'', 'default'=>0, 
-                                   'buttons'=>'ÊĤ¸¤ë')} )
+				   '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"})
+	'command'=>proc{print "You invoked the #{icon} bitmap\n"})
   }
 
   entryconfigure(2, :columnbreak=>true)
@@ -180,34 +175,34 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
   [ '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"})
+	'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'=>'')
-                   })
+		   '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"})
+	'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')
+	      begin
+		label = w.entrycget('active', 'label')
+	      rescue
+		label = "    "
+	      end
+	      menustatus.value = label
+	      Tk.update(true)
+	    }, '%W')
diff --git a/ext/tk/sample/demos-jp/menu8x.rb b/ext/tk/sample/demos-jp/menu8x.rb
index 9249f2491a..a6d3c5e09e 100644
--- a/ext/tk/sample/demos-jp/menu8x.rb
+++ b/ext/tk/sample/demos-jp/menu8x.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # menus widget demo (called by 'widget')
 #
@@ -16,21 +15,18 @@ $menu8x_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($menu8x_demo).pack(:fill=>:both, :expand=>true)
-
 # version check
 if $tk_version.to_f < 8.0
 
 # label À¸À®
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+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(base_frame) {|frame|
+TkFrame.new($menu8x_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $menu8x_demo
       $menu8x_demo = nil
@@ -40,22 +36,15 @@ TkFrame.new(base_frame) {|frame|
 
   TkButton.new(frame) {
     text '¥³¡¼¥É»²¾È'
-    command proc{showCode 'menu8x'}
+    command proc{showCode 'menu'}
   }.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(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
+TkLabel.new($menu8x_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+  if $tk_platform['platform'] == 'macintosh'
     text("¤³¤Î¥¦¥£¥ó¥É¥¦¤ÏÍÍ¡¹¤Ê¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Command-X ¤òÆþÎϤ¹¤ë¤È¡¢X¤¬¥³¥Þ¥ó¥É¥­¡¼µ­¹æ¤Ë³¤¤¤Æɽ¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ê¤é¤Ð¡¢¥¢¥¯¥»¥é¥ì¡¼¥¿¤ò»È¤Ã¤¿¹àÌܵ¯Æ°¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼Í×ÁÇÃæ¡¢ºÇ¸å¤Î¤â¤Î¤Ï¡¢¤½¤Î¥á¥Ë¥å¡¼¤ÎºÇ½é¤Î¹àÌܤòÁªÂò¤¹¤ë¤³¤È¤ÇÆÈΩ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£")
   else
     text("¤³¤Î¥¦¥£¥ó¥É¥¦¤ÏÍÍ¡¹¤Ê¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Alt-X ¤òÆþÎϤ¹¤ë¤È¡¢X¤¬¥á¥Ë¥å¡¼¤Ë¥¢¥ó¥À¡¼¥é¥¤¥óÉÕ¤­¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ê¤é¤Ð¡¢¥­¡¼¥Ü¡¼¥É¤«¤é¤Î»ØÄ꤬¤Ç¤­¤Þ¤¹¡£Ìð°õ¥­¡¼¤Ç¥á¥Ë¥å¡¼¤Î¥È¥é¥Ð¡¼¥¹¤â²Äǽ¤Ç¤¹¡£¥á¥Ë¥å¡¼¤¬»ØÄꤵ¤ì¤¿ºÝ¤Ë¤Ï¡¢¥¹¥Ú¡¼¥¹¥­¡¼¤Ç¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¢¤ë¤¤¤Ï¡¢¥¢¥ó¥À¡¼¥é¥¤¥óÉÕ¤­¤Îʸ»ú¤òÆþÎϤ¹¤ë¤³¤È¤Ç¤â¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼¤Î¥¨¥ó¥È¥ê¤¬¥¢¥¯¥»¥é¥ì¡¼¥¿¤ò»ý¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥¢¥¯¥»¥é¥ì¡¼¥¿¤òÆþÎϤ¹¤ë¤³¤È¤Ç¥á¥Ë¥å¡¼¤ò»ØÄꤹ¤ë¤³¤È¤Ê¤·¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼Í×ÁÇÃæ¡¢ºÇ¸å¤Î¤â¤Î¤Ï¡¢¤½¤Î¥á¥Ë¥å¡¼¤ÎºÇ½é¤Î¹àÌܤòÁªÂò¤¹¤ë¤³¤È¤ÇÆÈΩ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£")
@@ -64,17 +53,16 @@ TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
 
 # ¾õÂÖɽ¼¨¤ÎÀ¸À®
 $menu8xstatus = TkVariable.new("    ")
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($menu8x_demo) {|frame|
   TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken', 
-              'bd'=>1, 'font'=>['Helvetica', '10'], 'anchor'=>'w')\
+	      '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(base_frame) {|frame|
+TkFrame.new($menu8x_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $menu8x_demo
       $menu8x_demo = nil
@@ -84,7 +72,7 @@ TkFrame.new(base_frame) {|frame|
 
   TkButton.new(frame) {
     text '¥³¡¼¥É»²¾È'
-    command proc{showCode 'menu8x'}
+    command proc{showCode 'menu'}
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
@@ -103,8 +91,7 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
     add('command', 'label'=>'½ªÎ»', 'command'=>proc{$menu8x_demo.destroy})
   }
 
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
+  if $tk_platform['platform'] == 'macintosh'
     modifier = 'Command'
   elsif $tk_platform['platform'] == 'windows'
     modifier = 'Control'
@@ -118,8 +105,8 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
     ['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}")
+	  'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+	  'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
       $menu8x_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
     }
   }
@@ -127,17 +114,17 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
   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)
+	'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)
+	'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)
+		       'menu'=>cascade_check, 'underline'=>0)
       oil = TkVariable.new(0)
       add('check', 'label'=>'¥ª¥¤¥ëÅÀ¸¡', 'variable'=>oil)
       trans = TkVariable.new(0)
@@ -148,18 +135,18 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
       add('check', 'label'=>'¥é¥¤¥ÈÅÀ¸¡', 'variable'=>lights)
       add('separator')
       add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨', 
-          'command'=>proc{showVars($menu8x_demo, 
-                                   ['¥ª¥¤¥ëÅÀ¸¡', oil], 
-                                   ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', trans], 
-                                   ['¥Ö¥ì¡¼¥­ÅÀ¸¡', brakes], 
-                                   ['¥é¥¤¥ÈÅÀ¸¡', lights])} )
+	  '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)
+		       'menu'=>cascade_radio, 'underline'=>0)
       pointSize = TkVariable.new
       add('radio', 'label'=>'10 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>10)
       add('radio', 'label'=>'14 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>14)
@@ -173,9 +160,9 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
       add('radio', 'label'=>'¥¤¥¿¥ê¥Ã¥¯', 'variable'=>style, 'value'=>'italic')
       add('separator')
       add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨', 
-          'command'=>proc{showVars($menu8x_demo, 
-                                   ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize], 
-                                   ['¥¹¥¿¥¤¥ë', style])} )
+	  'command'=>proc{showVars($menu8x_demo, 
+				   ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize], 
+				   ['¥¹¥¿¥¤¥ë', style])} )
       invoke 1
       invoke 7
     }
@@ -184,16 +171,15 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
   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'=>'λ²ò')} )
+	'bitmap'=>'@'+[$demo_dir,'images','pattern.bmp'].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"})
+	  'command'=>proc{print "You invoked the #{icon} bitmap\n"})
     }
 
     entryconfigure(2, 'columnbreak'=>1)
@@ -204,7 +190,7 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
     [ '¥¨¥ó¥È¥ê','Ê̤Υ¨¥ó¥È¥ê','²¿¤â¤·¤Ê¤¤','¤Û¤È¤ó¤É²¿¤â¤·¤Ê¤¤',
       '¿ÍÀ¸¤ò°ÕµÁ¤¢¤ë¤â¤Î¤Ë' ].each{|i|
       add('command', 'label'=>i, 
-          'command'=>proc{print "You invoked \"#{i}\"\n"})
+	  'command'=>proc{print "You invoked \"#{i}\"\n"})
     }
   }
 
@@ -212,7 +198,7 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
     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"})
+	  'command'=>proc{print "You invoked \"#{c}\"\n"})
     }
   }
 
@@ -220,14 +206,14 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
 }
 
 TkMenu.bind('<MenuSelect>', 
-            proc{|w| 
-              begin
-                label = w.entrycget('active', 'label')
-              rescue
-                label = '    '
-              end
-              $menu8xstatus.value = label
-              Tk.update('idletasks')
-            }, '%W')
+	    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/ext/tk/sample/demos-jp/menubu.rb b/ext/tk/sample/demos-jp/menubu.rb
index 90dc367305..8b4d7980d2 100644
--- a/ext/tk/sample/demos-jp/menubu.rb
+++ b/ext/tk/sample/demos-jp/menubu.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 require "tkcanvas"
 
 def optionMenu(menubutton, varName, firstValue, *rest)
@@ -33,21 +32,18 @@ $menubu_demo = TkToplevel.new {|w|
 
 positionWindow($menubu_demo)
 
-base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
-
 # version check
 if $tk_version.to_f < 8.0
 
 # label À¸À®
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+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(base_frame) {|frame|
+TkFrame.new($menubu_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $menubu_demo
       $menubu_demo = nil
@@ -57,13 +53,13 @@ TkFrame.new(base_frame) {|frame|
 
   TkButton.new(frame) {
     text '¥³¡¼¥É»²¾È'
-    command proc{showCode 'menubu'}
+    command proc{showCode 'menu'}
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 else ; # Tk8.x
 
-body = TkFrame.new(base_frame)
+body = TkFrame.new($menubu_demo)
 body.pack('expand'=>'yes', 'fill'=>'both')
 
 below = TkMenubutton.new(body) {
@@ -158,10 +154,9 @@ center = TkFrame.new(body) {
   grid('row'=>1, 'column'=>1, 'sticky'=>'news')
 }
 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($menubu_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc {
       tmppath = $menubu_demo
       $menubu_demo = nil
@@ -190,7 +185,7 @@ TkFrame.new(center) {|f|
   menubuttonoptions = TkVariable.new
   mbutton = TkMenubutton.new(f)
   options = optionMenu(mbutton, menubuttonoptions, 
-                       'one', 'two', 'three')
+		       'one', 'two', 'three')
   mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
   paletteColor = TkVariable.new
   colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
diff --git a/ext/tk/sample/demos-jp/msgbox.rb b/ext/tk/sample/demos-jp/msgbox.rb
index 88380e08bd..cf53d70487 100644
--- a/ext/tk/sample/demos-jp/msgbox.rb
+++ b/ext/tk/sample/demos-jp/msgbox.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # message boxes widget demo (called by 'widget')
 #
@@ -16,17 +15,14 @@ $msgbox_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($msgbox_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"¤Þ¤ºÉ½¼¨¤¹¤ë¥¢¥¤¥³¥ó¤È¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Î¼ïÎà¤òÁª¤ó¤Ç²¼¤µ¤¤¡£¤½¤Î¸å¤Ë\"¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹\"¥Ü¥¿¥ó¤ò²¡¤¹¤È¡¢»ØÄꤷ¤¿¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£").pack('side'=>'top')
+TkLabel.new($msgbox_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
+	    'text'=>"ɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤È¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Î¼ïÎà¤òÁª¤ó¤Ç²¼¤µ¤¤¡£¤½¤·¤Æ \"¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹\" ¥Ü¥¿¥ó¤ò²¡¤¹¤È¡¢»ØÄꤷ¤¿¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£").pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($msgbox_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $msgbox_demo
       $msgbox_demo = nil
@@ -46,12 +42,12 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame À¸À®
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_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')
+			'pady'=>'.5c', 'padx'=>'.5c')
 $msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
-                        'pady'=>'.5c', 'padx'=>'.5c')
+			'pady'=>'.5c', 'padx'=>'.5c')
 
 TkLabel.new($msgbox_leftframe, 'text'=>'¥¢¥¤¥³¥ó').pack('side'=>'top')
 TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
@@ -60,9 +56,9 @@ TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
 $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')
+		    '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')
@@ -73,17 +69,17 @@ $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')
+		    '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}\"¤Î¥¢¥¤¥³¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£")
+			 'title'=>'Message', 'parent'=>w,
+			 'message'=>"¤³¤ì¤Ï \"#{$msgboxType.value}\" ¤È¤¤¤¦¼ïÎà¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Ç¡¢\"#{$msgboxIcon.value}\" ¤Î¥¢¥¤¥³¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£")
 
   Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w, 
-                'message'=>"¤¢¤Ê¤¿¤Ï \"#{button}\" ¤ò²¡¤·¤Þ¤·¤¿¤Í¡£")
+		'message'=>"¤¢¤Ê¤¿¤Ï \"#{button}\" ¤ò²¡¤·¤Þ¤·¤¿¤Í¡£")
 end
 
diff --git a/ext/tk/sample/demos-jp/msgbox2.rb b/ext/tk/sample/demos-jp/msgbox2.rb
deleted file mode 100644
index d61f25129a..0000000000
--- a/ext/tk/sample/demos-jp/msgbox2.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
-if defined?($msgbox2_demo) && $msgbox2_demo
-  $msgbox2_demo.destroy 
-  $msgbox2_demo = nil
-end
-
-# demo ÍѤΠtoplevel widget ¤òÀ¸À®
-$msgbox2_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox2_demo).pack(:fill=>:both, :expand=>true)
-
-# label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"¤Þ¤ºÉ½¼¨¤¹¤ë¥¢¥¤¥³¥ó¤È¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Î¼ïÎà¤òÁª¤ó¤Ç²¼¤µ¤¤¡£¤½¤Î¸å¤Ë\"¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹\"¥Ü¥¿¥ó¤ò²¡¤¹¤È¡¢»ØÄꤵ¤ì¤¿·Á¼°¤Ç¡¢¥á¥Ã¥»¡¼¥¸¤È¾ÜºÙ¥Æ¥­¥¹¥È¤È¤ò»ý¤Ã¤¿¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£").pack('side'=>'top')
-
-# frame À¸À®
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
-    command proc{
-      tmppath = $msgbox2_demo
-      $msgbox2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '¥³¡¼¥É»²¾È'
-    command proc{showCode 'msgbox2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹'
-    command proc{showMessageBox $msgbox2_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame À¸À®
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$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}\"¥¿¥¤¥×¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹", 
-                         'detail'=>"¤³¤ì¤Ï\"#{$msgboxType.value}\"¤È¤¤¤¦¼ïÎà¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Ç¡¢\"#{$msgboxIcon.value}\"¤Î¥¢¥¤¥³¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£²¼¤Î¥Ü¥¿¥ó¤Î¤¤¤º¤ì¤«¤òÁªÂò¤·¤Æ¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w, 
-                'message'=>"¤¢¤Ê¤¿¤Ï \"#{button}\" ¤ò²¡¤·¤Þ¤·¤¿¤Í¡£")
-end
-
diff --git a/ext/tk/sample/demos-jp/paned1.rb b/ext/tk/sample/demos-jp/paned1.rb
index f994e83ff1..99e6b6cddb 100644
--- a/ext/tk/sample/demos-jp/paned1.rb
+++ b/ext/tk/sample/demos-jp/paned1.rb
@@ -1,5 +1,3 @@
-# -*- coding: euc-jp -*-
-#
 # paned1.rb
 #
 # This demonstration script creates a toplevel window containing
@@ -18,11 +16,9 @@ $paned1_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+TkLabel.new($paned1_demo, 
+	    :font=>$font, :wraplength=>'4i', :justify=>:left, 
+	    :text=><<EOL).pack(:side=>:top)
 ²¼¤Î¿§ÉÕ¤±¤µ¤ì¤¿Æó¤Ä¤Î¥¦¥£¥ó¥É¥¦¤Î´Ö¤Î»ÅÀÚ¤êÏȤϡ¢°ì¤Ä¤ÎÎΰè¤ò¤½¤ì¤¾¤ì¤Î¥¦¥£¥ó¥É¥¦¤Î¤¿¤á¤Ëʬ³ä¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£º¸¥Ü¥¿¥ó¤Ç»ÅÀÚ¤ê¤òÁàºî¤¹¤ë¤È¡¢Ê¬³ä¥µ¥¤¥ºÊѹ¹¤ÎÁàºîÅÓÃæ¤Ç¤ÏºÆɽ¼¨¤Ï¤Ê¤µ¤ì¤º¡¢³ÎÄꤵ¤»¤¿¤È¤­¤Ëɽ¼¨¤¬¹¹¿·¤µ¤ì¤Þ¤¹¡£¥Þ¥¦¥¹¤Ë¤è¤ë»ÅÀÚ¤ê¤ÎÁàºî¤ËÄɿ路¤Æ¥µ¥¤¥º¤òÊѹ¹¤·¤¿É½¼¨¤¬¤Ê¤ï¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢¥Þ¥¦¥¹¤ÎÃæ±û¥Ü¥¿¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 ¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤¬ panedwindow ¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤
 ¾ì¹ç¡¢¤³¤Î¥Ç¥â¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤Ï¤º¤Ç¤¹¡£¤½¤Î¾ì¹ç¤Ë¤Ï panedwindow ¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê
@@ -31,22 +27,22 @@ TkLabel.new(base_frame,
 EOL
 
 # The bottom buttons
-TkFrame.new(base_frame){|f|
+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{
+		 $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)
+		 showCode 'paned1'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
-TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
-  add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'), 
-      Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
-
+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/ext/tk/sample/demos-jp/paned2.rb b/ext/tk/sample/demos-jp/paned2.rb
index cdc8253402..9df88c4b97 100644
--- a/ext/tk/sample/demos-jp/paned2.rb
+++ b/ext/tk/sample/demos-jp/paned2.rb
@@ -1,5 +1,3 @@
-# -*- coding: euc-jp -*-
-#
 # paned2.rb --
 #
 # This demonstration script creates a toplevel window containing
@@ -18,11 +16,9 @@ $paned2_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'4i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+TkLabel.new($paned2_demo, 
+	    :font=>$font, :wraplength=>'4i', :justify=>:left, 
+	    :text=><<EOL).pack(:side=>:top)
 ²¼¤Î¥¹¥¯¥í¡¼¥ë¥Ð¡¼ÉÕ¤­¤Î¥¦¥£¥¸¥§¥Ã¥È¤¬ÃÖ¤«¤ì¤¿Æó¤Ä¤Î¥¦¥£¥ó¥É¥¦¤Î´Ö¤Î»ÅÀÚ¤êÏȤϡ¢°ì¤Ä¤ÎÎΰè¤ò¤½¤ì¤¾¤ì¤Î¥¦¥£¥ó¥É¥¦¤Î¤¿¤á¤Ëʬ³ä¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£º¸¥Ü¥¿¥ó¤Ç»ÅÀÚ¤ê¤òÁàºî¤¹¤ë¤È¡¢Ê¬³ä¥µ¥¤¥ºÊѹ¹¤ÎÁàºîÅÓÃæ¤Ç¤ÏºÆɽ¼¨¤Ï¤Ê¤µ¤ì¤º¡¢³ÎÄꤵ¤»¤¿¤È¤­¤Ëɽ¼¨¤¬¹¹¿·¤µ¤ì¤Þ¤¹¡£¥Þ¥¦¥¹¤Ë¤è¤ë»ÅÀÚ¤ê¤ÎÁàºî¤ËÄɿ路¤Æ¥µ¥¤¥º¤òÊѹ¹¤·¤¿É½¼¨¤¬¤Ê¤ï¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢¥Þ¥¦¥¹¤ÎÃæ±û¥Ü¥¿¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 ¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤¬ panedwindow ¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤
 ¾ì¹ç¡¢¤³¤Î¥Ç¥â¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤Ï¤º¤Ç¤¹¡£¤½¤Î¾ì¹ç¤Ë¤Ï panedwindow ¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê
@@ -31,17 +27,17 @@ TkLabel.new(base_frame,
 EOL
 
 # The bottom buttons
-TkFrame.new(base_frame){|f|
+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{
+		 $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)
+		 showCode 'paned2'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
 paneList = TkVariable.new  # define as normal variable (not array)
@@ -68,33 +64,33 @@ paneList.value = [         # ruby's array --> tcl's list
 ]
 
 # Create the pane itself
-TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
+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)
-        }
+	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)
+      TkFrame.new(f) {|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/ext/tk/sample/demos-jp/pendulum.rb b/ext/tk/sample/demos-jp/pendulum.rb
deleted file mode 100644
index b115f5be2c..0000000000
--- a/ext/tk/sample/demos-jp/pendulum.rb
+++ /dev/null
@@ -1,242 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# 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)
-}
-
-base_frame = TkFrame.new($pendulum_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text '¤³¤Î¥Ç¥â¤Ï¡¢ÊªÍý·Ï¤Î¥·¥ß¥å¥ì¡¼¥·¥ç¥ó¤Ë´Ø¤ï¤ë¤è¤¦¤Ê¥¢¥Ë¥á¡¼¥·¥ç¥ó¼Â¹Ô¤¹¤ë¤¿¤á¤Ë Ruby/Tk ¤ò¤É¤Î¤è¤¦¤ËÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£º¸Â¦¤Î¥­¥ã¥ó¥Ð¥¹¤Ïñ½ã¤Ê¿¶¤ê»Ò¤Ç¤¢¤ëʪÍý·Ï¼«ÂΤΥ°¥é¥Õ¥£¥«¥ëɽ¸½¤Ç¤¢¤ë¤Î¤ËÂФ·¡¢±¦Â¦¤Î¥­¥ã¥ó¥Ð¥¹¤Ï·Ï¤Î°ÌÁê¶õ´Ö¤Î¥°¥é¥Õ¡Ê³Ñ®Å٤ȳÑÅ٤Ȥò¥×¥í¥Ã¥È¤·¤¿¤â¤Î¡Ë¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£º¸Â¦¤Î¥­¥ã¥ó¥Ð¥¹¾å¤Ç¥¯¥ê¥Ã¥¯¤ª¤è¤Ó¥É¥é¥Ã¥°¤ò¹Ô¤Ã¤Æ¿¶¤ê»Ò¤Î½Å¤ê¤Î°ÌÃÖ¤òÊѤ¨¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|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, :orient=>:horizontal).pack(:fill=>:both, :expand=>true)
-#    @pane.add(@lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation'))
-#    @pane.add(@lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space'))
-    @lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation')
-    @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
-
-    # 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.to_i, y.to_i)}, 
-              '%x %y')
-    btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
-    btag.bind('ButtonRelease-1', 
-              proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start }, 
-              '%x %y')
-
-    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
-
-    @k.bind('Configure', proc{|h, w| 
-              h = h.to_i
-              w = w.to_i
-              @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')
-
-    # add
-    Tk.update
-    @pane.add(@lf1)
-    @pane.add(@lf2)
-
-    # init display
-    showPendulum
-
-    # 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
-    unless @psw && @psh
-      @psw = @k.width/2
-      @psh = @k.height/2
-    end
-    @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(base_frame)
diff --git a/ext/tk/sample/demos-jp/plot.rb b/ext/tk/sample/demos-jp/plot.rb
index 9ff71904cd..464dd4441d 100644
--- a/ext/tk/sample/demos-jp/plot.rb
+++ b/ext/tk/sample/demos-jp/plot.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # 2-D plot widget demo (called by 'widget')
 #
@@ -16,19 +15,16 @@ $plot_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left', 
-            'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï´Êñ¤Ê2¼¡¸µ¤Î¥×¥í¥Ã¥È¤ò´Þ¤ó¤À¥­¥ã¥ó¥Ð¥¹ widget¤Ç¤¹¡£É½¼¨¤µ¤ì¤¿ÅÀ¤ò¥Þ¥¦¥¹¥Ü¥¿¥ó1¤Ç¥É¥é¥Ã¥°¤·¤Æ¥Ç¡¼¥¿¤ò¤¤¤¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"){
+TkLabel.new($plot_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left', 
+	    'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï´Êñ¤Ê2¼¡¸µ¤Î¥×¥í¥Ã¥È¤ò´Þ¤ó¤À¥­¥ã¥ó¥Ð¥¹ widget¤Ç¤¹¡£É½¼¨¤µ¤ì¤¿ÅÀ¤ò¥Þ¥¦¥¹¥Ü¥¿¥ó1¤Ç¥É¥é¥Ã¥°¤·¤Æ¥Ç¡¼¥¿¤ò¤¤¤¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"){
   pack('side'=>'top')
 }
 
 # frame À¸À®
-$plot_buttons = TkFrame.new(base_frame) {|frame|
+$plot_buttons = TkFrame.new($plot_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $plot_demo
       $plot_demo = nil
@@ -44,53 +40,49 @@ $plot_buttons = TkFrame.new(base_frame) {|frame|
 $plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # font ÀßÄê
-  if $tk_version =~ /^4.*/
-    plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  else
-    font = 'Helvetica 18'
-  end
+plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
 
 # canvas ÀßÄê
-$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
+$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')
+	    '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')
+	      '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')
+	      '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')
+		     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
   item.addtag 'point'
 end
 
 $plot_canvas.itembind('point', 'Any-Enter', 
-                      proc{$plot_canvas.itemconfigure 'current','fill','red'})
+		      proc{$plot_canvas.itemconfigure 'current','fill','red'})
 $plot_canvas.itembind('point', 'Any-Leave', 
-                      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
+		      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
 $plot_canvas.itembind('point', '1', 
-                      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
+		      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
 $plot_canvas.itembind('point', 'ButtonRelease-1', 
-                      proc{$plot_canvas.dtag 'selected'})
+		      proc{$plot_canvas.dtag 'selected'})
 $plot_canvas.bind('B1-Motion', 
-                  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
+		  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
 
 $plot = {'lastX'=>0, 'lastY'=>0}
 
@@ -99,8 +91,8 @@ $plot = {'lastX'=>0, 'lastY'=>0}
 # 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.
+# w -		The canvas window.
+# x, y -	The coordinates of the mouse press.
 
 def plotDown (w, x, y)
   w.dtag 'selected'
@@ -115,8 +107,8 @@ end
 # current item.
 #
 # Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse.
+# 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']
diff --git a/ext/tk/sample/demos-jp/puzzle.rb b/ext/tk/sample/demos-jp/puzzle.rb
index 2febc2c55a..24c48693a9 100644
--- a/ext/tk/sample/demos-jp/puzzle.rb
+++ b/ext/tk/sample/demos-jp/puzzle.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # widet demo 'puzzle' (called by 'widget')
 #
@@ -16,10 +15,8 @@ $puzzle_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($puzzle_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($puzzle_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $puzzle_demo
       $puzzle_demo = nil
@@ -53,27 +49,18 @@ TkFrame.new(base_frame) {|frame|
 #
 begin
   if Tk.windowingsystem() == 'aqua'
-    frameWidth  = 168
-    frameHeight = 168
-  elsif Tk.default_widget_set == :Ttk
-    frameWidth  = 148
-    frameHeight = 124
+    frameSize = 160
   else
-    frameWidth  = 120
-    frameHeight = 120
+    frameSize = 120
   end
 rescue
-  frameWidth  = 120
-  frameHeight = 120
+  frameSize = 120
 end
-
-# depend_on_button_width = true
-depend_on_button_width = false
  
-s = TkScrollbar.new(base_frame)
-base = TkFrame.new(base_frame) {
-  width  frameWidth
-  height frameHeight
+s = TkScrollbar.new($puzzle_demo)
+base = TkFrame.new($puzzle_demo) {
+  width  frameSize
+  height frameSize
   borderwidth 2
   relief 'sunken'
   bg s['troughcolor']
@@ -100,11 +87,8 @@ order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
     text num
     highlightthickness 0
     command def_puzzleswitch_proc(w, num)
-    if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
-      base.width = w.winfo_reqwidth * 4
-    end
   }.place('relx'=>$xpos[num], 'rely'=>$ypos[num], 
-          'relwidth'=>0.25, 'relheight'=>0.25)
+	  'relwidth'=>0.25, 'relheight'=>0.25)
 }
 $xpos['space'] = 0.75
 $ypos['space'] = 0.75
@@ -116,9 +100,9 @@ def puzzleSwitch(w, num)
       && ($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)))
+	&& ($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
diff --git a/ext/tk/sample/demos-jp/radio.rb b/ext/tk/sample/demos-jp/radio.rb
index a61ad46d9b..871503029e 100644
--- a/ext/tk/sample/demos-jp/radio.rb
+++ b/ext/tk/sample/demos-jp/radio.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # radiobutton widget demo (called by 'widget')
 #
@@ -16,10 +15,8 @@ $radio_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($radio_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($radio_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -32,10 +29,9 @@ size = TkVariable.new
 color = TkVariable.new
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($radio_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $radio_demo
       $radio_demo = nil
@@ -52,14 +48,14 @@ TkFrame.new(base_frame) {|frame|
   TkButton.new(frame) {
     text 'ÊÑ¿ô»²¾È'
     command proc{
-      showVars(base_frame, ['size', size], ['color', color])
+      showVars($radio_demo, ['size', size], ['color', color])
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame À¸À®
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_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')
 
diff --git a/ext/tk/sample/demos-jp/radio2.rb b/ext/tk/sample/demos-jp/radio2.rb
index cf53e3e485..62425af90d 100644
--- a/ext/tk/sample/demos-jp/radio2.rb
+++ b/ext/tk/sample/demos-jp/radio2.rb
@@ -1,6 +1,4 @@
-# -*- coding: euc-jp -*-
-#
-# radio2.rb
+# radio.rb
 #
 # This demonstration script creates a toplevel window containing
 # several radiobutton widgets.
@@ -16,19 +14,17 @@ end
 
 # demo toplevel widget
 $radio2_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 2")
-  iconname("radio2")
+  title("Radiobutton Demonstration")
+  iconname("radio")
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
-
 # label 
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($radio2_demo) {
   font $font
   wraplength '5i'
   justify 'left'
-  text "²¼¤Ë¤Ï3¤Ä¤Î¥é¥¸¥ª¥Ü¥¿¥ó¥°¥ë¡¼¥×¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥Ü¥¿¥ó¤À¤±¤¬¤½¤Î¥°¥ë¡¼¥×¤ÎÃæ¤ÇÁªÂò¤µ¤ì¤Þ¤¹¡£³Æ¥°¥ë¡¼¥×¤ËÂФ·¤Æ¤½¤Î¥°¥ë¡¼¥×¤ÎÃæ¤Î¤É¤Î¥Ü¥¿¥ó¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤¹ÊÑ¿ô¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹¡£¸½ºß¤ÎÊÑ¿ô¤ÎÃͤò¸«¤ë¤Ë¤Ï¡ÖÊÑ¿ô»²¾È¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£"
+  text "²¼¤Ë¤Ï2¤Ä¤Î¥é¥¸¥ª¥Ü¥¿¥ó¥°¥ë¡¼¥×¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥Ü¥¿¥ó¤À¤±¤¬¤½¤Î¥°¥ë¡¼¥×¤ÎÃæ¤ÇÁªÂò¤µ¤ì¤Þ¤¹¡£³Æ¥°¥ë¡¼¥×¤ËÂФ·¤Æ¤½¤Î¥°¥ë¡¼¥×¤ÎÃæ¤Î¤É¤Î¥Ü¥¿¥ó¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤¹ÊÑ¿ô¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹¡£¸½ºß¤ÎÊÑ¿ô¤ÎÃͤò¸«¤ë¤Ë¤Ï¡ÖÊÑ¿ô»²¾È¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£"
 }
 msg.pack('side'=>'top')
 
@@ -38,10 +34,9 @@ color = TkVariable.new
 align = TkVariable.new
 
 # frame 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($radio2_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $radio2_demo
       $radio2_demo = nil
@@ -52,25 +47,25 @@ TkFrame.new(base_frame) {|frame|
 
   TkButton.new(frame) {
     text '¥³¡¼¥É»²¾È'
-    command proc{showCode 'radio2'}
+    command proc{showCode 'radio'}
   }.pack('side'=>'left', 'expand'=>'yes')
 
   TkButton.new(frame) {
     text 'ÊÑ¿ô»²¾È'
     command proc{
-      showVars(base_frame, 
-               ['size', size], ['color', color], ['compound', align])
+      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(base_frame, 'text'=>'ʸ»ú¥µ¥¤¥º', 
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'¿§', 
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'¥Ó¥Ã¥È¥Þ¥Ã¥×ÇÛÃÖ', 
-                           'pady'=>2, 'padx'=>2)
+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')
@@ -95,16 +90,15 @@ f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
   }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
 }
 
-# label = TkLabel.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead', 
-label = Tk::Label.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead', 
-                    'compound'=>'left')
+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)})
+		    'value'=>lower, 'indicatoron'=>0, 'width'=>7, 
+		    'command'=>proc{label.compound(align.value)})
 }
 
 Tk.grid('x', abtn[0])
diff --git a/ext/tk/sample/demos-jp/radio3.rb b/ext/tk/sample/demos-jp/radio3.rb
deleted file mode 100644
index 4bbc1b31f5..0000000000
--- a/ext/tk/sample/demos-jp/radio3.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# 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)
-}
-
-base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
-
-# label 
-msg = TkLabel.new(base_frame) {
-  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(base_frame) {|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(base_frame, ['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(base_frame, 'text'=>'ʸ»ú¥µ¥¤¥º', 
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'¿§', 
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, '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(base_frame, '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', 
-label = Tk::Label.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/ext/tk/sample/demos-jp/rolodex-j b/ext/tk/sample/demos-jp/rolodex-j
index 6c3ea7a484..1c482aafb2 100644
--- a/ext/tk/sample/demos-jp/rolodex-j
+++ b/ext/tk/sample/demos-jp/rolodex-j
@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
 #
 # rolodex --
 # ¤³¤Î¥¹¥¯¥ê¥×¥È¤Ï Tom LaStrange ¤Î rolodex ¤Î°ìÉô¤Ç¤¹¡£
 # 
 # Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "04/04/09 00:32:12 nagai"
+# Time-stamp: "03/08/02 14:01:54 nagai"
 #
 
 require "tk"
diff --git a/ext/tk/sample/demos-jp/ruler.rb b/ext/tk/sample/demos-jp/ruler.rb
index d6bc9e76d1..d1a7818be4 100644
--- a/ext/tk/sample/demos-jp/ruler.rb
+++ b/ext/tk/sample/demos-jp/ruler.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # ruler widget demo (called by 'widget')
 #
@@ -8,8 +7,8 @@
 # represent a tab stop.
 #
 # Arguments:
-# c -           The canvas window.
-# x, y -        Coordinates at which to create the tab stop.
+# c -		The canvas window.
+# x, y -	Coordinates at which to create the tab stop.
 
 def rulerMkTab(c,x,y)
   v = $demo_rulerInfo
@@ -29,19 +28,16 @@ $ruler_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
-            'text'=>"¤³¤Î¥­¥ã¥ó¥Ð¥¹widget¤Ï¥ë¡¼¥é¡¼¤ÎÌÏ·¿¤Ç¤¹¡£¥ë¡¼¥é¡¼¤Î±¦¤Ë¤¢¤ë¤Î¤Ï¥¿¥Ö¥¹¥È¥Ã¥×¤Î°æ¸Í¤Ç¡¢¤³¤³¤«¤é°ú¤ÃÄ¥¤Ã¤Æ¤¯¤ë¤³¤È¤Ë¤è¤Ã¤Æ¥¿¥Ö¥¹¥È¥Ã¥×¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢¤¹¤Ç¤Ë¤¢¤ë¥¿¥Ö¥¹¥È¥Ã¥×¤òÆ°¤«¤¹¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¥¿¥Ö¥¹¥È¥Ã¥×¤ò¾åÊý¤Þ¤¿¤Ï²¼Êý¤Ë¤«¤¹¤ì¤Æɽ¼¨¤µ¤ì¤ë¤Þ¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢¥Þ¥¦¥¹¥Ü¥¿¥ó¤òÎ¥¤·¤¿»þ¤Ë¤½¤Î¥¿¥Ö¥¹¥È¥Ã¥×¤Ï¾Ã¤¨¤Þ¤¹¡£"){
+TkLabel.new($ruler_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+	    'text'=>"¤³¤Î¥­¥ã¥ó¥Ð¥¹widget¤Ï¥ë¡¼¥é¡¼¤ÎÌÏ·¿¤Ç¤¹¡£¥ë¡¼¥é¡¼¤Î±¦¤Ë¤¢¤ë¤Î¤Ï¥¿¥Ö¥¹¥È¥Ã¥×¤Î°æ¸Í¤Ç¡¢¤³¤³¤«¤é°ú¤ÃÄ¥¤Ã¤Æ¤¯¤ë¤³¤È¤Ë¤è¤Ã¤Æ¥¿¥Ö¥¹¥È¥Ã¥×¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢¤¹¤Ç¤Ë¤¢¤ë¥¿¥Ö¥¹¥È¥Ã¥×¤òÆ°¤«¤¹¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¥¿¥Ö¥¹¥È¥Ã¥×¤ò¾åÊý¤Þ¤¿¤Ï²¼Êý¤Ë¤«¤¹¤ì¤Æɽ¼¨¤µ¤ì¤ë¤Þ¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢¥Þ¥¦¥¹¥Ü¥¿¥ó¤òÎ¥¤·¤¿»þ¤Ë¤½¤Î¥¿¥Ö¥¹¥È¥Ã¥×¤Ï¾Ã¤¨¤Þ¤¹¡£"){
   pack('side'=>'top')
 }
 
 # frame À¸À®
-$ruler_buttons = TkFrame.new(base_frame) {|frame|
+$ruler_buttons = TkFrame.new($ruler_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $ruler_demo
       $ruler_demo = nil
@@ -57,14 +53,14 @@ $ruler_buttons = TkFrame.new(base_frame) {|frame|
 $ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # canvas ÀßÄê
-$ruler_canvas = TkCanvas.new(base_frame, 'width'=>'14.8c', 'height'=>'2.5c')
+$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
+			       :top, :bottom, :size, :normalStyle, 
+			       :activeStyle, :deleteStyle).new
 end
 $demo_rulerInfo.grid = '.25c'
 $demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
@@ -76,17 +72,15 @@ $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)}
+    'stipple'=>'@'+[$demo_dir, 'images', 'gray25.bmp'].join(File::Separator)}
 else
   $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
   $demo_rulerInfo.deleteStyle = {'fill'=>'black', 
-    'stipple'=>'@'+[$demo_dir, '..', 
-                     'images', 'gray25.xbm'].join(File::Separator)}
+    'stipple'=>'@'+[$demo_dir, 'images', 'gray25.bmp'].join(File::Separator)}
 end
 
 TkcLine.new($ruler_canvas, 
-            '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
+	    '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)
@@ -99,22 +93,22 @@ TkcLine.new($ruler_canvas,
 $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]) )
+		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') ) )
+		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')
+		       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')
+		   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
 $ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
 
 # rulerNewTab --
@@ -122,8 +116,8 @@ $ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
 # 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.
+# c -		The canvas window.
+# x, y -	The coordinates of the tab stop.
 
 def rulerNewTab(c,x,y)
   v = $demo_rulerInfo
@@ -140,9 +134,9 @@ end
 # 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).
+# 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
@@ -159,8 +153,8 @@ end
 # it is about to be dragged out of the ruler.
 #
 # Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
+# c -		The canvas widget.
+# x, y -	The coordinates of the mouse.
 
 def rulerMoveTab(c,x,y)
   v = $demo_rulerInfo
@@ -187,8 +181,8 @@ end
 # it was dragged out of the ruler.
 #
 # Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
+# c -		The canvas widget.
+# x, y -	The coordinates of the mouse.
 
 def rulerReleaseTab(c)
   v = $demo_rulerInfo
diff --git a/ext/tk/sample/demos-jp/sayings.rb b/ext/tk/sample/demos-jp/sayings.rb
index aa24b3a2ad..f627396e0f 100644
--- a/ext/tk/sample/demos-jp/sayings.rb
+++ b/ext/tk/sample/demos-jp/sayings.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # listbox widget demo 'sayings' (called by 'widget')
 #
@@ -16,10 +15,8 @@ $sayings_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($sayings_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($sayings_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($sayings_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $sayings_demo
       $sayings_demo = nil
@@ -48,7 +44,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame À¸À®
 sayings_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
+TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
   sv = TkScrollbar.new(w)
   sh = TkScrollbar.new(w, 'orient'=>'horizontal')
   sayings_lbox = TkListbox.new(w) {
@@ -68,11 +64,11 @@ TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
 
   else
     sayings_lbox.grid('row'=>0, 'column'=>0, 
-                      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+		      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     sv.grid('row'=>0, 'column'=>1, 
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	    'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     sh.grid('row'=>1, 'column'=>0, 
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+	    'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
     TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
     TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
   end
diff --git a/ext/tk/sample/demos-jp/search.rb b/ext/tk/sample/demos-jp/search.rb
index 9838ff5d19..538c607c01 100644
--- a/ext/tk/sample/demos-jp/search.rb
+++ b/ext/tk/sample/demos-jp/search.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # Text Search widget demo (called by 'widget')
 #
@@ -9,9 +8,9 @@
 # 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.
+# 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')
@@ -27,10 +26,10 @@ end
 # 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.
+# 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')
@@ -51,15 +50,15 @@ end
 # 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.
+# 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)
+	      -1, cmd1, cmd2).start(sleep1)
 end
 
 # toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
@@ -75,13 +74,10 @@ $search_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($search_demo).pack(:fill=>:both, :expand=>true)
-
 # frame À¸À®
-$search_buttons = TkFrame.new(base_frame) {|frame|
+$search_buttons = TkFrame.new($search_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $search_demo
       $search_demo = nil
@@ -97,44 +93,44 @@ $search_buttons = TkFrame.new(base_frame) {|frame|
 $search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|f|
+TkFrame.new($search_demo) {|f|
   TkLabel.new(f, 'text'=>'¥Õ¥¡¥¤¥ë̾:', 
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
+	      'width'=>13, 'anchor'=>'w').pack('side'=>'left')
   $search_fileName = TkVariable.new
   TkEntry.new(f, 'width'=>40, 
-              'textvariable'=>$search_fileName) {
+	      'textvariable'=>$search_fileName) {
     pack('side'=>'left')
     bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
-                        $search_string_entry.focus})
+	                $search_string_entry.focus})
     focus
   }
   TkButton.new(f, 'text'=>'Æɤ߹þ¤ß', 
-               'command'=>proc{textLoadFile($search_text, 
-                                            $search_fileName.value)})\
+	       'command'=>proc{textLoadFile($search_text, 
+					    $search_fileName.value)})\
   .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
 }.pack('side'=>'top', 'fill'=>'x')
 
-TkFrame.new(base_frame) {|f|
+TkFrame.new($search_demo) {|f|
   TkLabel.new(f, 'text'=>'¸¡º÷ʸ»úÎó:', 
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
+	      'width'=>13, 'anchor'=>'w').pack('side'=>'left')
   $search_searchString = TkVariable.new
   $search_string_entry = TkEntry.new(f, 'width'=>40, 
-                                     'textvariable'=>$search_searchString) {
+				     'textvariable'=>$search_searchString) {
     pack('side'=>'left')
     bind('Return', proc{textSearch($search_text, $search_searchString.value, 
-                                   $search_Tag)})
+				   $search_Tag)})
   }
   TkButton.new(f, 'text'=>'ȿž', 
-               'command'=>proc{textSearch($search_text, 
-                                          $search_searchString.value, 
-                                          $search_Tag)}) {
+	       '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(base_frame, 'setgrid'=>true) {|t|
+$search_text = TkText.new($search_demo, 'setgrid'=>true) {|t|
   $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
+  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')
   }
@@ -145,40 +141,47 @@ $search_text = TkText.new(base_frame, 'setgrid'=>true) {|t|
 
 if TkWinfo.depth($search_demo) > 1
   textToggle(proc{
-               $search_Tag.configure('background'=>'#ce5555', 
-                                     'foreground'=>'white')
-             },
-             800, 
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
+	       begin
+		 $search_Tag.configure('background'=>'#ce5555', 
+				       'foreground'=>'white')
+	       rescue
+	       end
+	     },
+	     800, 
+	     proc{
+	       begin
+		 $search_Tag.configure('background'=>'', 'foreground'=>'')
+	       rescue
+	       end
+	     },
+	     200 )
 else
   textToggle(proc{
-               $search_Tag.configure('background'=>'black', 
-                                     'foreground'=>'white')
-             },
-             800, 
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
+	       begin
+		 $search_Tag.configure('background'=>'black', 
+				       'foreground'=>'white')
+	       rescue
+	       end
+	     },
+	     800, 
+	     proc{
+	       begin
+		 $search_Tag.configure('background'=>'', 'foreground'=>'')
+	       rescue
+	       end
+	     },
+	     200 )
 end
-$search_text.insert('1.0', "\
-¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï¸¡º÷µ¡¹½¤ò¼Â¸½¤¹¤ë¤Î¤Ë¥Æ¥­¥¹¥È widget ¤Î¥¿¥°µ¡Ç½¤¬¤É¤Î \
-¤è¤¦¤Ë»È¤ï¤ì¤ë¤Î¤«¤ò¥Ç¥â¤¹¤ë¤â¤Î¤Ç¤¹¡£¤Þ¤º¾å¤Î¥¨¥ó¥È¥ê¤Ë¥Õ¥¡¥¤¥ë̾¤òÆþ \
-¤ì¡¢<¥ê¥¿¡¼¥ó> ¤ò²¡¤¹¤«¡Ö¥í¡¼¥É¡×¥Ü¥¿¥ó¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£¼¡¤Ë¤½¤Î²¼¤Î \
-¥¨¥ó¥È¥ê¤Ëʸ»úÎó¤òÆþÎϤ·¡¢<¥ê¥¿¡¼¥ó> ¤ò²¡¤¹¤«¡Öȿž¡×¥Ü¥¿¥ó¤ò²¡¤·¤Æ¤¯ \
-¤À¤µ¤¤¡£¤¹¤ë¤È¥Õ¥¡¥¤¥ëÃæ¤Î¡¢¸¡º÷ʸ»úÎó¤È°ìÃפ¹¤ëÉôʬ¤ËÁ´¤Æ \"search_Tag\" \
-¤È¤¤¤¦¥¿¥°¤¬¤Ä¤±¤é¤ì¡¢¥¿¥°¤Îɽ¼¨Â°À­¤È¤·¤Æ¤½¤Îʸ»úÎó¤¬ÅÀÌǤ¹¤ë¤è¤¦¤Ë \
-ÀßÄꤵ¤ì¤Þ¤¹¡£\n")
-$search_text.insert('end', "\
-¥Õ¥¡¥¤¥ëÆɤ߹þ¤ß¤Î¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ï \"#{Dir.pwd}\" ¤Ç¤¹¡£\
-")
+$search_text.insert('1.0', '\
+¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï¸¡º÷µ¡¹½¤ò¼Â¸½¤¹¤ë¤Î¤Ë¥Æ¥­¥¹¥È widget ¤Î¥¿¥°µ¡Ç½¤¬¤É¤Î
+¤è¤¦¤Ë»È¤ï¤ì¤ë¤Î¤«¤ò¥Ç¥â¤¹¤ë¤â¤Î¤Ç¤¹¡£¤Þ¤º¾å¤Î¥¨¥ó¥È¥ê¤Ë¥Õ¥¡¥¤¥ë̾¤òÆþ
+¤ì¡¢<¥ê¥¿¡¼¥ó> ¤ò²¡¤¹¤«¡Ö¥í¡¼¥É¡×¥Ü¥¿¥ó¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£¼¡¤Ë¤½¤Î²¼¤Î
+¥¨¥ó¥È¥ê¤Ëʸ»úÎó¤òÆþÎϤ·¡¢<¥ê¥¿¡¼¥ó> ¤ò²¡¤¹¤«¡Öȿž¡×¥Ü¥¿¥ó¤ò²¡¤·¤Æ¤¯
+¤À¤µ¤¤¡£¤¹¤ë¤È¥Õ¥¡¥¤¥ëÃæ¤Î¡¢¸¡º÷ʸ»úÎó¤È°ìÃפ¹¤ëÉôʬ¤ËÁ´¤Æ "search_Tag"
+¤È¤¤¤¦¥¿¥°¤¬¤Ä¤±¤é¤ì¡¢¥¿¥°¤Îɽ¼¨Â°À­¤È¤·¤Æ¤½¤Îʸ»úÎó¤¬ÅÀÌǤ¹¤ë¤è¤¦¤Ë
+ÀßÄꤵ¤ì¤Þ¤¹¡£')
 $search_text.set_insert '0.0'
 
 $search_fileName.value = ''
 $search_searchString.value = ''
 
-$search_text.width = 60
-$search_text.height = 20
diff --git a/ext/tk/sample/demos-jp/spin.rb b/ext/tk/sample/demos-jp/spin.rb
index 8d4e33cda0..4f6edc13c0 100644
--- a/ext/tk/sample/demos-jp/spin.rb
+++ b/ext/tk/sample/demos-jp/spin.rb
@@ -1,5 +1,3 @@
-# -*- coding: euc-jp -*-
-#
 # spin.rb --
 #
 # This demonstration script creates several spinbox widgets.
@@ -17,12 +15,10 @@ $spin_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'5i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
-²¼¤Ë¤Ï£³¼ïÎà¤Î¥¹¥Ô¥ó¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+TkLabel.new($spin_demo, 
+	    :font=>$font, :wraplength=>'5i', :justify=>:left, 
+	    :text=><<EOL).pack(:side=>:top)
+²¼¤Ë¤Ï£³¼ïÎà¤Î¥¹¥Ô¥ó¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\
 ¤½¤ì¤¾¤ì¡¢¥Þ¥¦¥¹¤ÇÁªÂò¤·¤Æʸ»ú¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 ÊÔ½¸Áàºî¤È¤·¤Æ¤Ï¡¢Emacs ·Á¼°¤Î¿¤¯¤Ë²Ã¤¨¤Æ¡¢°ìÈÌŪ¤Ê
 Motif ·Á¼°¤Î¥­¡¼Áàºî¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
@@ -42,17 +38,17 @@ Backspace ¤È Control-h ¤È¤ÏÆþÎÏ¥«¡¼¥½¥ë¤Îº¸Â¦¤Îʸ»ú¤ò
 ¤òÁȤ߹ç¤ï¤»¤Æ»î¤¹¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 EOL
 
-TkFrame.new(base_frame){|f|
+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{
+		 $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)
+		 showCode 'spin'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
 australianCities = [
@@ -61,11 +57,11 @@ australianCities = [
 ]
 
 [
-  TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key, 
-                :validatecommand=>[
-                  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-                ]), 
-  TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5, 
-                :format=>'%05.2f', :width=>10), 
-  TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
+  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/ext/tk/sample/demos-jp/states.rb b/ext/tk/sample/demos-jp/states.rb
index 5e242b7c38..cf8a6768b6 100644
--- a/ext/tk/sample/demos-jp/states.rb
+++ b/ext/tk/sample/demos-jp/states.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # listbox widget demo 'states' (called by 'widget')
 #
@@ -16,10 +15,8 @@ $states_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($states_demo).pack(:fill=>:both, :expand=>true)
-
 # label À¸À®
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($states_demo) {
   font $font
   wraplength '4i'
   justify 'left'
@@ -28,10 +25,9 @@ msg = TkLabel.new(base_frame) {
 msg.pack('side'=>'top')
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($states_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $states_demo
       $states_demo = nil
@@ -48,7 +44,7 @@ TkFrame.new(base_frame) {|frame|
 
 # frame À¸À®
 states_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
+TkFrame.new($states_demo, 'borderwidth'=>'.5c') {|w|
   s = TkScrollbar.new(w)
   states_lbox = TkListbox.new(w) {
     setgrid 1
diff --git a/ext/tk/sample/demos-jp/style.rb b/ext/tk/sample/demos-jp/style.rb
index 66b6de0251..d58c6115ae 100644
--- a/ext/tk/sample/demos-jp/style.rb
+++ b/ext/tk/sample/demos-jp/style.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # text (display styles) widget demo (called by 'widget')
 #
@@ -9,7 +8,6 @@ if defined?($style_demo) && $style_demo
   $style_demo = nil
 end
 
-
 # demo ÍѤΠtoplevel widget ¤òÀ¸À®
 $style_demo = TkToplevel.new {|w|
   title("Text Demonstration - Display Styles")
@@ -17,13 +15,10 @@ $style_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($style_demo).pack(:fill=>:both, :expand=>true)
-
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($style_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $style_demo
       $style_demo = nil
@@ -37,16 +32,14 @@ TkFrame.new(base_frame) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-
 # text À¸À®
-txt = TkText.new(base_frame){|t|
+TkText.new($style_demo){|t|
   # À¸À®
   setgrid 'true'
-  #width  70
-  #height 32
+  width  70
+  height 32
   wrap 'word'
-  font $font
-  TkScrollbar.new(base_frame) {|s|
+  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}
@@ -54,20 +47,11 @@ txt = TkText.new(base_frame){|t|
   pack('expand'=>'yes', 'fill'=>'both')
 
   # ¥Æ¥­¥¹¥È¥¿¥°ÀßÄê (¥Õ¥©¥ó¥È´ØÏ¢)
-  family = 'Courier'
-
-  if $tk_version =~ /^4.*/
-    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_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-*', 'kanjifont'=>$kanji_font)
     style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-  else
-    style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic])
-    style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold])
-    style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold])
-    style_tag_small = TkTextTag.new(t, 'font'=>'Times 8 bold')
-  end
 ###
 #  case($tk_version)
 #  when /^4.*/
@@ -77,13 +61,13 @@ txt = TkText.new(base_frame){|t|
 #    unless $style_demo_do_first
 #      $style_demo_do_first = true
 #      Tk.tk_call('font', 'create', '@bigascii', 
-#                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
+#		 '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
 #      Tk.tk_call('font', 'create', '@smallascii', 
-#                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
+#		 '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
 #      Tk.tk_call('font', 'create', '@cBigFont', 
-#                '-compound', '@bigascii @msg_knj')
+#		 '-compound', '@bigascii @msg_knj')
 #      Tk.tk_call('font', 'create', '@cSmallFont', 
-#                '-compound', '@smallascii @kanji')
+#		 '-compound', '@smallascii @kanji')
 #    end
 #    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
 #    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
@@ -97,42 +81,37 @@ txt = TkText.new(base_frame){|t|
     style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
   else
     style_tag_color1 = TkTextTag.new(t, 'background'=>'black', 
-                                     'foreground'=>'white')
+				     'foreground'=>'white')
     style_tag_color2 = TkTextTag.new(t, 'background'=>'black', 
-                                     'foreground'=>'white')
+				     'foreground'=>'white')
     style_tag_raised = TkTextTag.new(t, 'background'=>'white', 
-                                     'relief'=>'raised', 'borderwidth'=>1)
+				     'relief'=>'raised', 'borderwidth'=>1)
     style_tag_sunken = TkTextTag.new(t, 'background'=>'white', 
-                                     'relief'=>'sunken', 'borderwidth'=>1)
+				     'relief'=>'sunken', 'borderwidth'=>1)
   end
 
   # ¥Æ¥­¥¹¥È¥¿¥°ÀßÄê (¤½¤Î¾)
   if $tk_version =~ /^4\.[01]/
     style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-                                        'borderwidth'=>0, 
-                                        'bgstipple'=>'gray25')
+					'borderwidth'=>0, 
+					'bgstipple'=>'gray25')
   else
     style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-                                        'borderwidth'=>0, 
-                                        'bgstipple'=>'gray12')
+					'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')
-  if $tk_version =~ /^4.*/
-    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-*-*-*-*-*-*')
-  else
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>[family, 10])
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>[family, 10])
-  end
+  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')
+				    'rmargin'=>'10m')
   style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
-                                    'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
+				    'lmargin1'=>'12m', 'lmargin2'=>'6m',
+				    'rmargin'=>'10m')
 
   # ¥Æ¥­¥¹¥ÈÁÞÆþ
   insert('end', '¤³¤Î¤è¤¦¤Ë¥Æ¥­¥¹¥È widget ¤Ï¾ðÊó¤òÍÍ¡¹¤Ê¥¹¥¿¥¤¥ë¤Çɽ¼¨¤¹¤ë¤³¤È
@@ -218,9 +197,9 @@ X')
   insert('end', '¥Æ¥­¥¹¥È¤Îº¸Â¦¤Ë;ʬ¤Ê¶õÇò¤òÃÖ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹:
 ')
   insert('end', '¤³¤ÎÃÊÍî¤Ï¥Þ¡¼¥¸¥ó¤Î»ÈÍÑÎã¤Ç¤¹¡£¥¹¥¯¥ê¡¼¥ó', 
-         style_tag_margins)
+	 style_tag_margins)
   insert('end', '¾å¤ÇÀÞ¤êÊÖ¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Æ¤¤¤ë1¹Ô¤Î¥Æ¥­¥¹¥È¤Ç¤¹¡£', 
-         style_tag_margins)
+	 style_tag_margins)
   insert('end', 'º¸Â¦¤Ë¤Ï2¼ïÎà¤Î¥Þ¡¼¥¸¥ó¤ò»ý¤Á¤Þ¤¹¡£', style_tag_margins)
   insert('end', '1¹ÔÌܤËÂФ¹¤ë¤â¤Î¤È¡¢', style_tag_margins)
   insert('end', '2¹ÔÌܰʹߤÎϢ³¤·¤¿¥Þ¡¼¥¸¥ó', style_tag_margins)
@@ -242,9 +221,9 @@ spacing3')
 ¤¯¤«¤ò¼¨¤·¤Þ¤¹¡£
 ')
   insert('end', '¤³¤ì¤é¤Î¥¤¥ó¥Ç¥ó¥È¤µ¤ì¤¿ÃÊÍî¤Ï¤É¤Î¤è¤¦¤Ë', 
-         style_tag_spacing)
+	 style_tag_spacing)
   insert('end', '¥¹¥Ú¡¼¥·¥ó¥°¤¬¤¬¹Ô¤ï¤ì¤ë¤Î¤«¤ò¼¨¤·¤Þ¤¹¡£', 
-         style_tag_spacing)
+	 style_tag_spacing)
   insert('end', '³ÆÃÊÍî¤Ï¼ÂºÝ¤Ï¥Æ¥­¥¹¥Èwidget', style_tag_spacing)
   insert('end', '¤Î1¹Ô¤Ç¡¢widget¤Ë¤è¤Ã¤ÆÀÞ¤ê¾ö¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
 ', style_tag_spacing)
@@ -254,11 +233,11 @@ spacing3')
   insert('end', '¸ºß¤·¤Æ¤¤¤Þ¤¹¡£', style_tag_spacing)
   insert('end', 'Spacing2¤Ï2point¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£', style_tag_spacing)
   insert('end', '¤³¤ì¤ÇÃÊÍî¤ÎÃæ¤Ë¤Û¤ó¤Î¾¯¤·´Ö³Ö¤¬Â¸ºß¤·¤Æ¤¤¤Þ¤¹¡£', 
-         style_tag_spacing)
+	 style_tag_spacing)
   insert('end', 'Spacing3¤Ï¤³¤ÎÎã¤Ç¤Ï»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
 ', style_tag_spacing)
   insert('end', '´Ö³Ö¤¬¤É¤³¤Ë¤¢¤ë¤«¤ò¸«¤¿¤±¤ì¤Ð¡¢¤³¤ì¤é¤ÎÃÊÍî¤Î', 
-         style_tag_spacing)
+	 style_tag_spacing)
   insert('end', '¤Ê¤«¤Ç¥Æ¥­¥¹¥È¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ÁªÂò¤Î', style_tag_spacing)
   insert('end', 'ȿž¤·¤¿Éôʬ¤Ë¤Ï;ʬ¤Ë¤È¤é¤ì¤¿´Ö³Ö¤¬', style_tag_spacing)
   insert('end', '´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
@@ -266,5 +245,3 @@ spacing3')
 
 }
 
-txt.width 70
-txt.height 32
diff --git a/ext/tk/sample/demos-jp/tcolor b/ext/tk/sample/demos-jp/tcolor
index 17f7e1347e..391ce4c446 100644
--- a/ext/tk/sample/demos-jp/tcolor
+++ b/ext/tk/sample/demos-jp/tcolor
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
 #
 # tcolor --
 # ¤³¤Î¥¹¥¯¥ê¥×¥È¤ÏRGB,HSB,CYM·Á¼°¤ò¥µ¥Ý¡¼¥È¤¹¤ë
@@ -17,16 +16,15 @@ 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("")
+$name = TkVariable.new("")
+# $command = TkVariable.new("print(%%,\"\n\")")
+$command = TkVariable.new("")
 $label1 = TkVariable.new("label1")
 $label2 = TkVariable.new("label2")
 $label3 = TkVariable.new("label3")
@@ -125,14 +123,9 @@ def hsbToRgb(hue,sat,value)
 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)
+  eval(newCmd)
 end
 
 
@@ -141,8 +134,6 @@ def tc_scaleChanged
     return 
   end
 
-  $master = :scale if $master == nil
-
   scale1 = $root.middle.middle.scale1
   scale2 = $root.middle.middle.scale2
   scale3 = $root.middle.middle.scale3
@@ -167,13 +158,11 @@ def tc_scaleChanged
     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
+  Tk.update(TRUE)
 end
 
 
@@ -207,8 +196,6 @@ 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]
@@ -217,27 +204,27 @@ def tc_loadNamedColor(name)
   else
     case name.length
     when 4
-      fmt = /#(.{1})(.{1})(.{1})/
+      format = /#(.{1})(.{1})(.{1})/
       shift = 12
     when 7
-      fmt = /#(.{2})(.{2})(.{2})/
+      format = /#(.{2})(.{2})(.{2})/
       shift = 8
     when 10
-      fmt = /#(.{3})(.{3})(.{3})/
+      format = /#(.{3})(.{3})(.{3})/
       shift = 4
     when 13
-      fmt = /#(.{4})(.{4})(.{4})/
+      format = /#(.{4})(.{4})(.{4})/
       shift = 0
     else
       raise(eException,"syntax error in color name \"#{name}\"")
     end
-    name.scan(fmt){|strlist|
+    name.scan(format){|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 = strlist[0].to_i
+      $green = strlist[1].to_i
+      $blue = strlist[2].to_i
     }
     $red = $red << shift
     $green = $green << shift
@@ -250,8 +237,6 @@ def tc_loadNamedColor(name)
   if $autoUpdate.to_i == 1
     doUpdate
   end
-  Tk.update(true)
-  $master = nil if $master == :name
 end
 
 
diff --git a/ext/tk/sample/demos-jp/text.rb b/ext/tk/sample/demos-jp/text.rb
index 0ae480eb00..179589d820 100644
--- a/ext/tk/sample/demos-jp/text.rb
+++ b/ext/tk/sample/demos-jp/text.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # text (basic facilities) widget demo (called by 'widget')
 #
@@ -16,8 +15,6 @@ $text_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($text_demo).pack(:fill=>:both, :expand=>true)
-
 # version check
 if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
   undo_support = false
@@ -26,10 +23,9 @@ else
 end
 
 # frame À¸À®
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($text_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $text_demo
       $text_demo = nil
@@ -44,13 +40,13 @@ TkFrame.new(base_frame) {|frame|
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # text À¸À®
-TkText.new(base_frame){|t|
+TkText.new($text_demo){|t|
   # À¸À®
   relief 'sunken'
   bd 2
   setgrid 1
   height 30
-  TkScrollbar.new(base_frame) {|s|
+  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}
@@ -95,16 +91,16 @@ TkText.new(base_frame){|t|
 ¥³¥ó¥È¥í¡¼¥ë-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)¤ò¹Ô¤¤¤Þ¤¹¡£"
+	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
 }
 
diff --git a/ext/tk/sample/demos-jp/textpeer.rb b/ext/tk/sample/demos-jp/textpeer.rb
deleted file mode 100644
index 4967a99c92..0000000000
--- a/ext/tk/sample/demos-jp/textpeer.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# text widget peering demo (called by 'widget')
-#
-# based on Tcl/Tk8.5.0 widget demos
-
-if defined?($textpeer_demo) && $textpeer_demo
-  $textpeer_demo.destroy 
-  $textpeer_demo = nil
-end
-
-# demo toplevel widget
-$textpeer_demo = TkToplevel.new {|w|
-  title("Text Wdget Peering Demonstration")
-  iconname("textpeer")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($textpeer_demo).pack(:fill=>:both, :expand=>true)
-
-count = [0]
-
-## Define a widget that we peer from; it won't ever actually be shown though
-first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
-first.insert :end,"¤³¤Î¥Ç¥â¤Ï°ì¤Ä¤ÎÁȤòÀ®¤·¤¿¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ò¼¨¤·¤Þ¤¹¡£"
-first.insert :end,"¤½¤ì¤é¤Î¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ÏÂÐÅù(¥Ô¥¢;peer)¤Î´Ø·¸¤Ë"
-first.insert :end,"¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
-first.insert :end,"¤½¤ì¤é¤Ï¡¢´ðÈפȤʤë¥Ç¡¼¥¿¥â¥Ç¥ë¤Ï¶¦Ä̤Τâ¤Î¤ò»ý¤Á¤Þ¤¹¤¬¡¢"
-first.insert :end,"²èÌÌɽ¼¨°ÌÃÖ¡¢ÊÔ½¸°ÌÃÖ¡¢ÁªÂòÈÏ°Ï(selection)¤Ë¤Ä¤¤¤Æ¤Ï"
-first.insert :end,"ÆÈΩ¤Ë»ý¤Ä¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
-first.insert :end,"³Æ¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ÎÏƤˤ¢¤ë"
-first.insert :end,"¡Ö¥Ô¥¢(peer)¤ÎºîÀ®¡×¥Ü¥¿¥ó¤ò»È¤¨¤Ð¡¢"
-first.insert :end,"¿·¤¿¤Ê¥Ô¥¢¤òÄɲ乤뤳¤È¤¬²Äǽ¤Ç¤¹¡£"
-first.insert :end,"¤Þ¤¿¡Ö¥Ô¥¢(peer)¤Î¾Ãµî¡×¥Ü¥¿¥ó¤ò»È¤¨¤Ð¡¢"
-first.insert :end,"ÆÃÄê¤Î¥Ô¥¢¥¦¥£¥¸¥§¥Ã¥È¤ò¾Ãµî¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£"
-
-Tk.update_idletasks  ## for 'first' widget
-
-## Procedures to make and kill clones; most of this is just so that the demo
-## looks nice...
-def makeClone(count, win, txt)
-  cnt = (count[0] += 1)
-  peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
-  sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
-  peer.yscrollbar sbar
-  b1 = TkButton.new(win, :widgetname=>"clone#{cnt}", 
-                    :text=>'¥Ô¥¢(peer)¤ÎºîÀ®', 
-                    :command=>proc{makeClone(count, win, peer)})
-  b2 = TkButton.new(win, :widgetname=>"kill#{cnt}", 
-                    :text=>'¥Ô¥¢(peer)¤Î¾Ãµî', 
-                    :command=>proc{killClone(win, cnt)})
-  row = cnt * 2
-  TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
-  TkGrid.configure('^',  '^',  b2, :sticky=>'nsew', :row=>(row+=1))
-  TkGrid.configure(b1,  b2, :sticky=>'new')
-  TkGrid.rowconfigure(win,  b2, :weight=>1)
-end
-
-def killClone(win, cnt)
-  Tk.destroy("#{win.path}.text#{cnt}",  "#{win.path}.sb#{cnt}", 
-             "#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
-end
-
-## Now set up the GUI
-makeClone(count, base_frame, first)
-makeClone(count, base_frame, first)
-first.destroy
-
-## See Code / Dismiss buttons
-TkFrame.new(base_frame){|f|
-  TkButton.new(f, :text=>'ÊĤ¸¤ë', :width=>15, :command=>proc{
-                 $textpeer_demo.destroy
-                 $textpeer_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'¥³¡¼¥É»²¾È', :width=>15, :command=>proc{
-                 showCode 'textpeer'
-               }).pack(:side=>:left, :expand=>true)
-
-  TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
-}
-TkGrid.columnconfigure(base_frame, 0, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/toolbar.rb b/ext/tk/sample/demos-jp/toolbar.rb
deleted file mode 100644
index 9cb3834c34..0000000000
--- a/ext/tk/sample/demos-jp/toolbar.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# toolbar.rb --
-#
-# This demonstration script creates a toolbar that can be torn off.
-#
-# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($toolbar_demo) && $toolbar_demo
-  $toolbar_demo.destroy 
-  $toolbar_demo = nil
-end
-
-$toolbar_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("toolbar")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
-
-if Tk.windowingsystem != 'aqua'
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
-¤³¤Î¥Ç¥â¤Ç¤Ï¡¤¥Ä¡¼¥ë¥Ð¡¼¤ò¤É¤Î¤è¤¦¤Ë¤·¤ÆŬÀڤ˥ơ¼¥ÞÂбþ¤µ¤»¤ë¤«¡¤\
-¤Þ¤¿¡¤¤É¤Î¤è¤¦¤Ë¤·¤ÆÀÚ¤êÎ¥¤·²Äǽ¤Ë¤¹¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹\
-¡Ê¤¿¤À¤·¡¤¥Ä¡¼¥ë¥Ð¡¼¤ÎÀÚ¤êÎ¥¤·¤Ë¤ÏTcl/Tk8.5°Ê¾å¤Îµ¡Ç½¤¬É¬ÍפǤ¹¡Ë¡¥\
-¥Ä¡¼¥ë¥Ð¡¼¤Î¥Ü¥¿¥ó¤Ï¡¤'Toolbutton'¥¹¥¿¥¤¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¤ËÌÀ¼¨¤¹¤ë¤³¤È¤Ç¡¤\
-"toolbar style"¥Ü¥¿¥ó¤È¤Ê¤ë¤è¤¦¤Ë°À­ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡¥\
-¥Ä¡¼¥ë¥Ð¡¼¤Îº¸Ã¼¤Ë¤Ï´Êñ¤Ê¥Þ¡¼¥«¡¼¤¬ÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡¥\
-¥Þ¡¼¥«¡¼¾å¤Ë¥Þ¥¦¥¹¥«¡¼¥½¥ë¤¬Íè¤ë¤È°ÜÆ°¥¢¥¤¥³¥ó¤Ë¥«¡¼¥½¥ë¤¬ÊѲ½¤·¤Þ¤¹¡¥\
-¤½¤³¤Ç¥Ä¡¼¥ë¥Ð¡¼¤òÆ°¤«¤¹¤è¤¦¤Ë¥É¥é¥Ã¥°¤¹¤ë¤È¡¤\
-¥Ä¡¼¥ë¥Ð¡¼Á´ÂΤòÀÚ¤êÎ¥¤·¤ÆÆÈΩ¤·¤¿¥È¥Ã¥×¥ì¥Ù¥ë¥¦¥£¥¸¥§¥Ã¥È¤Ë\
-¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥\
-ÀÚ¤êÎ¥¤·¤¿¥Ä¡¼¥ë¥Ð¡¼¤¬ÉÔÍפȤʤä¿»þ¤Ë¤Ï¡¤\
-°ìÈÌŪ¤Ê¥È¥Ã¥×¥ì¥Ù¥ë¥¦¥£¥¸¥§¥Ã¥È¤ÈƱÍͤËñ½ã¤ËÊĤ¸¤ë¤³¤È¤Ç¡¤
-ºÆ¤Ó¸µ¤Î¥¦¥£¥ó¥É¥¦¤ËÄ¥¤êÉÕ¤±¤é¤ì¤ë¤Ç¤·¤ç¤¦¡¥
-EOL
-else
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
-¤³¤Î¥Ç¥â¤Ç¤Ï¡¤¥Ä¡¼¥ë¥Ð¡¼¤ò¤É¤Î¤è¤¦¤Ë¤·¤ÆŬÀڤ˥ơ¼¥ÞÂбþ¤µ¤»¤ë¤«¤ò\
-¼¨¤·¤Æ¤¤¤Þ¤¹¡¥\
-¥Ä¡¼¥ë¥Ð¡¼¤Î¥Ü¥¿¥ó¤Ï¡¤'Toolbutton'¥¹¥¿¥¤¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¤ËÌÀ¼¨¤¹¤ë¤³¤È¤Ç¡¤\
-"toolbar style"¥Ü¥¿¥ó¤È¤Ê¤ë¤è¤¦¤Ë°À­ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡¥
-EOL
-end
-
-## Set up the toolbar hull
-tbar_base = Tk::Frame.new(base_frame,  # Tk ɸ½à¤Î frame ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡¥
-                          :widgetname=>'toolbar') # ¥¦¥£¥ó¥É¥¦¥¿¥¤¥È¥ëʸ»úÎó¤È¤¹¤ë¤¿¤á¤Ë¡¤¥¦¥£¥¸¥§¥Ã¥È̾¤òÌÀ¼¨¤·¤Æ¤¤¤Þ¤¹¡¥
-sep = Ttk::Separator.new(base_frame)
-to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
-if Tk.windowingsystem != 'aqua'
-  to  = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to2 = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to.pack(:fill=>:y, :expand=>true, :padx=>2, :side=>:left)
-  to2.pack(:fill=>:y, :expand=>true, :side=>:left)
-end
-
-contents = Ttk::Frame.new(tbar_base)
-Tk.grid(to_base, contents, :sticky=>'nsew')
-tbar_base.grid_columnconfigure(contents, :weight=>1)
-contents.grid_columnconfigure(1000, :weight=>1)
-
-if Tk.windowingsystem != 'aqua'
-  ## Bindings so that the toolbar can be torn off and reattached
-  to_base.bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to.     bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to2.    bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  def tbar_base.tearoff(w, x, y)
-    on_win = TkWinfo.containing(x, y)
-    return unless (on_win && on_win.path =~ /^#{@path}(\.|$)/)
-    self.grid_remove
-    w.grid_remove
-    self.wm_manage
-    # self.wm_title('Toolbar') # ¤â¤·¥¦¥£¥¸¥§¥Ã¥È̾¤ò¥¦¥£¥ó¥É¥¦¥¿¥¤¥È¥ë¤Ë¤·¤¿¤¯¤Ê¤¤¤Ê¤é¡¤¤³¤³¤ÇÀßÄꤷ¤Æ¤¯¤À¤µ¤¤
-    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(self) }
-  end
-  def tbar_base.untearoff(w)
-    self.wm_forget
-    w.grid
-    self.grid
-  end
-end
-
-## Some content for the rest of the toplevel
-text = TkText.new(base_frame, :width=>40, :height=>10)
-
-## Toolbar contents
-tb_btn = Ttk::Button.new(tbar_base, :text=>'¥Ü¥¿¥ó', :style=>'Toolbutton', 
-                         :command=>proc{
-                           text.insert(:end, "¥Ü¥¿¥ó¤¬²¡¤µ¤ì¤Þ¤·¤¿¡¥\n")
-                         })
-tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'¥Á¥§¥Ã¥¯¥Ü¥¿¥ó', 
-                              :style=>'Toolbutton', 
-                              :variable=>(check = TkVariable.new), 
-                              :command=>proc{
-                                text.insert(:end, "¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¤ÎÃͤÏ#{check.value}¤Ç¤¹¡¥\n")
-                              })
-tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'¥á¥Ë¥å¡¼')
-tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families, 
-                             :state=>:readonly)
-tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
-menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
-menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
-menu.add(:command, :label=>'Example', 
-         :command=>proc{text.insert(:end, "Example\n")})
-tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
-
-## Arrange contents
-Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo, 
-        :in=>contents, :padx=>2, :sticky=>'ns')
-Tk.grid(tbar_base, :sticky=>'ew')
-Tk.grid(sep, :sticky=>'ew')
-Tk.grid(msg, :sticky=>'ew')
-Tk.grid(text, :sticky=>'nsew')
-base_frame.grid_rowconfigure(text, :weight=>1)
-base_frame.grid_columnconfigure(text, :weight=>1)
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'toolbar'}), 
-         Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $toolbar_demo.destroy
-                           $toolbar_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  Tk.grid(frame, :sticky=>'ew')
-}
diff --git a/ext/tk/sample/demos-jp/tree.rb b/ext/tk/sample/demos-jp/tree.rb
deleted file mode 100644
index c3b4191144..0000000000
--- a/ext/tk/sample/demos-jp/tree.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# tree.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget.
-#
-# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($tree_demo) && $tree_demo
-  $tree_demo.destroy 
-  $tree_demo = nil
-end
-
-$tree_demo = TkToplevel.new {|w|
-  title("Directory Browser")
-  iconname("tree")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', 
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6], 
-               :text=><<EOL).pack(:fill=>:x)
-Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
-¤³¤Î¥µ¥ó¥×¥ë¤Ï¡¤¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¤è¤¦¤Ê³¬ÁØŪ¤Ê¥Ç¡¼¥¿½¸¹ç¤ò\
-»²¾È¤Ç¤­¤ë¤è¤¦¤Ë¤·¤¿Ttk::Treeview¥¦¥£¥¸¥§¥Ã¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡¥\
-Ttk::Treeview¥¦¥£¥¸¥§¥Ã¥È¤Ï¡¤ÌÚ¹½Â¤¼«ÂΤÎɽ¼¨¤ò²Äǽ¤Ë¤¹¤ë¤À¤±¤Ç¤Ê¤¯¡¤\
-ÄɲþðÊó(¤³¤Î¥µ¥ó¥×¥ë¤Î¾ì¹ç¤Ï¥Õ¥¡¥¤¥ë¥µ¥¤¥º)¤òɽ¼¨¤¹¤ë¤¿¤á¤Ë\
-Ǥ°Õ¤Î¸Ä¿ô¤ÎÄɲå«¥é¥à¤â°·¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡¥\
-¤Þ¤¿¡¤¥«¥é¥à¤Î¥¿¥¤¥È¥ë´Ö¤Î¶èÀÚ¤êÉôʬ¤ò¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¡¤\
-¥«¥é¥à¤ÎÉý¤òÊѹ¹¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'tree'}), 
-         Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $tree_demo.destroy
-                           $tree_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-## Code to populate the roots of the tree (can be more than one on Windows)
-def populate_roots(tree)
-  TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
-    populate_tree(tree, tree.insert(nil, :end, :text=>dir, 
-                                    :values=>[dir, 'directory']))
-  }
-end
-
-## Code to populate a node of the tree
-def populate_tree(tree, node)
-  return if tree.get(node, :type) != 'directory'
-
-  path = tree.get(node, :fullpath)
-  tree.delete(tree.children(node))
-  Dir.glob("#{path}/*").sort.each{|f|
-    type = File.ftype(f)
-    id = tree.insert(node, :end, 
-                     :text=>File.basename(f), :values=>[f, type]).id
-    if type == 'directory'
-      ## Make it so that this node is openable
-      tree.insert(id, 0, :text=>'dummy')
-      tree.itemconfigure(id, :text=>File.basename(f))
-    elsif type == 'file'
-      size = File.size(f)
-      if size >= 1024*1024*1024
-        size = '%.1f GB' % (size.to_f/1024/1024/1024)
-      elsif size >= 1024*1024
-        size = '%.1f MB' % (size.to_f/1024/1024)
-      elsif size >= 1024
-        size = '%.1f KB' % (size.to_f/1024)
-      else
-        size = '%.1f bytes' % (size.to_f/1024)
-      end
-      tree.set(id, :size, size)
-    end
-  }
-
-  # Stop this code from rerunning on the current node
-  tree.set(node, :type, 'processed_directory')
-end
-
-## Create the tree and set it up
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size), 
-                         :displaycolumns=>['size'])
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-tree.heading_configure('#0', :text=>'Directory Structure')
-tree.heading_configure('size', :text=>'File Size')
-tree.column_configure('size', :stretch=>0, :width=>70)
-populate_roots(tree)
-tree.bind('<TreeviewOpen>', '%W'){|w| populate_tree(w, w.focus_item)}
-
-## Arrange the tree and its scrollbars in the toplevel
-container = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-container.lower
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/ttkbut.rb b/ext/tk/sample/demos-jp/ttkbut.rb
deleted file mode 100644
index 4d577120bb..0000000000
--- a/ext/tk/sample/demos-jp/ttkbut.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttkbut.rb
-#
-# This demonstration script creates a toplevel window containing several
-# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
-# radiobuttons.
-#
-# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkbut_demo) && $ttkbut_demo
-  $ttkbut_demo.destroy 
-  $ttkbut_demo = nil
-end
-
-$ttkbut_demo = TkToplevel.new {|w|
-  title("Simple Ttk Widgets")
-  iconname("ttkbut")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left, 
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
-º£¡¤¤¢¤Ê¤¿¤¬Ìܤˤ·¤Æ¤¤¤ë¤Î¤ÏTtk¤Î¥Æ¡¼¥Þ²½¥é¥Ù¥ë¤Ç¡¤\
-²¼¤Ë¤ÏTtk¤Î¥é¥Ù¥ë¥Õ¥ì¡¼¥à¤ÎÃæ¤Ë»°¤Ä¤Î¥°¥ë¡¼¥×¤ÎTtk¥¦¥£¥¸¥§¥Ã¥È¤¬\
-ɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-ºÇ½é¤Î¥°¥ë¡¼¥×¤ÏÁ´¤Æ¥Ü¥¿¥ó¤Ç¤¢¤ê¡¤\
-¤½¤ì¤¾¤ì¥¯¥ê¥Ã¥¯¤¹¤ì¤Ð¸½ºß¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥Æ¡¼¥Þ¤¬ÀßÄꤵ¤ì¤Þ¤¹¡¥
-£²ÈÖÌܤΥ°¥ë¡¼¥×¤Ï»°¤Ä¤Î¥Á¥§¥Ã¥¯¥Ü¥¿¥ó½¸¹ç¤Ç¤¹¡¥\
-³Æ½¸¹ç¤Î´Ö¤Ë¤Ï¡¤¥»¥Ñ¥ì¡¼¥¿¥¦¥£¥¸¥§¥Ã¥È¤¬ÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡¥\
-¤Ê¤ª¡ÖÍ­¸ú²½¡×¥Ü¥¿¥ó¤Ï¡¤¤³¤Î¥È¥Ã¥×¥ì¥Ù¥ë¥¦¥£¥¸¥§¥Ã¥ÈÆâ¤Î\
-¾¤Î¤¹¤Ù¤Æ¤Î¥Æ¡¼¥Þ²½¥¦¥£¥¸¥§¥Ã¥È¤Î¾õÂÖ(state)¤¬"disabled"¤«¤É¤¦¤«¤ò\
-¥³¥ó¥È¥í¡¼¥ë¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥
-£³ÈÖÌܤΥ°¥ë¡¼¥×¤Ï´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥é¥¸¥ª¥Ü¥¿¥ó½¸¹ç¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
-EOL
-
-## Add buttons for setting the theme
-buttons = Ttk::Labelframe.new(base_frame, :text=>'¥Ü¥¿¥ó')
-# Ttk::Style.theme_names.each{|theme|
-#   Ttk::Button.new(buttons, :text=>theme, 
-#                   :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
-# }
-Ttk.themes.each{|theme|
-  Ttk::Button.new(buttons, :text=>theme, 
-                  :command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
-}
-
-## Helper procedure for the top checkbutton
-def setState(root, value, *excepts)
-  return if excepts.member?(root)
-
-  ## Non-Ttk widgets (e.g. the toplevel) will fail, so make it silent
-  begin
-    root.state = value
-  rescue
-  end
-
-  ## Recursively invoke on all children of this root that are in the same
-  ## toplevel widget
-  root.winfo_children.each{|w|
-    setState(w, value, *excepts) if w.winfo_toplevel == root.winfo_toplevel
-  }
-end
-
-## Set up the checkbutton group
-checks = Ttk::Labelframe.new(base_frame, :text=>'¥Á¥§¥Ã¥¯¥Ü¥¿¥ó')
-enabled = TkVariable.new(true)
-e = Ttk::Checkbutton.new(checks, :text=>'Í­¸ú²½', :variable=>enabled, 
-                         :command=>proc{
-                           setState($ttkbut_demo, 
-                                    ((enabled.bool)? "!disabled" : "disabled"),
-                                    e)
-                         })
-
-## See ttk_widget(n) for other possible state flags
-sep1 = Ttk::Separator.new(checks)
-sep2 = Ttk::Separator.new(checks)
-
-cheese  = TkVariable.new
-tomato  = TkVariable.new
-basil   = TkVariable.new
-oregano = TkVariable.new
-
-c1 = Ttk::Checkbutton.new(checks, :text=>'¥Á¡¼¥º',   :variable=>cheese)
-c2 = Ttk::Checkbutton.new(checks, :text=>'¥È¥Þ¥È',   :variable=>tomato)
-c3 = Ttk::Checkbutton.new(checks, :text=>'¥Ð¥¸¥ë',   :variable=>basil)
-c4 = Ttk::Checkbutton.new(checks, :text=>'¥ª¥ì¥¬¥Î', :variable=>oregano)
-
-Tk.pack(e, sep1, c1, c2, sep2, c3, c4, :fill=>:x, :pady=>2)
-
-## Set up the radiobutton group
-radios = Ttk::Labelframe.new(base_frame, :text=>'¥é¥¸¥ª¥Ü¥¿¥ó')
-
-happyness = TkVariable.new
-
-r1 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Great', :value=>'great')
-r2 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Good', :value=>'good')
-r3 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Ok', :value=>'ok')
-r4 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Poor', :value=>'poor')
-r5 = Ttk::Radiobutton.new(radios, :variable=>happyness, 
-                          :text=>'Awful', :value=>'awful')
-
-Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'ÊÑ¿ô»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{
-                           showVars(base_frame, ['Í­¸ú²½', enabled], 
-                                    ['¥Á¡¼¥º', cheese], ['¥È¥Þ¥È', tomato], 
-                                    ['¥Ð¥¸¥ë', basil], ['¥ª¥ì¥¬¥Î', oregano], 
-                                    ['¹¬Ê¡ÅÙ', happyness])
-                         }), 
-         Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttkbut'}), 
-         Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           tmppath = $ttkbut_demo
-                           $ttkbut_demo = nil
-                           $showVarsWin[tmppath.path] = nil
-                           tmppath.destroy
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x, :expand=>true)
-}
-
-## Arrange things neatly
-f = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-Tk.grid(buttons, checks, radios, :in=>f, :sticky=>'nwe', :pady=>2, :padx=>3)
-f.grid_columnconfigure([0, 1, 2], :weight=>1, :uniform=>:yes)
diff --git a/ext/tk/sample/demos-jp/ttkmenu.rb b/ext/tk/sample/demos-jp/ttkmenu.rb
deleted file mode 100644
index d349b42d11..0000000000
--- a/ext/tk/sample/demos-jp/ttkmenu.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttkmenu.rb --
-#
-# This demonstration script creates a toplevel window containing several Ttk
-# menubutton widgets.
-#
-# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkmenu_demo) && $ttkmenu_demo
-  $ttkmenu_demo.destroy 
-  $ttkmenu_demo = nil
-end
-
-$ttkmenu_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("ttkmenu")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left, 
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
-¤³¤ì¤Ë¤è¤ê¥Æ¡¼¥Þ¤ËÂбþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¥¦¥£¥¸¥§¥Ã¥È¤Î¤Ò¤È¤Ä¤Ë\
-¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤¬¤¢¤ê¤Þ¤¹¡¥\
-°Ê²¼¤Ç¤Ï¡¤¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤¬¤¤¤¯¤Ä¤«É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥\
-¤½¤ì¤é¤ò»È¤Ã¤Æ¡¤¸½ºß»ÈÍÑÃæ¤Î¥Æ¡¼¥Þ¤òÊѹ¹¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥\
-¥Æ¡¼¥Þ¤ÎÁªÂò¤¬¥á¥Ë¥å¡¼¥Ü¥¿¥ó¼«¿È¤Î¸«³Ý¤±¤òÊѲ½¤µ¤»¤ëÍͻҤ䡤\
-Ãæ±û¤Î¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤À¤±¤¬°Û¤Ê¤ë¥¹¥¿¥¤¥ë\
-(¥Ä¡¼¥ë¥Ð¡¼¤Ç¤Î°ìÈÌŪ¤Êɽ¼¨¤ËŬ¤·¤¿¤â¤Î)¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ëÍͻҤË\
-ÃíÌܤ·¤Æ¤¯¤À¤µ¤¤¡¥\
-¤Ê¤ª¡¤¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤Ë¤Ä¤¤¤Æ¤Ï¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥¦¥£¥¸¥§¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¤¬¡¤\
-¥á¥Ë¥å¡¼¤Ë¤Ä¤¤¤Æ¤Ï¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥¦¥£¥¸¥§¥Ã¥È¤Ï´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡¥\
-¤½¤ÎÍýͳ¤Ï¡¤É¸½à¤ÎTk¤Î¥á¥Ë¥å¡¼¥¦¥£¥¸¥§¥Ã¥È¤¬\
-¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç½½Ê¬¤ËÎɹ¥¤Ê¸«³Ý¤±¤ÈÁàºîÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡¤\
-Æäˡ¤Â¿¤¯¤Î´Ä¶­¤Ç¤½¤Î´Ä¶­ËÜÍè¤ÎÁàºîÂηϤȤʤë¤è¤¦¤Ë¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¤È\
-ȽÃǤµ¤ì¤¿¤³¤È¤Ë¤è¤ê¤Þ¤¹¡¥
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new($ttkmenu_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttkmenu'}), 
-         Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $ttkmenu_demo.destroy
-                           $ttkmenu_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-b1 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:above)
-b2 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:left)
-b3 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:right)
-b4 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:flush,
-                         :style=>Ttk::Menubutton.style('Toolbutton'))
-b5 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:below)
-
-b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
-b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
-b3.menu(m3 = Tk::Menu.new(b3, :tearoff=>false))
-b4.menu(m4 = Tk::Menu.new(b4, :tearoff=>false))
-b5.menu(m5 = Tk::Menu.new(b5, :tearoff=>false))
-
-Ttk.themes.each{|theme|
-  m1.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m2.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m3.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m4.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m5.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-}
-
-f = Ttk::Frame.new(base_frame).pack(:fill=>:x)
-f1 = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-
-f.grid_anchor(:center)
-TkGrid('x', b1, 'x', :in=>f, :padx=>3, :pady=>2)
-TkGrid(b2,  b4, b3,  :in=>f, :padx=>3, :pady=>2)
-TkGrid('x', b5, 'x', :in=>f, :padx=>3, :pady=>2)
diff --git a/ext/tk/sample/demos-jp/ttknote.rb b/ext/tk/sample/demos-jp/ttknote.rb
deleted file mode 100644
index 09cc7960a3..0000000000
--- a/ext/tk/sample/demos-jp/ttknote.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttknote.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# notebook widget.
-#
-# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttknote_demo) && $ttknote_demo
-  $ttknote_demo.destroy 
-  $ttknote_demo = nil
-end
-
-$ttknote_demo = TkToplevel.new {|w|
-  title("Ttk Notebook Widget")
-  iconname("ttknote")
-  positionWindow(w)
-}
-
-## See Code / Dismiss
-Ttk::Frame.new($ttknote_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttknote'}), 
-         Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $ttknote_demo.destroy
-                           $ttknote_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
-
-## Make the notebook and set up Ctrl+Tab traversal
-notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true, 
-                                              :padx=>2, :pady=>3)
-notebook.enable_traversal
-
-## Popuplate the first pane
-f_msg = Ttk::Frame.new(notebook)
-msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'5i', 
-                       :justify=>:left, :anchor=>'n', :text=><<EOL)
-Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
-¤½¤ÎÃæ¤Ë´Þ¤Þ¤ì¤ë¥¦¥£¥¸¥§¥Ã¥È¤Î¤Ò¤È¤Ä¤Ë¥Î¡¼¥È¥Ö¥Ã¥¯¥¦¥£¥¸¥§¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¡¥\
-¥Î¡¼¥È¥Ö¥Ã¥¯¥¦¥£¥¸¥§¥Ã¥È¤Ï¡¤\
-¸ÄÊ̤ÎÆâÍƤò»ý¤Ã¤¿¥Ñ¥Í¥ë¤«¤é¤ÎÁªÂò¤ò²Äǽ¤Ë¤¹¤ë¤è¤¦¤Ê\
-¥¿¥Ö¤Î½¸¹ç¡Ê¥¿¥Ö¥»¥Ã¥È¡Ë¤òÄê¤á¤Þ¤¹¡¥\
-¥¿¥Ö¥»¥Ã¥È¤ÏºÇ¶á¤Î¿¤¯¤Î¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Ç¸«¤é¤ì¤ëµ¡Ç½¤Ç¤¹¡¥\
-¥¿¥Ö¤ÎÁªÂò¤Ï¡¤¥Þ¥¦¥¹¤Ë¤è¤ë¤À¤±¤Ç¤Ê¤¯¡¤\
-¥Î¡¼¥È¥Ö¥Ã¥¯¥¦¥£¥¸¥§¥Ã¥È¤Î¥Ú¡¼¥¸¤Î¸«½Ð¤·¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë»þ¤Ç¤¢¤ì¤Ð\
-Ctrl+Tab¥­¡¼¤ÎÆþÎϤˤè¤Ã¤Æ¤â¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥\
-¤³¤Î¥Ç¥â¤Ç¤Ï¡¤¸«½Ð¤·¤Ç²¼ÀþÉÕ¤­¤Îʸ»ú¤Î¥­¡¼¤ÈAlt¥­¡¼¤È¤òÁȤ߹ç¤ï¤»¤ë¤³¤È¤Ç\
-¥Ú¡¼¥¸¤òÁªÂò¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤âÀßÄꤷ¤Æ¤¤¤Þ¤¹¡¥\
-¤¿¤À¤·¡¤£²ÈÖÌܤΥ¿¥Ö¤Ï̵¸ú²½¤µ¤ì¤ÆÁªÂò¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤Ë¤Ï\
-Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥
-EOL
-neat = TkVariable.new
-after_id = nil
-msg_b = Ttk::Button.new(f_msg, :text=>'¤¹¤Æ¤­¤À¡ª(Neat!)', :underline=>6, 
-                        :command=>proc{
-                          neat.value = '¤¢¤¡¡¤¤½¤Î¤È¤ª¤ê¤µ¡¥¡¥¡¥'
-                          Tk.after_cancel(after_id) if after_id
-                          after_id = Tk.after(500){neat.value = ''}
-                        })
-msg_b.winfo_toplevel.bind('Alt-n'){ msg_b.focus; msg_b.invoke }
-msg_l = Ttk::Label.new(f_msg, :textvariable=>neat)
-notebook.add(f_msg, :text=>'ÀâÌÀ(Description)', :underline=>3, :padding=>2)
-Tk.grid(msg_m, '-', :sticky=>'new', :pady=>2)
-Tk.grid(msg_b, msg_l, :pady=>[2, 4], :padx=>20)
-msg_b.grid_configure(:sticky=>'e')
-msg_l.grid_configure(:sticky=>'w')
-f_msg.grid_rowconfigure(1, :weight=>1)
-f_msg.grid_columnconfigure([0, 1], :weight=>1, :uniform=>1)
-
-## Populate the second pane. Note that the content doesn't really matter
-f_disabled = Ttk::Frame.new(notebook)
-notebook.add(f_disabled, :text=>'̵¸ú²½¤µ¤ì¤¿¥¿¥Ö', :state=>:disabled)
-
-## Popuplate the third pane
-f_editor = Ttk::Frame.new(notebook)
-notebook.add(f_editor, :text=>'¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿(Text Editor)', :underline=>9)
-editor_t = Tk::Text.new(f_editor, :width=>40, :height=>10, :wrap=>:char)
-if Tk.windowingsystem != 'aqua'
-  editor_s = editor_t.yscrollbar(Ttk::Scrollbar.new(f_editor))
-else
-  editor_s = editor_t.yscrollbar(Tk::Scrollbar.new(f_editor))
-end
-editor_s.pack(:side=>:right, :fill=>:y, :padx=>[0,2], :pady=>2)
-editor_t.pack(:fill=>:both, :expand=>true, :padx=>[2,0], :pady=>2)
diff --git a/ext/tk/sample/demos-jp/ttkpane.rb b/ext/tk/sample/demos-jp/ttkpane.rb
deleted file mode 100644
index 96670c0e5c..0000000000
--- a/ext/tk/sample/demos-jp/ttkpane.rb
+++ /dev/null
@@ -1,216 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttkpane.rb --
-#
-# This demonstration script creates a Ttk pane with some content.
-#
-# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkpane_demo) && $ttkpane_demo
-  $ttkpane_demo.destroy 
-  $ttkpane_demo = nil
-end
-
-$ttkpane_demo = TkToplevel.new {|w|
-  title("Themed Nested Panes")
-  iconname("ttkpane")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left, 
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-¤³¤Î¥Ç¥â¤Ï¡¤Ëä¤á¹þ¤ß´Ø·¸¤Ë¤¢¤ë¥Æ¡¼¥ÞÉÕ¤­¥Ú¥¤¥ó¥É¥¦¥£¥ó¥É¥¦¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡¥\
-¤½¤ì¤¾¤ì¤ÎÂ礭¤µ¤Ï¡¤´Þ¤Þ¤ì¤Æ¤¤¤ë¥Ú¥¤¥ó¤Î´Ö¤Ë¤¢¤ë¥¨¥ê¥¢¤ò¤Ä¤«¤ó¤Ç\
-¶­³¦¤ò¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤ÇÊѹ¹¤Ç¤­¤Þ¤¹¡¥
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttkpane'}), 
-         Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $ttkpane_demo.destroy
-                           $ttkpane_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-outer = Ttk::Panedwindow.new(frame, :orient=>:horizontal)
-outer.add(in_left = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-outer.add(in_right = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'¥Ü¥¿¥ó'))
-in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'»þ·×'))
-in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'¥×¥í¥°¥ì¥¹'))
-in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'¥Æ¥­¥¹¥È'))
-if Tk.windowingsystem == 'aqua'
-  [left_top, left_bot, right_top, right_bot].each{|w| w.padding(3) }
-end
-
-# Fill the button pane
-Ttk::Button.new(left_top, :text=>'²¡¤·¤Æ¤Í', 
-                :command=>proc{
-                  Tk.messageBox(:type=>'ok', :icon=>'info', 
-                                :message=>'¤¤¤Æ¤Æ¡ª', 
-                                :detail=>'That hurt...', :parent=>base_frame, 
-                                :title=>'Button Pressed')
-                }).pack(:padx=>2, :pady=>5)
-
-
-zones_list = [
-  [':Europe/Berlin'], 
-  [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'], 
-  [':Africa/Johannesburg'], 
-  [':Europe/London'], 
-  [':America/Los_Angeles'], 
-  [':Europe/Moscow'],
-  [':America/New_York'], 
-  [':Asia/Singapore'], 
-  [':Australia/Sydney'], 
-  [':Asia/Tokyo'], 
-]
-
-zones = []
-
-# Check tzinfo support
-if $tk_major_ver > 8 || ($tk_major_ver == 8 && $tk_minor_ver >= 5)
-  tzinfo = :tcl
-
-  zones_list.each{|list|
-    list.each{|zone|
-      begin
-        # Force a pre-load of all the timezones needed; otherwise can end up
-        # poor-looking synch problems!
-        Tk.tk_call('clock', 'format', '0', '-timezone', zone)
-      rescue RuntimeError
-        # ignore
-      else
-        zones << [zone, zone[%r<[^/:]+$>].tr('_', ' ')]
-        break
-      end
-    }
-  }
-
-else
-  begin
-    require 'tzinfo'
-    tzinfo = :tzinfo
-  rescue Exception
-    begin
-      require 'tzfile'
-      tzinfo = :tzfile
-    rescue Exception
-      tzinfo = nil
-    end
-  end
-
-  case tzinfo
-  when :tzinfo
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZInfo::Timezone.get(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  when :tzfile
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZFile.create(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  else
-    [ -7, -4, -2, -1, 0, +1, +3, +8, +9, +10 ].each{|zone|
-      zones << [zone, 'UTC%+03d00' % zone]
-    }
-  end
-end
-
-time = TkVariable.new_hash
-
-case tzinfo
-when :tcl
-  update_proc = proc{|now, tz, label|
-    time[label] = Tk.tk_call('clock', 'format', now.tv_sec, 
-                             '-timezone', tz, '-format', '%T')
-  }
-when :tzinfo
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.utc_to_local(now).strftime('%H:%M:%S')
-  }
-when :tzfile
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.at(now.tv_sec).strftime('%H:%M:%S')
-  }
-else
-  update_proc = proc{|now, tz, label|
-    time[label] = (now + (tz * 3600)).strftime('%H:%M:%S')
-  }
-end
-
-# Fill the clocks pane
-zones.each_with_index{|(zone, label), idx|
-  Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
-  Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
-  Ttk::Label.new(left_bot, :textvariable=>time.ref(label), 
-                 :anchor=>'w').pack(:fill=>:x)
-}
-
-# Timer start
-every = proc{
-  now = Time.now.utc
-  zones.each{|zone, label| update_proc.call(now, zone, label) }
-}
-TkRTTimer.new(1000, -1, every).start(0, every)
-
-# Fill the progress pane
-Ttk::Progressbar.new(right_top, :mode=>:indeterminate).pack(:fill=>:both, :expand=>true).start
-
-# Fill the text pane
-if Tk.windowingsystem != 'aqua'
-  # The trick with the ttk::frame makes the text widget look like it fits with
-  # the current Ttk theme despite not being a themed widget itself. It is done
-  # by styling the frame like an entry, turning off the border in the text
-  # widget, and putting the text widget in the frame with enough space to allow
-  # the surrounding border to show through (2 pixels seems to be enough).
-  f = Ttk::Frame.new(right_bot, :style=>Ttk::Entry)
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  txt.pack(:fill=>:both, :expand=>true, :in=>f, :pady=>2, :padx=>2)
-  scr = txt.yscrollbar(Ttk::Scrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  f.pack(:fill=>:both, :expand=>true)
-  outer.pack(:fill=>:both, :expand=>true)
-else
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  scr = txt.yscrollbar(TkScrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  txt.pack(:fill=>:both, :expand=>true, :in=>right_bot)
-  outer.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>[6, 10])
-end
diff --git a/ext/tk/sample/demos-jp/ttkprogress.rb b/ext/tk/sample/demos-jp/ttkprogress.rb
deleted file mode 100644
index 43a9cbcd7e..0000000000
--- a/ext/tk/sample/demos-jp/ttkprogress.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttkprogress.rb --
-#
-# This demonstration script creates several progress bar widgets.
-#
-# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkprogress_demo) && $ttkprogress_demo
-  $ttkprogress_demo.destroy 
-  $ttkprogress_demo = nil
-end
-
-$ttkprogress_demo = TkToplevel.new {|w|
-  title("Progress Bar Demonstration")
-  iconname("ttkprogress")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left, 
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-²¼¤Ë¤¢¤ë¤Î¤ÏÆó¤Ä¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤Ç¤¹¡¥\
-¾å¤Î¤â¤Î¤Ï"determinate"¥¿¥¤¥×¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤Ç¡¤\
-Î㤨¤Ð¥×¥í¥°¥é¥à¤¬Í¿¤¨¤é¤ì¤¿¥¿¥¹¥¯¤ò½ªÎ»¤¹¤ë¤Þ¤Ç¤Ë¤É¤Î¤¯¤é¤¤¤«¤«¤ë¤«¤ò\
-¼¨¤¹¤È¤­¤Ê¤É¤ËÍѤ¤¤é¤ì¤Þ¤¹¡¥\
-²¼¤Î¤â¤Î¤Ï"indeterminate"¥¿¥¤¥×¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤Ç¡¤\
-Î㤨¤Ð¥×¥í¥°¥é¥à¤¬¼Â¹ÔÃæ(busy)¤Ç¤¢¤ë¤â¤Î¤Î\
-½ªÎ»¤Þ¤Ç¤Ë¤É¤ì¤¯¤é¤¤¤«¤«¤ë¤«¤Ïʬ¤«¤é¤Ê¤¤¤È¤¤¤¦¾õÂÖ¤ò\
-¼¨¤¹¤È¤­¤Ê¤É¤ËÍѤ¤¤é¤ì¤Þ¤¹¡¥\
-¤¤¤º¤ì¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤â¡¤¤¹¤°²¼¤Ë¤¢¤ë¥Ü¥¿¥ó¤ò»È¤¦¤³¤È¤Ç\
-¼«Æ°¥¢¥Ë¥á¡¼¥·¥ç¥ó¥â¡¼¥É¤ÎON/OFF¤òÀÚÂؤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥
-EOL
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x', 
-         Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È', 
-                         :image=>$image['view'], :compound=>:left, 
-                         :command=>proc{showCode 'ttkprogress'}), 
-         Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë', 
-                         :image=>$image['delete'], :compound=>:left, 
-                         :command=>proc{
-                           $ttkprogress_demo.destroy
-                           $ttkprogress_demo = nil
-                         }), 
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
-p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
-
-start = Ttk::Button.new(frame, :text=>'Start Progress', 
-                        :command=>proc{ p1.start; p2.start })
-stop  = Ttk::Button.new(frame, :text=>'Stop Progress', 
-                        :command=>proc{ p1.stop; p2.stop })
-
-Tk.grid(p1, '-', :pady=>5, :padx=>10)
-Tk.grid(p2, '-', :pady=>5, :padx=>10)
-Tk.grid(start, stop, :padx=>10, :pady=>5)
-start.grid_configure(:sticky=>'e')
-stop.grid_configure(:sticky=>'w')
-frame.grid_columnconfigure(:all, :weight=>1)
-
diff --git a/ext/tk/sample/demos-jp/twind.rb b/ext/tk/sample/demos-jp/twind.rb
index faefaefd6e..d35acd24d0 100644
--- a/ext/tk/sample/demos-jp/twind.rb
+++ b/ext/tk/sample/demos-jp/twind.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 #
 # text (embedded windows) widget demo (called by 'widget')
 #
@@ -16,13 +15,10 @@ $twind_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($twind_demo).pack(:fill=>:both, :expand=>true)
-
 # frame À¸À®
-$twind_buttons = TkFrame.new(base_frame) {|frame|
+$twind_buttons = TkFrame.new($twind_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc{
       tmppath = $twind_demo
       $twind_demo = nil
@@ -39,11 +35,11 @@ $twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # frame À¸À®
 $twind_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2, 
-            'relief'=>'sunken') {|f|
+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|
+			  '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}
@@ -53,60 +49,60 @@ TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
 
 # ¥¿¥°À¸À®
 $tag_center = TkTextTag.new($twind_text, 
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
+			    'justify' =>'center',
+			    'spacing1'=>'5m',
+			    'spacing3'=>'5m'  )
 $tag_buttons = TkTextTag.new($twind_text, 
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
+			     'lmargin1'=>'1c',
+			     'lmargin2'=>'1c',
+			     'rmargin' =>'1c',
+			     'spacing1'=>'3m',
+			     'spacing2'=>0,
+			     'spacing3'=>0 )
 
 # ¥Æ¥­¥¹¥È¤ÎÀ¸À®
 $twind_text.insert('end', 
-                  '¥Æ¥­¥¹¥Èwidget¾å¤Ë¾¤Îwidget¤òÁȤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
+		  '¥Æ¥­¥¹¥Èwidget¾å¤Ë¾¤Îwidget¤òÁȤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
 $twind_text.insert('end',
-                  'ÁȤ߹þ¤ß¥¦¥£¥ó¥É¥¦¤È¸Æ¤Ð¤ì¡¢Ç¤°Õ¤Îwidget¤¬²Äǽ¤Ç¤¹¡£')
+		  'ÁȤ߹þ¤ß¥¦¥£¥ó¥É¥¦¤È¸Æ¤Ð¤ì¡¢Ç¤°Õ¤Îwidget¤¬²Äǽ¤Ç¤¹¡£')
 $twind_text.insert('end',
-                  'Î㤨¤Ð¡¢¤³¤³¤Ë2¤Ä¤Î¥Ü¥¿¥ówidget¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£')
+		  'Î㤨¤Ð¡¢¤³¤³¤Ë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")
+		 'window'=>TkButton.new($twind_text) {
+		   #text 'ON'
+		   text '¥ª¥ó'
+		   command proc{textWindOn $twind_text,$twind_buttons}
+		   cursor 'top_left_arrow'
+		 })
+$twind_text.insert('end', '¤Ë¤·¤Þ¤¹¡£¤Þ¤¿2¤Ä¤á¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È')
 $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'
-                 })
+		 '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'
-                 })
+		 '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'
-                 })
+		 'window'=>TkButton.new($twind_text) {
+		   text '¾Ãµî'
+		   command proc{textWindDel $twind_text}
+		   cursor 'top_left_arrow'
+		 })
 $twind_text.insert('end', '¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¸µ¤ËÌá¤ê¤Þ¤¹¡£
 
 ')
@@ -126,27 +122,27 @@ $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 )
+		 '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 )
+		 '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', 
@@ -154,13 +150,13 @@ TkTextWindow.new($twind_text, 'end',
   '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 )
+		   'window'=>TkButton.new($twind_text) {
+		     text twind_color
+		     cursor 'top_left_arrow'
+		     command proc{$twind_text.bg twind_color}
+		   },
+		   'padx'=>3, 
+		   'pady'=>2 )
 }
 
 # ¥á¥½¥Ã¥ÉÄêµÁ
@@ -209,48 +205,44 @@ def textWindPlot (t)
     cursor 'top_left_arrow'
   }
 
-  if $tk_version =~ /^4.*/
-    font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  else
-    font = 'Helvetica 18'
-  end
+  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')
+	      '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')
+		'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')
+		'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')
+		       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
     item.addtag 'point'
   end
 
   $twind_plot.itembind('point', 'Any-Enter', 
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
+			proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
   $twind_plot.itembind('point', 'Any-Leave', 
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
+			proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
   $twind_plot.itembind('point', '1', 
-                        proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
+			proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
   $twind_plot.itembind('point', 'ButtonRelease-1', 
-                        proc{$twind_plot.dtag 'selected'})
+			proc{$twind_plot.dtag 'selected'})
   $twind_plot.bind('B1-Motion', 
-                    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
+		    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
   while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
     $twind_text.delete $mark_plot
   end
diff --git a/ext/tk/sample/demos-jp/twind2.rb b/ext/tk/sample/demos-jp/twind2.rb
deleted file mode 100644
index 2a26b28ef6..0000000000
--- a/ext/tk/sample/demos-jp/twind2.rb
+++ /dev/null
@@ -1,384 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# 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)
-}
-
-base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
-
-# frame À¸À®
-$twind2_buttons = TkFrame.new(base_frame) {|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(base_frame, '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/ext/tk/sample/demos-jp/unicodeout.rb b/ext/tk/sample/demos-jp/unicodeout.rb
index 178077ec08..d408a36aae 100644
--- a/ext/tk/sample/demos-jp/unicodeout.rb
+++ b/ext/tk/sample/demos-jp/unicodeout.rb
@@ -1,5 +1,3 @@
-# -*- coding: euc-jp -*-
-#
 # unicodeout.rb --
 #
 # This demonstration script shows how you can produce output (in label
@@ -18,11 +16,9 @@ $unicodeout_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
-base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame, 
-            :font=>$font, :wraplength=>'5.4i', :justify=>:left, 
-            :text=><<EOL).pack(:side=>:top)
+TkLabel.new($unicodeout_demo, 
+	    :font=>$font, :wraplength=>'5.4i', :justify=>:left, 
+	    :text=><<EOL).pack(:side=>:top)
 ¤³¤ì¤Ï¡¤Tk¤Ë¤ª¤±¤ëÈó²¤ÊÆʸ»ú½¸¹ç¤òÍѤ¤¤ë¸À¸ì¤ËÂФ¹¤ë¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤Î\
 ¥µ¥ó¥×¥ë¤Ç¤¹¡¥¤¿¤À¤·¡¤²¼¤Îɽ¼¨¤Ë¤ª¤¤¤Æ¤¢¤Ê¤¿¤¬¼ÂºÝ¤Ë¤É¤Î¤è¤¦¤Êɽ¼¨¤ò\
 Ìܤˤ¹¤ë¤«¤Ï¡¤¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¤É¤Î¤è¤¦¤Êʸ»ú½¸¹ç¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¤Ë\
@@ -42,23 +38,23 @@ Tcl¤Î¥¨¥¹¥±¡¼¥×ɽ¸½¤òÍѤ¤¤¿UNICODEʸ»úÎó¤Ç½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡¥\
 EOL
 #'
 
-TkFrame.new(base_frame){|f|
+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{
+		 $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)
+		 showCode 'unicodeout'
+	       }).pack(:side=>:left, :expand=>true)
 }
 
-wait_msg = TkLabel.new(base_frame, 
-                       :text=>"¥Õ¥©¥ó¥ÈÆɤ߹þ¤ß¤Î´°Î»¤Þ¤Ç" + 
-                              "¤·¤Ð¤é¤¯¤ªÂÔ¤Á²¼¤µ¤¤¡¥¡¥¡¥", 
-                       :font=>"Helvetica 12 italic").pack
+wait_msg = TkLabel.new($unicodeout_demo, 
+		       :text=>"¥Õ¥©¥ó¥ÈÆɤ߹þ¤ß¤Î´°Î»¤Þ¤Ç" + 
+		              "¤·¤Ð¤é¤¯¤ªÂÔ¤Á²¼¤µ¤¤¡¥¡¥¡¥", 
+		       :font=>"Helvetica 12 italic").pack
 
 class Unicodeout_SampleFrame < TkFrame
   @@font = $font
@@ -70,23 +66,23 @@ class Unicodeout_SampleFrame < TkFrame
   # @@font = 'Newspaper 12'
   # @@font = '{New century schoolbook} 12'
 
-  def initialize(base)
-    super(base)
+  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)
+		    :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)
+		    :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(base_frame)
+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
@@ -97,23 +93,23 @@ $unicodeout_demo.cursor('watch')
 Tk.update
 
 f.add_sample('Arabic', 
-             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94', 
-             '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
+	     '\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')
+	     '\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')
+	     '\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')
+	     '\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')
+	     '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ', 
+	     '\u044F\u0437\u044B\u043A')
 
 wait_msg.destroy
 $unicodeout_demo.cursor(oldCursor)
diff --git a/ext/tk/sample/demos-jp/vscale.rb b/ext/tk/sample/demos-jp/vscale.rb
index a1097fd77f..4cb8e0f6b7 100644
--- a/ext/tk/sample/demos-jp/vscale.rb
+++ b/ext/tk/sample/demos-jp/vscale.rb
@@ -1,4 +1,3 @@
-# -*- coding: euc-jp -*-
 require "tkcanvas"
 
 if defined?($vscale_demo) && $vscale_demo
@@ -12,9 +11,7 @@ $vscale_demo = TkToplevel.new {|w|
 }
 positionWindow($vscale_demo)
 
-base_frame = TkFrame.new($vscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
+msg = TkLabel.new($vscale_demo) {
   font $font
   wraplength '3.5i'
   justify 'left'
@@ -25,10 +22,9 @@ msg = TkLabel.new(base_frame) {
 }
 msg.pack('side'=>'top', 'padx'=>'.5c')
 
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($vscale_demo) {|frame|
   TkButton.new(frame) {
-    #text 'λ²ò'
-    text 'ÊĤ¸¤ë'
+    text 'λ²ò'
     command proc {
       tmppath = $vscale_demo
       $vscale_demo = nil
@@ -42,17 +38,7 @@ TkFrame.new(base_frame) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
-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
-
-TkFrame.new(base_frame) {|frame|
+TkFrame.new($vscale_demo) {|frame|
   borderwidth 10
   canvas = TkCanvas.new(frame) {|c|
     width 50
@@ -78,3 +64,14 @@ TkFrame.new(base_frame) {|frame|
   }.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/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
index 8eb699e513..696a9073cc 100644
--- a/ext/tk/sample/demos-jp/widget
+++ b/ext/tk/sample/demos-jp/widget
@@ -1,144 +1,62 @@
 #!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
-
-# ´Á»ú¥³¡¼¥ÉÀßÄê ( tk.rb ¤Î¥í¡¼¥É»þ¤Î encoding ¿äÄê/ÀßÄê¤Ë»È¤ï¤ì¤ë )
-if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
-  $KCODE = 'euc'
-else
-  DEFAULT_TK_ENCODING = 'EUC-JP'
-end
 
 # tk ´Ø·¸¥é¥¤¥Ö¥é¥ê¤ÎÆɤ߹þ¤ß
 require 'tk'
-# require 'tkafter'
-
-$RubyTk_WidgetDemo = true
+require 'tkafter'
 
 # widget demo directory °ÌÃ֤γÍÆÀ
-# $demo_dir = File.dirname($0)
-$demo_dir = File.dirname(__FILE__)
+$demo_dir = File.dirname($0)
 
 # root ¤ÎÀ¸À®
-$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
+$root = TkRoot.new{title "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')
 
 # ¥Õ¥©¥ó¥ÈÀßÄê
+$font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
+knjfont = '-*-r-*--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-*-*-*-*-*-*',
+			     '-*-r-*--24-*-jisx0208.1983-0')
 #######
-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 14 bold', 'Gothic 14 bold')
-
-else
-  $font = TkFont.new('Helvetica 14', nil)
-  knjfont = '-*--16-*-jisx0208.1983-0'
-  $kanji_font = TkFont.new('Helvetic 14', knjfont)
-  TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('Helvetica 14',
-                             '-*--24-*-jisx0208.1983-0')
-end
+#case($tk_version)
+#when /^4.*/
+#  $font = '-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*'
+#  $kanji_font = '-*--16-*-jisx0208.1983-0'
+#  $msg_kanji_font = '-*--24-*-jisx0208.1983-0'
+#  $knjfont_opt = 'kanjifont'
+#  TkOption.add('*kanjiFont', $kanji_font, 'startupFile')
+#
+#when /^8.*/
+#  Tk.tk_call('font', 'create', '@ascii', 
+#	     '-copy', '-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*')
+#  Tk.tk_call('font', 'create', '@kanji', 
+#	     '-copy', '-*--16-*-jisx0208.1983-0')
+#  Tk.tk_call('font', 'create', '@msg_knj', 
+#	     '-copy', '-*--24-*-jisx0208.1983-0')
+#  Tk.tk_call('font', 'create', '@cFont', '-compound', '@ascii @kanji')
+#  Tk.tk_call('font', 'create', '@cMsgFont', '-compound', '@ascii @msg_knj')
+#  $font = '-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*'
+#  $kanji_font = '@cFont'
+#  $msg_kanji_font = '@cMsgFont'
+#  $knjfont_opt = 'font'
+#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
-
 # ¥á¥Ë¥å¡¼ÀßÄê
-if $tk_major_ver >= 8
-  $root.add_menubar([[['File', 0], 
-                        ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                        '---', 
-                        ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                      ]])
-else
-  TkMenubar.new($root, 
-                [[['File', 0], 
-                    ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                    '---', 
-                    ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                  ]]).pack('side'=>'top', 'fill'=>'x')
-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('Control-q', proc{exit})
 
 =begin
 TkFrame.new($root){|frame|
@@ -159,7 +77,7 @@ if $tk_version =~ /^4\.[01]/
   txt = TkText.new($root) {
     #wrap 'word'
     wrap 'char'
-    width 70
+    width 60
     height 30
     font $font
     setgrid 'yes'
@@ -171,13 +89,13 @@ if $tk_version =~ /^4\.[01]/
 else
   textFrame = TkFrame.new($root)
   scr = TkScrollbar.new($root, 'orient'=>'vertical', 
-                        'highlightthickness'=>0, 'takefocus'=>1) {
+			'highlightthickness'=>0, 'takefocus'=>1) {
     pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
   }
   txt = TkText.new($root) {
     #wrap 'word'
     wrap 'char'
-    width 70
+    width 60
     height 30
     font $font
     setgrid 'yes'
@@ -185,7 +103,6 @@ else
     padx 4
     pady 2
     takefocus 0
-    bd 1
     yscrollcommand proc{|first,last| scr.set first,last}
   }
   scr.command(proc{|*args| txt.yview(*args)})
@@ -195,82 +112,71 @@ else
   textFrame.pack('expand'=>'yes', 'fill'=>'both')
 
   statusBar = TkFrame.new($root) {|f|
-    if $tk_version =~ /^4.*/
-      statusfont = '-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-    else
-      statusfont = 'Helvetica 10'
-    end
     $statusBarLabel = \
     TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-                'font'=>statusfont) \
+		'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'=>statusfont) \
+		'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
     .pack('side'=>'left', 'padx'=>2)
   }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
 end
 
 # ¥Æ¥­¥¹¥È¥¿¥°ÀßÄê
-if $tk_version =~ /^4.*/
-  tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
-else
-  tag_title = TkTextTag.new(txt, 'font'=>'Helvetica 18 bold')
-end
-#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_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_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
 
-if TkWinfo.depth($root) == 1
+if TkWinfo.depth($root) == '1'
   tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-                           'underline'=>1)
+			   'underline'=>1)
   $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-                              'underline'=>1)
+			      '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)
+			   'foreground'=>'blue', 'underline'=>1)
   $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-                              'foreground'=>'#303080', 'underline'=>1)
+			      'foreground'=>'#303080', 'underline'=>1)
 #  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1, 
-#                         'background'=>'SeaGreen3')
+#			  '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')
+	      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')
+		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'=>"")
-              })
+	      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')
+		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)
@@ -286,81 +192,55 @@ txt.insert('end', <<"EOT")
 ¤ë¤¿¤á¤Ë¡¢"¥³¡¼¥É»²¾È"¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¢¤Ê¤¿¤¬\
 ˾¤à¤Ê¤é¡¢¤½¤Î¥³¡¼¥É¤ò½¤Àµ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£½¤Àµ¤·¤¿¥³¡¼¥É¤Ç¥Ç¥â\
 ¥ó¥¹¥È¥ì¡¼¥·¥ç¥ó¤òºÆ¼Â¹Ô¤¹¤ë¤¿¤á¤Ë¤Ï¡¢¥³¡¼¥É¤¬½ñ¤«¤ì¤¿¥¦¥£¥ó¥É¥¦¤Ë\
-¤¢¤ë"¥Ç¥âºÆ¼Â¹Ô" ¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£\
-¥³¡¼¥É¤ò½¤Àµ¤·¤Æ¤â¥ª¥ê¥¸¥Ê¥ë¤Î¥Õ¥¡¥¤¥ë¤¬½ñ¤­´¹¤¨¤é¤ì¤ë¤³¤È¤Ï\
-¤¢¤ê¤Þ¤»¤ó¤«¤é¡¢¿´ÇÛ¤»¤º¤Ë¿§¡¹¤ÊÊѹ¹¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
-
-°ìÉô¤Î¥Ç¥â¤Ç¤Ï¡¢Èæ³ÓŪºÇ¶á¤Î¥Ð¡¼¥¸¥ç¥ó¤Î Tk ¤Ç¤Ê¤±¤ì¤Ð¥µ¥Ý¡¼¥È¤·¤Æ\
-¤¤¤Ê¤¤µ¡Ç½¤ò»È¤Ã¤Æ¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹(Î㤨¤Ð Tk8.4 °Ê¾å¤Ê¤É)¡£¤½¤Î¤¿¤á¡¢\
-¤½¤¦¤·¤¿µ¡Ç½¤ò»ý¤¿¤Ê¤¤ Tk ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤¦¤·¤¿\
-¥Ç¥â¤ÏÀµ¤·¤¯Æ°¤­¤Þ¤»¤ó¡£¤½¤Î¤è¤¦¤Êµ¡Ç½¤¬É¬ÍפǤ¢¤ì¤Ð¡¢¤½¤ì¤ò¥µ¥Ý¡¼¥È\
-¤·¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤ò»È¤¦¤è¤¦¤Ë tcltklib ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Ê¤ª¤·¤Æ\
-¤¯¤À¤µ¤¤¡£
+¤¢¤ë"¥Ç¥âºÆ¼Â¹Ô" ¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
 
-¤â¤·¤¢¤Ê¤¿¤Î Tk ¤¬ (ºÇ½é¤«¤é´Þ¤à¤«¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤«¤Ë¤è¤ê) \
-Ttk (Tile) ³ÈÄ¥¤òÍøÍѤǤ­¤ë¾õÂ֤Ǥ¢¤ë¤Ê¤é¡¢\
-Ttk ³ÈÄ¥¤Î¥Ç¥â (sample/tkextlib/tile/demo.rb) ¤â¤¼¤Ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
-( ¿ʬ¡¤¸½ºß¤Î¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¤Ï Ttk ³ÈÄ¥¤Ï\
-#{
-begin
-  require 'tkextlib/tile'
-  "¤¹¤Ç¤ËƳÆþ¤µ¤ì¤Æ¤¤¤Þ¤¹"
-rescue
-  "¤Þ¤À¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-end
-}\
-¡£)
-Ttk ³ÈÄ¥¤Ï¡¢Tk8.5 °Ê¾å¤Ç¤Ïɸ½à¤Îµ¡Ç½¤È¤·¤ÆÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
+°ìÉô¤Î¥Ç¥â¤Ç¤Ï¡¤Èæ³ÓŪºÇ¶á¤Î¥Ð¡¼¥¸¥ç¥ó¤Î Tk ¤Ç¤Ê¤±¤ì¤Ð¥µ¥Ý¡¼¥È¤·¤Æ\
+¤¤¤Ê¤¤µ¡Ç½¤ò»È¤Ã¤Æ¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹(Î㤨¤Ð Tk8.4 °Ê¾å¤Ê¤É)¡¥¤½¤Î¤¿¤á¡¤\
+¤½¤¦¤·¤¿µ¡Ç½¤ò»ý¤¿¤Ê¤¤ Tk ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¤¤½¤¦¤·¤¿\
+¥Ç¥â¤ÏÀµ¤·¤¯Æ°¤­¤Þ¤»¤ó¡¥¤½¤Î¤è¤¦¤Êµ¡Ç½¤¬É¬ÍפǤ¢¤ì¤Ð¡¤¤½¤ì¤ò¥µ¥Ý¡¼¥È\
+¤·¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤ò»È¤¦¤è¤¦¤Ë¡¤tcltklib ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Ê¤ª¤·¤Æ\
+¤¯¤À¤µ¤¤¡¥
 
 
 EOT
 
 #txt.insert('end',"¥é¥Ù¥ë, ¥Ü¥¿¥ó, ¥Á¥§¥Ã¥¯¥Ü¥¿¥ó, ¥é¥¸¥ª¥Ü¥¿¥ó\n",tag_middle)
 txt.insert('end', "¥é¥Ù¥ë, ¥Ü¥¿¥ó, ¥Á¥§¥Ã¥¯¥Ü¥¿¥ó, ¥é¥¸¥ª¥Ü¥¿¥ó\n", 
-           tag_kanji_title)
+	   tag_kanji_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. ¥é¥Ù¥ë (¥Æ¥­¥¹¥È, ¥Ó¥Ã¥È¥Þ¥Ã¥×)\n", 
-           tag_demo, "demo-label")
+	   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")
+	   tag_demo, "demo-check")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. £³¾õÂ֥饸¥ª¥Ü¥¿¥ó (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", 
-           tag_demo, "demo-radio3")
+txt.insert('end', "5. ¥é¥¸¥ª¥Ü¥¿¥ó (Ǥ°Õ¤Î°ì¤Ä¤òÁªÂò²Äǽ)\n", 
+	   tag_demo, "demo-radio")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. ¥Ü¥¿¥ó¤Çºî¤é¤ì¤¿15-¥Ñ¥º¥ë¥²¡¼¥à\n", 
-           tag_demo, "demo-puzzle")
+txt.insert('end', "6. ¥é¥¸¥ª¥Ü¥¿¥ó (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", 
+	   tag_demo, "demo-radio2")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. ¥Ó¥Ã¥È¥Þ¥Ã¥×¤ò»ÈÍѤ·¤¿¥¢¥¤¥³¥ó¥Ü¥¿¥ó\n", 
-           tag_demo, "demo-icon")
+txt.insert('end', "7. ¥Ü¥¿¥ó¤Çºî¤é¤ì¤¿15-¥Ñ¥º¥ë¥²¡¼¥à\n", 
+	   tag_demo, "demo-puzzle")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "11. ²èÁü¤òɽ¼¨¤¹¤ëÆó¤Ä¤Î¥é¥Ù¥ë\n", 
-           tag_demo, "demo-image1")
+txt.insert('end', "8. ¥Ó¥Ã¥È¥Þ¥Ã¥×¤ò»ÈÍѤ·¤¿¥¢¥¤¥³¥ó¥Ü¥¿¥ó\n", 
+	   tag_demo, "demo-icon")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "12. ²èÁü¤ò¸«¤ë¤¿¤á¤Î´Êñ¤Ê¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹\n", 
-           tag_demo, "demo-image2")
+txt.insert('end', "9. ²èÁü¤òɽ¼¨¤¹¤ëÆó¤Ä¤Î¥é¥Ù¥ë\n", 
+	   tag_demo, "demo-image1")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "13. ²èÁü¤ò¸«¤ë¤¿¤á¤Î´Êñ¤Ê¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", 
-           tag_demo, "demo-image3")
+txt.insert('end', "10. ²èÁü¤ò¸«¤ë¤¿¤á¤Î´Êñ¤Ê¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹\n", 
+	   tag_demo, "demo-image2")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "14. ¥é¥Ù¥ëÉÕ¤­¥Õ¥ì¡¼¥à (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", 
-           tag_demo, "demo-labelframe")
+txt.insert('end', "11. ²èÁü¤ò¸«¤ë¤¿¤á¤Î´Êñ¤Ê¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", 
+	   tag_demo, "demo-image3")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "15. ¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥¦¥£¥¸¥§¥Ã¥È¤Î´Êñ¤ÊÎã (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", 
-           tag_demo, "demo-ttkbut")
+txt.insert('end', "12. ¥é¥Ù¥ëÉÕ¤­¥Õ¥ì¡¼¥à (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", 
+	   tag_demo, "demo-labelframe")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -370,16 +250,10 @@ 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")
+	   "#{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', "4. ¹ñ¤Ë¤Ä¤¤¤Æ¤Î¥Þ¥ë¥Á¥«¥é¥à¥ê¥¹¥È (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", 
-           tag_demo, "demo-mclist")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ¥Ç¥£¥ì¥¯¥È¥ê¥Ö¥é¥¦¥¶ (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", 
-           tag_demo, "demo-tree")
-txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 #txt.insert('end', "¥¨¥ó¥È¥ê¤È¥¹¥Ô¥ó¥Ü¥Ã¥¯¥¹\n", tag_middle)
@@ -390,15 +264,12 @@ 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")
+	   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. ¥³¥ó¥Ü¥Ü¥Ã¥¯¥¹ (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", 
-           tag_demo, "demo-combo")
+	   tag_demo, "demo-spin")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. ´Êñ¤Ê¥Õ¥©¡¼¥à\n", tag_demo, "demo-form")
+txt.insert('end', "5. ´Êñ¤Ê¥Õ¥©¡¼¥à\n", tag_demo, "demo-form")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -410,17 +281,12 @@ 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")
+	   tag_demo, "demo-bind")
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "4. ¥¦¥£¥ó¥É¥¦¤òËä¤á¹þ¤ó¤À¥Æ¥­¥¹¥È\n", 
-           tag_demo, "demo-twind")
+	   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', "7. ¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ÎÂÐÅù²½(peering) (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", tag_demo, "demo-textpeer")
+txt.insert('end', "5. ¸¡º÷\n", tag_demo, "demo-search")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -439,63 +305,44 @@ 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', "9. ¥Á¥§¥¹¥Ü¡¼¥É¾å¤Îµ³»Î¤Î½ä²ó (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", 
-           tag_demo, "demo-knightstour")
+txt.insert('end', "7. ¥¹¥¯¥í¡¼¥ë²Äǽ¤Ê¥­¥ã¥ó¥Ð¥¹\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_middle)
+txt.insert('end', "¥¹¥±¡¼¥ë\n", tag_kanji_title)
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ¿åÊ¿¥¹¥±¡¼¥ë\n", tag_demo.id, "demo-hscale")
+txt.insert('end', "1. ¿âľ\n", tag_demo.id, "demo-vscale")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ¥×¥í¥°¥ì¥¹¥Ð¡¼ (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", tag_demo.id, "demo-ttkprogress")
+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_kanji_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. ¿åÊ¿Êý¸þ (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", 
-           tag_demo.id, "demo-paned1")
+	   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', "3. ¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿Ëä¤á¹þ¤ß¥Ú¥¤¥ó (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", 
-           tag_demo.id, "demo-ttkpane")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ¥Î¡¼¥È¥Ö¥Ã¥¯¥¦¥£¥¸¥§¥Ã¥È (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", 
-           tag_demo.id, "demo-ttknote")
+	   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_middle)
+txt.insert('end', "¥á¥Ë¥å¡¼\n", tag_kanji_title)
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "1. ¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¤ò´Þ¤ó¤À¥¦¥£¥ó¥É¥¦\n", 
-           tag_demo, "demo-menu")
+	   tag_demo, "demo-menu")
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "2. ¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¤ò´Þ¤ó¤À¥¦¥£¥ó¥É¥¦ (Tk8.x ÀìÍÑ)\n", 
-           tag_demo, "demo-menu8x")
+	   tag_demo, "demo-menu8x")
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "3.                 ¡·                (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", 
-           tag_demo, "demo-menu84")
+	   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', "5. ¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥á¥Ë¥å¡¼¥Ü¥¿¥ó (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", 
-           tag_demo.id, "demo-ttkmenu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. ¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥Ä¡¼¥ë¥Ð¡¼ (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", 
-           tag_demo.id, "demo-toolbar")
+	   tag_demo, "demo-menubu")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -504,36 +351,22 @@ 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. ¾ÜºÙ¥Æ¥­¥¹¥ÈÉÕ¤­¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹ (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", tag_demo, "demo-msgbox2")
+txt.insert('end', "2. ¥Õ¥¡¥¤¥ëÁªÂò¥À¥¤¥¢¥í¥°\n", tag_demo, "demo-filebox")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ¥Õ¥¡¥¤¥ëÁªÂò¥À¥¤¥¢¥í¥°\n", tag_demo, "demo-filebox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ¿§ÁªÂò¥À¥¤¥¢¥í¥°\n", tag_demo, "demo-clrpick")
+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")
+	   tag_demo, "demo-dialog1")
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "3. ¥â¡¼¥À¥ë¥À¥¤¥¢¥í¥°(¥°¥í¡¼¥Ð¥ë¥°¥é¥Ö)\n", 
-           tag_demo, "demo-dialog2")
+	   tag_demo, "demo-dialog2")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.state('disabled')
@@ -548,228 +381,56 @@ end
 
 # ¿Æ¥¦¥£¥¸¥§¥Ã¥È¤È¡¤ÊÑ¿ô̾¤È TkVariable ¤È¤ÎÁÈ(ÇÛÎó)¤ÎʤӤòÅϤ¹
 $showVarsWin = {}
-def showVars1(parent, *args)
+def showVars (parent, *args)
   if $showVarsWin[parent.path]
     begin
       $showVarsWin[parent.path].destroy 
     rescue
     end
   end
-  top = TkToplevel.new(parent) {|w|
+  w = TkToplevel.new(parent) {|w|
     title "Variable values"
-    base = TkFrame.new(w).pack(:fill=>:both, :expand=>true)
-    TkLabel.new(base) {
+    TkLabel.new(w) {
       text "ÊÑ¿ôÃÍ:"
       width 20
       anchor 'center'
-      if $tk_version =~ /^4.*/
-        font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
-      else
-        font 'Helvetica 14'
-      end
+      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(base){|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')
+      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(base) {
+    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) {|top|
-    title "Variable values"
-
-    base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
-
-    TkLabelFrame.new(base, :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(base, :text=>"λ²ò", :width=>8, :default=>:active, 
-                 :command=>proc{top.destroy}){|b|
-      top.bind('Return', proc{b.invoke})
-      top.bind('Escape', proc{b.invoke})
-
-      b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
-    }
-    base.grid_columnconfig(0, :weight=>1)
-    base.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, file=nil)
-  #eval(code)
-  #_null_binding.pseudo_toplevel_eval{ eval(code) }
-  #Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }
-  Thread.new{
-    _null_binding.pseudo_toplevel_eval{
-      begin
-        if file
-          eval(code, binding, "(eval:#{file})")
-        else
-          eval(code)
-        end
-      rescue Exception=>e
-        #p e
-        TkBgError.show(e.message + "\n" + 
-                         "\n---< backtrace of Ruby side >-----\n" + 
-                         e.backtrace.join("\n") + 
-                         "\n---< backtrace of Tk side >-------")
-      end
-    }
-  }
-  Tk.update
+  $showVarsWin[parent.path] = w
 end
 
 # ¥Æ¥­¥¹¥È¾å¤Ç¤Î click ¤ËÂФ¹¤ëÆ°ºî
-def invoke(txt, idx)
-  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
+def invoke (txt, index)
+  tag = txt.tag_names(index).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, tag[5..-1] + '.rb')
-  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
+  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
   Tk.update
 #  txt.cursor('xterm')
-  txt.cursor(current_cursor)
+  txt.cursor(cursor)
 
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
+  $tag_visited.add("#{index} linestart +1 chars", "#{index} lineend +1 chars")
 end
-=end
 
 # ¾õÂÖɽ¼¨
 def showStatus (txt, index)
@@ -781,104 +442,79 @@ def showStatus (txt, index)
   else
     demoname = tag[5..-1]
     $statusBarLabel.configure('text', 
-                             "¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à \"#{demoname}\" ¤Î¼Â¹Ô ")
+			     "¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à \"#{demoname}\" ¤Î¼Â¹Ô ")
     newcursor = 'hand2'
   end
   txt.configure('cursor'=>newcursor) if cursor != newcursor
 end
 
 # ¥½¡¼¥¹¥³¡¼¥É¤Îɽ¼¨
-def showCode1(demo)
+def showCode (demo)
   file = "#{demo}.rb"
   $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
+  if $code_window == nil || TkWinfo.exist?($code_window) == '0'
     $code_window = TkToplevel.new(nil)
     f = TkFrame.new($code_window)
-
     TkButton.new(f) {
-      #text "λ²ò"
-      text "ÊĤ¸¤ë"
+      text "λ²ò"
       command proc{
-        $code_window.destroy
-        $code_window = nil
+	$code_window.destroy
+	$code_window = nil
       }
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
+    }.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'), '<viewer>')}
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
-
-    TkLabel.new(f,'text'=>'line:').pack('side'=>'left')
-    linenum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-    TkLabel.new(f,'text'=>'  pos:').pack('side'=>'left')
-    posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
+      command proc{eval($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}
+	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)
+	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
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
   else
     $code_window.deiconify
     $code_window.raise
   end
-
   $code_window.title("Demo code: #{file}")
   $code_window.iconname(file)
 #  fid = open(file, 'r')
@@ -889,235 +525,16 @@ def showCode1(demo)
   #$code_mark = TkTextMark.new($code_text, '1.0')
   #$code_text.set_insert('1.0')
   TkTextMarkInsert.new($code_text,'1.0')
-
-  $set_linenum.call($code_text)
-
   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)
-
-    lf = TkFrame.new(bf)
-    TkLabel.new(lf, :text=>'line:').pack(:side=>:left)
-    linenum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-    TkLabel.new(lf, :text=>'  pos:').pack(:side=>:left)
-    posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    #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'), '<viewer>')
-                         }, 
-                         :image=>$image['refresh'], :compound=>:left)
-
-    TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
-    bf.grid_columnconfigure(1, :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)
-    }
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  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')
-
-  $set_linenum.call($code_text)
-
-  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.7.0-jp\n\n" + 
-                           "based on demos of Tk8.1 -- 8.5  " + 
-                           "( Copyright of Tcl/Tk demos:: " + 
-                           "(c) 1996-1997 Sun Microsystems, Inc. / " + 
-                           "(c) 1997-2000 Ajuba Solutions, Inc. / " + 
-                           "(c) 2001-2007 Donal K. Fellows / " + 
-                           "(c) 2002-2007 Daniel A. Steffen )\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, cmd + '.rb')
-}
-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
-  }
+		'message'=>"Ruby/Tk ¥¦¥£¥¸¥§¥Ã¥È¥Ç¥â Ver.1.3.2-jp\n\n( based on Tk ¥¦¥£¥¸¥§¥Ã¥È¥Ç¥â :: Copyright (c) 1996-1997 Sun Microsystems, Inc. )\n\nRunning Version :: Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''}")
 end
 
 ################################
diff --git a/ext/tk/sample/editable_listbox.rb b/ext/tk/sample/editable_listbox.rb
deleted file mode 100644
index 99345da380..0000000000
--- a/ext/tk/sample/editable_listbox.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# 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/ext/tk/sample/encstr_usage.rb b/ext/tk/sample/encstr_usage.rb
deleted file mode 100644
index b22c2504ac..0000000000
--- a/ext/tk/sample/encstr_usage.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-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(File.join(File.dirname(__FILE__),'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' (Tk.force_default_encoding? == #{Tk.force_default_encoding?})\n\n")
-
-t3.insert('end', src_str)
-
-Tk.mainloop
diff --git a/ext/tk/sample/figmemo_sample.rb b/ext/tk/sample/figmemo_sample.rb
deleted file mode 100644
index 1b6979d2dd..0000000000
--- a/ext/tk/sample/figmemo_sample.rb
+++ /dev/null
@@ -1,456 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-
-begin
-  # try to use Img extension
-  require 'tkextlib/tkimg'
-rescue Exception
-  # cannot use Img extention --> ignore
-end
-
-
-############################
-# scrolled_canvas
-class TkScrolledCanvas < TkCanvas
-  include TkComposite
-
-  def initialize_composite(keys={})
-    @h_scr = TkScrollbar.new(@frame)
-    @v_scr = TkScrollbar.new(@frame)
-
-    @canvas = TkCanvas.new(@frame)
-    @path = @canvas.path
-
-    @canvas.xscrollbar(@h_scr)
-    @canvas.yscrollbar(@v_scr)
-
-    TkGrid.rowconfigure(@frame, 0, :weight=>1, :minsize=>0)
-    TkGrid.columnconfigure(@frame, 0, :weight=>1, :minsize=>0)
-
-    @canvas.grid(:row=>0, :column=>0, :sticky=>'news')
-    @h_scr.grid(:row=>1, :column=>0, :sticky=>'ew')
-    @v_scr.grid(:row=>0, :column=>1, :sticky=>'ns')
-
-    delegate('DEFAULT', @canvas)
-    delegate('background', @canvas, @h_scr, @v_scr)
-    delegate('activebackground', @h_scr, @v_scr)
-    delegate('troughcolor', @h_scr, @v_scr)
-    delegate('repeatdelay', @h_scr, @v_scr)
-    delegate('repeatinterval', @h_scr, @v_scr)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
-
-    delegate_alias('canvasborderwidth', 'borderwidth', @canvas)
-    delegate_alias('canvasrelief', 'relief', @canvas)
-
-    delegate_alias('scrollbarborderwidth', 'borderwidth', @h_scr, @v_scr)
-    delegate_alias('scrollbarrelief', 'relief', @h_scr, @v_scr)
-
-    configure(keys) unless keys.empty?
-  end
-end
-
-############################
-class PhotoCanvas < TkScrolledCanvas
-
-USAGE = <<EOT
---- WHAT IS ---
-You can write comments on the loaded image, and save it as a Postscipt 
-file (original image file is not modified). Each comment is drawn as a 
-set of an indicator circle, an arrow, and a memo text. See the following 
-how to write comments.
-This can save the list of memo texts to another file. It may useful to 
-search the saved Postscript file by the comments on them.
-This may not support multibyte characters (multibyte texts are broken on 
-a Postscript file). It depends on features of canvas widgets of Tcl/Tk 
-libraries linked your Ruby/Tk. If you use Tcl/Tk8.0-jp (Japanized Tcl/Tk),
-you can (possibly) get a Japanese Postscript file.
-
---- BINDINGS ---
-* Button-1 : draw comments by following steps
-    1st - Set center of a indicator circle.
-    2nd - Set head position of an arrow.
-    3rd - Set tail position of an arrow, and show an entry box.
-          Input a memo text and hit 'Enter' key to entry the comment.
-
-* Button-2-drag : scroll the canvas
-
-* Button-3 : when drawing, cancel current drawing
-
-* Double-Button-3 : delete the clicked comment (text, arrow, and circle)
-EOT
-
-  def initialize(*args)
-    super(*args)
-
-    self.highlightthickness = 0
-    self.selectborderwidth = 0
-
-    @photo = TkPhotoImage.new
-    @img = TkcImage.new(self, 0, 0, :image=>@photo)
-
-    width  = self.width
-    height = self.height
-    @scr_region = [-width, -height, width, height]
-    self.scrollregion(@scr_region)
-    self.xview_moveto(0.25)
-    self.yview_moveto(0.25)
-
-    @col = 'red'
-    @font = 'Helvetica -12'
-
-    @memo_id_num = -1
-    @memo_id_head = 'memo_'
-    @memo_id_tag = nil
-    @overlap_d = 2
-
-    @state = TkVariable.new
-    @border = 2
-    @selectborder = 1
-    @delta = @border + @selectborder
-    @entry = TkEntry.new(self, :relief=>:ridge, :borderwidth=>@border, 
-                         :selectborderwidth=>@selectborder, 
-                         :highlightthickness=>0)
-    @entry.bind('Return'){@state.value = 0}
-
-    @mode = old_mode = 0
-
-    _state0()
-
-    bind('2', :x, :y){|x,y| scan_mark(x,y)}
-    bind('B2-Motion', :x, :y){|x,y| scan_dragto(x,y)}
-
-    bind('3'){
-      next if (old_mode = @mode) == 0
-      @items.each{|item| item.delete }
-      _state0()
-    }
-
-    bind('Double-3', :widget, :x, :y){|w, x, y|
-      next if old_mode != 0
-      x = w.canvasx(x)
-      y = w.canvasy(y)
-      tag = nil
-      w.find_overlapping(x - @overlap_d, y - @overlap_d, 
-                         x + @overlap_d, y + @overlap_d).find{|item|
-        ! (item.tags.find{|name|
-             if name =~ /^(#{@memo_id_head}\d+)$/
-               tag = $1
-             end
-           }.empty?)
-      }
-      w.delete(tag) if tag
-    }
-  end
-
-  #-----------------------------------
-  private
-  def _state0() # init
-    @mode = 0
-
-    @memo_id_num += 1
-    @memo_id_tag = @memo_id_head + @memo_id_num.to_s
-
-    @target = nil
-    @items = []
-    @mark = [0, 0]
-    bind_remove('Motion')
-    bind('ButtonRelease-1', proc{|x,y| _state1(x,y)}, '%x', '%y')
-  end
-
-  def _state1(x,y) # set center
-    @mode = 1
-
-    @target = TkcOval.new(self, 
-                          [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)], 
-                          :outline=>@col, :width=>3, :tags=>[@memo_id_tag])
-    @items << @target
-    @mark = [x,y]
-
-    bind('Motion', proc{|x,y| _state2(x,y)}, '%x', '%y')
-    bind('ButtonRelease-1', proc{|x,y| _state3(x,y)}, '%x', '%y')
-  end
-
-  def _state2(x,y) # create circle
-    @mode = 2
-
-    r = Integer(Math.sqrt((x-@mark[0])**2 + (y-@mark[1])**2))
-    @target.coords([canvasx(@mark[0] - r), canvasy(@mark[1] - r)], 
-                   [canvasx(@mark[0] + r), canvasy(@mark[1] + r)])
-  end
-
-  def _state3(x,y) # set line start
-    @mode = 3
-
-    @target = TkcLine.new(self, 
-                          [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)], 
-                          :arrow=>:first, :arrowshape=>[10, 14, 5], 
-                          :fill=>@col, :tags=>[@memo_id_tag])
-    @items << @target
-    @mark = [x, y]
-
-    bind('Motion', proc{|x,y| _state4(x,y)}, '%x', '%y')
-    bind('ButtonRelease-1', proc{|x,y| _state5(x,y)}, '%x', '%y')
-  end
-
-  def _state4(x,y) # create line
-    @mode = 4
-
-    @target.coords([canvasx(@mark[0]), canvasy(@mark[1])], 
-                   [canvasx(x), canvasy(y)])
-  end
-
-  def _state5(x,y) # set text
-    @mode = 5
-
-    if x - @mark[0] >= 0
-      justify = 'left'
-      dx = - @delta
-
-      if y - @mark[1] >= 0
-        anchor = 'nw'
-        dy = - @delta
-      else
-        anchor = 'sw'
-        dy = @delta
-      end
-    else
-      justify = 'right'
-      dx = @delta
-
-      if y - @mark[1] >= 0
-        anchor = 'ne'
-        dy = - @delta
-      else
-        anchor = 'se'
-        dy = @delta
-      end
-    end
-
-    bind_remove('Motion')
-
-    @entry.value = ''
-    @entry.configure(:justify=>justify, :font=>@font, :foreground=>@col)
-
-    ewin = TkcWindow.new(self, [canvasx(x)+dx, canvasy(y)+dy], 
-                         :window=>@entry, :state=>:normal, :anchor=>anchor, 
-                         :tags=>[@memo_id_tag])
-
-    @entry.focus
-    @entry.grab
-    @state.wait
-    @entry.grab_release
-
-    ewin.delete
-
-    @target = TkcText.new(self, [canvasx(x), canvasy(y)], 
-                          :anchor=>anchor, :justify=>justify, 
-                          :fill=>@col, :font=>@font, :text=>@entry.value, 
-                          :tags=>[@memo_id_tag])
-
-    _state0()
-  end
-
-  #-----------------------------------
-  public
-  def load_photo(filename)
-    @photo.configure(:file=>filename)
-  end
-
-  def modified?
-    ! ((find_withtag('all') - [@img]).empty?)
-  end
-
-  def fig_erase
-    (find_withtag('all') - [@img]).each{|item| item.delete}
-  end
-
-  def reset_region
-    width = @photo.width
-    height = @photo.height
-
-    if width > @scr_region[2]
-      @scr_region[0] = -width
-      @scr_region[2] = width
-    end
-
-    if height > @scr_region[3]
-      @scr_region[1] = -height
-      @scr_region[3] = height
-    end
-
-    self.scrollregion(@scr_region)
-    self.xview_moveto(0.25)
-    self.yview_moveto(0.25)
-  end
-
-  def get_texts
-    ret = []
-    find_withtag('all').each{|item|
-      if item.kind_of?(TkcText)
-        ret << item[:text]
-      end
-    }
-    ret
-  end
-end
-############################
-
-# define methods for menu
-def open_file(canvas, fname)
-  if canvas.modified?
-    ret = Tk.messageBox(:icon=>'warning',:type=>'okcancel',:default=>'cancel',
-                        :message=>'Canvas may be modified. Realy erase? ')
-    return if ret == 'cancel'
-  end
-
-  filetypes = [
-    ['GIF Files', '.gif'], 
-    ['GIF Files', [], 'GIFF'], 
-    ['PPM Files', '.ppm'], 
-    ['PGM Files', '.pgm']
-  ]
-
-  begin
-    if Tk::Img::package_version != ''
-      filetypes << ['JPEG Files', ['.jpg', '.jpeg']]
-      filetypes << ['PNG Files', '.png']
-      filetypes << ['PostScript Files', '.ps']
-      filetypes << ['PDF Files', '.pdf']
-      filetypes << ['Windows Bitmap Files', '.bmp']
-      filetypes << ['Windows Icon Files', '.ico']
-      filetypes << ['PCX Files', '.pcx']
-      filetypes << ['Pixmap Files', '.pixmap']
-      filetypes << ['SGI Files', '.sgi']
-      filetypes << ['Sun Raster Files', '.sun']
-      filetypes << ['TGA Files', '.tga']
-      filetypes << ['TIFF Files', '.tiff']
-      filetypes << ['XBM Files', '.xbm']
-      filetypes << ['XPM Files', '.xpm']
-    end
-  rescue
-  end
-
-  filetypes << ['ALL Files', '*']
-
-  fpath = Tk.getOpenFile(:filetypes=>filetypes)
-  return if fpath.empty?
-
-  begin
-    canvas.load_photo(fpath)
-  rescue => e
-    Tk.messageBox(:icon=>'error', :type=>'ok', 
-                  :message=>"Fail to read '#{fpath}'.\n#{e.message}")
-  end
-
-  canvas.fig_erase
-  canvas.reset_region
-
-  fname.value = fpath
-end
-
-# --------------------------------
-def save_memo(canvas, fname)
-  initname = fname.value
-  if initname != '-'
-    initname = File.basename(initname, File.extname(initname))
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'], 
-                                         ['ALL Files', '*'] ], 
-                           :initialfile=>initname)
-  else
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'], 
-                                         ['ALL Files', '*'] ])
-  end
-  return if fpath.empty?
-
-  begin
-    fid = open(fpath, 'w')
-  rescue => e
-    Tk.messageBox(:icon=>'error', :type=>'ok', 
-                  :message=>"Fail to open '#{fname.value}'.\n#{e.message}")
-  end
-
-  begin
-    canvas.get_texts.each{|txt|
-      fid.print(txt, "\n")
-    }
-  ensure
-    fid.close
-  end
-end
-
-# --------------------------------
-def ps_print(canvas, fname)
-  initname = fname.value
-  if initname != '-'
-    initname = File.basename(initname, File.extname(initname))
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'], 
-                                         ['ALL Files', '*'] ], 
-                           :initialfile=>initname)
-  else
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'], 
-                                         ['ALL Files', '*'] ])
-  end
-  return if fpath.empty?
-
-  bbox = canvas.bbox('all')
-  canvas.postscript(:file=>fpath, :x=>bbox[0], :y=>bbox[1], 
-                    :width=>bbox[2] - bbox[0], :height=>bbox[3] - bbox[1])
-end
-
-# --------------------------------
-def quit(canvas)
-  ret = Tk.messageBox(:icon=>'warning', :type=>'okcancel', 
-                      :default=>'cancel', 
-                      :message=>'Realy quit? ')
-  exit if ret == 'ok'
-end
-
-# --------------------------------
-# setup root
-root = TkRoot.new(:title=>'Fig Memo')
-
-# create canvas frame
-canvas = PhotoCanvas.new(root).pack(:fill=>:both, :expand=>true)
-usage_frame = TkFrame.new(root, :relief=>:ridge, :borderwidth=>2)
-hide_btn = TkButton.new(usage_frame, :text=>'hide usage', 
-                        :font=>{:size=>8}, :pady=>1, 
-                        :command=>proc{usage_frame.unpack})
-hide_btn.pack(:anchor=>'e', :padx=>5)
-usage = TkLabel.new(usage_frame, :text=>PhotoCanvas::USAGE, 
-                    :font=>'Helvetica 8', :justify=>:left).pack
-
-show_usage = proc{
-  usage_frame.pack(:before=>canvas, :fill=>:x, :expand=>true)
-}
-
-fname = TkVariable.new('-')
-f = TkFrame.new(root, :relief=>:sunken, :borderwidth=>1).pack(:fill=>:x)
-label = TkLabel.new(f, :textvariable=>fname, 
-                    :font=>{:size=>-12, :weight=>:bold}, 
-                    :anchor=>'w').pack(:side=>:left, :fill=>:x, :padx=>10)
-
-# create menu
-mspec = [
-  [ ['File', 0], 
-    ['Show Usage',      proc{show_usage.call}, 5], 
-    '---', 
-    ['Open Image File', proc{open_file(canvas, fname)}, 0], 
-    ['Save Memo Texts', proc{save_memo(canvas, fname)}, 0], 
-    '---', 
-    ['Save Postscript', proc{ps_print(canvas, fname)}, 5], 
-    '---', 
-    ['Quit', proc{quit(canvas)}, 0]
-  ]
-]
-root.add_menubar(mspec)
-
-# manage wm_protocol
-root.protocol(:WM_DELETE_WINDOW){quit(canvas)}
-
-# show usage
-show_usage.call
-
-# --------------------------------
-# start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/images/earth.gif b/ext/tk/sample/images/earth.gif
deleted file mode 100644
index 2c229eb110..0000000000
--- a/ext/tk/sample/images/earth.gif
+++ /dev/null
diff --git a/ext/tk/sample/images/earthris.gif b/ext/tk/sample/images/earthris.gif
deleted file mode 100644
index c4ee473727..0000000000
--- a/ext/tk/sample/images/earthris.gif
+++ /dev/null
diff --git a/ext/tk/sample/images/tcllogo.gif b/ext/tk/sample/images/tcllogo.gif
deleted file mode 100644
index 4603d4ff41..0000000000
--- a/ext/tk/sample/images/tcllogo.gif
+++ /dev/null
diff --git a/ext/tk/sample/images/teapot.ppm b/ext/tk/sample/images/teapot.ppm
deleted file mode 100644
index b8ab85f3a5..0000000000
--- a/ext/tk/sample/images/teapot.ppm
+++ /dev/null
@@ -1,31 +0,0 @@
-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ç£|쩂ſt명æ¦�ÞŸ{Õ—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ËŒiljgÆ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ÌŽlljgÃ…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/ext/tk/sample/irbtk.rb b/ext/tk/sample/irbtk.rb
deleted file mode 100644
index 53ef10d0d1..0000000000
--- a/ext/tk/sample/irbtk.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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/ext/tk/sample/irbtkw.rbw b/ext/tk/sample/irbtkw.rbw
deleted file mode 100644
index 3fb6dde626..0000000000
--- a/ext/tk/sample/irbtkw.rbw
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  irbtkw.rb : IRB console with Ruby/Tk
-#
-#                                 by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-release = '2008/03/08'
-
-require 'tk'
-begin
-  require 'tktextio'
-rescue LoadError
-  require File.join(File.dirname(File.expand_path(__FILE__)), 'tktextio.rb')
-end
-
-require 'irb'
-
-if TkCore::WITH_ENCODING
-else
-  # $KCODE setup
-  case Tk.encoding
-  when 'shiftjis', 'cp932'
-    $KCODE='SJIS'
-  when 'euc-jp'
-    $KCODE='EUC'
-  when 'utf-8', 'unicode'
-    $KCODE='UTF8'
-  else
-    # unknown
-  end
-end
-
-# console setup
-top = TkToplevel.new(:title=>'IRB console')
-top.protocol(:WM_DELETE_WINDOW){ Tk.exit }
-
-case (Tk.windowingsystem)
-when 'win32'
-  fnt = ['MS Gothic', '-12']
-else
-  fnt = ['courier', '-12']
-end
-
-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/ext/tk/sample/iso2022-kr.txt b/ext/tk/sample/iso2022-kr.txt
deleted file mode 100644
index 2e3fe6ea2a..0000000000
--- a/ext/tk/sample/iso2022-kr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Sample text:
-$)C  Hangul (GQ1[)	>H3gGO<<?d, >H3gGO=J4O1n
diff --git a/ext/tk/sample/menubar1.rb b/ext/tk/sample/menubar1.rb
deleted file mode 100644
index 9fa1201d41..0000000000
--- a/ext/tk/sample/menubar1.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/ext/tk/sample/menubar2.rb b/ext/tk/sample/menubar2.rb
deleted file mode 100644
index 4507d8b2fe..0000000000
--- a/ext/tk/sample/menubar2.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 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/ext/tk/sample/msgs_rb/README b/ext/tk/sample/msgs_rb/README
deleted file mode 100644
index 2e3ff2a9c4..0000000000
--- a/ext/tk/sample/msgs_rb/README
+++ /dev/null
@@ -1,3 +0,0 @@
-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/ext/tk/sample/msgs_rb/cs.msg b/ext/tk/sample/msgs_rb/cs.msg
deleted file mode 100644
index 199f2a73bd..0000000000
--- a/ext/tk/sample/msgs_rb/cs.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-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/ext/tk/sample/msgs_rb/de.msg b/ext/tk/sample/msgs_rb/de.msg
deleted file mode 100644
index 283874df42..0000000000
--- a/ext/tk/sample/msgs_rb/de.msg
+++ /dev/null
@@ -1,88 +0,0 @@
-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/ext/tk/sample/msgs_rb/el.msg b/ext/tk/sample/msgs_rb/el.msg
deleted file mode 100644
index f314ae03eb..0000000000
--- a/ext/tk/sample/msgs_rb/el.msg
+++ /dev/null
@@ -1,98 +0,0 @@
-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/ext/tk/sample/msgs_rb/en.msg b/ext/tk/sample/msgs_rb/en.msg
deleted file mode 100644
index 9b70239511..0000000000
--- a/ext/tk/sample/msgs_rb/en.msg
+++ /dev/null
@@ -1,83 +0,0 @@
-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/ext/tk/sample/msgs_rb/en_gb.msg b/ext/tk/sample/msgs_rb/en_gb.msg
deleted file mode 100644
index 97c58959b1..0000000000
--- a/ext/tk/sample/msgs_rb/en_gb.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    en_gb 'Color', 'Colour'
-}
-
-TkMsgCatalog.new('::tk') {
-    en_gb 'Color', 'Colour'
-}
diff --git a/ext/tk/sample/msgs_rb/eo.msg b/ext/tk/sample/msgs_rb/eo.msg
deleted file mode 100644
index 1630df5e83..0000000000
--- a/ext/tk/sample/msgs_rb/eo.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-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/ext/tk/sample/msgs_rb/es.msg b/ext/tk/sample/msgs_rb/es.msg
deleted file mode 100644
index 460dbe848c..0000000000
--- a/ext/tk/sample/msgs_rb/es.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-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/ext/tk/sample/msgs_rb/fr.msg b/ext/tk/sample/msgs_rb/fr.msg
deleted file mode 100644
index ea85cf1a39..0000000000
--- a/ext/tk/sample/msgs_rb/fr.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-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/ext/tk/sample/msgs_rb/it.msg b/ext/tk/sample/msgs_rb/it.msg
deleted file mode 100644
index a180bdbd99..0000000000
--- a/ext/tk/sample/msgs_rb/it.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-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/ext/tk/sample/msgs_rb/ja.msg b/ext/tk/sample/msgs_rb/ja.msg
deleted file mode 100644
index 40587c1f1d..0000000000
--- a/ext/tk/sample/msgs_rb/ja.msg
+++ /dev/null
@@ -1,13 +0,0 @@
-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/ext/tk/sample/msgs_rb/nl.msg b/ext/tk/sample/msgs_rb/nl.msg
deleted file mode 100644
index 24e41dae86..0000000000
--- a/ext/tk/sample/msgs_rb/nl.msg
+++ /dev/null
@@ -1,123 +0,0 @@
-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/ext/tk/sample/msgs_rb/pl.msg b/ext/tk/sample/msgs_rb/pl.msg
deleted file mode 100644
index 0b3b4445c2..0000000000
--- a/ext/tk/sample/msgs_rb/pl.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-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/ext/tk/sample/msgs_rb/ru.msg b/ext/tk/sample/msgs_rb/ru.msg
deleted file mode 100644
index f389dff0b6..0000000000
--- a/ext/tk/sample/msgs_rb/ru.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-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/ext/tk/sample/msgs_rb2/README b/ext/tk/sample/msgs_rb2/README
deleted file mode 100644
index b8aa114e1b..0000000000
--- a/ext/tk/sample/msgs_rb2/README
+++ /dev/null
@@ -1,5 +0,0 @@
-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/ext/tk/sample/msgs_rb2/de.msg b/ext/tk/sample/msgs_rb2/de.msg
deleted file mode 100644
index 0d6c82d9e5..0000000000
--- a/ext/tk/sample/msgs_rb2/de.msg
+++ /dev/null
@@ -1,88 +0,0 @@
-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/ext/tk/sample/msgs_rb2/ja.msg b/ext/tk/sample/msgs_rb2/ja.msg
deleted file mode 100644
index 84e89aa6ef..0000000000
--- a/ext/tk/sample/msgs_rb2/ja.msg
+++ /dev/null
@@ -1,85 +0,0 @@
-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/ext/tk/sample/msgs_tk/README b/ext/tk/sample/msgs_tk/README
deleted file mode 100644
index c7422e3a9b..0000000000
--- a/ext/tk/sample/msgs_tk/README
+++ /dev/null
@@ -1,4 +0,0 @@
-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/ext/tk/sample/msgs_tk/cs.msg b/ext/tk/sample/msgs_tk/cs.msg
deleted file mode 100644
index 697070985e..0000000000
--- a/ext/tk/sample/msgs_tk/cs.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-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/ext/tk/sample/msgs_tk/de.msg b/ext/tk/sample/msgs_tk/de.msg
deleted file mode 100644
index 437f2ed9e7..0000000000
--- a/ext/tk/sample/msgs_tk/de.msg
+++ /dev/null
@@ -1,88 +0,0 @@
-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/ext/tk/sample/msgs_tk/el.msg b/ext/tk/sample/msgs_tk/el.msg
deleted file mode 100644
index 1e3a539647..0000000000
--- a/ext/tk/sample/msgs_tk/el.msg
+++ /dev/null
@@ -1,103 +0,0 @@
-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/ext/tk/sample/msgs_tk/en.msg b/ext/tk/sample/msgs_tk/en.msg
deleted file mode 100644
index de586d195e..0000000000
--- a/ext/tk/sample/msgs_tk/en.msg
+++ /dev/null
@@ -1,83 +0,0 @@
-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/ext/tk/sample/msgs_tk/en_gb.msg b/ext/tk/sample/msgs_tk/en_gb.msg
deleted file mode 100644
index 1aa5b49380..0000000000
--- a/ext/tk/sample/msgs_tk/en_gb.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset en_gb Color Colour
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset en_gb Color Colour
-}
diff --git a/ext/tk/sample/msgs_tk/eo.msg b/ext/tk/sample/msgs_tk/eo.msg
deleted file mode 100644
index e683cef297..0000000000
--- a/ext/tk/sample/msgs_tk/eo.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-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/ext/tk/sample/msgs_tk/es.msg b/ext/tk/sample/msgs_tk/es.msg
deleted file mode 100644
index ba981236a3..0000000000
--- a/ext/tk/sample/msgs_tk/es.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-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/ext/tk/sample/msgs_tk/fr.msg b/ext/tk/sample/msgs_tk/fr.msg
deleted file mode 100644
index ebbba48ca1..0000000000
--- a/ext/tk/sample/msgs_tk/fr.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-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/ext/tk/sample/msgs_tk/it.msg b/ext/tk/sample/msgs_tk/it.msg
deleted file mode 100644
index b144fcc073..0000000000
--- a/ext/tk/sample/msgs_tk/it.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-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/ext/tk/sample/msgs_tk/ja.msg b/ext/tk/sample/msgs_tk/ja.msg
deleted file mode 100644
index 44a25839db..0000000000
--- a/ext/tk/sample/msgs_tk/ja.msg
+++ /dev/null
@@ -1,13 +0,0 @@
-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/ext/tk/sample/msgs_tk/license.terms b/ext/tk/sample/msgs_tk/license.terms
deleted file mode 100644
index 03ca6fcb31..0000000000
--- a/ext/tk/sample/msgs_tk/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-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/ext/tk/sample/msgs_tk/nl.msg b/ext/tk/sample/msgs_tk/nl.msg
deleted file mode 100644
index d9642e808c..0000000000
--- a/ext/tk/sample/msgs_tk/nl.msg
+++ /dev/null
@@ -1,123 +0,0 @@
-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/ext/tk/sample/msgs_tk/pl.msg b/ext/tk/sample/msgs_tk/pl.msg
deleted file mode 100644
index 2699e42bdf..0000000000
--- a/ext/tk/sample/msgs_tk/pl.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-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/ext/tk/sample/msgs_tk/ru.msg b/ext/tk/sample/msgs_tk/ru.msg
deleted file mode 100644
index a1192b7095..0000000000
--- a/ext/tk/sample/msgs_tk/ru.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-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/ext/tk/sample/multi-ip_sample.rb b/ext/tk/sample/multi-ip_sample.rb
deleted file mode 100644
index 8d6e1bc626..0000000000
--- a/ext/tk/sample/multi-ip_sample.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/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/ext/tk/sample/multi-ip_sample2.rb b/ext/tk/sample/multi-ip_sample2.rb
deleted file mode 100644
index f4a45d8d9a..0000000000
--- a/ext/tk/sample/multi-ip_sample2.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-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/ext/tk/sample/optobj_sample.rb b/ext/tk/sample/optobj_sample.rb
deleted file mode 100644
index cafacbdd17..0000000000
--- a/ext/tk/sample/optobj_sample.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/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/ext/tk/sample/propagate.rb b/ext/tk/sample/propagate.rb
deleted file mode 100644
index 800cef553d..0000000000
--- a/ext/tk/sample/propagate.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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/ext/tk/sample/remote-ip_sample.rb b/ext/tk/sample/remote-ip_sample.rb
deleted file mode 100644
index 3696a20852..0000000000
--- a/ext/tk/sample/remote-ip_sample.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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/ext/tk/sample/remote-ip_sample2.rb b/ext/tk/sample/remote-ip_sample2.rb
deleted file mode 100644
index e12b2a96c9..0000000000
--- a/ext/tk/sample/remote-ip_sample2.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/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/ext/tk/sample/safe-tk.rb b/ext/tk/sample/safe-tk.rb
index e2289697e0..0a25c804f0 100644
--- a/ext/tk/sample/safe-tk.rb
+++ b/ext/tk/sample/safe-tk.rb
@@ -3,113 +3,101 @@
 
 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
+# 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
 }
 
-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} ) ----------"
+# 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(7000, 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/ext/tk/sample/scrollframe.rb b/ext/tk/sample/scrollframe.rb
deleted file mode 100644
index b0ac6d3874..0000000000
--- a/ext/tk/sample/scrollframe.rb
+++ /dev/null
@@ -1,237 +0,0 @@
-#
-#  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/ext/tk/sample/tcltklib/lines3.rb b/ext/tk/sample/tcltklib/lines3.rb
deleted file mode 100644
index caa50f92e7..0000000000
--- a/ext/tk/sample/tcltklib/lines3.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /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/ext/tk/sample/tcltklib/lines4.rb b/ext/tk/sample/tcltklib/lines4.rb
deleted file mode 100644
index 7a1175bce0..0000000000
--- a/ext/tk/sample/tcltklib/lines4.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /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/ext/tk/sample/tcltklib/sample1.rb b/ext/tk/sample/tcltklib/sample1.rb
deleted file mode 100644
index 13df440751..0000000000
--- a/ext/tk/sample/tcltklib/sample1.rb
+++ /dev/null
@@ -1,634 +0,0 @@
-#! /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/ext/tk/sample/tcltklib/sample2.rb b/ext/tk/sample/tcltklib/sample2.rb
deleted file mode 100644
index 110e81ebc4..0000000000
--- a/ext/tk/sample/tcltklib/sample2.rb
+++ /dev/null
@@ -1,451 +0,0 @@
-#!/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_accessor :com_disk
-   
-      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/ext/tk/sample/tkalignbox.rb b/ext/tk/sample/tkalignbox.rb
index 32915a5e69..b56c9cc11e 100644
--- a/ext/tk/sample/tkalignbox.rb
+++ b/ext/tk/sample/tkalignbox.rb
@@ -54,7 +54,7 @@ class TkAlignBox < TkFrame
   def add(*widgets)
     widgets.each{|w|
       unless w.kind_of? TkWindow
-        fail RuntimeError, "#{w.inspect} is not a widget instance."
+	fail RuntimeError, "#{w.inspect} is not a widget instance."
       end
       @widgets.delete(w)
       @widgets << w
@@ -127,10 +127,10 @@ class TkHBox < TkAlignBox
 
   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)
+		    '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
@@ -139,10 +139,10 @@ 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)
+		    '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
@@ -157,10 +157,10 @@ class TkVBox < TkAlignBox
 
   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)
+		    '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
@@ -169,10 +169,10 @@ 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)
+		    '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
@@ -183,43 +183,43 @@ end
 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'))
+	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
+		 :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'))
+	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'))
+	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'))
+	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)
-        })
+	  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/ext/tk/sample/tkballoonhelp.rb b/ext/tk/sample/tkballoonhelp.rb
index c2c95f771d..312e376a07 100644
--- a/ext/tk/sample/tkballoonhelp.rb
+++ b/ext/tk/sample/tkballoonhelp.rb
@@ -24,17 +24,13 @@ class TkBalloonHelp<TkLabel
     @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
+    @parent = parent
 
     @frame = TkToplevel.new(@parent)
     @frame.withdraw
@@ -42,13 +38,7 @@ class TkBalloonHelp<TkLabel
     @frame.transient(TkWinfo.toplevel(@parent))
     @epath = @frame.path
 
-    if keys
-      keys = _symbolkey2str(keys)
-    else
-      keys = {}
-    end
-
-    @command = keys.delete('command')
+    keys = {} unless keys
 
     @interval = keys.delete('interval'){1000}
     _balloon_binding(@interval)
@@ -70,31 +60,10 @@ class TkBalloonHelp<TkLabel
     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
 
@@ -123,72 +92,8 @@ if __FILE__ == $0
   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')
+		      'interval'=>500, '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/ext/tk/sample/tkbiff.rb b/ext/tk/sample/tkbiff.rb
index c6699629cc..e89644bd9d 100644
--- a/ext/tk/sample/tkbiff.rb
+++ b/ext/tk/sample/tkbiff.rb
@@ -40,13 +40,13 @@ class Mail
     @body = []
     while line = f.gets()
       line.chop!
-      next if /^From / =~ line  # skip From-line  
-      break if /^$/ =~ line     # end of header
+      next if /^From / =~ line	# skip From-line  
+      break if /^$/ =~ line	# end of header
       if /^(\S+):\s*(.*)/ =~ line
-        @header[attr = $1.capitalize] = $2
+	@header[attr = $1.capitalize] = $2
       elsif attr
-        sub(/^\s*/, '')
-        @header[attr] += "\n" + $_
+	sub(/^\s*/, '')
+	@header[attr] += "\n" + $_
       end
     end
 
@@ -112,7 +112,7 @@ if defined? Thread
     loop do
       sleep 600
       if Time.now - $check_time > 200
-        Tk.after 5000, proc{check}
+	Tk.after 5000, proc{check}
       end
     end
   end
diff --git a/ext/tk/sample/tkbrowse.rb b/ext/tk/sample/tkbrowse.rb
index 4893f57f95..7395688e97 100644
--- a/ext/tk/sample/tkbrowse.rb
+++ b/ext/tk/sample/tkbrowse.rb
@@ -41,8 +41,8 @@ def browsedir (dir)
 
     list.bind "Double-Button-1", proc{
       for i in TkSelection.get.split
-        print "clicked ", i, "\n"
-        browse dir, i
+	print "clicked ", i, "\n"
+	browse dir, i
       end
     }
     $dirlist[dir] = list
@@ -56,9 +56,9 @@ def browse (dir, file)
   else
     if File.file? file
       if ENV['EDITOR']
-        system format("%s %s&", ENV['EDITOR'], file)
+	system format("%s %s&", ENV['EDITOR'], file)
       else
-        system "xedit #{file}&"
+	system "xedit #{file}&"
       end
     else
       STDERR.print "\"#{file}\" isn't a directory or regular file"
diff --git a/ext/tk/sample/tkcombobox.rb b/ext/tk/sample/tkcombobox.rb
index 1840270951..f0cbdac3ba 100644
--- a/ext/tk/sample/tkcombobox.rb
+++ b/ext/tk/sample/tkcombobox.rb
@@ -45,9 +45,9 @@ EOD
     @scr.command(proc{|*args| @lbox.yview(*args); _config_proc})
 
     @up_arrow   = TkLabel.new(@lbox, :image=>@@up_bmp, 
-                              :relief=>:raised, :borderwidth=>1)
+			      :relief=>:raised, :borderwidth=>1)
     @down_arrow = TkLabel.new(@lbox, :image=>@@down_bmp, 
-                              :relief=>:raised, :borderwidth=>1)
+			      :relief=>:raised, :borderwidth=>1)
 
     _init_binding
 
@@ -62,9 +62,6 @@ EOD
     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?
@@ -198,10 +195,10 @@ EOD
     @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')
+		 @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})
@@ -267,7 +264,7 @@ EOD
     begin
       @var.tkwait
       if (idx = @var.to_i) >= 0
-        @ent.value = @lst.get(idx)
+	@ent.value = @lst.get(idx)
       end
       @top.withdraw
       @btn.relief(:raised)
@@ -275,8 +272,8 @@ EOD
     rescue
     ensure
       begin
-        @top.grab(:release)
-        @ent.focus
+	@top.grab(:release)
+	@ent.focus
       rescue
       end
     end
@@ -299,8 +296,8 @@ EOD
     keys = _symbolkey2str(keys)
 
     @btn = TkLabel.new(@frame, :relief=>:raised, :borderwidth=>3, 
-                       :image=>@@down_btn_bmp).pack(:side=>:right, 
-                                                    :ipadx=>2, :fill=>:y)
+		       :image=>@@down_btn_bmp).pack(:side=>:right, 
+						    :ipadx=>2, :fill=>:y)
     @ent = TkEntry.new(@frame).pack(:side=>:left)
     @path = @ent.path
 
@@ -313,9 +310,9 @@ EOD
     startwait = keys.delete('startwait'){300}
     interval = keys.delete('interval'){150}
     @lst = TkAutoScrollbox.new(@top, 
-                               :startwait=>startwait, 
-                               :interval=>interval).pack(:fill=>:both, 
-                                                         :expand=>true)
+			       :startwait=>startwait, 
+			       :interval=>interval).pack(:fill=>:both, 
+							 :expand=>true)
     @ent_list = []
 
     @var = TkVariable.new
@@ -327,9 +324,6 @@ EOD
     delegate('relief', @frame)
     delegate('borderwidth', @frame)
 
-    delegate('arrowrelief', @lst)
-    delegate('arrowborderwidth', @lst)
-
     if mode = keys.delete('scrollbar')
       scrollbar(mode)
     end
@@ -397,8 +391,7 @@ end
 if __FILE__ == $0
   v = TkVariable.new
   e = TkCombobox.new(:height=>7, :scrollbar=>true, :textvariable=>v, 
-                     :arrowrelief=>:flat, :arrowborderwidth=>0, 
-                     :startwait=>400, :interval=>200).pack
+		     :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'
@@ -409,17 +402,17 @@ if __FILE__ == $0
   }.pack
 
   TkFrame.new(:relief=>:raised, :borderwidth=>2, 
-              :height=>3).pack(:fill=>:x, :expand=>true, :padx=>5, :pady=>3)
+	      :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)
+			  :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)
+		 :command=>proc{l.scrollbar(true)}).pack(:side=>:left)
     TkButton.new(self, :text=>'OFF', 
-                 :command=>proc{l.scrollbar(false)}).pack(:side=>:right)
+		 :command=>proc{l.scrollbar(false)}).pack(:side=>:right)
     pack(:fill=>:x)
   }
   Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt
deleted file mode 100644
index 71e359559a..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-
-  #########################################################################
-  ### 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/ext/tk/sample/tkextlib/ICONS/tkIcons b/ext/tk/sample/tkextlib/ICONS/tkIcons
deleted file mode 100644
index 0d5b2c8695..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/tkIcons
+++ /dev/null
@@ -1,195 +0,0 @@
-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/ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde b/ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde
deleted file mode 100644
index 51f76a0488..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde
+++ /dev/null
@@ -1,658 +0,0 @@
-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/ext/tk/sample/tkextlib/ICONS/tkIcons.kde b/ext/tk/sample/tkextlib/ICONS/tkIcons.kde
deleted file mode 100644
index 0d5b2c8695..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/tkIcons.kde
+++ /dev/null
@@ -1,195 +0,0 @@
-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/ext/tk/sample/tkextlib/ICONS/viewIcons.rb b/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
deleted file mode 100644
index fc88eb5c85..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
+++ /dev/null
@@ -1,329 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/barchart5.rb b/ext/tk/sample/tkextlib/blt/barchart5.rb
deleted file mode 100644
index db181d10ca..0000000000
--- a/ext/tk/sample/tkextlib/blt/barchart5.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/calendar.rb b/ext/tk/sample/tkextlib/blt/calendar.rb
deleted file mode 100644
index 4fc6d64d9e..0000000000
--- a/ext/tk/sample/tkextlib/blt/calendar.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/graph6.rb b/ext/tk/sample/tkextlib/blt/graph6.rb
deleted file mode 100644
index f899b44115..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph6.rb
+++ /dev/null
@@ -1,2222 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/graph7.rb b/ext/tk/sample/tkextlib/blt/graph7.rb
deleted file mode 100644
index 27fbe53d97..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph7.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/graph7a.rb b/ext/tk/sample/tkextlib/blt/graph7a.rb
deleted file mode 100644
index a014f72fc7..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph7a.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/graph7b.rb b/ext/tk/sample/tkextlib/blt/graph7b.rb
deleted file mode 100644
index c589f18d86..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph7b.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/graph7c.rb b/ext/tk/sample/tkextlib/blt/graph7c.rb
deleted file mode 100644
index 495b66f4af..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph7c.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/images/buckskin.gif b/ext/tk/sample/tkextlib/blt/images/buckskin.gif
deleted file mode 100644
index e2d7be9d62..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/buckskin.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/images/chalk.gif b/ext/tk/sample/tkextlib/blt/images/chalk.gif
deleted file mode 100644
index 30d29a7221..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/chalk.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/images/qv100.t.gif b/ext/tk/sample/tkextlib/blt/images/qv100.t.gif
deleted file mode 100644
index 1e738ee86b..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/qv100.t.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/images/rain.gif b/ext/tk/sample/tkextlib/blt/images/rain.gif
deleted file mode 100644
index d7bb417939..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/rain.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/images/sample.gif b/ext/tk/sample/tkextlib/blt/images/sample.gif
deleted file mode 100644
index 1d8a4010c3..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/sample.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/pareto.rb b/ext/tk/sample/tkextlib/blt/pareto.rb
deleted file mode 100644
index 94d5f3f97f..0000000000
--- a/ext/tk/sample/tkextlib/blt/pareto.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/plot1.rb b/ext/tk/sample/tkextlib/blt/plot1.rb
deleted file mode 100644
index 07dff48292..0000000000
--- a/ext/tk/sample/tkextlib/blt/plot1.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/plot1b.rb b/ext/tk/sample/tkextlib/blt/plot1b.rb
deleted file mode 100644
index eb41e361f9..0000000000
--- a/ext/tk/sample/tkextlib/blt/plot1b.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/readme.txt b/ext/tk/sample/tkextlib/blt/readme.txt
deleted file mode 100644
index fe12dd88a3..0000000000
--- a/ext/tk/sample/tkextlib/blt/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The scripts and image files in this directory are based on demo files
-of Tcl/Tk's BLT extention. 
diff --git a/ext/tk/sample/tkextlib/blt/scripts/stipples.rb b/ext/tk/sample/tkextlib/blt/scripts/stipples.rb
deleted file mode 100644
index 47f3c4d063..0000000000
--- a/ext/tk/sample/tkextlib/blt/scripts/stipples.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-$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/ext/tk/sample/tkextlib/blt/winop1.rb b/ext/tk/sample/tkextlib/blt/winop1.rb
deleted file mode 100644
index e94138cd94..0000000000
--- a/ext/tk/sample/tkextlib/blt/winop1.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/blt/winop2.rb b/ext/tk/sample/tkextlib/blt/winop2.rb
deleted file mode 100644
index 1f674ee893..0000000000
--- a/ext/tk/sample/tkextlib/blt/winop2.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt
deleted file mode 100644
index 0c4c16fe47..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-
-  ######################################################################
-  ###  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/ext/tk/sample/tkextlib/bwidget/basic.rb b/ext/tk/sample/tkextlib/bwidget/basic.rb
deleted file mode 100644
index c1521651fd..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/basic.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-#
-#  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/ext/tk/sample/tkextlib/bwidget/bwidget.xbm b/ext/tk/sample/tkextlib/bwidget/bwidget.xbm
deleted file mode 100644
index 5451ebb9c0..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/bwidget.xbm
+++ /dev/null
@@ -1,46 +0,0 @@
-#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/ext/tk/sample/tkextlib/bwidget/demo.rb b/ext/tk/sample/tkextlib/bwidget/demo.rb
deleted file mode 100644
index 785d2681a8..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/demo.rb
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/bwidget/dnd.rb b/ext/tk/sample/tkextlib/bwidget/dnd.rb
deleted file mode 100644
index 1c8b036530..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/dnd.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#  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/ext/tk/sample/tkextlib/bwidget/manager.rb b/ext/tk/sample/tkextlib/bwidget/manager.rb
deleted file mode 100644
index 776cb3065b..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/manager.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-#  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/ext/tk/sample/tkextlib/bwidget/select.rb b/ext/tk/sample/tkextlib/bwidget/select.rb
deleted file mode 100644
index ea24b47e2e..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/select.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-#  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/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb b/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
deleted file mode 100644
index 3d19c8d092..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
+++ /dev/null
@@ -1,221 +0,0 @@
-#
-#  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/ext/tk/sample/tkextlib/bwidget/tree.rb b/ext/tk/sample/tkextlib/bwidget/tree.rb
deleted file mode 100644
index e1fcaa774f..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/tree.rb
+++ /dev/null
@@ -1,289 +0,0 @@
-#
-#  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/ext/tk/sample/tkextlib/bwidget/x1.xbm b/ext/tk/sample/tkextlib/bwidget/x1.xbm
deleted file mode 100644
index 6137a118f8..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/x1.xbm
+++ /dev/null
@@ -1,2258 +0,0 @@
-#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/ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt
deleted file mode 100644
index 22f787609d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-  #######################################################################
-  ###  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/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm
deleted file mode 100644
index 7498e15de2..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#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/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gif
deleted file mode 100644
index bd45628aa7..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gif
deleted file mode 100644
index f91b9e9d1e..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gif
deleted file mode 100644
index 7319f1dcb0..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gif
deleted file mode 100644
index 4258b17591..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gif
deleted file mode 100644
index e462be033f..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gif
deleted file mode 100644
index dddcb8044b..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gif
deleted file mode 100644
index bc8f18c00d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm
deleted file mode 100644
index 4622ae978b..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#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/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gif
deleted file mode 100644
index 4a5be66e76..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gif
deleted file mode 100644
index 9c68ad35f5..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gif
deleted file mode 100644
index bed862c8c4..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm
deleted file mode 100644
index 856bd43785..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#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/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gif
deleted file mode 100644
index 9974f23bf5..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm
deleted file mode 100644
index c50aa4c5f3..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#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/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gif
deleted file mode 100644
index 2b595bb9b7..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gif
deleted file mode 100644
index d321f17457..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gif
deleted file mode 100644
index 00d26febf6..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gif
deleted file mode 100644
index d1ceb1a5c4..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gif
deleted file mode 100644
index f885c9ca5f..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm
deleted file mode 100644
index ffb0686303..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#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/ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb
deleted file mode 100644
index 2b7cd45205..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
deleted file mode 100644
index 4dd929c035..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb
deleted file mode 100644
index c7c043000a..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb
deleted file mode 100644
index ea8d63e6eb..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Canvasprintdialog.new.activate
-
-Tk.mainloop
-
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb
deleted file mode 100644
index bae0eba73a..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
deleted file mode 100644
index ec9c7a1df3..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb b/ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb
deleted file mode 100644
index 5727879217..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Dateentry.new.pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb b/ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb
deleted file mode 100644
index 12d498245d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb
deleted file mode 100644
index 3449cd4b3d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb b/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
deleted file mode 100644
index 197521e0a4..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
deleted file mode 100644
index 85c5d03d17..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
deleted file mode 100644
index 856d883a92..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
deleted file mode 100644
index 4a4c2e7eb7..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
deleted file mode 100644
index bddd542f64..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
deleted file mode 100644
index 6971052b60..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
deleted file mode 100644
index 4738084d9d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb
deleted file mode 100644
index c1a9b3defd..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb b/ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb
deleted file mode 100644
index 7b87a029ed..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
deleted file mode 100644
index 2ad3adb974..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb
deleted file mode 100644
index ff22b2f643..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb
deleted file mode 100644
index 110efb9b96..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb b/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
deleted file mode 100644
index ddb08d8b78..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb b/ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb
deleted file mode 100644
index f9c92bf6dc..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb b/ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb
deleted file mode 100644
index 4e2e21e727..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb b/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
deleted file mode 100644
index 1d2e0a98a3..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb b/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
deleted file mode 100644
index b87a6d27f9..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
deleted file mode 100644
index 891761adc1..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
deleted file mode 100644
index d6f2292650..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
deleted file mode 100644
index 3221dbc30c..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
deleted file mode 100644
index 2f0e3648a6..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
deleted file mode 100644
index 6c6bfbca3f..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
deleted file mode 100644
index e33b81eb6f..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
deleted file mode 100644
index 649de4f024..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb b/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
deleted file mode 100644
index 1fd7a5bc05..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
deleted file mode 100644
index 6e4458e508..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
deleted file mode 100644
index 6779cb57db..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
deleted file mode 100644
index 2c643e56f7..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb b/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
deleted file mode 100644
index 6e1c3fffe3..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb
deleted file mode 100644
index 9cd6a002b0..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb
deleted file mode 100644
index 92c94b96bb..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
deleted file mode 100644
index 5219847c9c..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
deleted file mode 100644
index 04334b8da8..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
deleted file mode 100644
index 0b69751911..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
deleted file mode 100644
index dd1a99a829..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
deleted file mode 100644
index a5d623ae80..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
deleted file mode 100644
index f40b419180..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb b/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
deleted file mode 100644
index c44b5554a6..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb
deleted file mode 100644
index 17197a66b7..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Spindate.new.pack(:padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
deleted file mode 100644
index 0bcdefb763..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
deleted file mode 100644
index 295d38ee96..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb
deleted file mode 100644
index 2c13884b94..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Spintime.new.pack(:padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
deleted file mode 100644
index 6f1ecc4fa4..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
deleted file mode 100644
index 4a5eef5a8f..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb
deleted file mode 100644
index 90be46b40b..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb b/ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb
deleted file mode 100644
index 465939947b..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Timeentry.new.pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb b/ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb
deleted file mode 100644
index bb5945048d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
deleted file mode 100644
index 355466eb1a..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb b/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
deleted file mode 100644
index 808c798aec..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt
deleted file mode 100644
index 272853870c..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-
-  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-  >>>  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/ext/tk/sample/tkextlib/tcllib/datefield.rb b/ext/tk/sample/tkextlib/tcllib/datefield.rb
deleted file mode 100644
index cfeca0c6de..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/datefield.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
deleted file mode 100644
index 053b0de085..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
deleted file mode 100644
index 33a6f29940..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
deleted file mode 100644
index 2b5c7642bb..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tcllib/xyplot.rb b/ext/tk/sample/tkextlib/tcllib/xyplot.rb
deleted file mode 100644
index 8f8c3eb880..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/xyplot.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt
deleted file mode 100644
index 2326ef21fa..0000000000
--- a/ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-  ######################################################################
-  ###  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/ext/tk/sample/tkextlib/tile/demo.rb b/ext/tk/sample/tkextlib/tile/demo.rb
deleted file mode 100644
index 633a072460..0000000000
--- a/ext/tk/sample/tkextlib/tile/demo.rb
+++ /dev/null
@@ -1,983 +0,0 @@
-#!/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
-
-# define Tcl/Tk procedures for compatibility
-Tk::Tile.__define_LoadImages_proc_for_compatibility__!
-Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
-
-unless Tk::Tile::Style.theme_names.include?('step')
-  Tk::Tile::Style.theme_create('step')
-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|ttk)::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 => e
-raise e
-  $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|ttk)::theme::#{theme}/})
-      b.ttk_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.ttk_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|ttk)::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 (pkg = TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
-    unless Tk::Tile::Style.theme_names.find{|n| n == theme}
-      TkPackage.require(pkg)
-    end
-  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.ttk_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.ttk_instate(st)
-    rescue
-      $states_btns[st].ttk_state('disabled')
-    else
-      $states_btns[st].ttk_state('!disabled')
-    end
-  }
-end
-
-def changeState(st)
-  if $Widget.value != ''
-    if $State.bool_element(st)
-      $Widget.window.ttk_state(st)
-    else
-      $Widget.window.ttk_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/ext/tk/sample/tkextlib/tile/iconlib.tcl b/ext/tk/sample/tkextlib/tile/iconlib.tcl
deleted file mode 100644
index 9a93ece504..0000000000
--- a/ext/tk/sample/tkextlib/tile/iconlib.tcl
+++ /dev/null
@@ -1,110 +0,0 @@
-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/ext/tk/sample/tkextlib/tile/readme.txt b/ext/tk/sample/tkextlib/tile/readme.txt
deleted file mode 100644
index a76b3338f7..0000000000
--- a/ext/tk/sample/tkextlib/tile/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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/ext/tk/sample/tkextlib/tile/repeater.tcl b/ext/tk/sample/tkextlib/tile/repeater.tcl
deleted file mode 100644
index 652ba8ab17..0000000000
--- a/ext/tk/sample/tkextlib/tile/repeater.tcl
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# $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/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl b/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl
deleted file mode 100644
index 37e3d07ff7..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gif
deleted file mode 100644
index 3c1be9d880..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gif
deleted file mode 100644
index 1cb36ec554..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gif
deleted file mode 100644
index e363c362ed..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gif
deleted file mode 100644
index cbc3db2756..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gif
deleted file mode 100644
index 14d541b03e..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gif
deleted file mode 100644
index 32584a34b2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gif
deleted file mode 100644
index 913e9da94b..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gif
deleted file mode 100644
index d02208fcf7..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gif
deleted file mode 100644
index 2b0f1fd07b..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gif
deleted file mode 100644
index 6059bae094..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gif
deleted file mode 100644
index 20b6a824f4..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gif
deleted file mode 100644
index 5857616228..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gif
deleted file mode 100644
index 0947f43b90..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gif
deleted file mode 100644
index d9845283a5..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcf b/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcf
deleted file mode 100644
index e38ed19e61..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcf
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gif
deleted file mode 100644
index e819b1b951..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gif
deleted file mode 100644
index b753aead97..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gif
deleted file mode 100644
index 74dbb799a2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gif
deleted file mode 100644
index 8f3d9114a3..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gif
deleted file mode 100644
index 6f360ffd62..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gif
deleted file mode 100644
index f7c21fb0c3..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gif
deleted file mode 100644
index a006630388..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gif
deleted file mode 100644
index 0281de37d8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gif
deleted file mode 100644
index 58ec60c1db..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gif
deleted file mode 100644
index 6cfaa416d1..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gif
deleted file mode 100644
index d9bfc0a7be..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gif
deleted file mode 100644
index 930d7fd9ff..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gif
deleted file mode 100644
index 060be5dd41..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gif
deleted file mode 100644
index c1c089de3e..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gif
deleted file mode 100644
index 1805c2dc7c..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gif
deleted file mode 100644
index bc37b31c3d..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gif
deleted file mode 100644
index d3745c7f62..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl
deleted file mode 100644
index 4facac70d8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl
+++ /dev/null
@@ -1,6 +0,0 @@
-# Package index for tile demo pixmap themes.
-
-if {[file isdirectory [file join $dir blue]]} {
-    package ifneeded tile::theme::blue 0.7 \
-        [list source [file join $dir blue.tcl]]
-}
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl
deleted file mode 100644
index 79fcd7c04e..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl
+++ /dev/null
@@ -1,194 +0,0 @@
-# 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/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gif
deleted file mode 100644
index 2d84f29c60..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gif
deleted file mode 100644
index 52ee752641..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gif
deleted file mode 100644
index ff309c56f2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gif
deleted file mode 100644
index 2159f274a5..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gif
deleted file mode 100644
index 905fa7ed1d..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gif
deleted file mode 100644
index 0323332f30..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gif
deleted file mode 100644
index 20dcadb30e..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gif
deleted file mode 100644
index 129169e4c4..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gif
deleted file mode 100644
index fe9bf98f81..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gif
deleted file mode 100644
index 210734d1ae..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gif
deleted file mode 100644
index 5e1eafa854..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gif
deleted file mode 100644
index bfd74889f8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gif
deleted file mode 100644
index 1095ed7583..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gif
deleted file mode 100644
index 06e8795df8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gif
deleted file mode 100644
index 3c02fcbe81..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gif
deleted file mode 100644
index 1d93973c75..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gif
deleted file mode 100644
index 18fbae08ab..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gif
deleted file mode 100644
index 334e8e4a40..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gif
deleted file mode 100644
index 2e2f1c2f10..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gif
deleted file mode 100644
index 48197cbfc9..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gif
deleted file mode 100644
index 4a294b4984..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gif
deleted file mode 100644
index 65c0e4efa2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gif
deleted file mode 100644
index c8257c9336..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gif
deleted file mode 100644
index 215a73821c..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gif
deleted file mode 100644
index 03099a95be..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gif
deleted file mode 100644
index abec6aba40..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gif
deleted file mode 100644
index 2c223ba2c5..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gif
deleted file mode 100644
index 77ef8a26cf..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gif
deleted file mode 100644
index 3179b87ad9..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gif
deleted file mode 100644
index be01e4a72a..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gif
deleted file mode 100644
index 0bb39e91ff..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gif
deleted file mode 100644
index cf03d7f325..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl
deleted file mode 100644
index 4bb89aa8a5..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/ext/tk/sample/tkextlib/tile/themes/kroc.rb b/ext/tk/sample/tkextlib/tile/themes/kroc.rb
deleted file mode 100644
index 27006d847f..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc.rb
+++ /dev/null
@@ -1,226 +0,0 @@
-#
-# 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 Tk::Tile::TILE_SPEC_VERSION_ID >= 8
-    Tk::Tile::Style.element_create('Button.button', 
-                                   :image, 
-                                   [ $images['button-n'],
-                                     :pressed, $images['button-p'], 
-                                     :active,  $images['button-h'], 
-                                   ], :border=>3, :sticky=>:ew)
-
-    Tk::Tile::Style.element_create('Checkbutton.indicator', 
-                                   :image, 
-                                   [ $images['check-nu'],
-                                     [: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'],
-                                     [:pressed,:selected],$images['radio-nc'],
-                                     :pressed,            $images['radio-nu'],
-                                     [:active,:selected], $images['radio-hc'],
-                                     :active,             $images['radio-hu'],
-                                     :selected,           $images['radio-nc'],
-                                   ], :sticky=>:w)
-
-  elsif 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/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl
deleted file mode 100644
index 73548acef2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gif
deleted file mode 100644
index e7a140dede..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gif
deleted file mode 100644
index 78b506ddeb..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gif
deleted file mode 100644
index a5a4e90be1..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gif
deleted file mode 100644
index 41503c5ebd..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gif
deleted file mode 100644
index b3e512ca67..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gif
deleted file mode 100644
index a28c288fce..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gif
deleted file mode 100644
index 5c23931bbc..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gif
deleted file mode 100644
index 359fe1cc8b..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gif
deleted file mode 100644
index 9f46b37926..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gif
deleted file mode 100644
index 6437f33a7a..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gif
deleted file mode 100644
index 2d2aac8597..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl
deleted file mode 100644
index 179077917c..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl
deleted file mode 100644
index e39aff6f44..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl
deleted file mode 100644
index ea6ed74162..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gif
deleted file mode 100644
index d914e7a3d3..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gif
deleted file mode 100644
index abffaa49f6..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gif
deleted file mode 100644
index 9939ae1d50..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gif
deleted file mode 100644
index 1a45ef2e4b..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gif
deleted file mode 100644
index f4b563fed2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gif
deleted file mode 100644
index 5459d5e615..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gif
deleted file mode 100644
index 118290cd95..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gif
deleted file mode 100644
index 89f9b38c73..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gif
deleted file mode 100644
index 548f3769df..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gif
deleted file mode 100644
index 49a25909f3..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gif
deleted file mode 100644
index e83f7ed985..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gif
deleted file mode 100644
index b279fa50d8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gif
deleted file mode 100644
index 5b4fb4f037..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gif
deleted file mode 100644
index b139e02a09..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gif
deleted file mode 100644
index fbe391f9d8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gif
deleted file mode 100644
index 75a3bd635c..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gif
deleted file mode 100644
index b8ea07ea92..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gif
deleted file mode 100644
index ce8f28404f..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gif
deleted file mode 100644
index 33917715b0..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gif
deleted file mode 100644
index 88925d0e1d..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gif
deleted file mode 100644
index f8723d367a..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gif
deleted file mode 100644
index fb5140e6a1..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gif
deleted file mode 100644
index 176225d9e1..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gif
deleted file mode 100644
index 85bac4579e..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gif
deleted file mode 100644
index cf887f9855..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/toolbutton.tcl b/ext/tk/sample/tkextlib/tile/toolbutton.tcl
deleted file mode 100644
index 4e08034e31..0000000000
--- a/ext/tk/sample/tkextlib/tile/toolbutton.tcl
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# $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/ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt b/ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt
deleted file mode 100644
index 2b3757bb23..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-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/ext/tk/sample/tkextlib/tkHTML/README b/ext/tk/sample/tkextlib/tkHTML/README
deleted file mode 100644
index 1208e270b4..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-   [ 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/ext/tk/sample/tkextlib/tkHTML/hv.rb b/ext/tk/sample/tkextlib/tkHTML/hv.rb
deleted file mode 100644
index a4d78ea5b1..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/hv.rb
+++ /dev/null
@@ -1,313 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tkHTML/page1/image1 b/ext/tk/sample/tkextlib/tkHTML/page1/image1
deleted file mode 100644
index 31e96b6797..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image1
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image10 b/ext/tk/sample/tkextlib/tkHTML/page1/image10
deleted file mode 100644
index 80a8f81686..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image10
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image11 b/ext/tk/sample/tkextlib/tkHTML/page1/image11
deleted file mode 100644
index e8cb01d450..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image11
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image12 b/ext/tk/sample/tkextlib/tkHTML/page1/image12
deleted file mode 100644
index c317bbd5cc..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image12
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image13 b/ext/tk/sample/tkextlib/tkHTML/page1/image13
deleted file mode 100644
index ac4b3cd594..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image13
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image14 b/ext/tk/sample/tkextlib/tkHTML/page1/image14
deleted file mode 100644
index c3b02558e3..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image14
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image2 b/ext/tk/sample/tkextlib/tkHTML/page1/image2
deleted file mode 100644
index da26d7092e..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image2
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image3 b/ext/tk/sample/tkextlib/tkHTML/page1/image3
deleted file mode 100644
index d91cdfafab..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image3
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image4 b/ext/tk/sample/tkextlib/tkHTML/page1/image4
deleted file mode 100644
index 5fdf70c0e5..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image4
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image5 b/ext/tk/sample/tkextlib/tkHTML/page1/image5
deleted file mode 100644
index 67cd14d78d..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image5
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image6 b/ext/tk/sample/tkextlib/tkHTML/page1/image6
deleted file mode 100644
index 9e05aa0f36..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image6
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image7 b/ext/tk/sample/tkextlib/tkHTML/page1/image7
deleted file mode 100644
index 879656d45c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image7
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image8 b/ext/tk/sample/tkextlib/tkHTML/page1/image8
deleted file mode 100644
index 8c647c4f00..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image8
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image9 b/ext/tk/sample/tkextlib/tkHTML/page1/image9
deleted file mode 100644
index 3a7707589b..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image9
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/index.html b/ext/tk/sample/tkextlib/tkHTML/page1/index.html
deleted file mode 100644
index 9efac7f7af..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/index.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<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/ext/tk/sample/tkextlib/tkHTML/page2/image1 b/ext/tk/sample/tkextlib/tkHTML/page2/image1
deleted file mode 100644
index 2ed6ddcfe1..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image1
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image10 b/ext/tk/sample/tkextlib/tkHTML/page2/image10
deleted file mode 100644
index 3021b68990..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image10
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image11 b/ext/tk/sample/tkextlib/tkHTML/page2/image11
deleted file mode 100644
index 41d1fe3666..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image11
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image12 b/ext/tk/sample/tkextlib/tkHTML/page2/image12
deleted file mode 100644
index 655a686541..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image12
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image13 b/ext/tk/sample/tkextlib/tkHTML/page2/image13
deleted file mode 100644
index 97d5950e8c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image13
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image14 b/ext/tk/sample/tkextlib/tkHTML/page2/image14
deleted file mode 100644
index 6d73ad833c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image14
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image15 b/ext/tk/sample/tkextlib/tkHTML/page2/image15
deleted file mode 100644
index 90cc3b2b16..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image15
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image16 b/ext/tk/sample/tkextlib/tkHTML/page2/image16
deleted file mode 100644
index 93aa853cf1..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image16
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image17 b/ext/tk/sample/tkextlib/tkHTML/page2/image17
deleted file mode 100644
index f46f0308cd..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image17
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image18 b/ext/tk/sample/tkextlib/tkHTML/page2/image18
deleted file mode 100644
index 3badd5e909..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image18
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image19 b/ext/tk/sample/tkextlib/tkHTML/page2/image19
deleted file mode 100644
index bd4f6d9677..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image19
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image2 b/ext/tk/sample/tkextlib/tkHTML/page2/image2
deleted file mode 100644
index 7566dda25d..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image2
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image20 b/ext/tk/sample/tkextlib/tkHTML/page2/image20
deleted file mode 100644
index 358fa95f63..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image20
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image21 b/ext/tk/sample/tkextlib/tkHTML/page2/image21
deleted file mode 100644
index c81aa52588..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image21
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image22 b/ext/tk/sample/tkextlib/tkHTML/page2/image22
deleted file mode 100644
index 6cbd63022a..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image22
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image23 b/ext/tk/sample/tkextlib/tkHTML/page2/image23
deleted file mode 100644
index e8173a7456..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image23
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image24 b/ext/tk/sample/tkextlib/tkHTML/page2/image24
deleted file mode 100644
index bffd4b4956..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image24
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image25 b/ext/tk/sample/tkextlib/tkHTML/page2/image25
deleted file mode 100644
index c656fa4f30..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image25
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image26 b/ext/tk/sample/tkextlib/tkHTML/page2/image26
deleted file mode 100644
index bc93fdb259..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image26
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image27 b/ext/tk/sample/tkextlib/tkHTML/page2/image27
deleted file mode 100644
index 6ad0eff1e7..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image27
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image28 b/ext/tk/sample/tkextlib/tkHTML/page2/image28
deleted file mode 100644
index 88f0d7cea6..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image28
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image29 b/ext/tk/sample/tkextlib/tkHTML/page2/image29
deleted file mode 100644
index e0704183b3..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image29
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image3 b/ext/tk/sample/tkextlib/tkHTML/page2/image3
deleted file mode 100644
index ac3fa33e6f..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image3
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image30 b/ext/tk/sample/tkextlib/tkHTML/page2/image30
deleted file mode 100644
index 4a41950434..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image30
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image31 b/ext/tk/sample/tkextlib/tkHTML/page2/image31
deleted file mode 100644
index 60f13ed564..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image31
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image32 b/ext/tk/sample/tkextlib/tkHTML/page2/image32
deleted file mode 100644
index 04ddc4e8d7..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image32
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image33 b/ext/tk/sample/tkextlib/tkHTML/page2/image33
deleted file mode 100644
index c1ecfff6c4..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image33
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image34 b/ext/tk/sample/tkextlib/tkHTML/page2/image34
deleted file mode 100644
index 3dfd5d76e2..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image34
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image35 b/ext/tk/sample/tkextlib/tkHTML/page2/image35
deleted file mode 100644
index aea44f3017..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image35
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image36 b/ext/tk/sample/tkextlib/tkHTML/page2/image36
deleted file mode 100644
index baef0e0380..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image36
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image37 b/ext/tk/sample/tkextlib/tkHTML/page2/image37
deleted file mode 100644
index 6c6ba52b45..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image37
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image38 b/ext/tk/sample/tkextlib/tkHTML/page2/image38
deleted file mode 100644
index e298e04b29..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image38
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image39 b/ext/tk/sample/tkextlib/tkHTML/page2/image39
deleted file mode 100644
index e16e2f10d5..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image39
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image4 b/ext/tk/sample/tkextlib/tkHTML/page2/image4
deleted file mode 100644
index 9e5e46b7e5..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image4
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image5 b/ext/tk/sample/tkextlib/tkHTML/page2/image5
deleted file mode 100644
index 646a6d9a51..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image5
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image6 b/ext/tk/sample/tkextlib/tkHTML/page2/image6
deleted file mode 100644
index 7df417c710..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image6
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image7 b/ext/tk/sample/tkextlib/tkHTML/page2/image7
deleted file mode 100644
index 0e6ac10aff..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image7
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image8 b/ext/tk/sample/tkextlib/tkHTML/page2/image8
deleted file mode 100644
index ba7fb476b9..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image8
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image9 b/ext/tk/sample/tkextlib/tkHTML/page2/image9
deleted file mode 100644
index b1cad73ae9..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image9
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/index.html b/ext/tk/sample/tkextlib/tkHTML/page2/index.html
deleted file mode 100644
index 7eaf2d2cc9..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/index.html
+++ /dev/null
@@ -1,433 +0,0 @@
-<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/ext/tk/sample/tkextlib/tkHTML/page3/image1 b/ext/tk/sample/tkextlib/tkHTML/page3/image1
deleted file mode 100644
index 814d1e8f08..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image1
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image10 b/ext/tk/sample/tkextlib/tkHTML/page3/image10
deleted file mode 100644
index 45001faf05..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image10
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image11 b/ext/tk/sample/tkextlib/tkHTML/page3/image11
deleted file mode 100644
index 7c4c170f21..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image11
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image12 b/ext/tk/sample/tkextlib/tkHTML/page3/image12
deleted file mode 100644
index 903e7344a6..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image12
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image13 b/ext/tk/sample/tkextlib/tkHTML/page3/image13
deleted file mode 100644
index 226d4f68c2..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image13
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image14 b/ext/tk/sample/tkextlib/tkHTML/page3/image14
deleted file mode 100644
index 8e8c71814c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image14
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image2 b/ext/tk/sample/tkextlib/tkHTML/page3/image2
deleted file mode 100644
index 2ddeb3258c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image2
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image3 b/ext/tk/sample/tkextlib/tkHTML/page3/image3
deleted file mode 100644
index 1651ba7e41..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image3
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image4 b/ext/tk/sample/tkextlib/tkHTML/page3/image4
deleted file mode 100644
index b565c8dd0e..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image4
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image5 b/ext/tk/sample/tkextlib/tkHTML/page3/image5
deleted file mode 100644
index e1268b81c0..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image5
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image6 b/ext/tk/sample/tkextlib/tkHTML/page3/image6
deleted file mode 100644
index 1a6b260b40..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image6
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image7 b/ext/tk/sample/tkextlib/tkHTML/page3/image7
deleted file mode 100644
index cec7aa04d8..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image7
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image8 b/ext/tk/sample/tkextlib/tkHTML/page3/image8
deleted file mode 100644
index ad0d748d65..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image8
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image9 b/ext/tk/sample/tkextlib/tkHTML/page3/image9
deleted file mode 100644
index 46ade3018b..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image9
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/index.html b/ext/tk/sample/tkextlib/tkHTML/page3/index.html
deleted file mode 100644
index ce92e8a22e..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/index.html
+++ /dev/null
@@ -1,2787 +0,0 @@
-<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/ext/tk/sample/tkextlib/tkHTML/page4/image1 b/ext/tk/sample/tkextlib/tkHTML/page4/image1
deleted file mode 100644
index da26d7092e..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image1
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image2 b/ext/tk/sample/tkextlib/tkHTML/page4/image2
deleted file mode 100644
index e176a96a55..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image2
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image3 b/ext/tk/sample/tkextlib/tkHTML/page4/image3
deleted file mode 100644
index e829d3712c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image3
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image4 b/ext/tk/sample/tkextlib/tkHTML/page4/image4
deleted file mode 100644
index f14ea13547..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image4
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image5 b/ext/tk/sample/tkextlib/tkHTML/page4/image5
deleted file mode 100644
index 4ef6277226..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image5
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image6 b/ext/tk/sample/tkextlib/tkHTML/page4/image6
deleted file mode 100644
index 1adb261b40..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image6
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image7 b/ext/tk/sample/tkextlib/tkHTML/page4/image7
deleted file mode 100644
index ba0d26ec18..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image7
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image8 b/ext/tk/sample/tkextlib/tkHTML/page4/image8
deleted file mode 100644
index 8b81d58e27..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image8
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image9 b/ext/tk/sample/tkextlib/tkHTML/page4/image9
deleted file mode 100644
index f0a352f9d0..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image9
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/index.html b/ext/tk/sample/tkextlib/tkHTML/page4/index.html
deleted file mode 100644
index c7bfde35a5..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/index.html
+++ /dev/null
@@ -1,768 +0,0 @@
-<!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/ext/tk/sample/tkextlib/tkHTML/ss.rb b/ext/tk/sample/tkextlib/tkHTML/ss.rb
deleted file mode 100644
index 1c13d7ac34..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/ss.rb
+++ /dev/null
@@ -1,436 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tkimg/demo.rb b/ext/tk/sample/tkextlib/tkimg/demo.rb
deleted file mode 100644
index a0c4d1b64f..0000000000
--- a/ext/tk/sample/tkextlib/tkimg/demo.rb
+++ /dev/null
@@ -1,1478 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension b/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension
deleted file mode 100644
index 7f515feee8..0000000000
--- a/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension
+++ /dev/null
@@ -1,41 +0,0 @@
-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/ext/tk/sample/tkextlib/tkimg/readme.txt b/ext/tk/sample/tkextlib/tkimg/readme.txt
deleted file mode 100644
index 4d9774492c..0000000000
--- a/ext/tk/sample/tkextlib/tkimg/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-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/ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt
deleted file mode 100644
index dd176a7ccf..0000000000
--- a/ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-
-  #######################################################################
-  ###  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/ext/tk/sample/tkextlib/tktable/basic.rb b/ext/tk/sample/tkextlib/tktable/basic.rb
deleted file mode 100644
index 0d2d48893a..0000000000
--- a/ext/tk/sample/tkextlib/tktable/basic.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tktable/buttons.rb b/ext/tk/sample/tkextlib/tktable/buttons.rb
deleted file mode 100644
index b21e8673c2..0000000000
--- a/ext/tk/sample/tkextlib/tktable/buttons.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tktable/command.rb b/ext/tk/sample/tkextlib/tktable/command.rb
deleted file mode 100644
index bf36159ccc..0000000000
--- a/ext/tk/sample/tkextlib/tktable/command.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tktable/debug.rb b/ext/tk/sample/tkextlib/tktable/debug.rb
deleted file mode 100644
index d5cd5e49ba..0000000000
--- a/ext/tk/sample/tkextlib/tktable/debug.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tktable/dynarows.rb b/ext/tk/sample/tkextlib/tktable/dynarows.rb
deleted file mode 100644
index d083e26559..0000000000
--- a/ext/tk/sample/tkextlib/tktable/dynarows.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tktable/maxsize.rb b/ext/tk/sample/tkextlib/tktable/maxsize.rb
deleted file mode 100644
index aff68ff377..0000000000
--- a/ext/tk/sample/tkextlib/tktable/maxsize.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tktable/spreadsheet.rb b/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
deleted file mode 100644
index 9da896f5a7..0000000000
--- a/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/tktable/tcllogo.gif b/ext/tk/sample/tkextlib/tktable/tcllogo.gif
deleted file mode 100755
index 4603d4ff41..0000000000
--- a/ext/tk/sample/tkextlib/tktable/tcllogo.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tktable/valid.rb b/ext/tk/sample/tkextlib/tktable/valid.rb
deleted file mode 100644
index e5d3f11d84..0000000000
--- a/ext/tk/sample/tkextlib/tktable/valid.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/treectrl/bitmaps.rb b/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
deleted file mode 100644
index 745e6a2e5b..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# 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/ext/tk/sample/tkextlib/treectrl/demo.rb b/ext/tk/sample/tkextlib/treectrl/demo.rb
deleted file mode 100644
index eed95d0e1c..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/demo.rb
+++ /dev/null
@@ -1,1311 +0,0 @@
-#!/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)
-if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-  # ruby 1.9.x --> use Hash#key
-  # Because Hash#index show warning "Hash#index is deprecated; use Hash#key".
-else
-  # 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/ext/tk/sample/tkextlib/treectrl/explorer.rb b/ext/tk/sample/tkextlib/treectrl/explorer.rb
deleted file mode 100644
index 242777cbce..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/explorer.rb
+++ /dev/null
@@ -1,430 +0,0 @@
-
-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/ext/tk/sample/tkextlib/treectrl/help.rb b/ext/tk/sample/tkextlib/treectrl/help.rb
deleted file mode 100644
index af026fc006..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/help.rb
+++ /dev/null
@@ -1,404 +0,0 @@
-#
-# 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/ext/tk/sample/tkextlib/treectrl/imovie.rb b/ext/tk/sample/tkextlib/treectrl/imovie.rb
deleted file mode 100644
index d61bf9a7c3..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/imovie.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# 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/ext/tk/sample/tkextlib/treectrl/layout.rb b/ext/tk/sample/tkextlib/treectrl/layout.rb
deleted file mode 100644
index 745ac86f36..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/layout.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-#
-# 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/ext/tk/sample/tkextlib/treectrl/mailwasher.rb b/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
deleted file mode 100644
index 836e1e87de..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
+++ /dev/null
@@ -1,269 +0,0 @@
-#
-# 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/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb b/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
deleted file mode 100644
index c3af86868e..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# 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/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb b/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
deleted file mode 100644
index d7e7f7e004..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
+++ /dev/null
@@ -1,448 +0,0 @@
-#
-# 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/ext/tk/sample/tkextlib/treectrl/pics/big-dll.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-dll.gif
deleted file mode 100644
index 09170c0e26..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-dll.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/big-exe.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-exe.gif
deleted file mode 100644
index e19aac1a2d..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-exe.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/big-file.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-file.gif
deleted file mode 100644
index 6c752312a3..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-file.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/big-folder.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-folder.gif
deleted file mode 100644
index 186c9749fd..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-folder.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/big-txt.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-txt.gif
deleted file mode 100644
index a93492586e..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-txt.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/checked.gif b/ext/tk/sample/tkextlib/treectrl/pics/checked.gif
deleted file mode 100644
index 3b9b176ab3..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/checked.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/file.gif b/ext/tk/sample/tkextlib/treectrl/pics/file.gif
deleted file mode 100644
index a64c2a06bd..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/file.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gif b/ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gif
deleted file mode 100644
index 0a064376c9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/folder-open.gif b/ext/tk/sample/tkextlib/treectrl/pics/folder-open.gif
deleted file mode 100644
index 3fac27ffd9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/folder-open.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gif b/ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gif
deleted file mode 100644
index 0a0497bfa3..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gif b/ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gif
deleted file mode 100644
index 40656c5194..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/help-page.gif b/ext/tk/sample/tkextlib/treectrl/pics/help-page.gif
deleted file mode 100644
index e1ce1d72f5..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/help-page.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gif
deleted file mode 100644
index 5fd9215551..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gif
deleted file mode 100644
index 3d2d1c17c2..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gif
deleted file mode 100644
index 9fccf12b51..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gif
deleted file mode 100644
index eff851c9bb..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gif
deleted file mode 100644
index ad00c827f6..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gif
deleted file mode 100644
index 238bf162ac..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gif
deleted file mode 100644
index a9287e1b1c..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gif
deleted file mode 100644
index e64866a394..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gif
deleted file mode 100644
index cf652beff2..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-print.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-print.gif
deleted file mode 100644
index 7ac25b10e9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-print.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gif
deleted file mode 100644
index 90ef62971f..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gif
deleted file mode 100644
index 9de742c198..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-search.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-search.gif
deleted file mode 100644
index 1f9a047701..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-search.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-security.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-security.gif
deleted file mode 100644
index 86d3943786..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-security.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gif b/ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gif
deleted file mode 100644
index 81302c80c1..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gif b/ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gif
deleted file mode 100644
index 0a2cd80040..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gif
deleted file mode 100644
index b1c2afd426..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gif
deleted file mode 100644
index 8578132702..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gif
deleted file mode 100644
index 7cc8369b4b..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gif
deleted file mode 100644
index f19585050f..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gif
deleted file mode 100644
index b3f733563b..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gif
deleted file mode 100644
index 29ad9b466e..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gif
deleted file mode 100644
index f41d804444..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gif
deleted file mode 100644
index 0c74970d32..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gif
deleted file mode 100644
index 92325fa85f..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gif
deleted file mode 100644
index c7e80527a0..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gif
deleted file mode 100644
index 2f15a3af05..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gif
deleted file mode 100644
index a6f956207a..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gif
deleted file mode 100644
index 963b56c4c9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gif
deleted file mode 100644
index c950845d62..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gif
deleted file mode 100644
index 3df4b99439..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gif
deleted file mode 100644
index 87ec861312..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/sky.gif b/ext/tk/sample/tkextlib/treectrl/pics/sky.gif
deleted file mode 100644
index b7fbf14a0a..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/sky.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-dll.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-dll.gif
deleted file mode 100644
index d8875ec23f..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-dll.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-exe.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-exe.gif
deleted file mode 100644
index 69d30beacd..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-exe.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-file.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-file.gif
deleted file mode 100644
index f340662879..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-file.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-folder.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-folder.gif
deleted file mode 100644
index ad1b24da84..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-folder.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-txt.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-txt.gif
deleted file mode 100644
index cdc7cbfe99..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-txt.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/unchecked.gif b/ext/tk/sample/tkextlib/treectrl/pics/unchecked.gif
deleted file mode 100644
index 833e48268b..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/unchecked.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/random.rb b/ext/tk/sample/tkextlib/treectrl/random.rb
deleted file mode 100644
index 2c9e614aa5..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/random.rb
+++ /dev/null
@@ -1,508 +0,0 @@
-# 
-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/ext/tk/sample/tkextlib/treectrl/readme.txt b/ext/tk/sample/tkextlib/treectrl/readme.txt
deleted file mode 100644
index 9f26ac069c..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The scripts and image files in this directory are based on demo files
-of Tcl/Tk's TreeCtrl extention. 
diff --git a/ext/tk/sample/tkextlib/treectrl/www-options.rb b/ext/tk/sample/tkextlib/treectrl/www-options.rb
deleted file mode 100644
index efa55ca06c..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/www-options.rb
+++ /dev/null
@@ -1,303 +0,0 @@
-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/ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt
deleted file mode 100644
index f5f2f770cf..0000000000
--- a/ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-
-  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-  >>>  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/ext/tk/sample/tkextlib/vu/README.txt b/ext/tk/sample/tkextlib/vu/README.txt
deleted file mode 100644
index ce5f371fac..0000000000
--- a/ext/tk/sample/tkextlib/vu/README.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-
-  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-  >>>  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/ext/tk/sample/tkextlib/vu/canvItems.rb b/ext/tk/sample/tkextlib/vu/canvItems.rb
deleted file mode 100644
index 33acf4f7e7..0000000000
--- a/ext/tk/sample/tkextlib/vu/canvItems.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/vu/canvSticker.rb b/ext/tk/sample/tkextlib/vu/canvSticker.rb
deleted file mode 100644
index e2cd604975..0000000000
--- a/ext/tk/sample/tkextlib/vu/canvSticker.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/vu/canvSticker2.rb b/ext/tk/sample/tkextlib/vu/canvSticker2.rb
deleted file mode 100644
index 548a72c2cb..0000000000
--- a/ext/tk/sample/tkextlib/vu/canvSticker2.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/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 \u00E4\u00F6\u00FC\u00DF\u0040\u00B2\u00B3\u00BC\u00BD\u00BE'),
-             :center ]
-txt_conf = [ [250, 250],
-             Tk::UTF8_String('Text    \u00E4\u00F6\u00FC\u00DF\u0040\u00B2\u00B3\u00BC\u00BD\u00BE'),
-             :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/ext/tk/sample/tkextlib/vu/dial_demo.rb b/ext/tk/sample/tkextlib/vu/dial_demo.rb
deleted file mode 100644
index 09bd3e9186..0000000000
--- a/ext/tk/sample/tkextlib/vu/dial_demo.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/vu/m128_000.xbm b/ext/tk/sample/tkextlib/vu/m128_000.xbm
deleted file mode 100644
index 455e3c5e0f..0000000000
--- a/ext/tk/sample/tkextlib/vu/m128_000.xbm
+++ /dev/null
@@ -1,174 +0,0 @@
-#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/ext/tk/sample/tkextlib/vu/oscilloscope.rb b/ext/tk/sample/tkextlib/vu/oscilloscope.rb
deleted file mode 100644
index 2015e46645..0000000000
--- a/ext/tk/sample/tkextlib/vu/oscilloscope.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/vu/pie.rb b/ext/tk/sample/tkextlib/vu/pie.rb
deleted file mode 100644
index ed598d6233..0000000000
--- a/ext/tk/sample/tkextlib/vu/pie.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/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/ext/tk/sample/tkextlib/vu/vu_demo.rb b/ext/tk/sample/tkextlib/vu/vu_demo.rb
deleted file mode 100644
index d078ae16f2..0000000000
--- a/ext/tk/sample/tkextlib/vu/vu_demo.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/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/ext/tk/sample/tkfrom.rb b/ext/tk/sample/tkfrom.rb
index 2cece7337e..25f1d7c429 100644
--- a/ext/tk/sample/tkfrom.rb
+++ b/ext/tk/sample/tkfrom.rb
@@ -22,13 +22,13 @@ class Mail
     @body = []
     while line = f.gets()
       $_.chop!
-      next if /^From / =~ line  # skip From-line  
-      break if /^$/ =~ line     # end of header
+      next if /^From / =~ line	# skip From-line  
+      break if /^$/ =~ line	# end of header
       if /^(\S+):\s*(.*)/ =~ line
-        @header[attr = $1.capitalize] = $2
+	@header[attr = $1.capitalize] = $2
       elsif attr
-        sub(/^\s*/, '')
-        @header[attr] += "\n" + $_
+	sub(/^\s*/, '')
+	@header[attr] += "\n" + $_
       end
     end
 
@@ -65,7 +65,7 @@ list = scroll = nil
 TkFrame.new{|f|
   list = TkListbox.new(f) {
     yscroll proc{|*idx|
-        scroll.set *idx
+	scroll.set *idx
     }
     relief 'raised'
 #    geometry "80x5"
diff --git a/ext/tk/sample/tkhello.rb b/ext/tk/sample/tkhello.rb
index 3b505f4983..ab236963e8 100644
--- a/ext/tk/sample/tkhello.rb
+++ b/ext/tk/sample/tkhello.rb
@@ -1,10 +1,10 @@
 require "tk"
 
 TkButton.new(nil, 
-             :text => 'hello',
-             :command => proc{print "hello\n"}).pack(:fill=>'x')
+	     'text' => 'hello',
+	     'command' => proc{print "hello\n"}).pack('fill'=>'x')
 TkButton.new(nil,
-             :text => 'quit',
-             :command => proc{exit}).pack(:fill=>'x')
+	     'text' => 'quit',
+	     'command' => proc{exit}).pack('fill'=>'x')
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkline.rb b/ext/tk/sample/tkline.rb
index 3124c2fe0c..2406b0749f 100644
--- a/ext/tk/sample/tkline.rb
+++ b/ext/tk/sample/tkline.rb
@@ -8,15 +8,13 @@ def start_random
   if defined? Thread
     Thread.start do
       loop do
-        sleep 2
-        Line.new($c, rand(400), rand(200), rand(400), rand(200))
+	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
diff --git a/ext/tk/sample/tkmenubutton.rb b/ext/tk/sample/tkmenubutton.rb
index 37f6128fd9..1c7f51000b 100644
--- a/ext/tk/sample/tkmenubutton.rb
+++ b/ext/tk/sample/tkmenubutton.rb
@@ -11,7 +11,7 @@ TkFrame.new{|f|
 
 
   TkMenubutton.new(:parent=>f, :text=>'Right', :underline=>0, 
-                   :direction=>:right, :relief=>:raised){|mb|
+		   :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' + 
@@ -24,7 +24,7 @@ TkFrame.new{|f|
   }
 
   TkMenubutton.new(:parent=>f, :text=>'Below', :underline=>0, 
-                   :direction=>:below, :relief=>:raised){|mb|
+		   :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' + 
@@ -37,7 +37,7 @@ TkFrame.new{|f|
   }
 
   TkMenubutton.new(:parent=>f, :text=>'Above', :underline=>0, 
-                   :direction=>:above, :relief=>:raised){|mb|
+		   :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' + 
@@ -50,7 +50,7 @@ TkFrame.new{|f|
   }
 
   TkMenubutton.new(:parent=>f, :text=>'Left', :underline=>0, 
-                   :direction=>:left, :relief=>:raised){|mb|
+		   :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' + 
@@ -65,7 +65,7 @@ TkFrame.new{|f|
 
 ############################
 TkFrame.new(:borderwidth=>2, :relief=>:sunken, 
-            :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
+	    :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
 ############################
 
 TkLabel.new(:text=>'Sample of TkOptionMenu').pack(:side=>:top)
@@ -83,21 +83,21 @@ TkFrame.new{|f|
   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]
+	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]
+	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)
+			   :image=>no_sel, :selectimage=>sel)
     }
     optMB.menuconfigure(:tearoff, 1)
     %w(Black gray75 gray50 White).each{|color|
@@ -115,7 +115,7 @@ TkFrame.new{|f|
 
 ############################
 TkFrame.new(:borderwidth=>2, :relief=>:sunken, 
-            :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
+	    :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
 ############################
 
 root = TkRoot.new(:title=>'menubutton samples')
@@ -127,8 +127,8 @@ TkButton.new(root, :text=>'exit', :command=>proc{exit}){
 # 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')
+	      p widget.entrycget('active', :label)
+	    }, '%W')
 
 ############################
 
diff --git a/ext/tk/sample/tkmsgcat-load_rb.rb b/ext/tk/sample/tkmsgcat-load_rb.rb
deleted file mode 100644
index 5373e0086f..0000000000
--- a/ext/tk/sample/tkmsgcat-load_rb.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/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/ext/tk/sample/tkmsgcat-load_rb2.rb b/ext/tk/sample/tkmsgcat-load_rb2.rb
deleted file mode 100644
index 55246545c8..0000000000
--- a/ext/tk/sample/tkmsgcat-load_rb2.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/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/ext/tk/sample/tkmsgcat-load_tk.rb b/ext/tk/sample/tkmsgcat-load_tk.rb
deleted file mode 100644
index 45d68e4e0b..0000000000
--- a/ext/tk/sample/tkmsgcat-load_tk.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/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/ext/tk/sample/tkmulticolumnlist.rb b/ext/tk/sample/tkmulticolumnlist.rb
index 255eb691e5..5d6aa81bcd 100644
--- a/ext/tk/sample/tkmulticolumnlist.rb
+++ b/ext/tk/sample/tkmulticolumnlist.rb
@@ -55,28 +55,28 @@ class TkMultiColumnList < TkText
 
     # virtical scrollbar
     @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                 'borderwidth'=>@scrbar_border, 
-                                 'width'=>@scrbar_width)
+				 'borderwidth'=>@scrbar_border, 
+				 'width'=>@scrbar_width)
 
     # horizontal scrollbar
     @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                 'borderwidth'=>@scrbar_border, 
-                                 'width'=>@scrbar_width)
+				 'borderwidth'=>@scrbar_border, 
+				 'width'=>@scrbar_width)
 
     # create base flames
     @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                            'width'=>@window_width)
+			    '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')
+			     'window'=>@f_title, 'anchor'=>'nw')
 
     @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                            'width'=>@window_width)
+			    '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)
+			    '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')
 
@@ -86,9 +86,9 @@ class TkMultiColumnList < TkText
     title_info.each_with_index{|(label, width), idx|
       # set relation between label and index
       if @name_index.include?(label)
-        @name_index[label] << idx
+	@name_index[label] << idx
       else
-        @name_index[label] = [idx]
+	@name_index[label] = [idx]
       end
 
       # calculate relative positioning
@@ -100,69 +100,69 @@ class TkMultiColumnList < TkText
       base = [f]
 
       title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border, 
-                          'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
+			  '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])
+	      '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)
+			       '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)
+	      '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')
+				     '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])
+	      'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
       @lbox_list[idx].xscrollbar(@hscr_list[idx])
 
@@ -172,12 +172,12 @@ class TkMultiColumnList < TkText
 
     # pad
     @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised', 
-                               'borderwidth'=>@title_border, 
-                               'highlightthickness'=>@h_l_thick)
+			       'borderwidth'=>@title_border, 
+			       'highlightthickness'=>@h_l_thick)
 
     @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken', 
-                             'borderwidth'=>1, 
-                             'highlightthickness'=>@h_l_thick)
+			     'borderwidth'=>1, 
+			     'highlightthickness'=>@h_l_thick)
 
     # height check
     title_height = 0
@@ -205,27 +205,27 @@ class TkMultiColumnList < TkText
     # 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')
+	       @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')
+	       select_line(w, w.nearest(y))
+	     }, '%W %y')
       l.bind('Double-Button-1', proc{
-               @command.call(get_select) if @command
-             })
+	       @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')
+	       @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')
+	       @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
+	       l.scan_dragto(x, y)
+	     }, '%x %y')
     }
 
     bbox = @w_title.bbox
@@ -266,8 +266,8 @@ class TkMultiColumnList < TkText
 
     # binding for 'Configure' event
     @c_lbox.bind('Configure', 
-                 proc{|height, width| reconstruct(height, width)}, 
-                 '%h %w')
+		 proc{|height, width| reconstruct(height, width)}, 
+		 '%h %w')
 
     # set default receiver of method calls
     @path = @frame.path
@@ -433,9 +433,9 @@ class TkMultiColumnList < TkText
   def delete(*idx)
     idx = idx.collect{|i|
       if i.kind_of?(Integer)
-        "#{i}.0"
+	"#{i}.0"
       else
-        i.to_s
+	i.to_s
       end
     }
     @lbox_list.collect{|lbox| lbox.delete(*idx)}
@@ -444,30 +444,30 @@ class TkMultiColumnList < TkText
   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"
+	idx_s = "#{idx_s}.0"
+	idx_e = "#{idx_s} lineend"
       else
-        idx_s = idx_s.to_s
-        idx_e = "#{idx_s} lineend"
+	idx_s = idx_s.to_s
+	idx_e = "#{idx_s} lineend"
       end
       @lbox_list.collect{|lbox|
-        lbox.get(idx_s, idx_e)
+	lbox.get(idx_s, idx_e)
       }
     else
       if idx_s.kind_of?(Integer)
-        idx_s = "#{idx_s}.0"
+	idx_s = "#{idx_s}.0"
       else
-        idx_s = idx_s.to_s
+	idx_s = idx_s.to_s
       end
       if idx_e.kind_of?(Integer)
-        idx_e = "#{idx_e}.end"
+	idx_e = "#{idx_e}.end"
       else
-        idx_e = "#{idx_e} lineend"
+	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 << list.collect{|lines| lines[index]}
       }
       result
     end
@@ -481,9 +481,9 @@ class TkMultiColumnList < TkText
     result = {}
     @name_index.each_pair{|label, indices|
       if indices.size == 1
-        result[label] = line[indices[0]]
+	result[label] = line[indices[0]]
       else
-        result[label] = indices.collect{|index| line[index]}
+	result[label] = indices.collect{|index| line[index]}
       end
     }
     result
@@ -517,31 +517,31 @@ class TkMultiColumnList < TkText
 
     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
+	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
+	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]
@@ -582,7 +582,7 @@ class TkMultiColumnList < TkText
       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)
+		 'relheight'=>1.0)
       hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
     }
   end
@@ -609,11 +609,11 @@ class TkMultiColumnList < TkText
     # 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])
+		'relx'=>@rel_list[idx])
     lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
-               'relx'=>@rel_list[idx], 'relheight'=>1.0)
+	       'relx'=>@rel_list[idx], 'relheight'=>1.0)
     hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
-               'relx'=>@rel_list[idx])
+	       'relx'=>@rel_list[idx])
 
     # update reference position
     @x = x
@@ -637,34 +637,34 @@ class TkMultiColumnList < TkText
 
   def title_binding(title, index)
     title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
-               "%W %x #{index}")
+	       "%W %x #{index}")
 
     title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
-               "%W %x #{index}")
+	       "%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')
+	       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}")
+	       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
@@ -706,21 +706,21 @@ end
 ################################################
 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)
+			    [ ['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',
+	           'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
                    'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
   l.insert('end', [1,2,3])
   l.insert('end', [4,5,6], [4,5,6])
diff --git a/ext/tk/sample/tkmultilistbox.rb b/ext/tk/sample/tkmultilistbox.rb
index 6f956d0edb..c3787a0cf0 100644
--- a/ext/tk/sample/tkmultilistbox.rb
+++ b/ext/tk/sample/tkmultilistbox.rb
@@ -36,10 +36,10 @@ class TkMultiListbox < TkListbox
     # create base flames
     @f_title = TkFrame.new(@frame, 'width'=>@width_total)
     @f_lbox  = TkFrame.new(@frame, 
-                           'width'=>@width_total, 'height'=>lbox_height)
+			   'width'=>@width_total, 'height'=>lbox_height)
     @f_hscr  = TkFrame.new(@frame, 'width'=>@width_total, 
-                           'height'=>@v_scroll.cget('width') + 
-                                     2 * @v_scroll.cget('borderwidth'))
+			   '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
@@ -50,9 +50,9 @@ class TkMultiListbox < TkListbox
     title_info.each_with_index{|(label, width), idx|
       # set relation between label and index
       if @name_index.include?(label)
-        @name_index[label] << idx
+	@name_index[label] << idx
       else
-        @name_index[label] = [idx]
+	@name_index[label] = [idx]
       end
 
       # calculate relative positioning
@@ -64,25 +64,25 @@ class TkMultiListbox < TkListbox
       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])
+	      '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)
+	      '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')
+	                                      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])
+	      'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
       @lbox_list[idx].xscrollcommand proc{|first, last| 
-        @hscr_list[idx].set first, last
+	@hscr_list[idx].set first, last
       }
       @hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
 
@@ -94,19 +94,19 @@ class TkMultiListbox < TkListbox
     @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')
+			'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')
+	       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.set first, last
       }
     }
     @v_scroll.command proc{|*args| @lbox_list.each{|lbox| lbox.yview *args} }
@@ -120,18 +120,18 @@ class TkMultiListbox < TkListbox
     @current_mode = 'browse'
     @lbox_list.each{|l| 
       l.bind('Shift-Key-Left', 
-             proc{|w| focus_shift(w, -1); Tk.callback_break}, '%W')
+	     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')
+	     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')
+	       @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')
+	       @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]))
     }
@@ -242,7 +242,7 @@ class TkMultiListbox < TkListbox
       list = @lbox_list.collect{|lbox| lbox.get(*idx)}
       result = []
       list[0].each_with_index{|line, index|
-        result << list.collect{|lines| lines[index]}
+	result << list.collect{|lines| lines[index]}
       }
       result
     end
@@ -252,9 +252,9 @@ class TkMultiListbox < TkListbox
     result = {}
     @name_index.each_pair{|label, indices|
       if indices.size == 1
-        result[label] = line[indices[0]]
+	result[label] = line[indices[0]]
       else
-        result[label] = indices.collect{|index| line[index]}
+	result[label] = indices.collect{|index| line[index]}
       end
     }
     result
@@ -276,31 +276,31 @@ class TkMultiListbox < TkListbox
 
     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
+	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
+	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]
@@ -327,7 +327,7 @@ class TkMultiListbox < TkListbox
       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)
+		 'relheight'=>1.0)
       hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
 
       tab = @tab_list[idx]
@@ -357,11 +357,11 @@ class TkMultiListbox < TkListbox
     # 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])
+		'relx'=>@rel_list[idx])
     lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
-               'relx'=>@rel_list[idx], 'relheight'=>1.0)
+	       'relx'=>@rel_list[idx], 'relheight'=>1.0)
     hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
-               'relx'=>@rel_list[idx])
+	       'relx'=>@rel_list[idx])
 
     # update reference position
     @x = x
@@ -371,11 +371,11 @@ class TkMultiListbox < TkListbox
   def browse_mode_bindtag
     t = TkBindTag.new
     t.bind('Button-1', 
-           proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
+	   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')
+	   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')
@@ -386,7 +386,7 @@ class TkMultiListbox < TkListbox
     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')
+	   proc{|w| select_line(w, w.index('active').to_i)}, '%W')
 
     t
   end
@@ -395,12 +395,12 @@ class TkMultiListbox < TkListbox
   def single_mode_bindtag
     t = TkBindTag.new
     t.bind('Button-1', 
-           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
+	   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')
+	   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')
+	   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')
@@ -411,9 +411,9 @@ class TkMultiListbox < TkListbox
     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')
+	   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')}})
+	   proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
 
     t
   end
@@ -422,22 +422,22 @@ class TkMultiListbox < TkListbox
   def extended_mode_bindtag
     t = TkBindTag.new
     t.bind('Button-1', 
-           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
+	   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')
+	   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')
+	   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')
+	   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')
+	   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')
+	   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')
@@ -463,9 +463,9 @@ class TkMultiListbox < TkListbox
   def multiple_mode_bindtag
     t = TkBindTag.new
     t.bind('Button-1', 
-           proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
+	   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')
+	   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')
@@ -509,9 +509,9 @@ class TkMultiListbox < TkListbox
     @lbox_list.each{|l|
       l.selection_anchor(idx)
       if st == 1
-        l.selection_clear(idx)
+	l.selection_clear(idx)
       else
-        l.selection_set(idx)
+	l.selection_set(idx)
       end
     }
   end
@@ -520,9 +520,9 @@ class TkMultiListbox < TkListbox
     st = w.selection_includes('anchor')
     @lbox_list.each{|l|
       if st == 1
-        l.selection_set('anchor', idx)
+	l.selection_set('anchor', idx)
       else
-        l.selection_clear('anchor', idx)
+	l.selection_clear('anchor', idx)
       end
     }
   end
@@ -625,16 +625,16 @@ end
 ################################################
 if __FILE__ == $0
   f = TkFrame.new(nil, 'width'=>300, 
-                  'height'=>200).pack('fill'=>'both', 'expand'=>'true')
+		  '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)
+			 [ ['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])
diff --git a/ext/tk/sample/tkmultilistframe.rb b/ext/tk/sample/tkmultilistframe.rb
index ef1a0a824d..dac1df5513 100644
--- a/ext/tk/sample/tkmultilistframe.rb
+++ b/ext/tk/sample/tkmultilistframe.rb
@@ -55,37 +55,37 @@ class TkMultiListFrame < TkListbox
     # virtical scrollbar
 =begin
     @v_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                'borderwidth'=>@scrbar_border, 
-                                'orient'=>'vertical', 'width'=>@scrbar_width)
+				'borderwidth'=>@scrbar_border, 
+				'orient'=>'vertical', 'width'=>@scrbar_width)
 =end
     @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                 'borderwidth'=>@scrbar_border, 
-                                 'width'=>@scrbar_width)
+				 '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)
+				'borderwidth'=>@scrbar_border, 
+				'orient'=>'horizontal', 'width'=>@scrbar_width)
 =end
     @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                                 'borderwidth'=>@scrbar_border, 
-                                 'width'=>@scrbar_width)
+				 'borderwidth'=>@scrbar_border, 
+				 'width'=>@scrbar_width)
 
     # create base flames
     @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                            'width'=>@window_width)
+			    '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')
+			     'window'=>@f_title, 'anchor'=>'nw')
 
     @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
-                            'width'=>@window_width)
+			    '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)
+			    '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')
 
@@ -95,9 +95,9 @@ class TkMultiListFrame < TkListbox
     title_info.each_with_index{|(label, width), idx|
       # set relation between label and index
       if @name_index.include?(label)
-        @name_index[label] << idx
+	@name_index[label] << idx
       else
-        @name_index[label] = [idx]
+	@name_index[label] = [idx]
       end
 
       # calculate relative positioning
@@ -109,45 +109,45 @@ class TkMultiListFrame < TkListbox
       base = [f]
 
       title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border, 
-                          'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
+			  '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])
+	      '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)
+				  '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)
+	      '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')
+				    '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')
+				     '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])
+	      '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].set first, last
       }
       @hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
 =end
@@ -160,12 +160,12 @@ class TkMultiListFrame < TkListbox
     # pad
     # @f_title_pad = TkFrame.new(@frame)
     @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised', 
-                               'borderwidth'=>@title_border, 
-                               'highlightthickness'=>@h_l_thick)
+			       'borderwidth'=>@title_border, 
+			       'highlightthickness'=>@h_l_thick)
 
     @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken', 
-                             'borderwidth'=>1, 
-                             'highlightthickness'=>@h_l_thick)
+			     'borderwidth'=>1, 
+			     'highlightthickness'=>@h_l_thick)
 
     # height check
     title_height = 0
@@ -188,7 +188,7 @@ class TkMultiListFrame < TkListbox
 =begin
     @lbox_list.each{|lbox|
       lbox.yscrollcommand proc{|first, last| 
-        @v_scroll.set first, last
+	@v_scroll.set first, last
       }
     }
     @v_scroll.command proc{|*args| @lbox_list.each{|lbox| lbox.yview *args} }
@@ -223,18 +223,18 @@ class TkMultiListFrame < TkListbox
     @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')
+	     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')
+	     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')
+	       @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')
+	       @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]))
     }
@@ -271,8 +271,8 @@ class TkMultiListFrame < TkListbox
 
     # binding for 'Configure' event
     @c_lbox.bind('Configure', 
-                 proc{|height, width| reconstruct(height, width)}, 
-                 '%h %w')
+		 proc{|height, width| reconstruct(height, width)}, 
+		 '%h %w')
 
     # set default receiver of method calls
     @path = @lbox_list[0].path
@@ -458,7 +458,7 @@ class TkMultiListFrame < TkListbox
       list = @lbox_list.collect{|lbox| lbox.get(*idx)}
       result = []
       list[0].each_with_index{|line, index|
-        result << list.collect{|lines| lines[index]}
+	result << list.collect{|lines| lines[index]}
       }
       result
     end
@@ -468,9 +468,9 @@ class TkMultiListFrame < TkListbox
     result = {}
     @name_index.each_pair{|label, indices|
       if indices.size == 1
-        result[label] = line[indices[0]]
+	result[label] = line[indices[0]]
       else
-        result[label] = indices.collect{|index| line[index]}
+	result[label] = indices.collect{|index| line[index]}
       end
     }
     result
@@ -492,31 +492,31 @@ class TkMultiListFrame < TkListbox
 
     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
+	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
+	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]
@@ -561,7 +561,7 @@ class TkMultiListFrame < TkListbox
       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)
+		 'relheight'=>1.0)
       hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
     }
   end
@@ -588,11 +588,11 @@ class TkMultiListFrame < TkListbox
     # 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])
+		'relx'=>@rel_list[idx])
     lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
-               'relx'=>@rel_list[idx], 'relheight'=>1.0)
+	       'relx'=>@rel_list[idx], 'relheight'=>1.0)
     hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
-               'relx'=>@rel_list[idx])
+	       'relx'=>@rel_list[idx])
 
     # update reference position
     @x = x
@@ -616,34 +616,34 @@ class TkMultiListFrame < TkListbox
 
   def title_binding(title, index)
     title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
-               "%W %x #{index}")
+	       "%W %x #{index}")
 
     title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
-               "%W %x #{index}")
+	       "%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')
+	       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}")
+	       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
@@ -652,11 +652,11 @@ class TkMultiListFrame < TkListbox
   def browse_mode_bindtag
     t = TkBindTag.new
     t.bind('Button-1', 
-           proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
+	   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')
+	   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')
@@ -667,7 +667,7 @@ class TkMultiListFrame < TkListbox
     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')
+	   proc{|w| select_line(w, w.index('active').to_i)}, '%W')
 
     t
   end
@@ -676,12 +676,12 @@ class TkMultiListFrame < TkListbox
   def single_mode_bindtag
     t = TkBindTag.new
     t.bind('Button-1', 
-           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
+	   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')
+	   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')
+	   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')
@@ -692,9 +692,9 @@ class TkMultiListFrame < TkListbox
     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')
+	   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')}})
+	   proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
 
     t
   end
@@ -703,22 +703,22 @@ class TkMultiListFrame < TkListbox
   def extended_mode_bindtag
     t = TkBindTag.new
     t.bind('Button-1', 
-           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
+	   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')
+	   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')
+	   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')
+	   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')
+	   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')
+	   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')
@@ -744,9 +744,9 @@ class TkMultiListFrame < TkListbox
   def multiple_mode_bindtag
     t = TkBindTag.new
     t.bind('Button-1', 
-           proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
+	   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')
+	   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')
@@ -790,9 +790,9 @@ class TkMultiListFrame < TkListbox
     @lbox_list.each{|l|
       l.selection_anchor(idx)
       if st == 1
-        l.selection_clear(idx)
+	l.selection_clear(idx)
       else
-        l.selection_set(idx)
+	l.selection_set(idx)
       end
     }
   end
@@ -801,9 +801,9 @@ class TkMultiListFrame < TkListbox
     st = w.selection_includes('anchor')
     @lbox_list.each{|l|
       if st == 1
-        l.selection_set('anchor', idx)
+	l.selection_set('anchor', idx)
       else
-        l.selection_clear('anchor', idx)
+	l.selection_clear('anchor', idx)
       end
     }
   end
@@ -906,21 +906,21 @@ end
 ################################################
 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)
+			   [ ['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',
+	           'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
                    'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
   l.insert('end', [1,2,3])
   l.insert('end', [4,5,6], [4,5,6])
diff --git a/ext/tk/sample/tkoptdb-safeTk.rb b/ext/tk/sample/tkoptdb-safeTk.rb
index a06098323f..a5e394b230 100644
--- a/ext/tk/sample/tkoptdb-safeTk.rb
+++ b/ext/tk/sample/tkoptdb-safeTk.rb
@@ -4,70 +4,32 @@ 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 \
+On the slave interpreter, 'tkoptdb.rb' demo is running. 
+( Attention:: 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.
+has a container frame of the safe-Tk slave interpreter. \
+You can 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')
+						 File.dirname(__FILE__)),
+				'euc-jp')
 else
   # read English resource
   ent = TkOptionDB.read_entries(File.expand_path('resource.en', 
-                                                File.dirname(__FILE__)))
+						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.
-
+MultiTkIp.new_safeTk{
+  ent.each{|pat, val| TkOptionDB.add(pat, val)}
   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/ext/tk/sample/tkoptdb.rb b/ext/tk/sample/tkoptdb.rb
index 47784ea238..897701c222 100644
--- a/ext/tk/sample/tkoptdb.rb
+++ b/ext/tk/sample/tkoptdb.rb
@@ -12,12 +12,12 @@ 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')
+						   File.dirname(__FILE__)), 
+				  'euc-jp')
   else
     # read English resource
     TkOptionDB.readfile(File.expand_path('resource.en', 
-                                         File.dirname(__FILE__)))
+					 File.dirname(__FILE__)))
   end
 end
 
@@ -49,12 +49,12 @@ TkFrame.new(:class=>'BtnFrame'){|f|
     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'){
+		 print "($SAFE=#{$SAFE} >>>) : "
+		 cmd.bye_msg
+		 print "(<<< $SAFE=#{$SAFE} ) : "
+		 exit
+	       }, 
+	       :parent=>f, :widgetname=>'quit'){
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
 }
@@ -71,12 +71,12 @@ BtnFrame.new{|f|
     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'){
+		 print "($SAFE=#{$SAFE} >>>) : "
+		 cmd.bye_msg
+		 print "(<<< $SAFE=#{$SAFE})"
+		 exit
+	       }, 
+	       :parent=>f, :widgetname=>'quit'){
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
 }
@@ -93,12 +93,12 @@ TkFrame.new(:class=>'BtnFrame2'){|f|
     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'){
+		 print "($SAFE=#{$SAFE} >>>) : "
+		 cmd.bye_msg
+		 print "(<<< $SAFE=#{$SAFE})"
+		 exit
+	       }, 
+	       :parent=>f, :widgetname=>'quit'){
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
 }
diff --git a/ext/tk/sample/tkrttimer.rb b/ext/tk/sample/tkrttimer.rb
deleted file mode 100644
index 0abd4ecbd2..0000000000
--- a/ext/tk/sample/tkrttimer.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/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(:padx=>10, :pady=>5, :justify=>'left', :text=><<EOT).pack
-Interval setting of each timer object is 10 ms.
-Each timer object counts up the value on each callback
-(the value is not the clock data).
-The count of the TkTimer object is delayed by execution 
-time of callbacks and inaccuracy of interval.
-On the other hand, the count of the TkRTTimer object is 
-not delayed. Its callback interval is not accurate too. 
-But it can compute error correction about the time when 
-a callback should start.
-EOT
-
-# 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/ext/tk/sample/tksleep_sample.rb b/ext/tk/sample/tksleep_sample.rb
deleted file mode 100644
index 23f6eca54e..0000000000
--- a/ext/tk/sample/tksleep_sample.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'tk'
-
-v = TkVariable.new(0)
-l = TkLabel.new(:textvariable=>v).pack(:pady=>[1, 10])
-
-a = TkButton.new(:text=>"button A :: proc{p ['AAA', v.value]}").pack(:fill=>:x, :pady=>[1, 15], :padx=>15)
-a.command{p ['AAA', v.value]}
-
-TkLabel.new(:text=>'Callback of the button B returns LIFO order').pack
-b = TkButton.new(:text=>"button B :: proc{n = v.value; p ['B:start', n]; Tk.sleep(10000); p ['B:end', n]}").pack(:fill=>:x, :pady=>[1, 15], :padx=>15)
-b.command{n = v.value; p ['B:start', n]; Tk.sleep(10000); p ['B:end', n]}
-
-TkLabel.new(:text=>'Callback of the button C returns FIFO order').pack
-c = TkButton.new(:text=>"button C :: proc{n = v.value; Thread.new{p ['C:start', n]; Tk.sleep(10000); p ['C:end', n]}}").pack(:fill=>:x, :pady=>[1, 15], :padx=>15)
-c.command{n = v.value; Thread.new{p ['C:start', n]; Tk.sleep(10000); p ['C:end', n]}}
-
-TkLabel.new(:text=>'Callback of the button D blocks eventloop (no respond to event)').pack
-d = TkButton.new(:text=>"button D :: proc{n = v.value; p ['D:start', n]; sleep(10); p ['D:end', n]}").pack(:fill=>:x, :pady=>[1,15], :padx=>15)
-d.command{n = v.value; p ['D:start', n]; sleep(10); p ['D:end', n]}
-
-TkLabel.new(:text=>'Callback of the button E is another way to avoid eventloop blocking').pack
-e = TkButton.new(:text=>"button E :: proc{n = v.value; Thread.new{p ['D:start', n]; sleep(10); p ['D:end', n]}}").pack(:fill=>:x, :pady=>[1,15], :padx=>15)
-e.command{n = v.value; Thread.new{p ['D:start', n]; sleep(10); p ['D:end', n]}}
-
-TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
-
-TkTimer.new(500, -1){v.numeric += 1}.start
-
-Tk.mainloop
diff --git a/ext/tk/sample/tktextframe.rb b/ext/tk/sample/tktextframe.rb
index bdab057d34..78efdf0970 100644
--- a/ext/tk/sample/tktextframe.rb
+++ b/ext/tk/sample/tktextframe.rb
@@ -35,20 +35,8 @@ class TkTextFrame < TkText
     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)
@@ -74,52 +62,12 @@ class TkTextFrame < TkText
     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
+    if mode && st == [] then
       @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
-    elsif !mode && st.size != 0 then
+    elsif !mode && st != [] then
       @v_scroll.ungrid
     end
     self
@@ -128,10 +76,10 @@ class TkTextFrame < TkText
   # horizontal scrollbar : ON/OFF
   def hscroll(mode, wrap_mode="char")
     st = TkGrid.info(@h_scroll)
-    if mode && st.size == 0 then
+    if mode && st == [] then
       @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew')
       wrap 'none'  # => self.wrap('none')
-    elsif !mode && st.size != 0 then
+    elsif !mode && st != [] then
       @h_scroll.ungrid
       wrap wrap_mode  # => self.wrap(wrap_mode)
     end
@@ -145,18 +93,14 @@ end
 ################################################
 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
+  t = TkTextFrame.new.pack
   TkButton.new(f, 'text'=>'vscr OFF', 
-               'command'=>proc{t.vscroll(false)}).pack('side'=>'right')
+	       'command'=>proc{t.vscroll(false)}).pack('side'=>'right')
   TkButton.new(f, 'text'=>'vscr ON', 
-               'command'=>proc{t.vscroll(true)}).pack('side'=>'right')
+	       'command'=>proc{t.vscroll(true)}).pack('side'=>'right')
   TkButton.new(f, 'text'=>'hscr ON', 
-               'command'=>proc{t.hscroll(true)}).pack('side'=>'left')
+	       'command'=>proc{t.hscroll(true)}).pack('side'=>'left')
   TkButton.new(f, 'text'=>'hscr OFF', 
-               'command'=>proc{t.hscroll(false)}).pack('side'=>'left')
+	       'command'=>proc{t.hscroll(false)}).pack('side'=>'left')
   Tk.mainloop
 end
diff --git a/ext/tk/sample/tktextio.rb b/ext/tk/sample/tktextio.rb
deleted file mode 100644
index 9f012feada..0000000000
--- a/ext/tk/sample/tktextio.rb
+++ /dev/null
@@ -1,1060 +0,0 @@
-#!/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
-  def _cb_ctrl_u
-    if @console_mode
-      mark_set('insert', @ins_head)
-      delete('insert', 'insert lineend')
-      Tk.callback_break
-    end
-  end
-  private :_cb_up, :_cb_down, :_cb_left, :_cb_backspace, 
-          :_cb_ctrl_a, :_cb_ctrl_u
-
-  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 }
-
-    @bindtag.bind('Control-u'){ _cb_ctrl_u }
-  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/ext/tk/sample/tktree.rb b/ext/tk/sample/tktree.rb
deleted file mode 100644
index 56b7211c88..0000000000
--- a/ext/tk/sample/tktree.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-##########################################################################
-# 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/ext/tk/sample/tktree.tcl b/ext/tk/sample/tktree.tcl
deleted file mode 100644
index a5e47eb776..0000000000
--- a/ext/tk/sample/tktree.tcl
+++ /dev/null
@@ -1,305 +0,0 @@
-#
-#  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/ext/tk/sample/ttk_wrapper.rb b/ext/tk/sample/ttk_wrapper.rb
deleted file mode 100644
index 1580668994..0000000000
--- a/ext/tk/sample/ttk_wrapper.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  ttk_wrapper.rb  --  use Ttk widgets as default on old Ruby/Tk scripts
-#
-#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-version = '0.1.3'
-#
-##########################################################################
-#  parse commandline arguments
-##########################################################################
-require 'optparse'
-opt = OptionParser.new("Usage: #{$0} [options] rubytk_script" << "\n    " << 
-                         "Ruby/Tk script wrapper. Use Ttk widgets as default.")
-opt.version = version
-
-OPTS = {}
-OPTS[:themedir] = []
-OPTS[:rb_theme] = []
-OPTS[:theme] = 'default'
-
-opt.on('-l', '--list', 'list available theme names'){|v| OPTS[:list] = true}
-opt.on('-t', '--theme theme', 'theme name'){|v| OPTS[:theme] = v}
-opt.on('-d', '--themedir themes_dir', 'directory of theme definitions'){|v| 
-  OPTS[:themedir] << v
-}
-opt.on('-r', '--rubytheme rb_theme', 'theme definition file (ruby script)'){|v|
-  OPTS[:rb_theme] << v
-}
-opt.on('-v', '--verbose', 'print verbose messages'){|v| OPTS[:verbose] = true}
-
-opt.parse!(ARGV)
-
-
-##########################################################################
-#  load Ttk (Tile) extension
-##########################################################################
-require 'tk'
-
-begin
-  require 'tkextlib/tile'
-  Tk.default_widget_set = :Ttk
-rescue LoadError
-  if OPTS[:verbose]
-    print "warning: fail to load 'Ttk' extension. use standard widgets.\n" 
-  end
-end
-
-if OPTS[:verbose]
-  print "current default widget set is '#{Tk.default_widget_set}'\n"
-end
-
-
-##########################################################################
-# define Tcl/Tk procedures for compatibility.
-# those are required when want to use themes included 
-# in "sample/tkextlib/tile/demo.rb".
-##########################################################################
-Tk::Tile.__define_LoadImages_proc_for_compatibility__!
-Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
-
-
-##########################################################################
-#  use themes defined on the demo of Ttk (Tile) extension
-##########################################################################
-demodir = File.dirname(__FILE__)
-demo_themesdir = File.expand_path(File.join(demodir, 'tkextlib', 'tile', 'themes'))
-
-Tk::AUTO_PATH.lappend(*OPTS[:themedir]) unless OPTS[:themedir].empty?
-Tk::AUTO_PATH.lappend('.', demodir, demo_themesdir)
-
-OPTS[:themedir] << demo_themesdir
-print "theme-dirs: #{OPTS[:themedir].inspect}\n" if OPTS[:verbose]
-
-OPTS[:themedir].each{|themesdir|
-  if File.directory?(themesdir)
-    Dir.foreach(themesdir){|name|
-      next if name == '.' || name == '..'
-      path = File.join(themesdir, name)
-      Tk::AUTO_PATH.lappend(path) if File.directory?(path)
-    }
-  end
-}
-
-# This forces an update of the available packages list. It's required
-# for package names to find the themes in demos/themes/*.tcl
-Tk.ip_eval("#{TkPackage.unknown_proc}  Tcl #{TkPackage.provide('Tcl')}")
-
-# load themes written in Ruby.
-themes_by_ruby = [File.join(demo_themesdir, 'kroc.rb')]
-themes_by_ruby.concat OPTS[:rb_theme]
-print "ruby-themes: #{themes_by_ruby.inspect}\n" if OPTS[:verbose]
-
-themes_by_ruby.each{|f|
-  begin
-    load(f, true)
-  rescue LoadError
-    print "fail to load \"#{f}\"\n" if OPTS[:verbose]
-  end
-}
-
-
-##########################################################################
-# ignore unsupported options of Ttk widgets
-##########################################################################
-TkConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__! true
-TkItemConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__! true
-
-
-##########################################################################
-#  set theme of widget style
-##########################################################################
-if OPTS[:list] || OPTS[:verbose]
-  print "supported theme names: #{Tk::Tile.themes.inspect}\n" 
-  exit if OPTS[:list] && ARGV.empty?
-end
-print "use theme: \"#{OPTS[:theme]}\"\n" if OPTS[:theme] && OPTS[:verbose]
-#setTheme(OPTS[:theme]) if OPTS[:theme]
-Tk::Tile.set_theme(OPTS[:theme]) if OPTS[:theme]
-
-
-##########################################################################
-#  replace $0 and $RPAGRAM_NAME
-##########################################################################
-#  When the expand_path of the target script is long, ruby sometimes 
-#  fails to set the path to $0 (the path string is trimmed).
-#  The following replaces $0 and $PROGNAME to avoid such trouble.
-progname_obj = $0.dup
-$program_name = progname_obj
-
-alias $REAL_PROGRAM_NAME $0
-alias $PROGRAM_NAME $program_name
-alias $0 $program_name
-
-trace_var(:$program_name){|val|
-  unless progname_obj.object_id == val.object_id
-    progname_obj.replace(val.to_s)
-    $program_name = progname_obj
-  end
-}
-
-
-##########################################################################
-#  load script
-##########################################################################
-if (path = ARGV.shift) && (script = File.expand_path(path))
-  print "load script \"#{script}\"\n" if OPTS[:verbose]
-  $0 = script
-  load(script)
-else
-  print "Error: no script is given.\n"
-  print opt.help
-  exit(1)
-end
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
deleted file mode 100644
index 6d3b330f0e..0000000000
--- a/ext/tk/stubs.c
+++ /dev/null
@@ -1,564 +0,0 @@
-/************************************************
-
-  stubs.c - Tcl/Tk stubs support
-
-************************************************/
-
-#include "ruby.h"
-#include "stubs.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
-#ifdef RUBY_VM
-ruby_open_tcl_dll(char *appname)
-#else
-ruby_open_tcl_dll(appname)
-    char *appname;
-#endif
-{
-    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_PTR(rb_argv0)); */
-        int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 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
-#ifdef RUBY_VM
-ruby_open_tcltk_dll(char *appname)
-#else
-ruby_open_tcltk_dll(appname)
-    char *appname;
-#endif
-{
-    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 *
-#ifdef RUBY_VM
-ruby_tcl_create_ip_and_stubs_init(int *st)
-#else
-ruby_tcl_create_ip_and_stubs_init(st)
-    int *st;
-#endif
-{
-    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_PTR(rb_argv0)); */
-            int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 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
-#ifdef RUBY_VM
-ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_init(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
-{
-    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
-#ifdef RUBY_VM
-ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_safeinit(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
-{
-    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_PTR(rb_argv0)); */
-    st = ruby_open_tcltk_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 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
-#ifdef RUBY_VM
-ruby_open_tcl_dll(char *appname)
-#else
-ruby_open_tcl_dll(appname)
-    char *appname;
-#endif
-{
-    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_PTR(rb_argv0)); */
-        ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
-    }
-
-    return TCLTK_STUBS_OK;
-}
-
-int 
-#ifdef RUBY_VM
-ruby_open_tcltk_dll(char *appname)
-#else
-ruby_open_tcltk_dll(appname)
-    char *appname;
-#endif
-{
-    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 *
-#ifdef RUBY_VM
-ruby_tcl_create_ip_and_stubs_init(int *st)
-#else
-ruby_tcl_create_ip_and_stubs_init(st)
-    int *st;
-#endif
-{
-    Tcl_Interp *tcl_ip;
-
-    if (!open_tcl_dll) {
-        /* ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
-        ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 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 
-#ifdef RUBY_VM
-ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_init(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
-{
-    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
-#ifdef RUBY_VM
-ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_safeinit(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
-{
-#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_PTR(rb_argv0)); */
-    Tcl_FindExecutable(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
-    return 0;
-}
-
-#endif
diff --git a/ext/tk/stubs.h b/ext/tk/stubs.h
deleted file mode 100644
index 7c913fb393..0000000000
--- a/ext/tk/stubs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#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/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
deleted file mode 100644
index 8701cfef27..0000000000
--- a/ext/tk/tcltklib.c
+++ /dev/null
@@ -1,10258 +0,0 @@
-/*
- *      tcltklib.c
- *              Aug. 27, 1997   Y. Shigehiro
- *              Oct. 24, 1997   Y. Matsumoto
- */
-
-#define TCLTKLIB_RELEASE_DATE "2008-05-23"
-
-#include "ruby.h"
-
-#ifdef RUBY_VM
-/* #include "ruby/ruby.h" */
-#include "ruby/signal.h"
-#include "ruby/encoding.h"
-#else
-/* #include "ruby.h" */
-#include "rubysig.h"
-#include "version.h"
-#endif
-
-#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
-
-static struct {
-  int major;
-  int minor;
-  int patchlevel;
-  int type;
-} tcltk_version = {0, 0, 0, 0};
-
-static void
-set_tcltk_version()
-{
-    if (tcltk_version.major) return;
-
-    Tcl_GetVersion(&(tcltk_version.major), 
-		   &(tcltk_version.minor), 
-		   &(tcltk_version.patchlevel), 
-		   &(tcltk_version.type));
-}
-
-#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;
-
-#ifdef RUBY_VM
-static VALUE cRubyEncoding;
-
-/* encoding */
-static int ENCODING_INDEX_UTF8;
-static int ENCODING_INDEX_BINARY;
-#endif
-static VALUE ENCODING_NAME_UTF8;
-static VALUE ENCODING_NAME_BINARY;
-
-static VALUE create_dummy_encoding_for_tk_core _((VALUE, VALUE, VALUE));
-static VALUE create_dummy_encoding_for_tk _((VALUE, VALUE));
-static int update_encoding_table _((VALUE, VALUE, VALUE));
-static VALUE encoding_table_get_name_core _((VALUE, VALUE, VALUE));
-static VALUE encoding_table_get_obj_core _((VALUE, VALUE, VALUE));
-static VALUE encoding_table_get_name _((VALUE, VALUE));
-static VALUE encoding_table_get_obj _((VALUE, VALUE));
-static VALUE create_encoding_table _((VALUE));
-static VALUE ip_get_encoding_table _((VALUE));
-
-
-/* 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_encoding_name;
-static ID ID_encoding_table;
-
-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 ip_invoke_with_position _((int, VALUE*, VALUE, Tcl_QueuePosition));
-static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE));
-
-/* Tcl's object type */
-#if TCL_MAJOR_VERSION >= 8
-static char *Tcl_ObjTypeName_ByteArray = "bytearray";
-static Tcl_ObjType *Tcl_ObjType_ByteArray;
-
-static char *Tcl_ObjTypeName_String    = "string";
-static Tcl_ObjType *Tcl_ObjType_String;
-
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
-#define IS_TCL_BYTEARRAY(obj)    ((obj)->typePtr == Tcl_ObjType_ByteArray)
-#define IS_TCL_STRING(obj)       ((obj)->typePtr == Tcl_ObjType_String)
-#define IS_TCL_VALID_STRING(obj) ((obj)->bytes != (char*)NULL)
-#endif
-#endif
-
-#ifndef HAVE_RB_HASH_LOOKUP
-#define rb_hash_lookup rb_hash_aref
-#endif
-
-/* safe Tcl_Eval and Tcl_GlobalEval */
-static int
-#ifdef RUBY_VM
-tcl_eval(Tcl_Interp *interp, const char *cmd)
-#else
-tcl_eval(interp, cmd)
-    Tcl_Interp *interp;
-    const char *cmd; /* don't have to be writable */
-#endif
-{
-    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
-#ifdef RUBY_VM
-tcl_global_eval(Tcl_Interp *interp, const char *cmd)
-#else
-tcl_global_eval(interp, cmd)
-    Tcl_Interp *interp;
-    const char *cmd; /* don't have to be writable */
-#endif
-{
-    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;
-#ifdef RUBY_VM
-Tcl_ThreadId tk_eventloop_thread_id;  /* native thread ID of Tcl interpreter */
-#endif
-static VALUE eventloop_stack;
-static int   window_event_mode = ( ~ TCL_IDLE_EVENTS | TCL_WINDOW_EVENTS );
-
-static VALUE watchdog_thread;
-
-Tcl_Interp  *current_interp;
-
-/* thread control strategy */ 
-/* multi-tk works with the following settings only ???
-    : CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
-    : USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
-    : DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 0
-*/
-#define CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
-#define USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
-#define DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 0
-
-#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
-static int have_rb_thread_waiting_for_value = 0;
-#endif
-
-/* 
- *  '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.
- */
-#ifdef RUBY_VM
-#define DEFAULT_EVENT_LOOP_MAX        800/*counts*/
-#define DEFAULT_NO_EVENT_TICK          10/*counts*/
-#define DEFAULT_NO_EVENT_WAIT          10/*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 ) */
-#else /* ! RUBY_VM */
-#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 ) */
-#endif
-
-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
-#ifdef RUBY_VM
-    Tcl_ThreadId tk_thread_id;   /* native thread ID of Tcl interpreter */
-#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 1;
-    }
-    return 0;
-}
-
-/* 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
-
-#ifdef RUBY_VM
-    ptr->tk_thread_id = Tcl_GetCurrentThread();
-#endif
-
-    return Qnil;
-}
-
-
-/* treat excetiopn on Tcl side */
-static VALUE rbtk_pending_exception;
-static int rbtk_eventloop_depth = 0;
-static int rbtk_internal_eventloop_handler = 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 
-	    || rbtk_internal_eventloop_handler > 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
-	    || rbtk_internal_eventloop_handler > 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 *cmd_obj;
-    Tcl_Obj *state_obj;
-#endif
-    DUMP1("original_exit is called");
-
-    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;
-#define USE_RUBY_ALLOC 0
-#if USE_RUBY_ALLOC
-        argv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, 3);
-#else /* not USE_RUBY_ALLOC */
-        argv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * 3);
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-#endif
-	cmd_obj = Tcl_NewStringObj("exit", 4);
-	Tcl_IncrRefCount(cmd_obj);
-
-        argv[0] = cmd_obj;
-        argv[1] = state_obj;
-        argv[2] = (Tcl_Obj *)NULL;
-
-        ptr->return_value 
-            = (*(info->objProc))(info->objClientData, ptr->ip, 2, argv);
-
-	Tcl_DecrRefCount(cmd_obj);
-
-#if USE_RUBY_ALLOC
-        free(argv);
-#else /* not USE_RUBY_ALLOC */
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-#endif
-#undef USE_RUBY_ALLOC
-
-    } else {
-        /* string interface */
-        char **argv;
-#define USE_RUBY_ALLOC 0
-#if USE_RUBY_ALLOC
-        argv = (char **)ALLOC_N(char *, 3); /* XXXXXXXXXX */
-#else /* not USE_RUBY_ALLOC */
-        argv = (char **)ckalloc(sizeof(char *) * 3);
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-#endif
-        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);
-
-#if USE_RUBY_ALLOC
-        free(argv);
-#else /* not USE_RUBY_ALLOC */
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-#endif
-#undef USE_RUBY_ALLOC
-    }
-
-    Tcl_DecrRefCount(state_obj);
-
-#else /* TCL_MAJOR_VERSION < 8 */
-    {
-        /* string interface */
-        char **argv;
-#define USE_RUBY_ALLOC 0
-#if USE_RUBY_ALLOC
-        argv = (char **)ALLOC_N(char *, 3);
-#else /* not USE_RUBY_ALLOC */
-        argv = (char **)ckalloc(sizeof(char *) * 3);
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-#endif
-        argv[0] = "exit";
-        argv[1] = RSTRING_PTR(rb_fix2str(INT2NUM(state), 10));
-        argv[2] = (char *)NULL;
-
-        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 
-                                            2, argv);
-
-#if USE_RUBY_ALLOC
-        free(argv);
-#else /* not USE_RUBY_ALLOC */
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree(argv);
-#endif
-#endif
-#endif
-#undef USE_RUBY_ALLOC
-    }
-#endif
-    DUMP1("complete original_exit");
-
-    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; */
-}
-
-#ifdef RUBY_VM
-#if USE_TOGGLE_WINDOW_MODE_FOR_IDLE
-static int
-toggle_eventloop_window_mode_for_idle()
-{
-  if (window_event_mode & TCL_IDLE_EVENTS) {
-    /* idle -> event */
-    window_event_mode |= TCL_WINDOW_EVENTS;
-    window_event_mode &= ~TCL_IDLE_EVENTS;
-    return 1;
-  } else {
-    /* event -> idle */
-    window_event_mode |= TCL_IDLE_EVENTS;
-    window_event_mode &= ~TCL_WINDOW_EVENTS;
-    return 0;
-  }
-}
-#endif
-#endif
-
-static VALUE
-set_eventloop_window_mode(self, mode)
-    VALUE self;
-    VALUE mode;
-{
-    rb_secure(4);
-
-    if (RTEST(mode)) {
-      window_event_mode = ~0;
-    } else {
-      window_event_mode = ~(TCL_WINDOW_EVENTS | TCL_IDLE_EVENTS);
-    }
-
-    return mode;
-}
-
-static VALUE
-get_eventloop_window_mode(self)
-    VALUE self;
-{
-    if ( ~window_event_mode ) {
-      return Qfalse;
-    } else {
-      return Qtrue;
-    }
-}
-
-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_PTR(divmod)[0]);
-        tcl_time.usec = NUM2LONG(RARRAY_PTR(divmod)[1]);
-        break;
-
-    case T_FLOAT:
-        /* time is second value */
-        divmod = rb_funcall(time, rb_intern("divmod"), 1, INT2FIX(1));
-        tcl_time.sec  = NUM2LONG(RARRAY_PTR(divmod)[0]);
-        tcl_time.usec = (long)(NUM2DBL(RARRAY_PTR(divmod)[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_core(self, argc, argv)
-    VALUE self;
-    int   argc;   /* dummy */
-    VALUE *argv;  /* dummy */
-{
-    if (tk_stubs_init_p()) {
-        return INT2FIX(Tk_GetNumMainWindows());
-    } else {
-        return INT2FIX(0);
-    }
-}
-
-static VALUE
-lib_num_of_mainwindows(self)
-    VALUE self;
-{
-#ifdef RUBY_VM  /* Ruby 1.9+ !!! */
-    return tk_funcall(lib_num_of_mainwindows_core, 0, (VALUE*)NULL, self);
-#else
-    return lib_num_of_mainwindows_core(self, 0, (VALUE*)NULL);
-#endif
-}
-
-
-#ifdef RUBY_VM  /* Ruby 1.9+ !!! */
-static VALUE
-call_DoOneEvent_core(flag_val)
-    VALUE flag_val;
-{
-    int flag;
-
-    flag = FIX2INT(flag_val);
-    if (Tcl_DoOneEvent(flag)) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-}
-
-static VALUE
-call_DoOneEvent(flag_val)
-    VALUE flag_val;
-{
-  return tk_funcall(call_DoOneEvent_core, 0, (VALUE*)NULL, flag_val);
-}
-
-#else  /* Ruby 1.8- */
-static VALUE
-call_DoOneEvent(flag_val)
-    VALUE flag_val;
-{
-    int flag;
-
-    flag = FIX2INT(flag_val);
-    if (Tcl_DoOneEvent(flag)) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-}
-#endif
-
-
-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
-#ifdef RUBY_VM
-#if 0
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on eventloop_sleep()");
-    }
-#endif
-#else
-    if (!is_ruby_native_thread()) {
-        rb_bug("cross-thread violation on eventloop_sleep()");
-    }
-#endif
-#endif
-
-    DUMP2("eventloop_sleep: rb_thread_wait_for() at thread : %lx", rb_thread_current());
-    rb_thread_wait_for(t);
-    DUMP2("eventloop_sleep: finish at thread : %lx", rb_thread_current());
-
-#ifdef HAVE_NATIVETHREAD
-#ifdef RUBY_VM
-#if 0
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on eventloop_sleep()");
-    }
-#endif
-#else
-    if (!is_ruby_native_thread()) {
-        rb_bug("cross-thread violation on eventloop_sleep()");
-    }
-#endif
-#endif
-
-    return Qnil;
-}
-
-#define USE_EVLOOP_THREAD_ALONE_CHECK_FLAG 0
-
-#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
-static int
-get_thread_alone_check_flag()
-{
-#ifdef RUBY_VM
-  return 0;
-#else
-  set_tcltk_version();
-
-  if (tcltk_version.major < 8) {
-    /* Tcl/Tk 7.x */
-    return 1;
-  } else if (tcltk_version.major == 8) {
-    if (tcltk_version.minor < 5) {
-      /* Tcl/Tk 8.0 - 8.4 */
-      return 1;
-    } else if (tcltk_version.minor == 5) {
-      if (tcltk_version.type < TCL_FINAL_RELEASE) {
-	/* Tcl/Tk 8.5a? - 8.5b? */
-	return 1;
-      } else {
-	/* Tcl/Tk 8.5.x */
-	return 0;
-      }
-    } else {
-      /* Tcl/Tk 8.6 - 8.9 ?? */
-      return 0;
-    }
-  } else {
-    /* Tcl/Tk 9+ ?? */
-    return 0;
-  }
-#endif
-}
-#endif
-
-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 USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
-    int thread_alone_check_flag = 1;
-#endif
-
-    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;
-    }
-
-#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
-    /* version check */
-    thread_alone_check_flag = get_thread_alone_check_flag();
-#endif
-
-    for(;;) {
-#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
-        if (thread_alone_check_flag && rb_thread_alone()) {
-#else
-        if (rb_thread_alone()) {
-#endif
-            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;
-	        /* event_flag = TCL_ALL_EVENTS | TCL_DONT_WAIT; */
-            }
-
-            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:
-#ifdef RUBY_VM
-                    if (NIL_P(rb_errinfo())) {
-#else
-                    if (NIL_P(ruby_errinfo)) {
-#endif
-                        rbtk_pending_exception 
-                            = rb_exc_new2(rb_eException, "unknown exception");
-                    } else {
-#ifdef RUBY_VM
-                        rbtk_pending_exception = rb_errinfo();
-#else
-                        rbtk_pending_exception = ruby_errinfo;
-#endif
-
-                        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:
-#ifdef RUBY_VM
-                    if (NIL_P(rb_errinfo())) {
-#else
-                    if (NIL_P(ruby_errinfo)) {
-#endif
-                        rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
-                    } else {
-#ifdef RUBY_VM
-                        rb_exc_raise(rb_errinfo());
-#else
-                        rb_exc_raise(ruby_errinfo);
-#endif
-                    }
-                }
-            }
-
-            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;
-#ifdef RUBY_VM
-		    if (update_flag) {
-		      st = RTEST(rb_protect(call_DoOneEvent, 
-					    INT2FIX(event_flag), &status)); 
-		    } else {
-		      st = RTEST(rb_protect(call_DoOneEvent, 
-					    INT2FIX(event_flag & window_event_mode), 
-					    &status)); 
-#if USE_TOGGLE_WINDOW_MODE_FOR_IDLE
-		      if (!st) {
-			if (toggle_eventloop_window_mode_for_idle()) {
-			  /* idle-mode -> event-mode*/
-			  tick_counter = event_loop_max;
-			} else {
-			  /* event-mode -> idle-mode */
-			  tick_counter = 0;
-			}
-		      }
-#endif
-		    }
-#else
-                    /* st = Tcl_DoOneEvent(event_flag); */
-                    st = RTEST(rb_protect(call_DoOneEvent, 
-                                          INT2FIX(event_flag), &status)); 
-#endif
-
-#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
-		    if (have_rb_thread_waiting_for_value) {
-		      have_rb_thread_waiting_for_value = 0;
-		      rb_thread_schedule();
-		    }
-#endif
-
-                    if (status) {
-                        switch (status) {
-                        case TAG_RAISE:
-#ifdef RUBY_VM
-                            if (NIL_P(rb_errinfo())) {
-#else
-                            if (NIL_P(ruby_errinfo)) {
-#endif
-                                rbtk_pending_exception 
-                                    = rb_exc_new2(rb_eException, 
-                                                  "unknown exception");
-                            } else {
-#ifdef RUBY_VM
-                                rbtk_pending_exception = rb_errinfo();
-#else
-                                rbtk_pending_exception = ruby_errinfo;
-#endif
-
-                                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:
-#ifdef RUBY_VM
-                            if (NIL_P(rb_errinfo())) {
-#else
-                            if (NIL_P(ruby_errinfo)) {
-#endif
-                                rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
-                            } else {
-#ifdef RUBY_VM
-                                rb_exc_raise(rb_errinfo());
-#else
-                                rb_exc_raise(ruby_errinfo);
-#endif
-                            }
-                        }
-                    }
-
-                    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:
-#ifdef RUBY_VM
-                                if (NIL_P(rb_errinfo())) {
-#else
-                                if (NIL_P(ruby_errinfo)) {
-#endif
-                                    rbtk_pending_exception 
-                                        = rb_exc_new2(rb_eException, 
-                                                      "unknown exception");
-                                } else {
-#ifdef RUBY_VM
-                                    rbtk_pending_exception = rb_errinfo();
-#else
-                                    rbtk_pending_exception = ruby_errinfo;
-#endif
-
-                                    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:
-#ifdef RUBY_VM
-                                if (NIL_P(rb_errinfo())) {
-#else
-                                if (NIL_P(ruby_errinfo)) {
-#endif
-                                    rb_exc_raise(rb_exc_new2(rb_eFatal, 
-                                                             "FATAL"));
-                                } else {
-#ifdef RUBY_VM
-                                    rb_exc_raise(rb_errinfo());
-#else
-                                    rb_exc_raise(ruby_errinfo);
-#endif
-                                }
-                            }
-                        }
-                    }
-
-                } else {
-                    DUMP2("sleep eventloop %lx", current);
-                    DUMP2("eventloop thread is %lx", eventloop_thread);
-                    /* rb_thread_stop(); */
-                    rb_thread_sleep_forever();
-                }
-
-                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("thread scheduling");
-            rb_thread_schedule();
-        }
-
-        DUMP1("trap check & thread scheduling");
-#ifdef RUBY_VM
-        /* if (update_flag == 0) CHECK_INTS; */ /*XXXXXXXXXXXXX  TODO !!!! */
-#else
-        if (update_flag == 0) CHECK_INTS;
-#endif
-
-    }
-    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:
-#ifdef RUBY_VM
-        if (NIL_P(rb_errinfo())) {
-#else
-        if (NIL_P(ruby_errinfo)) {
-#endif
-            rbtk_pending_exception 
-                = rb_exc_new2(rb_eException, "unknown exception");
-        } else {
-#ifdef RUBY_VM
-            rbtk_pending_exception = rb_errinfo();
-#else
-            rbtk_pending_exception = ruby_errinfo;
-#endif
-        }
-        return Qnil;
-
-    case TAG_FATAL:
-#ifdef RUBY_VM
-        if (NIL_P(rb_errinfo())) {
-#else
-        if (NIL_P(ruby_errinfo)) {
-#endif
-            rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
-        } else {
-#ifdef RUBY_VM
-            rbtk_pending_exception = rb_errinfo();
-#else
-            rbtk_pending_exception = ruby_errinfo;
-#endif
-        }
-        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);
-        /* ckfree((char*)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))) { */
-	if (RTEST(rb_thread_alive_p(eventloop_thread))) {
-            DUMP2("eventloop-enshure: wake up parent %lx", eventloop_thread);
-            rb_thread_wakeup(eventloop_thread);
-
-            break;
-        }
-    }
-
-#ifdef RUBY_VM
-    if (NIL_P(eventloop_thread)) {
-        tk_eventloop_thread_id = (Tcl_ThreadId) 0;
-    }
-#endif
-
-    rb_thread_critical = ptr->thr_crit_bup;
-
-    free(ptr);
-    /* ckfree((char*)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);
-    /* struct evloop_params *args = (struct evloop_params *)ckalloc(sizeof(struct evloop_params)); */
-
-    tcl_stubs_check();
-
-    eventloop_thread = rb_thread_current();
-#ifdef RUBY_VM
-    tk_eventloop_thread_id = Tcl_GetCurrentThread();
-#endif
-
-    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 */
-#ifdef RUBY_VM
-    tk_eventloop_thread_id = (Tcl_ThreadId) 0;
-#endif
-    return Qnil;
-}
-
-static VALUE
-lib_mainloop_watchdog(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE check_rootwidget;
-
-#ifdef RUBY_VM
-    rb_raise(rb_eNotImpError, 
-	     "eventloop_watchdog is not implemented on Ruby VM.");
-#endif
-
-    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 = (struct thread_call_proc_arg *)ckalloc(sizeof(struct thread_call_proc_arg)); */
-    q->proc = proc;
-    q->done = (int*)ALLOC(int);
-    /* q->done = (int*)ckalloc(sizeof(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))) { */
-    if (RTEST(rb_thread_alive_p(th))) {
-        rb_funcall(th, ID_kill, 0);
-        ret = Qnil;
-    } else {
-        ret = rb_protect(_thread_call_proc_value, th, &status);
-    }
-
-    free(q->done);
-    free(q);
-    /* ckfree((char*)q->done); */
-    /* ckfree((char*)q); */
-
-    if (NIL_P(rbtk_pending_exception)) {
-#ifdef RUBY_VM
-        /* return rb_errinfo(); */
-        if (status) {
-            rb_exc_raise(rb_errinfo());
-        }
-#else
-        /* return ruby_errinfo; */
-        if (status) {
-            rb_exc_raise(ruby_errinfo);
-        }
-#endif
-    } 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_PTR(enc)); */
-        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(enc));
-    } else {
-        enc = rb_funcall(enc, ID_to_s, 0, 0);
-        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
-        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(enc));
-    }
-
-    /* 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; */
-    buf = ALLOC_N(char, RSTRING_LEN(msg)+1);
-    /* buf = ckalloc(sizeof(char)*((RSTRING_LEN(msg))+1)); */
-    memcpy(buf, RSTRING_PTR(msg), RSTRING_LEN(msg));
-    buf[RSTRING_LEN(msg)] = 0;
-
-    Tcl_DStringInit(&dstr);
-    Tcl_DStringFree(&dstr);
-    Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LEN(msg), &dstr);
-
-    Tcl_AppendResult(interp, Tcl_DStringValue(&dstr), (char*)NULL);
-    DUMP2("error message:%s", Tcl_DStringValue(&dstr));
-    Tcl_DStringFree(&dstr);
-    free(buf);
-    /* ckfree(buf); */
-
-#else /* TCL_VERSION <= 8.0 */
-    Tcl_AppendResult(interp, RSTRING_PTR(msg), (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;
-
-    Tcl_ResetResult(interp);
-
-    rb_thread_critical = Qfalse;
-    ret = rb_protect(proc, data, &status);
-    rb_thread_critical = Qtrue;
-    if (status) {
-        char *buf;
-        VALUE old_gc;
-        volatile VALUE 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: ");
-#ifdef RUBY_VM
-            rb_str_append(str, rb_obj_as_string(rb_errinfo()));
-#else
-            rb_str_append(str, rb_obj_as_string(ruby_errinfo));
-#endif
-            exc = rb_exc_new3(type, str);
-            break;
-
-        case TAG_RETRY:
-#ifdef RUBY_VM
-            if (NIL_P(rb_errinfo())) {
-#else
-            if (NIL_P(ruby_errinfo)) {
-#endif
-                DUMP1("rb_protect: retry");
-                exc = rb_exc_new2(eTkCallbackRetry, "retry jump error");
-            } else {
-#ifdef RUBY_VM
-                exc = rb_errinfo();
-#else
-                exc = ruby_errinfo;
-#endif
-            }
-            break;
-
-        case TAG_REDO:
-#ifdef RUBY_VM
-            if (NIL_P(rb_errinfo())) {
-#else
-            if (NIL_P(ruby_errinfo)) {
-#endif
-                DUMP1("rb_protect: redo");
-                exc = rb_exc_new2(eTkCallbackRedo,  "redo jump error");
-            } else {
-#ifdef RUBY_VM
-                exc = rb_errinfo();
-#else
-                exc = ruby_errinfo;
-#endif
-            }
-            break;
-
-        case TAG_RAISE:
-#ifdef RUBY_VM
-            if (NIL_P(rb_errinfo())) {
-#else
-            if (NIL_P(ruby_errinfo)) {
-#endif
-                exc = rb_exc_new2(rb_eException, "unknown exception");
-            } else {
-#ifdef RUBY_VM
-                exc = rb_errinfo();
-#else
-                exc = ruby_errinfo;
-#endif
-            }
-            break;
-
-        case TAG_FATAL:
-#ifdef RUBY_VM
-            if (NIL_P(rb_errinfo())) {
-#else
-            if (NIL_P(ruby_errinfo)) {
-#endif
-                exc = rb_exc_new2(rb_eFatal, "FATAL");
-            } else {
-#ifdef RUBY_VM
-                exc = rb_errinfo();
-#else
-                exc = ruby_errinfo;
-#endif
-            }
-            break;
-
-        case TAG_THROW:
-#ifdef RUBY_VM
-            if (NIL_P(rb_errinfo())) {
-#else
-            if (NIL_P(ruby_errinfo)) {
-#endif
-                DUMP1("rb_protect: throw");
-                exc = rb_exc_new2(eTkCallbackThrow,  "throw jump error");
-            } else {
-#ifdef RUBY_VM
-                exc = rb_errinfo();
-#else
-                exc = ruby_errinfo;
-#endif
-            }
-            break;
-
-        default:
-            buf = ALLOC_N(char, 256);
-            /* buf = ckalloc(sizeof(char) * 256); */
-            sprintf(buf, "unknown loncaljmp status %d", status);
-            exc = rb_exc_new2(rb_eException, buf);
-            free(buf);
-            /* ckfree(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_PTR(ret), (char *)NULL);
-
-        rb_thread_critical = thr_crit_bup;
-    }
-
-    DUMP2("(result) %s", NIL_P(ret) ? "nil" : RSTRING_PTR(ret));
-
-    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
-#ifdef RUBY_VM
-#if 0
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on tcl_protect()");
-    }
-#endif
-#else
-    if (!is_ruby_native_thread()) {
-        rb_bug("cross-thread violation on tcl_protect()");
-    }
-#endif
-#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);
-      /* arg = ckalloc(sizeof(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);
-    /* ckfree(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;
-}
-
-#define SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER 1
-
-static VALUE
-ip_ruby_cmd_receiver_const_get(name)
-     char *name;
-{
-  volatile VALUE klass = rb_cObject;
-  char *head, *tail;
-  int state;
-
-#if SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER
-  klass = rb_eval_string_protect(name, &state);
-  if (state) {
-    return Qnil;
-  } else {
-    return klass;
-  }
-#else
-  return rb_const_get(klass, rb_intern(name));
-#endif
-
-  /* TODO!!!!!! */
-  /* support nest of classes/modules */
-
-  /* return rb_eval_string(name); */
-  /* return rb_eval_string_protect(name, &state); */
-
-#if 0 /* doesn't work!! (fail to autoload?) */
-  /* duplicate */
-  head = name = strdup(name);
-
-  /* has '::' at head ? */
-  if (*head == ':')  head += 2;
-  tail = head; 
-
-  /* search */
-  while(*tail) {
-    if (*tail == ':') {
-      *tail = '\0';
-      klass = rb_const_get(klass, rb_intern(head));
-      tail += 2;
-      head = tail;
-    } else {
-      tail++;
-    }
-  }
-
-  free(name);
-  return rb_const_get(klass, rb_intern(head));
-#endif
-}
-
-static VALUE
-ip_ruby_cmd_receiver_get(str)
-     char *str;
-{
-  volatile VALUE receiver;
-  volatile VALUE klass = rb_cObject;
-  int state;
-
-  if (str[0] == ':' || ('A' <= str[0] && str[0] <= 'Z')) {
-    /* class | module | constant */
-#if SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER
-    receiver = ip_ruby_cmd_receiver_const_get(str);
-#else
-    receiver = rb_protect(ip_ruby_cmd_receiver_const_get, (VALUE)str, &state);
-    if (state) return Qnil;
-#endif
-  } else if (str[0] == '$') {
-    /* global variable */
-    receiver = rb_gv_get(str);
-  } else {
-    /* global variable omitted '$' */
-    char *buf;
-    int len;
-
-    len = strlen(str);
-    buf = ALLOC_N(char, len + 2);
-    /* buf = ckalloc(sizeof(char) * (len + 2)); */
-    buf[0] = '$';
-    memcpy(buf + 1, str, len);
-    buf[len + 1] = 0;
-    receiver = rb_gv_get(buf);
-    free(buf);
-    /* ckfree(buf); */
-  }
-
-  return receiver;
-}
-
-/* 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
-    }
-
-    /* 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);
-    /* receiver = rb_protect(ip_ruby_cmd_receiver_get, (VALUE)str, &code); */
-    receiver = ip_ruby_cmd_receiver_get(str);
-    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));
-        if (old_gc == Qfalse) rb_gc_enable();
-        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);
-#ifdef RUBY_VM
-#else
-    RARRAY(args)->len = 0;
-#endif
-    for(i = 3; i < argc; i++) {
-#if TCL_MAJOR_VERSION >= 8
-        str = Tcl_GetStringFromObj(argv[i], &len);
-        DUMP2("arg:%s",str);
-#ifdef RUBY_VM
-	rb_ary_push(args, rb_tainted_str_new(str, len));
-#else
-        RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new(str, len);
-#endif
-#else /* TCL_MAJOR_VERSION < 8 */
-        DUMP2("arg:%s",argv[i]);
-#ifdef RUBY_VM
-	rb_ary_push(args, rb_tainted_str_new2(argv[i]));
-#else
-        RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new2(argv[i]);
-#endif
-#endif
-    }
-
-    if (old_gc == Qfalse) rb_gc_enable();
-    rb_thread_critical = thr_crit_bup;
-
-    /* allocate */
-    arg = ALLOC(struct cmd_body_arg);
-    /* arg = (struct cmd_body_arg *)ckalloc(sizeof(struct cmd_body_arg)); */
-
-    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);
-    /* ckfree((char*)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
-#ifdef RUBY_VM
-#if 0
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on ip_ruby_eval()");
-    }
-#endif
-#else
-    if (!is_ruby_native_thread()) {
-        rb_bug("cross-thread violation on ip_ruby_eval()");
-    }
-#endif
-#endif
-
-    Tcl_ResetResult(interp);
-
-    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
-#ifdef RUBY_VM
-#if 0
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
-    }
-#endif
-#else
-    if (!is_ruby_native_thread()) {
-        rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
-    }
-#endif
-#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");
-
-    Tcl_ResetResult(interp);
-
-    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)); */
-    param = (struct th_update_param *)ckalloc(sizeof(struct th_update_param));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)param);
-#endif
-    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(); */
-        rb_thread_sleep_forever();
-    }
-
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)param);
-#else
-    /* Tcl_Free((char *)param); */
-    ckfree((char *)param);
-#endif
-#endif
-
-    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
-#ifdef RUBY_VM
-#if 0
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on ip_rbVwaitCommand()");
-    }
-#endif
-#else
-    if (!is_ruby_native_thread()) {
-        rb_bug("cross-thread violation on ip_rbVwaitCommand()");
-    }
-#endif
-#endif
-
-    Tcl_ResetResult(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;
-    }
-
-    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);
-    Tcl_ResetResult(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;
-
-	/* This function works on the Tk eventloop thread only. */
-        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;
-
-	/* This function works on the Tk eventloop thread only. */
-        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;
-    }
-    if (param->done != 0) 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;
-    }
-    if (param->done != 0) 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;
-    }
-    if (param->done != 0) 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);
-    Tcl_ResetResult(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)); */
-    param = (struct th_vwait_param *)ckalloc(sizeof(struct th_vwait_param));
-#if 1 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)param);
-#endif
-    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) {
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-        Tcl_Release((ClientData)param);
-#else
-        /* Tcl_Free((char *)param); */
-        ckfree((char *)param);
-#endif
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[1]);
-#endif
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-
-    while(!param->done) {
-        /* rb_thread_stop(); */
-        rb_thread_sleep_forever();
-    }
-
-    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 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)param);
-#else
-    /* Tcl_Free((char *)param); */
-    ckfree((char *)param);
-#endif
-#endif
-
-    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);
-
-    Tcl_ResetResult(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(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)); */
-    param = (struct th_vwait_param *)ckalloc(sizeof(struct th_vwait_param));
-#if 1 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)param);
-#endif
-    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) {
-#if 0 /* use Tcl_EventuallyFree */
-            Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-            Tcl_Release(param);
-#else
-            /* Tcl_Free((char *)param); */
-            ckfree((char *)param);
-#endif
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_DecrRefCount(objv[2]);
-#endif
-
-            Tcl_Release(tkwin);
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-
-        while(!param->done) {
-            /* rb_thread_stop(); */
-            rb_thread_sleep_forever();
-        }
-
-        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 0 /* variable 'tkwin' must keep the token of MainWindow */
-        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
-            window = NULL;
-        } else {
-            window = Tk_NameToWindow(interp, nameString, tkwin);
-        }
-#else
-        if (!tk_stubs_init_p() || tkwin == (Tk_Window)NULL) {
-            window = NULL;
-	} else {
-            /* Tk_NameToWindow() returns right token on non-eventloop thread */
-            Tcl_CmdInfo info;
-            if (Tcl_GetCommandInfo(interp, ".", &info)) { /* check root */
-                window = Tk_NameToWindow(interp, nameString, tkwin);
-            } else {
-                window = NULL;
-            }
-	}
-#endif
-
-        if (window == NULL) {
-            Tcl_AppendResult(interp, ": thread_tkwait: ", 
-                             "no main-window (not Tk application?)", 
-                             (char*)NULL);
-
-            rb_thread_critical = thr_crit_bup;
-
-#if 0 /* use Tcl_EventuallyFree */
-	    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-            Tcl_Release(param);
-#else
-            /* Tcl_Free((char *)param); */
-            ckfree((char *)param);
-#endif
-#endif
-
-#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;
-
-        while(param->done != TKWAIT_MODE_VISIBILITY) {
-            if (param->done == TKWAIT_MODE_DESTROY) break;
-            /* rb_thread_stop(); */
-            rb_thread_sleep_forever();
-        }
-
-        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);
-
-#if 0 /* use Tcl_EventuallyFree */
-	    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-            Tcl_Release(param);
-#else
-            /* Tcl_Free((char *)param); */
-            ckfree((char *)param);
-#endif
-#endif
-
-#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 0 /* variable 'tkwin' must keep the token of MainWindow */
-        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
-            window = NULL;
-        } else {
-            window = Tk_NameToWindow(interp, nameString, tkwin);
-        }
-#else
-        if (!tk_stubs_init_p() || tkwin == (Tk_Window)NULL) {
-            window = NULL;
-	} else {
-            /* Tk_NameToWindow() returns right token on non-eventloop thread */
-            Tcl_CmdInfo info;
-            if (Tcl_GetCommandInfo(interp, ".", &info)) { /* check root */
-                window = Tk_NameToWindow(interp, nameString, tkwin);
-            } else {
-                window = NULL;
-            }
-	}
-#endif
-
-#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;
-
-#if 0 /* use Tcl_EventuallyFree */
-	    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-            Tcl_Release(param);
-#else
-            /* Tcl_Free((char *)param); */
-            ckfree((char *)param);
-#endif
-#endif
-
-            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;
-
-        while(param->done != TKWAIT_MODE_DESTROY) {
-            /* rb_thread_stop(); */
-            rb_thread_sleep_forever();
-        }
-
-        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 */
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)param);
-#else
-    /* Tcl_Free((char *)param); */
-    ckfree((char *)param);
-#endif
-#endif
-
-    /*
-     * 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_with_position(2, argv, self, TCL_QUEUE_TAIL);
-}
-
-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_with_position(3, argv, self, TCL_QUEUE_TAIL);
-}
-
-
-/* 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 void
-lib_mark_at_exit(self)
-    VALUE self;
-{
-    at_exit = 1;
-}
-
-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
-	/* 
-	  rb_thread_critical = thr_crit_bup;
-	  return;
-	*/
-    }
-
-    /* delete root widget */
-#if 1
-    DUMP1("check `destroy'");
-    if (Tcl_GetCommandInfo(ip, "destroy", &info)) {
-        DUMP1("call `destroy .'");
-        Tcl_GlobalEval(ip, "catch {destroy .}");
-    }
-#endif
-#if 1
-    DUMP1("destroy root widget");
-    if (tk_stubs_init_p() && Tk_MainWindow(ip) != (Tk_Window)NULL) {
-        /*
-	 *  On Ruby VM, this code piece may be not called, because 
-	 *  Tk_MainWindow() returns NULL on a native thread except 
-         *  the thread which initialize Tk environment.
-         *  Of course, that is a problem. But maybe not so serious.
-         *  All widgets are destroyed when the Tcl interp is deleted.
-         *  At then, Ruby may raise exceptions on the delete hook 
-         *  callbacks which registered for the deleted widgets, and 
-	 *  may fail to clear objects which depends on the widgets.
-         *  Although it is the problem, it is possibly avoidable by
-         *  rescuing exceptions and the finalize hook of the interp.
-         */
-        Tk_Window win = Tk_MainWindow(ip);
-
-        DUMP1("call Tk_DestroyWindow");
-        ruby_debug   = Qfalse;
-        ruby_verbose = Qnil;
-	if (! (((Tk_FakeWin*)win)->flags & TK_ALREADY_DEAD)) {
-	  Tk_DestroyWindow(win);
-	}
-        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, "catch {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);
-            /* ckfree((char*)ptr); */
-            rb_thread_critical = thr_crit_bup;
-            return;
-        }
-
-        if (ptr->ip == (Tcl_Interp*)NULL) {
-            DUMP1("ip_free is called for deleted IP");
-            free(ptr);
-            /* ckfree((char*)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);
-        /* ckfree((char*)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)); */
-        argv = (char **)ckalloc(sizeof(char *) * (objc + 1));
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-
-        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);
-
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* Tcl_Free((char*)argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-    }
-
-    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 */
-#ifdef RUBY_VM
-    if (rb_safe_level() >= 4) {
-#else
-    if (ruby_safe_level >= 4) {
-#endif
-        rb_raise(rb_eSecurityError, 
-                 "Cannot create a TclTkIp object at level %d", 
-#ifdef RUBY_VM
-                 rb_safe_level()
-#else
-                 ruby_safe_level
-#endif
-                 );
-    }
-
-    /* create object */
-    Data_Get_Struct(self, struct tcltkip, ptr);
-    ptr = ALLOC(struct tcltkip);
-    /* ptr = (struct tcltkip *)ckalloc(sizeof(struct tcltkip)); */
-    DATA_PTR(self) = ptr;
-#ifdef RUBY_VM
-    ptr->tk_thread_id = 0;
-#endif
-    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
-
-#ifdef RUBY_VM
-        /* set Tk thread ID */
-        ptr->tk_thread_id = Tcl_GetCurrentThread();
-#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);
-    /* struct tcltkip *slave = (struct tcltkip *)ckalloc(sizeof(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 */
-#ifdef RUBY_VM
-    /* slave->tk_thread_id = 0; */
-    slave->tk_thread_id = master->tk_thread_id; /* == current thread */
-#endif
-    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");
-    }
-
-    /*
-     *  Because of cross-threading, the following line may fail to find 
-     *  the MainWindow, even if the Tcl/Tk interpreter has one or more.
-     *  But it has no problem. Current implementation of both type of 
-     *  the "exit" command don't need maiinWin token.
-     */
-    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_core(self, argc, argv)
-    VALUE self;
-    int   argc;   /* dummy */
-    VALUE *argv;  /* dummy */
-{
-    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;
-    }
-}
-
-static VALUE
-ip_has_mainwindow_p(self)
-    VALUE self;
-{
-    return tk_funcall(ip_has_mainwindow_p_core, 0, (VALUE*)NULL, self);
-}
-
-
-/*** 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_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 4)
-    int len2;
-    const char *s2;
-#endif
-
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
-    s = Tcl_GetStringFromObj(obj, &len);
-#else
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 3
-     /* TCL_VERSION 8.1 -- 8.3 */
-    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);
-    }
-#else /* TCL_VERSION >= 8.4 */
-    if (IS_TCL_BYTEARRAY(obj)) {
-      s = Tcl_GetByteArrayFromObj(obj, &len);
-      binary = 1;
-    } else {
-      s = Tcl_GetStringFromObj(obj, &len);
-    }
-
-#endif
-#endif
-    str = s ? rb_str_new(s, len) : rb_str_new2("");
-    if (binary) {
-#ifdef RUBY_VM
-      rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
-#endif
-      rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
-    } else {
-#ifdef RUBY_VM
-      rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
-#endif
-      rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
-#endif
-    }
-    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_LEN(str));
-#else /* TCL_VERSION >= 8.1 */
-    VALUE enc = rb_attr_get(str, ID_at_enc);
-
-    if (!NIL_P(enc)) {
-        StringValue(enc);
-        if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-            /* binary string */
-            return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
-        } else {
-            /* text string */
-            return Tcl_NewStringObj(s, RSTRING_LEN(str));
-        }
-#ifdef RUBY_VM
-    } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
-        /* binary string */
-        return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
-#endif
-    } else if (strlen(s) != RSTRING_LEN(str)) {
-        /* probably binary string */
-        return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
-    } else {
-        /* probably text string */
-        return Tcl_NewStringObj(s, RSTRING_LEN(str));
-    }
-#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_ResetResult(interp);
-    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;
-    volatile VALUE thread = q->thread;
-    struct tcltkip *ptr;
-
-    DUMP2("do_call_queue_handler : evPtr = %p", evPtr);
-    DUMP2("call_queue_handler thread : %lx", rb_thread_current());
-    DUMP2("added by thread : %lx", thread);
-
-    if (*(q->done)) {
-        DUMP1("processed by another event-loop");
-        return 0;
-    } else {
-        DUMP1("process it on current event-loop");
-    }
-
-    if (RTEST(rb_thread_alive_p(thread)) 
-	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-      DUMP1("caller is not yet ready to receive the result -> pending");
-      return 0;
-    }
-
-    /* process it */
-    *(q->done) = 1;
-
-    /* deleted ipterp ? */
-    ptr = get_ip(q->interp);
-    if (deleted_ip(ptr)) {
-        /* deleted IP --> ignore */
-        return 1;
-    }
-
-    /* incr internal handler mark */
-    rbtk_internal_eventloop_handler++;
-
-    /* check safe-level */
-    if (rb_safe_level() != q->safe_level) {
-        /* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
-        q_dat = Data_Wrap_Struct(rb_cData,call_queue_mark,-1,q);
-        ret = rb_funcall(rb_proc_new(callq_safelevel_handler, q_dat), 
-                         ID_call, 0);
-        rb_gc_force_recycle(q_dat);
-	q_dat = (VALUE)NULL;
-    } else {
-        DUMP2("call function (for caller thread:%lx)", thread);
-        DUMP2("call function (current thread:%lx)", rb_thread_current());
-        ret = (q->func)(q->interp, q->argc, q->argv);
-    }
-
-    /* set result */
-    RARRAY_PTR(q->result)[0] = ret;
-    ret = (VALUE)NULL;
-
-    /* decr internal handler mark */
-    rbtk_internal_eventloop_handler--;
-
-    /* complete */
-    *(q->done) = -1;
-
-    /* unlink ruby objects */
-    q->argv = (VALUE*)NULL;
-    q->interp = (VALUE)NULL;
-    q->result = (VALUE)NULL;
-    q->thread = (VALUE)NULL;
-
-    /* back to caller */
-    /* if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) { */
-    if (RTEST(rb_thread_alive_p(thread))) {
-      DUMP2("back to caller (caller thread:%lx)", thread);
-      DUMP2("               (current thread:%lx)", rb_thread_current());
-#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
-      have_rb_thread_waiting_for_value = 1;
-      rb_thread_wakeup(thread);
-#else
-      rb_thread_run(thread);
-#endif
-      DUMP1("finish back to caller");
-#if DO_THREAD_SCHEDULE_AT_CALLBACK_DONE
-      rb_thread_schedule();
-#endif
-    } else {
-      DUMP2("caller is dead (caller thread:%lx)", 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;
-    struct tcltkip *ptr;
-    int  *alloc_done;
-    int  thr_crit_bup;
-    int  is_tk_evloop_thread;
-    volatile VALUE current = rb_thread_current();
-    volatile VALUE ip_obj = obj;
-    volatile VALUE result;
-    volatile VALUE ret;
-
-    if (!NIL_P(ip_obj) && rb_obj_is_kind_of(ip_obj, tcltkip_class)) {
-        ptr = get_ip(ip_obj);
-        if (deleted_ip(ptr)) return Qnil;
-    } else {
-        ptr = (struct tcltkip *)NULL;
-    }
-
-#ifdef RUBY_VM
-    if (ptr) {
-      /* on Tcl interpreter */
-      is_tk_evloop_thread = (ptr->tk_thread_id == (Tcl_ThreadId) 0 
-			     || ptr->tk_thread_id == Tcl_GetCurrentThread());
-    } else {
-      /* on Tcl/Tk library */
-      is_tk_evloop_thread = (tk_eventloop_thread_id == (Tcl_ThreadId) 0 
-			     || tk_eventloop_thread_id == Tcl_GetCurrentThread());
-    }
-#else
-    is_tk_evloop_thread = 1;
-#endif
-
-    if (is_tk_evloop_thread
-	&& (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); */
-        VALUE *temp = (VALUE*)ckalloc(sizeof(VALUE) * argc);
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)temp); /* XXXXXXXX */
-#endif
-        MEMCPY(temp, argv, VALUE, argc);
-        argv = temp;
-    }
-
-    /* allocate memory (keep result) */
-    /* alloc_done = (int*)ALLOC(int); */
-    alloc_done = (int*)ckalloc(sizeof(int));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
-#endif
-    *alloc_done = 0;
-
-    /* allocate memory (freed by Tcl_ServiceEvent) */
-    /* callq = (struct call_queue *)Tcl_Alloc(sizeof(struct call_queue)); */
-    callq = (struct call_queue *)ckalloc(sizeof(struct call_queue));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve(callq);
-#endif
-
-    /* allocate result obj */
-    result = rb_ary_new3(1, Qnil);
-
-    /* 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");
-#ifdef RUBY_VM
-    if (ptr && ptr->tk_thread_id) {
-      /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, 
-			   &(callq->ev), TCL_QUEUE_HEAD); */
-      Tcl_ThreadQueueEvent(ptr->tk_thread_id, 
-			   (Tcl_Event*)callq, TCL_QUEUE_HEAD);
-      Tcl_ThreadAlert(ptr->tk_thread_id);
-    } else if (tk_eventloop_thread_id) {
-      /* Tcl_ThreadQueueEvent(tk_eventloop_thread_id, 
-			   &(callq->ev), TCL_QUEUE_HEAD); */
-      Tcl_ThreadQueueEvent(tk_eventloop_thread_id, 
-			   (Tcl_Event*)callq, TCL_QUEUE_HEAD);
-      Tcl_ThreadAlert(tk_eventloop_thread_id);
-    } else {
-      /* Tcl_QueueEvent(&(callq->ev), TCL_QUEUE_HEAD); */
-      Tcl_QueueEvent((Tcl_Event*)callq, TCL_QUEUE_HEAD);
-    }
-#else
-    /* Tcl_QueueEvent(&(callq->ev), TCL_QUEUE_HEAD); */
-    Tcl_QueueEvent((Tcl_Event*)callq, TCL_QUEUE_HEAD);
-#endif
-
-    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) {
-      DUMP2("*** wait for handler (current thread:%lx)", current);
-      /* rb_thread_stop(); */
-      rb_thread_sleep_forever();
-      DUMP2("*** wakeup (current thread:%lx)", current);
-    }
-    DUMP2("back from handler (current thread:%lx)", current);
-
-    /* get result & free allocated memory */
-    ret = RARRAY_PTR(result)[0];
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)alloc_done); /* XXXXXXXX */
-#else
-    /* free(alloc_done); */
-    ckfree((char*)alloc_done);
-#endif
-#endif
-    /* if (argv) free(argv); */
-    if (argv) {
-      /* if argv != NULL, alloc as 'temp' */
-      int i;
-      for(i = 0; i < argc; i++) { argv[i] = (VALUE)NULL; }
-
-#if 0 /* use Tcl_EventuallyFree */
-      Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-      Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-      ckfree((char*)argv);
-#endif
-#endif
-    }
-
-#if 0 /* callq is freed by Tcl_ServiceEvent */
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release(callq);
-#else
-    ckfree((char*)callq);
-#endif
-#endif
-
-    /* exception? */
-    if (rb_obj_is_kind_of(ret, rb_eException)) {
-        DUMP1("raise exception");
-        /* rb_exc_raise(ret); */
-	rb_exc_raise(rb_exc_new3(rb_obj_class(ret), 
-				 rb_funcall(ret, ID_to_s, 0, 0)));
-    }
-
-    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:
-#ifdef RUBY_VM
-              if (NIL_P(rb_errinfo())) {
-#else
-              if (NIL_P(ruby_errinfo)) {
-#endif
-                  rbtk_pending_exception = rb_exc_new2(rb_eException, 
-                                                       "unknown exception");
-              } else {
-#ifdef RUBY_VM
-                  rbtk_pending_exception = rb_errinfo();
-#else
-                  rbtk_pending_exception = ruby_errinfo;
-#endif
-              }
-              break;
-
-          case TAG_FATAL:
-#ifdef RUBY_VM
-              if (NIL_P(rb_errinfo())) {
-#else
-              if (NIL_P(ruby_errinfo)) {
-#endif
-                  rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
-              } else {
-#ifdef RUBY_VM
-                  rbtk_pending_exception = rb_errinfo();
-#else
-                  rbtk_pending_exception = ruby_errinfo;
-#endif
-              }
-          }
-#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;
-    volatile VALUE thread = q->thread;
-    struct tcltkip *ptr;
-
-    DUMP2("do_eval_queue_handler : evPtr = %p", evPtr);
-    DUMP2("eval_queue_thread : %lx", rb_thread_current());
-    DUMP2("added by thread : %lx", thread);
-
-    if (*(q->done)) {
-        DUMP1("processed by another event-loop");
-        return 0;
-    } else {
-        DUMP1("process it on current event-loop");
-    }
-
-    if (RTEST(rb_thread_alive_p(thread)) 
-	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-      DUMP1("caller is not yet ready to receive the result -> pending");
-      return 0;
-    }
-
-    /* process it */
-    *(q->done) = 1;
-
-    /* deleted ipterp ? */
-    ptr = get_ip(q->interp);
-    if (deleted_ip(ptr)) {
-        /* deleted IP --> ignore */
-        return 1;
-    }
-
-    /* incr internal handler mark */
-    rbtk_internal_eventloop_handler++;
-
-    /* check safe-level */
-    if (rb_safe_level() != q->safe_level) {
-#ifdef HAVE_NATIVETHREAD
-#ifdef RUBY_VM
-#if 0
-    if (!ruby_native_thread_p()) {
-      rb_bug("cross-thread violation on eval_queue_handler()");
-    }
-#endif
-#else
-    if (!is_ruby_native_thread()) {
-      rb_bug("cross-thread violation on eval_queue_handler()");
-    }
-#endif
-#endif
-        /* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
-        q_dat = Data_Wrap_Struct(rb_cData,eval_queue_mark,-1,q);
-        ret = rb_funcall(rb_proc_new(evq_safelevel_handler, q_dat), 
-                         ID_call, 0);
-        rb_gc_force_recycle(q_dat);
-	q_dat = (VALUE)NULL;
-    } else {
-        ret = ip_eval_real(q->interp, q->str, q->len);
-    }
-
-    /* set result */
-    RARRAY_PTR(q->result)[0] = ret;
-    ret = (VALUE)NULL;
-
-    /* decr internal handler mark */
-    rbtk_internal_eventloop_handler--;
-
-    /* complete */
-    *(q->done) = -1;
-
-    /* unlink ruby objects */
-    q->interp = (VALUE)NULL;
-    q->result = (VALUE)NULL;
-    q->thread = (VALUE)NULL;
-
-    /* back to caller */
-    /* if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) { */
-    if (RTEST(rb_thread_alive_p(thread))) {
-      DUMP2("back to caller (caller thread:%lx)", thread);
-      DUMP2("               (current thread:%lx)", rb_thread_current());
-#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
-      have_rb_thread_waiting_for_value = 1;
-      rb_thread_wakeup(thread);
-#else
-      rb_thread_run(thread);
-#endif
-      DUMP1("finish back to caller");
-#if DO_THREAD_SCHEDULE_AT_CALLBACK_DONE
-      rb_thread_schedule();
-#endif
-    } else {
-      DUMP2("caller is dead (caller thread:%lx)", 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;
-#ifdef RUBY_VM
-    struct tcltkip *ptr;
-#endif
-    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;
-
-#ifdef RUBY_VM
-    ptr = get_ip(ip_obj);
-#endif
-
-    if (
-#ifdef RUBY_VM
-	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
-	&& 
-#endif
-	(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_PTR(str), RSTRING_LEN(str));
-        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 (keep result) */
-    /* alloc_done = (int*)ALLOC(int); */
-    alloc_done = (int*)ckalloc(sizeof(int));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
-#endif
-    *alloc_done = 0;
-
-    /* eval_str = ALLOC_N(char, RSTRING_LEN(str) + 1); */
-    eval_str = ckalloc(sizeof(char) * (RSTRING_LEN(str) + 1));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)eval_str); /* XXXXXXXX */
-#endif
-    memcpy(eval_str, RSTRING_PTR(str), RSTRING_LEN(str));
-    eval_str[RSTRING_LEN(str)] = 0;
-
-    /* allocate memory (freed by Tcl_ServiceEvent) */
-    /* evq = (struct eval_queue *)Tcl_Alloc(sizeof(struct eval_queue)); */
-    evq = (struct eval_queue *)ckalloc(sizeof(struct eval_queue));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve(evq);
-#endif
-
-    /* allocate result obj */
-    result = rb_ary_new3(1, Qnil);
-
-    /* construct event data */
-    evq->done = alloc_done;
-    evq->str = eval_str;
-    evq->len = RSTRING_LEN(str);
-    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");
-#ifdef RUBY_VM
-    if (ptr->tk_thread_id) {
-      /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(evq->ev), position); */
-      Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)evq, position);
-      Tcl_ThreadAlert(ptr->tk_thread_id);
-    } else if (tk_eventloop_thread_id) {
-      Tcl_ThreadQueueEvent(tk_eventloop_thread_id, (Tcl_Event*)evq, position);
-      /* Tcl_ThreadQueueEvent(tk_eventloop_thread_id, 
-			   &(evq->ev), position); */
-      Tcl_ThreadAlert(tk_eventloop_thread_id);
-    } else {
-      /* Tcl_QueueEvent(&(evq->ev), position); */
-      Tcl_QueueEvent((Tcl_Event*)evq, position);
-    }
-#else
-    /* Tcl_QueueEvent(&(evq->ev), position); */
-    Tcl_QueueEvent((Tcl_Event*)evq, position);
-#endif
-
-    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) {
-      DUMP2("*** wait for handler (current thread:%lx)", current);
-      /* rb_thread_stop(); */
-      rb_thread_sleep_forever();
-      DUMP2("*** wakeup (current thread:%lx)", current);
-    }
-    DUMP2("back from handler (current thread:%lx)", current);
-
-    /* get result & free allocated memory */
-    ret = RARRAY_PTR(result)[0];
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)alloc_done); /* XXXXXXXX */
-#else
-    /* free(alloc_done); */
-    ckfree((char*)alloc_done);
-#endif
-#endif
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)eval_str, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)eval_str); /* XXXXXXXX */
-#else
-    /* free(eval_str); */
-    ckfree(eval_str);
-#endif
-#endif
-#if 0 /* evq is freed by Tcl_ServiceEvent */
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release(evq);
-#else
-    ckfree((char*)evq);
-#endif
-#endif
-
-    if (rb_obj_is_kind_of(ret, rb_eException)) {
-        DUMP1("raise exception");
-        /* rb_exc_raise(ret); */
-	rb_exc_raise(rb_exc_new3(rb_obj_class(ret), 
-				 rb_funcall(ret, ID_to_s, 0, 0)));
-    }
-
-    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;
-
-#ifdef RUBY_VM
-            enc = rb_funcall(rb_obj_encoding(str), ID_to_s, 0, 0);
-#else
-            enc = rb_attr_get(str, ID_at_enc);
-#endif
-            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); */
-                        enc = rb_funcall(enc, ID_to_s, 0, 0);
-                        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
-			if (!RSTRING_LEN(enc)) {
-			  encoding = (Tcl_Encoding)NULL;
-			} else {
-			  encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, 
-						     RSTRING_PTR(enc));
-			  if (encoding == (Tcl_Encoding)NULL) {
-                            rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING_PTR(enc));
-			  }
-			}
-                    }
-                }
-            } else {
-                StringValue(enc);
-                if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-#ifdef RUBY_VM
-		    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
-#endif
-		    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
-                    rb_thread_critical = thr_crit_bup;
-                    return str;
-                }
-                /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
-                encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, 
-					   RSTRING_PTR(enc));
-                if (encoding == (Tcl_Encoding)NULL) {
-                    rb_warning("string has unknown encoding information (@encoding:'%s')", RSTRING_PTR(enc));
-                }
-            }
-        } else {
-            encoding = (Tcl_Encoding)NULL;
-        }
-    } else {
-        StringValue(encodename);
-	if (strcmp(RSTRING_PTR(encodename), "binary") == 0) {
-#ifdef RUBY_VM
-	  rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
-#endif
-	  rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
-	  rb_thread_critical = thr_crit_bup;
-	  return str;
-	}
-        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(encodename)); */
-        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(encodename));
-        if (encoding == (Tcl_Encoding)NULL) {
-            /*
-            rb_warning("unknown encoding name '%s'", 
-                       RSTRING_PTR(encodename));
-            */
-            rb_raise(rb_eArgError, "unknown encoding name '%s'", 
-                     RSTRING_PTR(encodename));
-        }
-    }
-
-    StringValue(str);
-    if (!RSTRING_LEN(str)) {
-        rb_thread_critical = thr_crit_bup;
-        return str;
-    }
-    buf = ALLOC_N(char, RSTRING_LEN(str)+1);
-    /* buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1)); */
-    memcpy(buf, RSTRING_PTR(str), RSTRING_LEN(str));
-    buf[RSTRING_LEN(str)] = 0;
-
-    Tcl_DStringInit(&dstr);
-    Tcl_DStringFree(&dstr);
-    /* Tcl_ExternalToUtfDString(encoding,buf,strlen(buf),&dstr); */
-    Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LEN(str), &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));
-#ifdef RUBY_VM
-    rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
-#endif
-    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
-    if (taint_flag) OBJ_TAINT(str);
-
-    /*
-    if (encoding != (Tcl_Encoding)NULL) {
-        Tcl_FreeEncoding(encoding);
-    }
-    */
-    Tcl_DStringFree(&dstr);
-
-    free(buf);
-    /* ckfree(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_PTR(enc), "binary") == 0) {
-#ifdef RUBY_VM
-		    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
-#endif
-		    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
-                    rb_thread_critical = thr_crit_bup;
-                    return str;
-                }
-#ifdef RUBY_VM
-	    } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
-	        rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
-		rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
-		rb_thread_critical = thr_crit_bup;
-		return str;
-#endif
-            }
-        }
-
-        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); */
-                enc = rb_funcall(enc, ID_to_s, 0, 0);
-                /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
-		if (!RSTRING_LEN(enc)) {
-		  encoding = (Tcl_Encoding)NULL;
-		} else {
-		  encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, 
-					     RSTRING_PTR(enc));
-		  if (encoding == (Tcl_Encoding)NULL) {
-                    rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING_PTR(enc));
-		  } else {
-		    encodename = rb_obj_dup(enc);
-		  }
-		}
-            }
-        }
-
-    } else {
-        StringValue(encodename);
-
-        if (strcmp(RSTRING_PTR(encodename), "binary") == 0) {
-	    Tcl_Obj *tclstr;
-            char *s;
-            int  len;
-
-            StringValue(str);
-            tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LEN(str));
-	    Tcl_IncrRefCount(tclstr);
-            s = Tcl_GetByteArrayFromObj(tclstr, &len);
-            str = rb_tainted_str_new(s, len);
-	    s = (char*)NULL;
-	    Tcl_DecrRefCount(tclstr);
-#ifdef RUBY_VM
-	    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
-#endif
-            rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
-
-            rb_thread_critical = thr_crit_bup;
-            return str;
-        }
-
-        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(encodename)); */
-        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(encodename));
-        if (encoding == (Tcl_Encoding)NULL) {
-            /* 
-            rb_warning("unknown encoding name '%s'", 
-                       RSTRING_PTR(encodename));
-            encodename = Qnil;
-            */
-            rb_raise(rb_eArgError, "unknown encoding name '%s'", 
-                     RSTRING_PTR(encodename));
-        }
-    }
-
-    StringValue(str);
-
-    if (RSTRING_LEN(str) == 0) {
-        rb_thread_critical = thr_crit_bup;
-        return rb_tainted_str_new2("");
-    }
-
-    buf = ALLOC_N(char, RSTRING_LEN(str)+1);
-    /* buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1)); */
-    memcpy(buf, RSTRING_PTR(str), RSTRING_LEN(str));
-    buf[RSTRING_LEN(str)] = 0;
-
-    Tcl_DStringInit(&dstr);
-    Tcl_DStringFree(&dstr);
-    /* Tcl_UtfToExternalDString(encoding,buf,strlen(buf),&dstr); */
-    Tcl_UtfToExternalDString(encoding,buf,RSTRING_LEN(str),&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));
-#ifdef RUBY_VM
-    if (interp) {
-      /* can access encoding_table of TclTkIp */
-      /*   ->  try to use encoding_table      */
-      VALUE tbl = ip_get_encoding_table(ip_obj);
-      VALUE encobj = encoding_table_get_obj(tbl, encodename);
-      rb_enc_associate_index(str, rb_to_encoding_index(encobj));
-    } else {
-      /* cannot access encoding_table of TclTkIp */
-      /*   ->  try to find on Ruby Encoding      */
-      rb_enc_associate_index(str, rb_enc_find_index(RSTRING_PTR(encodename)));
-    }
-#endif
-    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);
-    /* ckfree(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_LEN(str)) {
-        return str;
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /* src_buf = ALLOC_N(char, RSTRING_LEN(str)+1); */
-    src_buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)src_buf); /* XXXXXXXX */
-#endif
-    memcpy(src_buf, RSTRING_PTR(str), RSTRING_LEN(str));
-    src_buf[RSTRING_LEN(str)] = 0;
-
-    /* dst_buf = ALLOC_N(char, RSTRING_LEN(str)+1); */
-    dst_buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)dst_buf); /* XXXXXXXX */
-#endif
-
-    ptr = src_buf;
-    while(RSTRING_LEN(str) > 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);
-#ifdef RUBY_VM
-    rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
-#endif
-    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)src_buf, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)src_buf); /* XXXXXXXX */
-#else
-    /* free(src_buf); */
-    ckfree(src_buf);
-#endif
-#endif
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)dst_buf, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)dst_buf); /* XXXXXXXX */
-#else
-    /* free(dst_buf); */
-    ckfree(dst_buf);
-#endif
-#endif
-
-    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_PTR(enc_name));
-    }
-
-    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);*/ /* XXXXXXXXXX */
-        argv = (char **)ckalloc(sizeof(char *)*(argc+1));
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-        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);
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-
-#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 data struct */
-    ptr = get_ip(interp);
-
-    /* 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 = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * (objc+2));
-#if 0 /* use Tcl_Preserve/Release */
-	    Tcl_Preserve((ClientData)unknown_objv); /* XXXXXXXX */
-#endif
-            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 = (char **)ckalloc(sizeof(char *) * (argc+2));
-#if 0 /* use Tcl_Preserve/Release */
-	    Tcl_Preserve((ClientData)unknown_argv); /* XXXXXXXX */
-#endif
-            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:
-#ifdef RUBY_VM
-        if (NIL_P(rb_errinfo())) {
-#else
-        if (NIL_P(ruby_errinfo)) {
-#endif
-            rbtk_pending_exception = rb_exc_new2(rb_eException, 
-                                                 "unknown exception");
-        } else {
-#ifdef RUBY_VM
-            rbtk_pending_exception = rb_errinfo();
-#else
-            rbtk_pending_exception = ruby_errinfo;
-#endif
-        }
-        break;
-        
-    case TAG_FATAL:
-#ifdef RUBY_VM
-        if (NIL_P(rb_errinfo())) {
-#else
-        if (NIL_P(ruby_errinfo)) {
-#endif
-            rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
-        } else {
-#ifdef RUBY_VM
-            rbtk_pending_exception = rb_errinfo();
-#else
-            rbtk_pending_exception = ruby_errinfo;
-#endif
-        }
-    }
-
-#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); */
-        argv = (char **)ckalloc(sizeof(char *) * (argc+1));
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-        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);
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-
-#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]);
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)objv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)objv); /* XXXXXXXX */
-#else
-        /* free(objv); */
-        ckfree((char*)objv);
-#endif
-#endif
-#else /* TCL_MAJOR_VERSION < 8 */
-        free(argv[0]);
-        /* ckfree(argv[0]); */
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-#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);*/ /* XXXXXXXXXX */
-    av = (Tcl_Obj**)ckalloc(sizeof(Tcl_Obj *)*(argc+1));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)av); /* XXXXXXXX */
-#endif
-    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); */
-    av = (char**)ckalloc(sizeof(char *) * (argc+1));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)av); /* XXXXXXXX */
-#endif
-    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]);
-	av[i] = (Tcl_Obj*)NULL;
-#else /* TCL_MAJOR_VERSION < 8 */
-        free(av[i]);
-	av[i] = (char*)NULL;
-#endif
-    }
-#if TCL_MAJOR_VERSION >= 8
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)av, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)av); /* XXXXXXXX */
-#else
-    ckfree((char*)av);
-#endif
-#endif
-#else /* TCL_MAJOR_VERSION < 8 */
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)av, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)av); /* XXXXXXXX */
-#else
-    /* free(av); */
-    ckfree((char*)av);
-#endif
-#endif
-#endif
-}
-
-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;
-    volatile VALUE thread = q->thread;
-    struct tcltkip *ptr;
-
-    DUMP2("do_invoke_queue_handler : evPtr = %p", evPtr);
-    DUMP2("invoke queue_thread : %lx", rb_thread_current());
-    DUMP2("added by thread : %lx", thread);
-
-    if (*(q->done)) {
-        DUMP1("processed by another event-loop");
-        return 0;
-    } else {
-        DUMP1("process it on current event-loop");
-    }
-
-    if (RTEST(rb_thread_alive_p(thread)) 
-	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-      DUMP1("caller is not yet ready to receive the result -> pending");
-      return 0;
-    }
-
-    /* process it */
-    *(q->done) = 1;
-
-    /* deleted ipterp ? */
-    ptr = get_ip(q->interp);
-    if (deleted_ip(ptr)) {
-        /* deleted IP --> ignore */
-        return 1;
-    }
-
-    /* incr internal handler mark */
-    rbtk_internal_eventloop_handler++;
-
-    /* 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,-1,q);
-        ret = rb_funcall(rb_proc_new(ivq_safelevel_handler, q_dat), 
-                         ID_call, 0);
-        rb_gc_force_recycle(q_dat);
-	q_dat = (VALUE)NULL;
-    } else {
-        DUMP2("call invoke_real (for caller thread:%lx)", thread);
-        DUMP2("call invoke_real (current thread:%lx)", rb_thread_current());
-        ret = ip_invoke_core(q->interp, q->argc, q->argv);
-    }
-
-    /* set result */
-    RARRAY_PTR(q->result)[0] = ret;
-    ret = (VALUE)NULL;
-
-    /* decr internal handler mark */
-    rbtk_internal_eventloop_handler--;
-
-    /* complete */
-    *(q->done) = -1;
-
-    /* unlink ruby objects */
-    q->interp = (VALUE)NULL;
-    q->result = (VALUE)NULL;
-    q->thread = (VALUE)NULL;
-
-    /* back to caller */
-    /* if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) { */
-    if (RTEST(rb_thread_alive_p(thread))) {
-      DUMP2("back to caller (caller thread:%lx)", thread);
-      DUMP2("               (current thread:%lx)", rb_thread_current());
-#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
-      have_rb_thread_waiting_for_value = 1;
-      rb_thread_wakeup(thread);
-#else
-      rb_thread_run(thread);
-#endif
-      DUMP1("finish back to caller");
-#if DO_THREAD_SCHEDULE_AT_CALLBACK_DONE
-      rb_thread_schedule();
-#endif
-    } else {
-      DUMP2("caller is dead (caller thread:%lx)", 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;
-#ifdef RUBY_VM
-    struct tcltkip *ptr;
-#endif
-    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");
-    }
-
-#ifdef RUBY_VM
-    ptr = get_ip(ip_obj);
-    DUMP2("status: ptr->tk_thread_id %d", ptr->tk_thread_id);
-#endif
-    DUMP2("status: Tcl_GetCurrentThread %d", Tcl_GetCurrentThread());
-    DUMP2("status: eventloopt_thread %lx", eventloop_thread);
-
-    if (
-#ifdef RUBY_VM
-	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
-	&& 
-#endif
-	(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 = (int*)ckalloc(sizeof(int));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
-#endif
-    *alloc_done = 0;
-
-    /* allocate memory (freed by Tcl_ServiceEvent) */
-    /* ivq = (struct invoke_queue *)Tcl_Alloc(sizeof(struct invoke_queue)); */
-    ivq = (struct invoke_queue *)ckalloc(sizeof(struct invoke_queue));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)ivq); /* XXXXXXXX */
-#endif
-
-    /* allocate result obj */
-    result = rb_ary_new3(1, Qnil);
-
-    /* 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");
-#ifdef RUBY_VM
-    if (ptr->tk_thread_id) {
-      /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(ivq->ev), position); */
-      Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)ivq, position);
-      Tcl_ThreadAlert(ptr->tk_thread_id);
-    } else if (tk_eventloop_thread_id) {
-      /* Tcl_ThreadQueueEvent(tk_eventloop_thread_id, 
-			   &(ivq->ev), position); */
-      Tcl_ThreadQueueEvent(tk_eventloop_thread_id, 
-			   (Tcl_Event*)ivq, position);
-      Tcl_ThreadAlert(tk_eventloop_thread_id);
-    } else {
-      /* Tcl_QueueEvent(&(ivq->ev), position); */
-      Tcl_QueueEvent((Tcl_Event*)ivq, position);
-    }
-#else
-    /* Tcl_QueueEvent(&(ivq->ev), position); */
-    Tcl_QueueEvent((Tcl_Event*)ivq, position);
-#endif
-
-    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(); */
-	rb_thread_sleep_forever();
-    }
-    DUMP2("back from handler (current thread:%lx)", current);
-
-    /* get result & free allocated memory */
-    ret = RARRAY(result)->ptr[0];
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)alloc_done); /* XXXXXXXX */
-#else
-    /* free(alloc_done); */
-    ckfree((char*)alloc_done);
-#endif
-#endif
-
-#if 0 /* ivq is freed by Tcl_ServiceEvent */
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)ivq, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release(ivq);
-#else
-    ckfree((char*)ivq);
-#endif
-#endif
-#endif
-
-    /* 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); */
-	rb_exc_raise(rb_exc_new3(rb_obj_class(ret), 
-				 rb_funcall(ret, ID_to_s, 0, 0)));
-    }
-
-    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_PTR(varname),
-                                NIL_P(index) ? NULL : RSTRING_PTR(index),
-                                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_PTR(varname), 
-                              NIL_P(index) ? NULL : RSTRING_PTR(index),
-                              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_PTR(varname),
-                                NIL_P(index) ? NULL : RSTRING_PTR(index),
-                                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_PTR(varname), 
-                              NIL_P(index) ? NULL : RSTRING_PTR(index), 
-                              RSTRING_PTR(value), 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_PTR(varname), 
-                                      NIL_P(index) ? NULL : RSTRING_PTR(index),
-                                      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);
-#ifdef RUBY_VM
-    int list_enc_idx;
-    volatile VALUE list_ivar_enc;
-#endif
-    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);
-#ifdef RUBY_VM
-    list_enc_idx = rb_enc_get_index(list_str);
-    list_ivar_enc = rb_ivar_get(list_str, ID_at_enc);
-#endif
-
-    {
-#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]);
-#ifdef RUBY_VM
-	    if (rb_enc_get_index(elem) == ENCODING_INDEX_BINARY) {
-	        rb_enc_associate_index(elem, ENCODING_INDEX_BINARY);
-		rb_ivar_set(elem, ID_at_enc, ENCODING_NAME_BINARY);
-	    } else {
-	        rb_enc_associate_index(elem, list_enc_idx);
-		rb_ivar_set(elem, ID_at_enc, list_ivar_enc);
-	    }
-#endif
-            if (taint_flag) OBJ_TAINT(elem);
-            /* RARRAY(ary)->ptr[idx] = elem; */
-	    rb_ary_push(ary, 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_PTR(list_str), 
-                          &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; */
-	    rb_ary_push(ary, 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); */
-    flagPtr = (int *)ckalloc(sizeof(int) * argc);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)flagPtr); /* XXXXXXXXXX */
-#endif
-
-    /* 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_LEN(argv[num]),  
-                                      &flagPtr[num]) + 1;
-#else /* TCL_MAJOR_VERSION < 8 */
-        len += Tcl_ScanElement(dst, &flagPtr[num]) + 1;
-#endif
-    }
-
-    /* pass 2 */
-    /* result = (char *)Tcl_Alloc(len); */
-    result = (char *)ckalloc(len);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)result);
-#endif
-    dst = result;
-    for(num = 0; num < argc; num++) {
-#if TCL_MAJOR_VERSION >= 8
-        len = Tcl_ConvertCountedElement(RSTRING_PTR(argv[num]), 
-                                        RSTRING_LEN(argv[num]), 
-                                        dst, flagPtr[num]);
-#else /* TCL_MAJOR_VERSION < 8 */
-        len = Tcl_ConvertElement(RSTRING_PTR(argv[num]), dst, flagPtr[num]);
-#endif
-        dst += len;
-        *dst = ' ';
-        dst++;
-    }
-    if (dst == result) {
-        *dst = 0;
-    } else {
-        dst[-1] = 0;
-    }
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)flagPtr, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)flagPtr);
-#else
-    /* free(flagPtr); */
-    ckfree((char*)flagPtr);
-#endif
-#endif
-
-    /* create object */
-    str = rb_str_new(result, dst - result - 1);
-    if (taint_flag) OBJ_TAINT(str);
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)result, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)result); /* XXXXXXXXXXX */
-#else
-    /* Tcl_Free(result); */
-    ckfree(result);
-#endif
-#endif
-
-    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_PTR(src), RSTRING_LEN(src), 
-                                 &scan_flag);
-    dst = rb_str_new(0, len + 1);
-    len = Tcl_ConvertCountedElement(RSTRING_PTR(src), RSTRING_LEN(src), 
-                                    RSTRING_PTR(dst), scan_flag);
-#else /* TCL_MAJOR_VERSION < 8 */
-    len = Tcl_ScanElement(RSTRING_PTR(src), &scan_flag);
-    dst = rb_str_new(0, len + 1);
-    len = Tcl_ConvertElement(RSTRING_PTR(src), RSTRING_PTR(dst), scan_flag);
-#endif
-
-    rb_str_resize(dst, len);
-    if (taint_flag) OBJ_TAINT(dst);
-
-    rb_thread_critical = thr_crit_bup;
-
-    return dst;
-}
-
-static VALUE
-lib_getversion(self)
-    VALUE self;
-{
-    volatile VALUE type_name;
-
-    set_tcltk_version();
-
-    switch(tcltk_version.type) {
-    case TCL_ALPHA_RELEASE:
-      type_name = rb_str_new2("alpha");
-      break;
-    case TCL_BETA_RELEASE:
-      type_name = rb_str_new2("beta");
-      break;
-    case TCL_FINAL_RELEASE:
-      type_name = rb_str_new2("final");
-      break;
-    default:
-      type_name = rb_str_new2("unknown");
-    }
-
-    return rb_ary_new3(5, INT2NUM(tcltk_version.major), 
-		          INT2NUM(tcltk_version.minor), 
-		          INT2NUM(tcltk_version.type), type_name, 
-		          INT2NUM(tcltk_version.patchlevel));
-}
-
-
-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);
-    /* info = ckalloc(sizeof(char) * size); */ /* SEGV */
-
-    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);
-    /* ckfree(info); */
-
-    return ret;
-}
-
-
-/*###############################################*/
-
-static VALUE
-create_dummy_encoding_for_tk_core(interp, name, error_mode)
-     VALUE interp;
-     VALUE name;
-     VALUE error_mode;
-{
-  struct tcltkip *ptr = get_ip(interp);
-
-  rb_secure(4);
-
-  StringValue(name);
-
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
-  if (Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(name)) == (Tcl_Encoding)NULL) {
-    if (RTEST(error_mode)) {
-      rb_raise(rb_eArgError, "invalid Tk encoding name '%s'", 
-	       RSTRING_PTR(name));
-    } else {
-      return Qnil;
-    }
-  }
-#endif
-
-#ifdef RUBY_VM
-  if (RTEST(rb_define_dummy_encoding(RSTRING_PTR(name)))) {
-    int idx = rb_enc_find_index(StringValueCStr(name));
-    return rb_enc_from_encoding(rb_enc_from_index(idx));
-  } else {
-    if (RTEST(error_mode)) {
-      rb_raise(rb_eRuntimeError, "fail to create dummy encoding for '%s'",
-	       RSTRING_PTR(name));
-    } else {
-      return Qnil;
-    }
-  }
-#else
-    return name;
-#endif
-}
-static VALUE
-create_dummy_encoding_for_tk(interp, name)
-     VALUE interp;
-     VALUE name;
-{
-  return create_dummy_encoding_for_tk_core(interp, name, Qtrue);
-}
-
-
-#ifdef RUBY_VM
-static int
-update_encoding_table(table, interp, error_mode)
-     VALUE table;
-     VALUE interp;
-     VALUE error_mode;
-{
-  struct tcltkip *ptr;
-  int retry = 0;
-  int i, idx, objc;
-  Tcl_Obj **objv;
-  Tcl_Obj *enc_list;
-  volatile VALUE encname = Qnil;
-  volatile VALUE encobj = Qnil;
-
-  /* interpreter check */
-  if (NIL_P(interp)) return 0;
-  ptr = get_ip(interp);
-  if (ptr == (struct tcltkip *) NULL)  return 0;
-  if (deleted_ip(ptr)) return 0;
-
-  /* get Tcl's encoding list */
-  Tcl_GetEncodingNames(ptr->ip);
-  enc_list = Tcl_GetObjResult(ptr->ip);
-  Tcl_IncrRefCount(enc_list);
-
-  if (Tcl_ListObjGetElements(ptr->ip, enc_list, 
-			     &objc, &objv) != TCL_OK) {
-    Tcl_DecrRefCount(enc_list);
-    /* rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names");*/
-    return 0;
-  }
-
-  /* check each encoding name */
-  for(i = 0; i < objc; i++) {
-    encname = rb_str_new2(Tcl_GetString(objv[i]));
-    if (NIL_P(rb_hash_lookup(table, encname))) {
-      /* new Tk encoding -> add to table */
-      idx = rb_enc_find_index(StringValueCStr(encname));
-      if (idx < 0) {
-	encobj = create_dummy_encoding_for_tk_core(interp,encname,error_mode);
-      } else {
-	encobj = rb_enc_from_encoding(rb_enc_from_index(idx));
-      }
-      encname = rb_obj_freeze(encname);
-      rb_hash_aset(table, encname, encobj);
-      if (!NIL_P(encobj) && NIL_P(rb_hash_lookup(table, encobj))) {
-	rb_hash_aset(table, encobj, encname);
-      }
-      retry = 1;
-    }
-  }
-
-  Tcl_DecrRefCount(enc_list);
-
-  return retry;
-}
-
-static VALUE
-encoding_table_get_name_core(table, enc_arg, error_mode)
-     VALUE table;
-     VALUE enc_arg;
-     VALUE error_mode;
-{
-  volatile VALUE enc = enc_arg;
-  volatile VALUE name = Qnil;
-  volatile VALUE tmp = Qnil;
-  volatile VALUE interp = rb_ivar_get(table, ID_at_interp);
-  struct tcltkip *ptr = (struct tcltkip *) NULL;
-  int idx;
-
-  /* deleted interp ? */
-  if (!NIL_P(interp)) {
-    ptr = get_ip(interp);
-    if (deleted_ip(ptr)) {
-      ptr = (struct tcltkip *) NULL;
-    }
-  }
-
-  /* encoding argument check */
-  /* 1st: default encoding setting of interp */
-  if (ptr && NIL_P(enc)) {
-    if (rb_respond_to(interp, ID_encoding_name)) {
-      enc = rb_funcall(interp, ID_encoding_name, 0, 0);
-    }
-  }
-  /* 2nd: encoding system of Tcl/Tk */
-  if (NIL_P(enc)) {
-    enc = rb_str_new2(Tcl_GetEncodingName((Tcl_Encoding)NULL));
-  }
-  /* 3rd: Encoding.default_external */
-  if (NIL_P(enc)) {
-    enc = rb_enc_default_external();
-  }
-
-  if (RTEST(rb_obj_is_kind_of(enc, cRubyEncoding))) {
-    /* Ruby's Encoding object */
-    name = rb_hash_lookup(table, enc);
-    if (!NIL_P(name)) {
-      /* find */
-      return name;
-    }
-
-    /* is it new ? */
-    /* update check of Tk encoding names */
-    if (update_encoding_table(table, interp, error_mode)) {
-      /* add new relations to the table   */
-      /* RETRY: registered Ruby encoding? */
-      name = rb_hash_lookup(table, enc);
-      if (!NIL_P(name)) {
-	/* find */
-	return name;
-      }
-    }
-    /* fail to find */
-
-  } else {
-    /* String or Symbol? */
-    name = rb_funcall(enc, ID_to_s, 0, 0);
-
-    if (!NIL_P(rb_hash_lookup(table, name))) {
-      /* find */
-      return name;
-    }
-
-    /* is it new ? */
-    idx = rb_enc_find_index(StringValueCStr(name));
-    if (idx >= 0) {
-      enc = rb_enc_from_encoding(rb_enc_from_index(idx));
-
-      /* registered Ruby encoding? */
-      tmp = rb_hash_lookup(table, enc);
-      if (!NIL_P(tmp)) {
-	/* find */
-	return tmp;
-      }
-
-      /* update check of Tk encoding names */
-      if (update_encoding_table(table, interp, error_mode)) {
-	/* add new relations to the table   */
-	/* RETRY: registered Ruby encoding? */
-	tmp = rb_hash_lookup(table, enc);
-	if (!NIL_P(tmp)) {
-	  /* find */
-	  return tmp;
-	}
-      }
-    }
-    /* fail to find */
-  }
-
-  if (RTEST(error_mode)) {
-    enc = rb_funcall(enc_arg, ID_to_s, 0, 0);
-    rb_raise(rb_eArgError, "unsupported Tk encoding '%s'", RSTRING_PTR(enc));
-  }
-  return Qnil;
-}
-static VALUE
-encoding_table_get_obj_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  volatile VALUE obj = Qnil;
-
-  obj = rb_hash_lookup(table, 
-		       encoding_table_get_name_core(table, enc, error_mode));
-  if (RTEST(rb_obj_is_kind_of(obj, cRubyEncoding))) {
-    return obj;
-  } else {
-    return Qnil;
-  }
-}
-
-#else /* ! RUBY_VM */
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
-static int
-update_encoding_table(table, interp, error_mode)
-     VALUE table;
-     VALUE interp;
-     VALUE error_mode;
-{
-  struct tcltkip *ptr;
-  int retry = 0;
-  int i, idx, objc;
-  Tcl_Obj **objv;
-  Tcl_Obj *enc_list;
-  volatile VALUE encname = Qnil;
-  volatile VALUE encobj = Qnil;
-
-  /* interpreter check */
-  if (NIL_P(interp)) return 0;
-  ptr = get_ip(interp);
-  if (ptr == (struct tcltkip *) NULL)  return 0;
-  if (deleted_ip(ptr)) return 0;
-
-  /* get Tcl's encoding list */
-  Tcl_GetEncodingNames(ptr->ip);
-  enc_list = Tcl_GetObjResult(ptr->ip);
-  Tcl_IncrRefCount(enc_list);
-
-  if (Tcl_ListObjGetElements(ptr->ip, enc_list, &objc, &objv) != TCL_OK) {
-    Tcl_DecrRefCount(enc_list);
-    /* rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names"); */
-    return 0;
-  }
-
-  /* get encoding name and set it to table */
-  for(i = 0; i < objc; i++) {
-    encname = rb_str_new2(Tcl_GetString(objv[i]));
-    if (NIL_P(rb_hash_lookup(table, encname))) {
-      /* new Tk encoding -> add to table */
-      encname = rb_obj_freeze(encname);
-      rb_hash_aset(table, encname, encname);
-      retry = 1;
-    }
-  }
-
-  Tcl_DecrRefCount(enc_list);
-
-  return retry;
-}
-
-static VALUE
-encoding_table_get_name_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  volatile VALUE name = Qnil;
-  int retry = 0;
-
-  enc = rb_funcall(enc, ID_to_s, 0, 0);
-  name = rb_hash_lookup(table, enc);
-
-  if (!NIL_P(name)) {
-    /* find */
-    return name;
-  }
-
-  /* update check */
-  if (update_encoding_table(table, rb_ivar_get(table, ID_at_interp), 
-					       error_mode)) {
-    /* add new relations to the table   */
-    /* RETRY: registered Ruby encoding? */
-    name = rb_hash_lookup(table, enc);
-    if (!NIL_P(name)) {
-      /* find */
-      return name;
-    }
-  }
-
-  if (RTEST(error_mode)) {
-    rb_raise(rb_eArgError, "unsupported Tk encoding '%s'", RSTRING_PTR(enc));
-  }
-  return Qnil;
-}
-static VALUE
-encoding_table_get_obj_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  return encoding_table_get_name_core(table, enc, error_mode);
-}
-
-#else /* Tcl/Tk 7.x or 8.0 */
-static VALUE
-encoding_table_get_name_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  return Qnil;
-}
-static VALUE
-encoding_table_get_obj_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  return Qnil;
-}
-#endif /* end of dependency for the version of Tcl/Tk */
-#endif
-
-static VALUE
-encoding_table_get_name(table, enc)
-     VALUE table;
-     VALUE enc;
-{
-  return encoding_table_get_name_core(table, enc, Qtrue);
-}
-static VALUE
-encoding_table_get_obj(table, enc)
-     VALUE table;
-     VALUE enc;
-{
-  return encoding_table_get_obj_core(table, enc, Qtrue);
-}
-
-#ifdef RUBY_VM
-static VALUE
-create_encoding_table(interp)
-     VALUE interp;
-{
-  struct tcltkip *ptr = get_ip(interp);
-  volatile VALUE table = rb_hash_new();
-  volatile VALUE encname = Qnil;
-  volatile VALUE encobj = Qnil;
-  int i, idx, objc;
-  Tcl_Obj **objv;
-  Tcl_Obj *enc_list;
-
-  rb_secure(4);
-
-  /* set 'binary' encoding */
-  encobj = rb_enc_from_encoding(rb_enc_from_index(ENCODING_INDEX_BINARY));
-  rb_hash_aset(table, ENCODING_NAME_BINARY, encobj);
-  rb_hash_aset(table, encobj, ENCODING_NAME_BINARY);
-	       
-
-  /* Tcl stub check */
-  tcl_stubs_check();
-
-  /* get Tcl's encoding list */
-  Tcl_GetEncodingNames(ptr->ip);
-  enc_list = Tcl_GetObjResult(ptr->ip);
-  Tcl_IncrRefCount(enc_list);
-
-  if (Tcl_ListObjGetElements(ptr->ip, enc_list, &objc, &objv) != TCL_OK) {
-    Tcl_DecrRefCount(enc_list);
-    rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names");
-  }
-
-  /* get encoding name and set it to table */
-  for(i = 0; i < objc; i++) {
-    int name2obj, obj2name;
-
-    name2obj = 1; obj2name = 1;
-    encname = rb_obj_freeze(rb_str_new2(Tcl_GetString(objv[i])));
-    idx = rb_enc_find_index(StringValueCStr(encname));
-    if (idx < 0) {
-      /* fail to find ruby encoding -> check known encoding */
-      if (strcmp(RSTRING_PTR(encname), "identity") == 0) {
-	name2obj = 1; obj2name = 0;
-	idx = ENCODING_INDEX_BINARY;
-
-      } else if (strcmp(RSTRING_PTR(encname), "shiftjis") == 0) {
-	name2obj = 1; obj2name = 0;
-	idx = rb_enc_find_index("Shift_JIS");
-
-      } else if (strcmp(RSTRING_PTR(encname), "unicode") == 0) {
-	name2obj = 1; obj2name = 0;
-	idx = ENCODING_INDEX_UTF8;
-
-      } else if (strcmp(RSTRING_PTR(encname), "symbol") == 0) {
-	name2obj = 1; obj2name = 0;
-	idx = rb_enc_find_index("ASCII-8BIT");
-
-      } else {
-	/* regist dummy encoding */
-	name2obj = 1; obj2name = 1;
-      }
-    }
-
-    if (idx < 0) {
-      /* unknown encoding -> create dummy */
-      encobj = create_dummy_encoding_for_tk(interp, encname);
-    } else {
-      encobj = rb_enc_from_encoding(rb_enc_from_index(idx));
-    }
-
-    if (name2obj) {
-      DUMP2("create_encoding_table: name2obj: %s", RSTRING_PTR(encname));
-      rb_hash_aset(table, encname, encobj);
-    }
-    if (obj2name) {
-      DUMP2("create_encoding_table: obj2name: %s", RSTRING_PTR(encname));
-      rb_hash_aset(table, encobj, encname);
-    }
-  }
-
-  Tcl_DecrRefCount(enc_list);
-
-  rb_ivar_set(table, ID_at_interp, interp);
-  rb_ivar_set(interp, ID_encoding_table, table);
-
-  return table;
-}
-
-#else /* ! RUBY_VM */
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
-static VALUE
-create_encoding_table(interp)
-     VALUE interp;
-{
-  struct tcltkip *ptr = get_ip(interp);
-  volatile VALUE table = rb_hash_new();
-  volatile VALUE encname = Qnil;
-  int i, objc;
-  Tcl_Obj **objv;
-  Tcl_Obj *enc_list;
-
-  rb_secure(4);
-
-  /* set 'binary' encoding */
-  rb_hash_aset(table, ENCODING_NAME_BINARY, ENCODING_NAME_BINARY);
-
-  /* get Tcl's encoding list */
-  Tcl_GetEncodingNames(ptr->ip);
-  enc_list = Tcl_GetObjResult(ptr->ip);
-  Tcl_IncrRefCount(enc_list);
-
-  if (Tcl_ListObjGetElements(ptr->ip, enc_list, &objc, &objv) != TCL_OK) {
-    Tcl_DecrRefCount(enc_list);
-    rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names");
-  }
-
-  /* get encoding name and set it to table */
-  for(i = 0; i < objc; i++) {
-    encname = rb_obj_freeze(rb_str_new2(Tcl_GetString(objv[i])));
-    rb_hash_aset(table, encname, encname);
-  }
-
-  Tcl_DecrRefCount(enc_list);
-
-  rb_ivar_set(table, ID_at_interp, interp);
-  rb_ivar_set(interp, ID_encoding_table, table);
-
-  return table;
-}
-
-#else /* Tcl/Tk 7.x or 8.0 */
-static VALUE
-create_encoding_table(interp)
-     VALUE interp;
-{
-  volatile VALUE table = rb_hash_new();
-  rb_secure(4);
-  rb_ivar_set(interp, ID_encoding_table, table);
-  return table;
-}
-#endif
-#endif
-
-static VALUE
-ip_get_encoding_table(interp)
-     VALUE interp;
-{
-  volatile VALUE table = Qnil;
-
-  table = rb_ivar_get(interp, ID_encoding_table);
-
-  if (NIL_P(table)) {
-    /* initialize encoding_table */
-    table = create_encoding_table(interp);
-    rb_define_singleton_method(table, "get_name", encoding_table_get_name, 1);
-    rb_define_singleton_method(table, "get_obj",  encoding_table_get_obj,  1);
-  }
-
-  return table;
-}
-
-
-/*###############################################*/
-
-/*
- *   The following is based on tkMenu.[ch] 
- *   of Tcl/Tk (Tk8.0 -- Tk8.5b1) 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;
-};
-
-#if 0 /* was available on Tk8.0 -- Tk8.4 */
-EXTERN struct dummy_TkMenuRef *TkFindMenuReferences(Tcl_Interp*, char*);
-#else /* based on Tk8.0 -- Tk8.5.0 */
-#define MENU_HASH_KEY "tkMenus"
-#endif
-
-#endif
-
-static VALUE
-ip_make_menu_embeddable_core(interp, argc, argv)
-    VALUE interp;
-    int   argc;
-    VALUE *argv;
-{
-#if TCL_MAJOR_VERSION >= 8
-    volatile VALUE menu_path;
-    struct tcltkip *ptr = get_ip(interp);
-    struct dummy_TkMenuRef *menuRefPtr = NULL;
-    XEvent event;
-    Tcl_HashTable *menuTablePtr;
-    Tcl_HashEntry *hashEntryPtr;
-
-    menu_path = argv[0];
-    StringValue(menu_path);
-
-#if 0 /* was available on Tk8.0 -- Tk8.4 */
-    menuRefPtr = TkFindMenuReferences(ptr->ip, RSTRING_PTR(menu_path));
-#else /* based on Tk8.0 -- Tk8.5b1 */
-    if ((menuTablePtr 
-	 = (Tcl_HashTable *) Tcl_GetAssocData(ptr->ip, MENU_HASH_KEY, NULL))
-	!= NULL) {
-      if ((hashEntryPtr 
-	   = Tcl_FindHashEntry(menuTablePtr, RSTRING_PTR(menu_path)))
-	  != NULL) {
-        menuRefPtr = (struct dummy_TkMenuRef *) Tcl_GetHashValue(hashEntryPtr);
-      }
-    }
-#endif
-
-    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));
-       /* Tcl_IncrRefCount((menuRefPtr->menuPtr)->menuTypePtr); */
-       /* (menuRefPtr->menuPtr)->menuType = TEAROFF_MENU; */
-       (menuRefPtr->menuPtr)->menuType = MASTER_MENU;
-    }
-#endif
-
-#if 0 /* was available on Tk8.0 -- Tk8.4 */
-    TkEventuallyRecomputeMenu(menuRefPtr->menuPtr);
-    TkEventuallyRedrawMenu(menuRefPtr->menuPtr, 
-			   (struct dummy_TkMenuEntry *)NULL);
-#else /* based on Tk8.0 -- Tk8.5b1 */
-    memset((void *) &event, 0, sizeof(event));
-    event.xany.type = ConfigureNotify;
-    event.xany.serial = NextRequest(Tk_Display((menuRefPtr->menuPtr)->tkwin));
-    event.xany.send_event = 0; /* FALSE */
-    event.xany.window = Tk_WindowId((menuRefPtr->menuPtr)->tkwin);
-    event.xany.display = Tk_Display((menuRefPtr->menuPtr)->tkwin);
-    event.xconfigure.window = event.xany.window;
-    Tk_HandleEvent(&event);
-#endif
-
-#else /* TCL_MAJOR_VERSION <= 7 */
-    rb_notimplement();
-#endif
-
-    return interp;
-}
-
-static VALUE
-ip_make_menu_embeddable(interp, menu_path)
-    VALUE interp;
-    VALUE menu_path;
-{
-    VALUE argv[1];
-
-    argv[0] = menu_path;
-    return tk_funcall(ip_make_menu_embeddable_core, 1, argv, 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");
-    VALUE release_type = rb_define_module_under(lib, "RELEASE_TYPE");
-
-    /* --------------------------------------------------------------- */
-
-    tcltkip_class = ip;
-
-    /* --------------------------------------------------------------- */
-
-#ifdef RUBY_VM
-    rb_global_variable(&cRubyEncoding);
-    cRubyEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
-
-    ENCODING_INDEX_UTF8   = rb_enc_to_index(rb_utf8_encoding());
-    ENCODING_INDEX_BINARY = rb_enc_find_index("binary");
-#endif
-
-    rb_global_variable(&ENCODING_NAME_UTF8);
-    rb_global_variable(&ENCODING_NAME_BINARY);
-
-    ENCODING_NAME_UTF8   = rb_obj_freeze(rb_str_new2("utf-8"));
-    ENCODING_NAME_BINARY = rb_obj_freeze(rb_str_new2("binary"));
-
-    /* --------------------------------------------------------------- */
-
-    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
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_module_function(lib, "get_version", lib_getversion, -1);
-
-    rb_define_const(release_type, "ALPHA", INT2FIX(TCL_ALPHA_RELEASE));
-    rb_define_const(release_type, "BETA",  INT2FIX(TCL_BETA_RELEASE));
-    rb_define_const(release_type, "FINAL", INT2FIX(TCL_FINAL_RELEASE));
-
-    /* --------------------------------------------------------------- */
-
-    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_encoding_name = rb_intern("encoding_name");
-    ID_encoding_table = rb_intern("encoding_table");
-
-    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, "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_window_mode", 
-			      set_eventloop_window_mode, 1);
-    rb_define_module_function(lib, "get_eventloop_window_mode", 
-			      get_eventloop_window_mode, 0);
-    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, "create_dummy_encoding_for_tk", 
-		     create_dummy_encoding_for_tk, 1);
-    rb_define_method(ip, "encoding_table", ip_get_encoding_table, 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. */
-#ifdef RUBY_VM
-    ruby_native_thread_p();
-#else
-    is_ruby_native_thread();
-#endif
-
-    /* --------------------------------------------------------------- */
-
-    rb_set_end_proc(lib_mark_at_exit, 0);
-
-    /* --------------------------------------------------------------- */
-
-    ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 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);
-    }
-
-    /* --------------------------------------------------------------- */
-
-    /* Tcl stub check */
-    tcl_stubs_check();
-
-    Tcl_ObjType_ByteArray = Tcl_GetObjType(Tcl_ObjTypeName_ByteArray);
-    Tcl_ObjType_String    = Tcl_GetObjType(Tcl_ObjTypeName_String);
-
-    /* --------------------------------------------------------------- */
-}
-
-/* eof */
diff --git a/ext/tk/tkutil.c b/ext/tk/tkutil.c
new file mode 100644
index 0000000000..b42069e234
--- /dev/null
+++ b/ext/tk/tkutil.c
@@ -0,0 +1,45 @@
+/************************************************
+
+  tk.c -
+
+  $Author$
+  $Date$
+  created at: Fri Nov  3 00:47:54 JST 1995
+
+************************************************/
+
+#include "ruby.h"
+
+static VALUE
+tk_eval_cmd(argc, argv)
+    int argc;
+    VALUE argv[];
+{
+    VALUE cmd, rest;
+
+    rb_scan_args(argc, argv, "1*", &cmd, &rest);
+    return rb_eval_cmd(cmd, rest, 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()) rb_obj_instance_eval(0, 0, obj);
+    return obj;
+}
+
+void
+Init_tkutil()
+{
+    VALUE mTK = rb_define_module("TkUtil");
+    VALUE cTK = rb_define_class("TkKernel", rb_cObject);
+
+    rb_define_singleton_method(mTK, "eval_cmd", tk_eval_cmd, -1);
+
+    rb_define_singleton_method(cTK, "new", tk_s_new, -1);
+}
diff --git a/ext/tk/tkutil/depend b/ext/tk/tkutil/depend
deleted file mode 100644
index fd63e230f0..0000000000
--- a/ext/tk/tkutil/depend
+++ /dev/null
@@ -1 +0,0 @@
-tkutil.o: tkutil.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/tk/tkutil/extconf.rb b/ext/tk/tkutil/extconf.rb
deleted file mode 100644
index 015bc3a45e..0000000000
--- a/ext/tk/tkutil/extconf.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-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'
-  have_func("rb_obj_instance_exec", "ruby.h")
-  have_func("strndup", "string.h")
-  create_makefile('tkutil')
-end
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
deleted file mode 100644
index 00d719143b..0000000000
--- a/ext/tk/tkutil/tkutil.c
+++ /dev/null
@@ -1,1799 +0,0 @@
-/************************************************
-
-  tkutil.c -
-
-  $Author$
-  created at: Fri Nov  3 00:47:54 JST 1995
-
-************************************************/
-
-#define TKUTIL_RELEASE_DATE "2008-05-23"
-
-#include "ruby.h"
-
-#ifdef RUBY_VM  /* Ruby 1.9 */
-/* #include "ruby/ruby.h" */
-#include "ruby/signal.h"
-#include "ruby/st.h"
-#else
-/* #include "ruby.h" */
-#include "rubysig.h"
-#include "version.h"
-#include "st.h"
-#endif
-
-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 VALUE ENCODING_NAME_UTF8; /* for saving GC cost */
-
-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()) {
-#ifndef HAVE_RB_OBJ_INSTANCE_EXEC
-      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_PTR(cmd_id), head_len) != 0) {
-        return Qnil;
-    }
-    if (strncmp(cmd_id_prefix, 
-                RSTRING_PTR(cmd_id) + head_len, prefix_len) != 0) {
-        return Qnil;
-    }
-
-    return rb_hash_delete(CALLBACK_TABLE, 
-                          rb_str_new2(RSTRING_PTR(cmd_id) + 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_TBL(keys), 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_LEN(ary); */
-    size = 0;
-    for(idx = 0; idx < RARRAY_LEN(ary); idx++) {
-        if (TYPE(RARRAY_PTR(ary)[idx]) == T_HASH) {
-            size += 2 * RHASH_SIZE(RARRAY_PTR(ary)[idx]);
-        } else {
-            size++;
-        }
-    }
-
-    dst = rb_ary_new2(size);
-    for(idx = 0; idx < RARRAY_LEN(ary); idx++) {
-        val = RARRAY_PTR(ary)[idx];
-        str_val = Qnil;
-        switch(TYPE(val)) {
-        case T_ARRAY:
-            str_val = ary2list(val, enc_flag, self);
-            rb_ary_push(dst, 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:
-	    /* rb_ary_push(dst, hash2list(val, self)); */
-            if (RTEST(enc_flag)) {
-                val = hash2kv_enc(val, Qnil, self);
-            } else {
-                val = hash2kv(val, Qnil, self);
-            }
-            size2 = RARRAY_LEN(val);
-            for(idx2 = 0; idx2 < size2; idx2++) {
-                val2 = RARRAY_PTR(val)[idx2];
-                switch(TYPE(val2)) {
-                case T_ARRAY:
-                    str_val = ary2list(val2, enc_flag, self);
-                    rb_ary_push(dst, str_val);
-                    break;
-
-                case T_HASH:
-                    if (RTEST(enc_flag)) {
-                        str_val = hash2list_enc(val2, self);
-                    } else {
-                        str_val = hash2list(val2, self);
-                    }
-                    rb_ary_push(dst, str_val);
-                    break;
-
-                default:
-                    if (val2 != TK_None) {
-                        str_val = get_eval_string_core(val2, enc_flag, self);
-                        rb_ary_push(dst, 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);
-                rb_ary_push(dst, 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_LEN(dst); idx++) {
-            str_val = RARRAY_PTR(dst)[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_PTR(dst)[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, ENCODING_NAME_UTF8);
-        }
-        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_LEN(ary);
-    dst = rb_ary_new2(size);
-    for(idx = 0; idx < RARRAY_LEN(ary); idx++) {
-        val = RARRAY_PTR(ary)[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)) {
-            rb_ary_push(dst, 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_LEN(dst); idx++) {
-            str_val = RARRAY_PTR(dst)[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_PTR(dst)[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, ENCODING_NAME_UTF8);
-        }
-        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_LEN(assoc));
-
-    len = RARRAY_LEN(assoc);
-
-    for(i = 0; i < len; i++) {
-        pair = RARRAY_PTR(assoc)[i];
-        if (TYPE(pair) != T_ARRAY) {
-            rb_ary_push(dst, key2keyname(pair));
-            continue;
-        }
-        switch(RARRAY_LEN(assoc)) {
-        case 2:
-            rb_ary_push(dst, RARRAY_PTR(pair)[2]);
-
-        case 1:
-            rb_ary_push(dst, key2keyname(RARRAY_PTR(pair)[0]));
-
-        case 0:
-            continue;
-
-        default:
-            rb_ary_push(dst, key2keyname(RARRAY_PTR(pair)[0]));
-
-            val = rb_ary_new2(RARRAY_LEN(pair) - 1);
-            for(j = 1; j < RARRAY_LEN(pair); j++) {
-                rb_ary_push(val, RARRAY_PTR(pair)[j]);
-            }
-
-            rb_ary_push(dst, 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_LEN(assoc));
-
-    len = RARRAY_LEN(assoc);
-
-    for(i = 0; i < len; i++) {
-        pair = RARRAY_PTR(assoc)[i];
-        if (TYPE(pair) != T_ARRAY) {
-            rb_ary_push(dst, key2keyname(pair));
-            continue;
-        }
-        switch(RARRAY_LEN(assoc)) {
-        case 2:
-            rb_ary_push(dst, get_eval_string_core(RARRAY_PTR(pair)[2], Qtrue, self));
-
-        case 1:
-            rb_ary_push(dst, key2keyname(RARRAY_PTR(pair)[0]));
-
-        case 0:
-            continue;
-
-        default:
-            rb_ary_push(dst, key2keyname(RARRAY_PTR(pair)[0]));
-
-            val = rb_ary_new2(RARRAY_LEN(pair) - 1);
-            for(j = 1; j < RARRAY_LEN(pair); j++) {
-                rb_ary_push(val, RARRAY_PTR(pair)[j]);
-            }
-
-            rb_ary_push(dst, 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_PTR(args)[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
-    rb_ary_push(ary, key2keyname(key));
-
-    if (val == TK_None) return ST_CHECK;
-
-    rb_ary_push(ary, get_eval_string_core(val, Qnil, RARRAY_PTR(args)[1]));
-
-    return ST_CHECK;
-}
-
-static VALUE
-hash2kv(hash, ary, self)
-    VALUE hash;
-    VALUE ary;
-    VALUE self;
-{
-    volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
-    volatile VALUE args = rb_ary_new3(2, dst, self);
-
-    st_foreach(RHASH_TBL(hash), 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_PTR(args)[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_PTR(args)[1]));
-    }
-#endif
-    rb_ary_push(ary, key2keyname(key));
-
-    if (val == TK_None) return ST_CHECK;
-
-    rb_ary_push(ary, get_eval_string_core(val, Qtrue, RARRAY_PTR(args)[1]));
-
-    return ST_CHECK;
-}
-
-static VALUE
-hash2kv_enc(hash, ary, self)
-    VALUE hash;
-    VALUE ary;
-    VALUE self;
-{
-    volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
-    volatile VALUE args = rb_ary_new3(2, dst, self);
-
-    st_foreach(RHASH_TBL(hash), 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 {
-#ifdef RUBY_VM
-            return rb_sym_to_s(obj);
-#else
-            return rb_str_new2(rb_id2name(SYM2ID(obj)));
-#endif
-        }
-
-    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_PTR(rb_funcall(obj, rb_intern("inspect"), 0, 0)));
-
-    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_SIZE(argv[idx]);
-        } else {
-            size++;
-        }
-    }
-    /* dst = rb_ary_new2(argc - 2); */
-    dst = rb_ary_new2(size);
-    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) {
-            rb_ary_push(dst, 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_PTR(value) == (char*)NULL) return Qnil;
-
-    if (RSTRING_PTR(value)[0] == '\0'
-        || strcmp(RSTRING_PTR(value), "0") == 0
-        || strcmp(RSTRING_PTR(value), "no") == 0
-        || strcmp(RSTRING_PTR(value), "off") == 0
-        || strcmp(RSTRING_PTR(value), "false") == 0) {
-        return Qfalse;
-    } else {
-        return Qtrue;
-    }
-}
-
-static VALUE
-tkstr_to_dec(value)
-    VALUE value;
-{
-    return rb_cstr_to_inum(RSTRING_PTR(value), 10, 1);
-}
-
-static VALUE
-tkstr_to_int(value)
-    VALUE value;
-{
-    return rb_cstr_to_inum(RSTRING_PTR(value), 0, 1);
-}
-
-static VALUE
-tkstr_to_float(value)
-    VALUE value;
-{
-    return rb_float_new(rb_cstr_to_dbl(RSTRING_PTR(value), 1));
-}
-
-static VALUE
-tkstr_invalid_numstr(value)
-    VALUE value;
-{
-    rb_raise(rb_eArgError, 
-             "invalid value for Number: '%s'", RSTRING_PTR(value));
-    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_PTR(value) == (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_PTR(value);
-    len = RSTRING_LEN(value);
-
-    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_PTR(value) == (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_PTR(value) == (char*)NULL) return rb_tainted_str_new2("");
-
-    return rb_rescue2(tkstr_to_number, value, 
-                      tkstr_to_str, value, 
-                      rb_eArgError, 0);
-}
-
-
-/*************************************/
-
-#define CBSUBST_TBL_MAX (256)
-struct cbsubst_info {
-    int   full_subst_length;
-    int   keylen[CBSUBST_TBL_MAX];
-    unsigned char  *key[CBSUBST_TBL_MAX];
-    unsigned char  type[CBSUBST_TBL_MAX];
-    ID    ivar[CBSUBST_TBL_MAX];
-    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;
-{
-    int i;
-
-    if (ptr) {
-      for(i = 0; i < CBSUBST_TBL_MAX; i++) {
-	if (ptr->key[i] != (unsigned char *)NULL) {
-	  free(ptr->key[i]);
-	  ptr->key[i] = (unsigned char *)NULL;
-	}
-      }
-      free(ptr);
-    }
-}
-
-static struct cbsubst_info *
-allocate_cbsubst_info()
-{
-  struct cbsubst_info *inf;
-  volatile VALUE proc, aliases;
-  int idx;
-
-  inf = ALLOC(struct cbsubst_info);
-
-  inf->full_subst_length = 0;
-
-  for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
-    inf->keylen[idx] = 0;
-    inf->key[idx]    = (unsigned char *) NULL;
-    inf->type[idx]   = '\0';
-    inf->ivar[idx]   = (ID) 0;
-  }
-
-  proc = rb_hash_new();
-  inf->proc = proc;
-
-  aliases = rb_hash_new();
-  inf->aliases = aliases;
-
-  return inf;
-}
-
-static void
-cbsubst_init()
-{
-    rb_const_set(cCB_SUBST, ID_SUBST_INFO, 
-		 Data_Wrap_Struct(cSUBST_INFO, subst_mark, subst_free, 
-				  allocate_cbsubst_info()));
-}
-
-static VALUE
-cbsubst_initialize(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct cbsubst_info *inf;
-    int idx, iv_idx;
-
-    Data_Get_Struct(rb_const_get(rb_obj_class(self), ID_SUBST_INFO), 
-                    struct cbsubst_info, inf);
-
-   idx = 0;
-    for(iv_idx = 0; iv_idx < CBSUBST_TBL_MAX; iv_idx++) {
-      if ( inf->ivar[iv_idx] == (ID) 0 ) continue;
-      rb_ivar_set(self, inf->ivar[iv_idx], argv[idx++]);
-      if (idx >= argc) break;
-    }
-
-    return self;
-}
-
-static VALUE
-cbsubst_ret_val(self, val)
-    VALUE self;
-    VALUE val;
-{
-    /* This method may be overwritten on some sub-classes.                  */
-    /* This method is used for converting from ruby's callback-return-value */
-    /* to tcl's value (e.g. validation procedure of entry widget).          */
-    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_PTR(key));
-        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_PTR(value));
-        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_sym_to_subst(self, sym)
-    VALUE self;
-    VALUE sym;
-{
-    struct cbsubst_info *inf;
-    const char *str;
-    unsigned char *buf, *ptr;
-    int idx, len;
-    ID id;
-    volatile VALUE ret;
-
-    if (TYPE(sym) != T_SYMBOL) return sym;
-
-    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
-                    struct cbsubst_info, inf);
-
-    if (!NIL_P(ret = rb_hash_aref(inf->aliases, sym))) {
-      str = rb_id2name(SYM2ID(ret));
-    } else {
-      str = rb_id2name(SYM2ID(sym));
-    }
-
-    id = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), str)));
-
-    for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
-      if (inf->ivar[idx] == id) break;
-    }
-    if (idx >= CBSUBST_TBL_MAX)  return sym;
-
-    ptr = buf = ALLOC_N(char, inf->full_subst_length + 1);
-
-    *(ptr++) = '%';
-
-    if (len = inf->keylen[idx]) {
-      /* longname */
-      strncpy(ptr, inf->key[idx], len);
-      ptr += len;
-    } else {
-      /* single char */
-      *(ptr++) = idx;
-    }
-
-    *(ptr++) = ' ';
-    *(ptr++) = '\0';
-
-    ret = rb_str_new2(buf);
-
-    free(buf);
-
-    return ret;
-}
-
-static VALUE
-cbsubst_get_subst_arg(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct cbsubst_info *inf;
-    const char *str;
-    unsigned char *buf, *ptr;
-    int i, idx, len;
-    ID id;
-    volatile VALUE arg_sym, ret;
-
-    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
-                    struct cbsubst_info, inf);
-
-    ptr = buf = ALLOC_N(char, inf->full_subst_length + 1);
-
-    for(i = 0; i < argc; i++) {
-        switch(TYPE(argv[i])) {
-        case T_STRING:
-            str = RSTRING_PTR(argv[i]);
-            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_PTR(rb_str_cat2(rb_str_new2("@"), str)));
-
-	for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
-	  if (inf->ivar[idx] == id) break;
-	}
-        if (idx >= CBSUBST_TBL_MAX) {
-            rb_raise(rb_eArgError, "cannot find attribute :%s", str);
-        }
-
-	*(ptr++) = '%';
-
-	if (len = inf->keylen[idx]) {
-	  /* longname */
-	  strncpy(ptr, inf->key[idx], len);
-	  ptr += len;
-	} else {
-	  /* single char */
-	  *(ptr++) = idx;
-	}
-
-	*(ptr++) = ' ';
-    }
-
-    *ptr = '\0';
-
-    ret = rb_str_new2(buf);
-
-    free(buf);
-
-    return ret;
-}
-
-static VALUE
-cbsubst_get_subst_key(self, str)
-    VALUE self;
-    VALUE str;
-{
-    struct cbsubst_info *inf;
-    volatile VALUE list;
-    volatile VALUE ret;
-    VALUE keyval;
-    int i, len, keylen, idx;
-    unsigned char *buf, *ptr, *key;
-
-    list = rb_funcall(cTclTkLib, ID_split_tklist, 1, str);
-    len = RARRAY_LEN(list);
-
-    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
-                    struct cbsubst_info, inf);
-
-    ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + len + 1);
-
-    for(i = 0; i < len; i++) {
-      keyval = RARRAY_PTR(list)[i];
-      key = (unsigned char*)RSTRING_PTR(keyval);
-      if (*key == '%') {
-	if (*(key + 2) == '\0') {
-	  /* single char */
-	  *(ptr++) = *(key + 1);
-	} else {
-	  /* search longname-key */
-	  keylen = RSTRING_LEN(keyval) - 1;
-	  for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
-	    if (inf->keylen[idx] != keylen) continue;
-	    if (inf->key[idx][0] != *(key + 1)) continue;
-	    if (strncmp(inf->key[idx], key + 1, keylen)) continue;
-	    break;
-	  }
-	  if (idx < CBSUBST_TBL_MAX) {
-	    *(ptr++) = (unsigned char)idx;
-	  } else {
-	    *(ptr++) = ' ';
-	  }
-	}
-      } else {
-	*(ptr++) = ' ';
-      }
-    }
-    *ptr = '\0';
-
-    ret = rb_str_new2((const char*)buf);
-    free(buf);
-    return ret;
-}
-
-static VALUE
-cbsubst_get_all_subst_keys(self)
-    VALUE self;
-{
-    struct cbsubst_info *inf;
-    unsigned char *buf, *ptr;
-    unsigned char *keys_buf, *keys_ptr;
-    int idx, len;
-    volatile VALUE ret;
-
-    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
-                    struct cbsubst_info, inf);
-
-    ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + 1);
-    keys_ptr = keys_buf = ALLOC_N(unsigned char, CBSUBST_TBL_MAX + 1);
-
-    for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
-      if (inf->ivar[idx] == (ID) 0) continue;
-
-      *(keys_ptr++) = (unsigned char)idx;
-
-      *(ptr++) = '%';
-
-      if (len = inf->keylen[idx]) {
-	/* longname */
-	strncpy(ptr, inf->key[idx], len);
-	ptr += len;
-      } else {
-	/* single char */
-	*(ptr++) = (unsigned char)idx;
-      }
-
-      *(ptr++) = ' ';
-    }
-
-    *ptr = '\0';
-    *keys_ptr = '\0';
-
-    ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2((const char*)buf));
-
-    free(buf);
-    free(keys_buf);
-
-    return ret;
-}
-
-static VALUE
-cbsubst_table_setup(argc, argv, self)
-     int   argc;
-     VALUE *argv;
-     VALUE self;
-{
-  volatile VALUE key_inf;
-  volatile VALUE longkey_inf;
-  volatile VALUE proc_inf;
-  VALUE inf;
-  ID id;
-  struct cbsubst_info *subst_inf;
-  int idx, len;
-  unsigned char chr;
-
-  /* accept (key_inf, proc_inf) or (key_inf, longkey_inf, procinf) */
-  if (rb_scan_args(argc, argv, "21", &key_inf, &longkey_inf, &proc_inf) == 2) {
-    proc_inf = longkey_inf;
-    longkey_inf = rb_ary_new();
-  }
-
-  /* check the number of longkeys */
-  if (RARRAY_LEN(longkey_inf) > 125 /* from 0x80 to 0xFD */) {
-    rb_raise(rb_eArgError, "too many longname-key definitions");
-  }
-
-  /* init */
-  subst_inf = allocate_cbsubst_info();
-
-  /*
-   * keys : array of [subst, type, ivar]
-   *         subst ==> char code or string
-   *         type  ==> char code or string
-   *         ivar  ==> symbol
-   */
-  len = RARRAY_LEN(key_inf);
-  for(idx = 0; idx < len; idx++) {
-    inf = RARRAY_PTR(key_inf)[idx];
-    if (TYPE(inf) != T_ARRAY) continue;
-
-    if (TYPE(RARRAY_PTR(inf)[0]) == T_STRING) {
-      chr = *(RSTRING_PTR(RARRAY_PTR(inf)[0]));
-    } else {
-      chr = NUM2CHR(RARRAY_PTR(inf)[0]);
-    }
-    if (TYPE(RARRAY_PTR(inf)[1]) == T_STRING) {
-      subst_inf->type[chr] = *(RSTRING_PTR(RARRAY_PTR(inf)[1]));
-    } else {
-      subst_inf->type[chr] = NUM2CHR(RARRAY_PTR(inf)[1]);
-    }
-
-    subst_inf->full_subst_length += 3;
-
-    id = SYM2ID(RARRAY_PTR(inf)[2]);
-    subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id))));
-
-    rb_attr(self, id, 1, 0, Qtrue);
-  }
-
-
-  /*
-   * longkeys : array of [name, type, ivar]
-   *         name ==> longname key string
-   *         type ==> char code or string
-   *         ivar ==> symbol
-   */
-  len = RARRAY_LEN(longkey_inf);
-  for(idx = 0; idx < len; idx++) {
-    inf = RARRAY_PTR(longkey_inf)[idx];
-    if (TYPE(inf) != T_ARRAY) continue;
-
-    chr = (unsigned char)(0x80 + idx);
-    subst_inf->keylen[chr] = RSTRING_LEN(RARRAY_PTR(inf)[0]);
-#if HAVE_STRNDUP
-    subst_inf->key[chr] = strndup(RSTRING_PTR(RARRAY_PTR(inf)[0]), 
-				  RSTRING_LEN(RARRAY_PTR(inf)[0]));
-#else
-    subst_inf->key[chr] = malloc(RSTRING_LEN(RARRAY_PTR(inf)[0]) + 1);
-    if (subst_inf->key[chr]) {
-      strncpy(subst_inf->key[chr], RSTRING_PTR(RARRAY_PTR(inf)[0]),
-	      RSTRING_LEN(RARRAY_PTR(inf)[0]) + 1);
-      subst_inf->key[chr][RSTRING_LEN(RARRAY_PTR(inf)[0])] = '\0';
-    }
-#endif
-    if (TYPE(RARRAY_PTR(inf)[1]) == T_STRING) {
-      subst_inf->type[chr] = *(RSTRING_PTR(RARRAY_PTR(inf)[1]));
-    } else {
-      subst_inf->type[chr] = NUM2CHR(RARRAY_PTR(inf)[1]);
-    }
-
-    subst_inf->full_subst_length += (subst_inf->keylen[chr] + 2);
-
-    id = SYM2ID(RARRAY_PTR(inf)[2]);
-    subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id))));
-
-    rb_attr(self, id, 1, 0, Qtrue);
-  }
-
-  /*
-   * procs : array of [type, proc]
-   *         type  ==> char code or string
-   *         proc  ==> proc/method/obj (must respond to 'call')
-   */
-  len = RARRAY_LEN(proc_inf);
-  for(idx = 0; idx < len; idx++) {
-    inf = RARRAY_PTR(proc_inf)[idx];
-    if (TYPE(inf) != T_ARRAY) continue;
-    rb_hash_aset(subst_inf->proc, 
-		 ((TYPE(RARRAY_PTR(inf)[0]) == T_STRING)? 
-		  INT2FIX(*(RSTRING_PTR(RARRAY_PTR(inf)[0]))) : 
-		  RARRAY_PTR(inf)[0]), 
-		 RARRAY_PTR(inf)[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;
-    unsigned char *keyptr = (unsigned char*)RSTRING_PTR(arg_key);
-    int keylen = RSTRING_LEN(arg_key);
-    int vallen = RARRAY_LEN(val_ary);
-    unsigned char type_chr;
-    volatile VALUE dst = rb_ary_new2(vallen);
-    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);
-
-    for(idx = 0; idx < vallen; idx++) {
-      if (idx >= keylen) {
-	proc = Qnil;
-      } else if (*(keyptr + idx) == ' ') {
-	proc = Qnil;
-      } else {
-	if (type_chr = inf->type[*(keyptr + idx)]) {
-	  proc = rb_hash_aref(inf->proc, INT2FIX((int)type_chr));
-	} else {
-	  proc = Qnil;
-	}
-      }
-
-      if (NIL_P(proc)) {
-	rb_ary_push(dst, RARRAY_PTR(val_ary)[idx]);
-      } else {
-	rb_ary_push(dst, rb_funcall(proc, ID_call, 1, 
-				    RARRAY_PTR(val_ary)[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, "_sym2subst", 
-			       cbsubst_sym_to_subst, 1);
-    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, -1);
-    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);
-
-    /* --------------------- */
-    rb_global_variable(&ENCODING_NAME_UTF8);
-    ENCODING_NAME_UTF8 = rb_obj_freeze(rb_str_new2("utf-8"));
-
-    /* --------------------- */
-}
diff --git a/ext/win32ole/.cvsignore b/ext/win32ole/.cvsignore
index 4f6430def0..44e7f262dc 100644
--- a/ext/win32ole/.cvsignore
+++ b/ext/win32ole/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.log
-.document
diff --git a/ext/win32ole/MANIFEST b/ext/win32ole/MANIFEST
new file mode 100644
index 0000000000..8e9bd46211
--- /dev/null
+++ b/ext/win32ole/MANIFEST
@@ -0,0 +1,24 @@
+MANIFEST
+depend
+doc/win32ole.rd
+extconf.rb
+lib/win32ole/property.rb
+sample/excel1.rb
+sample/excel2.rb
+sample/excel3.rb
+sample/ie.rb
+sample/ieconst.rb
+sample/ienavi.rb
+sample/oledirs.rb
+sample/olegen.rb
+sample/xml.rb
+tests/oleserver.rb
+tests/testOLEEVENT.rb
+tests/testOLEMETHOD.rb
+tests/testOLEPARAM.rb
+tests/testOLETYPE.rb
+tests/testOLEVARIABLE.rb
+tests/testVARIANT.rb
+tests/testWIN32OLE.rb
+tests/testall.rb
+win32ole.c
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
index cee922554a..4afe1117eb 100644
--- a/ext/win32ole/extconf.rb
+++ b/ext/win32ole/extconf.rb
@@ -5,30 +5,14 @@
 #----------------------------------
 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
 
diff --git a/ext/win32ole/tests/testNIL2VTEMPTY.rb b/ext/win32ole/tests/testNIL2VTEMPTY.rb
deleted file mode 100644
index 555d35fbf3..0000000000
--- a/ext/win32ole/tests/testNIL2VTEMPTY.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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/ext/win32ole/tests/testOLEEVENT.rb b/ext/win32ole/tests/testOLEEVENT.rb
new file mode 100644
index 0000000000..15b7ca8413
--- /dev/null
+++ b/ext/win32ole/tests/testOLEEVENT.rb
@@ -0,0 +1,33 @@
+require 'rubyunit'
+require 'win32ole'
+
+class TestWIN32OLE_EVENT < RUNIT::TestCase
+  def setup
+    @excel = WIN32OLE.new("Excel.Application")
+    @excel.visible = true
+  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 teardown
+    @excel.quit
+    @excel = nil
+    GC.start
+  end
+end
+
diff --git a/ext/win32ole/tests/testOLEMETHOD.rb b/ext/win32ole/tests/testOLEMETHOD.rb
index 390c9999f8..b52052e669 100644
--- a/ext/win32ole/tests/testOLEMETHOD.rb
+++ b/ext/win32ole/tests/testOLEMETHOD.rb
@@ -84,9 +84,4 @@ class TestOLEMETHOD < RUNIT::TestCase
     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/ext/win32ole/tests/testOLEPARAM.rb b/ext/win32ole/tests/testOLEPARAM.rb
index 4014fadbfc..685b548aa5 100644
--- a/ext/win32ole/tests/testOLEPARAM.rb
+++ b/ext/win32ole/tests/testOLEPARAM.rb
@@ -62,4 +62,13 @@ class TestOLEPARAM < RUNIT::TestCase
     f = methods.find {|m| m.name == 'SaveAs'}
     assert(f.params[0].optional?)
   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(nil, f.params[0].default)
+    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert_equal(1, f.params[6].default)
+  end
 end
diff --git a/ext/win32ole/tests/testWIN32OLE.rb b/ext/win32ole/tests/testWIN32OLE.rb
index d7f9dd2543..7907fe36a9 100644
--- a/ext/win32ole/tests/testWIN32OLE.rb
+++ b/ext/win32ole/tests/testWIN32OLE.rb
@@ -40,7 +40,7 @@ class TestWin32OLE < RUNIT::TestCase
     exc = assert_exception(WIN32OLERuntimeError) {
       WIN32OLE.new("{000}")
     }
-    assert_match(/unknown OLE server: `\{000\}'/, exc.message)
+    assert_match(/Unknown OLE server : `\{000\}'/, exc.message)
   end
   def test_s_connect
     excel2 = WIN32OLE.connect('Excel.Application')
@@ -57,60 +57,6 @@ class TestWin32OLE < RUNIT::TestCase
     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)
@@ -142,7 +88,6 @@ class TestWin32OLE < RUNIT::TestCase
       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
@@ -156,8 +101,7 @@ class TestWin32OLE < RUNIT::TestCase
       sheet.range("A3").value = "=A1*10 + 9"
       assert_equal(9999999999, sheet.range("A2").value)
       assert_equal(9999999999, sheet.range("A3").value)
-      sheet.range("A4").value = "2008/03/04"
-      assert_equal("2008/03/04 00:00:00", sheet.range("A4").value)
+     
     ensure
       book.saved = true
     end
@@ -245,24 +189,6 @@ class TestWin32OLE < RUNIT::TestCase
     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)
@@ -276,6 +202,10 @@ class TestWin32OLE < RUNIT::TestCase
     assert(add_info.params[0].optional?)
     assert_equal('VARIANT', add_info.params[0].ole_type)
   end
+#  def test_ole_put_methods
+#    methods_list = @excel.ole_put_methods
+#    puts methods_list
+#  end
   def teardown
     @excel.quit
     @excel = nil
@@ -305,11 +235,6 @@ class TestWin32OLE_WITH_MSI < RUNIT::TestCase
     @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
 
 # ---------------------
diff --git a/ext/win32ole/tests/test_ole_methods.rb b/ext/win32ole/tests/test_ole_methods.rb
deleted file mode 100644
index ca1c03b010..0000000000
--- a/ext/win32ole/tests/test_ole_methods.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# 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/ext/win32ole/tests/test_propertyputref.rb b/ext/win32ole/tests/test_propertyputref.rb
deleted file mode 100644
index befc35ca9c..0000000000
--- a/ext/win32ole/tests/test_propertyputref.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-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/ext/win32ole/tests/test_win32ole_event.rb b/ext/win32ole/tests/test_win32ole_event.rb
deleted file mode 100644
index 744021dfd2..0000000000
--- a/ext/win32ole/tests/test_win32ole_event.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(WIN32OLE_EVENT)
-  class TestWIN32OLE_EVENT < Test::Unit::TestCase
-    def create_temp_html
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      dummy_file = fso.GetTempName + ".html"
-      cfolder = fso.getFolder(".")
-      f = cfolder.CreateTextFile(dummy_file)
-      f.writeLine("<html><body>This is test HTML file for Win32OLE.</body></html>")
-      f.close
-      dummy_path = cfolder.path + "\\" + dummy_file
-      dummy_path
-    end
-
-    def setup
-      @ie = WIN32OLE.new("InternetExplorer.Application")
-      @ie.visible = true
-      @event = ""
-      @event2 = ""
-      @event3 = ""
-      @f = create_temp_html
-    end
-
-    def default_handler(event, *args)
-      @event += event
-    end
-
-    def test_on_event
-      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
-      ev.on_event {|*args| default_handler(*args)}
-      @ie.navigate("file:///#{@f}")
-      while @ie.busy
-        WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') 
-        GC.start  
-        sleep 0.1
-      end
-      assert_match(/BeforeNavigate/, @event)
-      assert_match(/NavigateComplete/, @event)
-    end
-
-    def test_on_event2
-      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
-      ev.on_event('BeforeNavigate') {|*args| handler1}
-      ev.on_event('BeforeNavigate') {|*args| handler2}
-      @ie.navigate("file:///#{@f}")
-      while @ie.busy
-        sleep 0.1
-      end
-      assert_equal("handler2", @event2)
-    end
-
-    def test_on_event3
-      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
-      ev.on_event {|*args| handler1}
-      ev.on_event {|*args| handler2}
-      @ie.navigate("file:///#{@f}")
-      while @ie.busy
-        sleep 0.1
-      end
-      assert_equal("handler2", @event2)
-    end
-
-    def test_on_event4
-      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
-      ev.on_event{|*args| handler1}
-      ev.on_event{|*args| handler2}
-      ev.on_event('NavigateComplete'){|*args| handler3(*args)}
-      @ie.navigate("file:///#{@f}")
-      while @ie.busy
-        sleep 0.1
-      end
-      assert(@event3!="")
-      assert("handler2", @event2)
-    end
-
-    def test_on_event5
-      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
-      ev.on_event {|*args| default_handler(*args)}
-      ev.on_event('NavigateComplete'){|*args| handler3(*args)}
-      @ie.navigate("file:///#{@f}")
-      while @ie.busy
-        sleep 0.1
-      end
-      assert_match(/BeforeNavigate/, @event)
-      assert(/NavigateComplete/ !~ @event)
-      assert(@event!="")
-    end
-
-    def test_unadvise
-      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
-      ev.on_event {|*args| default_handler(*args)}
-      @ie.navigate("file:///#{@f}")
-      while @ie.busy
-        sleep 0.1
-      end
-      assert_match(/BeforeNavigate/, @event)
-      ev.unadvise
-      @event = ""
-      @ie.navigate("file:///#{@f}")
-      while @ie.busy
-        sleep 0.1
-      end
-      assert_equal("", @event);
-      assert_raise(WIN32OLERuntimeError) {
-        ev.on_event {|*args| default_handler(*args)}
-      }
-    end
-
-    def handler1
-      @event2 = "handler1"
-    end
-
-    def handler2
-      @event2 = "handler2"
-    end
-
-    def handler3(url)
-      @event3 += url
-    end
-
-    def teardown
-      @ie.quit
-      @ie = nil
-      File.unlink(@f)
-      GC.start
-    end
-  end
-end
diff --git a/ext/win32ole/tests/test_word.rb b/ext/win32ole/tests/test_word.rb
deleted file mode 100644
index 53a6c521ba..0000000000
--- a/ext/win32ole/tests/test_word.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# 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/ext/win32ole/tests/testall.rb b/ext/win32ole/tests/testall.rb
index 553ce88509..17bae2c810 100644
--- a/ext/win32ole/tests/testall.rb
+++ b/ext/win32ole/tests/testall.rb
@@ -8,9 +8,4 @@ require "testOLEPARAM"
 require "testOLEMETHOD"
 require "testOLEVARIABLE"
 require "testVARIANT"
-require "testNIL2VTEMPTY"
-require "test_ole_methods.rb"
-require "test_propertyputref.rb"
-require "test_word.rb"
-require "test_win32ole_event.rb"
 # require "testOLEEVENT"
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index ae0066ffc9..3b143ebd07 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -20,7 +20,6 @@
 #include "st.h"
 #include <windows.h>
 #include <ocidl.h>
-#include <olectl.h>
 #include <ole2.h>
 #ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
@@ -29,7 +28,6 @@
 #include <varargs.h>
 #define va_init_list(a,b) va_start(a)
 #endif
-#include <objidl.h>
 
 #define DOUT fprintf(stderr,"[%d]\n",__LINE__)
 #define DOUTS(x) fprintf(stderr,"[%d]:" #x "=%s\n",__LINE__,x)
@@ -68,24 +66,25 @@
             (x) = 0;\
         }\
     }\
+    CoFreeUnusedLibraries();\
 }
 
 #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");\
+        rb_raise(rb_eRuntimeError, "Fail to get Dispatch Interface");\
     }\
 }
 
 #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
 
-#define WIN32OLE_VERSION "0.7.6"
+#define WIN32OLE_VERSION "0.5.5"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
 
 typedef HWND (WINAPI FNHTMLHELP)(HWND hwndCaller, LPCSTR pszFile,
-                                 UINT uCommand, DWORD dwData);
+				 UINT uCommand, DWORD dwData);
 typedef struct {
     struct IEventSinkVtbl * lpVtbl;
 } IEventSink, *PEVENTSINK;
@@ -135,7 +134,6 @@ typedef struct tagIEVENTSINKOBJ {
     DWORD m_dwCookie;
     IConnectionPoint *pConnectionPoint;
     ITypeInfo *pTypeInfo;
-    int *ptr_freed;
 }IEVENTSINKOBJ, *PIEVENTSINKOBJ;
 
 VALUE cWIN32OLE;
@@ -153,13 +151,6 @@ 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;
-static IMessageFilterVtbl message_filter;
-static IMessageFilter imessage_filter = { &message_filter };
-static IMessageFilter* previous_filter;
 
 struct oledata {
     IDispatch *pDispatch;
@@ -188,7 +179,6 @@ struct oleparamdata {
 
 struct oleeventdata {
     IEVENTSINKOBJ *pEvent;
-    int freed;
 };
 
 struct oleparam {
@@ -202,232 +192,6 @@ 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*);
-  
-static HRESULT (STDMETHODCALLTYPE mf_QueryInterface)(
-    IMessageFilter __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_IMessageFilter, GUID, 1) == 0)
-    {
-        *ppvObject = &message_filter;
-        return S_OK;
-    }
-    return E_NOINTERFACE;
-}
-
-static ULONG (STDMETHODCALLTYPE mf_AddRef)( 
-    IMessageFilter __RPC_FAR * This)
-{
-    return 1;
-}
-        
-static ULONG (STDMETHODCALLTYPE mf_Release)( 
-    IMessageFilter __RPC_FAR * This)
-{
-    return 1;
-}
-
-static DWORD (STDMETHODCALLTYPE mf_HandleInComingCall)(
-    IMessageFilter __RPC_FAR * pThis,
-    DWORD dwCallType,      //Type of incoming call
-    HTASK threadIDCaller,  //Task handle calling this task
-    DWORD dwTickCount,     //Elapsed tick count
-    LPINTERFACEINFO lpInterfaceInfo //Pointer to INTERFACEINFO structure
-    )
-{
-#ifdef DEBUG_MESSAGEFILTER
-    printf("incoming %08X, %08X, %d\n", dwCallType, threadIDCaller, dwTickCount);
-    fflush(stdout);
-#endif
-    switch (dwCallType)
-    {
-    case CALLTYPE_ASYNC:
-    case CALLTYPE_TOPLEVEL_CALLPENDING:
-    case CALLTYPE_ASYNC_CALLPENDING:
-        if (rb_during_gc()) {
-            return SERVERCALL_RETRYLATER;
-        }
-        break;
-    default:
-        break;
-    }
-    if (previous_filter) {
-        return previous_filter->lpVtbl->HandleInComingCall(previous_filter,
-                                                   dwCallType,
-                                                   threadIDCaller,
-                                                   dwTickCount,
-                                                   lpInterfaceInfo);
-    }
-    return SERVERCALL_ISHANDLED;
-}
-
-static DWORD (STDMETHODCALLTYPE mf_RetryRejectedCall)(
-    IMessageFilter* pThis,
-    HTASK threadIDCallee,  //Server task handle
-    DWORD dwTickCount,     //Elapsed tick count
-    DWORD dwRejectType     //Returned rejection message
-    )
-{
-    if (previous_filter) {
-        return previous_filter->lpVtbl->RetryRejectedCall(previous_filter,
-                                                  threadIDCallee,
-                                                  dwTickCount,
-                                                  dwRejectType);
-    }
-    return 1000;
-}
-
-static DWORD (STDMETHODCALLTYPE mf_MessagePending)(
-    IMessageFilter* pThis,
-    HTASK threadIDCallee,  //Called applications task handle
-    DWORD dwTickCount,     //Elapsed tick count
-    DWORD dwPendingType    //Call type
-    )
-{
-    if (rb_during_gc()) {
-        return PENDINGMSG_WAITNOPROCESS;
-    }
-    if (previous_filter) {
-        return previous_filter->lpVtbl->MessagePending(previous_filter,
-                                               threadIDCallee,
-                                               dwTickCount,
-                                               dwPendingType);
-    }
-    return PENDINGMSG_WAITNOPROCESS;
-}
-    
-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)
@@ -557,7 +321,7 @@ date2time_str(date)
     double date;
 {
     int y, m, d, hh, mm, ss;
-    char szTime[40];
+    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",
@@ -573,11 +337,10 @@ ole_wc2mb(pw)
 {
     int size;
     LPSTR pm;
-    size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL);
+    size = WideCharToMultiByte(CP_ACP, 0, pw, -1, NULL, 0, NULL, NULL);
     if (size) {
-        pm = ALLOC_N(char, size + 1);    
-        WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, pm, size, NULL, NULL);
-        pm[size] = '\0';
+        pm = ALLOC_N(char, size);    
+        WideCharToMultiByte(CP_ACP, 0, pw, -1, pm, size, NULL, NULL);
     }
     else {
         pm = ALLOC_N(char, 1);
@@ -591,12 +354,11 @@ ole_hresult2msg(hr)
     HRESULT hr;
 {
     VALUE msg = Qnil;
-    char *p_msg = NULL;
-    char *term = NULL;
+    char *p_msg;
     DWORD dwCount;
 
     char strhr[100];
-    sprintf(strhr, "    HRESULT error code:0x%08lx\n      ", hr);
+    sprintf(strhr, "    HRESULT error code:0x%08x\n      ", hr);
     msg = rb_str_new2(strhr);
 
     dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
@@ -605,30 +367,18 @@ ole_hresult2msg(hr)
                             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;
-	}
+        /* remove dots and CRs/LFs */
+        while (dwCount > 0 &&
+               (p_msg[dwCount-1] < ' ' || p_msg[dwCount-1] == '.')) {
+            p_msg[--dwCount] = '\0';
+        }
         if (p_msg[0] != '\0') {
             rb_str_cat2(msg, p_msg);
         }
     }
-    LocalFree(p_msg);
     return msg;
 }
 
-static void
-ole_freeexceptinfo(pExInfo)
-    EXCEPINFO *pExInfo;
-{
-    SysFreeString(pExInfo->bstrDescription);
-    SysFreeString(pExInfo->bstrSource);
-    SysFreeString(pExInfo->bstrHelpFile);
-}
-
 static VALUE
 ole_excepinfo2msg(pExInfo)
     EXCEPINFO *pExInfo;
@@ -668,7 +418,9 @@ ole_excepinfo2msg(pExInfo)
     }
     if(pSource) free(pSource);
     if(pDescription) free(pDescription);
-    ole_freeexceptinfo(pExInfo);
+    SysFreeString(pExInfo->bstrDescription);
+    SysFreeString(pExInfo->bstrSource);
+    SysFreeString(pExInfo->bstrHelpFile);
     return error_msg;
 }
 
@@ -714,20 +466,15 @@ ole_initialize()
     if(gOLEInitialized == Qfalse) {
         hr = OleInitialize(NULL);
         if(FAILED(hr)) {
-            ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
+            ole_raise(hr, rb_eRuntimeError, "Fail : OLE initialize");
         }
         gOLEInitialized = Qtrue;
-        /*
-         * In some situation, OleUninitialize does not work fine. ;-<
-         */
-        /*
+	/*
+	 * In some situation, OleUninitialize does not work fine. ;-<
+	 */
+	/*
         atexit((void (*)(void))ole_uninitialize);
-        */
-        hr = CoRegisterMessageFilter(&imessage_filter, &previous_filter);
-        if(FAILED(hr)) {
-            previous_filter = NULL;
-            ole_raise(hr, rb_eRuntimeError, "fail: install OLE MessageFilter");
-        }
+	*/
     }
 }
 
@@ -745,7 +492,6 @@ ole_free(pole)
     struct oledata *pole;
 {
     OLE_FREE(pole->pDispatch);
-    free(pole);
 }
 
 static void
@@ -753,7 +499,6 @@ oletype_free(poletype)
     struct oletypedata *poletype;
 {
     OLE_FREE(poletype->pTypeInfo);
-    free(poletype);
 }
 
 static void
@@ -762,7 +507,6 @@ olemethod_free(polemethod)
 {
     OLE_FREE(polemethod->pTypeInfo);
     OLE_FREE(polemethod->pOwnerTypeInfo);
-    free(polemethod);
 }
 
 static void
@@ -770,7 +514,6 @@ olevariable_free(polevar)
     struct olevariabledata *polevar;
 {
     OLE_FREE(polevar->pTypeInfo);
-    free(polevar);
 }
 
 static void
@@ -778,7 +521,6 @@ oleparam_free(pole)
     struct oleparamdata *pole;
 {
     OLE_FREE(pole->pTypeInfo);
-    free(pole);
 }
 
 static LPWSTR
@@ -788,9 +530,9 @@ ole_mb2wc(pm, len)
 {
     int size;
     LPWSTR pw;
-    size = MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, NULL, 0);
+    size = MultiByteToWideChar(CP_ACP, 0, pm, len, NULL, 0);
     pw = SysAllocStringLen(NULL, size - 1);
-    MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, pw, size);
+    MultiByteToWideChar(CP_ACP, 0, pm, len, pw, size);
     return pw;
 }
 
@@ -858,7 +600,7 @@ ole_val2variant(val, var)
     struct oledata *pole;
     if(rb_obj_is_kind_of(val, cWIN32OLE)) {
         Data_Get_Struct(val, struct oledata, pole);
-        OLE_ADDREF(pole->pDispatch);
+	OLE_ADDREF(pole->pDispatch);
         V_VT(var) = VT_DISPATCH;
         V_DISPATCH(var) = pole->pDispatch;
         return;
@@ -893,7 +635,7 @@ ole_val2variant(val, var)
             if(pub) free(pub);
             if(psab) free(psab);
             if(pid) free(pid);
-            rb_raise(rb_eRuntimeError, "memory allocation error");
+            rb_raise(rb_eRuntimeError, "memory allocate error");
         }
         val1 = val;
         i = 0;
@@ -936,9 +678,9 @@ ole_val2variant(val, var)
         V_I4(var) = NUM2INT(val);
         break;
     case T_BIGNUM:
-        V_VT(var) = VT_R8;
+	V_VT(var) = VT_R8;
         V_R8(var) = rb_big2dbl(val);
-        break;
+	break;
     case T_FLOAT:
         V_VT(var) = VT_R8;
         V_R8(var) = NUM2DBL(val);
@@ -952,30 +694,15 @@ ole_val2variant(val, var)
         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;
-        }
+        V_VT(var) = VT_ERROR;
+        V_ERROR(var) = DISP_E_PARAMNOTFOUND;
         break;
     default:
-        V_VT(var) = VT_DISPATCH;
-        V_DISPATCH(var) = val2dispatch(val);
+        rb_raise(rb_eTypeError, "not valid value");
         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;
@@ -1032,13 +759,8 @@ ole_variant2val(pvar)
         VARIANT variant;
         VALUE val;
         VALUE val2;
-        int dim = 0;
-
-        if (!psa) {
-            return obj;
-        }
-        dim = SafeArrayGetDim(psa);
 
+        int dim = SafeArrayGetDim(psa);
         VariantInit(&variant);
         V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF;
 
@@ -1050,7 +772,7 @@ ole_variant2val(pvar)
             if(pID) free(pID);
             if(pLB) free(pLB);
             if(pUB) free(pUB);
-            rb_raise(rb_eRuntimeError, "memory allocation error");
+            rb_raise(rb_eRuntimeError, "memory allocate error");
         }
 
         obj = Qnil;
@@ -1167,7 +889,7 @@ ole_variant2val(pvar)
             pDispatch = V_DISPATCH(pvar);
 
         if (pDispatch != NULL ) {
-            OLE_ADDREF(pDispatch);
+	    OLE_ADDREF(pDispatch);
             obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
         }
         break;
@@ -1227,7 +949,6 @@ ole_variant2val(pvar)
     return obj;
 }
 
-
 static LONG reg_open_key(hkey, name, phkey)
     HKEY hkey;
     const char *name;
@@ -1249,13 +970,12 @@ reg_enum_key(hkey, i)
     HKEY hkey;
     DWORD i;
 {
-    char buf[BUFSIZ + 1];
-    DWORD size_buf = sizeof(buf) - 1;
+    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) {
-        buf[BUFSIZ] = '\0';
         return rb_str_new2(buf);
     }
     return Qnil;
@@ -1266,11 +986,10 @@ reg_get_val(hkey, subkey)
     HKEY hkey;
     const char *subkey;
 {
-    char buf[BUFSIZ + 1];
-    LONG size_buf = sizeof(buf) - 1;
+    char buf[BUFSIZ];
+    LONG size_buf = sizeof(buf);
     LONG err = RegQueryValue(hkey, subkey, buf, &size_buf);
     if (err == ERROR_SUCCESS) {
-        buf[BUFSIZ] = '\0';
         return rb_str_new2(buf);
     }
     return Qnil;
@@ -1293,7 +1012,7 @@ typelib_file_from_clsid(ole)
     hr = CLSIDFromProgID(pbuf, &clsid);
     SysFreeString(pbuf);
     if (FAILED(hr)) {
-        return Qnil;
+	return Qnil;
     }
     StringFromCLSID(&clsid, &pbuf);
     vclsid = WC2VSTR(pbuf);
@@ -1351,7 +1070,7 @@ typelib_file_from_typelib(ole)
             if (typelib == Qnil)
                 continue;
             if (rb_str_cmp(typelib, ole) == 0) {
-                for(k = 0; !found; k++) {
+	        for(k = 0; !found; k++) {
                     lang = reg_enum_key(hversion, k);
                     if (lang == Qnil)
                         break;
@@ -1377,7 +1096,7 @@ typelib_file(ole)
 {
     VALUE file = typelib_file_from_clsid(ole);
     if (file != Qnil) {
-        return file;
+	return file;
     }
     return typelib_file_from_typelib(ole);
 }
@@ -1479,8 +1198,8 @@ clsid_from_remote(host, com, pclsid)
             pbuf  = ole_mb2wc(clsid, -1);
             hr = CLSIDFromString(pbuf, pclsid);
             SysFreeString(pbuf);
-        }
-        else {
+	}
+	else {
             hr = HRESULT_FROM_WIN32(err);
         }
         RegCloseKey(hpid);
@@ -1507,12 +1226,12 @@ ole_create_dcom(argc, argv, self)
     if (!gole32)
         gole32 = LoadLibrary("OLE32");
     if (!gole32)
-        rb_raise(rb_eRuntimeError, "failed to load OLE32");
+        rb_raise(rb_eRuntimeError, "Fail to load OLE32.");
     if (!gCoCreateInstanceEx)
         gCoCreateInstanceEx = (FNCOCREATEINSTANCEEX*)
             GetProcAddress(gole32, "CoCreateInstanceEx");
     if (!gCoCreateInstanceEx)
-        rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
+        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);
@@ -1524,7 +1243,7 @@ ole_create_dcom(argc, argv, self)
     SysFreeString(pbuf);
     if (FAILED(hr))
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "unknown OLE server: `%s'",
+                  "Unknown OLE server : `%s'",
                   StringValuePtr(ole));
     memset(&serverinfo, 0, sizeof(COSERVERINFO));    
     serverinfo.pwszName = ole_mb2wc(StringValuePtr(host), -1);
@@ -1534,7 +1253,7 @@ ole_create_dcom(argc, argv, self)
     SysFreeString(serverinfo.pwszName);
     if (FAILED(hr))
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "failed to create DCOM server `%s' in `%s'",
+                  "Fail to create DCOM server : `%s' in `%s'",
                   StringValuePtr(ole),
                   StringValuePtr(host));
 
@@ -1561,7 +1280,7 @@ ole_bind_obj(moniker, argc, argv, self)
     hr = CreateBindCtx(0, &pBindCtx);
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "failed to create bind context");
+                  "Fail to create bind context");
     }
 
     pbuf  = ole_mb2wc(StringValuePtr(moniker), -1);
@@ -1570,31 +1289,28 @@ ole_bind_obj(moniker, argc, argv, self)
     if(FAILED(hr)) {
         OLE_RELEASE(pBindCtx);
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
-                  "failed to parse display name of moniker `%s'",
+                  "Faile to parse display name of moniker:%s",
                   StringValuePtr(moniker));
     }
     hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL, 
                                         &IID_IDispatch,
-                                        (void**)&pDispatch);
+				        (void**)&pDispatch);
     OLE_RELEASE(pMoniker);
     OLE_RELEASE(pBindCtx);
 
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
-                  "failed to bind moniker `%s'",
+                  "Faile 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.
+ * 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.
  */
 static VALUE
 fole_s_connect(argc, argv, self)
@@ -1616,8 +1332,8 @@ fole_s_connect(argc, argv, self)
 
     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));
+	rb_raise(rb_eSecurityError, "Insecure Object Connection - %s",
+		 StringValuePtr(svr_name));
     }
 
     /* get CLSID from OLE server name */
@@ -1634,14 +1350,14 @@ fole_s_connect(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));
+                  "Not Running OLE server : `%s'", 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'", 
+                  "Fail to create WIN32OLE server : `%s'", 
                   StringValuePtr(svr_name));
     }
 
@@ -1651,33 +1367,10 @@ fole_s_connect(argc, argv, self)
 }
 
 /* 
- *  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
+ * WIN32OLE.const_load( ole, mod = WIN32OLE)
+ * ----
+ * Defines the constants of OLE Automation server as mod's constants.
+ * If 2nd argument is omitted, the default is WIN32OLE.
  */
 static VALUE
 fole_s_const_load(argc, argv, self)
@@ -1701,19 +1394,19 @@ fole_s_const_load(argc, argv, self)
     if (TYPE(klass) != T_CLASS &&
         TYPE(klass) != T_MODULE &&
         TYPE(klass) != T_NIL) {
-        rb_raise(rb_eTypeError, "2nd parameter must be Class or Module");
+        rb_raise(rb_eTypeError, "2nd paramator 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");
+            ole_raise(hr, rb_eRuntimeError, "fail to GetTypeInfo");
         }
         hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
         if(FAILED(hr)) {
             OLE_RELEASE(pTypeInfo);
-            ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
+            ole_raise(hr, rb_eRuntimeError, "fail to GetContainingTypeLib");
         }
         OLE_RELEASE(pTypeInfo);
         if(TYPE(klass) != T_NIL) {
@@ -1727,13 +1420,13 @@ fole_s_const_load(argc, argv, self)
     else if(TYPE(ole) == T_STRING) {
         file = typelib_file(ole);
         if (file == Qnil) {
-            file = ole;
+	    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 (FAILED(hr))
+          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to LoadTypeLibEx");
         if(TYPE(klass) != T_NIL) {
             ole_const_load(pTypeLib, klass, self);
         }
@@ -1743,7 +1436,7 @@ fole_s_const_load(argc, argv, self)
         OLE_RELEASE(pTypeLib);
     }
     else {
-        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE instance");
+        rb_raise(rb_eTypeError, "1st paramator must be WIN32OLE instance");
     }
     return Qnil;
 }
@@ -1767,17 +1460,17 @@ ole_classes_from_typelib(pTypeLib, classes)
         hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
                                                 &bstr, NULL, NULL, NULL);
         if (FAILED(hr)) 
-            continue;
+	    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));
+	oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
 
-        rb_ary_push(classes, type);
-        OLE_RELEASE(pTypeInfo);
+	rb_ary_push(classes, type);
+	OLE_RELEASE(pTypeInfo);
     }
     return classes;
 }
@@ -1788,19 +1481,18 @@ reference_count(pole)
 {
     ULONG n = 0;
     if(pole->pDispatch) {
-        OLE_ADDREF(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.
+ * 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)
@@ -1813,13 +1505,12 @@ fole_s_reference_count(self, obj)
 }
 
 /*
- *  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.
+ * 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)
@@ -1855,21 +1546,16 @@ ole_show_help(helpfile, helpcontext)
     hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile), 
                     0x0f, NUM2INT(helpcontext));
     if (hwnd == 0)
-        hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile), 
+	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)
+ * WIN32OLE.ole_show_help(obj [,helpcontext])
+ * ----
+ * Displays helpfile. The 1st argument specifies WIN32OLE_TYPE
+ * object or WIN32OLE_METHOD object or helpfile.
  */
 static VALUE
 fole_s_show_help(argc, argv, self)
@@ -1896,84 +1582,16 @@ fole_s_show_help(argc, argv, self)
         helpfile = target;
     }
     if (TYPE(helpfile) != T_STRING) {
-        rb_raise(rb_eTypeError, "1st parameter must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD)");
+        rb_raise(rb_eTypeError, "1st parametor 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'",
+        rb_raise(rb_eRuntimeError, "fail 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;
@@ -1993,14 +1611,14 @@ fole_initialize(argc, argv, self)
     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));
+	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));
-        }
+	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);
     }
 
@@ -2013,7 +1631,7 @@ fole_initialize(argc, argv, self)
     SysFreeString(pBuf);
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "unknown OLE server: `%s'",
+                  "Unknown OLE server : `%s'",
                   StringValuePtr(svr_name));
     }
 
@@ -2022,7 +1640,7 @@ fole_initialize(argc, argv, self)
                           &IID_IDispatch, (void**)&pDispatch);
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
-                  "failed to create WIN32OLE object from `%s'",
+                  "Fail to create WIN32OLE object from `%s'",
                   StringValuePtr(svr_name));
     }
     
@@ -2068,22 +1686,6 @@ hash2named_arg(pair, pOp)
 }
 
 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;
@@ -2105,6 +1707,7 @@ ole_invoke(argc, argv, self, wFlags)
     DISPID* pDispID;
     EXCEPINFO excepinfo;
     VARIANT result;
+    VALUE args;
     VARIANTARG* realargs = NULL;
     unsigned int argErr = 0;
     unsigned int i;
@@ -2123,7 +1726,7 @@ ole_invoke(argc, argv, self, wFlags)
     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");
+	rb_raise(rb_eRuntimeError, "Fail to get dispatch interface.");
     }
     wcmdname = ole_mb2wc(StringValuePtr(cmd), -1);
     hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
@@ -2131,7 +1734,7 @@ ole_invoke(argc, argv, self, wFlags)
     SysFreeString(wcmdname);
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "unknown property or method `%s'",
+                  "Unknown property or method : `%s'",
                   StringValuePtr(cmd));
     }
 
@@ -2168,7 +1771,7 @@ ole_invoke(argc, argv, self, wFlags)
                 VariantClear(&op.dp.rgvarg[i]);
             }
             ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                      "failed to get named argument info: `%s'",
+                      "FAIL to get named argument info : `%s'",
                       StringValuePtr(cmd));
         }
         op.dp.rgdispidNamedArgs = &(pDispID[1]);
@@ -2192,9 +1795,9 @@ ole_invoke(argc, argv, self, wFlags)
             VariantInit(&op.dp.rgvarg[n]);
             param = rb_ary_entry(paramS, i-cNamedArgs);
             
-             ole_val2variant(param, &realargs[n]);
+ 	    ole_val2variant(param, &realargs[n]);
             V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
-             V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
+ 	    V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
 
         }
     }
@@ -2213,69 +1816,44 @@ ole_invoke(argc, argv, self, wFlags)
                                          &result, &excepinfo, &argErr);
     if (FAILED(hr)) {
         /* retry to call args by value */
-        if(op.dp.cArgs >= cNamedArgs) {
+        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]);
             }
-            if (hr == DISP_E_EXCEPTION) {
-                ole_freeexceptinfo(&excepinfo);
-            }
             memset(&excepinfo, 0, sizeof(EXCEPINFO));
-            VariantInit(&result);
             hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
                                                  &IID_NULL, lcid, wFlags,
-                                                 &op.dp, &result,
+                                                 &op.dp, NULL,
                                                  &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) {
-                if (hr == DISP_E_EXCEPTION) {
-                    ole_freeexceptinfo(&excepinfo);
-                }
-                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]);
-                }
-                if (hr == DISP_E_EXCEPTION) {
-                    ole_freeexceptinfo(&excepinfo);
-                }
-                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]);
-                }
-            }
-        }
+        /* 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 && DispID > 0x8000) {
+            memset(&excepinfo, 0, sizeof(EXCEPINFO));
+            hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
+                                                 &IID_NULL, lcid, wFlags,
+                                                 &op.dp, NULL,
+                                                 &excepinfo, &argErr);
 
+        }
     }
     /* clear dispatch parameter */
     if(op.dp.cArgs > cNamedArgs) {
-        set_argv(realargs, cNamedArgs, op.dp.cArgs);
+        args = rb_cvar_get(cWIN32OLE, rb_intern("ARGV"));
+        rb_funcall(args, rb_intern("clear"), 0);
+        for(i = cNamedArgs; i < op.dp.cArgs; i++) {
+            n = op.dp.cArgs - i + cNamedArgs - 1;
+            rb_ary_push(args, ole_variant2val(&realargs[n]));
+            VariantClear(&realargs[n]);
+        }
     }
     else {
         for(i = 0; i < op.dp.cArgs; i++) {
@@ -2293,19 +1871,6 @@ ole_invoke(argc, argv, self, wFlags)
     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;
@@ -2349,136 +1914,136 @@ ole_invoke2(self, dispid, args, types, dispkind)
     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]);
-            }
-        }
+	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) {
@@ -2487,7 +2052,7 @@ ole_invoke2(self, dispid, args, types, dispkind)
         dispParams.rgdispidNamedArgs[0] = DISPID_PROPERTYPUT;
     }
 
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, NUM2INT(dispid),
+    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, FIX2INT(dispid),
                                          &IID_NULL, LOCALE_SYSTEM_DEFAULT,
                                          dispkind,
                                          &dispParams, &result,
@@ -2501,7 +2066,12 @@ ole_invoke2(self, dispid, args, types, dispkind)
 
     /* clear dispatch parameter */
     if(dispParams.cArgs > 0) {
-        set_argv(realargs, 0, dispParams.cArgs);
+        VALUE argv = rb_cvar_get(cWIN32OLE, rb_intern("ARGV"));
+        rb_funcall(argv, rb_intern("clear"), 0);
+        for(i = dispParams.cArgs - 1; i >= 0; i--) {
+            rb_ary_push(argv, ole_variant2val(&realargs[i]));
+            VariantClear(&realargs[i]);
+        }
     }
 
     obj = ole_variant2val(&result);
@@ -2510,16 +2080,12 @@ ole_invoke2(self, dispid, args, types, dispkind)
 }
 
 /*
- *   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
+ * 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.
  */
 static VALUE
 fole_invoke2(self, dispid, args, types)
@@ -2532,16 +2098,12 @@ fole_invoke2(self, dispid, args, types)
 }
 
 /*
- *  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
+ * 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.
  */
 static VALUE
 fole_getproperty2(self, dispid, args, types)
@@ -2554,16 +2116,12 @@ fole_getproperty2(self, dispid, args, types)
 }
 
 /*
- *   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
+ * 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.
  */
 static VALUE
 fole_setproperty2(self, dispid, args, types)
@@ -2576,18 +2134,12 @@ fole_setproperty2(self, dispid, args, types)
 }
 
 /*
- *  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.
+ * WIN32OLE['property']=val 
  *
- *     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.
+ * WIN32OLE.setproperty('property', [arg1, arg2,] val)
+ * -----
+ * Sets property of OLE object.
+ * When you want to set property with argument, you can use setproperty method.
  */
 static VALUE
 fole_setproperty(argc, argv, self)
@@ -2599,21 +2151,15 @@ fole_setproperty(argc, argv, self)
 }
 
 /*
- *  call-seq:
- *     WIN32OLE['property'] 
- * 
- *  Returns property of OLE object.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     puts excel['Visible'] # => false
+ * WIN32OLE['property'] 
+ * -----
+ * Returns property of OLE object.
  */
 static VALUE
-fole_getproperty(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+fole_getproperty(self, property)
+    VALUE self, property;
 {
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET);
+    return ole_invoke(1, &property, self, DISPATCH_PROPERTYGET);
 }
 
 static VALUE
@@ -2627,7 +2173,7 @@ ole_propertyput(self, property, value)
     EXCEPINFO excepinfo;
     DISPID dispID = DISPID_VALUE;
     DISPID dispIDParam = DISPID_PROPERTYPUT;
-    USHORT wFlags = DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF;
+    USHORT wFlags = DISPATCH_PROPERTYPUT;
     DISPPARAMS dispParams;
     VARIANTARG propertyValue[2];
     OLECHAR* pBuf[1];
@@ -2653,7 +2199,7 @@ ole_propertyput(self, property, value)
 
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "unknown property or method: `%s'",
+                  "Unknown property or method : `%s'",
                   StringValuePtr(property));
     }
     /* set property value */
@@ -2672,15 +2218,6 @@ ole_propertyput(self, property, value)
     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;
@@ -2705,7 +2242,7 @@ ole_each_sub(pEnumV)
         obj = ole_variant2val(&variant);
         VariantClear(&variant);
         VariantInit(&variant);
-        rb_yield(obj);
+	rb_yield(obj);
     }
     return Qnil;
 }
@@ -2720,18 +2257,9 @@ ole_ienum_free(pEnumV)
 }
 
 /*
- *  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
+ * WIN32OLE#each {|i|...}
+ * -----
+ * Iterates over each item of OLE collection which has IEnumVARIANT interface.
  */
 static VALUE
 fole_each(self)
@@ -2764,7 +2292,7 @@ fole_each(self)
 
     if (FAILED(hr)) {
         VariantClear(&result);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to get IEnum Interface");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to get IEnum Interface");
     }
 
     if (V_VT(&result) == VT_UNKNOWN)
@@ -2777,7 +2305,7 @@ fole_each(self)
                                                          (void**)&pEnum);
     if (FAILED(hr) || !pEnum) {
         VariantClear(&result);
-        ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
+        ole_raise(hr, rb_eRuntimeError, "Fail to get IEnum Interface");
     }
 
     VariantClear(&result);
@@ -2786,10 +2314,9 @@ fole_each(self)
 }
 
 /*
- *  call-seq:
- *     WIN32OLE#method_missing(id [,arg1, arg2, ...])
- * 
- *  Calls WIN32OLE#invoke method.
+ * WIN32OLE#method_missing(id [,arg1, arg2, ...])
+ * ----
+ * Calls WIN32OLE#invoke method.
  */
 static VALUE
 fole_missing(argc, argv, self)
@@ -2803,7 +2330,7 @@ fole_missing(argc, argv, self)
     id = rb_to_id(argv[0]);
     mname = rb_id2name(id);
     if(!mname) {
-        rb_raise(rb_eRuntimeError, "fail: unknown method or property");
+        rb_raise(rb_eRuntimeError, "Fail : Unknown method or property");
     }
     n = strlen(mname);
     if(mname[n-1] == '=') {
@@ -2833,12 +2360,12 @@ ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
     VALUE method = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
         hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
-        if (FAILED(hr))
-             continue;
+	if (FAILED(hr))
+	     continue;
 
         hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
                                                  &bstr, NULL, NULL, NULL);
@@ -2846,13 +2373,13 @@ ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
             pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
             continue;
         }
-        fname = WC2VSTR(bstr);
-        if (strcasecmp(StringValuePtr(name), StringValuePtr(fname)) == 0) {
-            olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, i, fname);
+	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;
+	pFuncDesc=NULL;
     }
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return method;
@@ -2872,7 +2399,7 @@ olemethod_from_typeinfo(self, pTypeInfo, name)
     VALUE method = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
     }
     method = ole_method_sub(self, 0, pTypeInfo, name);
     if (method != Qnil) {
@@ -2908,13 +2435,13 @@ ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
     WORD i;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs; i++) {
         pstr = NULL;
         hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
-        if (FAILED(hr))
-             continue;
+	if (FAILED(hr))
+	     continue;
                  
         hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
                                                  &bstr, NULL, NULL, NULL);
@@ -2922,14 +2449,14 @@ ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
             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));
+	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;
+	pFuncDesc=NULL;
     }
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
 
@@ -2949,7 +2476,7 @@ ole_methods_from_typeinfo(pTypeInfo, mask)
     VALUE methods = rb_ary_new();
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
     }
 
     ole_methods_sub(0, pTypeInfo, methods, mask);
@@ -2982,7 +2509,7 @@ typeinfo_from_ole(pole, ppti)
     HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                                       0, lcid, &pTypeInfo);
     if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "fail to GetTypeInfo");
     }
     hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo,
                                              -1,
@@ -2992,7 +2519,7 @@ typeinfo_from_ole(pole, ppti)
     hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
     OLE_RELEASE(pTypeInfo);
     if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
+        ole_raise(hr, rb_eRuntimeError, "fail to GetContainingTypeLib");
     }
     count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
     for (i = 0; i < count; i++) {
@@ -3032,83 +2559,63 @@ ole_methods(self,mask)
 }
 
 /*
- *  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
- *     
+ * WIN32OLE#ole_methods
+ * ----
+ * Returns OLE methods
  */
 static VALUE
 fole_methods( self )
     VALUE self;
 {
-    return ole_methods( self, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
+    return ole_methods( self, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT);
 }
 
 /*
- *  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
+ * WIN32OLE#ole_get_methods
+ * ----
+ * Returns get properties.
  */
 static VALUE
-fole_get_methods( self )
+fole_get_methods( argc, argv, self )
+    int argc;
+    VALUE *argv;
     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
+ * WIN32OLE#ole_put_methods
+ * ----
+ * Returns put properties.
  */
 static VALUE
-fole_put_methods( self )
+fole_put_methods( argc, argv, self )
+    int argc;
+    VALUE *argv;
     VALUE self;
 {
-    return ole_methods( self, INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
+    return ole_methods( self, INVOKE_PROPERTYPUT);
 }
 
 /*
- *  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
- *
+ * WIN32OLE#ole_func_methods
+ * ---
+ * Returns OLE func methods.
  */
 static VALUE
-fole_func_methods( self )
+fole_func_methods( argc, argv, self )
+    int argc;
+    VALUE *argv;
     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
+ * WIN32OLE#ole_obj_help
+ * ----
+ * Returns WIN32OLE_TYPE object.
  */
 static VALUE
 fole_obj_help( self )
@@ -3127,18 +2634,18 @@ fole_obj_help( self )
 
     hr = pole->pDispatch->lpVtbl->GetTypeInfo( pole->pDispatch, 0, lcid, &pTypeInfo );
     if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "fail to GetTypeInfo");
     }
     hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
     if(FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
+        ole_raise(hr, rb_eRuntimeError, "fail 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));
+	oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
     }
     OLE_RELEASE(pTypeLib);
     OLE_RELEASE(pTypeInfo);
@@ -3187,7 +2694,7 @@ ole_usertype2val(pTypeInfo, pTypeDesc, typedetails)
 
     hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, 
                                            V_UNION1(pTypeDesc, hreftype),
-                                           &pRefTypeInfo);
+				           &pRefTypeInfo);
     if(FAILED(hr))
         return Qnil;
     hr = ole_docinfo_from_type(pRefTypeInfo, &bstr, NULL, NULL, NULL);
@@ -3212,13 +2719,13 @@ ole_ptrtype2val(pTypeInfo, pTypeDesc, 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);
+	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;
 }
@@ -3327,16 +2834,16 @@ ole_typedesc2val(pTypeInfo, pTypeDesc, typedetails)
         if(typedetails != Qnil)
             rb_ary_push(typedetails, rb_str_new2("USERDEFINED"));
         str = ole_usertype2val(pTypeInfo, pTypeDesc, typedetails);
-        if (str != Qnil) {
-            return str;
-        }
+	if (str != Qnil) {
+	    return str;
+	}
         return rb_str_new2("USERDEFINED");
     case VT_UNKNOWN:
-        return rb_str_new2("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");
+	return rb_str_new2("DISPATCH");
     default:
         str = rb_str_new2("Unknown Type ");
         rb_str_concat(str, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
@@ -3345,15 +2852,10 @@ ole_typedesc2val(pTypeInfo, pTypeDesc, typedetails)
 }
 
 /*
- *   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')
- *
+ * WIN32OLE#ole_method_help(method)
+ * -----
+ * Returns WIN32OLE_METHOD object corresponding with method 
+ * specified by 1st argument.
  */
 static VALUE
 fole_method_help( self, cmdname )
@@ -3370,69 +2872,20 @@ fole_method_help( self, cmdname )
     OLEData_Get_Struct(self, pole);
     hr = typeinfo_from_ole(pole, &pTypeInfo);
     if(FAILED(hr))
-        ole_raise(hr, rb_eRuntimeError, "failed to get ITypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "fail 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));
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found %s",
+	         StringValuePtr(cmdname));
     return obj;
 }
 
 /*
- *  call-seq:
- *     WIN32OLE#ole_activex_initialize() -> Qnil
- *
- *  Initialize WIN32OLE object(ActiveX Control) by calling 
- *  IPersistMemory::InitNew.
- *
- *  Before calling OLE method, some kind of the ActiveX controls 
- *  created with MFC should be initialized by calling 
- *  IPersistXXX::InitNew.
- *
- *  If and only if you recieved the exception "HRESULT error code:
- *  0x8000ffff catastrophic failure", try this method before
- *  invoking any ole_method.
- *
- *     obj = WIN32OLE.new("ProgID_or_GUID_of_ActiveX_Control")
- *     obj.ole_activex_initialize
- *     obj.method(...)
- *  
- */ 
-static VALUE
-fole_activex_initialize(self)
-    VALUE self; 
-{
-    struct oledata *pole;
-    IPersistMemory *pPersistMemory;
-
-    HRESULT hr = S_OK;
-
-    OLEData_Get_Struct(self, pole);
-
-    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &IID_IPersistMemory,
-                                                 (void **)&pPersistMemory);
-    if (SUCCEEDED(hr)) {
-        hr = pPersistMemory->lpVtbl->InitNew(pPersistMemory);
-        OLE_RELEASE(pPersistMemory);
-        if (SUCCEEDED(hr)) {
-            return Qnil;
-        }
-    }
-
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "fail to initialize ActiveX control");
-    }
-
-    return Qnil;
-}
-
-/*
- *   call-seq:
- *      WIN32OLE_TYPE.ole_classes(typelib)
- * 
- *   Returns array of WIN32OLE_TYPE objects defined by the <i>typelib</i> type library.
+ * WIN32OLE.ole_classes(typelibrary)
+ * ----
+ * Returns array of WIN32OLE_TYPE objects defined by type library.
  */
 static VALUE
 foletype_s_ole_classes(self, typelib)
@@ -3449,27 +2902,25 @@ foletype_s_ole_classes(self, typelib)
     if(TYPE(typelib) == T_STRING) {
         file = typelib_file(typelib);
         if (file == Qnil) {
-            file = typelib;
+	    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");
+	if (FAILED(hr))
+          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to LoadTypeLibEx");
         SysFreeString(pbuf);
         ole_classes_from_typelib(pTypeLib, classes);
-        OLE_RELEASE(pTypeLib);
+	OLE_RELEASE(pTypeLib);
     } else {
-        rb_raise(rb_eTypeError, "1st argument should be TypeLib string");
+	rb_raise(rb_eTypeError, "1st argument should be TypeLib string");
     }
     return classes;
 }
 
 /*
- *  call-seq:
- *     WIN32OLE_TYPE.typelibs
- * 
- *  Returns array of type libraries.
- *
+ * WIN32OLE_TYPE.typelibs
+ * ----
+ * Returns array of type libraries.
  */
 static VALUE
 foletype_s_typelibs(self)
@@ -3514,10 +2965,9 @@ foletype_s_typelibs(self)
 }
 
 /*
- *  call-seq:
- *     WIN32OLE_TYPE.progids
- * 
- *  Returns array of ProgID.
+ * WIN32OLE_TYPE.progids
+ * ---
+ * Returns array of ProgID.
  */
 static VALUE
 foletype_s_progids(self)
@@ -3601,34 +3051,17 @@ oleclass_from_typelib(self, pTypeLib, oleclass)
         hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
                                                 &bstr, NULL, NULL, NULL);
         if (FAILED(hr)) 
-            continue;
+	    continue;
         typelib = WC2VSTR(bstr);
-        if (rb_str_cmp(oleclass, typelib) == 0) {
+	if (rb_str_cmp(oleclass, typelib) == 0) {
             oletype_set_member(self, pTypeInfo, typelib);
-            found = Qtrue;
-        }
-        OLE_RELEASE(pTypeInfo);
+	    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;
@@ -3649,24 +3082,21 @@ foletype_initialize(self, typelib, oleclass)
     pbuf = ole_mb2wc(StringValuePtr(file), -1);
     hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail 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));
+        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
+ * WIN32OLE_TYPE#name
+ * ---
+ * Returns name.
  */
 static VALUE
 foletype_name(self)
@@ -3723,12 +3153,9 @@ ole_ole_type(pTypeInfo)
 }
 
 /*
- *  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
+ * WIN32OLE_TYPE#ole_type
+ * ----
+ * returns type of class.
  */
 static VALUE
 foletype_ole_type(self)
@@ -3760,12 +3187,9 @@ ole_type_guid(pTypeInfo)
 }
 
 /*
- *  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}
+ * WIN32OLE_TYPE#guid
+ * ----
+ * Returns GUID.
  */
 static VALUE
 foletype_guid(self)
@@ -3788,21 +3212,16 @@ ole_type_progid(pTypeInfo)
     if (FAILED(hr)) 
         return progid;
     hr = ProgIDFromCLSID(&pTypeAttr->guid, &pbuf);
-    if (SUCCEEDED(hr)) { 
-        progid = ole_wc2vstr(pbuf, FALSE);
-        CoTaskMemFree(pbuf);
-    }
+    if (SUCCEEDED(hr)) 
+        progid = WC2VSTR(pbuf);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return progid;
 }
 
 /*
- * call-seq:
- *    WIN32OLE_TYPE#progid  #=> ProgID
- * 
+ * WIN32OLE_TYPE#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)
@@ -3834,12 +3253,9 @@ ole_type_visible(pTypeInfo)
 }
 
 /*
- *  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
+ * WIN32OLE_TYPE#visible
+ * ----
+ * returns true if the OLE class is public.
  */
 static VALUE
 foletype_visible(self)
@@ -3859,19 +3275,16 @@ ole_type_major_version(pTypeInfo)
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail 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
+ * WIN32OLE_TYPE#major_version
+ * ----
+ * Returns major version.
  */
 static VALUE
 foletype_major_version(self)
@@ -3891,19 +3304,16 @@ ole_type_minor_version(pTypeInfo)
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail 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
+ * WIN32OLE_TYPE#minor_version
+ * ----
+ * Returns minor version.
  */
 static VALUE
 foletype_minor_version(self)
@@ -3923,20 +3333,16 @@ ole_type_typekind(pTypeInfo)
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail 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
- *
+ * WIN32OLE_TYPE#typekind
+ * ----
+ * Returns number which represents type.
  */
 static VALUE 
 foletype_typekind(self)
@@ -3961,12 +3367,9 @@ ole_type_helpstring(pTypeInfo)
 }
 
 /*
- *  call-seq:
- *    WIN32OLE_TYPE#helpstring #=> help string.
- * 
- *  Returns help string.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'IWebBrowser')
- *    puts tobj.helpstring # => Web Browser interface
+ * WIN32OLE_TYPE#helpstring
+ * ---
+ * Returns help string.
  */
 static VALUE 
 foletype_helpstring(self)
@@ -3989,7 +3392,7 @@ ole_type_src_type(pTypeInfo)
         return alias;
     if(pTypeAttr->typekind != TKIND_ALIAS) {
         OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-        return alias;
+	return alias;
     }
     alias = ole_typedesc2val(pTypeInfo, &(pTypeAttr->tdescAlias), Qnil);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
@@ -3997,13 +3400,9 @@ ole_type_src_type(pTypeInfo)
 }
 
 /*
- *  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
- *
+ * WIN32OLE_TYPE#src_type
+ * ----
+ * Returns source class when the OLE class is 'Alias'.
  */
 static VALUE
 foletype_src_type(self)
@@ -4028,13 +3427,9 @@ ole_type_helpfile(pTypeInfo)
 }
 
 /*
- *  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
- *
+ * WIN32OLE_TYPE#helpfile
+ * ----
+ * Returns helpfile
  */
 static VALUE
 foletype_helpfile(self)
@@ -4059,12 +3454,9 @@ ole_type_helpcontext(pTypeInfo)
 }
 
 /*
- *  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
+ * WIN32OLE_TYPE#helpcontext
+ * ---
+ * Returns helpcontext.
  */
 static VALUE
 foletype_helpcontext(self)
@@ -4091,7 +3483,7 @@ ole_variables(pTypeInfo)
     VALUE variables = rb_ary_new();
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
     }
     
     for(i = 0; i < pTypeAttr->cVars; i++) {
@@ -4099,46 +3491,31 @@ ole_variables(pTypeInfo)
         if(FAILED(hr))
             continue;
         len = 0;
-        pstr = NULL;
+	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);
+	                       0,olevariable_free,pvar);
         pvar->pTypeInfo = pTypeInfo;
         OLE_ADDREF(pTypeInfo);
         pvar->index = i;
-        rb_ivar_set(var, rb_intern("name"), WC2VSTR(bstr));
+	rb_ivar_set(var, rb_intern("name"), WC2VSTR(bstr));
         rb_ary_push(variables, var);
 
         pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-        pVarDesc = NULL;
+	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
- *
+ * WIN32OLE_TYPE#variables
+ * ----
+ * Returns array of variables defined in OLE class.
  */
 static VALUE
 foletype_variables(self)
@@ -4150,16 +3527,9 @@ foletype_variables(self)
 }
 
 /*
- *  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',....]
+ * WIN32OLE_TYPE#ole_methods
+ * ----
+ * Returns array of WIN32OLE_METHOD objects.
  */
 static VALUE
 foletype_methods(argc, argv, self)
@@ -4173,30 +3543,9 @@ foletype_methods(argc, argv, self)
 }
 
 /*
- * 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
- *
+ * WIN32OLE_VARIABLE#name
+ * ---
+ * Returns the name.
  */
 static VALUE
 folevariable_name(self)
@@ -4205,8 +3554,7 @@ folevariable_name(self)
     return rb_ivar_get(self, rb_intern("name"));
 }
 
-static VALUE
-ole_variable_ole_type(pTypeInfo, var_index)
+static ole_variable_ole_type(pTypeInfo, var_index)
     ITypeInfo *pTypeInfo;
     UINT var_index;
 {
@@ -4215,31 +3563,16 @@ ole_variable_ole_type(pTypeInfo, var_index)
     VALUE type;
     hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail 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
- *
+ * WIN32OLE_VARIABLE#ole_type
+ * ----
+ * Returns type.
  */
 static VALUE
 folevariable_ole_type(self)
@@ -4250,8 +3583,7 @@ folevariable_ole_type(self)
     return ole_variable_ole_type(pvar->pTypeInfo, pvar->index);
 }
 
-static VALUE
-ole_variable_ole_type_detail(pTypeInfo, var_index)
+static ole_variable_ole_type_detail(pTypeInfo, var_index)
     ITypeInfo *pTypeInfo;
     UINT var_index;
 {
@@ -4260,23 +3592,16 @@ ole_variable_ole_type_detail(pTypeInfo, var_index)
     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_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail 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"]
- *
+ * WIN32OLE_VARIABLE#ole_type_detail
+ * ---
+ * Returns detail information of type. The information is array of type.
  */
 static VALUE
 folevariable_ole_type_detail(self)
@@ -4287,8 +3612,7 @@ folevariable_ole_type_detail(self)
     return ole_variable_ole_type_detail(pvar->pTypeInfo, pvar->index);
 }
 
-static VALUE
-ole_variable_value(pTypeInfo, var_index)
+static ole_variable_value(pTypeInfo, var_index)
     ITypeInfo *pTypeInfo;
     UINT var_index;
 {
@@ -4305,25 +3629,10 @@ ole_variable_value(pTypeInfo, var_index)
 }
 
 /*
- *  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
- *
+ * WIN32OLE_VARIABLE#value
+ * ----
+ * Returns value if value is exists. If the value does not exist, 
+ * this method returns nil.
  */    
 static VALUE
 folevariable_value(self)
@@ -4334,8 +3643,7 @@ folevariable_value(self)
     return ole_variable_value(pvar->pTypeInfo, pvar->index);
 }
 
-static VALUE
-ole_variable_visible(pTypeInfo, var_index)
+static ole_variable_visible(pTypeInfo, var_index)
     ITypeInfo *pTypeInfo;
     UINT var_index;
 {
@@ -4355,24 +3663,9 @@ ole_variable_visible(pTypeInfo, var_index)
 }
 
 /*
- *  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
- *       
+ * WIN32OLE_VARIABLE#visible?
+ * ----
+ * Returns true if the variable is public.
  */
 static VALUE
 folevariable_visible(self)
@@ -4415,23 +3708,9 @@ ole_variable_kind(pTypeInfo, var_index)
 }
 
 /*
- * call-seq:
- *   WIN32OLE_VARIABLE#variable_kind
- * 
+ * 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)
@@ -4459,22 +3738,9 @@ ole_variable_varkind(pTypeInfo, var_index)
 }
 
 /*
- *  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
+ * WIN32OLE_VARIABLE#varkind
+ * ----
+ * Returns the number which represents variable kind.
  */
 static VALUE
 folevariable_varkind(self)
@@ -4485,12 +3751,6 @@ folevariable_varkind(self)
     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;
@@ -4525,19 +3785,6 @@ folemethod_s_allocate(klass)
     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;
@@ -4549,28 +3796,22 @@ folemethod_initialize(self, oletype, method)
     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));
+	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");
+        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
- *     
+ * WIN32OLE_METHOD#name
+ * ----
+ * Returns the name of the method.
  */
 static VALUE
 folemethod_name(self)
@@ -4590,7 +3831,7 @@ ole_method_return_type(pTypeInfo, method_index)
 
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetFuncDesc");
     
     type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
@@ -4598,14 +3839,9 @@ ole_method_return_type(pTypeInfo, method_index)
 }
 
 /*
- *  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
- *
+ * WIN32OLE_METHOD#return_type
+ * ----
+ * Returns string of return value type of method.
  */
 static VALUE
 folemethod_return_type(self)
@@ -4627,7 +3863,7 @@ ole_method_return_vtype(pTypeInfo, method_index)
 
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetFuncDesc");
     
     vt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
@@ -4635,14 +3871,9 @@ ole_method_return_vtype(pTypeInfo, method_index)
 }
 
 /*
- *  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
- *
+ * WIN32OLE_METHOD#return_vtype
+ * ----
+ * Returns number of return value type of method.
  */
 static VALUE
 folemethod_return_vtype(self)
@@ -4672,14 +3903,10 @@ ole_method_return_type_detail(pTypeInfo, method_index)
 }
 
 /*
- *  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"]
+ * WIN32OLE_METHOD#return_type_detail
+ * -----
+ * Returns detail information of return value type of method.
+ * The information is array.
  */
 static VALUE
 folemethod_return_type_detail(self)
@@ -4700,7 +3927,7 @@ ole_method_invkind(pTypeInfo, method_index)
     VALUE invkind;
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if(FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetFuncDesc");
     invkind = INT2FIX(pFuncDesc->invkind);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return invkind;
@@ -4729,14 +3956,9 @@ ole_method_invoke_kind(pTypeInfo, method_index)
 }
 
 /*
- *   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
- *
+ * WIN32OLE_MTHOD#invkind
+ * ----
+ * Returns invkind.
  */
 static VALUE
 folemethod_invkind(self)
@@ -4748,15 +3970,9 @@ folemethod_invkind(self)
 }
 
 /*
- *  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"
+ * WIN32OLE_METHOD#invoke_kind
+ * ----
+ * Returns invoke kind string.
  */
 static VALUE
 folemethod_invoke_kind(self)
@@ -4780,7 +3996,7 @@ ole_method_visible(pTypeInfo, method_index)
         return Qfalse;
     if (pFuncDesc->wFuncFlags & (FUNCFLAG_FRESTRICTED |
                                  FUNCFLAG_FHIDDEN |
-                                 FUNCFLAG_FNONBROWSABLE)) {
+				 FUNCFLAG_FNONBROWSABLE)) {
         visible = Qfalse;
     } else {
         visible = Qtrue;
@@ -4790,13 +4006,9 @@ ole_method_visible(pTypeInfo, method_index)
 }
 
 /*
- *  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
+ * WIN32OLE_METHOD#visible?
+ * ----
+ * Returns true if the method is public.
  */
 static VALUE
 folemethod_visible(self) 
@@ -4807,8 +4019,7 @@ folemethod_visible(self)
     return ole_method_visible(pmethod->pTypeInfo, pmethod->index);
 }
 
-static VALUE
-ole_method_event(pTypeInfo, method_index, method_name)
+static ole_method_event(pTypeInfo, method_index, method_name)
     ITypeInfo *pTypeInfo;
     WORD method_index;
     VALUE method_name;
@@ -4844,29 +4055,29 @@ ole_method_event(pTypeInfo, method_index, method_name)
             hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
                                                    href, &pRefTypeInfo);
             if (FAILED(hr))
-                continue;
+	        continue;
             hr = pRefTypeInfo->lpVtbl->GetFuncDesc(pRefTypeInfo, method_index, 
-                                                   &pFuncDesc);
+	                                           &pFuncDesc);
             if (FAILED(hr)) {
-                OLE_RELEASE(pRefTypeInfo);
-                continue;
+	        OLE_RELEASE(pRefTypeInfo);
+		continue;
             }
 
             hr = pRefTypeInfo->lpVtbl->GetDocumentation(pRefTypeInfo, 
-                                                        pFuncDesc->memid,
+	                                                pFuncDesc->memid,
                                                         &bstr, NULL, NULL, NULL);
             if (FAILED(hr)) {
-                pRefTypeInfo->lpVtbl->ReleaseFuncDesc(pRefTypeInfo, pFuncDesc);
-                OLE_RELEASE(pRefTypeInfo);
-                continue;
+		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;
+	    pRefTypeInfo->lpVtbl->ReleaseFuncDesc(pRefTypeInfo, pFuncDesc);
+	    OLE_RELEASE(pRefTypeInfo);
+	    if (rb_str_cmp(method_name, name) == 0) {
+	        event = Qtrue;
+		break;
             }
         }
     }
@@ -4875,14 +4086,9 @@ ole_method_event(pTypeInfo, method_index, method_name)
 }
 
 /*
- *  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
- *
+ * WIN32OLE_METHOD#event?
+ * ----
+ * Returns true if the method is event.
  */
 static VALUE
 folemethod_event(self)
@@ -4897,15 +4103,6 @@ folemethod_event(self)
                             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;
@@ -4916,8 +4113,8 @@ folemethod_event_interface(self)
     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);
+	if(SUCCEEDED(hr))
+	    return WC2VSTR(name);
     }
     return Qnil;
 }
@@ -4958,17 +4155,6 @@ ole_method_helpstring(pTypeInfo, method_index)
     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;
@@ -4993,14 +4179,9 @@ ole_method_helpfile(pTypeInfo, method_index)
 }
 
 /*
- *  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
+ * WIN32OLE_METHOD#helpfile
+ * ---
+ * Returns help file.
  */
 static VALUE
 folemethod_helpfile(self)
@@ -5027,13 +4208,9 @@ ole_method_helpcontext(pTypeInfo, method_index)
 }
 
 /* 
- *  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
+ * WIN32OLE_METHOD#helpcontext
+ * -----
+ * Returns help context.
  */
 static VALUE
 folemethod_helpcontext(self)
@@ -5055,19 +4232,15 @@ ole_method_dispid(pTypeInfo, method_index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return dispid;
-    dispid = INT2NUM(pFuncDesc->memid); 
+    dispid = INT2FIX(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
+ * WIN32OLE_METHOD#dispid
+ * ----
+ * Returns dispatch ID.
  */
 static VALUE
 folemethod_dispid(self)
@@ -5095,13 +4268,9 @@ ole_method_offset_vtbl(pTypeInfo, method_index)
 }
 
 /*
- *  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
+ * WIN32OLE_METHOD#offset_vtbl
+ * ----
+ * Returns the offset ov VTBL.
  */
 static VALUE
 folemethod_offset_vtbl(self)
@@ -5129,14 +4298,9 @@ ole_method_size_params(pTypeInfo, method_index)
 }
 
 /*
- *  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
- *  
+ * WIN32OLE_METHOD#size_params
+ * ----
+ * Returns the size of arguments.
  */
 static VALUE
 folemethod_size_params(self)
@@ -5147,6 +4311,11 @@ folemethod_size_params(self)
     return ole_method_size_params(pmethod->pTypeInfo, pmethod->index);
 }
 
+/*
+ * WIN32OLE_METHOD#size_opt_params
+ * ----
+ * Returns the size of optional parameters.
+ */
 static VALUE
 ole_method_size_opt_params(pTypeInfo, method_index)
     ITypeInfo *pTypeInfo;
@@ -5163,15 +4332,6 @@ ole_method_size_opt_params(pTypeInfo, method_index)
     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;
@@ -5224,16 +4384,9 @@ ole_method_params(pTypeInfo, method_index)
 }
 
 /*
- *  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]
+ * WIN32OLE_METHOD#params
+ * ----
+ * returns array of WIN32OLE_PARAM object corresponding with method parameters.
  */
 static VALUE
 folemethod_params(self)
@@ -5245,21 +4398,9 @@ folemethod_params(self)
 }
 
 /*
- * 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
+ * WIN32OLE_PARAM#name
+ * ----
+ * Returns name.
  */
 static VALUE
 foleparam_name(self)
@@ -5286,16 +4427,6 @@ ole_param_ole_type(pTypeInfo, method_index, index)
     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;
@@ -5324,16 +4455,6 @@ ole_param_ole_type_detail(pTypeInfo, method_index, index)
     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;
@@ -5364,14 +4485,9 @@ ole_param_flag_mask(pTypeInfo, method_index, index, mask)
 }
 
 /*
- *  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
+ * WIN32OLE_PARAM#input?
+ * ----
+ * Returns true if the parameter is input.
  */
 static VALUE foleparam_input(self)
     VALUE self;
@@ -5383,23 +4499,9 @@ static VALUE foleparam_input(self)
 }
 
 /*
- *  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
+ * WIN32OLE#output?
+ * ----
+ * Returns true if argument is output.
  */
 static VALUE foleparam_output(self)
     VALUE self;
@@ -5411,14 +4513,9 @@ static VALUE foleparam_output(self)
 }
 
 /*
- *  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
+ * WIN32OLE_PARAM#optional?
+ * -----
+ * Returns true if argument is output.
  */
 static VALUE foleparam_optional(self)
     VALUE self;
@@ -5429,17 +4526,6 @@ static VALUE foleparam_optional(self)
                                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;
 {
@@ -5476,33 +4562,10 @@ ole_param_default(pTypeInfo, method_index, index)
 }
 
 /*
- *  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
+ * WIN32OLE_PARAM#default
+ * ----
+ * Returns default value. If the default value does not exist, 
+ * this method returns nil.
  */
 static VALUE foleparam_default(self)
     VALUE self;
@@ -5513,13 +4576,6 @@ static VALUE foleparam_default(self)
                              pparam->index);
 }
 
-
-/*
- * Document-class: WIN32OLE_EVENT
- *
- *   <code>WIN32OLE_EVENT</code> objects controls OLE event.
- */
-
 static IEventSinkVtbl vtEventSink;
 static BOOL g_IsEventSinkVtblInitialized = FALSE;
 
@@ -5592,35 +4648,6 @@ STDMETHODIMP EVENTSINK_GetIDsOfNames(
     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;
@@ -5630,7 +4657,7 @@ ole_search_event(ary, ev, is_default)
     VALUE event;
     VALUE def_event;
     VALUE event_name;
-    long i, len;
+    int i, len;
     *is_default = FALSE;
     def_event = Qnil;
     len = RARRAY(ary)->len;
@@ -5791,7 +4818,7 @@ STDMETHODIMP EVENTSINK_Invoke(
 
     if (rb_ary_entry(event, 3) == Qtrue) {
         argv = rb_ary_new();
-        rb_ary_push(args, argv);
+	rb_ary_push(args, argv);
         result = rb_apply(handler, rb_intern("call"), args);
         ary2ptr_dispparams(argv, pdispparams);
     }
@@ -5828,7 +4855,6 @@ EVENTSINK_Constructor() {
     pEv->m_dwCookie = 0;
     pEv->pConnectionPoint = NULL;
     pEv->pTypeInfo = NULL;
-    pEv->ptr_freed = NULL;
     return pEv;
 }
 
@@ -5836,7 +4862,6 @@ void EVENTSINK_Destructor(
     PIEVENTSINKOBJ pEVObj
     ) {
     if(pEVObj != NULL) {
-        *(pEVObj->ptr_freed) = 1;
         free(pEVObj);
     }
 }
@@ -6058,23 +5083,15 @@ ole_event_free(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) {
+	if(pti) OLE_RELEASE(pti);
+	pcp = poleev->pEvent->pConnectionPoint;
+	if(pcp) {
             pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie);
             OLE_RELEASE(pcp);
         }
-        free(poleev);
+        CoFreeUnusedLibraries();
     }
 }
 
@@ -6090,16 +5107,6 @@ fev_s_allocate(klass)
     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;
@@ -6116,21 +5123,21 @@ fev_initialize(argc, argv, self)
     IConnectionPointContainer *pContainer;
     IConnectionPoint *pConnectionPoint;
     IEVENTSINKOBJ *pIEV;
-    DWORD dwCookie = 0;
+    DWORD dwCookie;
     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");
+        rb_raise(rb_eTypeError, "1st parametor 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));
-        }
+	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);
@@ -6139,7 +5146,7 @@ fev_initialize(argc, argv, self)
         hr = find_default_source(ole, &iid, &pTypeInfo);
     }
     if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "interface not found");
+        ole_raise(hr, rb_eRuntimeError, "not found interface");
     }
 
     OLEData_Get_Struct(ole, pole);
@@ -6150,7 +5157,7 @@ fev_initialize(argc, argv, self)
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
         ole_raise(hr, rb_eRuntimeError,
-                  "failed to query IConnectionPointContainer");
+                  "fail to query IConnectionPointContainer");
     }
 
     hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
@@ -6159,7 +5166,7 @@ fev_initialize(argc, argv, self)
     OLE_RELEASE(pContainer);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError, "failed to query IConnectionPoint");
+        ole_raise(hr, rb_eRuntimeError, "fail to query IConnectionPoint");
     }
     pIEV = EVENTSINK_Constructor();
     pIEV->m_iid = iid;
@@ -6177,17 +5184,15 @@ fev_initialize(argc, argv, self)
     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.
+ * WIN32OLE_EVENT.message_loop
+ * ---
+ * Translates and dispatches Windows message.
  */
 static VALUE
 fev_s_msg_loop(klass)
@@ -6199,22 +5204,16 @@ fev_s_msg_loop(klass)
 
 
 static void
-add_event_call_back(obj, event, data)
+add_event_call_back(obj, 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);
+    VALUE ary = rb_ivar_get(obj, id_events);
+    if (NIL_P(ary) || TYPE(ary) != T_ARRAY) {
+        ary = rb_ary_new();
+        rb_ivar_set(obj, id_events, ary);
     }
-    rb_ary_push(events, data);
+    rb_ary_push(ary, data);
 }
 
 static VALUE
@@ -6230,19 +5229,15 @@ ev_on_event(argc, argv, self, is_ary_arg)
         Check_SafeStr(event);
     }
     data = rb_ary_new3(4, rb_block_proc(), event, args, is_ary_arg);
-    add_event_call_back(self, event, data);
+    add_event_call_back(self, 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}
+ * WIN32OLE_EVENT#on_event([event]){...}
+ * ----
+ * defines the callback event.
+ * If argument is omitted, this method defines the callback of all events.
  */
 static VALUE
 fev_on_event(argc, argv, self)
@@ -6254,12 +5249,11 @@ fev_on_event(argc, argv, self)
 }
 
 /*
- *  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.
+ * 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)
@@ -6274,28 +5268,10 @@ fev_on_event_with_outargs(argc, argv, self)
 void
 Init_win32ole()
 {
-    rb_global_variable(&ary_ole_event);
     ary_ole_event = rb_ary_new();
+    rb_global_variable(&ary_ole_event);
     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;
-
-    message_filter.QueryInterface = mf_QueryInterface;
-    message_filter.AddRef = mf_AddRef;
-    message_filter.Release = mf_Release;
-    message_filter.HandleInComingCall = mf_HandleInComingCall;
-    message_filter.RetryRejectedCall = mf_RetryRejectedCall;
-    message_filter.MessagePending = mf_MessagePending;
-
-    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);
@@ -6308,12 +5284,10 @@ Init_win32ole()
     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, "[]", 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);
@@ -6337,17 +5311,9 @@ Init_win32ole()
     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_method(cWIN32OLE, "ole_activex_initialize", fole_activex_initialize, 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));
diff --git a/ext/zlib/MANIFEST b/ext/zlib/MANIFEST
new file mode 100644
index 0000000000..746275d5c8
--- /dev/null
+++ b/ext/zlib/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+extconf.rb
+zlib.c
+doc/zlib.rd
diff --git a/ext/zlib/doc/zlib.rd b/ext/zlib/doc/zlib.rd
index 6a36dc7fed..6adff7f89c 100644
--- a/ext/zlib/doc/zlib.rd
+++ b/ext/zlib/doc/zlib.rd
@@ -465,7 +465,7 @@ to duplicate (clone, dup) itself.
 
 == Zlib::GzipFile
 
-The abstract class for handling a gzip formatted compressed file.
+The abstruct class for handling a gzip formatted compressed file.
 The operations are defined in the subclasses,
 ((<Zlib::GzipReader>)) for reading, and ((<Zlib::GzipWriter>))
 for writing.
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index 53b971b189..bf3349a65d 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -10,7 +10,7 @@ require 'rbconfig'
 dir_config 'zlib'
 
 
-if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
+if %w'z libz zlib'.find {|z| have_library(z, 'deflateReset')} and
     have_header('zlib.h') then
 
   defines = []
@@ -22,7 +22,7 @@ if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
       os_code = 'AMIGA'
     when /\Aos2[\-_]emx\z/ then
       os_code = 'OS2'
-    when /mswin|mingw|bccwin/ then
+    when 'mswin32', 'mingw32', 'bccwin32' then
       # NOTE: cygwin should be regarded as Unix.
       os_code = 'WIN32'
     else
@@ -54,7 +54,12 @@ if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
   message "#{OS_NAMES[os_code]}\n"
   defines << "OS_CODE=#{os_code}"
 
-  $defs.concat(defines.collect{|d|' -D'+d})
+  defines = defines.collect{|d|' -D'+d}.join
+  if $CPPFLAGS then
+    $CPPFLAGS += defines
+  else
+    $CFLAGS += defines
+  end
 
   create_makefile('zlib')
 
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index d4c5028920..80b45ad0c9 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -29,6 +29,7 @@
 #endif
 
 
+
 /*--------- Prototypes --------*/
 
 static NORETURN(void raise_zlib_error _((int, const char *)));
@@ -39,7 +40,6 @@ 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;
@@ -56,14 +56,13 @@ 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_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));
@@ -82,8 +81,7 @@ 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_clone _((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));
@@ -92,7 +90,6 @@ 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));
@@ -123,13 +120,11 @@ 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 VALUE gzfile_finalize _((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*));
@@ -242,21 +237,9 @@ raise_zlib_error(err, msg)
 }
 
 
-/*--- 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;
@@ -299,15 +282,6 @@ do_checksum(argc, argv, func)
     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;
@@ -317,15 +291,6 @@ rb_zlib_adler32(argc, argv, 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;
@@ -335,9 +300,6 @@ rb_zlib_crc32(argc, argv, 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;
@@ -375,13 +337,13 @@ struct zstream {
 #define ZSTREAM_FLAG_READY      0x1
 #define ZSTREAM_FLAG_IN_STREAM  0x2
 #define ZSTREAM_FLAG_FINISHED   0x4
-#define ZSTREAM_FLAG_CLOSING    0x8
+#define ZSTREAM_FLAG_FINALIZE   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)
+#define ZSTREAM_IS_FINALIZE(z) ((z)->flags & ZSTREAM_FLAG_FINALIZE)
 
 /* I think that more better value should be found,
    but I gave up finding it. B) */
@@ -449,7 +411,6 @@ zstream_expand_buffer(z)
 	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;
     }
 
@@ -481,7 +442,6 @@ zstream_expand_buffer_into(z, 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);
@@ -502,7 +462,6 @@ zstream_append_buffer(z, 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;
     }
 
@@ -538,7 +497,6 @@ zstream_detach_buffer(z)
     else {
 	dst = z->buf;
 	rb_str_resize(dst, z->buf_filled);
-	RBASIC(dst)->klass = rb_cString;
     }
 
     z->buf = Qnil;
@@ -560,7 +518,6 @@ zstream_shift_buffer(z, len)
     }
 
     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);
@@ -602,7 +559,6 @@ zstream_append_input(z, src, len)
     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);
@@ -650,13 +606,7 @@ zstream_detach_input(z)
 {
     VALUE dst;
 
-    if (NIL_P(z->input)) {
-	dst = rb_str_new(0, 0);
-    }
-    else {
-	dst = z->input;
-	RBASIC(dst)->klass = rb_cString;
-    }
+    dst = NIL_P(z->input) ? rb_str_new(0, 0) : z->input;
     z->input = Qnil;
     return dst;
 }
@@ -668,7 +618,7 @@ zstream_reset(z)
     int err;
 
     err = z->func->reset(&z->stream);
-    if (err != Z_OK) {
+    if (err != Z_OK && !ZSTREAM_IS_FINALIZE(z)) {
 	raise_zlib_error(err, z->stream.msg);
     }
     z->flags = ZSTREAM_FLAG_READY;
@@ -679,28 +629,31 @@ zstream_reset(z)
     zstream_reset_input(z);
 }
 
-static VALUE
+static void
 zstream_end(z)
     struct zstream *z;
 {
     int err;
 
-    if (!ZSTREAM_IS_READY(z)) {
-	rb_warning("attempt to close uninitialized zstream; ignored.");
-	return Qnil;
+    if (!ZSTREAM_IS_READY(z) && !ZSTREAM_IS_FINALIZE(z)) {
+	if (RTEST(ruby_debug)) {
+	    rb_warning("attempt to close uninitialized zstream; ignored.");
+	}
+	return;
     }
     if (z->flags & ZSTREAM_FLAG_IN_STREAM) {
-	rb_warning("attempt to close unfinished zstream; reset forced.");
+	if (RTEST(ruby_debug)) {
+	    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) {
+    if (err != Z_OK && !ZSTREAM_IS_FINALIZE(z)) {
 	raise_zlib_error(err, z->stream.msg);
     }
     z->flags = 0;
-    return Qnil;
 }
 
 static void
@@ -712,20 +665,15 @@ zstream_run(z, src, len, flush)
 {
     uInt n;
     int err;
-    volatile VALUE guard;
 
-    if (NIL_P(z->input) && len == 0) {
-	z->stream.next_in = "";
-	z->stream.avail_in = 0;
+    if (NIL_P(z->input)) {
+	z->stream.next_in = src;
+	z->stream.avail_in = len;
     }
     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) {
@@ -765,7 +713,6 @@ zstream_run(z, src, len, flush)
     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 */
     }
 }
 
@@ -820,23 +767,11 @@ zstream_mark(z)
 }
 
 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);
-    }
+    z->flags |= ZSTREAM_FLAG_FINALIZE;
+    zstream_end(z);
     free(z);
 }
 
@@ -871,73 +806,9 @@ get_zstream(obj)
 }
 
 
-/* ------------------------------------------------------------------------- */
 
-/*
- * 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?
- */
+/*-------- class Zlib::ZStream ---------*/
 
-/*
- * Closes the stream. All operations on the closed stream will raise an
- * exception.
- */
 static VALUE
 rb_zstream_end(obj)
     VALUE obj;
@@ -946,10 +817,6 @@ rb_zstream_end(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;
@@ -958,10 +825,6 @@ rb_zstream_reset(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;
@@ -976,9 +839,6 @@ rb_zstream_finish(obj)
     return dst;
 }
 
-/*
- * Flushes input buffer and returns all data in that buffer.
- */
 static VALUE
 rb_zstream_flush_next_in(obj)
     VALUE obj;
@@ -992,9 +852,6 @@ rb_zstream_flush_next_in(obj)
     return dst;
 }
 
-/*
- * Flushes output buffer and returns all data in that buffer.
- */
 static VALUE
 rb_zstream_flush_next_out(obj)
     VALUE obj;
@@ -1008,10 +865,6 @@ rb_zstream_flush_next_out(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;
@@ -1021,12 +874,6 @@ rb_zstream_avail_out(obj)
     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;
@@ -1038,9 +885,6 @@ rb_zstream_set_avail_out(obj, size)
     return size;
 }
 
-/*
- * Returns bytes of data in the input buffer. Normally, returns 0.
- */
 static VALUE
 rb_zstream_avail_in(obj)
     VALUE obj;
@@ -1050,9 +894,6 @@ rb_zstream_avail_in(obj)
     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;
@@ -1060,9 +901,6 @@ rb_zstream_total_in(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;
@@ -1070,11 +908,6 @@ rb_zstream_total_out(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;
@@ -1082,9 +915,6 @@ rb_zstream_data_type(obj)
     return INT2FIX(get_zstream(obj)->stream.data_type);
 }
 
-/*
- * Returns the adler-32 checksum.
- */
 static VALUE
 rb_zstream_adler(obj)
     VALUE obj;
@@ -1092,9 +922,6 @@ rb_zstream_adler(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;
@@ -1102,9 +929,6 @@ rb_zstream_finished_p(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;
@@ -1115,14 +939,8 @@ rb_zstream_closed_p(obj)
 }
 
 
-/* ------------------------------------------------------------------------- */
 
-/*
- * Document-class: Zlib::Deflate
- *
- * Zlib::Deflate is the class for compressing data.  See Zlib::Stream for more
- * information.
- */
+/*-------- class Zlib::Deflate --------*/
 
 #define FIXNUMARG(val, ifnil) \
     (NIL_P((val)) ? (ifnil) \
@@ -1139,18 +957,9 @@ static VALUE
 rb_deflate_s_allocate(klass)
     VALUE klass;
 {
-    return zstream_deflate_new(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;
@@ -1175,86 +984,52 @@ rb_deflate_initialize(argc, argv, obj)
     return obj;
 }
 
-/*
- * Duplicates the deflate stream.
- */
 static VALUE
-rb_deflate_init_copy(self, orig)
-    VALUE self, orig;
+rb_deflate_clone(obj)
+    VALUE obj;
 {
-    struct zstream *z1, *z2;
+    struct zstream *z = get_zstream(obj);
+    struct zstream *z2;
+    VALUE clone;
     int err;
 
-    Data_Get_Struct(self, struct zstream, z1);
-    z2 = get_zstream(orig);
+    clone = zstream_deflate_new(rb_class_of(obj));
+    Data_Get_Struct(clone, struct zstream, z2);
 
-    err = deflateCopy(&z1->stream, &z2->stream);
+    err = deflateCopy(&z2->stream, &z->stream);
     if (err != Z_OK) {
 	raise_zlib_error(err, 0);
     }
-    z1->input = NIL_P(z2->input) ? Qnil : rb_str_dup(z2->input);
-    z1->buf   = NIL_P(z2->buf)   ? Qnil : rb_str_dup(z2->buf);
-    z1->buf_filled = z2->buf_filled;
-    z1->flags = z2->flags;
 
-    return self;
+    z2->flags = z->flags;
+    CLONESETUP(clone, obj);
+    OBJ_INFECT(clone, obj);
+    return clone;
 }
 
 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;
+    VALUE src, level, dst;
+    int err;
 
     rb_scan_args(argc, argv, "11", &src, &level);
 
-    lev = ARG_LEVEL(level);
-    StringValue(src);
     zstream_init_deflate(&z);
-    err = deflateInit(&z.stream, lev);
+    err = deflateInit(&z.stream, ARG_LEVEL(level));
     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);
+    StringValue(src);
+    zstream_run(&z, RSTRING(src)->ptr, RSTRING(src)->len, Z_FINISH);
+    dst = zstream_detach_buffer(&z);
+    zstream_end(&z);
 
     OBJ_INFECT(dst, src);
     return dst;
@@ -1276,20 +1051,6 @@ do_deflate(z, src, 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;
@@ -1308,13 +1069,6 @@ rb_deflate_deflate(argc, argv, 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;
@@ -1324,15 +1078,6 @@ rb_deflate_addstr(obj, src)
     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;
@@ -1354,15 +1099,6 @@ rb_deflate_flush(argc, argv, 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;
@@ -1376,7 +1112,9 @@ rb_deflate_params(obj, v_level, v_strategy)
 
     err = deflateParams(&z->stream, level, strategy);
     while (err == Z_BUF_ERROR) {
-	rb_warning("deflateParams() returned Z_BUF_ERROR");
+	if (RTEST(ruby_debug)) {
+	    rb_warning("deflateParams() returned Z_BUF_ERROR");
+	}
 	zstream_expand_buffer(z);
 	err = deflateParams(&z->stream, level, strategy);
     }
@@ -1387,15 +1125,6 @@ rb_deflate_params(obj, v_level, v_strategy)
     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;
@@ -1416,17 +1145,8 @@ rb_deflate_set_dictionary(obj, 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.
- */
-
 
+/*-------- class Zlib::Inflate --------*/
 
 static VALUE
 rb_inflate_s_allocate(klass)
@@ -1435,14 +1155,6 @@ rb_inflate_s_allocate(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;
@@ -1466,43 +1178,13 @@ rb_inflate_initialize(argc, argv, 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];
+    VALUE dst;
     int err;
 
-    StringValue(src);
     zstream_init_inflate(&z);
     err = inflateInit(&z.stream);
     if (err != Z_OK) {
@@ -1510,9 +1192,11 @@ rb_inflate_s_inflate(obj, src)
     }
     ZSTREAM_READY(&z);
 
-    args[0] = (VALUE)&z;
-    args[1] = src;
-    dst = rb_ensure(inflate_run, (VALUE)args, zstream_end, (VALUE)&z);
+    StringValue(src);
+    zstream_run(&z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
+    zstream_run(&z, "", 0, Z_FINISH);  /* for checking errors */
+    dst = zstream_detach_buffer(&z);
+    zstream_end(&z);
 
     OBJ_INFECT(dst, src);
     return dst;
@@ -1533,20 +1217,6 @@ do_inflate(z, src)
     }
 }
 
-/*
- * 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;
@@ -1578,13 +1248,6 @@ rb_inflate_inflate(obj, src)
     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;
@@ -1609,14 +1272,6 @@ rb_inflate_addstr(obj, src)
     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;
@@ -1628,13 +1283,6 @@ rb_inflate_sync(obj, 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;
@@ -1652,12 +1300,6 @@ rb_inflate_sync_point_p(obj)
     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;
@@ -1768,13 +1410,9 @@ 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);
+    gz->z.flags |= ZSTREAM_FLAG_FINALIZE;
+    if (ZSTREAM_IS_READY(&gz->z)) {
+	gz->end(gz);
     }
     free(gz);
 }
@@ -1823,7 +1461,6 @@ gzfile_close(gz, closeflag)
     int closeflag;
 {
     VALUE io = gz->io;
-
     gz->end(gz);
     gz->io = Qnil;
     gz->orig_name = Qnil;
@@ -1917,7 +1554,7 @@ gzfile_get32(src)
     n  = *(src++) & 0xff;
     n |= (*(src++) & 0xff) << 8;
     n |= (*(src++) & 0xff) << 16;
-    n |= (*(src++) & 0xffU) << 24;
+    n |= (*(src++) & 0xff) << 24;
     return n;
 }
 
@@ -2113,7 +1750,7 @@ static long
 gzfile_read_more(gz)
     struct gzfile *gz;
 {
-    volatile VALUE str;
+    VALUE str;
 
     while (!ZSTREAM_IS_FINISHED(&gz->z)) {
 	str = gzfile_read_raw(gz);
@@ -2132,21 +1769,6 @@ gzfile_read_more(gz)
     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;
@@ -2154,10 +1776,7 @@ gzfile_read(gz, len)
 {
     VALUE dst;
 
-    if (len < 0)
-        rb_raise(rb_eArgError, "negative length %d given", len);
-    if (len == 0)
-	return rb_str_new(0, 0);
+    if (len <= 0) return Qnil;
     while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
 	gzfile_read_more(gz);
     }
@@ -2169,7 +1788,13 @@ gzfile_read(gz, len)
     }
 
     dst = zstream_shift_buffer(&gz->z, len);
-    gzfile_calc_crc(gz, dst);
+    if (RSTRING(dst)->len <= gz->ungetc) {
+	gz->ungetc -= RSTRING(dst)->len;
+    }
+    else {
+	gz->crc = crc32(gz->crc, RSTRING(dst)->ptr + gz->ungetc,
+			RSTRING(dst)->len - gz->ungetc);
+    }
 
     OBJ_TAINT(dst);  /* for safe */
     return dst;
@@ -2192,7 +1817,13 @@ gzfile_read_all(gz)
     }
 
     dst = zstream_detach_buffer(&gz->z);
-    gzfile_calc_crc(gz, dst);
+    if (RSTRING(dst)->len <= gz->ungetc) {
+	gz->ungetc -= RSTRING(dst)->len;
+    }
+    else {
+	gz->crc = crc32(gz->crc, RSTRING(dst)->ptr + gz->ungetc,
+			RSTRING(dst)->len - gz->ungetc);
+    }
 
     OBJ_TAINT(dst);  /* for safe */
     return dst;
@@ -2208,19 +1839,11 @@ gzfile_ungetc(gz, c)
 }
 
 static VALUE
-gzfile_writer_end_run(arg)
-    VALUE arg;
+gzfile_finalize(obj)
+    VALUE obj;
 {
-    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);
+    struct gzfile *gz = (struct gzfile *)obj;
     gzfile_write_raw(gz);
-
     return Qnil;
 }
 
@@ -2228,34 +1851,44 @@ static void
 gzfile_writer_end(gz)
     struct gzfile *gz;
 {
-    if (ZSTREAM_IS_CLOSING(&gz->z)) return;
-    gz->z.flags |= ZSTREAM_FLAG_CLOSING;
+    int aborted;
 
-    rb_ensure(gzfile_writer_end_run, (VALUE)gz, zstream_end, (VALUE)&gz->z);
-}
+    if (!(gz->z.flags & GZFILE_FLAG_HEADER_FINISHED)) {
+	gzfile_make_header(gz);
+    }
 
-static VALUE
-gzfile_reader_end_run(arg)
-    VALUE arg;
-{
-    struct gzfile *gz = (struct gzfile *)arg;
+    zstream_run(&gz->z, "", 0, Z_FINISH);
+    gzfile_make_footer(gz);
 
-    if (GZFILE_IS_FINISHED(gz)
-	&& !(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	gzfile_check_footer(gz);
+    if (ZSTREAM_IS_FINALIZE(&gz->z)) {
+	rb_warn("Zlib::GzipWriter object must be closed explicitly.");
+	if (OBJ_IS_FREED(gz->io)) {
+	    aborted = 1;
+	}
+	else {
+	    rb_protect(gzfile_finalize, (VALUE)gz, &aborted);
+	}
+	if (aborted) {
+	    rb_warn("gzip footer is not written; broken gzip file");
+	}
+	zstream_end(&gz->z);
+	return;
     }
-
-    return Qnil;
+    gzfile_write_raw(gz);
+    zstream_end(&gz->z);
 }
 
 static void
 gzfile_reader_end(gz)
     struct gzfile *gz;
 {
-    if (ZSTREAM_IS_CLOSING(&gz->z)) return;
-    gz->z.flags |= ZSTREAM_FLAG_CLOSING;
+    if (GZFILE_IS_FINISHED(gz)
+	&& !ZSTREAM_IS_FINALIZE(&gz->z)
+	&& !(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
+	gzfile_check_footer(gz);
+    }
 
-    rb_ensure(gzfile_reader_end_run, (VALUE)gz, zstream_end, (VALUE)&gz->z);
+    zstream_end(&gz->z);
 }
 
 static void
@@ -2305,18 +1938,8 @@ get_gzfile(obj)
 }
 
 
-/* ------------------------------------------------------------------------- */
-
-/*
- * 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.
- */
 
+/*-------- class Zlib::GzipFile --------*/
 
 static VALUE
 gzfile_ensure_close(obj)
@@ -2331,9 +1954,6 @@ gzfile_ensure_close(obj)
     return Qnil;
 }
 
-/*
- * See Zlib::GzipReader#wrap and Zlib::GzipWriter#wrap.
- */
 static VALUE
 rb_gzfile_s_wrap(argc, argv, klass)
     int argc;
@@ -2350,9 +1970,6 @@ rb_gzfile_s_wrap(argc, argv, klass)
     }
 }
 
-/*
- * See Zlib::GzipReader#open and Zlib::GzipWriter#open.
- */
 static VALUE
 gzfile_s_open(argc, argv, klass, mode)
     int argc;
@@ -2373,9 +1990,6 @@ gzfile_s_open(argc, argv, klass, mode)
     return rb_gzfile_s_wrap(argc, argv, klass);
 }
 
-/*
- * Same as IO.
- */
 static VALUE
 rb_gzfile_to_io(obj)
     VALUE obj;
@@ -2383,9 +1997,6 @@ rb_gzfile_to_io(obj)
     return get_gzfile(obj)->io;
 }
 
-/*
- * Returns CRC value of the uncompressed data.
- */
 static VALUE
 rb_gzfile_crc(obj)
     VALUE obj;
@@ -2393,9 +2004,6 @@ rb_gzfile_crc(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;
@@ -2403,9 +2011,6 @@ rb_gzfile_mtime(obj)
     return rb_time_new(get_gzfile(obj)->mtime, (time_t)0);
 }
 
-/*
- * Returns compression level.
- */
 static VALUE
 rb_gzfile_level(obj)
     VALUE obj;
@@ -2413,9 +2018,6 @@ rb_gzfile_level(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;
@@ -2423,10 +2025,6 @@ rb_gzfile_os_code(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;
@@ -2439,10 +2037,6 @@ rb_gzfile_orig_name(obj)
     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;
@@ -2455,9 +2049,6 @@ rb_gzfile_comment(obj)
     return str;
 }
 
-/*
- * ???
- */
 static VALUE
 rb_gzfile_lineno(obj)
     VALUE obj;
@@ -2465,9 +2056,6 @@ rb_gzfile_lineno(obj)
     return INT2NUM(get_gzfile(obj)->lineno);
 }
 
-/*
- * ???
- */
 static VALUE
 rb_gzfile_set_lineno(obj, lineno)
     VALUE obj, lineno;
@@ -2477,9 +2065,6 @@ rb_gzfile_set_lineno(obj, lineno)
     return lineno;
 }
 
-/*
- * ???
- */
 static VALUE
 rb_gzfile_set_mtime(obj, mtime)
     VALUE obj, mtime;
@@ -2501,9 +2086,6 @@ rb_gzfile_set_mtime(obj, mtime)
     return mtime;
 }
 
-/*
- * ???
- */
 static VALUE
 rb_gzfile_set_orig_name(obj, str)
     VALUE obj, str;
@@ -2524,9 +2106,6 @@ rb_gzfile_set_orig_name(obj, str)
     return str;
 }
 
-/*
- * ???
- */
 static VALUE
 rb_gzfile_set_comment(obj, str)
     VALUE obj, str;
@@ -2547,10 +2126,6 @@ rb_gzfile_set_comment(obj, str)
     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;
@@ -2563,11 +2138,6 @@ rb_gzfile_close(obj)
     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;
@@ -2580,9 +2150,6 @@ rb_gzfile_finish(obj)
     return io;
 }
 
-/*
- * Same as IO.
- */
 static VALUE
 rb_gzfile_closed_p(obj)
     VALUE obj;
@@ -2592,9 +2159,6 @@ rb_gzfile_closed_p(obj)
     return NIL_P(gz->io) ? Qtrue : Qfalse;
 }
 
-/*
- * ???
- */
 static VALUE
 rb_gzfile_eof_p(obj)
     VALUE obj;
@@ -2603,9 +2167,6 @@ rb_gzfile_eof_p(obj)
     return GZFILE_IS_FINISHED(gz) ? Qtrue : Qfalse;
 }
 
-/*
- * Same as IO.
- */
 static VALUE
 rb_gzfile_sync(obj)
     VALUE obj;
@@ -2613,13 +2174,6 @@ rb_gzfile_sync(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;
@@ -2635,9 +2189,6 @@ rb_gzfile_set_sync(obj, mode)
     return mode;
 }
 
-/*
- * ???
- */
 static VALUE
 rb_gzfile_total_in(obj)
     VALUE obj;
@@ -2645,9 +2196,6 @@ rb_gzfile_total_in(obj)
     return rb_uint2inum(get_gzfile(obj)->z.stream.total_in);
 }
 
-/*
- * ???
- */
 static VALUE
 rb_gzfile_total_out(obj)
     VALUE obj;
@@ -2657,34 +2205,8 @@ rb_gzfile_total_out(obj)
 }
 
 
-/* ------------------------------------------------------------------------- */
 
-/*
- * 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.
- */
+/*-------- class Zlib::GzipWriter --------*/
 
 static VALUE
 rb_gzwriter_s_allocate(klass)
@@ -2693,13 +2215,6 @@ rb_gzwriter_s_allocate(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;
@@ -2709,14 +2224,6 @@ rb_gzwriter_s_open(argc, argv, 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;
@@ -2743,13 +2250,6 @@ rb_gzwriter_initialize(argc, argv, obj)
     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;
@@ -2774,9 +2274,6 @@ rb_gzwriter_flush(argc, argv, obj)
     return obj;
 }
 
-/*
- * Same as IO.
- */
 static VALUE
 rb_gzwriter_write(obj, str)
     VALUE obj, str;
@@ -2790,9 +2287,6 @@ rb_gzwriter_write(obj, str)
     return INT2FIX(RSTRING(str)->len);
 }
 
-/*
- * Same as IO.
- */
 static VALUE
 rb_gzwriter_putc(obj, ch)
     VALUE obj, ch;
@@ -2804,86 +2298,13 @@ rb_gzwriter_putc(obj, ch)
     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.
- */
+/*-------- class Zlib::GzipReader --------*/
 
 static VALUE
 rb_gzreader_s_allocate(klass)
@@ -2892,13 +2313,6 @@ rb_gzreader_s_allocate(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;
@@ -2908,16 +2322,6 @@ rb_gzreader_s_open(argc, argv, 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;
@@ -2939,10 +2343,6 @@ rb_gzreader_initialize(obj, io)
     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;
@@ -2952,10 +2352,6 @@ rb_gzreader_rewind(obj)
     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;
@@ -2965,9 +2361,6 @@ rb_gzreader_unused(obj)
     return gzfile_reader_get_unused(gz);
 }
 
-/*
- * See Zlib::GzipReader documentation for a description.
- */
 static VALUE
 rb_gzreader_read(argc, argv, obj)
     int argc;
@@ -2990,9 +2383,6 @@ rb_gzreader_read(argc, argv, obj)
     return gzfile_read(gz, len);
 }
 
-/*
- * See Zlib::GzipReader documentation for a description.
- */
 static VALUE
 rb_gzreader_getc(obj)
     VALUE obj;
@@ -3007,9 +2397,6 @@ rb_gzreader_getc(obj)
     return dst;
 }
 
-/*
- * See Zlib::GzipReader documentation for a description.
- */
 static VALUE
 rb_gzreader_readchar(obj)
     VALUE obj;
@@ -3017,14 +2404,11 @@ rb_gzreader_readchar(obj)
     VALUE dst;
     dst = rb_gzreader_getc(obj);
     if (NIL_P(dst)) {
-	rb_raise(rb_eEOFError, "end of file reached");
+	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;
@@ -3036,9 +2420,6 @@ rb_gzreader_each_byte(obj)
     return Qnil;
 }
 
-/*
- * See Zlib::GzipReader documentation for a description.
- */
 static VALUE
 rb_gzreader_ungetc(obj, ch)
     VALUE obj, ch;
@@ -3066,7 +2447,8 @@ gzreader_skip_linebreaks(gz)
     while (n++, *(p++) == '\n') {
 	if (n >= gz->z.buf_filled) {
 	    str = zstream_detach_buffer(&gz->z);
-	    gzfile_calc_crc(gz, str);
+	    gz->crc = crc32(gz->crc, RSTRING(str)->ptr,
+			    RSTRING(str)->len);
 	    while (gz->z.buf_filled == 0) {
 		if (GZFILE_IS_FINISHED(gz)) return;
 		gzfile_read_more(gz);
@@ -3077,17 +2459,7 @@ gzreader_skip_linebreaks(gz)
     }
 
     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");
+    gz->crc = crc32(gz->crc, RSTRING(str)->ptr, RSTRING(str)->len);
 }
 
 static VALUE
@@ -3097,9 +2469,8 @@ gzreader_gets(argc, argv, obj)
     VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
-    volatile VALUE rs;
-    VALUE dst;
-    char *rsptr, *p, *res;
+    VALUE rs, dst;
+    char *rsptr, *p;
     long rslen, n;
     int rspara;
 
@@ -3115,9 +2486,7 @@ gzreader_gets(argc, argv, obj)
 
     if (NIL_P(rs)) {
 	dst = gzfile_read_all(gz);
-	if (RSTRING(dst)->len != 0) gz->lineno++;
-	else
-		return Qnil;
+	if (!NIL_P(dst)) gz->lineno++;
 	return dst;
     }
 
@@ -3143,24 +2512,16 @@ gzreader_gets(argc, argv, obj)
 	gzfile_read_more(gz);
     }
 
-    p = RSTRING(gz->z.buf)->ptr;
     n = rslen;
+    p = RSTRING(gz->z.buf)->ptr;
     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++;
-	}
+	if (memcmp(p, rsptr, rslen) == 0) break;
+	p++, n++;
     }
 
     gz->lineno++;
@@ -3172,9 +2533,6 @@ gzreader_gets(argc, argv, obj)
     return dst;
 }
 
-/*
- * See Zlib::GzipReader documentation for a description.
- */
 static VALUE
 rb_gzreader_gets(argc, argv, obj)
     int argc;
@@ -3189,9 +2547,6 @@ rb_gzreader_gets(argc, argv, obj)
     return dst;
 }
 
-/*
- * See Zlib::GzipReader documentation for a description.
- */
 static VALUE
 rb_gzreader_readline(argc, argv, obj)
     int argc;
@@ -3201,14 +2556,11 @@ rb_gzreader_readline(argc, argv, obj)
     VALUE dst;
     dst = rb_gzreader_gets(argc, argv, obj);
     if (NIL_P(dst)) {
-	rb_raise(rb_eEOFError, "end of file reached");
+	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;
@@ -3222,9 +2574,6 @@ rb_gzreader_each(argc, argv, obj)
     return obj;
 }
 
-/*
- * See Zlib::GzipReader documentation for a description.
- */
 static VALUE
 rb_gzreader_readlines(argc, argv, obj)
     int argc;
@@ -3242,86 +2591,6 @@ rb_gzreader_readlines(argc, argv, obj)
 #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;
@@ -3351,7 +2620,7 @@ void Init_zlib()
     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_out=", rb_zstream_set_avail_out, 0);
     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);
@@ -3376,7 +2645,7 @@ void Init_zlib()
     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, 1);
+    rb_define_method(cDeflate, "clone", rb_deflate_clone, 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);
@@ -3503,52 +2772,3 @@ void Init_zlib()
 
 #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/file.c b/file.c
index ca80795817..1750eefff9 100644
--- a/file.c
+++ b/file.c
@@ -15,10 +15,6 @@
 #ifdef _WIN32
 #include "missing/file.h"
 #endif
-#ifdef __CYGWIN__
-#include <windows.h>
-#include <sys/cygwin.h>
-#endif
 
 #include "ruby.h"
 #include "rubyio.h"
@@ -68,48 +64,17 @@ char *strrchr _((const char*,const char));
 #include <sys/mkdev.h>
 #endif
 
-#if !defined HAVE_LSTAT && !defined lstat
-#define lstat stat
-#endif
-#if !HAVE_FSEEKO && !defined(fseeko)
-# define fseeko  fseek
+#ifndef HAVE_LSTAT
+#define lstat(path,st) stat(path,st)
 #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 VALUE rb_cStat;
 
-static long apply2files _((void (*)(const char *, void *), VALUE, void *));
 static long
 apply2files(func, vargs, arg)
-    void (*func)_((const char *, void *));
+    void (*func)();
     VALUE vargs;
     void *arg;
 {
@@ -128,7 +93,7 @@ apply2files(func, vargs, arg)
 
 /*
  *  call-seq:
- *     file.path -> filename
+ *     file.path -> file_ame
  *  
  *  Returns the pathname used to create <i>file</i> as a string. Does
  *  not normalize the name.
@@ -142,10 +107,9 @@ static VALUE
 rb_file_path(obj)
     VALUE obj;
 {
-    rb_io_t *fptr;
+    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);
 }
@@ -211,20 +175,6 @@ rb_stat_cmp(self, other)
     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
@@ -242,52 +192,6 @@ rb_stat_dev(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:
@@ -577,7 +481,7 @@ rb_stat_ctime(self)
  * call-seq:
  *   stat.inspect  =>  string
  *
- * Produce a nicely formatted description of <i>stat</i>.
+ * Produce a nicely formatted descriptin of <i>stat</i>.
  *
  *   File.stat("/etc/passwd").inspect
  *      #=> "#<File::Stat dev=0xe000005, ino=1078078, mode=0100644, 
@@ -593,23 +497,23 @@ rb_stat_inspect(self)
 {
     VALUE str;
     int i;
-    static const struct {
-	const char *name;
-	VALUE (*func)_((VALUE));
+    static struct {
+        char *name;
+        VALUE (*func)();
     } 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},
+        {"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("#<");
@@ -656,7 +560,7 @@ rb_stat(file, st)
 
     tmp = rb_check_convert_type(file, T_FILE, "IO", "to_io");
     if (!NIL_P(tmp)) {
-	rb_io_t *fptr;
+	OpenFile *fptr;
 
 	rb_secure(2);
 	GetOpenFile(tmp, fptr);
@@ -666,40 +570,6 @@ rb_stat(file, st)
     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)) {
-	rb_io_t *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
@@ -743,7 +613,7 @@ static VALUE
 rb_io_stat(obj)
     VALUE obj;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
@@ -804,7 +674,7 @@ rb_file_lstat(obj)
     VALUE obj;
 {
 #ifdef HAVE_LSTAT
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct stat st;
 
     rb_secure(2);
@@ -819,13 +689,12 @@ rb_file_lstat(obj)
 #endif
 }
 
-#ifndef HAVE_GROUP_MEMBER
 static int
 group_member(gid)
     GETGROUPS_T gid;
 {
 #ifndef _WIN32
-    if (getgid() == gid || getegid() == gid)
+    if (getgid() ==  gid)
 	return Qtrue;
 
 # ifdef HAVE_GETGROUPS
@@ -849,23 +718,17 @@ group_member(gid)
 #endif
     return Qfalse;
 }
-#endif
 
 #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
+#if defined(S_IXGRP) && !defined(_WIN32) && !defined(__CYGWIN__)
     struct stat st;
     int euid;
 
@@ -888,20 +751,16 @@ eaccess(path, mode)
 
     if (st.st_uid == euid)        /* owner */
 	mode <<= 6;
-    else if (group_member(st.st_gid))
+    else if (getegid() == st.st_gid || group_member(st.st_gid))
 	mode <<= 3;
 
     if ((st.st_mode & mode) == mode) return 0;
 
     return -1;
 #else
-# if defined(_MSC_VER) || defined(__MINGW32__)
-    mode &= ~1;
-# endif
     return access(path, mode);
 #endif
 }
-#endif
 
 
 /*
@@ -967,7 +826,7 @@ test_p(obj, fname)
 
 /*
  * call-seq:
- *   File.symlink?(file_name)   =>  true or false
+ *   File.pipe?(file_name)   =>  true or false
  *
  * Returns <code>true</code> if the named file is a symbolic link.
  */
@@ -1011,7 +870,7 @@ test_l(obj, fname)
 
 /*
  * call-seq:
- *   File.socket?(file_name)   =>  true or false
+ *   File.pipe?(file_name)   =>  true or false
  *
  * Returns <code>true</code> if the named file is a socket.
  */
@@ -1054,7 +913,7 @@ test_S(obj, fname)
 
 /*
  * call-seq:
- *   File.blockdev?(file_name)   =>  true or false
+ *   File.pipe?(file_name)   =>  true or false
  *
  * Returns <code>true</code> if the named file is a block device.
  */
@@ -1083,7 +942,7 @@ test_b(obj, fname)
 
 /*
  * call-seq:
- *   File.chardev?(file_name)   =>  true or false
+ *   File.pipe?(file_name)   =>  true or false
  *
  * Returns <code>true</code> if the named file is a character device.
  */
@@ -1269,10 +1128,10 @@ test_z(obj, fname)
 
 /*
  * call-seq:
- *    File.size?(file_name)   => Integer or nil
+ *    File.file?(file_name)   => integer  or  nil
  *
- * Returns +nil+ if +file_name+ doesn't exist or has zero size, the size of the
- * file otherwise.
+ * Returns <code>nil</code> if <code>file_name</code> doesn't
+ * exist or has zero size, the size of the file otherwise.
  */
 
 static VALUE
@@ -1334,7 +1193,7 @@ test_grpowned(obj, fname)
     struct stat st;
 
     if (rb_stat(fname, &st) < 0) return Qfalse;
-    if (group_member(st.st_gid)) return Qtrue;
+    if (st.st_gid == getegid()) return Qtrue;
 #endif
     return Qfalse;
 }
@@ -1356,9 +1215,9 @@ check3rdbyte(fname, mode)
 
 /*
  * call-seq:
- *   File.setuid?(file_name)   =>  true or false
+ *   File.pipe?(file_name)   =>  true or false
  *
- * Returns <code>true</code> if the named file has the setuid bit set.
+ * Returns <code>true</code> if the named file is a has the setuid bit set.
  */
 
 static VALUE
@@ -1374,9 +1233,9 @@ test_suid(obj, fname)
 
 /*
  * call-seq:
- *   File.setgid?(file_name)   =>  true or false
+ *   File.pipe?(file_name)   =>  true or false
  *
- * Returns <code>true</code> if the named file has the setgid bit set.
+ * Returns <code>true</code> if the named file is a has the setgid bit set.
  */
 
 static VALUE
@@ -1392,9 +1251,9 @@ test_sgid(obj, fname)
 
 /*
  * call-seq:
- *   File.sticky?(file_name)   =>  true or false
+ *   File.pipe?(file_name)   =>  true or false
  *
- * Returns <code>true</code> if the named file has the sticky bit set.
+ * Returns <code>true</code> if the named file is a has the sticky bit set.
  */
 
 static VALUE
@@ -1410,71 +1269,6 @@ test_sticky(obj, fname)
 
 /*
  * 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>.
@@ -1495,7 +1289,7 @@ static VALUE
 rb_file_ftype(st)
     struct stat *st;
 {
-    const char *t;
+    char *t;
 
     if (S_ISREG(st->st_mode)) {
 	t = "file";
@@ -1598,7 +1392,7 @@ static VALUE
 rb_file_atime(obj)
     VALUE obj;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
@@ -1643,7 +1437,7 @@ static VALUE
 rb_file_mtime(obj)
     VALUE obj;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
@@ -1691,7 +1485,7 @@ static VALUE
 rb_file_ctime(obj)
     VALUE obj;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
@@ -1701,13 +1495,12 @@ rb_file_ctime(obj)
     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;
+    int mode;
 {
-    if (chmod(path, *(int *)mode) < 0)
+    if (chmod(path, mode) < 0)
 	rb_sys_fail(path);
 }
 
@@ -1738,7 +1531,7 @@ rb_file_s_chmod(argc, argv)
     rb_scan_args(argc, argv, "1*", &vmode, &rest);
     mode = NUM2INT(vmode);
 
-    n = apply2files(chmod_internal, rest, &mode);
+    n = apply2files(chmod_internal, rest, (void *)(long)mode);
     return LONG2FIX(n);
 }
 
@@ -1759,7 +1552,7 @@ static VALUE
 rb_file_chmod(obj, vmode)
     VALUE obj, vmode;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int mode;
 
     rb_secure(2);
@@ -1779,13 +1572,12 @@ rb_file_chmod(obj, vmode)
 }
 
 #if defined(HAVE_LCHMOD)
-static void lchmod_internal _((const char *, void *));
 static void
 lchmod_internal(path, mode)
     const char *path;
-    void *mode;
+    int mode;
 {
-    if (lchmod(path, (int)(VALUE)mode) < 0)
+    if (lchmod(path, mode) < 0)
 	rb_sys_fail(path);
 }
 
@@ -1806,7 +1598,8 @@ rb_file_s_lchmod(argc, argv)
 {
     VALUE vmode;
     VALUE rest;
-    long mode, n;
+    int mode;
+    long n;
 
     rb_secure(2);
     rb_scan_args(argc, argv, "1*", &vmode, &rest);
@@ -1830,13 +1623,11 @@ struct chown_args {
     int owner, group;
 };
 
-static void chown_internal _((const char *, void *));
 static void
-chown_internal(path, argp)
+chown_internal(path, args)
     const char *path;
-    void *argp;
+    struct chown_args *args;
 {
-    struct chown_args *args = (struct chown_args *)argp;
     if (chown(path, args->owner, args->group) < 0)
 	rb_sys_fail(path);
 }
@@ -1903,19 +1694,16 @@ static VALUE
 rb_file_chown(obj, owner, group)
     VALUE obj, owner, group;
 {
-    rb_io_t *fptr;
-    int o, g;
+    OpenFile *fptr;
 
     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)
+    if (chown(fptr->path, NUM2INT(owner), NUM2INT(group)) == -1)
 	rb_sys_fail(fptr->path);
 #else
-    if (fchown(fileno(fptr->f), o, g) == -1)
+    if (fchown(fileno(fptr->f), NUM2INT(owner), NUM2INT(group)) == -1)
 	rb_sys_fail(fptr->path);
 #endif
 
@@ -1923,13 +1711,11 @@ rb_file_chown(obj, owner, group)
 }
 
 #if defined(HAVE_LCHOWN) && !defined(__CHECKER__)
-static void lchown_internal _((const char *, void *));
 static void
-lchown_internal(path, argp)
+lchown_internal(path, args)
     const char *path;
-    void *argp;
+    struct chown_args *args;
 {
-    struct chown_args *args = (struct chown_args *)argp;
     if (lchown(path, args->owner, args->group) < 0)
 	rb_sys_fail(path);
 }
@@ -1985,16 +1771,13 @@ rb_file_s_lchown(argc, argv)
 
 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;
+utime_internal(path, tvp)
+    char *path;
+    struct timeval tvp[];
 {
-    struct timeval *tvp = arg;
     if (utimes(path, tvp) < 0)
 	rb_sys_fail(path);
 }
@@ -2014,17 +1797,13 @@ rb_file_s_utime(argc, argv)
     VALUE *argv;
 {
     VALUE atime, mtime, rest;
-    struct timeval tvs[2], *tvp = NULL;
+    struct timeval tvp[2];
     long n;
 
-    rb_secure(2);
     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);
-    }
+    tvp[0] = rb_time_timeval(atime);
+    tvp[1] = rb_time_timeval(mtime);
 
     n = apply2files(utime_internal, rest, tvp);
     return LONG2FIX(n);
@@ -2040,11 +1819,10 @@ struct utimbuf {
 #endif
 
 static void
-utime_internal(path, arg)
+utime_internal(path, utp)
     const char *path;
-    void *arg;
+    struct utimbuf *utp;
 {
-    struct utimbuf *utp = arg;
     if (utime(path, utp) < 0)
 	rb_sys_fail(path);
 }
@@ -2057,19 +1835,16 @@ rb_file_s_utime(argc, argv)
     VALUE atime, mtime, rest;
     long n;
     struct timeval tv;
-    struct utimbuf utbuf, *utp = NULL;
+    struct utimbuf utbuf;
 
     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;
-    }
+    tv = rb_time_timeval(atime);
+    utbuf.actime = tv.tv_sec;
+    tv = rb_time_timeval(mtime);
+    utbuf.modtime = tv.tv_sec;
 
-    n = apply2files(utime_internal, rest, utp);
+    n = apply2files(utime_internal, rest, &utbuf);
     return LONG2FIX(n);
 }
 
@@ -2105,7 +1880,6 @@ static VALUE
 rb_file_s_link(klass, from, to)
     VALUE klass, from, to;
 {
-#ifdef HAVE_LINK
     SafeStringValue(from);
     SafeStringValue(to);
 
@@ -2113,10 +1887,6 @@ rb_file_s_link(klass, from, to)
 	sys_fail2(from, to);
     }
     return INT2FIX(0);
-#else
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#endif
 }
 
 /*
@@ -2172,11 +1942,7 @@ rb_file_s_readlink(klass, path)
 
     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
-	) {
+    while ((rv = readlink(StringValueCStr(path), buf, size)) == size) {
 	size *= 2;
 	buf = xrealloc(buf, size);
     }
@@ -2194,11 +1960,9 @@ rb_file_s_readlink(klass, path)
 #endif
 }
 
-static void unlink_internal _((const char *, void *));
 static void
-unlink_internal(path, arg)
+unlink_internal(path)
     const char *path;
-    void *arg;
 {
     if (unlink(path) < 0)
 	rb_sys_fail(path);
@@ -2245,16 +2009,16 @@ rb_file_s_rename(klass, from, 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 __CYGWIN__
+	extern unsigned long __attribute__((stdcall)) GetLastError();
+	errno = GetLastError(); /* This is a Cygwin bug */
+#elif defined DOSISH && !defined _WIN32
+	if (errno == EEXIST
 #if defined (__EMX__)
-	  case EACCES:
+	    || errno == EACCES
 #endif
+	    ) {
 	    if (chmod(dst, 0666) == 0 &&
 		unlink(dst) == 0 &&
 		rename(src, dst) == 0)
@@ -2298,38 +2062,17 @@ rb_file_s_umask(argc, argv)
 	omask = umask(NUM2INT(argv[0]));
     }
     else {
-	rb_raise(rb_eArgError, "wrong number of arguments");
+	rb_raise(rb_eArgError, "wrong number of argument");
     }
     return INT2FIX(omask);
 }
 
-#ifdef __CYGWIN__
-#undef DOSISH
-#endif
-#if defined __CYGWIN__ || defined DOSISH
+#if defined DOSISH
 #define DOSISH_UNC
-#define DOSISH_DRIVE_LETTER
 #define isdirsep(x) ((x) == '/' || (x) == '\\')
 #else
 #define isdirsep(x) ((x) == '/')
 #endif
-
-#if defined _WIN32 || defined __CYGWIN__
-#define USE_NTFS 1
-#else
-#define USE_NTFS 0
-#endif
-
-#ifdef DOSISH_DRIVE_LETTER
-#include <ctype.h>
-#endif
-
-#if USE_NTFS
-#define istrailinggabage(x) ((x) == '.' || (x) == ' ')
-#else
-#define istrailinggabage(x) 0
-#endif
-
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */
 # if defined(DJGPP)
 #   define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
@@ -2338,6 +2081,12 @@ rb_file_s_umask(argc, argv)
 # 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)
@@ -2402,11 +2151,7 @@ rb_path_next(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;
@@ -2414,9 +2159,7 @@ rb_path_skip_prefix(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]))
+	if (*(path = nextdirsep(path + 2)))
 	    path = nextdirsep(path + 1);
 	return (char *)path;
     }
@@ -2449,47 +2192,16 @@ rb_path_last_separator(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;
-}
-
+#define chompdirsep rb_path_end
 char *
 rb_path_end(path)
     const char *path;
 {
-    if (isdirsep(*path)) path++;
-    return chompdirsep(path);
-}
-
-#if USE_NTFS
-static char *
-ntfs_tail(const char *path)
-{
-    while (*path == '.') path++;
-    while (*path && *path != ':') {
-	if (istrailinggabage(*path)) {
-	    const char *last = path++;
-	    while (istrailinggabage(*path)) path++;
-	    if (!*path || *path == ':') return (char *)last;
-	}
-	else if (isdirsep(*path)) {
+    while (*path) {
+	if (isdirsep(*path)) {
 	    const char *last = path++;
 	    while (isdirsep(*path)) path++;
 	    if (!*path) return (char *)last;
-	    if (*path == ':') path++;
 	}
 	else {
 	    path = CharNext(path);
@@ -2497,17 +2209,16 @@ ntfs_tail(const char *path)
     }
     return (char *)path;
 }
-#endif
 
 #define BUFCHECK(cond) do {\
     long bdiff = p - buf;\
-    if (cond) {\
-	do {buflen *= 2;} while (cond);\
-	rb_str_resize(result, buflen);\
-	buf = RSTRING_PTR(result);\
-	p = buf + bdiff;\
-	pend = buf + buflen;\
+    while (cond) {\
+	buflen *= 2;\
     }\
+    rb_str_resize(result, buflen);\
+    buf = RSTRING(result)->ptr;\
+    p = buf + bdiff;\
+    pend = buf + buflen;\
 } while (0)
 
 #define BUFINIT() (\
@@ -2525,8 +2236,7 @@ static VALUE
 file_expand_path(fname, dname, result)
     VALUE fname, dname, result;
 {
-    const char *s, *b;
-    char *buf, *p, *pend, *root;
+    char *s, *buf, *b, *p, *pend, *root;
     long buflen, dirlen;
     int tainted;
 
@@ -2536,7 +2246,7 @@ file_expand_path(fname, dname, result)
 
     if (s[0] == '~') {
 	if (isdirsep(s[1]) || s[1] == '\0') {
-	    const char *dir = getenv("HOME");
+	    char *dir = getenv("HOME");
 
 	    if (!dir) {
 		rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `%s'", s);
@@ -2667,21 +2377,15 @@ file_expand_path(fname, dname, result)
 		  case '.':
 		    if (*(s+1) == '\0' || isdirsep(*(s+1))) {
 			/* We must go back to the parent */
-			char *n;
 			*p = '\0';
-			if (!(n = strrdirsep(root))) {
+			if (!(b = strrdirsep(root))) {
 			    *p = '/';
 			}
 			else {
-			    p = n;
+			    p = b;
 			}
 			b = ++s;
 		    }
-#if USE_NTFS
-		    else {
-			do *++s; while (istrailinggabage(*s));
-		    }
-#endif
 		    break;
 		  case '/':
 #if defined DOSISH || defined __CYGWIN__
@@ -2694,19 +2398,6 @@ file_expand_path(fname, dname, result)
 		    break;
 		}
 	    }
-#if USE_NTFS
-	    else {
-		--s;
-	      case ' ': {
-		const char *e = s;
-		while (istrailinggabage(*s)) s++;
-		if (!*s) {
-		    s = e;
-		    goto endpath;
-		}
-	      }
-	    }
-#endif
 	    break;
 	  case '/':
 #if defined DOSISH || defined __CYGWIN__
@@ -2729,76 +2420,15 @@ file_expand_path(fname, dname, result)
     }
 
     if (s > b) {
-#if USE_NTFS
-      endpath:
-	if (s > b + 6 && strncasecmp(s - 6, ":$DATA", 6) == 0) {
-	    /* alias of stream */
-	    /* get rid of a bug of x64 VC++ */
-	    if (*(s-7) == ':') s -= 7;			/* prime */
-	    else if (memchr(b, ':', s - 6 - b)) s -= 6; /* alternative */
-	}
-#endif
 	BUFCHECK(bdiff + (s-b) >= buflen);
 	memcpy(++p, b, s-b);
 	p += s-b;
     }
     if (p == skiproot(buf) - 1) p++;
 
-#if USE_NTFS
-    *p = '\0';
-    if ((s = strrdirsep(b = buf)) != 0 && !strpbrk(s, "*?")) {
-	size_t len;
-	WIN32_FIND_DATA wfd;
-#ifdef __CYGWIN__
-	int lnk_added = 0, is_symlink = 0;
-	struct stat st;
-	char w32buf[MAXPATHLEN];
-	p = (char *)s;
-	if (lstat(buf, &st) == 0 && S_ISLNK(st.st_mode)) {
-	    is_symlink = 1;
-	    *p = '\0';
-	}
-	if (cygwin_conv_to_win32_path((*buf ? buf : "/"), w32buf) == 0) {
-	    b = w32buf;
-	}
-	if (is_symlink && b == w32buf) {
-	    *p = '\\';
-	    strlcat(w32buf, p, sizeof(w32buf));
-	    len = strlen(p);
-	    if (len > 4 && strcasecmp(p + len - 4, ".lnk") != 0) {
-		lnk_added = 1;
-		strlcat(w32buf, ".lnk", sizeof(w32buf));
-	    }
-	}
-	*p = '/';
-#endif
-	HANDLE h = FindFirstFile(b, &wfd);
-	if (h != INVALID_HANDLE_VALUE) {
-	    FindClose(h);
-	    len = strlen(wfd.cFileName);
-#ifdef __CYGWIN__
-	    if (lnk_added && len > 4 &&
-		strcasecmp(wfd.cFileName + len - 4, ".lnk") == 0) {
-		wfd.cFileName[len -= 4] = '\0';
-	    }
-#else
-	    p = (char *)s;
-#endif
-	    ++p;
-	    BUFCHECK(bdiff + len >= buflen);
-	    memcpy(p, wfd.cFileName, len + 1);
-	    p += len;
-	}
-#ifdef __CYGWIN__
-	else {
-	    p += strlen(p);
-	}
-#endif
-    }
-#endif
-
     if (tainted) OBJ_TAINT(result);
-    rb_str_set_len(result, p - buf);
+    RSTRING(result)->len = p - buf;
+    *p = '\0';
     return result;
 }
 
@@ -2842,31 +2472,23 @@ rb_file_s_expand_path(argc, argv)
 }
 
 static int
-rmext(p, l1, e)
+rmext(p, e)
     const char *p, *e;
-    int l1;
 {
-    int l2;
+    int l1, l2;
 
     if (!e) return 0;
 
+    l1 = chompdirsep(p) - p;
     l2 = strlen(e);
     if (l2 == 2 && e[1] == '*') {
-	unsigned char c = *e;
-	e = p + l1;
-	do {
-	    if (e <= p) return 0;
-	} while (*--e != c);
+	e = strrchr(p, *e);
+	if (!e) return 0;
 	return e - p;
     }
     if (l1 < l2) return l1;
 
-#if CASEFOLD_FILESYSTEM
-#define fncomp strncasecmp
-#else
-#define fncomp strncmp
-#endif
-    if (fncomp(p+l1-l2, e, l2) == 0) {
+    if (strncmp(p+l1-l2, e, l2) == 0) {
 	return l1-l2;
     }
     return 0;
@@ -2892,60 +2514,37 @@ rb_file_s_basename(argc, argv)
     VALUE *argv;
 {
     VALUE fname, fext, basename;
-    const char *name, *p;
-#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
-    const char *root;
-#endif
-    int f, n;
+    char *name, *p, *ext = NULL;
+    int f;
 
     if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) {
-	StringValue(fext);
+	ext = StringValueCStr(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) {
+    if (!*(name = skiproot(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 == ':') {
+	if (*p == ':') {
 	    p++;
 	    f = 0;
 	}
 #endif
-#ifdef DOSISH_UNC
-	else {
-	    p = "/";
+    }
+    else if (!(p = strrdirsep(name))) {
+	if (NIL_P(fext) || !(f = rmext(name, ext))) {
+	    f = chompdirsep(name) - name;
+	    if (f == RSTRING(fname)->len) return fname;
 	}
-#endif
-#endif
+	p = name;
     }
     else {
-	if (!(p = strrdirsep(name))) {
-	    p = name;
+	while (isdirsep(*p)) p++; /* skip last / */
+	if (NIL_P(fext) || !(f = rmext(p, ext))) {
+	    f = chompdirsep(p) - p;
 	}
-	else {
-	    while (isdirsep(*p)) p++; /* skip last / */
-	}
-#if USE_NTFS
-	n = ntfs_tail(p) - p;
-#else
-	n = chompdirsep(p) - p;
-#endif
-	if (NIL_P(fext) || !(f = rmext(p, n, StringValueCStr(fext)))) {
-	    f = n;
-	}
-	if (f == RSTRING_LEN(fname)) return fname;
     }
     basename = rb_str_new(p, f);
     OBJ_INFECT(basename, fname);
@@ -2968,14 +2567,14 @@ static VALUE
 rb_file_s_dirname(klass, fname)
     VALUE klass, fname;
 {
-    const char *name, *root, *p;
+    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);
+    if (root > name + 2 && isdirsep(*name))
+	name = root - 2;
 #else
     if (root > name + 1)
 	name = root - 1;
@@ -2986,17 +2585,9 @@ rb_file_s_dirname(klass, fname)
     }
     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)
+    if (root == name + 2 && name[1] == ':')
 	rb_str_cat(dirname, ".", 1);
 #endif
     OBJ_INFECT(dirname, fname);
@@ -3021,49 +2612,22 @@ static VALUE
 rb_file_s_extname(klass, fname)
     VALUE klass, fname;
 {
-    const char *name, *p, *e;
+    char *name, *p, *e;
     VALUE extname;
 
     name = StringValueCStr(fname);
     p = strrdirsep(name);	/* get the last path component */
     if (!p)
-	p = name;
+ 	p = name;
     else
-	name = ++p;
-
-    e = 0;
-    while (*p) {
-	if (*p == '.' || istrailinggabage(*p)) {
-#if USE_NTFS
-	    const char *last = p++, *dot = last;
-	    while (istrailinggabage(*p)) {
-		if (*p == '.') dot = p;
-		p++;
-	    }
-	    if (!*p || *p == ':') {
-		p = last;
-		break;
-	    }
-	    if (*last == '.') e = dot;
-	    continue;
-#else
-	    e = p;	  /* get the last dot of the last component */
-#endif
-	}
-#if USE_NTFS
-	else if (*p == ':') {
-	    break;
-	}
-#endif
-	else if (isdirsep(*p))
-	    break;
-	p = CharNext(p);
-    }
-    if (!e || e == name || e+1 == p)	/* no dot, or the only dot is first or end? */
-	return rb_str_new(0, 0);
-    extname = rb_str_new(e, p - e);	/* keep the dot, too! */
-    OBJ_INFECT(extname, fname);
-    return extname;
+ 	p++;
+ 
+     e = strrchr(p, '.');	/* get the last dot of the last component */
+     if (!e || e == p)		/* no dot, or the only dot is first? */
+	 return rb_str_new2("");
+     extname = rb_str_new(e, chompdirsep(e) - e);	/* keep the dot, too! */
+     OBJ_INFECT(extname, fname);
+     return extname;
 }
 
 /*
@@ -3104,7 +2668,7 @@ rb_file_join(ary, sep)
     long len, i;
     int taint = 0;
     VALUE result, tmp;
-    const char *name, *tail;
+    char *name;
 
     if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
     if (OBJ_TAINTED(ary)) taint = 1;
@@ -3141,18 +2705,11 @@ rb_file_join(ary, sep)
 	    }
 	    break;
 	  default:
-	    StringValueCStr(tmp);
+	    tmp = rb_obj_as_string(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);
-	    }
-	}
+	if (i > 0 && !NIL_P(sep) && !*chompdirsep(name))
+	    rb_str_buf_append(result, sep);
 	rb_str_buf_append(result, tmp);
 	if (OBJ_TAINTED(tmp)) taint = 1;
     }
@@ -3198,14 +2755,11 @@ 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)
+    if (truncate(StringValueCStr(path), NUM2OFFT(len)) < 0)
 	rb_sys_fail(RSTRING(path)->ptr);
 #else
 # ifdef HAVE_CHSIZE
@@ -3221,7 +2775,7 @@ rb_file_s_truncate(klass, path, len)
 	    rb_sys_fail(RSTRING(path)->ptr);
 	}
 #  endif
-	if (chsize(tmpfd, pos) < 0) {
+	if (chsize(tmpfd, NUM2OFFT(len)) < 0) {
 	    close(tmpfd);
 	    rb_sys_fail(RSTRING(path)->ptr);
 	}
@@ -3252,25 +2806,19 @@ static VALUE
 rb_file_truncate(obj, len)
     VALUE obj, len;
 {
-    rb_io_t *fptr;
-    FILE *f;
-    off_t pos;
+    OpenFile *fptr;
 
     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_FTRUNCATE
-    if (ftruncate(fileno(f), pos) < 0)
+#ifdef HAVE_TRUNCATE
+    if (ftruncate(fileno(fptr->f), NUM2OFFT(len)) < 0)
 	rb_sys_fail(fptr->path);
 #else
 # ifdef HAVE_CHSIZE
-    if (chsize(fileno(f), pos) < 0)
+    if (chsize(fileno(fptr->f), NUM2OFFT(len)) < 0)
 	rb_sys_fail(fptr->path);
 # else
     rb_notimplement();
@@ -3292,57 +2840,34 @@ rb_file_truncate(obj, len)
 #  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
-
+#if 0
 static int
 rb_thread_flock(fd, op, fptr)
     int fd, op;
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     if (rb_thread_alone() || (op & LOCK_NB)) {
-	int ret;
-	TRAP_BEG;
-	ret = flock(fd, op);
-	TRAP_END;
-	return ret;
+	return flock(fd, op);
     }
     op |= LOCK_NB;
     while (flock(fd, op) < 0) {
 	switch (errno) {
-	  case EAGAIN:
-	  case EACCES:
+          case EAGAIN:
+          case EACCES:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
 #endif
 	    rb_thread_polling();	/* busy wait */
 	    rb_io_check_closed(fptr);
-	    continue;
+            continue;
 	  default:
 	    return -1;
 	}
     }
     return 0;
 }
-#ifdef __CYGWIN__
-# undef flock
-#endif
 #define flock(fd, op) rb_thread_flock(fd, op, fptr)
+#endif
 
 /*
  *  call-seq:
@@ -3379,31 +2904,29 @@ rb_file_flock(obj, operation)
     VALUE operation;
 {
 #ifndef __CHECKER__
-    rb_io_t *fptr;
-    int op;
+    OpenFile *fptr;
 
     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 (flock(fileno(fptr->f), NUM2INT(operation)) < 0) {
+        switch (errno) {
+          case EAGAIN:
+          case EACCES:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	  case EWOULDBLOCK:
+          case EWOULDBLOCK:
 #endif
-	      return Qfalse;
+              return Qfalse;
 	  case EINTR:
 #if defined(ERESTART)
 	  case ERESTART:
 #endif
 	    goto retry;
-	}
+        }
 	rb_sys_fail(fptr->path);
     }
 #endif
@@ -3419,7 +2942,7 @@ test_check(n, argc, argv)
     int i;
 
     n+=1;
-    if (n != argc) rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
+    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:
@@ -3452,14 +2975,14 @@ test_check(n, argc, argv)
  *     ?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
+ *     ?g  | boolean | True if files 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
+ *     ?l  | boolean | True if files exists and is a symbolic link
  *     ?M  | Time    | Last modification time for file1
- *     ?o  | boolean | True if file1 exists and is owned by 
+ *     ?o  | boolean | True if files 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
@@ -3468,7 +2991,7 @@ test_check(n, argc, argv)
  *         |         | 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,
+ *     ?s  | int/nil | If files 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
@@ -3484,7 +3007,7 @@ test_check(n, argc, argv)
  *
  * Tests that take two files:
  *
- *     ?-  | boolean | True if file1 and file2 are identical
+ *     ?-  | boolean | True if file1 is a hard link to file2
  *     ?=  | boolean | True if the modification times of file1
  *         |         | and file2 are equal
  *     ?<  | boolean | True if the modification time of file1
@@ -3598,12 +3121,7 @@ rb_f_test(argc, argv)
 	}
     }
 
-    if (cmd == '-') {
-	CHECK(2);
-	return test_identical(0, argv[1], argv[2]);
-    }
-
-    if (strchr("=<>", cmd)) {
+    if (strchr("-=<>", cmd)) {
 	struct stat st1, st2;
 
 	CHECK(2);
@@ -3611,6 +3129,11 @@ rb_f_test(argc, argv)
 	if (rb_stat(argv[2], &st2) < 0) return Qfalse;
 
 	switch (cmd) {
+	  case '-':
+	    if (st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino)
+		return Qtrue;
+            return Qfalse;
+
 	  case '=':
 	    if (st1.st_mtime == st2.st_mtime) return Qtrue;
 	    return Qfalse;
@@ -3622,7 +3145,7 @@ rb_f_test(argc, argv)
 	  case '<':
 	    if (st1.st_mtime < st2.st_mtime) return Qtrue;
 	    return Qfalse;
-	}
+        }
     }
     /* unknown command */
     rb_raise(rb_eArgError, "unknown command ?%c", cmd);
@@ -3684,7 +3207,6 @@ rb_stat_init(obj, fname)
     return Qnil;
 }
 
-/* :nodoc: */
 static VALUE
 rb_stat_init_copy(copy, orig)
     VALUE copy, orig;
@@ -3909,7 +3431,7 @@ rb_stat_grpowned(obj)
     VALUE obj;
 {
 #ifndef _WIN32
-    if (group_member(get_stat(obj)->st_gid)) return Qtrue;
+    if (get_stat(obj)->st_gid == getegid()) return Qtrue;
 #endif
     return Qfalse;
 }
@@ -3931,9 +3453,6 @@ rb_stat_r(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;
@@ -3967,9 +3486,6 @@ rb_stat_R(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;
@@ -4001,9 +3517,6 @@ rb_stat_w(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;
@@ -4035,9 +3548,6 @@ rb_stat_W(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;
@@ -4071,11 +3581,6 @@ rb_stat_x(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;
@@ -4105,11 +3610,6 @@ rb_stat_X(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;
@@ -4248,7 +3748,7 @@ rb_stat_sticky(obj)
     return Qfalse;
 }
 
-VALUE rb_mFConst;
+static VALUE rb_mFConst;
 
 void
 rb_file_const(name, value)
@@ -4274,22 +3774,13 @@ is_absolute_path(path)
     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
+#ifndef DOSISH
 static int
-path_check_0(fpath, execpath)
-     VALUE fpath;
-     int execpath;
+path_check_1(path)
+     VALUE path;
 {
     struct stat st;
-    const char *p0 = StringValueCStr(fpath);
+    char *p0 = StringValueCStr(path);
     char *p = 0, *s;
 
     if (!is_absolute_path(p0)) {
@@ -4301,7 +3792,7 @@ path_check_0(fpath, execpath)
 
 	rb_str_cat2(newpath, "/");
 	rb_str_cat2(newpath, p0);
-	p0 = RSTRING(fpath = newpath)->ptr;
+	return path_check_1(newpath);
     }
     for (;;) {
 #ifndef S_IWOTH
@@ -4309,11 +3800,10 @@ path_check_0(fpath, execpath)
 #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))
+	    && !(st.st_mode & S_ISVTX)
 #endif
 	    ) {
-	    rb_warn("Insecure world writable dir %s in %sPATH, mode 0%o",
-		    p0, (execpath ? "" : "LOAD_"), st.st_mode);
+	    rb_warn("Insecure world writable dir %s, mode 0%o", p0, st.st_mode);
 	    if (p) *p = '/';
 	    return 0;
 	}
@@ -4326,23 +3816,12 @@ path_check_0(fpath, execpath)
 }
 #endif
 
-static int
-fpath_check(path)
-    const char *path;
-{
-#if ENABLE_PATH_CHECK
-    return path_check_0(rb_str_new2(path), Qfalse);
-#else
-    return 1;
-#endif
-}
-
 int
 rb_path_check(path)
-    const char *path;
+    char *path;
 {
-#if ENABLE_PATH_CHECK
-    const char *p0, *p, *pend;
+#ifndef DOSISH
+    char *p0, *p, *pend;
     const char sep = PATH_SEP_CHAR;
 
     if (!path) return 1;
@@ -4353,7 +3832,7 @@ rb_path_check(path)
     if (!p) p = pend;
 
     for (;;) {
-	if (!path_check_0(rb_str_new(p0, p - p0), Qtrue)) {
+	if (!path_check_1(rb_str_new(p0, p - p0))) {
 	    return 0;		/* not safe */
 	}
 	p0 = p + 1;
@@ -4377,7 +3856,7 @@ is_macos_native_path(path)
 
 static int
 file_load_ok(file)
-    const char *file;
+    char *file;
 {
     FILE *f;
 
@@ -4395,8 +3874,8 @@ rb_find_file_ext(filep, ext)
     VALUE *filep;
     const char * const *ext;
 {
-    const char *path, *found;
-    const char *f = RSTRING(*filep)->ptr;
+    char *path, *found;
+    char *f = RSTRING(*filep)->ptr;
     VALUE fname;
     long i, j;
 
@@ -4405,7 +3884,6 @@ rb_find_file_ext(filep, ext)
 	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;
     }
@@ -4414,7 +3892,6 @@ rb_find_file_ext(filep, ext)
 	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;
@@ -4435,7 +3912,6 @@ rb_find_file_ext(filep, ext)
 	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;
@@ -4451,21 +3927,20 @@ rb_find_file(path)
     VALUE path;
 {
     VALUE tmp;
-    const char *f = StringValueCStr(path);
-    const char *lpath;
+    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)) {
+	if (rb_safe_level() >= 1 && !rb_path_check(f)) {
 	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
 	}
 	if (file_load_ok(f)) return path;
@@ -4473,7 +3948,7 @@ rb_find_file(path)
 #endif
 
     if (is_absolute_path(f)) {
-	if (rb_safe_level() >= 1 && !fpath_check(f)) {
+	if (rb_safe_level() >= 1 && !rb_path_check(f)) {
 	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
 	}
 	if (file_load_ok(f)) return path;
@@ -4501,6 +3976,9 @@ rb_find_file(path)
 	}
 	else {
 	    lpath = RSTRING(tmp)->ptr;
+	    if (rb_safe_level() >= 1 && !rb_path_check(lpath)) {
+		rb_raise(rb_eSecurityError, "loading from unsafe path %s", lpath);
+	    }
 	}
     }
     else {
@@ -4510,16 +3988,12 @@ rb_find_file(path)
     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)) {
+    f = dln_find_file(f, lpath);
+    if (rb_safe_level() >= 1 && !rb_path_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 rb_str_new2(f);
     }
     return 0;
 }
@@ -4600,8 +4074,6 @@ Init_File()
     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);
@@ -4676,8 +4148,6 @@ Init_File()
     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);
diff --git a/gc.c b/gc.c
index f75a11a937..c521e58fea 100644
--- a/gc.c
+++ b/gc.c
@@ -30,17 +30,25 @@
 #include <sys/resource.h>
 #endif
 
-#if defined _WIN32 || defined __CYGWIN__
-#include <windows.h>
+#ifdef __ia64__
+#include <ucontext.h>
+#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.
+ */
+#define __libc_ia64_register_backing_store_base (4ULL<<61)
+#else
+#pragma weak __libc_ia64_register_backing_store_base
+extern unsigned long __libc_ia64_register_backing_store_base;
+#endif
 #endif
 
 void re_free_registers _((struct re_registers*));
-void rb_io_fptr_finalize _((struct rb_io_t*));
+void rb_io_fptr_finalize _((struct OpenFile*));
 
-#define rb_setjmp(env) RUBY_SETJMP(env)
-#define rb_jmp_buf rb_jmpbuf_t
-#ifdef __CYGWIN__
-int _setjmp(), _longjmp();
+#if !defined(setjmp) && defined(HAVE__SETJMP)
+#define setjmp(env) _setjmp(env)
 #endif
 
 /* Make alloca work the best possible way.  */
@@ -54,7 +62,9 @@ int _setjmp(), _longjmp();
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
-#  ifndef _AIX
+#  ifdef _AIX
+ #pragma alloca
+#  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca ();
 #   endif
@@ -74,64 +84,20 @@ 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();
-
-int ruby_gc_stress = 0;
-
-NORETURN(void rb_exc_jump _((VALUE)));
 
 void
 rb_memerror()
 {
-    rb_thread_t th = rb_curr_thread;
+    static int recurse = 0;
 
-    if (!nomem_error ||
-	(rb_thread_raised_p(th, RAISED_NOMEMORY) && rb_safe_level() < 4)) {
+    if (recurse > 0 && rb_safe_level() < 4) {
 	fprintf(stderr, "[FATAL] failed to allocate memory\n");
 	exit(1);
     }
-    if (rb_thread_raised_p(th, RAISED_NOMEMORY)) {
-	rb_exc_jump(nomem_error);
-    }
-    rb_thread_raised_set(th, RAISED_NOMEMORY);
+    recurse++;
     rb_exc_raise(nomem_error);
 }
 
-/*
- *  call-seq:
- *    GC.stress                 => true or false
- *
- *  returns current status of GC stress mode.
- */
-
-static VALUE
-gc_stress_get(self)
-    VALUE self;
-{
-    return ruby_gc_stress ? Qtrue : Qfalse;
-}
-
-/*
- *  call-seq:
- *    GC.stress = bool          => bool
- *
- *  updates GC stress mode.
- *
- *  When GC.stress = true, GC is invoked for all GC opportunity:
- *  all memory and object allocation.
- *
- *  Since it makes Ruby very slow, it is only for debugging.
- */
-
-static VALUE
-gc_stress_set(self, bool)
-    VALUE self, bool;
-{
-    rb_secure(2);
-    ruby_gc_stress = RTEST(bool);
-    return bool;
-}
-
 void *
 ruby_xmalloc(size)
     long size;
@@ -142,19 +108,19 @@ ruby_xmalloc(size)
 	rb_raise(rb_eNoMemError, "negative allocation size (or too big)");
     }
     if (size == 0) size = 1;
+    malloc_increase += size;
 
-    if (ruby_gc_stress || (malloc_increase+size) > malloc_limit) {
-	garbage_collect();
+    if (malloc_increase > malloc_limit) {
+	rb_gc();
     }
     RUBY_CRITICAL(mem = malloc(size));
     if (!mem) {
-	garbage_collect();
+	rb_gc();
 	RUBY_CRITICAL(mem = malloc(size));
 	if (!mem) {
 	    rb_memerror();
 	}
     }
-    malloc_increase += size;
 
     return mem;
 }
@@ -183,16 +149,15 @@ ruby_xrealloc(ptr, size)
     }
     if (!ptr) return xmalloc(size);
     if (size == 0) size = 1;
-    if (ruby_gc_stress) garbage_collect();
+    malloc_increase += size;
     RUBY_CRITICAL(mem = realloc(ptr, size));
     if (!mem) {
-	garbage_collect();
+	rb_gc();
 	RUBY_CRITICAL(mem = realloc(ptr, size));
 	if (!mem) {
 	    rb_memerror();
         }
     }
-    malloc_increase += size;
 
     return mem;
 }
@@ -215,14 +180,14 @@ 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
@@ -237,13 +202,13 @@ rb_gc_enable()
 /*
  *  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
@@ -306,10 +271,6 @@ rb_global_variable(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 {
@@ -330,7 +291,7 @@ typedef struct RVALUE {
 	struct RFile   file;
 	struct RNode   node;
 	struct RMatch  match;
-	struct RVarmap varmap;
+	struct RVarmap varmap; 
 	struct SCOPE   scope;
     } as;
 #ifdef GC_DEBUG
@@ -339,16 +300,11 @@ typedef struct RVALUE {
 #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;
@@ -386,7 +342,8 @@ add_heap()
     }
 
     for (;;) {
-	RUBY_CRITICAL(p = (RVALUE*)malloc(sizeof(RVALUE)*(heap_slots+1)));
+	RUBY_CRITICAL(p = heaps[heaps_used].slot = (RVALUE*)malloc(sizeof(RVALUE)*heap_slots));
+	heaps[heaps_used].limit = heap_slots;
 	if (p == 0) {
 	    if (heap_slots == HEAP_MIN_SLOTS) {
 		rb_memerror();
@@ -394,13 +351,6 @@ add_heap()
 	    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;
@@ -408,7 +358,6 @@ add_heap()
     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;
@@ -419,21 +368,12 @@ add_heap()
 }
 #define RANY(o) ((RVALUE*)(o))
 
-int 
-rb_during_gc()
-{
-    return during_gc;
-}
-
 VALUE
 rb_newobj()
 {
     VALUE obj;
 
-    if (during_gc)
-	rb_bug("object allocation during garbage collection phase");
-
-    if (ruby_gc_stress || !freelist) garbage_collect();
+    if (!freelist) rb_gc();
 
     obj = (VALUE)freelist;
     freelist = freelist->as.free.next;
@@ -453,7 +393,7 @@ rb_data_object_alloc(klass, datap, dmark, dfree)
     RUBY_DATA_FUNC dfree;
 {
     NEWOBJ(data, struct RData);
-    if (klass) Check_Type(klass, T_CLASS);
+    Check_Type(klass, T_CLASS);
     OBJSETUP(data, klass, T_DATA);
     data->data = datap;
     data->dfree = dfree;
@@ -464,48 +404,37 @@ rb_data_object_alloc(klass, datap, dmark, dfree)
 
 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;
+#else
+#ifdef __human68k__
+extern unsigned int _stacksize;
 # define STACK_LEVEL_MAX (_stacksize - 4096)
 # undef HAVE_GETRLIMIT
-#elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
+#else
+#ifdef HAVE_GETRLIMIT
 static unsigned int STACK_LEVEL_MAX = 655300;
 #else
 # define STACK_LEVEL_MAX 655300
 #endif
+#endif
+#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 void
-stack_end_address(VALUE **stack_end_p)
-{
-    VALUE stack_end;
-    *stack_end_p = &stack_end;
-}
-#  define  SET_STACK_END    VALUE *stack_end; stack_end_address(&stack_end)
+# if defined(__GNUC__) && defined(USE_BUILTIN_FRAME_ADDRESS) && !defined(__ia64__)
+#  define  SET_STACK_END    VALUE *stack_end = __builtin_frame_address(0)
 # else
 #  define  SET_STACK_END    VALUE *stack_end = alloca(1)
 # endif
 # define STACK_END (stack_end)
 #endif
-#if STACK_GROW_DIRECTION < 0
+#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)
@@ -518,17 +447,15 @@ stack_end_address(VALUE **stack_end_p)
 #elif STACK_GROW_DIRECTION < 0
 # define STACK_UPPER(x, a, b) b
 #else
-static int grow_direction;
 static int
-stack_grow_direction(addr)
+stack_growup_p(addr)
     VALUE *addr;
 {
     SET_STACK_END;
 
-    if (STACK_END > addr) return grow_direction = 1;
-    return grow_direction = -1;
+    if (STACK_END > addr) return Qtrue;
+    return Qfalse;
 }
-# 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
 
@@ -570,25 +497,24 @@ init_mark_stack()
 }
 
 #define MARK_STACK_EMPTY (mark_stack_ptr == mark_stack)
-
+            
 static st_table *source_filenames;
 
 char *
 rb_source_filename(f)
     const char *f;
 {
-    st_data_t name;
+    char *name;
 
-    if (!st_lookup(source_filenames, (st_data_t)f, &name)) {
+    if (!st_lookup(source_filenames, (st_data_t)f, (st_data_t *)&name)) {
 	long len = strlen(f) + 1;
-	char *ptr = ALLOC_N(char, len + 1);
-	name = (st_data_t)ptr;
+	char *ptr = name = ALLOC_N(char, len + 1);
 	*ptr++ = 0;
 	MEMCPY(ptr, f, char, len);
-	st_add_direct(source_filenames, (st_data_t)ptr, name);
+	st_add_direct(source_filenames, (st_data_t)ptr, (st_data_t)name);
 	return ptr;
     }
-    return (char *)name + 1;
+    return name + 1;
 }
 
 static void
@@ -661,12 +587,12 @@ is_pointer_to_heap(ptr)
     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)
+	if (heap_org <= p && p < heap_org + heaps[i].limit &&
+	    ((((char*)p)-((char*)heap_org))%sizeof(RVALUE)) == 0)
 	    return Qtrue;
     }
     return Qfalse;
@@ -677,11 +603,9 @@ 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);
+	if (is_pointer_to_heap((void *)*x)) {
+	    gc_mark(*x, 0);
 	}
 	x++;
     }
@@ -707,13 +631,13 @@ mark_entry(key, value, lev)
     return ST_CONTINUE;
 }
 
-static void
+void
 mark_tbl(tbl, lev)
     st_table *tbl;
     int lev;
 {
     if (!tbl) return;
-    st_foreach(tbl, mark_entry, lev);
+    st_foreach(tbl, mark_entry, lev+1);
 }
 
 void
@@ -734,13 +658,13 @@ mark_keyvalue(key, value, lev)
     return ST_CONTINUE;
 }
 
-static void
+void
 mark_hash(tbl, lev)
     st_table *tbl;
     int lev;
 {
     if (!tbl) return;
-    st_foreach(tbl, mark_keyvalue, lev);
+    st_foreach(tbl, mark_keyvalue, lev+1);
 }
 
 void
@@ -761,7 +685,7 @@ rb_gc_mark_maybe(obj)
 
 #define GC_LEVEL_MAX 250
 
-static void
+void
 gc_mark(ptr, lev)
     VALUE ptr;
     int lev;
@@ -771,14 +695,14 @@ gc_mark(ptr, lev)
     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 */
+    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 (lev > GC_LEVEL_MAX) {
 	if (!mark_stack_overflow) {
 	    if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) {
 		*mark_stack_ptr = ptr;
-		mark_stack_ptr++;
+		mark_stack_ptr++;		
 	    }
 	    else {
 		mark_stack_overflow = 1;
@@ -786,7 +710,7 @@ gc_mark(ptr, lev)
 	}
 	return;
     }
-    gc_mark_children(ptr, lev+1);
+    gc_mark_children(ptr, lev);
 }
 
 void
@@ -809,7 +733,7 @@ gc_mark_children(ptr, lev)
     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 */
+    if (obj->as.basic.flags & FL_MARK) return;  /* already marked */ 
     obj->as.basic.flags |= FL_MARK;
 
   marking:
@@ -872,9 +796,6 @@ gc_mark_children(ptr, lev)
 	  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 */
@@ -889,7 +810,6 @@ gc_mark_children(ptr, lev)
 	  case NODE_COLON3:
 	  case NODE_OPT_N:
 	  case NODE_EVSTR:
-	  case NODE_UNDEF:
 	    ptr = (VALUE)obj->as.node.u2.node;
 	    goto again;
 
@@ -904,6 +824,7 @@ gc_mark_children(ptr, lev)
 	  case NODE_NEXT:
 	  case NODE_YIELD:
 	  case NODE_COLON2:
+	  case NODE_ARGS:
 	  case NODE_SPLAT:
 	  case NODE_TO_ARY:
 	  case NODE_SVALUE:
@@ -928,8 +849,11 @@ gc_mark_children(ptr, lev)
 	  case NODE_CVAR:
 	  case NODE_NTH_REF:
 	  case NODE_BACK_REF:
+	  case NODE_ALIAS:
+	  case NODE_VALIAS:
 	  case NODE_REDO:
 	  case NODE_RETRY:
+	  case NODE_UNDEF:
 	  case NODE_SELF:
 	  case NODE_NIL:
 	  case NODE_TRUE:
@@ -938,11 +862,13 @@ gc_mark_children(ptr, lev)
 	  case NODE_BLOCK_ARG:
 	  case NODE_POSTEXE:
 	    break;
+#ifdef C_ALLOCA
 	  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;
+#endif
 
 	  default:		/* unlisted NODE */
 	    if (is_pointer_to_heap(obj->as.node.u1.node)) {
@@ -1055,57 +981,12 @@ gc_mark_children(ptr, lev)
 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;
+    int i, j;
     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
@@ -1121,9 +1002,7 @@ gc_sweep()
     }
 
     mark_source_filename(ruby_sourcefile);
-    if (source_filenames) {
-        st_foreach(source_filenames, sweep_source_filename, 0);
-    }
+    st_foreach(source_filenames, sweep_source_filename, 0);
 
     freelist = 0;
     final_list = deferred_final_list;
@@ -1153,7 +1032,7 @@ gc_sweep()
 	    }
 	    else if (RBASIC(p)->flags == FL_MARK) {
 		/* objects to be finalized */
-		/* do nothing remain marked */
+		/* do notning remain marked */
 	    }
 	    else {
 		RBASIC(p)->flags &= ~FL_MARK;
@@ -1161,12 +1040,12 @@ gc_sweep()
 	    }
 	    p++;
 	}
-	if (n == heaps[i].limit && freed > free_min) {
+	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 */
+		p->as.free.flags |= FL_SINGLETON; /* freeing page mark */
 	    }
 	    freelist = free;	/* cancel this page from freelist */
 	}
@@ -1179,17 +1058,42 @@ gc_sweep()
 	if (malloc_limit < GC_MALLOC_LIMIT) malloc_limit = GC_MALLOC_LIMIT;
     }
     malloc_increase = 0;
-    if (freed < free_min) {
+    if (freed < FREE_MIN) {
 	add_heap();
     }
     during_gc = 0;
 
     /* clear finalization list */
     if (final_list) {
-	deferred_final_list = final_list;
-	return;
+	RVALUE *tmp;
+
+	if (rb_prohibit_interrupt || ruby_in_compile) {
+	    deferred_final_list = final_list;
+	    return;
+	}
+
+	for (p = final_list; p; p = tmp) {
+	    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;
+	    }
+	}
+    }
+    for (i = j = 1; j < heaps_used; i++) {
+	if (heaps[i].limit == 0) {
+	    free(heaps[i].slot);
+	    heaps_used--;
+	}
+	else {
+	    if (i != j) {
+		heaps[j] = heaps[i];
+	    }
+	    j++;
+	}
     }
-    free_unused_heaps();
 }
 
 void
@@ -1298,9 +1202,11 @@ obj_free(obj)
 		RUBY_CRITICAL(free(RANY(obj)->as.node.u1.tbl));
 	    }
 	    break;
+#ifdef C_ALLOCA
 	  case NODE_ALLOCA:
 	    RUBY_CRITICAL(free(RANY(obj)->as.node.u1.node));
 	    break;
+#endif
 	}
 	return;			/* no need to free iv_tbl */
 
@@ -1308,7 +1214,7 @@ obj_free(obj)
 	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)
+	    if (vars[0] == 0)
 		RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl));
 	    if (RANY(obj)->as.scope.flags & SCOPE_MALLOC)
 		RUBY_CRITICAL(free(vars));
@@ -1322,8 +1228,8 @@ obj_free(obj)
 	break;
 
       default:
-	rb_bug("gc_sweep(): unknown data type 0x%lx(0x%lx)",
-	       RANY(obj)->as.basic.flags & T_MASK, obj);
+	rb_bug("gc_sweep(): unknown data type 0x%lx(%ld)", obj,
+	       RANY(obj)->as.basic.flags & T_MASK);
     }
 }
 
@@ -1331,13 +1237,12 @@ void
 rb_gc_mark_frame(frame)
     struct FRAME *frame;
 {
+    mark_locations_array(frame->argv, frame->argc);
     gc_mark((VALUE)frame->node, 0);
 }
 
 #ifdef __GNUC__
 #if defined(__human68k__) || defined(DJGPP)
-#undef rb_setjmp
-#undef rb_jmp_buf
 #if defined(__human68k__)
 typedef unsigned long rb_jmp_buf[8];
 __asm__ (".even\n\
@@ -1346,6 +1251,9 @@ _rb_setjmp:\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];
@@ -1366,11 +1274,13 @@ _rb_setjmp:\n\
 #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()
+void
+rb_gc()
 {
     struct gc_list *list;
     struct FRAME * volatile frame; /* gcc 2.7.2.3 -O2 bug??  */
@@ -1392,12 +1302,10 @@ garbage_collect()
     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);
+	rb_gc_mark_frame(frame); 
 	if (frame->tmp) {
 	    struct FRAME *tmp = frame->tmp;
 	    while (tmp) {
@@ -1414,7 +1322,7 @@ garbage_collect()
 
     FLUSH_REGISTER_WINDOWS;
     /* This assumes that all registers are saved into the jmp_buf (and stack) */
-    rb_setjmp(save_regs_gc_mark);
+    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);
@@ -1426,10 +1334,23 @@ garbage_collect()
     else
 	rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
 #endif
-#ifdef __ia64
+#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());
+    {
+	ucontext_t ctx;
+	VALUE *top, *bot;
+	getcontext(&ctx);
+	mark_locations_array((VALUE*)&ctx.uc_mcontext,
+			     ((size_t)(sizeof(VALUE)-1 + sizeof ctx.uc_mcontext)/sizeof(VALUE)));
+	bot = (VALUE*)__libc_ia64_register_backing_store_base;
+#if defined(__FreeBSD__)
+	top = (VALUE*)ctx.uc_mcontext.mc_special.bspstore;
+#else
+	top = (VALUE*)ctx.uc_mcontext.sc_ar_bsp;
+#endif
+	rb_gc_mark_locations(bot, top);
+    }
 #endif
 #if defined(__human68k__) || defined(__mc68000__)
     rb_gc_mark_locations((VALUE*)((char*)STACK_END + 2),
@@ -1451,30 +1372,19 @@ garbage_collect()
     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();
-	    }
+    while (!MARK_STACK_EMPTY){
+	if (mark_stack_overflow){
+	    gc_mark_all();
 	}
-	rb_gc_abort_threads();
-    } while (!MARK_STACK_EMPTY);
-
+	else {
+	    gc_mark_rest();
+	}
+    }
     gc_sweep();
 }
 
-void
-rb_gc()
-{
-    garbage_collect();
-    rb_gc_finalize_deferred();
-}
-
 /*
  *  call-seq:
  *     GC.start                     => nil
@@ -1482,7 +1392,7 @@ rb_gc()
  *     ObjectSpace.garbage_collect  => nil
  *
  *  Initiates garbage collection, unless manually disabled.
- *
+ *     
  */
 
 VALUE
@@ -1493,59 +1403,18 @@ rb_gc_start()
 }
 
 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;
-    }
+#if defined(__human68k__)
+    extern void *_SEND;
+    rb_gc_stack_start = _SEND;
 #else
-    if (!addr) addr = (void *)&addr;
-    STACK_UPPER(&addr, addr, ++addr);
+    if (!addr) addr = (VALUE *)&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))
 	    rb_gc_stack_start = addr;
 	return;
     }
@@ -1562,83 +1431,47 @@ Init_stack(addr)
 	    STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
 	}
     }
+#ifdef __ia64__
+    /* ruby crashes on IA64 if compiled with optimizer on */
+    /* when if STACK_LEVEL_MAX is greater than this magic number */
+    /* I know this is a kludge.  I suspect optimizer bug */
+#define IA64_MAGIC_STACK_LIMIT 49152
+    if (STACK_LEVEL_MAX > IA64_MAGIC_STACK_LIMIT)
+	STACK_LEVEL_MAX = IA64_MAGIC_STACK_LIMIT;
 #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
@@ -1651,12 +1484,43 @@ Init_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;
-    volatile VALUE v;
 
     for (i = 0; i < heaps_used; i++) {
 	RVALUE *p, *pend;
@@ -1664,8 +1528,7 @@ os_obj_of(of)
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	for (;p < pend; p++) {
 	    if (p->as.basic.flags) {
-		switch (BUILTIN_TYPE(p)) {
-		  case T_NONE:
+		switch (TYPE(p)) {
 		  case T_ICLASS:
 		  case T_VARMAP:
 		  case T_SCOPE:
@@ -1675,9 +1538,8 @@ os_obj_of(of)
 		    if (FL_TEST(p, FL_SINGLETON)) continue;
 		  default:
 		    if (!p->as.basic.klass) continue;
-                    v = (VALUE)p;
-		    if (!of || rb_obj_is_kind_of(v, of)) {
-			rb_yield(v);
+		    if (rb_obj_is_kind_of((VALUE)p, of)) {
+			rb_yield((VALUE)p);
 			n++;
 		    }
 		}
@@ -1691,7 +1553,7 @@ os_obj_of(of)
 /*
  *  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)
@@ -1701,15 +1563,15 @@ os_obj_of(of)
  *  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
@@ -1718,26 +1580,23 @@ os_obj_of(of)
  *     1.7976931348623157e+308
  *     2.2250738585072e-308
  *     Total count: 7
- *
+ *     
  */
 
 static VALUE
-os_each_obj(argc, argv, os)
+os_each_obj(argc, argv)
     int argc;
     VALUE *argv;
-    VALUE os;
 {
     VALUE of;
 
     rb_secure(4);
-    if (argc == 0) {
-	of = 0;
+    if (rb_scan_args(argc, argv, "01", &of) == 0) {
+	return os_live_obj();
     }
     else {
-	rb_scan_args(argc, argv, "01", &of);
+	return os_obj_of(of);
     }
-    RETURN_ENUMERATOR(os, 1, &of);
-    return os_obj_of(of);
 }
 
 static VALUE finalizers;
@@ -1797,9 +1656,9 @@ call_final(os, obj)
 /*
  *  call-seq:
  *     ObjectSpace.undefine_finalizer(obj)
- *
+ *  
  *  Removes all finalizers for <i>obj</i>.
- *
+ *     
  */
 
 static VALUE
@@ -1815,10 +1674,10 @@ undefine_final(os, 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.
- *
+ *  
+ *  Adds <i>aProc</i> as a finalizer, to be called when <i>obj</i>
+ *  is about to be destroyed.
+ *     
  */
 
 static VALUE
@@ -1840,8 +1699,6 @@ define_final(argc, argv, os)
     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();
     }
@@ -1862,17 +1719,19 @@ rb_gc_copy_finalizer(dest, obj)
 
     if (!finalizer_table) return;
     if (!FL_TEST(obj, FL_FINALIZE)) return;
+    if (FL_TEST(dest, FL_FINALIZE)) {
+	rb_warn("copy_finalizer: descarding old finalizers");
+    }
     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]);
+    rb_eval_cmd(args[0], args[1], 0);
     return Qnil;
 }
 
@@ -1882,23 +1741,17 @@ run_final(obj)
 {
     long i;
     int status, critical_save = rb_thread_critical;
-    VALUE args[3], table, objid;
+    VALUE args[2], table;
 
-    objid = rb_obj_id(obj);	/* make obj into id */
     rb_thread_critical = Qtrue;
-    args[1] = 0;
-    args[2] = (VALUE)ruby_safe_level;
+    args[1] = rb_ary_new3(1, rb_obj_id(obj)); /* make obj into id */
     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]);
+	    args[0] = RARRAY(table)->ptr[i];
 	    rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
 	}
     }
@@ -1906,18 +1759,6 @@ run_final(obj)
 }
 
 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;
@@ -1925,9 +1766,14 @@ rb_gc_call_finalizer_at_exit()
 
     /* run finalizers */
     if (need_call_final) {
-	p = deferred_final_list;
-	deferred_final_list = 0;
-	finalize_list(p);
+	if (deferred_final_list) {
+	    p = deferred_final_list;
+	    while (p) {
+		RVALUE *tmp = p;
+		p = p->as.free.next;
+		run_final((VALUE)tmp);
+	    }
+	}
 	for (i = 0; i < heaps_used; i++) {
 	    p = heaps[i].slot; pend = p + heaps[i].limit;
 	    while (p < pend) {
@@ -1966,40 +1812,34 @@ rb_gc_call_finalizer_at_exit()
 /*
  *  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;
+id2ref(obj, id)
+    VALUE obj, id;
 {
     unsigned long ptr, p0;
-    int type;
 
     rb_secure(4);
-    p0 = ptr = NUM2ULONG(objid);
+    p0 = ptr = NUM2ULONG(id);
     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 (SYMBOL_P(ptr) && rb_id2name(SYM2ID((VALUE)ptr)) != 0) {
+	return (VALUE)ptr;
     }
 
-    if (!is_pointer_to_heap((void *)ptr)||
-	(type = BUILTIN_TYPE(ptr)) >= T_BLKTAG || type == T_ICLASS) {
+    ptr = id ^ FIXNUM_FLAG;	/* unset FIXNUM_FLAG */
+    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) {
@@ -2009,73 +1849,6 @@ id2ref(obj, objid)
 }
 
 /*
- *  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.
@@ -2090,8 +1863,6 @@ Init_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_singleton_method(rb_mGC, "stress", gc_stress_get, 0);
-    rb_define_singleton_method(rb_mGC, "stress=", gc_stress_set, 1);
     rb_define_method(rb_mGC, "garbage_collect", rb_gc_start, 0);
 
     rb_mObSpace = rb_define_module("ObjectSpace");
@@ -2114,12 +1885,6 @@ Init_GC()
 
     source_filenames = st_init_strtable();
 
-    rb_global_variable(&nomem_error);
     nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory");
-    OBJ_TAINT(nomem_error);
-    OBJ_FREEZE(nomem_error);
-
-    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);
+    rb_global_variable(&nomem_error);
 }
diff --git a/hash.c b/hash.c
index 3f269becb5..b15bd2488b 100644
--- a/hash.c
+++ b/hash.c
@@ -89,16 +89,15 @@ rb_any_hash(a)
     VALUE a;
 {
     VALUE hval;
-    int hnum;
 
     switch (TYPE(a)) {
       case T_FIXNUM:
       case T_SYMBOL:
-	hnum = (int)a;
+	return (int)a;
 	break;
 
       case T_STRING:
-	hnum = rb_str_hash(a);
+	return rb_str_hash(a);
 	break;
 
       default:
@@ -106,10 +105,8 @@ rb_any_hash(a)
 	if (!FIXNUM_P(hval)) {
 	    hval = rb_funcall(hval, '%', 1, INT2FIX(536870923));
 	}
-	hnum = (int)FIX2LONG(hval);
+	return (int)FIX2LONG(hval);
     }
-    hnum <<= 1;
-    return RSHIFT(hnum, 1);
 }
 
 static struct st_hash_type objhash = {
@@ -117,81 +114,39 @@ static struct st_hash_type objhash = {
     rb_any_hash,
 };
 
-typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
-
-struct foreach_safe_arg {
-    st_table *tbl;
-    st_foreach_func *func;
-    st_data_t arg;
+struct rb_hash_foreach_arg {
+    VALUE hash;
+    enum st_retval (*func)();
+    VALUE arg;
 };
 
 static int
-foreach_safe_i(key, value, arg)
-    st_data_t key, value;
-    struct foreach_safe_arg *arg;
+rb_hash_foreach_iter(key, value, arg)
+    VALUE key, value;
+    struct rb_hash_foreach_arg *arg;
 {
     int status;
+    st_table *tbl = RHASH(arg->hash)->tbl;
+    struct st_table_entry **bins = tbl->bins;
 
     if (key == Qundef) return ST_CONTINUE;
     status = (*arg->func)(key, value, arg->arg);
-    if (status == ST_CONTINUE) {
-	return ST_CHECK;
+    if (RHASH(arg->hash)->tbl != tbl || RHASH(arg->hash)->tbl->bins != bins){
+	rb_raise(rb_eIndexError, "rehash occurred during iteration");
     }
     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 = (st_foreach_func *)func;
-    arg.arg = a;
-    if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) {
-	rb_raise(rb_eRuntimeError, "hash modified during iteration");
-    }
-}
-
-typedef int rb_foreach_func(VALUE, VALUE, VALUE);
-
-struct hash_foreach_arg {
-    VALUE hash;
-    rb_foreach_func *func;
-    VALUE arg;
-};
-
-static int
-hash_foreach_iter(key, value, arg)
-    VALUE key, value;
-    struct hash_foreach_arg *arg;
+static VALUE
+rb_hash_foreach_call(arg)
+    struct rb_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;
+    st_foreach(RHASH(arg->hash)->tbl, rb_hash_foreach_iter, (st_data_t)arg);
+    return Qnil;
 }
 
 static VALUE
-hash_foreach_ensure(hash)
+rb_hash_foreach_ensure(hash)
     VALUE hash;
 {
     RHASH(hash)->iter_lev--;
@@ -205,56 +160,35 @@ hash_foreach_ensure(hash)
     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
+static int
 rb_hash_foreach(hash, func, farg)
     VALUE hash;
-    int (*func)();
+    enum st_retval (*func)();
     VALUE farg;
 {
-    struct hash_foreach_arg arg;
+    struct rb_hash_foreach_arg arg;
 
     RHASH(hash)->iter_lev++;
     arg.hash = hash;
-    arg.func = (rb_foreach_func *)func;
+    arg.func = func;
     arg.arg  = farg;
-    rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
+    return rb_ensure(rb_hash_foreach_call, (VALUE)&arg, rb_hash_foreach_ensure, hash);
 }
 
-static VALUE hash_alloc0 _((VALUE));
 static VALUE hash_alloc _((VALUE));
 static VALUE
-hash_alloc0(klass)
+hash_alloc(klass)
     VALUE klass;
 {
     NEWOBJ(hash, struct RHash);
     OBJSETUP(hash, klass, T_HASH);
 
     hash->ifnone = Qnil;
+    hash->tbl = st_init_table(&objhash);
 
     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()
 {
@@ -266,7 +200,7 @@ rb_hash_new()
  *     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
@@ -276,7 +210,7 @@ rb_hash_new()
  *  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
@@ -286,14 +220,14 @@ rb_hash_new()
  *     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
@@ -323,11 +257,11 @@ rb_hash_initialize(argc, argv, 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}
@@ -339,34 +273,20 @@ rb_hash_s_create(argc, argv, klass)
     VALUE *argv;
     VALUE klass;
 {
-    VALUE hash, tmp;
+    VALUE hash;
     int i;
 
-    if (argc == 1) {
-	tmp = rb_check_convert_type(argv[0], T_HASH, "Hash", "to_hash");
-	if (!NIL_P(tmp)) {
-	    hash = hash_alloc0(klass);
-	    RHASH(hash)->tbl = st_copy(RHASH(tmp)->tbl);
-	    return hash;
-	}
+    if (argc == 1 && TYPE(argv[0]) == T_HASH) {
+	hash = hash_alloc(klass);
+	    
+	RHASH(hash)->ifnone = Qnil;
+	RHASH(hash)->tbl = st_copy(RHASH(argv[0])->tbl);
 
-	tmp = rb_check_array_type(argv[0]);
-	if (!NIL_P(tmp)) {
-	    long i;
-
-	    hash = hash_alloc(klass);
-	    for (i = 0; i < RARRAY_LEN(tmp); ++i) {
-		VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]);
-		
-		if (NIL_P(v)) continue;
-		if (RARRAY_LEN(v) < 1 || 2 < RARRAY_LEN(v)) continue;
-		rb_hash_aset(hash, RARRAY_PTR(v)[0], RARRAY_PTR(v)[1]);
-	    }
-	    return hash;
-	}
+	return hash;
     }
+
     if (argc % 2 != 0) {
-	rb_raise(rb_eArgError, "odd number of arguments for Hash");
+	rb_raise(rb_eArgError, "odd number args for Hash");
     }
 
     hash = hash_alloc(klass);
@@ -396,13 +316,13 @@ rb_hash_rehash_i(key, value, tbl)
 /*
  *  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 }
@@ -421,7 +341,7 @@ rb_hash_rehash(hash)
 
     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_foreach(RHASH(hash)->tbl, rb_hash_rehash_i, (st_data_t)tbl);
     st_free_table(RHASH(hash)->tbl);
     RHASH(hash)->tbl = tbl;
 
@@ -431,15 +351,15 @@ rb_hash_rehash(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
@@ -454,45 +374,33 @@ rb_hash_aref(hash, key)
     return val;
 }
 
-VALUE
-rb_hash_lookup(hash, key)
-    VALUE hash, key;
-{
-    VALUE val;
-
-    if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
-	return Qnil; /* without Hash#default */
-    }
-    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
@@ -524,21 +432,21 @@ rb_hash_fetch(argc, argv, hash)
 /*
  *  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                               #=> nil
+ *     h.default                               #=> 0
  *     h.default(2)                            #=> 20
  */
 
@@ -552,7 +460,6 @@ rb_hash_default(argc, argv, hash)
 
     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;
@@ -561,11 +468,11 @@ rb_hash_default(argc, argv, hash)
 /*
  *  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
@@ -591,10 +498,10 @@ rb_hash_set_default(hash, 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 = []                             #=> []
@@ -625,33 +532,16 @@ index_i(key, value, args)
     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
@@ -663,7 +553,7 @@ rb_hash_index(hash, value)
     args[0] = value;
     args[1] = Qnil;
 
-    rb_hash_foreach(hash, index_i, (st_data_t)args);
+    st_foreach(RHASH(hash)->tbl, index_i, (st_data_t)args);
 
     return args[1];
 }
@@ -672,9 +562,9 @@ rb_hash_index(hash, value)
  *  call-seq:
  *     hsh.indexes(key, ...)    => array
  *     hsh.indices(key, ...)    => array
- *
+ *  
  *  Deprecated in favor of <code>Hash#select</code>.
- *
+ *     
  */
 
 static VALUE
@@ -700,17 +590,18 @@ rb_hash_indexes(argc, argv, hash)
  *  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 <code>nil</code>.
- *  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>.
- *
+ *  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
@@ -720,8 +611,14 @@ rb_hash_delete(hash, key)
     VALUE val;
 
     rb_hash_modify(hash);
-    val = rb_hash_delete_key(hash, key);
-    if (val != Qundef) return val;
+    if (RHASH(hash)->iter_lev > 0) {
+	if (st_delete_safe(RHASH(hash)->tbl, (st_data_t*)&key, &val, Qundef)) {
+	    FL_SET(hash, HASH_DELETED);
+	    return val;
+	}
+    }
+    else if (st_delete(RHASH(hash)->tbl, (st_data_t*)&key, &val))
+	return val;
     if (rb_block_given_p()) {
 	return rb_yield(key);
     }
@@ -729,6 +626,7 @@ rb_hash_delete(hash, key)
 }
 
 struct shift_var {
+    int stop;
     VALUE key;
     VALUE val;
 };
@@ -739,31 +637,21 @@ shift_i(key, value, var)
     struct shift_var *var;
 {
     if (key == Qundef) return ST_CONTINUE;
-    if (var->key != Qundef) return ST_STOP;
+    if (var->stop) return ST_STOP;
+    var->stop = 1;
     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"}
@@ -776,21 +664,10 @@ rb_hash_shift(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);
-    }
+    var.stop = 0;
+    st_foreach(RHASH(hash)->tbl, shift_i, (st_data_t)&var);
 
-    if (var.key != Qundef) {
+    if (var.stop) {
 	return rb_assoc_new(var.key, var.val);
     }
     else if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
@@ -801,43 +678,41 @@ rb_hash_shift(hash)
     }
 }
 
-static int
-delete_if_i(key, value, hash)
-    VALUE key, value, hash;
+static enum st_retval
+delete_if_i(key, value)
+    VALUE key, value;
 {
     if (key == Qundef) return ST_CONTINUE;
-    if (RTEST(rb_yield_values(2, key, value))) {
-	rb_hash_delete_key(hash, key);
-    }
+    if (RTEST(rb_yield_values(2, key, value)))
+	return ST_DELETE;
     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;
 {
-    RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_modify(hash);
-    rb_hash_foreach(hash, delete_if_i, hash);
+    rb_hash_foreach(hash, delete_if_i, 0);
     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.
  */
@@ -846,10 +721,7 @@ VALUE
 rb_hash_reject_bang(hash)
     VALUE hash;
 {
-    int n;
-
-    RETURN_ENUMERATOR(hash, 0, 0);
-    n = RHASH(hash)->tbl->num_entries;
+    int n = RHASH(hash)->tbl->num_entries;
     rb_hash_delete_if(hash);
     if (n == RHASH(hash)->tbl->num_entries) return Qnil;
     return hash;
@@ -858,11 +730,11 @@ rb_hash_reject_bang(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
@@ -872,7 +744,7 @@ rb_hash_reject(hash)
     return rb_hash_delete_if(rb_obj_dup(hash));
 }
 
-static int
+static enum st_retval
 select_i(key, value, result)
     VALUE key, value, result;
 {
@@ -891,7 +763,7 @@ select_i(key, value, result)
  *
  *   h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
  *   h.values_at("cow", "cat")  #=> ["bovine", "feline"]
- */
+*/
 
 VALUE
 rb_hash_values_at(argc, argv, hash)
@@ -911,23 +783,27 @@ rb_hash_values_at(argc, argv, hash)
 /*
  *  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(hash)
+rb_hash_select(argc, argv, hash)
+    int argc;
+    VALUE *argv;
     VALUE hash;
 {
     VALUE result;
 
-    RETURN_ENUMERATOR(hash, 0, 0);
+    if (argc > 0) {
+	rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
+    }
     result = rb_ary_new();
     rb_hash_foreach(hash, select_i, result);
     return result;
@@ -943,12 +819,12 @@ clear_i(key, value, dummy)
 /*
  *  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
@@ -956,9 +832,7 @@ rb_hash_clear(hash)
     VALUE hash;
 {
     rb_hash_modify(hash);
-    if (RHASH(hash)->tbl->num_entries > 0) {
-	rb_hash_foreach(hash, clear_i, 0);
-    }
+    st_foreach(RHASH(hash)->tbl, clear_i, 0);
 
     return hash;
 }
@@ -967,18 +841,18 @@ rb_hash_clear(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
@@ -1009,13 +883,13 @@ replace_i(key, val, hash)
 /*
  *  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
@@ -1025,7 +899,7 @@ rb_hash_replace(hash, hash2)
     hash2 = to_hash(hash2);
     if (hash == hash2) return hash;
     rb_hash_clear(hash);
-    rb_hash_foreach(hash2, replace_i, hash);
+    st_foreach(RHASH(hash2)->tbl, replace_i, hash);
     RHASH(hash)->ifnone = RHASH(hash2)->ifnone;
     if (FL_TEST(hash2, HASH_PROC_DEFAULT)) {
 	FL_SET(hash, HASH_PROC_DEFAULT);
@@ -1041,9 +915,9 @@ rb_hash_replace(hash, hash2)
  *  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
@@ -1061,11 +935,11 @@ rb_hash_size(hash)
 /*
  *  call-seq:
  *     hsh.empty?    => true or false
- *
+ *  
  *  Returns <code>true</code> if <i>hsh</i> contains no key-value pairs.
- *
+ *     
  *     {}.empty?   #=> true
- *
+ *     
  */
 
 static VALUE
@@ -1077,7 +951,7 @@ rb_hash_empty_p(hash)
     return Qfalse;
 }
 
-static int
+static enum st_retval
 each_value_i(key, value)
     VALUE key, value;
 {
@@ -1089,15 +963,15 @@ each_value_i(key, value)
 /*
  *  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
  */
@@ -1106,12 +980,11 @@ static VALUE
 rb_hash_each_value(hash)
     VALUE hash;
 {
-    RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_foreach(hash, each_value_i, 0);
     return hash;
 }
 
-static int
+static enum st_retval
 each_key_i(key, value)
     VALUE key, value;
 {
@@ -1123,15 +996,15 @@ each_key_i(key, value)
 /*
  *  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
  */
@@ -1139,12 +1012,11 @@ static VALUE
 rb_hash_each_key(hash)
     VALUE hash;
 {
-    RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_foreach(hash, each_key_i, 0);
     return hash;
 }
 
-static int
+static enum st_retval
 each_pair_i(key, value)
     VALUE key, value;
 {
@@ -1156,30 +1028,29 @@ each_pair_i(key, value)
 /*
  *  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;
 {
-    RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_foreach(hash, each_pair_i, 0);
     return hash;
 }
 
-static int
+static enum st_retval
 each_i(key, value)
     VALUE key, value;
 {
@@ -1191,28 +1062,27 @@ each_i(key, value)
 /*
  *  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;
 {
-    RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_foreach(hash, each_i, 0);
     return hash;
 }
@@ -1229,10 +1099,10 @@ to_a_i(key, value, ary)
 /*
  *  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]]
  */
@@ -1244,7 +1114,7 @@ rb_hash_to_a(hash)
     VALUE ary;
 
     ary = rb_ary_new();
-    rb_hash_foreach(hash, to_a_i, ary);
+    st_foreach(RHASH(hash)->tbl, to_a_i, ary);
     if (OBJ_TAINTED(hash)) OBJ_TAINT(ary);
 
     return ary;
@@ -1252,17 +1122,17 @@ rb_hash_to_a(hash)
 
 /*
  *  call-seq:
- *     hsh.sort                    => array
- *     hsh.sort {| a, b | block }  => array
- *
+ *     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
@@ -1302,7 +1172,7 @@ inspect_hash(hash)
     VALUE str;
 
     str = rb_str_buf_new2("{");
-    rb_hash_foreach(hash, inspect_i, str);
+    st_foreach(RHASH(hash)->tbl, inspect_i, str);
     rb_str_buf_cat2(str, "}");
     OBJ_INFECT(str, hash);
 
@@ -1336,12 +1206,12 @@ to_s_hash(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"
  */
@@ -1380,13 +1250,13 @@ keys_i(key, value, ary)
 /*
  *  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
@@ -1396,7 +1266,7 @@ rb_hash_keys(hash)
     VALUE ary;
 
     ary = rb_ary_new();
-    rb_hash_foreach(hash, keys_i, ary);
+    st_foreach(RHASH(hash)->tbl, keys_i, ary);
 
     return ary;
 }
@@ -1413,13 +1283,13 @@ values_i(key, value, ary)
 /*
  *  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
@@ -1429,7 +1299,7 @@ rb_hash_values(hash)
     VALUE ary;
 
     ary = rb_ary_new();
-    rb_hash_foreach(hash, values_i, ary);
+    st_foreach(RHASH(hash)->tbl, values_i, ary);
 
     return ary;
 }
@@ -1440,13 +1310,13 @@ rb_hash_values(hash)
  *     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
@@ -1476,10 +1346,10 @@ rb_hash_search_value(key, value, data)
  *  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
@@ -1494,20 +1364,18 @@ rb_hash_has_value(hash, val)
 
     data[0] = Qfalse;
     data[1] = val;
-    rb_hash_foreach(hash, rb_hash_search_value, (st_data_t)data);
+    st_foreach(RHASH(hash)->tbl, rb_hash_search_value, (st_data_t)data);
     return data[0];
 }
 
 struct equal_data {
     int result;
     st_table *tbl;
-    int eql;
 };
 
 static int
-eql_i(key, val1, data)
-    VALUE key;
-    VALUE val1;
+equal_i(key, val1, data)
+    VALUE key, val1;
     struct equal_data *data;
 {
     VALUE val2;
@@ -1517,66 +1385,22 @@ eql_i(key, val1, data)
 	data->result = Qfalse;
 	return ST_STOP;
     }
-    if (!(data->eql ? rb_eql(val1, val2) : rb_equal(val1, val2))) {
+    if (!rb_equal(val1, val2)) {
 	data->result = Qfalse;
 	return ST_STOP;
     }
     return ST_CONTINUE;
 }
 
-static VALUE recursive_eql _((VALUE, VALUE, int));
-static VALUE
-recursive_eql(hash, dt, recur)
-    VALUE hash;
-    VALUE dt;
-    int recur;
-{
-    struct equal_data *data;
-
-    if (recur) return Qfalse;
-    data = (struct equal_data*)dt;
-    data->result = Qtrue;
-    rb_hash_foreach(hash, eql_i, (st_data_t)data);
-
-    return data->result;
-}
-
-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.eql = eql;
-    return rb_exec_recursive(recursive_eql, hash1, (VALUE)&data);
-}
-
 /*
  *  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 }
@@ -1584,74 +1408,33 @@ hash_equal(hash1, hash2, eql)
  *     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
-hash_i(key, val, hval)
-    VALUE key;
-    VALUE val;
-    int *hval;
-{
-    if (key == Qundef) return ST_CONTINUE;
-    *hval ^= rb_hash(key);
-    *hval ^= rb_hash(val);
-    return ST_CONTINUE;
-}
-
-static VALUE recursive_hash _((VALUE, VALUE, int));
-static VALUE
-recursive_hash(hash, dummy, recur)
-    VALUE hash;
-    VALUE dummy;
-    int recur;
-{
-    int hval;
+    struct equal_data data;
 
-    if (recur) {
-	return LONG2FIX(0);
+    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);
     }
-    hval = RHASH(hash)->tbl->num_entries;
-    rb_hash_foreach(hash, hash_i, (st_data_t)&hval);
-    return INT2FIX(hval);
-}
-
-/*
- *  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_hash_hash(hash)
-    VALUE hash;
-{
-    return rb_exec_recursive(recursive_hash, hash, 0);
-}
-
+    if (RHASH(hash1)->tbl->num_entries != RHASH(hash2)->tbl->num_entries)
+	return Qfalse;
+    if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
+	  FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
+	return Qfalse;
 
-/*
- *  call-seq:
- *     hash.eql?(other)  -> true or false
- *
- *  Returns <code>true</code> if <i>hash</i> and <i>other</i> are
- *  both hashes with the same content.
- */
+    data.tbl = RHASH(hash2)->tbl;
+    data.result = Qtrue;
+    st_foreach(RHASH(hash1)->tbl, equal_i, (st_data_t)&data);
 
-static VALUE
-rb_hash_eql(hash1, hash2)
-    VALUE hash1, hash2;
-{
-    return hash_equal(hash1, hash2, Qtrue);
+    return data.result;
 }
 
 static int
@@ -1667,13 +1450,13 @@ rb_hash_invert_i(key, value, hash)
 /*
  *  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
@@ -1682,7 +1465,7 @@ rb_hash_invert(hash)
 {
     VALUE h = rb_hash_new();
 
-    rb_hash_foreach(hash, rb_hash_invert_i, h);
+    st_foreach(RHASH(hash)->tbl, rb_hash_invert_i, h);
     return h;
 }
 
@@ -1711,25 +1494,15 @@ rb_hash_update_block_i(key, value, hash)
 
 /*
  *  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>.  If no
- *  block is specified entries with duplicate keys are overwritten
- *  with the values from <i>other_hash</i>, otherwise the value
- *  of each duplicate key is determined by calling the block with
- *  the key, its value in <i>hsh</i> and its value in <i>other_hash</i>.
- *
+ *     hsh.merge!(other_hash)    => hsh
+ *     hsh.update(other_hash)    => 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}
- *
- *     h1 = { "a" => 100, "b" => 200 }
- *     h2 = { "b" => 254, "c" => 300 }
- *     h1.merge!(h2) { |key, v1, v2| v1 }
- *                     #=> {"a"=>100, "b"=>200, "c"=>300}
  */
 
 static VALUE
@@ -1738,28 +1511,27 @@ rb_hash_update(hash1, hash2)
 {
     hash2 = to_hash(hash2);
     if (rb_block_given_p()) {
-	rb_hash_foreach(hash2, rb_hash_update_block_i, hash1);
+	st_foreach(RHASH(hash2)->tbl, rb_hash_update_block_i, hash1);
     }
     else {
-	rb_hash_foreach(hash2, rb_hash_update_i, hash1);
+	st_foreach(RHASH(hash2)->tbl, 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
- *
+ *     hsh.merge(other_hash) -> 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
@@ -1855,8 +1627,7 @@ rb_f_getenv(obj, name)
 {
     char *nam, *env;
 
-    rb_secure(4);
-    SafeStringValue(name);
+    StringValue(name);
     nam = RSTRING(name)->ptr;
     if (strlen(nam) != RSTRING(name)->len) {
 	rb_raise(rb_eArgError, "bad environment variable name");
@@ -1888,13 +1659,12 @@ env_fetch(argc, argv)
     long block_given;
     char *nam, *env;
 
-    rb_secure(4);
     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");
     }
-    SafeStringValue(key);
+    StringValue(key);
     nam = RSTRING(key)->ptr;
     if (strlen(nam) != RSTRING(key)->len) {
 	rb_raise(rb_eArgError, "bad environment variable name");
@@ -1932,7 +1702,6 @@ rb_env_path_tainted()
     return path_tainted;
 }
 
-#if !defined(_WIN32) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
 static int
 envix(nam)
     const char *nam;
@@ -1954,7 +1723,6 @@ envix(nam)
     FREE_ENVIRON(environ);
     return i;
 }
-#endif
 
 void
 ruby_setenv(name, value)
@@ -1980,7 +1748,7 @@ ruby_setenv(name, value)
      *         RTL's environ global variable directly yet.
      */
     SetEnvironmentVariable(name,value);
-#elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
+#elif defined __CYGWIN__
 #undef setenv
 #undef unsetenv
     if (value)
@@ -1988,7 +1756,7 @@ ruby_setenv(name, value)
     else
 	unsetenv(name);
 #else  /* WIN32 */
-    size_t len;
+
     int i=envix(name);		        /* where does it go? */
 
     if (environ == origenviron) {	/* need we copy environment? */
@@ -2003,28 +1771,30 @@ ruby_setenv(name, value)
 	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;
+    if (!value) {
+	if (environ != origenviron) {
+	    char **envp = origenviron;
+	    while (*envp && *envp != environ[i]) envp++;
+	    if (!*envp)
+		free(environ[i]);
+	}
+	while (environ[i]) {
+	    environ[i] = environ[i+1];
+	    i++;
 	}
+	return;
     }
-    else {			/* does not exist yet */
-	if (!value) return;
+    if (!environ[i]) {			/* does not exist yet */
 	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);
+    else {
+	if (environ[i] != origenviron[i])
+	    free(environ[i]);
+    }
+    environ[i] = ALLOC_N(char, strlen(name) + strlen(value) + 2);
 #ifndef MSDOS
-    snprintf(environ[i],len,"%s=%s",name,value); /* all that work just for this */
+    sprintf(environ[i],"%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
@@ -2052,7 +1822,7 @@ env_aset(obj, nm, val)
     char *name, *value;
 
     if (rb_safe_level() >= 4) {
-	rb_raise(rb_eSecurityError, "can't change environment variable");
+	rb_raise(rb_eSecurityError, "cannot change environment variable");
     }
 
     if (NIL_P(val)) {
@@ -2091,10 +1861,8 @@ static VALUE
 env_keys()
 {
     char **env;
-    VALUE ary;
+    VALUE ary = rb_ary_new();
 
-    rb_secure(4);
-    ary = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2111,11 +1879,9 @@ static VALUE
 env_each_key(ehash)
     VALUE ehash;
 {
-    VALUE keys;
+    VALUE keys = env_keys();
     long i;
 
-    RETURN_ENUMERATOR(ehash, 0, 0);
-    keys = env_keys();	/* rb_secure(4); */
     for (i=0; i<RARRAY(keys)->len; i++) {
 	rb_yield(RARRAY(keys)->ptr[i]);
     }
@@ -2125,11 +1891,9 @@ env_each_key(ehash)
 static VALUE
 env_values()
 {
-    VALUE ary;
     char **env;
+    VALUE ary = rb_ary_new();
 
-    rb_secure(4);
-    ary = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2146,11 +1910,9 @@ static VALUE
 env_each_value(ehash)
     VALUE ehash;
 {
-    VALUE values;
+    VALUE values = env_values();
     long i;
 
-    RETURN_ENUMERATOR(ehash, 0, 0);
-    values = env_values();	/* rb_secure(4); */
     for (i=0; i<RARRAY(values)->len; i++) {
 	rb_yield(RARRAY(values)->ptr[i]);
     }
@@ -2163,11 +1925,9 @@ env_each_i(ehash, values)
     int values;
 {
     char **env;
-    VALUE ary;
+    VALUE ary = rb_ary_new();
     long i;
 
-    rb_secure(4);
-    ary = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2194,7 +1954,6 @@ static VALUE
 env_each(ehash)
     VALUE ehash;
 {
-    RETURN_ENUMERATOR(ehash, 0, 0);
     return env_each_i(ehash, Qfalse);
 }
 
@@ -2202,20 +1961,19 @@ static VALUE
 env_each_pair(ehash)
     VALUE ehash;
 {
-    RETURN_ENUMERATOR(ehash, 0, 0);
     return env_each_i(ehash, Qtrue);
 }
 
 static VALUE
-env_reject_bang(ehash)
-    VALUE ehash;
+env_reject_bang()
 {
     volatile VALUE keys;
     long i;
     int del = 0;
 
-    RETURN_ENUMERATOR(ehash, 0, 0);
-    keys = env_keys();	/* rb_secure(4); */
+    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)) {
@@ -2231,11 +1989,9 @@ env_reject_bang(ehash)
 }
 
 static VALUE
-env_delete_if(ehash)
-    VALUE ehash;
+env_delete_if()
 {
-    RETURN_ENUMERATOR(ehash, 0, 0);
-    env_reject_bang(ehash);
+    env_reject_bang();
     return envtbl;
 }
 
@@ -2244,11 +2000,9 @@ env_values_at(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE result;
+    VALUE result = rb_ary_new();
     long i;
 
-    rb_secure(4);
-    result = rb_ary_new();
     for (i=0; i<argc; i++) {
 	rb_ary_push(result, rb_f_getenv(Qnil, argv[i]));
     }
@@ -2256,14 +2010,16 @@ env_values_at(argc, argv)
 }
 
 static VALUE
-env_select(ehash)
-    VALUE ehash;
+env_select(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE result;
     char **env;
 
-    RETURN_ENUMERATOR(ehash, 0, 0);
-    rb_secure(4);
+    if (argc > 0) {
+	rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
+    }
     result = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
@@ -2287,8 +2043,10 @@ env_clear()
 {
     volatile VALUE keys;
     long i;
+    
+    rb_secure(4);
+    keys = env_keys();
 
-    keys = env_keys();	/* rb_secure(4); */
     for (i=0; i<RARRAY(keys)->len; i++) {
 	VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
 	if (!NIL_P(val)) {
@@ -2308,10 +2066,9 @@ static VALUE
 env_inspect()
 {
     char **env;
-    VALUE str, i;
+    VALUE str = rb_str_buf_new2("{");
+    VALUE i;
 
-    rb_secure(4);
-    str = rb_str_buf_new2("{");
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2339,10 +2096,8 @@ static VALUE
 env_to_a()
 {
     char **env;
-    VALUE ary;
+    VALUE ary = rb_ary_new();
 
-    rb_secure(4);
-    ary = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2368,7 +2123,6 @@ env_size()
     int i;
     char **env;
 
-    rb_secure(4);
     env = GET_ENVIRON(environ);
     for(i=0; env[i]; i++)
 	;
@@ -2381,7 +2135,6 @@ env_empty_p()
 {
     char **env;
 
-    rb_secure(4);
     env = GET_ENVIRON(environ);
     if (env[0] == 0) {
 	FREE_ENVIRON(environ);
@@ -2397,7 +2150,6 @@ env_has_key(env, key)
 {
     char *s;
 
-    rb_secure(4);
     s = StringValuePtr(key);
     if (strlen(s) != RSTRING(key)->len)
 	rb_raise(rb_eArgError, "bad environment variable name");
@@ -2411,9 +2163,7 @@ env_has_value(dmy, value)
 {
     char **env;
 
-    rb_secure(4);
-    value = rb_check_string_type(value);
-    if (NIL_P(value)) return Qfalse;
+    if (TYPE(value) != T_STRING) return Qfalse;
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2437,7 +2187,6 @@ env_index(dmy, value)
     char **env;
     VALUE str;
 
-    rb_secure(4);
     StringValue(value);
     env = GET_ENVIRON(environ);
     while (*env) {
@@ -2466,7 +2215,6 @@ env_indexes(argc, argv)
 
     rb_warn("ENV.%s is deprecated; use ENV.values_at",
 	    rb_id2name(rb_frame_last_func()));
-    rb_secure(4);
     for (i=0;i<argc;i++) {
 	VALUE tmp = rb_check_string_type(argv[i]);
 	if (NIL_P(tmp)) {
@@ -2485,10 +2233,8 @@ static VALUE
 env_to_hash()
 {
     char **env;
-    VALUE hash;
+    VALUE hash = rb_hash_new();
 
-    rb_secure(4);
-    hash = rb_hash_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2513,7 +2259,6 @@ env_shift()
 {
     char **env;
 
-    rb_secure(4);
     env = GET_ENVIRON(environ);
     if (*env) {
 	char *s = strchr(*env, '=');
@@ -2551,13 +2296,12 @@ static VALUE
 env_replace(env, hash)
     VALUE env, hash;
 {
-    volatile VALUE keys;
+    volatile VALUE keys = env_keys();
     long i;
 
-    keys = env_keys();	/* rb_secure(4); */
     if (env == hash) return env;
     hash = to_hash(hash);
-    rb_hash_foreach(hash, env_replace_i, keys);
+    st_foreach(RHASH(hash)->tbl, env_replace_i, keys);
 
     for (i=0; i<RARRAY(keys)->len; i++) {
 	env_delete(env, RARRAY(keys)->ptr[i]);
@@ -2582,10 +2326,9 @@ static VALUE
 env_update(env, hash)
     VALUE env, hash;
 {
-    rb_secure(4);
     if (env == hash) return env;
     hash = to_hash(hash);
-    rb_hash_foreach(hash, env_update_i, 0);
+    st_foreach(RHASH(hash)->tbl, env_update_i, 0);
     return env;
 }
 
@@ -2595,43 +2338,11 @@ env_update(env, hash)
  *  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
@@ -2658,8 +2369,6 @@ Init_Hash()
 
     rb_define_method(rb_cHash,"==", rb_hash_equal, 1);
     rb_define_method(rb_cHash,"[]", rb_hash_aref, 1);
-    rb_define_method(rb_cHash,"hash", rb_hash_hash, 0);
-    rb_define_method(rb_cHash,"eql?", rb_hash_eql, 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);
@@ -2686,7 +2395,7 @@ Init_Hash()
     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, 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);
@@ -2721,7 +2430,7 @@ Init_Hash()
     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, 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);
diff --git a/ia64.s b/ia64.s
deleted file mode 100644
index ba5241daf2..0000000000
--- a/ia64.s
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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/inits.c b/inits.c
index 947bbbe242..052573a443 100644
--- a/inits.c
+++ b/inits.c
@@ -18,7 +18,6 @@ void Init_Binding _((void));
 void Init_Comparable _((void));
 void Init_Dir _((void));
 void Init_Enumerable _((void));
-void Init_Enumerator _((void));
 void Init_Exception _((void));
 void Init_syserr _((void));
 void Init_eval _((void));
@@ -80,7 +79,6 @@ rb_call_inits()
     Init_Binding();
     Init_Math();
     Init_GC();
-    Init_Enumerator();
     Init_marshal();
     Init_version();
 }
diff --git a/instruby.rb b/instruby.rb
index 2903a7c739..c5a906a7c5 100755..100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -1,90 +1,38 @@
 #!./miniruby
 
 load "./rbconfig.rb"
-include RbConfig
+include Config
 
-srcdir = File.dirname(__FILE__)
-$:.unshift File.expand_path("lib", srcdir)
+$:.unshift File.join(CONFIG["srcdir"], "lib")
 require 'fileutils'
 require 'shellwords'
-require 'optparse'
-require 'optparse/shellwords'
+require 'getopts'
 require 'tempfile'
 
-STDOUT.sync = true
 File.umask(0)
 
-def parse_args(argv = ARGV)
-  $mantype = 'doc'
-  $destdir = nil
-  $extout = nil
-  $make = 'make'
-  $mflags = []
-  $install = []
-  $installed_list = nil
-  $dryrun = false
-  $rdocdir = nil
-  $data_mode = 0644
-  $prog_mode = 0755
-  $dir_mode = nil
-  $script_mode = nil
-  $cmdtype = ('bat' if File::ALT_SEPARATOR == '\\')
-  mflags = []
-  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, :"bin-arch", :"bin-comm", :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc]) do |ins|
-    $install << ins
-  end
-  opt.on('--data-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode|
-    $data_mode = mode
-  end
-  opt.on('--prog-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode|
-    $prog_mode = mode
-  end
-  opt.on('--dir-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode|
-    $dir_mode = mode
-  end
-  opt.on('--script-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode|
-    $script_mode = mode
+def parse_args()
+  getopts('n', 'dest-dir:',
+	  'make:', 'make-flags:', 'mflags:',
+	  'mantype:doc')
+
+  $dryrun = $OPT['n']
+  $destdir = $OPT['dest-dir'] || ''
+  $make = $OPT['make'] || $make || 'make'
+  $mantype = $OPT['mantype']
+  mflags = ($OPT['make-flags'] || '').strip
+  mflags = ($OPT['mflags'] || '').strip if mflags.empty?
+
+  $mflags = Shellwords.shellwords(mflags)
+  if arg = $mflags.first
+    arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
   end
-  opt.on('--installed-list [FILENAME]') {|name| $installed_list = name}
-  opt.on('--rdoc-output [DIR]') {|dir| $rdocdir = dir}
-  opt.on('--cmd-type=TYPE', %w[bat cmd plain]) {|cmd| $cmdtype = (cmd unless cmd == 'plain')}
-
-  opt.order!(argv) do |v|
-    case v
-    when /\AINSTALL[-_]([-\w]+)=(.*)/
-      argv.unshift("--#{$1.tr('_', '-')}=#{$2}")
-    when /\A\w[-\w+]*=\z/
-      mflags << v
-    when /\A\w[-\w+]*\z/
-      $install << v.intern
-    else
-      raise OptionParser::InvalidArgument, v
-    end
-  end rescue abort [$!.message, opt].join("\n")
 
   $make, *rest = Shellwords.shellwords($make)
   $mflags.unshift(*rest) unless rest.empty?
-  $mflags.unshift(*mflags)
 
   def $mflags.set?(flag)
-    grep(/\A-(?!-).*#{flag.chr}/i) { return true }
-    false
-  end
-  def $mflags.defined?(var)
-    grep(/\A#{var}=(.*)/) {return block_given? ? yield($1) : $1}
+    grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
     false
   end
 
@@ -94,111 +42,33 @@ def parse_args(argv = ARGV)
     $mflags << '-n' if $dryrun
   end
 
-  $destdir ||= $mflags.defined?("DESTDIR")
-  if $extout ||= $mflags.defined?("EXTOUT")
-    Config.expand($extout)
-  end
+  $mflags << "DESTDIR=#{$destdir}"
 
   $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')
-
-  $dir_mode ||= $prog_mode | 0700
-  $script_mode ||= $prog_mode
 end
 
 parse_args()
 
-include FileUtils
+include FileUtils::Verbose
 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
+  super
 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
+  dirs.reject! do |dir|
+    $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 => $dir_mode) unless dirs.empty?
-end
-
-def install_recursive(srcdir, dest, options = {})
-  opts = options.clone
-  noinst = opts.delete(:no_install)
-  glob = opts.delete(:glob) || "*"
-  subpath = srcdir.size..-1
-  Dir.glob("#{srcdir}/**/#{glob}") do |src|
-    case base = File.basename(src)
-    when /\A\#.*\#\z/, /~\z/
-      next
-    end
-    if noinst
-      if Array === noinst
-        next if noinst.any? {|n| File.fnmatch?(n, base)}
-      else
-        next if File.fnmatch?(noinst, base)
-      end
-    end
-    d = dest + src[subpath]
-    if File.directory?(src)
-      makedirs(d)
-    else
-      makedirs(File.dirname(d))
-      install src, d, opts
-    end
-  end
-end
-
-def open_for_install(path, mode)
-  data = open(realpath = with_destdir(path), "rb") {|f| f.read} rescue nil
-  newdata = yield
-  unless $dryrun
-    unless newdata == data
-      open(realpath, "wb", mode) {|f| f.write newdata}
+      File.directory?(dir)
     end
-    File.chmod(mode, realpath)
   end
-  $installed_list.puts path if $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
+  super(dirs, :mode => 0755, :verbose => true) unless dirs.empty?
 end
 
 exeext = CONFIG["EXEEXT"]
@@ -207,204 +77,130 @@ 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"]
-vendorlibdir = CONFIG["vendorlibdir"]
-vendorarchlibdir = CONFIG["vendorarchdir"]
-mandir = File.join(CONFIG["mandir"], "man")
+bindir = $destdir+CONFIG["bindir"]
+libdir = $destdir+CONFIG["libdir"]
+rubylibdir = $destdir+CONFIG["rubylibdir"]
+archlibdir = $destdir+CONFIG["archdir"]
+sitelibdir = $destdir+CONFIG["sitelibdir"]
+sitearchlibdir = $destdir+CONFIG["sitearchdir"]
+mandir = File.join($destdir+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, :'bin-arch') do
-  puts "installing binary commands"
-
-  makedirs [bindir, libdir, archlibdir]
+makedirs [bindir, libdir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir]
 
-  install ruby_install_name+exeext, bindir, :mode => $prog_mode
-  if rubyw_install_name and !rubyw_install_name.empty?
-    install rubyw_install_name+exeext, bindir, :mode => $prog_mode
-  end
-  if enable_shared and dll != lib
-    install dll, bindir, :mode => $prog_mode
-  end
-  install lib, libdir, :mode => $prog_mode unless lib == arc
-  install arc, libdir, :mode => $data_mode
-  install "config.h", archlibdir, :mode => $data_mode
-  install "rbconfig.rb", archlibdir, :mode => $data_mode
-  if CONFIG["ARCHFILE"]
-    for file in CONFIG["ARCHFILE"].split
-      install file, archlibdir, :mode => $data_mode
-    end
-  end
+ruby_bin = File.join(bindir, ruby_install_name)
 
-  if dll == lib and dll != arc
-    for link in CONFIG["LIBRUBY_ALIASES"].split
-      ln_sf(dll, File.join(libdir, link))
-    end
+install ruby_install_name+exeext, ruby_bin+exeext, :mode => 0755
+if rubyw_install_name and !rubyw_install_name.empty?
+  install rubyw_install_name+exeext, bindir, :mode => 0755
+end
+install dll, bindir, :mode => 0755 if enable_shared and dll != lib
+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 $extout
-  extout = "#$extout"
-  install?(:ext, :arch, :'ext-arch') do
-    puts "installing extension objects"
-    makedirs [archlibdir, sitearchlibdir, vendorarchlibdir]
-    if noinst = CONFIG["no_install_files"] and noinst.empty?
-      noinst = nil
-    end
-    install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => $prog_mode)
-  end
-  install?(:ext, :comm, :'ext-comm') do
-    puts "installing extension scripts"
-    makedirs [rubylibdir, sitelibdir, vendorlibdir]
-    install_recursive("#{extout}/common", rubylibdir, :mode => $data_mode)
+if dll == lib and dll != arc
+  for link in CONFIG["LIBRUBY_ALIASES"].split
+    ln_sf(dll, File.join(libdir, link))
   end
 end
 
-install?(:rdoc) do
-  if $rdocdir
-    puts "installing rdoc"
+Dir.chdir CONFIG["srcdir"]
 
-    ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR)/system')
-    Config.expand(ridatadir)
-    makedirs [ridatadir]
-    install_recursive($rdocdir, ridatadir, :mode => $data_mode)
-  end
-end
+ruby_shebang = File.join(CONFIG["bindir"], ruby_install_name)
+for src in Dir["bin/*"]
+  next unless File.file?(src)
+  next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
 
-install?(:local, :comm, :bin, :'bin-comm') do
-  puts "installing command scripts"
+  name = ruby_install_name.sub(/ruby/, File.basename(src))
+  dest = File.join(bindir, name)
 
-  Dir.chdir srcdir
-  makedirs [bindir, rubylibdir]
+  install src, dest, :mode => 0755
 
-  ruby_shebang = File.join(bindir, ruby_install_name)
-  if File::ALT_SEPARATOR
-    ruby_bin = 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
+  next if $dryrun
 
-    name = ruby_install_name.sub(/ruby/, File.basename(src))
+  shebang = ''
+  body = ''
+  open(dest, "r+") { |f|
+    shebang = f.gets
+    body = f.read
 
-    shebang = ''
-    body = ''
-    open(src, "rb") do |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
-    shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang}
-    shebang.sub!(/\r$/, '')
-    body.gsub!(/\r$/, '')
-
-    cmd = File.join(bindir, name)
-    cmd << ".#{$cmdtype}" if $cmdtype
-    open_for_install(cmd, $script_mode) do
-      case $cmdtype
-      when "bat"
-        "#{<<EOH}#{shebang}#{body}#{<<EOF}".gsub(/$/, "\r")
+  }
+
+  if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
+    ruby_bin_dosish = ruby_bin.gsub(Regexp.compile(File::SEPARATOR), File::ALT_SEPARATOR)
+    batfile = dest + ".bat"
+    open(batfile, "w") { |b|
+      b.print <<EOH, shebang, body, <<EOF
 @echo off
-@if not "%~d0" == "~d0" goto WinNT
-#{ruby_bin} -x "#{cmd}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-@goto endofruby
+if "%OS%" == "Windows_NT" 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
+#{ruby_bin_dosish} -x "#{batfile}" %*
+goto endofruby
 EOH
 __END__
 :endofruby
 EOF
-      when "cmd"
-        "#{<<EOH}#{shebang}#{body}"
-@"%~dp0#{ruby_install_name}" -x "%~f0" %*
-@exit /b %ERRORLEVEL%
-EOH
-      else
-        shebang + body
-      end
-    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 => $data_mode
-  end
+for f in Dir["lib/**/*{.rb,help-message}"]
+  dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir
+  makedirs dir
+  install f, dir, :mode => 0644
 end
 
-install?(:local, :arch, :lib) do
-  puts "installing headers"
-
-  Dir.chdir(srcdir)
-  makedirs [archlibdir]
-  for f in Dir["*.h"]
-    install f, archlibdir, :mode => $data_mode
-  end
-
-  if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
-    win32libdir = File.join(archlibdir, "win32")
-    makedirs win32libdir
-    install "win32/win32.h", win32libdir, :mode => $data_mode
-  end
+for f in Dir["*.h"]
+  install f, archlibdir, :mode => 0644
 end
 
-install?(:local, :comm, :man) do
-  puts "installing manpages"
+if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
+  makedirs File.join(archlibdir, "win32")
+  install "win32/win32.h", File.join(archlibdir, "win32"), :mode => 0644
+end
 
-  Dir.chdir(srcdir)
-  for mdoc in Dir["*.[1-9]"]
-    next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'}
+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))
+  section = mdoc[-1,1]
 
-    makedirs destdir
+  destdir = mandir + section
+  destfile = File.join(destdir, mdoc.sub(/ruby/, ruby_install_name))
 
-    if $mantype == "doc"
-      install mdoc, destfile, :mode => $data_mode
-    else
-      require 'mdoc2man.rb'
+  makedirs destdir
 
-      w = Tempfile.open(mdoc)
+  if $mantype == "doc"
+    install mdoc, destfile, :mode => 0644
+  else
+    require 'mdoc2man.rb'
 
-      open(mdoc) { |r|
-        Mdoc2Man.mdoc2man(r, w)
-      }
+    w = Tempfile.open(mdoc)
 
-      w.close
+    open(mdoc) { |r|
+      Mdoc2Man.mdoc2man(r, w)
+    }
 
-      install w.path, destfile, :mode => $data_mode
-    end
-  end
-end
+    w.close
 
-$install << :local << :ext if $install.empty?
-$install.each do |inst|
-  if !(procs = $install_procs[inst]) || procs.empty?
-    next warn("unknown install target - #{inst}")
-  end
-  procs.each do |block|
-    dir = Dir.pwd
-    begin
-      block.call
-    ensure
-      Dir.chdir(dir)
-    end
+    install w.path, destfile, :mode => 0644
   end
 end
 
diff --git a/intern.h b/intern.h
index 7e72dd5537..5d7e9e78f3 100644
--- a/intern.h
+++ b/intern.h
@@ -70,7 +70,6 @@ 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));
@@ -114,7 +113,6 @@ 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));
@@ -128,14 +126,6 @@ VALUE rb_singleton_class _((VALUE));
 int rb_cmpint _((VALUE, VALUE, VALUE));
 NORETURN(void rb_cmperr _((VALUE, VALUE)));
 /* enum.c */
-VALUE rb_block_call _((VALUE, ID, int, VALUE*, VALUE (*)(ANYARGS), VALUE));
-/* enumerator.c */
-VALUE rb_enumeratorize _((VALUE, VALUE, int, VALUE *));
-#define RETURN_ENUMERATOR(obj, argc, argv) do {				\
-	if (!rb_block_given_p())					\
-	    return rb_enumeratorize(obj, ID2SYM(rb_frame_this_func()),	\
-				    argc, argv);			\
-    } while (0)
 /* error.c */
 RUBY_EXTERN int ruby_nerrs;
 VALUE rb_exc_new _((VALUE, const char*, long));
@@ -146,8 +136,8 @@ 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*)));
+NORETURN(void rb_load_fail _((char*)));
+NORETURN(void rb_error_frozen _((char*)));
 void rb_check_frozen _((VALUE));
 /* eval.c */
 RUBY_EXTERN struct RNode *ruby_current_node;
@@ -174,13 +164,11 @@ 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));
-ID rb_frame_this_func _((void));
 VALUE rb_obj_instance_eval _((int, VALUE*, VALUE));
 VALUE rb_mod_module_eval _((int, VALUE*, VALUE));
 void rb_load _((VALUE, int));
@@ -193,11 +181,8 @@ 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_block_dup _((VALUE, VALUE, VALUE));
-VALUE rb_method_dup _((VALUE, VALUE, VALUE));
 VALUE rb_f_lambda _((void));
-VALUE rb_proc_call _((VALUE, VALUE));
-VALUE rb_obj_method _((VALUE, VALUE));
+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));
@@ -219,27 +204,22 @@ 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));
+void rb_thread_trap_eval _((VALUE, int));
+void rb_thread_signal_raise _((char*));
+int rb_thread_select(ANYARGS);
+void rb_thread_wait_for(ANYARGS);
 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_exec_recursive _((VALUE(*)(VALUE, VALUE, int),VALUE,VALUE));
-VALUE rb_funcall_rescue __((VALUE, ID, int, ...));
 /* file.c */
+int eaccess _((const char*, int));
 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));
@@ -247,12 +227,10 @@ 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**));
-int rb_during_gc _((void));
 char *rb_source_filename _((const char*));
 void rb_gc_mark_locations _((VALUE*, VALUE*));
 void rb_mark_tbl _((struct st_table*));
@@ -262,23 +240,19 @@ 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_lookup _((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 _((const char*));
+int rb_path_check _((char*));
 int rb_env_path_tainted _((void));
 /* io.c */
 #define rb_defout rb_stdout
@@ -331,10 +305,8 @@ 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_check_to_integer _((VALUE, const char *));
 VALUE rb_to_int _((VALUE));
 VALUE rb_Integer _((VALUE));
 VALUE rb_Float _((VALUE));
@@ -356,8 +328,6 @@ 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));
@@ -374,13 +344,10 @@ VALUE rb_detach_process _((int));
 VALUE rb_range_new _((VALUE, VALUE, int));
 VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
 VALUE rb_length_by_each _((VALUE));
-/* random.c */
-unsigned long rb_genrand_int32(void);
-double rb_genrand_real(void);
 /* 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));
+int rb_memcmp _((char*,char*,long));
+int rb_memcicmp _((char*,char*,long));
+long rb_memsearch _((char*,long,char*,long));
 VALUE rb_reg_nth_defined _((int, VALUE));
 VALUE rb_reg_nth_match _((int, VALUE));
 VALUE rb_reg_last_match _((VALUE));
@@ -393,13 +360,11 @@ 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 rb_load_file _((char*));
+void ruby_script _((char*));
 void ruby_prog_init _((void));
 void ruby_set_argv _((int, char**));
 void ruby_process_options _((int, char**));
@@ -416,10 +381,8 @@ void posix_signal _((int, RETSIGTYPE (*)(int)));
 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*));
-VALUE rb_str_format _((int, VALUE*, VALUE));
 /* string.c */
 VALUE rb_str_new _((const char*, long));
 VALUE rb_str_new2 _((const char*));
@@ -430,22 +393,18 @@ 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_tmp_new _((long));
 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));
-void rb_str_set_len _((VALUE, long));
 VALUE rb_str_resize _((VALUE, long));
 VALUE rb_str_cat _((VALUE, const char*, long));
 VALUE rb_str_cat2 _((VALUE, const char*));
@@ -469,20 +428,17 @@ 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, const char*));
-VALUE rb_struct_s_members _((VALUE));
-VALUE rb_struct_members _((VALUE));
+VALUE rb_struct_iv_get _((VALUE, char*));
 /* time.c */
-VALUE rb_time_new _((time_t, time_t));
+VALUE rb_time_new(ANYARGS);
 /* 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));
+void 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*));
diff --git a/io.c b/io.c
index 7663733d1e..8f9c9d59b9 100644
--- a/io.c
+++ b/io.c
@@ -21,7 +21,6 @@
 #include "rubyio.h"
 #include "rubysig.h"
 #include "env.h"
-#include "re.h"
 #include <ctype.h>
 #include <errno.h>
 
@@ -33,7 +32,7 @@
 # define NO_LONG_FNAME
 #endif
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(sun) || defined(_nec_ews)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(sun) || defined(_nec_ews)
 # define USE_SETVBUF
 #endif
 
@@ -42,7 +41,7 @@
 #endif
 
 #include <sys/types.h>
-#if defined(HAVE_SYS_IOCTL_H) && !defined(DJGPP) && !defined(_WIN32) && !defined(__human68k__)
+#if !defined(DJGPP) && !defined(_WIN32) && !defined(__human68k__)
 #include <sys/ioctl.h>
 #endif
 #if defined(HAVE_FCNTL_H) || defined(_WIN32)
@@ -50,9 +49,6 @@
 #elif defined(HAVE_SYS_FCNTL_H)
 #include <sys/fcntl.h>
 #endif
-#ifdef __CYGWIN__
-#include <io.h>
-#endif
 
 #if !HAVE_OFF_T && !defined(off_t)
 # define off_t  long
@@ -76,12 +72,6 @@
 #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
 
@@ -96,22 +86,10 @@ extern void Init_File _((void));
 
 #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;
@@ -136,7 +114,7 @@ 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);
+static VALUE lineno;
 
 #ifdef _STDIO_USES_IOSTREAM  /* GNU libc */
 #  ifdef _IO_fpos_t
@@ -148,19 +126,6 @@ static VALUE lineno = INT2FIX(0);
 #    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)
@@ -170,13 +135,7 @@ typedef struct _FILE64 {
 #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)
+#  define READ_DATA_PENDING(fp) (((unsigned int)((*(fp))->_flag) & _IOEOF) == 0)
 #else
 /* requires systems own version of the ReadDataPending() */
 extern int ReadDataPending();
@@ -208,7 +167,7 @@ extern int ReadDataPending();
 void
 rb_eof_error()
 {
-    rb_raise(rb_eEOFError, "end of file reached");
+    rb_raise(rb_eEOFError, "End of file reached");
 }
 
 VALUE
@@ -222,34 +181,26 @@ rb_io_taint_check(io)
 }
 
 void
-rb_io_check_initialized(fptr)
-    rb_io_t *fptr;
+rb_io_check_closed(fptr)
+    OpenFile *fptr;
 {
     if (!fptr) {
 	rb_raise(rb_eIOError, "uninitialized stream");
     }
-}
-
-void
-rb_io_check_closed(fptr)
-    rb_io_t *fptr;
-{
-    rb_io_check_initialized(fptr);
     if (!fptr->f && !fptr->f2) {
 	rb_raise(rb_eIOError, "closed stream");
     }
 }
 
-static void io_fflush _((FILE *, rb_io_t *));
+static void io_fflush _((FILE *, OpenFile *));
 
-static rb_io_t *
+static OpenFile *
 flush_before_seek(fptr)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     if (fptr->mode & FMODE_WBUF) {
 	io_fflush(GetWriteFile(fptr), fptr);
     }
-    errno = 0;
     return fptr;
 }
 
@@ -266,13 +217,13 @@ flush_before_seek(fptr)
 
 void
 rb_io_check_readable(fptr)
-    rb_io_t *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 NEED_IO_SEEK_BETWEEN_RW
     if (((fptr->mode & FMODE_WBUF) ||
 	 (fptr->mode & (FMODE_SYNCWRITE|FMODE_RBUF)) == FMODE_SYNCWRITE) &&
 	!feof(fptr->f) &&
@@ -285,15 +236,17 @@ rb_io_check_readable(fptr)
 
 void
 rb_io_check_writable(fptr)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     rb_io_check_closed(fptr);
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
+#if NEED_IO_SEEK_BETWEEN_RW
     if ((fptr->mode & FMODE_RBUF) && !feof(fptr->f) && !fptr->f2) {
 	io_seek(fptr, 0, SEEK_CUR);
     }
+#endif
     if (!fptr->f2) {
 	fptr->mode &= ~FMODE_RBUF;
     }
@@ -323,7 +276,7 @@ ruby_dup(orig)
 
     fd = dup(orig);
     if (fd < 0) {
-	if (errno == EMFILE || errno == ENFILE || errno == ENOMEM) {
+	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
 	    fd = dup(orig);
 	}
@@ -350,7 +303,7 @@ io_alloc(klass)
 static void
 io_fflush(f, fptr)
     FILE *f;
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     int n;
 
@@ -358,9 +311,7 @@ io_fflush(f, fptr)
         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);
@@ -424,104 +375,29 @@ rb_io_wait_writable(f)
     }
 }
 
-#ifndef S_ISREG
-#   define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
-#endif
-
-static int
-wsplit_p(rb_io_t *fptr)
-{
-    FILE *f = GetWriteFile(fptr);
-#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
-    int r;
-#endif
-
-    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;
-    rb_io_t *fptr;
+long
+rb_io_fwrite(ptr, len, f)
+    const char *ptr;
+    long len;
+    FILE *f;
 {
-    long len, n, r, l, offset = 0;
-    FILE *f = GetWriteFile(fptr);
+    long n, r;
 
-    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)
+#ifdef __human68k__
     do {
-	if (fputc(RSTRING(str)->ptr[offset++], f) == EOF) {
+	if (fputc(*ptr++, 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
+    while (ptr += (r = fwrite(ptr, 1, n, f)), (n -= r) > 0) {
+	if (ferror(f)) {
 	    if (rb_io_wait_writable(fileno(f))) {
-		rb_io_check_closed(fptr);
 		clearerr(f);
-		if (offset < RSTRING(str)->len)
-		    continue;
+		continue;
 	    }
 	    return -1L;
 	}
@@ -530,44 +406,12 @@ io_fwrite(str, fptr)
     return len - n;
 }
 
-long
-rb_io_fwrite(ptr, len, f)
-    const char *ptr;
-    long len;
-    FILE *f;
-{
-    rb_io_t 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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
+    FILE *f;
     long n;
 
     rb_secure(4);
@@ -582,10 +426,14 @@ io_write(io, str)
 
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
+    f = GetWriteFile(fptr);
 
-    n = io_fwrite(str, fptr);
+    n = rb_io_fwrite(RSTRING(str)->ptr, RSTRING(str)->len, f);
     if (n == -1L) rb_sys_fail(fptr->path);
-    if (!(fptr->mode & FMODE_SYNC)) {
+    if (fptr->mode & FMODE_SYNC) {
+	io_fflush(f, fptr);
+    }
+    else {
 	fptr->mode |= FMODE_WBUF;
     }
 
@@ -599,21 +447,6 @@ rb_io_write(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;
@@ -622,27 +455,11 @@ rb_io_addstr(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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     FILE *f;
 
     GetOpenFile(io, fptr);
@@ -654,29 +471,16 @@ rb_io_flush(io)
     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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     off_t pos;
 
     GetOpenFile(io, fptr);
     pos = io_tell(fptr);
-    if (pos < 0 && errno) rb_sys_fail(fptr->path);
+    if (pos < 0) rb_sys_fail(fptr->path);
     return OFFT2NUM(pos);
 }
 
@@ -685,39 +489,17 @@ rb_io_seek(io, offset, whence)
     VALUE io, offset;
     int whence;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     off_t pos;
 
-    pos = NUM2OFFT(offset);
     GetOpenFile(io, fptr);
-    pos = io_seek(fptr, pos, whence);
-    if (pos < 0 && errno) rb_sys_fail(fptr->path);
+    pos = io_seek(fptr, NUM2OFFT(offset), 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;
@@ -734,52 +516,26 @@ rb_io_seek_m(argc, argv, io)
     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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     off_t pos;
 
-    pos = NUM2OFFT(offset);
     GetOpenFile(io, fptr);
-    pos = io_seek(fptr, pos, SEEK_SET);
+    pos = io_seek(fptr, NUM2OFFT(offset), 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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     GetOpenFile(io, fptr);
     if (io_seek(fptr, 0L, 0) != 0) rb_sys_fail(fptr->path);
@@ -792,43 +548,11 @@ rb_io_rewind(io)
     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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int ch;
 
     GetOpenFile(io, fptr);
@@ -837,7 +561,6 @@ rb_io_eof(io)
     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;
@@ -846,54 +569,25 @@ rb_io_eof(io)
 	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;
 {
-    rb_io_t *fptr;
+    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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     GetOpenFile(io, fptr);
     if (RTEST(mode)) {
@@ -905,27 +599,16 @@ rb_io_set_sync(io, mode)
     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
-    rb_io_t *fptr;
+    OpenFile *fptr;
     FILE *f;
 
     GetOpenFile(io, fptr);
+    rb_io_check_writable(fptr);
     f = GetWriteFile(fptr);
 
     io_fflush(f, fptr);
@@ -938,23 +621,11 @@ rb_io_fsync(io)
 #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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int fd;
 
     GetOpenFile(io, fptr);
@@ -962,31 +633,11 @@ rb_io_fileno(io)
     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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     GetOpenFile(io, fptr);
     if (!fptr->pid)
@@ -994,20 +645,12 @@ rb_io_pid(io)
     return INT2FIX(fptr->pid);
 }
 
-/*
- * call-seq:
- *   ios.inspect   => string
- *
- * Return a string describing this IO object.
- */
-
 static VALUE
 rb_io_inspect(obj)
     VALUE obj;
 {
-    rb_io_t *fptr;
-    char *buf;
-    const char *cname, *st = "";
+    OpenFile *fptr;
+    char *buf, *cname, *st = "";
     long len;
 
     fptr = RFILE(rb_io_taint_check(obj))->fptr;
@@ -1019,17 +662,10 @@ rb_io_inspect(obj)
 	len += 9;
     }
     buf = ALLOCA_N(char, len);
-    snprintf(buf, len, "#<%s:%s%s>", cname, fptr->path, st);
+    sprintf(buf, "#<%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;
@@ -1038,75 +674,63 @@ rb_io_to_io(io)
 }
 
 /* reading functions */
-static long
-read_buffered_data(ptr, len, f)
+long
+rb_io_fread(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;
-    rb_io_t *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);
+#ifdef READ_DATA_PENDING_COUNT
+	long i = READ_DATA_PENDING_COUNT(f);
+	if (i <= 0) {
+	    rb_thread_wait_fd(fileno(f));
+	    i = READ_DATA_PENDING_COUNT(f);
+	}
+	if (i > 0) {
+	    if (i > n) i = n;
+	    TRAP_BEG;
+	    c = fread(ptr, 1, i, f);
+	    TRAP_END;
+	    if (c < 0) goto eof;
+	    ptr += c;
+	    n -= c;
+	    if (c < i) goto eof;
+	    continue;
+	}
+#else
+	if (!READ_DATA_PENDING(f)) {
+	    rb_thread_wait_fd(fileno(f));
+	}
+#endif
 	TRAP_BEG;
-	c = getc(fptr->f);
+	c = getc(f);
 	TRAP_END;
 	if (c == EOF) {
 	  eof:
-	    if (ferror(fptr->f)) {
+	    if (ferror(f)) {
 		switch (errno) {
 		  case EINTR:
 #if defined(ERESTART)
 		  case ERESTART:
 #endif
-		    clearerr(fptr->f);
+		    clearerr(f);
 		    continue;
 		  case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 		  case EWOULDBLOCK:
 #endif
-		    if (len > n) {
-			clearerr(fptr->f);
+		    if (len - n >= 0) {
+			clearerr(f);
+			return len - n;
 		    }
-                    saved_errno = errno;
-                    rb_warning("nonblocking IO#read is obsolete; use IO#readpartial or IO#sysread");
-                    errno = saved_errno;
 		}
-		if (len == n) return 0;
+		return 0;
 	    }
+	    *ptr = '\0';
 	    break;
 	}
 	*ptr++ = c;
@@ -1115,24 +739,15 @@ io_fread(ptr, len, fptr)
     return len - n;
 }
 
-long
-rb_io_fread(ptr, len, f)
-    char *ptr;
-    long len;
-    FILE *f;
-{
-    rb_io_t of;
-
-    of.f = f;
-    of.f2 = NULL;
-    return io_fread(ptr, len, &of);
-}
+#ifndef S_ISREG
+#   define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
+#endif
 
 #define SMALLBUF 100
 
 static long
 remain_size(fptr)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     struct stat st;
     off_t siz = BUFSIZ;
@@ -1158,26 +773,25 @@ remain_size(fptr)
 
 static VALUE
 read_all(fptr, siz, str)
-    rb_io_t *fptr;
+    OpenFile *fptr;
     long siz;
     VALUE str;
 {
     long bytes = 0;
     long n;
 
+    READ_CHECK(fptr->f);
     if (siz == 0) siz = BUFSIZ;
     if (NIL_P(str)) {
-	str = rb_str_new(0, siz);
+	str = rb_tainted_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);
+	n = rb_io_fread(RSTRING(str)->ptr+bytes, siz-bytes, fptr->f);
 	if (n == 0 && bytes == 0) {
+	    rb_str_resize(str,0);
 	    if (!fptr->f) break;
 	    if (feof(fptr->f)) break;
 	    if (!ferror(fptr->f)) break;
@@ -1189,326 +803,52 @@ read_all(fptr, siz, str)
 	rb_str_resize(str, siz);
     }
     if (bytes != siz) rb_str_resize(str, bytes);
-    OBJ_TAINT(str);
 
     return str;
 }
 
-void rb_io_set_nonblock(rb_io_t *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)
-{
-    rb_io_t *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)
-{
-    rb_io_t *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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     long n, len;
     VALUE length, str;
 
     rb_scan_args(argc, argv, "02", &length, &str);
 
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
     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 (feof(fptr->f)) return Qnil;
     if (NIL_P(str)) {
-	str = rb_tainted_str_new(0, len);
+	str = rb_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);
+    n = rb_io_fread(RSTRING(str)->ptr, len, fptr->f);
     if (n == 0) {
+	rb_str_resize(str,0);
 	if (!fptr->f) return Qnil;
-	if (feof(fptr->f)) {
-	    rb_str_resize(str, 0);
-	    return Qnil;
-	}
+	if (feof(fptr->f)) 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);
@@ -1518,7 +858,7 @@ io_read(argc, argv, io)
 
 static int
 appendline(fptr, delim, strp)
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int delim;
     VALUE *strp;
 {
@@ -1570,7 +910,6 @@ appendline(fptr, delim, strp)
 #else
 	READ_CHECK(f);
 #endif
-	clearerr(f);
 	TRAP_BEG;
 	c = getc(f);
 	TRAP_END;
@@ -1623,7 +962,7 @@ appendline(fptr, delim, strp)
 
 static inline int
 swallow(fptr, term)
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int term;
 {
     FILE *f = fptr->f;
@@ -1648,7 +987,6 @@ swallow(fptr, term)
 #else
 	READ_CHECK(f);
 #endif
-	clearerr(f);
 	TRAP_BEG;
 	c = getc(f);
 	TRAP_END;
@@ -1662,8 +1000,8 @@ swallow(fptr, term)
 
 static VALUE
 rb_io_getline_fast(fptr, delim)
-    rb_io_t *fptr;
-    unsigned char delim;
+    OpenFile *fptr;
+    int delim;
 {
     VALUE str = Qnil;
     int c;
@@ -1679,41 +1017,27 @@ rb_io_getline_fast(fptr, delim)
     return str;
 }
 
-static int
-rscheck(rsptr, rslen, rs)
-    const 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;
+rb_io_getline(rs, fptr)
+    VALUE rs;
+    OpenFile *fptr;
 {
     VALUE str = Qnil;
-    rb_io_t *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;
-	const char *rsptr;
+	char *rsptr;
 	long rslen;
 	int rspara = 0;
 
+	StringValue(rs);
 	rslen = RSTRING(rs)->len;
 	if (rslen == 0) {
 	    rsptr = "\n\n";
@@ -1722,7 +1046,7 @@ rb_io_getline(rs, io)
 	    swallow(fptr, '\n');
 	}
 	else if (rslen == 1) {
-	    return rb_io_getline_fast(fptr, (unsigned char)RSTRING(rs)->ptr[0]);
+	    return rb_io_getline_fast(fptr, RSTRING(rs)->ptr[0]);
 	}
 	else {
 	    rsptr = RSTRING(rs)->ptr;
@@ -1731,7 +1055,6 @@ rb_io_getline(rs, io)
 
 	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) {
@@ -1754,30 +1077,13 @@ VALUE
 rb_io_gets(io)
     VALUE io;
 {
-    rb_io_t *fptr;
+    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;
@@ -1785,72 +1091,39 @@ rb_io_gets_m(argc, argv, io)
     VALUE io;
 {
     VALUE rs, str;
+    OpenFile *fptr;
 
     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);
+    GetOpenFile(io, fptr);
+    str = rb_io_getline(rs, fptr);
 
+    if (!NIL_P(str)) {
+	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;
 {
-    rb_io_t *fptr;
+    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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
@@ -1883,14 +1156,6 @@ 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;
@@ -1905,21 +1170,6 @@ rb_io_readline(argc, argv, io)
     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;
@@ -1928,41 +1178,22 @@ rb_io_readlines(argc, argv, io)
 {
     VALUE line, ary;
     VALUE rs;
+    OpenFile *fptr;
 
     if (argc == 0) {
 	rs = rb_rs;
     }
     else {
 	rb_scan_args(argc, argv, "1", &rs);
-	if (!NIL_P(rs)) StringValue(rs);
     }
+    GetOpenFile(io, fptr);
     ary = rb_ary_new();
-    while (!NIL_P(line = rb_io_getline(rs, io))) {
+    while (!NIL_P(line = rb_io_getline(rs, fptr))) {
 	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;
@@ -1970,52 +1201,36 @@ rb_io_each_line(argc, argv, io)
     VALUE io;
 {
     VALUE str;
+    OpenFile *fptr;
     VALUE rs;
 
-    RETURN_ENUMERATOR(io, argc, argv);
     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))) {
+    GetOpenFile(io, fptr);
+    while (!NIL_P(str = rb_io_getline(rs, fptr))) {
 	rb_yield(str);
     }
     return io;
 }
 
-/*
- *  call-seq:
- *     ios.each_byte {|byte| block }  => ios
- *  
- *  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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     FILE *f;
     int c;
 
-    RETURN_ENUMERATOR(io, 0, 0);
     GetOpenFile(io, fptr);
 
     for (;;) {
 	rb_io_check_readable(fptr);
 	f = fptr->f;
 	READ_CHECK(f);
-	clearerr(f);
 	TRAP_BEG;
 	c = getc(f);
 	TRAP_END;
@@ -2034,114 +1249,11 @@ rb_io_each_byte(io)
     return io;
 }
 
-VALUE rb_io_getc _((VALUE));
-
-/*
- *  call-seq:
- *     ios.each_char {|c| block }  => ios
- *
- *  Calls the given block once for each character in <em>ios</em>,
- *  passing the character as an argument. The stream must be opened for
- *  reading or an <code>IOError</code> will be raised.  Multibyte
- *  characters are dealt with according to $KCODE.
- *
- *     f = File.new("testfile")
- *     f.each_char {|c| print c, ' ' }   #=> #<File:testfile>
- */
-
-static VALUE
-rb_io_each_char(io)
-    VALUE io;
-{
-    VALUE ch;
-
-    RETURN_ENUMERATOR(io, 0, 0);
-
-    while (!NIL_P(ch = rb_io_getc(io))) {
-	unsigned char c;
-	int n;
-	VALUE str;
-
-	c= FIX2INT(ch);
-	n = mbclen(c);
-	str = rb_tainted_str_new((const char *)&c, 1);
-
-	while (--n > 0) {
-	    if (NIL_P(ch = rb_io_getc(io))) {
-		rb_yield(str);
-		return io;
-	    }
-	    c = FIX2INT(ch);
-	    rb_str_cat(str, (const char *)&c, 1);
-	}
-	rb_yield(str);
-    }
-    return io;
-}
-
-/*
- *  call-seq:
- *     ios.lines(sep=$/)     => anEnumerator
- *     ios.lines(limit)      => anEnumerator
- *     ios.lines(sep, limit) => anEnumerator
- *
- *  Returns an enumerator that gives each line in <em>ios</em>.
- *  The stream must be opened for reading or an <code>IOError</code>
- *  will be raised.
- *
- *     f = File.new("testfile")
- *     f.lines.to_a  #=> ["foo\n", "bar\n"]
- *     f.rewind
- *     f.lines.sort  #=> ["bar\n", "foo\n"]
- */
-
-static VALUE
-rb_io_lines(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-    return rb_enumeratorize(io, ID2SYM(rb_intern("each_line")), argc, argv);
-}
-
-/*
- *  call-seq:
- *     ios.bytes   => anEnumerator
- *
- *  Returns an enumerator that gives each byte (0..255) in <em>ios</em>.
- *  The stream must be opened for reading or an <code>IOError</code>
- *  will be raised.
- *     
- *     f = File.new("testfile")
- *     f.bytes.to_a  #=> [104, 101, 108, 108, 111]
- *     f.rewind
- *     f.bytes.sort  #=> [101, 104, 108, 108, 111]
- */
-
-static VALUE
-rb_io_bytes(io)
-    VALUE io;
-{
-    return rb_enumeratorize(io, ID2SYM(rb_intern("each_byte")), 0, 0);
-}
-
-/*
- *  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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     FILE *f;
     int c;
 
@@ -2151,7 +1263,6 @@ rb_io_getc(io)
 
   retry:
     READ_CHECK(f);
-    clearerr(f);
     TRAP_BEG;
     c = getc(f);
     TRAP_END;
@@ -2177,7 +1288,6 @@ rb_getc(f)
     if (!READ_DATA_PENDING(f)) {
 	rb_thread_wait_fd(fileno(f));
     }
-    clearerr(f);
     TRAP_BEG;
     c = getc(f);
     TRAP_END;
@@ -2185,14 +1295,6 @@ rb_getc(f)
     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;
@@ -2205,27 +1307,11 @@ rb_io_readchar(io)
     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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int cc = NUM2INT(c);
 
     GetOpenFile(io, fptr);
@@ -2233,29 +1319,16 @@ rb_io_ungetc(io, c)
 	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");
-    }
+    if (ungetc(cc, fptr->f) == EOF && cc != EOF)
+	rb_sys_fail(fptr->path);
     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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     GetOpenFile(io, fptr);
     if (isatty(fileno(fptr->f)) == 0)
@@ -2265,52 +1338,43 @@ rb_io_isatty(io)
 
 static void
 fptr_finalize(fptr, noraise)
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int noraise;
 {
-    int n1 = 0, n2 = 0, f1, f2 = -1;
+    int n1 = 0, n2 = 0, e = 0, f1, f2 = -1;
 
-    errno = 0;
     if (fptr->f2) {
 	f2 = fileno(fptr->f2);
-	while (n2 = 0, fflush(fptr->f2) < 0) {
-	    n2 = errno;
+	while ((n2 = fclose(fptr->f2)) < 0) {
 	    if (!rb_io_wait_writable(f2)) {
+		e = errno;
 		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;
+	while ((n1 = fclose(fptr->f)) < 0) {
+	    if (f2 != -1 || !(fptr->mode & FMODE_WBUF)) break;
+	    if (!rb_io_wait_writable(f1)) break;
+	    if (!fptr->f) break;
 	}
 	fptr->f = 0;
-	if (n1 == EBADF && f1 == f2) {
+	if (n1 < 0 && errno == EBADF && f1 == f2) {
 	    n1 = 0;
 	}
     }
-    if (!noraise && (n1 || n2)) {
-	errno = (n1 ? n1 : n2);
+    if (!noraise && (n1 < 0 || n2 < 0)) {
+	if (n1 == 0) errno = e;
 	rb_sys_fail(fptr->path);
     }
 }
 
 static void
 rb_io_fptr_cleanup(fptr, noraise)
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int noraise;
 {
     if (fptr->finalize) {
@@ -2323,7 +1387,7 @@ rb_io_fptr_cleanup(fptr, noraise)
 
 void
 rb_io_fptr_finalize(fptr)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     if (!fptr) return;
     if (fptr->path) {
@@ -2339,7 +1403,7 @@ VALUE
 rb_io_close(io)
     VALUE io;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int fd, fd2;
 
     fptr = RFILE(io)->fptr;
@@ -2365,20 +1429,6 @@ rb_io_close(io)
     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;
@@ -2392,71 +1442,27 @@ rb_io_close_m(io)
 }
 
 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);
+    return rb_funcall(io, rb_intern("close"), 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;
 {
-    rb_io_t *fptr;
+    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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int n;
 
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
@@ -2478,30 +1484,11 @@ rb_io_close_read(io)
     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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int n;
 
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
@@ -2522,19 +1509,6 @@ rb_io_close_write(io)
     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;
@@ -2543,13 +1517,13 @@ rb_io_sysseek(argc, argv, io)
 {
     VALUE offset, ptrname;
     int whence = SEEK_SET;
-    rb_io_t *fptr;
+    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");
@@ -2557,31 +1531,18 @@ rb_io_sysseek(argc, argv, io)
     if ((fptr->mode & FMODE_WRITABLE) && (fptr->mode & FMODE_WBUF)) {
 	rb_warn("sysseek for buffered IO");
     }
-    pos = lseek(fileno(fptr->f), pos, whence);
+    pos = lseek(fileno(fptr->f), NUM2OFFT(offset), 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;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     FILE *f;
     long n;
 
@@ -2599,29 +1560,13 @@ rb_io_syswrite(io, str)
     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;
@@ -2629,12 +1574,17 @@ rb_io_sysread(argc, argv, io)
     VALUE io;
 {
     VALUE len, str;
-    rb_io_t *fptr;
+    OpenFile *fptr;
     long n, ilen;
 
     rb_scan_args(argc, argv, "11", &len, &str);
     ilen = NUM2LONG(len);
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
 
+    if (READ_DATA_BUFFERED(fptr->f)) {
+	rb_raise(rb_eIOError, "sysread for buffered IO");
+    }
     if (NIL_P(str)) {
 	str = rb_str_new(0, ilen);
     }
@@ -2645,32 +1595,21 @@ rb_io_sysread(argc, argv, io)
     }
     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);
+    n = read(fileno(fptr->f), RSTRING(str)->ptr, RSTRING(str)->len);
     TRAP_END;
 
-    rb_str_unlocktmp(str);
     if (n == -1) {
+	rb_str_resize(str, 0);
 	rb_sys_fail(fptr->path);
     }
-    rb_str_resize(str, n);
     if (n == 0 && ilen > 0) {
+	rb_str_resize(str, 0);
 	rb_eof_error();
     }
+
     RSTRING(str)->len = n;
     RSTRING(str)->ptr[n] = '\0';
     OBJ_TAINT(str);
@@ -2678,21 +1617,12 @@ rb_io_sysread(argc, argv, io)
     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__)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     GetOpenFile(io, fptr);
 #ifdef __human68k__
@@ -2712,34 +1642,37 @@ rb_io_binmode(io)
     return io;
 }
 
-const char*
-rb_io_flags_mode(flags)
+char*
+rb_io_flags_mode(flags, mode)
     int flags;
+    char *mode;
 {
-#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");
-    }
+    char *p = mode;
+
     switch (flags & FMODE_READWRITE) {
       case FMODE_READABLE:
-	return MODE_BINMODE("r", "rb");
+	*p++ = 'r';
+	break;
       case FMODE_WRITABLE:
-	return MODE_BINMODE("w", "wb");
+	*p++ = 'w';
+	break;
       case FMODE_READWRITE:
-	if (flags & FMODE_CREATE) {
-	    return MODE_BINMODE("w+", "wb+");
+	*p++ = 'r';
+	*p++ = '+';
+	break;
+    }
+    *p++ = '\0';
+#ifdef O_BINARY
+    if (flags & FMODE_BINMODE) {
+	if (mode[1] == '+') {
+	    mode[1] = 'b'; mode[2] = '+'; mode[3] = '\0';
+	}
+	else {
+	    mode[1] = 'b'; mode[2] = '\0';
 	}
-	return MODE_BINMODE("r+", "rb+");
     }
-    rb_raise(rb_eArgError, "illegal access modenum %o", flags);
-    return NULL;		/* not reached */
+#endif
+    return mode;
 }
 
 int
@@ -2754,10 +1687,10 @@ rb_io_mode_flags(mode)
 	flags |= FMODE_READABLE;
 	break;
       case 'w':
-	flags |= FMODE_WRITABLE | FMODE_CREATE;
+	flags |= FMODE_WRITABLE;
 	break;
       case 'a':
-	flags |= FMODE_WRITABLE | FMODE_APPEND | FMODE_CREATE;
+	flags |= FMODE_WRITABLE;
 	break;
       default:
       error:
@@ -2772,20 +1705,15 @@ rb_io_mode_flags(mode)
         case '+':
             flags |= FMODE_READWRITE;
             break;
-        case ':':
-            /* forward compatibility */
-            rb_warning("encoding options not supported in 1.8: %s", mode);
-            goto end;
         default:
             goto error;
         }
     }
 
- end:
     return flags;
 }
 
-int
+static int
 rb_io_modenum_flags(mode)
     int mode;
 {
@@ -2799,16 +1727,10 @@ rb_io_modenum_flags(mode)
 	flags = FMODE_WRITABLE;
 	break;
       case O_RDWR:
-	flags = FMODE_READWRITE;
+	flags = FMODE_WRITABLE|FMODE_READABLE;
 	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;
@@ -2848,48 +1770,47 @@ rb_io_mode_modenum(mode)
 #endif
             break;
         case '+':
-            flags = (flags & ~O_ACCMODE) | O_RDWR;
+            flags |= O_RDWR;
             break;
-        case ':':
-            /* forward compatibility */
-            rb_warning("encoding options not supported in 1.8: %s", mode);
-            goto end;
         default:
             goto error;
         }
     }
 
- end:
     return flags;
 }
 
-#define MODENUM_MAX 4
-
-static const char*
-rb_io_modenum_mode(flags)
+static char*
+rb_io_modenum_mode(flags, mode)
     int flags;
+    char *mode;
 {
-#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");
-    }
+    char *p = mode;
+
     switch (flags & (O_RDONLY|O_WRONLY|O_RDWR)) {
       case O_RDONLY:
-	return MODE_BINARY("r", "rb");
+	*p++ = 'r';
+	break;
       case O_WRONLY:
-	return MODE_BINARY("w", "wb");
+	*p++ = 'w';
+	break;
       case O_RDWR:
-	return MODE_BINARY("r+", "rb+");
+	*p++ = 'r';
+	*p++ = '+';
+	break;
     }
-    rb_raise(rb_eArgError, "illegal access modenum %o", flags);
-    return NULL;		/* not reached */
+    *p++ = '\0';
+#ifdef O_BINARY
+    if (flags & O_BINARY) {
+	if (mode[1] == '+') {
+	    mode[1] = 'b'; mode[2] = '+'; mode[3] = '\0';
+	}
+	else {
+	    mode[1] = 'b'; mode[2] = '\0';
+	}
+    }
+#endif
+    return mode;
 }
 
 static int
@@ -2932,7 +1853,7 @@ rb_fopen(fname, mode)
     }
 #ifdef USE_SETVBUF
     if (setvbuf(file, NULL, _IOFBF, 0) != 0)
-	rb_warn("setvbuf() can't be honoured for %s", fname);
+	rb_warn("setvbuf() can't be honered for %s", fname);
 #endif
 #ifdef __human68k__
     fmode(file, _IOTEXT);
@@ -2947,36 +1868,23 @@ rb_fdopen(fd, 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);
+	rb_warn("setvbuf() can't be honered (fd=%d)", fd);
 #endif
     return file;
 }
@@ -2986,13 +1894,13 @@ rb_file_open_internal(io, fname, mode)
     VALUE io;
     const char *fname, *mode;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
 
     MakeOpenFile(io, fptr);
 
     fptr->mode = rb_io_mode_flags(mode);
+    fptr->f = rb_fopen(fname, mode);
     fptr->path = strdup(fname);
-    fptr->f = rb_fopen(fptr->path, rb_io_flags_mode(fptr->mode));
 
     return io;
 }
@@ -3010,17 +1918,18 @@ rb_file_sysopen_internal(io, fname, flags, mode)
     char *fname;
     int flags, mode;
 {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int fd;
-    const char *m;
+    char *m;
+    char mbuf[4];
 
     MakeOpenFile(io, fptr);
 
-    fptr->path = strdup(fname);
-    m = rb_io_modenum_mode(flags);
+    fd = rb_sysopen(fname, flags, mode);
+    m = rb_io_modenum_mode(flags, mbuf);
     fptr->mode = rb_io_modenum_flags(flags);
-    fd = rb_sysopen(fptr->path, flags, mode);
     fptr->f = rb_fdopen(fd, m);
+    fptr->path = strdup(fname);
 
     return io;
 }
@@ -3035,13 +1944,13 @@ rb_file_sysopen(fname, flags, mode)
 
 #if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__VMS)
 static struct pipe_list {
-    rb_io_t *fptr;
+    OpenFile *fptr;
     struct pipe_list *next;
 } *pipe_list;
 
 static void
 pipe_add_fptr(fptr)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     struct pipe_list *list;
 
@@ -3053,7 +1962,7 @@ pipe_add_fptr(fptr)
 
 static void
 pipe_del_fptr(fptr)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     struct pipe_list *list = pipe_list;
     struct pipe_list *tmp;
@@ -3088,11 +1997,11 @@ pipe_atexit _((void))
     }
 }
 
-static void pipe_finalize _((rb_io_t *fptr,int));
+static void pipe_finalize _((OpenFile *fptr,int));
 
 static void
 pipe_finalize(fptr, noraise)
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int noraise;
 {
 #if !defined (__CYGWIN__) && !defined(_WIN32)
@@ -3118,52 +2027,28 @@ pipe_finalize(fptr, noraise)
 
 void
 rb_io_synchronized(fptr)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     fptr->mode |= FMODE_SYNC;
 }
 
 void
 rb_io_unbuffered(fptr)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     rb_io_synchronized(fptr);
 }
 
-static VALUE pipe_open(VALUE pstr, const char *pname, const char *mode);
-
 static VALUE
-pipe_open(pstr, pname, mode)
-    VALUE pstr;
-    const char *pname, *mode;
+pipe_open(pname, mode)
+    char *pname, *mode;
 {
     int modef = rb_io_mode_flags(mode);
-    rb_io_t *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
+    OpenFile *fptr;
 
 #if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
-    f = popen(pname, mode);
-    
+    FILE *f = popen(pname, mode);
+
     if (!f) rb_sys_fail(pname);
     else {
 	VALUE port = io_alloc(rb_cIO);
@@ -3183,6 +2068,9 @@ pipe_open(pstr, pname, mode)
     }
 #else
 #ifdef _WIN32
+    int pid;
+    FILE *fpr, *fpw;
+
 retry:
     pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw);
     if (pid == -1) {		/* exec failed */
@@ -3212,10 +2100,14 @@ retry:
 	return (VALUE)port;
     }
 #else
+    int pid, pr[2], pw[2];
+    volatile int doexec;
+
     if (((modef & FMODE_READABLE) && pipe(pr) == -1) ||
 	((modef & FMODE_WRITABLE) && pipe(pw) == -1))
 	rb_sys_fail(pname);
 
+    doexec = (strcmp("-", pname) != 0);
     if (!doexec) {
 	fflush(stdin);		/* is it really needed? */
 	fflush(stdout);
@@ -3259,19 +2151,8 @@ retry:
 	    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);
-	}
+	close(pr[0]); close(pw[1]);
+	rb_sys_fail(pname);
 	break;
 
       default:			/* parent */
@@ -3306,71 +2187,28 @@ retry:
 #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)
+rb_io_popen(str, argc, argv, klass)
+    char *str;
     int argc;
     VALUE *argv;
     VALUE klass;
 {
-    const char *mode;
+    char *mode;
     VALUE pname, pmode, port;
+    char mbuf[4];
 
     if (rb_scan_args(argc, argv, "11", &pname, &pmode) == 1) {
 	mode = "r";
     }
     else if (FIXNUM_P(pmode)) {
-	mode = rb_io_modenum_mode(FIX2INT(pmode));
+	mode = rb_io_modenum_mode(FIX2INT(pmode), mbuf);
     }
     else {
-	mode = rb_io_flags_mode(rb_io_mode_flags(StringValueCStr(pmode)));
+	mode = StringValuePtr(pmode);
     }
     SafeStringValue(pname);
-    port = pipe_open(pname, 0, mode);
+    port = pipe_open(str, mode);
     if (NIL_P(port)) {
 	/* child */
 	if (rb_block_given_p()) {
@@ -3389,52 +2227,52 @@ rb_io_s_popen(argc, argv, klass)
 }
 
 static VALUE
+rb_io_s_popen(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    char *str = 0;
+
+    if (argc >= 1) {
+	str = StringValuePtr(argv[0]);
+    }
+    return rb_io_popen(str, argc, argv, klass);
+}
+
+static VALUE
 rb_open_file(argc, argv, io)
     int argc;
     VALUE *argv;
     VALUE io;
 {
     VALUE fname, vmode, perm;
-    const char *path, *mode;
-    int flags;
-    unsigned int fmode;
+    char *path, *mode;
+    int flags, fmode;
 
     rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
     SafeStringValue(fname);
+    path = RSTRING(fname)->ptr;
 
-    path = StringValueCStr(fname);
     if (FIXNUM_P(vmode) || !NIL_P(perm)) {
 	if (FIXNUM_P(vmode)) {
-	    flags = FIX2INT(vmode);
+	    flags = NUM2INT(vmode);
 	}
 	else {
 	    SafeStringValue(vmode);
 	    flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
 	}
-	fmode = NIL_P(perm) ? 0666 :  NUM2UINT(perm);
+	fmode = NIL_P(perm) ? 0666 :  NUM2INT(perm);
 
 	rb_file_sysopen_internal(io, path, flags, fmode);
     }
     else {
-	mode = NIL_P(vmode) ? "r" : StringValueCStr(vmode);
-	rb_file_open_internal(io, path, mode);
+	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;
@@ -3450,127 +2288,30 @@ rb_io_s_open(argc, argv, klass)
     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, fd;
-    unsigned int fmode;
-    char *path;
+    int flags, fmode, fd;
 
     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 if (FIXNUM_P(vmode)) flags = NUM2INT(vmode);
     else {
 	SafeStringValue(vmode);
 	flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
     }
     if (NIL_P(perm)) fmode = 0666;
-    else             fmode = NUM2UINT(perm);
+    else             fmode = NUM2INT(perm);
 
-    path = ALLOCA_N(char, strlen(RSTRING(fname)->ptr)+1);
-    strcpy(path, RSTRING(fname)->ptr);
-    fd = rb_sysopen(path, flags, fmode);
+    fd = rb_sysopen(RSTRING(fname)->ptr, 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;
@@ -3580,10 +2321,7 @@ rb_f_open(argc, argv)
 	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_popen(str+1, argc, argv, rb_cIO);
 	}
     }
     return rb_io_s_open(argc, argv, rb_cFile);
@@ -3594,7 +2332,7 @@ rb_io_open(fname, mode)
     char *fname, *mode;
 {
     if (fname[0] == '|') {
-	return pipe_open(0, fname+1, mode);
+	return pipe_open(fname+1, mode);
     }
     else {
 	return rb_file_open(fname, mode);
@@ -3608,16 +2346,9 @@ rb_io_get_io(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 const char*
+static char*
 rb_io_mode_string(fptr)
-    rb_io_t *fptr;
+    OpenFile *fptr;
 {
     switch (fptr->mode & FMODE_READWRITE) {
       case FMODE_READABLE:
@@ -3634,8 +2365,8 @@ static VALUE
 io_reopen(io, nfile)
     VALUE io, nfile;
 {
-    rb_io_t *fptr, *orig;
-    const char *mode;
+    OpenFile *fptr, *orig;
+    char *mode;
     int fd, fd2;
     off_t pos = 0;
 
@@ -3660,7 +2391,7 @@ io_reopen(io, nfile)
 	io_fflush(GetWriteFile(fptr), fptr);
     }
 
-    /* copy rb_io_t structure */
+    /* copy OpenFile structure */
     fptr->mode = orig->mode;
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
@@ -3680,22 +2411,10 @@ io_reopen(io, nfile)
 		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;
+	    fptr->f = rb_fdopen(fd, mode);
 	}
 	rb_thread_fd_close(fd);
 	if ((orig->mode & FMODE_READABLE) && pos >= 0) {
@@ -3728,22 +2447,6 @@ io_reopen(io, nfile)
     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;
@@ -3751,27 +2454,30 @@ rb_io_reopen(argc, argv, file)
     VALUE file;
 {
     VALUE fname, nmode;
-    const char *mode;
-    rb_io_t *fptr;
+    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);
+	if (TYPE(fname) != T_STRING) { /* fname must be IO */
+	    return io_reopen(file, fname);
 	}
     }
 
     SafeStringValue(fname);
+
     rb_io_taint_check(file);
     fptr = RFILE(file)->fptr;
     if (!fptr) {
-	fptr = RFILE(file)->fptr = ALLOC(rb_io_t);
-	MEMZERO(fptr, rb_io_t, 1);
+	fptr = RFILE(file)->fptr = ALLOC(OpenFile);
     }
 
     if (!NIL_P(nmode)) {
-	fptr->mode = rb_io_mode_flags(StringValueCStr(nmode));
+	mode = StringValuePtr(nmode);
+    }
+    else {
+	mode = ALLOCA_N(char, 4);
+	rb_io_flags_mode(fptr->mode, mode);
     }
 
     if (fptr->path) {
@@ -3779,27 +2485,28 @@ rb_io_reopen(argc, argv, file)
 	fptr->path = 0;
     }
 
-    fptr->path = strdup(StringValueCStr(fname));
-    mode = rb_io_flags_mode(fptr->mode);
+    fptr->path = strdup(RSTRING(fname)->ptr);
+    fptr->mode = rb_io_mode_flags(mode);
     if (!fptr->f) {
-	fptr->f = rb_fopen(fptr->path, mode);
+	fptr->f = rb_fopen(RSTRING(fname)->ptr, mode);
 	if (fptr->f2) {
 	    fclose(fptr->f2);
 	    fptr->f2 = 0;
 	}
+
 	return file;
     }
 
-    if (freopen(fptr->path, mode, fptr->f) == 0) {
+    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", fptr->path);
+	rb_warn("setvbuf() can't be honered for %s", RSTRING(fname)->ptr);
 #endif
 
     if (fptr->f2) {
-	if (freopen(fptr->path, "w", fptr->f2) == 0) {
+	if (freopen(RSTRING(fname)->ptr, "w", fptr->f2) == 0) {
 	    rb_sys_fail(fptr->path);
 	}
     }
@@ -3807,14 +2514,13 @@ rb_io_reopen(argc, argv, file)
     return file;
 }
 
-/* :nodoc: */
 static VALUE
 rb_io_init_copy(dest, io)
     VALUE dest, io;
 {
-    rb_io_t *fptr, *orig;
+    OpenFile *fptr, *orig;
     int fd;
-    const char *mode;
+    char *mode;
 
     io = rb_io_get_io(io);
     if (dest == io) return dest;
@@ -3832,7 +2538,7 @@ rb_io_init_copy(dest, io)
 	fseeko(orig->f, 0L, SEEK_CUR);
     }
 
-    /* copy rb_io_t structure */
+    /* copy OpenFile structure */
     fptr->mode = orig->mode;
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
@@ -3852,13 +2558,11 @@ rb_io_init_copy(dest, io)
     }
     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);
@@ -3867,15 +2571,6 @@ rb_io_init_copy(dest, io)
     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;
@@ -3886,17 +2581,6 @@ rb_io_printf(argc, argv, out)
     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;
@@ -3918,26 +2602,6 @@ rb_f_printf(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;
@@ -3973,29 +2637,6 @@ rb_io_print(argc, argv, out)
     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;
@@ -4005,22 +2646,6 @@ rb_f_print(argc, argv)
     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;
@@ -4031,15 +2656,6 @@ rb_io_putc(io, ch)
     return ch;
 }
 
-/*
- *  call-seq:
- *     putc(int)   => int
- *  
- *  Equivalent to:
- *
- *    $stdout.putc(int)
- */
-
 static VALUE
 rb_f_putc(recv, ch)
     VALUE recv, ch;
@@ -4064,26 +2680,6 @@ io_puts_ary(ary, 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;
@@ -4120,15 +2716,6 @@ rb_io_puts(argc, argv, out)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     puts(obj, ...)    => nil
- *  
- *  Equivalent to 
- *
- *      $stdout.puts(obj, ...)
- */
-
 static VALUE
 rb_f_puts(argc, argv)
     int argc;
@@ -4146,23 +2733,6 @@ rb_p(obj)			/* for debug print within C code */
     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;
@@ -4179,29 +2749,6 @@ rb_f_p(argc, argv)
     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;
@@ -4264,7 +2811,7 @@ defout_setter(val, id, variable)
     VALUE *variable;
 {
     stdout_setter(val, id, variable);
-    rb_warn("$defout is obsolete; use $stdout instead");
+    rb_warn("$defout is obslete; use $stdout instead");
 }
 
 static void
@@ -4274,7 +2821,7 @@ deferr_setter(val, id, variable)
     VALUE *variable;
 {
     stdout_setter(val, id, variable);
-    rb_warn("$deferr is obsolete; use $stderr instead");
+    rb_warn("$deferr is obslete; use $stderr instead");
 }
 
 static VALUE
@@ -4283,7 +2830,7 @@ prep_stdio(f, mode, klass)
     int mode;
     VALUE klass;
 {
-    rb_io_t *fp;
+    OpenFile *fp;
     VALUE io = io_alloc(klass);
 
     MakeOpenFile(io, fp);
@@ -4304,31 +2851,13 @@ prep_path(io, path)
     VALUE io;
     char *path;
 {
-    rb_io_t *fptr;
+    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;
@@ -4336,8 +2865,9 @@ rb_io_initialize(argc, argv, io)
     VALUE io;
 {
     VALUE fnum, mode;
-    rb_io_t *fp;
+    OpenFile *fp;
     int fd, flags;
+    char mbuf[4];
 
     rb_secure(4);
     rb_scan_args(argc, argv, "11", &fnum, &mode);
@@ -4348,45 +2878,23 @@ rb_io_initialize(argc, argv, io)
 	}
 	else {
 	    SafeStringValue(mode);
-	    flags = rb_io_mode_modenum(StringValueCStr(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));
+    fp->f = rb_fdopen(fd, rb_io_modenum_mode(flags, mbuf));
 
     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;
@@ -4394,7 +2902,9 @@ rb_file_initialize(argc, argv, io)
     VALUE io;
 {
     if (RFILE(io)->fptr) {
-	rb_raise(rb_eRuntimeError, "reinitializing File");
+	rb_io_close_m(io);
+	free(RFILE(io)->fptr);
+	RFILE(io)->fptr = 0;
     }
     if (0 < argc && argc < 3) {
 	VALUE fd = rb_check_convert_type(argv[0], T_FIXNUM, "Fixnum", "to_int");
@@ -4409,24 +2919,6 @@ rb_file_initialize(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;
@@ -4434,7 +2926,7 @@ rb_io_s_new(argc, argv, klass)
     VALUE klass;
 {
     if (rb_block_given_p()) {
-	const char *cname = rb_class2name(klass);
+	char *cname = rb_class2name(klass);
 
 	rb_warn("%s::new() does not take block; use %s::open() instead",
 		cname, cname);
@@ -4442,14 +2934,6 @@ rb_io_s_new(argc, argv, klass)
     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;
@@ -4464,18 +2948,16 @@ rb_io_s_for_fd(argc, argv, klass)
 static int binmode = 0;
 
 static VALUE
-argf_forward(int argc, VALUE *argv)
+argf_forward()
 {
-    return rb_funcall3(current_file, ruby_frame->last_func, argc, argv);
+    return rb_funcall3(current_file, ruby_frame->last_func,
+		       ruby_frame->argc, ruby_frame->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 {\
+#define ARGF_FORWARD() do { if (TYPE(current_file) != T_FILE) return argf_forward(); } while (0)
+#define NEXT_ARGF_FORWARD() do {\
      if (!next_argv()) return Qnil;\
-     ARGF_FORWARD(argc, argv);\
+      ARGF_FORWARD();\
 } while (0)
 
 static void
@@ -4493,7 +2975,7 @@ next_argv()
 {
     extern VALUE rb_argv;
     char *fn;
-    rb_io_t *fptr;
+    OpenFile *fptr;
     int stdout_binmode = 0;
 
     if (TYPE(rb_stdout) == T_FILE) {
@@ -4508,32 +2990,30 @@ next_argv()
 	}
 	else {
 	    next_p = -1;
+	    current_file = rb_stdin;
+	    filename = rb_str_new2("-");
 	}
 	init_p = 1;
 	gets_lineno = 0;
     }
 
+  retry:
     if (next_p == 1) {
 	next_p = 0;
-      retry:
 	if (RARRAY(rb_argv)->len > 0) {
 	    filename = rb_ary_shift(rb_argv);
-	    fn = StringValueCStr(filename);
+	    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;
+		    rb_warn("Can't do inplace edit for stdio");
 		}
 	    }
 	    else {
 		FILE *fr = rb_fopen(fn, "r");
 
 		if (ruby_inplace_mode) {
-		    struct stat st;
-#ifndef NO_SAFE_RENAME
-		    struct stat st2;
-#endif
+		    struct stat st, st2;
 		    VALUE str;
 		    FILE *fw;
 
@@ -4596,18 +3076,13 @@ next_argv()
 	    if (binmode) rb_io_binmode(current_file);
 	}
 	else {
-	    next_p = 1;
+	    init_p = 0;
+	    if (ruby_inplace_mode) {
+		rb_stdout = orig_stdout;
+	    }
 	    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;
 }
 
@@ -4625,15 +3100,16 @@ argf_getline(argc, argv)
     }
     else {
 	VALUE rs;
+	OpenFile *fptr;
 
 	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);
+	GetOpenFile(current_file, fptr);
+	line = rb_io_getline(rs, fptr);
     }
     if (NIL_P(line) && next_p != -1) {
 	argf_close(current_file);
@@ -4647,35 +3123,6 @@ argf_getline(argc, argv)
     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;
@@ -4720,14 +3167,6 @@ rb_gets()
     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;
@@ -4735,8 +3174,7 @@ rb_f_readline(argc, argv)
 {
     VALUE line;
 
-    if (!next_argv()) rb_eof_error();
-    ARGF_FORWARD(argc, argv);
+    NEXT_ARGF_FORWARD();
     line = rb_f_gets(argc, argv);
     if (NIL_P(line)) {
 	rb_eof_error();
@@ -4745,10 +3183,6 @@ rb_f_readline(argc, argv)
     return line;
 }
 
-/*
- * obsolete
- */
-
 static VALUE
 rb_f_getc()
 {
@@ -4759,14 +3193,6 @@ rb_f_getc()
     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;
@@ -4774,7 +3200,7 @@ rb_f_readlines(argc, argv)
 {
     VALUE line, ary;
 
-    NEXT_ARGF_FORWARD(argc, argv);
+    NEXT_ARGF_FORWARD();
     ary = rb_ary_new();
     while (!NIL_P(line = argf_getline(argc, argv))) {
 	rb_ary_push(ary, line);
@@ -4783,36 +3209,23 @@ rb_f_readlines(argc, argv)
     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;
-    rb_io_t *fptr;
+    VALUE port, result;
+    OpenFile *fptr;
 
     SafeStringValue(str);
-    port = pipe_open(str, 0, "r");
+    port = pipe_open(RSTRING(str)->ptr, "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);
 
+    if (NIL_P(result)) return rb_str_new(0,0);
     return result;
 }
 
@@ -4820,16 +3233,6 @@ rb_f_backquote(obj, str)
 #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;
@@ -4840,7 +3243,7 @@ rb_f_select(argc, argv, obj)
     fd_set rset, wset, eset, pset;
     fd_set *rp, *wp, *ep;
     struct timeval *tp, timerec;
-    rb_io_t *fptr;
+    OpenFile *fptr;
     long i;
     int max = 0, n;
     int interrupt_flag = 0;
@@ -4932,7 +3335,7 @@ rb_f_select(argc, argv, obj)
 		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));
+		    rb_ary_push(list, RARRAY(read)->ptr[i]);
 		}
 	    }
 	}
@@ -4942,10 +3345,10 @@ rb_f_select(argc, argv, obj)
 	    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));
+		    rb_ary_push(list, RARRAY(write)->ptr[i]);
 		}
 		else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), wp)) {
-		    rb_ary_push(list, rb_ary_entry(write, i));
+		    rb_ary_push(list, RARRAY(write)->ptr[i]);
 		}
 	    }
 	}
@@ -4955,10 +3358,10 @@ rb_f_select(argc, argv, obj)
 	    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));
+		    rb_ary_push(list, RARRAY(except)->ptr[i]);
 		}
 		else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), ep)) {
-		    rb_ary_push(list, rb_ary_entry(except, i));
+		    rb_ary_push(list, RARRAY(except)->ptr[i]);
 		}
 	    }
 	}
@@ -5002,12 +3405,13 @@ rb_io_ctl(io, req, arg, io_p)
 {
 #if !defined(MSDOS) && !defined(__human68k__)
     int cmd = NUM2ULONG(req);
-    rb_io_t *fptr;
+    OpenFile *fptr;
     long len = 0;
     long narg = 0;
     int retval;
 
     rb_secure(2);
+    GetOpenFile(io, fptr);
 
     if (NIL_P(arg) || arg == Qfalse) {
 	narg = 0;
@@ -5048,7 +3452,6 @@ rb_io_ctl(io, req, arg, io_p)
 	    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) {
@@ -5060,16 +3463,6 @@ rb_io_ctl(io, req, arg, io_p)
 	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();
@@ -5077,18 +3470,6 @@ rb_io_ctl(io, req, arg, io_p)
 #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;
@@ -5101,19 +3482,6 @@ rb_io_ioctl(argc, argv, io)
     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;
@@ -5131,25 +3499,6 @@ rb_io_fcntl(argc, argv, io)
 #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;
@@ -5173,8 +3522,6 @@ rb_f_syscall(argc, argv)
     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);
@@ -5182,7 +3529,7 @@ rb_f_syscall(argc, argv)
 	if (!NIL_P(v)) {
 	    StringValue(v);
 	    rb_str_modify(v);
-	    arg[i] = (unsigned long)StringValueCStr(v);
+	    arg[i] = (unsigned long)RSTRING(v)->ptr;
 	}
 	else {
 	    arg[i] = (unsigned long)NUM2LONG(*argv);
@@ -5261,42 +3608,6 @@ io_new_instance(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;
@@ -5342,6 +3653,7 @@ struct foreach_arg {
     int argc;
     VALUE sep;
     VALUE io;
+    OpenFile *fptr;
 };
 
 static VALUE
@@ -5350,52 +3662,33 @@ io_s_foreach(arg)
 {
     VALUE str;
 
-    while (!NIL_P(str = rb_io_getline(arg->sep, arg->io))) {
+    while (!NIL_P(str = rb_io_getline(arg->sep, arg->fptr))) {
 	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, self)
+rb_io_s_foreach(argc, argv)
     int argc;
     VALUE *argv;
-    VALUE self;
 {
-    VALUE fname;
+    VALUE fname, io;
+    OpenFile *fptr;
     struct foreach_arg arg;
 
     rb_scan_args(argc, argv, "11", &fname, &arg.sep);
-    RETURN_ENUMERATOR(self, argc, argv);
     SafeStringValue(fname);
 
     if (argc == 1) {
 	arg.sep = rb_default_rs;
     }
-    else if (!NIL_P(arg.sep)) {
-	StringValue(arg.sep);
-    }
-    arg.io = rb_io_open(StringValueCStr(fname), "r");
-    if (NIL_P(arg.io)) return Qnil;
+    io = rb_io_open(RSTRING(fname)->ptr, "r");
+    if (NIL_P(io)) return Qnil;
+    GetOpenFile(io, fptr);
+    arg.fptr = fptr;
 
-    return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io);
+    return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, io);
 }
 
 static VALUE
@@ -5405,19 +3698,6 @@ io_s_readlines(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;
@@ -5431,7 +3711,7 @@ rb_io_s_readlines(argc, argv, io)
     SafeStringValue(fname);
 
     arg.argc = argc - 1;
-    arg.io = rb_io_open(StringValueCStr(fname), "r");
+    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);
 }
@@ -5443,19 +3723,6 @@ io_s_read(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;
@@ -5469,7 +3736,7 @@ rb_io_s_read(argc, argv, io)
     SafeStringValue(fname);
 
     arg.argc = argc ? 1 : 0;
-    arg.io = rb_io_open(StringValueCStr(fname), "r");
+    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);
@@ -5483,7 +3750,7 @@ argf_tell()
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to tell");
     }
-    ARGF_FORWARD(0, 0);
+    ARGF_FORWARD();
     return rb_io_tell(current_file);
 }
 
@@ -5496,7 +3763,7 @@ argf_seek_m(argc, argv, self)
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to seek");
     }
-    ARGF_FORWARD(argc, argv);
+    ARGF_FORWARD();
     return rb_io_seek_m(argc, argv, current_file);
 }
 
@@ -5507,7 +3774,7 @@ argf_set_pos(self, offset)
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to set position");
     }
-    ARGF_FORWARD(1, &offset);
+    ARGF_FORWARD();
     return rb_io_set_pos(current_file, offset);
 }
 
@@ -5517,7 +3784,7 @@ argf_rewind()
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to rewind");
     }
-    ARGF_FORWARD(0, 0);
+    ARGF_FORWARD();
     return rb_io_rewind(current_file);
 }
 
@@ -5527,7 +3794,7 @@ argf_fileno()
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream");
     }
-    ARGF_FORWARD(0, 0);
+    ARGF_FORWARD();
     return rb_io_fileno(current_file);
 }
 
@@ -5535,7 +3802,7 @@ static VALUE
 argf_to_io()
 {
     next_argv();
-    ARGF_FORWARD(0, 0);
+    ARGF_FORWARD();
     return current_file;
 }
 
@@ -5544,8 +3811,9 @@ argf_eof()
 {
     if (current_file) {
 	if (init_p == 0) return Qtrue;
-	ARGF_FORWARD(0, 0);
+	ARGF_FORWARD();
 	if (rb_io_eof(current_file)) {
+	    next_p = 1;
 	    return Qtrue;
 	}
     }
@@ -5557,39 +3825,30 @@ argf_read(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE tmp, str, length;
+    VALUE tmp, str;
     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;
-    }
+    if (argc == 1) len = NUM2LONG(argv[0]);
+    str = Qnil;
 
   retry:
-    if (!next_argv()) {
-	return str;
-    }
+    if (!next_argv()) return str;
     if (TYPE(current_file) != T_FILE) {
-	tmp = argf_forward(argc, argv);
+	tmp = argf_forward();
     }
     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)) {
+    else rb_str_append(str, tmp);
+    if (NIL_P(tmp) || argc == 0) {
 	if (next_p != -1) {
 	    argf_close(current_file);
 	    next_p = 1;
 	    goto retry;
 	}
     }
-    else if (argc >= 1) {
+    else if (argc == 1) {
 	if (RSTRING(str)->len < len) {
 	    len -= RSTRING(str)->len;
 	    argv[0] = INT2NUM(len);
@@ -5626,7 +3885,7 @@ argf_readchar()
 {
     VALUE c;
 
-    NEXT_ARGF_FORWARD(0, 0);
+    NEXT_ARGF_FORWARD();
     c = argf_getc();
     if (NIL_P(c)) {
 	rb_eof_error();
@@ -5635,14 +3894,12 @@ argf_readchar()
 }
 
 static VALUE
-argf_each_line(argc, argv, argf)
+argf_each_line(argc, argv)
     int argc;
     VALUE *argv;
-    VALUE argf;
 {
     VALUE str;
 
-    RETURN_ENUMERATOR(argf, argc, argv);
     if (!next_argv()) return Qnil;
     if (TYPE(current_file) != T_FILE) {
 	for (;;) {
@@ -5658,52 +3915,14 @@ argf_each_line(argc, argv, argf)
 }
 
 static VALUE
-argf_each_byte(argf)
-    VALUE argf;
+argf_each_byte()
 {
     VALUE byte;
 
-    RETURN_ENUMERATOR(argf, 0, 0);
     while (!NIL_P(byte = argf_getc())) {
 	rb_yield(byte);
     }
-    return argf;
-}
-
-static VALUE
-argf_each_char(argf)
-    VALUE argf;
-{
-    VALUE ch;
-
-    RETURN_ENUMERATOR(argf, 0, 0);
-
-    while (!NIL_P(ch = argf_getc())) {
-	unsigned char c;
-	int n;
-	VALUE str, file;
-
-      first_char:
-	c = FIX2INT(ch);
-	n = mbclen(c);
-	str = rb_tainted_str_new((const char *)&c, 1);
-	file = current_file;
-
-	while (--n > 0) {
-	    if (NIL_P(ch = argf_getc())) {
-		rb_yield(str);
-		return argf;
-	    }
-	    if (current_file != file) {
-		rb_yield(str);
-		goto first_char;
-	    }
-	    c = FIX2INT(ch);
-	    rb_str_cat(str, (const char *)&c, 1);
-	}
-	rb_yield(str);
-    }
-    return argf;
+    return Qnil;
 }
 
 static VALUE
@@ -5725,7 +3944,7 @@ argf_binmode()
 {
     binmode = 1;
     next_argv();
-    ARGF_FORWARD(0, 0);
+    ARGF_FORWARD();
     rb_io_binmode(current_file);
     return argf;
 }
@@ -5756,7 +3975,7 @@ static VALUE
 argf_closed()
 {
     next_argv();
-    ARGF_FORWARD(0, 0);
+    ARGF_FORWARD();
     return rb_io_closed(current_file);
 }
 
@@ -5785,7 +4004,7 @@ opt_i_set(val)
     StringValue(val);
     if (ruby_inplace_mode) free(ruby_inplace_mode);
     ruby_inplace_mode = 0;
-    ruby_inplace_mode = strdup(StringValueCStr(val));
+    ruby_inplace_mode = strdup(RSTRING(val)->ptr);
 }
 
 /*
@@ -5825,14 +4044,8 @@ opt_i_set(val)
  *  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.
+ *  are shown in this section as <em>mode_string</em>. This mode string
+ *  must be one of the values listed in the following table.
  *
  *    Mode |  Meaning
  *    -----+--------------------------------------------------------
@@ -5856,12 +4069,6 @@ opt_i_set(val)
  *     "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
@@ -5926,9 +4133,9 @@ Init_IO()
     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;
+    rb_global_variable(&rb_default_rs);
     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);
@@ -5948,10 +4155,6 @@ Init_IO()
     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, "each_char",  rb_io_each_char, 0);
-    rb_define_method(rb_cIO, "lines",  rb_io_lines, -1);
-    rb_define_method(rb_cIO, "bytes",  rb_io_bytes, 0);
-    rb_define_method(rb_cIO, "chars",  rb_io_each_char, 0);
 
     rb_define_method(rb_cIO, "syswrite", rb_io_syswrite, 1);
     rb_define_method(rb_cIO, "sysread",  rb_io_sysread, -1);
@@ -5969,17 +4172,12 @@ Init_IO()
 
     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, "getbyte",  rb_io_getc, 0);
     rb_define_method(rb_cIO, "readchar",  rb_io_readchar, 0);
-    rb_define_method(rb_cIO, "readbyte",  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);
@@ -6009,12 +4207,12 @@ Init_IO()
     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_define_variable("$stdin", &rb_stdin);
     rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO);
-    rb_define_hooked_variable("$stderr", &rb_stderr, 0, stdout_setter);
+    rb_define_hooked_variable("$stdout", &rb_stdout, 0, stdout_setter);
     rb_stderr = prep_stdio(stderr, FMODE_WRITABLE, rb_cIO);
+    rb_define_hooked_variable("$stderr", &rb_stderr, 0, stdout_setter);
     rb_define_hooked_variable("$>", &rb_stdout, 0, stdout_setter);
     orig_stdout = rb_stdout;
     rb_deferr = orig_stderr = rb_stderr;
@@ -6028,9 +4226,10 @@ Init_IO()
     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_readonly_variable("$<", &argf);
     rb_define_global_const("ARGF", argf);
 
     rb_define_singleton_method(argf, "to_s", argf_to_s, 0);
@@ -6041,10 +4240,6 @@ Init_IO()
     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, "each_char",  argf_each_char, 0);
-    rb_define_singleton_method(argf, "lines",  argf_each_line, -1);
-    rb_define_singleton_method(argf, "bytes",  argf_each_byte, 0);
-    rb_define_singleton_method(argf, "chars",  argf_each_char, 0);
 
     rb_define_singleton_method(argf, "read",  argf_read, -1);
     rb_define_singleton_method(argf, "readlines", rb_f_readlines, -1);
@@ -6052,9 +4247,7 @@ Init_IO()
     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, "getbyte", argf_getc, 0);
     rb_define_singleton_method(argf, "readchar", argf_readchar, 0);
-    rb_define_singleton_method(argf, "readbyte", 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);
@@ -6075,8 +4268,8 @@ Init_IO()
     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_readonly_variable("$FILENAME", &filename);
 
     rb_define_virtual_variable("$-i", opt_i_get, opt_i_set);
 
diff --git a/keywords b/keywords
index 6eed5e1f4d..04be992857 100644
--- a/keywords
+++ b/keywords
@@ -1,4 +1,4 @@
-struct kwtable {const char *name; int id[2]; enum lex_state state;};
+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
diff --git a/lex.c b/lex.c
index a15309d502..79d9448dae 100644
--- a/lex.c
+++ b/lex.c
@@ -1,6 +1,6 @@
 /* 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 {const char *name; int id[2]; enum lex_state state;};
+struct kwtable {char *name; int id[2]; enum lex_state state;};
 
 #define TOTAL_KEYWORDS 40
 #define MIN_WORD_LENGTH 2
diff --git a/lib/.document b/lib/.document
deleted file mode 100644
index 2159be8360..0000000000
--- a/lib/.document
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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/lib/English.rb b/lib/English.rb
index 1a0e11de74..625b035270 100644
--- a/lib/English.rb
+++ b/lib/English.rb
@@ -1,155 +1,27 @@
-#  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 $LOADED_FEATURES         $"
 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 $PROGRAM_NAME            $0
 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/lib/README b/lib/README
index fa2bbd9635..19d6309166 100644
--- a/lib/README
+++ b/lib/README
@@ -6,7 +6,7 @@ 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
+complex.rb	complex number suppor
 csv.rb		CSV parser/generator
 date.rb		date object
 date/format.rb	date parsing and formatting
@@ -49,7 +49,7 @@ 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 (obsolete)
+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
@@ -59,7 +59,7 @@ 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
+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
diff --git a/lib/abbrev.rb b/lib/abbrev.rb
index 6530679681..9cd3a71e40 100644
--- a/lib/abbrev.rb
+++ b/lib/abbrev.rb
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-=begin
 #
 # Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
 #
@@ -9,38 +8,8 @@
 # $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)
@@ -80,13 +49,6 @@ module 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
diff --git a/lib/base64.rb b/lib/base64.rb
index 8628d611b2..d7461d82e7 100644
--- a/lib/base64.rb
+++ b/lib/base64.rb
@@ -1,133 +1,29 @@
-#
-# = 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"
 
+def decode64(str)
+  str.unpack("m")[0]
+end
 
-# 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
+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
 
-    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
+def encode64(bin)
+  [bin].pack("m")
 end
 
-include Base64::Deprecated
+def b64encode(bin, len = 60)
+  encode64(bin).scan(/.{1,#{len}}/o) do
+    print $&, "\n"
+  end
+end 
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
index a54700a1c2..c5d1cecc4d 100644
--- a/lib/benchmark.rb
+++ b/lib/benchmark.rb
@@ -1,4 +1,3 @@
-=begin
 #
 # benchmark.rb - a performance benchmarking library 
 # 
@@ -9,33 +8,40 @@
 # 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.
+# used to execute Ruby code.  Read on for illustrative examples.
+# 
+# == Examples
+# 
 #
-# * Measure the time to construct the string given by the expression
-#   <tt>"a"*1_000_000</tt>:
+# === Example 1
+#
+# To 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:
+# On my machine (FreeBSD 3.2 on P5100MHz) this reported as follows:
 # 
 #       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.
+# 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:
+#
+# === Example 2
+#
+# To do some experiments sequentially, the #bm method is useful:
 #
 #       require 'benchmark'
 #
@@ -46,14 +52,17 @@
 #         x.report { 1.upto(n) do ; a = "1"; end }
 #       end
 # 
-#   The result:
+# 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:
+#
+# === Example 3
+#
+# Continuing the previous example, to put a label in each report:
 #
 #       require 'benchmark'
 #
@@ -64,6 +73,9 @@
 #         x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
 #       end
 # 
+# The argument to #bm (7) specifies the offset of each report according to the
+# longest label.
+# 
 # The result:
 # 
 #                     user     system      total        real
@@ -72,11 +84,14 @@
 #        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:
+# === Example 4
+# 
+# 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 for sort an array of floats:
 #
 #       require 'benchmark'
 #       
@@ -87,7 +102,7 @@
 #         x.report("sort")  { array.dup.sort  }
 #       end
 # 
-#   The result:
+# The result:
 # 
 #        Rehearsal -----------------------------------------
 #        sort!  11.928000   0.010000  11.938000 ( 12.756000)
@@ -99,8 +114,10 @@
 #        sort   12.007000   0.000000  12.007000 ( 12.791000)
 #
 #
-# * Report statistics of sequential experiments with unique labels,
-#   using the #benchmark method:
+# === Example 5
+#
+# To report statistics of sequential experiments with unique labels,
+# #benchmark is available:
 #
 #       require 'benchmark'
 #
@@ -112,7 +129,7 @@
 #         [tf+tt+tu, (tf+tt+tu)/3]
 #       end
 # 
-#   The result:
+# The result:
 # 
 #                     user     system      total        real
 #        for:     1.016667   0.016667   1.033333 (  0.485749)
@@ -120,25 +137,20 @@
 #        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"
+  # BENCHMARK_VERSION is version string containing the last modification
+  # date (YYYY-MM-DD). 
+  BENCHMARK_VERSION = "2002-04-25"
 
   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.
+  #
+  # Reports the time required to execute one or more blocks of code.
   #
   # _Note_: Other methods provide a simpler interface to this one, and are
   # suitable for nearly all benchmarking requirements.  See the examples in
@@ -157,7 +169,7 @@ module Benchmark
   #       [tf+tt+tu, (tf+tt+tu)/3]
   #     end
   # 
-  # <i>Generates:</i>
+  # The result:
   # 
   #                     user     system      total        real
   #        for:     1.016667   0.016667   1.033333 (  0.485749)
@@ -166,7 +178,23 @@ module Benchmark
   #        >total:  4.000000   0.033333   4.033333 (  1.889282)
   #        >avg:    1.333333   0.011111   1.344444 (  0.629761)
   # 
-
+  # The parameters accepted are as follows:
+  # 
+  # _caption_::
+  #   A string printed once before execution of the given block. 
+  # 
+  # _label_width_::
+  #   An integer used as an offset in each report. 
+  # 
+  # _fmtstr_::
+  #   A string used to format each measurement. See Benchmark::Tms#format.
+  # 
+  # _labels_::
+  #   The remaining parameters are used as prefix of the format to the
+  #   value of block; see the example above.
+  #
+  # This method yields a Benchmark::Report object. 
+  # 
   def benchmark(caption = "", label_width = nil, fmtstr = nil, *labels) # :yield: report
     sync = STDOUT.sync
     STDOUT.sync = true
@@ -183,8 +211,9 @@ module Benchmark
   end
 
 
-  # A simple interface to the #benchmark method, #bm is generates sequential reports
-  # with labels.  The parameters have the same meaning as for #benchmark.
+  # 
+  # A simple interface to #benchmark, #bm is suitable for sequential reports
+  # with labels.  For example:
   # 
   #     require 'benchmark'
   #
@@ -195,32 +224,38 @@ module Benchmark
   #       x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
   #     end
   # 
-  # <i>Generates:</i>
+  # The argument to #bm (7) specifies the offset of each report according to the
+  # longest label.
+  # 
+  # This reports as follows:
   # 
   #                     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 labels are optional. 
+  # 
   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.
+  # 
+  # Similar to #bm, but designed to prevent memory allocation and garbage
+  # collection from influencing the result.  It works like this:
+  # 
+  # 1. The _rehearsal_ step runs all items in the job list to allocate
+  #    enough memory.
+  # 2. Before each measurement, invokes GC.start to prevent the influence of
+  #    previous job. 
   #
-  # Because #bmbm takes two passes through the tests, it can
-  # calculate the required label width.
+  # If the specified _label_width_ is less than the width of the widest label
+  # passed as an argument to #item, the latter is used.  (Because #bmbm is a
+  # 2-pass procedure, this is possible.)  Therefore you do not really need to
+  # specify a label width.
+  #
+  # For example:
   #
   #       require 'benchmark'
   #       
@@ -231,7 +266,7 @@ module Benchmark
   #         x.report("sort")  { array.dup.sort  }
   #       end
   # 
-  # <i>Generates:</i>
+  # The result:
   # 
   #        Rehearsal -----------------------------------------
   #        sort!  11.928000   0.010000  11.938000 ( 12.756000)
@@ -242,7 +277,7 @@ module Benchmark
   #        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
+  # #bmbm yields a Benchmark::Job object and returns an array of one
   # Benchmark::Tms objects.
   #
   def bmbm(width = 0, &blk) # :yield: job
@@ -304,10 +339,7 @@ module Benchmark
   # Returns the elapsed real time used to execute the given block.
   #
   def realtime(&blk) # :yield:
-    r0 = Time.now
-    yield
-    r1 = Time.now
-    r1.to_f - r0.to_f
+    Benchmark::measure(&blk).real
   end
 
 
@@ -316,7 +348,7 @@ module Benchmark
   # 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:
+  class Job
     #
     # Returns an initialized Job instance.
     # Usually, one doesn't call this method directly, as new
@@ -333,8 +365,8 @@ module Benchmark
     # Registers the given label and block pair in the job list.
     #
     def item(label = "", &blk) # :yield:
-      raise ArgumentError, "no block" unless block_given?
-      label += ' '
+      raise ArgmentError, "no block" unless block_given?
+      label.concat ' '
       w = label.length
       @width = w if @width < w
       @list.push [label, blk]
@@ -358,7 +390,7 @@ module Benchmark
   # This class is used by the Benchmark.benchmark and Benchmark.bm methods.
   # It is of little direct interest to the user.
   #
-  class Report # :nodoc:
+  class Report
     #
     # Returns an initialized Report instance.
     # Usually, one doesn't call this method directly, as new
@@ -417,9 +449,9 @@ module Benchmark
     attr_reader :label
 
     #
-    # Returns an initialized Tms object which has
+    # Returns a 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
+    # _cu_ as the childrens' user CPU time, _cs_ as the childrens'
     # system CPU time, _real_ as the elapsed real time and _l_
     # as the label. 
     # 
@@ -485,8 +517,8 @@ module Benchmark
     #
     # <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>%U</tt>::     Replaced by the childrens' user CPU time, as reported by Tms#cutime 
+    # <tt>%Y</tt>::     Replaced by the childrens' 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")
@@ -515,8 +547,8 @@ module Benchmark
 
     # 
     # 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
+    # label, user CPU time, system CPU time, childrens'
+    # user CPU time, childrens' system CPU time and elapsed
     # real time.
     # 
     def to_a
diff --git a/lib/cgi-lib.rb b/lib/cgi-lib.rb
index d6b60d66cc..bc780ffc4e 100644
--- a/lib/cgi-lib.rb
+++ b/lib/cgi-lib.rb
@@ -1,5 +1,3 @@
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: cgi-lib is deprecated after Ruby 1.8.1; use cgi instead"
-
 =begin
 
 = simple CGI support library
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 5279439a08..7f1f42260e 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -30,7 +30,7 @@
 # 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"
+raise "Please, use ruby1.5.4 or later." if RUBY_VERSION < "1.5.4"
 
 require 'English'
 
@@ -367,13 +367,13 @@ class CGI
   #   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
+    string.gsub(/&(.*?);/n) do
       match = $1.dup
       case match
-      when 'amp'                 then '&'
-      when 'quot'                then '"'
-      when 'gt'                  then '>'
-      when 'lt'                  then '<'
+      when /\Aamp\z/ni           then '&'
+      when /\Aquot\z/ni          then '"'
+      when /\Agt\z/ni            then '>'
+      when /\Alt\z/ni            then '<'
       when /\A#0*(\d+)\z/n       then
         if Integer($1) < 256
           Integer($1).chr
@@ -528,7 +528,7 @@ class CGI
   #   "METHOD_NOT_ALLOWED"  --> "405 Method Not Allowed"
   #   "NOT_ACCEPTABLE"      --> "406 Not Acceptable"
   #   "LENGTH_REQUIRED"     --> "411 Length Required"
-  #   "PRECONDITION_FAILED" --> "412 Precondition Failed"
+  #   "PRECONDITION_FAILED" --> "412 Rrecondition Failed"
   #   "SERVER_ERROR"        --> "500 Internal Server Error"
   #   "NOT_IMPLEMENTED"     --> "501 Method Not Implemented"
   #   "BAD_GATEWAY"         --> "502 Bad Gateway"
@@ -556,8 +556,7 @@ class CGI
     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)
+    if options.delete("nph") or /IIS/n.match(env_table['SERVER_SOFTWARE'])
       buf += (env_table["SERVER_PROTOCOL"] or "HTTP/1.0")  + " " +
              (HTTP_STATUS[options["status"]] or options["status"] or "200 OK") +
              EOL +
@@ -709,13 +708,13 @@ class CGI
       require "nkf"
       case options["charset"]
       when /iso-2022-jp/ni
-        content = NKF::nkf('-m0 -x -j', content)
+        content = NKF::nkf('-j', content)
         options["language"] = "ja" unless options.has_key?("language")
       when /euc-jp/ni
-        content = NKF::nkf('-m0 -x -e', content)
+        content = NKF::nkf('-e', content)
         options["language"] = "ja" unless options.has_key?("language")
       when /shift_jis/ni
-        content = NKF::nkf('-m0 -x -s', content)
+        content = NKF::nkf('-s', content)
         options["language"] = "ja" unless options.has_key?("language")
       end
     end
@@ -771,7 +770,7 @@ class CGI
   #   cookie1.domain  = 'domain'
   #   cookie1.expires = Time.now + 30
   #   cookie1.secure  = true
-  class Cookie < DelegateClass(Array)
+  class Cookie < SimpleDelegator
 
     # Create a new CGI::Cookie object.
     #
@@ -792,16 +791,11 @@ class CGI
     #
     # These keywords correspond to attributes of the cookie object.
     def initialize(name = "", *value)
-      if name.kind_of?(String)
-        @name = name
-        @value = value
-        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
-        @path = ($1 or "")
-        @secure = false
-        return super(@value)
-      end
-
-      options = name
+      options = if name.kind_of?(String)
+                  { "name" => name, "value" => value }
+                else
+                  name
+                end
       unless options.has_key?("name")
         raise ArgumentError, "`name' required"
       end
@@ -876,16 +870,15 @@ class CGI
     cookies = Hash.new([])
     return cookies unless raw_cookie
 
-    raw_cookie.split(/[;,]\s?/).each do |pairs|
+    raw_cookie.split(/; /).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
+      unless cookies.has_key?(name)
+        cookies[name] = Cookie::new({ "name" => name, "value" => values })
       end
-      cookies[name] = Cookie::new(name, *values)
     end
 
     cookies
@@ -930,7 +923,7 @@ class CGI
 
     %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
       define_method(env.sub(/^HTTP_/n, '').downcase) do
-        (val = env_table[env]) && Integer(val)
+        val = env_table[env] && Integer(val)
       end
     end
 
@@ -973,10 +966,8 @@ class CGI
     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
@@ -1005,7 +996,7 @@ class CGI
         end
         body.binmode if defined? body.binmode
 
-        until head and /#{quoted_boundary}(?:#{EOL}|--)/n.match(buf)
+        until head and /#{boundary}(?:#{EOL}|--)/n.match(buf)
 
           if (not head) and /#{EOL}#{EOL}/n.match(buf)
             buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
@@ -1021,37 +1012,33 @@ class CGI
           end
 
           c = if bufsize < content_length
-                stdinput.read(bufsize)
+                stdinput.read(bufsize) or ''
               else
-                stdinput.read(content_length)
+                stdinput.read(content_length) or ''
               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
+        buf = buf.sub(/\A((?:.|\n)*?)(?:#{EOL})?#{boundary}(#{EOL}|--)/n) do
           body.print $1
           if "--" == $2
             content_length = -1
           end
-          boundary_end = $2.dup
           ""
         end
 
         body.rewind
 
-        /Content-Disposition:.* filename=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni.match(head)
-	filename = ($1 or $2 or "")
+        /Content-Disposition:.* filename="?([^\";]*)"?/ni.match(head)
+	filename = ($1 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: ([^\s]*)/ni.match(head)
+        /Content-Type: (.*)/ni.match(head)
         content_type = ($1 or "")
 
         (class << body; self; end).class_eval do
@@ -1060,7 +1047,7 @@ class CGI
           define_method(:content_type) {content_type.dup.taint}
         end
 
-        /Content-Disposition:.* name="?([^\";\s]*)"?/ni.match(head)
+        /Content-Disposition:.* name="?([^\";]*)"?/ni.match(head)
         name = $1.dup
 
         if params.has_key?(name)
@@ -1069,9 +1056,8 @@ class CGI
           params[name] = [body]
         end
         break if buf.size == 0
-        break if content_length == -1
+        break if content_length === -1
       end
-      raise EOFError, "bad boundary end of body part" unless boundary_end=~/--/
 
       params
     end # read_multipart
@@ -1139,16 +1125,17 @@ class CGI
       @multipart
     end
 
-    module Value    # :nodoc:
-      def set_params(params)
+    class Value < DelegateClass(String)    # :nodoc:
+      def initialize(str, params)
         @params = params
+        super(str)
       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]
+          self
         else
-          super[idx,*args]
+          self.to_s[idx,*args]
         end
       end
       def first
@@ -1168,7 +1155,6 @@ class CGI
     # retrieved; use #params() to get the array of values.
     def [](key)
       params = @params[key]
-      return '' unless params
       value = params[0]
       if @multipart
         if value
@@ -1179,10 +1165,7 @@ class CGI
           Tempfile.new("CGI")
         end
       else
-        str = if value then value.dup else "" end
-        str.extend(Value)
-        str.set_params(params)
-        str
+        Value.new(value || "", params)
       end
     end
 
@@ -1305,7 +1288,7 @@ class CGI
     #
     # +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 elements's attributes.
     #
     # The body of the element is the string returned by the no-argument
     # block passed in.
@@ -1564,9 +1547,14 @@ class CGI
         body = ""
       end
       if @output_hidden
-        body += @output_hidden.collect{|k,v|
-          "<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
+        hidden = @output_hidden.collect{|k,v|
+          "<INPUT TYPE=HIDDEN NAME=\"#{k}\" VALUE=\"#{v}\">"
         }.to_s
+        if defined? fieldset
+          body += fieldset{ hidden }
+        else
+          body += hidden
+        end
       end
       super(attributes){body}
     end
@@ -1599,9 +1587,9 @@ class CGI
     # 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
+    # psuedo-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
+    # a string as the sole argument to this method.  The psuedo-attribute
     # "DOCTYPE", if given, is used as the leading DOCTYPE SGML tag; it
     # should include the entire text of this tag, including angle brackets.
     #
@@ -2273,12 +2261,33 @@ class CGI
 
     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
+    if "POST" != env_table['REQUEST_METHOD']
       initialize_query()  # set @params, @cookies
+    else
+      if defined?(CGI_PARAMS)
+        @params  = CGI_PARAMS.nil?  ? nil : CGI_PARAMS.dup
+        @cookies = CGI_COOKIES.nil? ? nil : CGI_COOKIES.dup
+      else
+        initialize_query()  # set @params, @cookies
+        params  = @params.nil?  ? nil : @params.dup
+        cookies = @cookies.nil? ? nil : @cookies.dup
+        (class << self; self; end).class_eval do
+          const_set(:CGI_PARAMS,  params)
+          const_set(:CGI_COOKIES, cookies)
+        end
+        if defined?(MOD_RUBY) and (RUBY_VERSION < "1.4.3")
+          raise "Please, use ruby1.4.3 or later."
+        else
+          at_exit() do
+            if defined?(CGI_PARAMS)
+              CGI.class_eval do
+                remove_const(:CGI_PARAMS)
+                remove_const(:CGI_COOKIES)
+              end
+            end
+          end
+        end
+      end
     end
     @output_cookies = nil
     @output_hidden = nil
@@ -2306,3 +2315,4 @@ class CGI
   end
 
 end   # class CGI
+
diff --git a/lib/cgi/.document b/lib/cgi/.document
deleted file mode 100644
index 107f2f317c..0000000000
--- a/lib/cgi/.document
+++ /dev/null
@@ -1,2 +0,0 @@
-session.rb
-
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index a6e999bc34..4ad6bf2a67 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -155,14 +155,11 @@ class CGI
   #
   class Session
 
-    class NoSession < RuntimeError #:nodoc:
-    end
-
     # The id of this session.
-    attr_reader :session_id, :new_session
+    attr_reader :session_id
 
     def Session::callback(dbman)  #:nodoc:
-      Proc.new{
+      lambda{
 	dbman[0].close unless dbman.empty?
       }
     end
@@ -173,25 +170,15 @@ class CGI
     # a random number, and a constant string.  This routine
     # is used internally for automatically generated
     # session ids. 
-    def create_new_id
-      require 'securerandom'
-      begin
-        session_id = SecureRandom.hex(16)
-      rescue NotImplementedError
-        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')
-        session_id = md5.hexdigest
-      end
-      @new_session = true
-      session_id
+    def Session::create_new_id
+      require 'digest/md5'
+      md5 = Digest::MD5::new
+      md5.update(String(Time::now))
+      md5.update(String(rand(0)))
+      md5.update(String($$))
+      md5.update('foobar')
+      md5.hexdigest[0,16]
     end
-    private :create_new_id
 
     # Create a new CGI::Session object for +request+.
     #
@@ -222,15 +209,15 @@ class CGI
     # 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.
+    #                   +Time+ object.  If not set, the session will continue
+    #                   indefinitely.
     # 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 initializer; see
+    # +option+ is also passed on to the session storage class initialiser; see
     # the documentation for each session storage class for the options
     # they support.
     #                  
@@ -250,45 +237,36 @@ class CGI
     #   end
     #
     def initialize(request, option={})
-      @new_session = false
       session_key = option['session_key'] || '_session_id'
-      session_id = option['session_id']
-      unless session_id
+      id = option['session_id']
+      unless id
 	if option['new_session']
-	  session_id = create_new_id
+	  id = Session::create_new_id
 	end
       end
-      unless session_id
+      unless id
 	if request.key?(session_key)
-	  session_id = request[session_key]
-	  session_id = session_id.read if session_id.respond_to?(:read)
+	  id = request[session_key] 
+	  id = id.read if id.respond_to?(:read)
 	end
-	unless session_id
-	  session_id, = request.cookies[session_key]
+	unless id
+	  id, = request.cookies[session_key]
 	end
-	unless session_id
-	  unless option.fetch('new_session', true)
+	unless id
+	  if option.key?('new_session') and not option['new_session']
 	    raise ArgumentError, "session_key `%s' should be supplied"%session_key
 	  end
-	  session_id = create_new_id
+	  id = Session::create_new_id
 	end
       end
-      @session_id = session_id
+      @session_id = 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
+      @dbman = dbman::new(self, option)
       request.instance_eval do
-	@output_hidden = {session_key => session_id} unless option['no_hidden']
+	@output_hidden = {session_key => id}
 	@output_cookies =  [
           Cookie::new("name" => session_key,
-		      "value" => session_id,
+		      "value" => id,
 		      "expires" => option['session_expires'],
 		      "domain" => option['session_domain'],
 		      "secure" => option['session_secure'],
@@ -299,7 +277,7 @@ class CGI
 				else
 				  ""
 				end)
-        ] unless option['no_cookies']
+        ]
       end
       @dbprot = [@dbman]
       ObjectSpace::define_finalizer(self, Session::callback(@dbprot))
@@ -307,14 +285,20 @@ class CGI
 
     # Retrieve the session data for key +key+.
     def [](key)
-      @data ||= @dbman.restore
+      unless @data
+	@data = @dbman.restore
+      end
       @data[key]
     end
 
     # Set the session date for key +key+.
     def []=(key, val)
-      @write_lock ||= true
-      @data ||= @dbman.restore
+      unless @write_lock
+	@write_lock = true
+      end
+      unless @data
+	@data = @dbman.restore
+      end
       @data[key] = val
     end
 
@@ -347,6 +331,10 @@ class CGI
     # user is responsible for converting other types to Strings when
     # storing and from Strings when retrieving.
     class FileStore
+      def check_id(id) #:nodoc:
+	/[^0-9a-zA-Z]/ =~ id.to_s ? false : true
+      end
+
       # Create a new FileStore instance.
       #
       # This constructor is used internally by CGI::Session.  The
@@ -357,7 +345,7 @@ class CGI
       # characters; automatically generated session ids observe
       # this requirement.
       # 
-      # +option+ is a hash of options for the initializer.  The
+      # +option+ is a hash of options for the initialiser.  The
       # following options are recognised:
       #
       # tmpdir:: the directory to use for storing the FileStore
@@ -366,28 +354,26 @@ class CGI
       # 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
+	unless check_id(id)
+	  raise ArgumentError, "session_id `%s' is invalid" % id
+	end
+	path = dir+"/"+prefix+id
+	path.untaint
+	unless File::exist? path
 	  @hash = {}
 	end
+	begin
+	  @f = open(path, "r+")
+	rescue Errno::ENOENT
+	  @f = open(path, "w+")
+	end
       end
 
       # Restore session state from the session's FileStore file.
@@ -396,19 +382,13 @@ class CGI
       def restore
 	unless @hash
 	  @hash = {}
-          begin
-            lockf = File.open(@path+".lock", "r")
-            lockf.flock File::LOCK_SH
-	    f = File.open(@path, 'r')
-	    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?
-            lockf.close if lockf
-          end
+	  @f.flock File::LOCK_EX
+	  @f.rewind
+	  for line in @f
+	    line.chomp!
+	    k, v = line.split('=',2)
+	    @hash[CGI::unescape(k)] = CGI::unescape(v)
+	  end
 	end
 	@hash
       end
@@ -416,32 +396,25 @@ class CGI
       # Save session state to the session's FileStore file.
       def update
 	return unless @hash
-        begin
-          lockf = File.open(@path+".lock", File::CREAT|File::RDWR, 0600)
-	  lockf.flock File::LOCK_EX
-          f = File.open(@path+".new", File::CREAT|File::TRUNC|File::WRONLY, 0600)
-   	  for k,v in @hash
-	    f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(v))
-	  end
-          f.close
-          File.rename @path+".new", @path
-        ensure
-          f.close if f and !f.closed?
-          lockf.close if lockf
-        end
+	@f.rewind
+	for k,v in @hash
+	  @f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(v))
+	end
+	@f.truncate @f.tell
       end
 
       # Update and close the session's FileStore file.
       def close
+	return if @f.closed?
 	update
+	@f.close
       end
 
       # Close and delete the session's FileStore file.
       def delete
-        File::unlink @path+".lock" rescue nil
-        File::unlink @path+".new" rescue nil
-        File::unlink @path
-      rescue Errno::ENOENT
+	path = @f.path
+	@f.close
+	File::unlink path
       end
     end
 
@@ -460,12 +433,7 @@ class CGI
       # 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
+	GLOBAL_HASH_TABLE[@session_id] ||= {}
       end
 
       # Restore session state.
diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb
index 3d204d5dc0..8f4beb978a 100644
--- a/lib/cgi/session/pstore.rb
+++ b/lib/cgi/session/pstore.rb
@@ -14,12 +14,27 @@ require 'pstore'
 
 class CGI
   class Session
+    def []=(key, val)
+      unless @write_lock
+	@write_lock = true
+      end
+      unless @data
+	@data = @dbman.restore
+      end
+      #@data[key] = String(val)
+      @data[key] = val
+    end
+
     # 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
+      def check_id(id) #:nodoc:
+	/[^0-9a-zA-Z]/ =~ id.to_s ? false : true
+      end
+
       # Create a new CGI::Session::PStore instance
       #
       # This constructor is used internally by CGI::Session.  The
@@ -30,7 +45,7 @@ class CGI
       # characters; automatically generated session ids observe
       # this requirement.
       # 
-      # +option+ is a hash of options for the initializer.  The
+      # +option+ is a hash of options for the initialiser.  The
       # following options are recognised:
       #
       # tmpdir:: the directory to use for storing the PStore
@@ -42,26 +57,19 @@ class CGI
       #
       # 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
+      def initialize session, option={}
+	dir = option['tmpdir'] || ENV['TMP'] || '/tmp'
 	prefix = option['prefix'] || ''
 	id = session.session_id
-        require 'digest/md5'
-        md5 = Digest::MD5.hexdigest(id)[0,16]
-	path = dir+"/"+prefix+md5
+	unless check_id(id)
+	  raise ArgumentError, "session_id `%s' is invalid" % id
+	end
+	path = dir+"/"+prefix+id
 	path.untaint
-	if File::exist?(path)
-	  @hash = nil
-	else
-          unless session.new_session
-            raise CGI::Session::NoSession, "uninitialized session"
-          end
+	unless File::exist? path
 	  @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.
@@ -70,7 +78,11 @@ class CGI
       def restore
 	unless @hash
 	  @p.transaction do
-           @hash = @p['hash'] || {}
+	    begin
+	      @hash = @p['hash']
+	    rescue
+	      @hash = {}
+	    end
 	  end
 	end
 	@hash
diff --git a/lib/complex.rb b/lib/complex.rb
index fbf50ffece..9300f391e8 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -102,8 +102,6 @@ class Complex < Numeric
   @RCS_ID='-$Id: complex.rb,v 1.3 1998/07/08 10:05:28 keiju Exp keiju $-'
 
   undef step
-  undef div, divmod
-  undef floor, truncate, ceil, round
 
   def Complex.generic?(other) # :nodoc:
     other.kind_of?(Integer) or
@@ -196,10 +194,6 @@ class Complex < Numeric
     end
   end
   
-  def quo(other)
-    Complex(@real.quo(1), @image.quo(1)) / other
-  end
-
   #
   # Raise this complex number to the given (real or complex) power.
   #
@@ -415,34 +409,8 @@ class Complex < Numeric
   
 end
 
-class Integer
-
-  unless defined?(1.numerator)
-    def numerator() self end
-    def denominator() 1 end
-
-    def gcd(other)
-      min = self.abs
-      max = other.abs
-      while min > 0
-        tmp = min
-        min = max % min
-        max = tmp
-      end
-      max
-    end
-
-    def lcm(other)
-      if self.zero? or other.zero?
-        0
-      else
-        (self.div(self.gcd(other)) * other).abs
-      end
-    end
 
-  end
 
-end
 
 module Math
   alias sqrt! sqrt
diff --git a/lib/csv.rb b/lib/csv.rb
index f6c12fa285..cfc5489ea0 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -1,314 +1,234 @@
 # 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.
+# This module is copyrighted free software by NAKAMURA, Hiroshi.
+# You can redistribute it and/or modify it under the same term as Ruby.
   
   
 class CSV
-  class IllegalFormatError < RuntimeError; end
+public
+
+  # DESCRIPTION
+  #   CSV::Cell -- Describes 1 cell of CSV.
+  #   
+  class Cell
+  public
+  
+    # Datum as string.
+    attr_accessor :data
+    
+    # Is this datum null?
+    attr_accessor :is_null
+
+    # SYNOPSIS
+    #   cell = CSV::Cell.new(data = '', is_null = true)
+    #
+    # ARGS
+    #   data: datum as String
+    #   is_null: is this datum null?
+    #
+    # RETURNS
+    #   cell: Created instance.
+    #
+    # DESCRIPTION
+    #   Create instance.  If is_null is true, datum is stored in the instance
+    #   created but it should be treated as 'NULL'.
+    #   
+    def initialize(data = '', is_null = true)
+      @data = data
+      @is_null = is_null
+    end
+
+    # SYNOPSIS
+    #   CSV::Cell#match(rhs)
+    #
+    # ARGS
+    #   rhs: an instance of CSV::Cell to be compared.
+    #
+    # RETURNS
+    #   true/false.  See the souce if you want to know matching algorithm.
+    #
+    # DESCRIPTION
+    #   Compare another cell with me.  Bare in mind Null matches with Null
+    #   using this method.  Use CSV::Cell#== if you want Null never matches
+    #   with other data including Null.
+    #
+    def match(rhs)
+      if @is_null and rhs.is_null
+        true
+      elsif @is_null or rhs.is_null
+        false
+      else
+        @data == rhs.data
+      end
+    end
+
+    # SYNOPSIS
+    #   CSV::Cell#==(rhs)
+    #
+    # ARGS
+    #   rhs: an instance of CSV::Cell to be compared.
+    #
+    # RETURNS
+    #   true/false.  See the souce if you want to know matching algorithm.
+    #
+    # DESCRIPTION
+    #   Compare another cell with me.  Bare in mind Null is not match with
+    #   Null using this method.  Null never matches with other data including
+    #   Null.  Use CSV::Cell#match if you want Null matches with Null.
+    #
+    def ==(rhs)
+      if @is_null or rhs.is_null
+        false
+      else
+        @data == rhs.data
+      end
+    end
 
-  # deprecated
-  class Cell < String
-    def initialize(data = "", is_null = false)
-      super(is_null ? "" : data)
+    def to_str
+      content.to_str
     end
 
-    def data
-      to_s
+    def to_s
+      content.to_s
+    end
+
+  private
+
+    def content
+      @is_null ? nil : data
     end
   end
+  
 
-  # deprecated
+  # DESCRIPTION
+  #   CSV::Row -- Describes a row of CSV.  Each element must be a CSV::Cell.
+  #   
   class Row < Array
+  public
+
+    # SYNOPSIS
+    #   CSV::Row#to_a
+    #
+    # RETURNS
+    #   An Array of String.
+    #
+    # DESCRIPTION
+    #   Convert CSV::Cell to String.  Null is converted to nil.
+    #
+    def to_a
+      self.collect { |cell| cell.is_null ? nil : cell.data }
+    end
+
+    # SYNOPSIS
+    #   CSV::Row#match(rhs)
+    #
+    # ARGS
+    #   rhs: an Array of cells.  Each cell is a instance of CSV::Cell.
+    #
+    # RETURNS
+    #   true/false.  See the souce if you want to know matching algorithm.
+    #
+    # DESCRIPTION
+    #   Compare another row with me.
+    #
+    def match(rhs)
+      if self.size != rhs.size
+        return false
+      end
+      for idx in 0...(self.size)
+        unless self[idx].match(rhs[idx])
+          return false
+        end
+      end
+      true
+    end
   end
 
-  # Open a CSV formatted file for reading or writing.
+
+  # SYNOPSIS
+  #   1. reader = CSV.open(filename, 'r')
   #
-  # For reading.
+  #   2. CSV.open(filename, 'r') do |row|
+  #        ...
+  #      end
   #
-  # EXAMPLE 1
-  #   CSV.open('csvfile.csv', 'r') do |row|
-  #     p row
-  #   end
+  #   3. writer = CSV.open(filename, 'w')
   #
-  # EXAMPLE 2
-  #   reader = CSV.open('csvfile.csv', 'r')
-  #   row1 = reader.shift
-  #   row2 = reader.shift
-  #   if row2.empty?
-  #     p 'row2 not find.'
-  #   end
-  #   reader.close
+  #   4. CSV.open(filename, 'w') do |writer|
+  #        ...
+  #      end
   #
   # 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.
+  #   filename: filename to open.
+  #   mode: 'r' for read (parse)
+  #         'w' for write (generate)
+  #   row: an Array of cells which is a parsed line.
+  #   writer: Created writer instance.  See CSV::Writer#<< and
+  #     CSV::Writer#add_row to know how to generate CSV string.
   #
   # RETURNS
-  #   reader instance.  To get parse result, see CSV::Reader#each.
-  #
+  #   reader: Create reader instance.  To get parse result, see
+  #     CSV::Reader#each.
+  #   writer: Created writer instance.  See CSV::Writer#<< and
+  #     CSV::Writer#add_row to know how to generate CSV string.
   #
-  # For writing.
+  # DESCRIPTION
+  #   Open a CSV formatted file to read or write.
   #
   # EXAMPLE 1
-  #   CSV.open('csvfile.csv', 'w') do |writer|
-  #     writer << ['r1c1', 'r1c2']
-  #     writer << ['r2c1', 'r2c2']
-  #     writer << [nil, nil]
+  #   reader = CSV.open('csvfile.csv', 'r')
+  #   row1 = reader.shift
+  #   row2 = reader.shift
+  #   if row2.empty?
+  #     p 'row2 not find.'
   #   end
-  #
+  #   reader.close
+  #   
   # EXAMPLE 2
+  #   CSV.open('csvfile.csv', 'r') do |row|
+  #     p row
+  #   end
+  #      
+  # EXAMPLE 3
   #   writer = CSV.open('csvfile.csv', 'w')
   #   writer << ['r1c1', 'r1c2'] << ['r2c1', 'r2c2'] << [nil, nil]
   #   writer.close
+  #   
+  # EXAMPLE 4
+  #   CSV.open('csvfile.csv', 'w') do |writer|
+  #     writer << ['r1c1', 'r1c2']
+  #     writer << ['r2c1', 'r2c2']
+  #     writer << [nil, nil]
+  #   end
   #
-  # 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)
+  def CSV.open(filename, mode, col_sep = ?,, row_sep = nil, &block)
     if mode == 'r' or mode == 'rb'
-      open_reader(path, mode, fs, rs, &block)
+      open_reader(filename, col_sep, row_sep, &block)
     elsif mode == 'w' or mode == 'wb'
-      open_writer(path, mode, fs, rs, &block)
+      open_writer(filename, col_sep, row_sep, &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)
+  def CSV.parse(filename, col_sep = ?,, row_sep = nil, &block)
+    open_reader(filename, col_sep, row_sep, &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
+  def CSV.generate(filename, col_sep = ?,, row_sep = nil, &block)
+    open_writer(filename, col_sep, row_sep, &block)
   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)
+    def open_reader(filename, col_sep, row_sep, &block)
+      file = File.open(filename, 'rb')
       if block
         begin
-          CSV::Reader.parse(file, fs, rs) do |row|
+          CSV::Reader.parse(file, col_sep, row_sep) do |row|
             yield(row)
           end
         ensure
@@ -316,17 +236,17 @@ class CSV
         end
         nil
       else
-        reader = CSV::Reader.create(file, fs, rs)
+        reader = CSV::Reader.create(file, col_sep, row_sep)
         reader.close_on_terminate
         reader
       end
     end
 
-    def open_writer(path, mode, fs, rs, &block)
-      file = File.open(path, mode)
+    def open_writer(filename, col_sep, row_sep, &block)
+      file = File.open(filename, 'wb')
       if block
         begin
-          CSV::Writer.generate(file, fs, rs) do |writer|
+          CSV::Writer.generate(file, col_sep, row_sep) do |writer|
             yield(writer)
           end
         ensure
@@ -334,186 +254,19 @@ class CSV
         end
         nil
       else
-        writer = CSV::Writer.create(file, fs, rs) 
+        writer = CSV::Writer.create(file, col_sep, row_sep) 
         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.
-  #
+  # DESCRIPTION
+  #   CSV::Reader -- CSV formatted string/stream reader.
+  #   
   # EXAMPLE
-  #   read CSV lines untill the first column is 'stop'.
+  #   Read CSV lines untill the first column is 'stop'.
   #
   #   CSV::Reader.parse(File.open('bigdata', 'rb')) do |row|
   #     p row
@@ -522,37 +275,80 @@ class CSV
   #
   class Reader
     include Enumerable
+  public
 
-    # 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)
+    # SYNOPSIS
+    #   reader = CSV::Reader.create(str_or_readable)
+    #
+    # ARGS
+    #   str_or_readable: a CSV data to be parsed.  A String or an IO.
+    #
+    # RETURNS
+    #   reader: Created instance.
+    #
+    # DESCRIPTION
+    #   Create instance.  To get parse result, see CSV::Reader#each.
+    #   
+    def Reader.create(str_or_readable, col_sep = ?,, row_sep = nil)
       case str_or_readable
       when IO
-        IOReader.new(str_or_readable, fs, rs)
+        IOReader.new(str_or_readable, col_sep, row_sep)
       when String
-        StringReader.new(str_or_readable, fs, rs)
+        StringReader.new(str_or_readable, col_sep, row_sep)
       else
-        IOReader.new(str_or_readable, fs, rs)
+        IOReader.new(str_or_readable, col_sep, row_sep)
       end
     end
 
+    # SYNOPSIS
+    #   CSV::Reader.parse(str_or_readable) do |row|
+    #     ...
+    #   end
+    #
+    # ARGS
+    #   str_or_readable: a CSV data to be parsed.  A String or an IO.
+    #   row: a CSV::Row; an Array of a CSV::Cell in a line.
+    #
+    # RETURNS
+    #   nil
+    #
+    # DESCRIPTION
+    #   Parse CSV data and get lines.  Caller block is called for each line
+    #   with an argument which is a chunk of cells in a row.
+    #
+    #   Block value is always nil.  Rows are not cached for performance
+    #   reason.
+    #
+    def Reader.parse(str_or_readable, col_sep = ?,, row_sep = nil)
+      reader = create(str_or_readable, col_sep, row_sep)
+      reader.each do |row|
+        yield(row)
+      end
+      reader.close
+      nil
+    end
+
+    # SYNOPSIS
+    #   CSV::Reader#each do |row|
+    #     ...
+    #   end
+    #
+    # ARGS
+    #   row: a CSV::Row; an Array of a CSV::Cell in a line.
+    #
+    # RETURNS
+    #   nil
+    #
+    # DESCRIPTION
+    #   Caller block is called for each line with an argument which is a chunk
+    #   of cells in a row.
+    #
+    #   Block value is always nil.  Rows are not cached for performance
+    #   reason.
+    #   
     def each
       while true
-        row = []
+        row = Row.new
         parsed_cells = get_row(row)
         if parsed_cells == 0
           break
@@ -562,18 +358,35 @@ class CSV
       nil
     end
 
+    # SYNOPSIS
+    #   cell = CSV::Reader#shift
+    #
+    # RETURNS
+    #   cell: a CSV::Row; an Array of a CSV::Cell.
+    #
+    # DESCRIPTION
+    #   Extract cells of next line.
+    #   
     def shift
-      row = []
+      row = Row.new
       parsed_cells = get_row(row)
       row
     end
 
+    # SYNOPSIS
+    #   CSV::Reader#close
+    #
+    # RETURNS
+    #   nil
+    #
+    # DESCRIPTION
+    #   Close this reader.
+    #   
     def close
       terminate
     end
 
   private
-
     def initialize(dev)
       raise RuntimeError.new('Do not instanciate this class directly.')
     end
@@ -588,10 +401,35 @@ class CSV
   end
   
 
+  # DESCRIPTION
+  #   CSV::StringReader -- CSV formatted 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 StringReader < Reader
-    def initialize(string, fs = ',', rs = nil)
-      @fs = fs
-      @rs = rs
+  public
+
+    # SYNOPSIS
+    #   reader = CSV::StringReader.new(string)
+    #
+    # ARGS
+    #   string: a CSV String to be parsed.
+    #
+    # RETURNS
+    #   reader: Created instance.
+    #
+    # DESCRIPTION
+    #   Create instance.  To get parse result, see CSV::Reader#each.
+    #   
+    def initialize(string, col_sep = ?,, row_sep = nil)
+      @col_sep = col_sep
+      @row_sep = row_sep
       @dev = string
       @idx = 0
       if @dev[0, 3] == "\xef\xbb\xbf"
@@ -600,10 +438,9 @@ class CSV
     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
+      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @col_sep, @row_sep)
+      if parsed_cells == 0 && next_idx == 0 && @idx != @dev.size
         raise IllegalFormatError.new
       end
       @idx = next_idx
@@ -612,11 +449,37 @@ class CSV
   end
 
 
+  # DESCRIPTION
+  #   CSV::IOReader -- CSV formatted 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 IOReader < Reader
-    def initialize(io, fs = ',', rs = nil)
+  public
+
+    # SYNOPSIS
+    #   reader = CSV::IOReader.new(io)
+    #
+    # ARGS
+    #   io: a CSV data to be parsed.  Must be an IO. (io#read is called.)
+    #
+    # RETURNS
+    #   reader: Created instance.
+    #
+    # DESCRIPTION
+    #   Create instance.  To get parse result, see CSV::Reader#each.
+    #   
+    def initialize(io, col_sep = ?,, row_sep = nil)
       @io = io
-      @fs = fs
-      @rs = rs
+      @io.binmode if @io.respond_to?(:binmode)
+      @col_sep = col_sep
+      @row_sep = row_sep
       @dev = CSV::IOBuf.new(@io)
       @idx = 0
       if @dev[0] == 0xef and @dev[1] == 0xbb and @dev[2] == 0xbf
@@ -625,17 +488,24 @@ class CSV
       @close_on_terminate = false
     end
 
-    # Tell this reader to close the IO when terminated (Triggered by invoking
-    # CSV::IOReader#close).
+    # SYNOPSIS
+    #   CSV::IOReader#close_on_terminate
+    #
+    # RETURNS
+    #   true
+    #
+    # DESCRIPTION
+    #   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?
+      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @col_sep, @row_sep)
+      if parsed_cells == 0 && next_idx == 0 && !@dev.is_eos?
         raise IllegalFormatError.new
       end
       dropped = @dev.drop(next_idx)
@@ -655,51 +525,137 @@ class CSV
   end
 
 
-  # CSV formatted string/stream writer.
-  #
+  # DESCRIPTION
+  #   CSV::Writer -- 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']
+  #     # or
+  #     csv.add_row [
+  #       CSV::Cell.new('c1', false),
+  #       CSV::Cell.new('dummy', true),
+  #       CSV::Cell.new('', false),
+  #       CSV::Cell.new('"', false),
+  #       CSV::Cell.new("\r\n", false)
+  #       CSV::Cell.new('c2', false)
+  #     ]
+  #     ...
   #     ...
   #   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
+  public
+
+    # SYNOPSIS
+    #   writer = CSV::Writer.create(str_or_readable)
+    #
+    # ARGS
+    #   str_or_writable: device for generated CSV string.  Must respond to
+    #     '<<(string)'.
+    #
+    # RETURNS
+    #   writer: Created instance.
+    #
+    # DESCRIPTION
+    #   Create instance.  To add CSV data to generate CSV string, see
+    #   CSV::Writer#<< or CSV::Writer#add_row.
+    #   
+    def Writer.create(str_or_writable, col_sep = ?,, row_sep = nil)
+      BasicWriter.new(str_or_writable, col_sep, row_sep)
     end
 
-    # str_or_writable must handle '<<(string)'.
-    def Writer.create(str_or_writable, fs = ',', rs = nil)
-      BasicWriter.new(str_or_writable, fs, rs)
+    # SYNOPSIS
+    #   CSV::Writer.generate(str_or_writable) do |writer|
+    #     ...
+    #   end
+    #
+    # ARGS
+    #   str_or_writable: device for generated CSV string.  Must respond to
+    #     '<<(string)'.
+    #   writer: Created writer instance.  See CSV::Writer#<< and
+    #     CSV::Writer#add_row to know how to generate CSV string.
+    #
+    # RETURNS
+    #   nil
+    #
+    # DESCRIPTION
+    #   Create writer instance.  Caller block is called with the new instance.
+    #   To add CSV data to generate CSV string, see CSV::Writer#<< or
+    #   CSV::Writer#add_row.
+    #   
+    def Writer.generate(str_or_writable, col_sep = ?,, row_sep = nil)
+      writer = Writer.create(str_or_writable, col_sep, row_sep)
+      yield(writer)
+      writer.close
+      nil
     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)
+    # SYNOPSIS
+    #   CSV::Writer#<<(row)
+    #
+    # ARGS
+    #   row: an Array of a String.
+    #
+    # RETURNS
+    #   self
+    #
+    # DESCRIPTION
+    #   Dump CSV stream to the device.  Argument is an array of a String like
+    #   ['c1', 'c2', 'c3'].
+    #   
+    def <<(ary)
+      row = ary.collect { |item|
+        if item.is_a?(Cell)
+          item
+        elsif (item.nil?)
+          Cell.new('', true)
+        else
+          Cell.new(item.to_s, false)
+        end
+      }
+      CSV.generate_row(row, row.size, @dev, @col_sep, @row_sep)
+      self
+    end
+
+    # SYNOPSIS
+    #   CSV::Writer#<<(row)
+    #
+    # ARGS
+    #   row: an Array of a CSV::Cell.
+    #
+    # RETURNS
+    #   self
+    #
+    # DESCRIPTION
+    #   Dump CSV stream to the device.  Argument is an array of a CSV::Cell
+    #   like [CSV::Cell.new('c1', false), CSV::Cell.new('dummy', true)].
+    #   (Formar is 'c1' and latter is Null.)
+    #   
+    def add_row(row)
+      CSV.generate_row(row, row.size, @dev, @col_sep, @row_sep)
       self
     end
-    alias add_row <<
 
+    # SYNOPSIS
+    #   CSV::Writer#close
+    #
+    # RETURNS
+    #   nil
+    #
+    # DESCRIPTION
+    #   Close this writer.
+    #   
     def close
       terminate
     end
 
   private
-
     def initialize(dev)
       raise RuntimeError.new('Do not instanciate this class directly.')
     end
@@ -710,22 +666,49 @@ class CSV
   end
 
 
+  # DESCRIPTION
+  #   CSV::BasicWriter -- CSV formatted string/stream writer using <<.
+  #   
   class BasicWriter < Writer
-    def initialize(str_or_writable, fs = ',', rs = nil)
-      @fs = fs
-      @rs = rs
+  public
+
+    # SYNOPSIS
+    #   writer = CSV::BasicWriter.new(str_or_writable)
+    #
+    # ARGS
+    #   str_or_writable: device for generated CSV string.  Must respond to
+    #     '<<(string)'.
+    #
+    # RETURNS
+    #   writer: Created instance.
+    #
+    # DESCRIPTION
+    #   Create instance.  To add CSV data to generate CSV string, see
+    #   CSV::Writer#<< or CSV::Writer#add_row.
+    #   
+    def initialize(str_or_writable, col_sep = ?,, row_sep = nil)
+      @col_sep = col_sep
+      @row_sep = row_sep
       @dev = str_or_writable
+      @dev.binmode if @dev.respond_to?(:binmode)
       @close_on_terminate = false
     end
 
-    # Tell this writer to close the IO when terminated (Triggered by invoking
-    # CSV::BasicWriter#close).
+    # SYNOPSIS
+    #   CSV::BasicWriter#close_on_terminate
+    #
+    # RETURNS
+    #   true
+    #
+    # DESCRIPTION
+    #   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
@@ -733,9 +716,350 @@ class CSV
     end
   end
 
+  # SYNOPSIS
+  #   cells = CSV.parse_line(src, col_sep = ?,, row_sep = nil)
+  #
+  # ARGS
+  #   src: a CSV 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
+  #   cells: an Array of parsed cells in first line.  Each cell is a String.
+  #
+  # DESCRIPTION
+  #   Parse one line from given string.  Bare 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, col_sep = ?,, row_sep = nil)
+    idx = 0
+    res_type = :DT_COLSEP
+    cells = Row.new
+    begin
+      while (res_type.equal?(:DT_COLSEP))
+        cell = Cell.new
+        res_type, idx = parse_body(src, idx, cell, col_sep, row_sep)
+        cells.push(cell.is_null ? nil : cell.data)
+      end
+    rescue IllegalFormatError
+      return Row.new
+    end
+    cells
+  end
+  
+
+  # SYNOPSIS
+  #   str = CSV.generate_line(cells, col_sep = ?,, row_sep = nil)
+  #
+  # ARGS
+  #   cells: an Array of cell to be converted to CSV string.  Each cell must 
+  #     respond to 'to_s'.
+  #   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
+  #   str: a String of generated CSV string.
+  #
+  # DESCRIPTION
+  #   Create a line from cells.  Each cell is stringified by to_s.
+  #   
+  def CSV.generate_line(cells, col_sep = ?,, row_sep = nil)
+    if (cells.size == 0)
+      return ''
+    end
+    res_type = :DT_COLSEP
+    result_str = ''
+    idx = 0
+    while true
+      cell = if (cells[idx].nil?)
+          Cell.new('', true)
+        else
+          Cell.new(cells[idx].to_s, false)
+        end
+      generate_body(cell, result_str, col_sep, row_sep)
+      idx += 1
+      if (idx == cells.size)
+        break
+      end
+      generate_separator(:DT_COLSEP, result_str, col_sep, row_sep)
+    end
+    result_str
+  end
+  
+  # SYNOPSIS
+  #   parsed_cells, idx = CSV.parse_row(src, idx, out_dev, col_sep = ?,, row_sep = nil)
+  #
+  # 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 '<<(CSV::Cell)'.
+  #   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'.
+  #
+  # DESCRIPTION
+  #   Parse a line from string.  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
+  #   
+  def CSV.parse_row(src, idx, out_dev, col_sep = ?,, row_sep = nil)
+    idx_backup = idx
+    parsed_cells = 0
+    res_type = :DT_COLSEP
+    begin
+      while (!res_type.equal?(:DT_ROWSEP))
+        cell = Cell.new
+        res_type, idx = parse_body(src, idx, cell, col_sep, row_sep)
+        if res_type.equal?(:DT_EOS)
+          if idx == idx_backup #((parsed_cells == 0) && (cell.is_null))
+            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
+  
+  # SYNOPSIS
+  #   parsed_cells = CSV.generate_row(src, cells, out_dev, col_sep = ?,, row_sep = nil)
+  #
+  # ARGS
+  #   src: an Array of CSV::Cell to be converted to CSV string.  Must respond to
+  #     'size' and '[](idx)'.  src[idx] must return CSV::Cell.
+  #   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.
+  #
+  # DESCRIPTION
+  #   Convert a line from cells data to string.  To generate multi-row CSV
+  #   string,  See EXAMPLE below.
+  #
+  # EXAMPLE
+  #   def d(str)
+  #     CSV::Cell.new(str, false)
+  #   end
+  #
+  #   row1 = [d('a'), d('b')]
+  #   row2 = [d('c'), d('d')]
+  #   row3 = [d('e'), d('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
+  #   
+  def CSV.generate_row(src, cells, out_dev, col_sep = ?,, row_sep = nil)
+    src_size = src.size
+    if (src_size == 0)
+      if cells == 0
+        generate_separator(:DT_ROWSEP, out_dev, col_sep, row_sep)
+      end
+      return 0
+    end
+    res_type = :DT_COLSEP
+    parsed_cells = 0
+    generate_body(src[parsed_cells], out_dev, col_sep, row_sep)
+    parsed_cells += 1
+    while ((parsed_cells < cells) && (parsed_cells != src_size))
+      generate_separator(:DT_COLSEP, out_dev, col_sep, row_sep)
+      generate_body(src[parsed_cells], out_dev, col_sep, row_sep)
+      parsed_cells += 1
+    end
+    if (parsed_cells == cells)
+      generate_separator(:DT_ROWSEP, out_dev, col_sep, row_sep)
+    else
+      generate_separator(:DT_COLSEP, out_dev, col_sep, row_sep)
+    end
+    parsed_cells
+  end
+  
 private
+  class IllegalFormatError < RuntimeError; end
+
+  # Private class methods.
+  class << self
+  private
 
-  # Buffered stream.
+    def parse_body(src, idx, cell, col_sep, row_sep)
+      row_sep_end = row_sep || ?\n
+      cell.is_null = false
+      state = :ST_START
+      quoted = false
+      cr = false
+      c = nil
+      while (c = src[idx])
+        idx += 1
+        result_state = :DT_UNKNOWN
+        if (c == col_sep)
+          if state.equal?(:ST_DATA)
+            if cr
+              raise IllegalFormatError.new
+            end
+            if (!quoted)
+              state = :ST_END
+              result_state = :DT_COLSEP
+            else
+              cell.data << c.chr
+            end
+          elsif state.equal?(:ST_QUOTE)
+            if cr
+              raise IllegalFormatError.new
+            end
+            state = :ST_END
+            result_state = :DT_COLSEP
+          else  # :ST_START
+            cell.is_null = true
+            state = :ST_END
+            result_state = :DT_COLSEP
+          end
+        elsif (c == ?")         # " for vim syntax hilighting.
+          if state.equal?(:ST_DATA)
+            if cr
+              raise IllegalFormatError.new
+            end
+            if quoted
+              quoted = false
+              state = :ST_QUOTE
+            else
+              raise IllegalFormatError.new
+            end
+          elsif state.equal?(:ST_QUOTE)
+            cell.data << c.chr
+            quoted = true
+            state = :ST_DATA
+          else  # :ST_START
+            quoted = true
+            state = :ST_DATA
+          end
+        elsif row_sep.nil? and c == ?\r
+          if cr
+            raise IllegalFormatError.new
+          end
+          if quoted
+            cell.data << c.chr
+            state = :ST_DATA
+          else
+            cr = true
+          end
+        elsif c == row_sep_end
+          if state.equal?(:ST_DATA)
+            if cr
+              state = :ST_END
+              result_state = :DT_ROWSEP
+              cr = false
+            else
+              if quoted
+                cell.data << c.chr
+                state = :ST_DATA
+              else
+                state = :ST_END
+                result_state = :DT_ROWSEP
+              end
+            end
+          elsif state.equal?(:ST_QUOTE)
+            state = :ST_END
+            result_state = :DT_ROWSEP
+            if cr
+              cr = false
+            end
+          else  # :ST_START
+            cell.is_null = true
+            state = :ST_END
+            result_state = :DT_ROWSEP
+          end
+        else
+          if state.equal?(:ST_DATA) || state.equal?(:ST_START)
+            if cr
+              raise IllegalFormatError.new
+            end
+            cell.data << c.chr
+            state = :ST_DATA
+          else  # :ST_QUOTE
+            raise IllegalFormatError.new
+          end
+        end
+        if state.equal?(:ST_END)
+          return result_state, idx;
+        end
+      end
+      if state.equal?(:ST_START)
+        cell.is_null = true
+      elsif state.equal?(:ST_QUOTE)
+        true    # dummy for coverate; only a data
+      elsif quoted
+        raise IllegalFormatError.new
+      elsif cr
+        raise IllegalFormatError.new
+      end
+      return :DT_EOS, idx
+    end
+  
+    def generate_body(cells, out_dev, col_sep, row_sep)
+      row_data = cells.data.dup
+      if (!cells.is_null)
+        if (row_data.gsub!('"', '""') ||
+            row_data.include?(col_sep) ||
+	    (row_sep && row_data.index(row_sep)) ||
+	    (/[\r\n]/ =~ row_data) ||
+	    (cells.data.empty?))
+          out_dev << '"' << row_data << '"'
+        else
+          out_dev << row_data
+        end
+      end
+    end
+    
+    def generate_separator(type, out_dev, col_sep, row_sep)
+      case type
+      when :DT_COLSEP
+        out_dev << col_sep.chr
+      when :DT_ROWSEP
+        out_dev << (row_sep ? row_sep.chr : "\r\n")
+      end
+    end
+  end
+
+
+  # DESCRIPTION
+  #   CSV::StreamBuf -- a class for a bufferd stream.
   #
   # EXAMPLE 1 -- an IO.
   #   class MyBuf < StreamBuf
@@ -777,14 +1101,14 @@ private
   #
   # 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
@@ -792,14 +1116,26 @@ private
   #     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.
+  class StreamBuf       # pure virtual. (do not instanciate it directly)
+  public
+  
+    # SYNOPSIS
+    #   char/str = CSV::StreamBuf#get(idx, n = nil)
+    #   char/str = CSV::StreamBuf#[idx, n = nil]
+    #
+    # ARGS
+    #   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: if n == nil.  A char at idx.
+    #   str: if n != nil.  A partial string, from idx to (idx + size).  At
+    #     EOF, the string size could not equal to arg n.
+    #
+    # DESCRIPTION
+    #   Get a char or a partial string from the stream.
+    #
     def [](idx, n = nil) 
       if idx < 0
         return nil
@@ -828,11 +1164,11 @@ private
       end
       loc = my_offset + next_idx
       if !n
-        return @buf_list[my_buf][loc]           # Fixnum of char code.
+        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.
+        return @buf_list[my_buf][loc, n]	# String.
       else # should do loop insted of (tail) recursive call...
-        res = @buf_list[my_buf][loc, BufSize]
+	res = @buf_list[my_buf][loc, BufSize]
         size_added = buf_size(my_buf) - loc
         if size_added > 0
           idx += size_added
@@ -847,17 +1183,27 @@ private
     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.
+    # SYNOPSIS
+    #   size_dropped = CSV::StreamBuf#drop(n)
+    #
+    # ARGS
+    #   n: drop size
+    #
+    # RETURNS
+    #   size_dropped: droped size.  At EOF, dropped size might not equals to arg n.
+    #     0 if n <= 0.
+    #
+    # DESCRIPTION
+    #   Drop a string from the stream.  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 (!@is_eos || (@cur_buf != @buf_tail_idx))
           if (@offset + n < buf_size(@cur_buf))
             size_dropped += n
             @offset += n
@@ -879,12 +1225,26 @@ private
       size_dropped
     end
   
+    # SYNOPSIS
+    #   is_eos = CSV::StreamBuf#is_eos?
+    #
+    # RETURNS
+    #   is_eos: true if end of the stream or false.
+    #
+    # DESCRIPTION
+    #   Check EOF or not.
+    #
     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.
+    # SYNOPSIS
+    #   N/A
+    #
+    # DESCRIPTION
+    #   Do not instanciate 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
@@ -895,15 +1255,14 @@ private
     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.
+    #   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
@@ -953,13 +1312,14 @@ private
     end
   
     def idx_is_eos?(idx)
-      (@is_eos and ((@cur_buf < 0) or (@cur_buf == @buf_tail_idx)))
+      (@is_eos && ((@cur_buf < 0) || (@cur_buf == @buf_tail_idx)))
     end
   
     BufSize = 1024 * 8
   end
 
-  # Buffered IO.
+  # DESCRIPTION
+  #   CSV::IOBuf -- a class for a bufferd IO.
   #
   # EXAMPLE
   #   # File 'bigdata' could be a giga-byte size one!
@@ -970,6 +1330,7 @@ private
   #   end
   #
   class IOBuf < StreamBuf
+  public
     def initialize(s)
       @s = s
       super()
@@ -980,7 +1341,6 @@ private
     end
 
   private
-
     def read(size)
       @s.read(size)
     end
diff --git a/lib/date.rb b/lib/date.rb
index 90a4a01ca3..21e35a6660 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -1,20 +1,20 @@
-#
+# 
 # date.rb - date and time library
 #
-# Author: Tadayoshi Funaba 1998-2008
+# Author: Tadayoshi Funaba 1998-2002
 #
 # Documentation: William Webber <william@williamwebber.com>
 #
 #--
-# $Id: date.rb,v 2.37 2008-01-17 20:16:31+09 tadf Exp $
+# $Id: date.rb,v 2.8 2002-06-08 00:39:51+09 tadf Exp $
 #++
 #
 # == Overview
 #
 # This file provides two classes for working with
 # dates and times.
-#
-# The first class, Date, represents dates.
+# 
+# The first class, Date, represents dates.  
 # It works with years, months, weeks, and days.
 # See the Date class documentation for more details.
 #
@@ -28,11 +28,11 @@
 # 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
+# This is known as the *Civil* *Date*, and abbrevated 
 # 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
+# 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.)
@@ -58,7 +58,7 @@
 # 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
@@ -80,7 +80,7 @@
 # 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.
+# 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*.
@@ -94,7 +94,7 @@
 #
 # 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*
+# 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.
 #
@@ -103,24 +103,24 @@
 # 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
+# (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
+# 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
+# 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)
+# 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.
@@ -148,13 +148,13 @@
 # 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).
+# 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
+# This simple representation of time zones does not take 
 # into account the common practice of Daylight Savings
 # Time or Summer Time.
 #
@@ -201,7 +201,7 @@ require 'date/format'
 # 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
+# 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.)
@@ -217,7 +217,7 @@ require 'date/format'
 # Date objects are immutable once created.
 #
 # Once a Date has been created, date values
-# can be retrieved for the different date formats supported
+# 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
@@ -237,9 +237,9 @@ class Date
   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
+  # 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.
+  # represenation indexed into this array gives the name of that day.
   DAYNAMES = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)
 
   # Abbreviated month names, in English.
@@ -249,54 +249,6 @@ class Date
   # 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 unless x.nil?}.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; return d <=> other.d
-      when Numeric; return 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
@@ -307,26 +259,11 @@ class Date
 
   # A constant used to indicate that a Date should always use the
   # Julian calendar.
-  JULIAN    =  Infinity.new
+  JULIAN    = false
 
   # A constant used to indicate that a Date should always use the
   # Gregorian calendar.
-  GREGORIAN = -Infinity.new
-
-  HALF_DAYS_IN_DAY       = Rational(1, 2) # :nodoc:
-  HOURS_IN_DAY           = Rational(1, 24) # :nodoc:
-  MINUTES_IN_DAY         = Rational(1, 1440) # :nodoc:
-  SECONDS_IN_DAY         = Rational(1, 86400) # :nodoc:
-  MILLISECONDS_IN_DAY    = Rational(1, 86400*10**3) # :nodoc:
-  NANOSECONDS_IN_DAY     = Rational(1, 86400*10**9) # :nodoc:
-  MILLISECONDS_IN_SECOND = Rational(1, 10**3) # :nodoc:
-  NANOSECONDS_IN_SECOND  = Rational(1, 10**9) # :nodoc:
-
-  MJD_EPOCH_IN_AJD       = Rational(4800001, 2) # 1858-11-17 # :nodoc:
-  UNIX_EPOCH_IN_AJD      = Rational(4881175, 2) # 1970-01-01 # :nodoc:
-  MJD_EPOCH_IN_CJD       = 2400001 # :nodoc:
-  UNIX_EPOCH_IN_CJD      = 2440588 # :nodoc:
-  LD_EPOCH_IN_CJD        = 2299160 # :nodoc:
+  GREGORIAN = true
 
   # Does a given Julian Day Number fall inside the old-style (Julian)
   # calendar?
@@ -336,17 +273,10 @@ class Date
   # 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)
+  def self.os? (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
+    when Numeric; jd < sg
+    else;         not sg
     end
   end
 
@@ -355,38 +285,7 @@ class Date
   #
   # 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
+  def self.ns? (jd, sg) not os?(jd, sg) end
 
   # Convert a Civil Date to a Julian Day Number.
   # +y+, +m+, and +d+ are the year, month, and day of the
@@ -403,7 +302,7 @@ class Date
     jd = (365.25 * (y + 4716)).floor +
       (30.6001 * (m + 1)).floor +
       d + b - 1524
-    if julian?(jd, sg)
+    if os?(jd, sg)
       jd -= b
     end
     jd
@@ -413,10 +312,10 @@ class Date
   # the Julian Day Number. +sg+ specifies the Day of
   # Calendar Reform.
   #
-  # Returns the corresponding [year, month, day_of_month]
+  # 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)
+    if os?(jd, sg)
       a = jd
     else
       x = ((jd - 1867216.25) / 36524.25).floor
@@ -437,16 +336,27 @@ class Date
     return y, m, dom
   end
 
-  # Convert a Commercial Date to a Julian Day Number.
+  # Convert an Ordinal 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.
+  # +y+ and +d+ are the year and day-of-year 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)
+  #
+  # 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, ns?(jd, sg))
+    return y, doy
   end
 
   # Convert a Julian Day Number to a Commercial Date
@@ -457,101 +367,100 @@ class Date
   # 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)
+    ns = ns?(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
+    w = 1 + (jd - commercial_to_jd(y, 1, 1, ns)) / 7
     d = (jd + 1) % 7
-    d = 7 if d == 0
+    if d.zero? then d = 7 end
     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
+  # 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
 
-  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
+  %w(self.clfloor clfloor).each do |name|
+    module_eval <<-"end;"
+      def #{name}(x, y=1)
+	q, r = x.divmod(y)
+	q = q.to_i
+	return q, r
+      end
+    end;
   end
 
-  private_class_method :weeknum_to_jd, :jd_to_weeknum
+  private_class_method :clfloor
+  private              :clfloor
+
 
   # Convert an Astronomical Julian Day Number to a (civil) Julian
   # Day Number.
   #
-  # +ajd+ is the Astronomical Julian Day Number to convert.
+  # +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 + HALF_DAYS_IN_DAY).divmod(1) end
+  def self.ajd_to_jd(ajd, of=0) clfloor(ajd + of + 1.to_r/2) 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.
+  # 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
+  # Returns the Astronomical Julian Day Number as a single 
   # numeric value.
-  def self.jd_to_ajd(jd, fr, of=0) jd + fr - of - HALF_DAYS_IN_DAY end
+  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)
-    ss,  fr = fr.divmod(SECONDS_IN_DAY) # 4p
-    h,   ss = ss.divmod(3600)
-    min, s  = ss.divmod(60)
+    h,   fr = clfloor(fr, 1.to_r/24)
+    min, fr = clfloor(fr, 1.to_r/1440)
+    s,   fr = clfloor(fr, 1.to_r/86400)
     return h, min, s, fr
   end
 
   # Convert an +h+ hour, +min+ minutes, +s+ seconds period
   # to a fractional day.
-  begin
-    Rational(Rational(1, 2), 2) # a challenge
-
-    def self.time_to_day_fraction(h, min, s)
-      Rational(h * 3600 + min * 60 + s, 86400) # 4p
-    end
-  rescue
-    def self.time_to_day_fraction(h, min, s)
-	if Integer === h && Integer === min && Integer === s
-	  Rational(h * 3600 + min * 60 + s, 86400) # 4p
-	else
-	  (h * 3600 + min * 60 + s).to_r/86400 # 4p
-	end
-    end
+  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
+  # Convert an Astronomical Modified Julian Day Number to an 
   # Astronomical Julian Day Number.
-  def self.amjd_to_ajd(amjd) amjd + MJD_EPOCH_IN_AJD end
+  def self.amjd_to_ajd(amjd) amjd + 4800001.to_r/2 end
 
-  # Convert an Astronomical Julian Day Number to an
+  # Convert an Astronimcal Julian Day Number to an
   # Astronomical Modified Julian Day Number.
-  def self.ajd_to_amjd(ajd) ajd - MJD_EPOCH_IN_AJD end
+  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 + MJD_EPOCH_IN_CJD end
+  def self.mjd_to_jd(mjd) mjd + 2400001 end
 
-  # Convert a Julian Day Number to a Modified Julian Day
+  # Convert a Julian Day Number to a Modified Julian Day 
   # Number.
-  def self.jd_to_mjd(jd) jd - MJD_EPOCH_IN_CJD end
+  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 + LD_EPOCH_IN_CJD end
+  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 - LD_EPOCH_IN_CJD end
+  def self.jd_to_ld(jd) jd - 2299160 end
 
   # Convert a Julian Day Number to the day of the week.
   #
@@ -567,10 +476,10 @@ class Date
   #
   # 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
+  def self.gregorian_leap? (y) y % 4 == 0 and y % 100 != 0 or y % 400 == 0 end
 
   class << self; alias_method :leap?, :gregorian_leap? end
-  class << self; alias_method :new!, :new end
+  class << self; alias_method :new0, :new end
 
   # Is +jd+ a valid Julian Day Number?
   #
@@ -578,6 +487,16 @@ class Date
   # Julian Day Number.
   def self.valid_jd? (jd, sg=ITALY) jd 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)
+    new0(jd_to_ajd(jd, 0, 0), 0, sg)
+  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.
@@ -585,17 +504,17 @@ class Date
   # +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.
+  # +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)
+      ny, = clfloor(y + 1, 1)
       jd = ordinal_to_jd(ny, d + 1, sg)
-      ns = fix_style(jd, sg)
+      ns = ns?(jd, sg)
       return unless [y] == jd_to_ordinal(jd, sg)[0..0]
       return unless [ny, 1] == jd_to_ordinal(jd - d, ns)
     else
@@ -605,15 +524,32 @@ class Date
     jd
   end
 
-  # Do year +y+, month +m+, and day-of-month +d+ make a
-  # valid Civil Date?  Returns the corresponding Julian
+  # 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
+    new0(jd_to_ajd(jd, 0, 0), 0, sg)
+  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
+  # A date falling in the period skipped in the Day of Calendar 
   # Reform adjustment is not valid.
   #
   # +sg+ specifies the Day of Calendar Reform.
@@ -622,10 +558,10 @@ class Date
       m += 13
     end
     if d < 0
-      ny, nm = (y * 12 + m).divmod(12)
-      nm,    = (nm + 1).divmod(1)
+      ny, nm = clfloor(y * 12 + m, 12)
+      nm,    = clfloor(nm + 1, 1)
       jd = civil_to_jd(ny, nm, d + 1, sg)
-      ns = fix_style(jd, sg)
+      ns = ns?(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
@@ -637,6 +573,28 @@ class Date
 
   class << self; alias_method :valid_date?, :valid_civil? 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
+    new0(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
+
+  class << self; alias_method :new, :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.
@@ -647,7 +605,7 @@ class Date
   # 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
+  # A date falling in the period skipped in the Day of Calendar 
   # Reform adjustment is not valid.
   #
   # +sg+ specifies the Day of Calendar Reform.
@@ -656,107 +614,15 @@ class Date
       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
+      w = jd_to_commercial(commercial_to_jd(y + 1, 1, 1) + w * 7)[1]
     end
     jd = commercial_to_jd(y, w, d)
-    return unless gregorian?(jd, sg)
+    return unless ns?(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...24) === h &&
-		   (0...60) === min &&
-		   (0...60) === 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
+  # Create a new Date object for the Commercial Date specifed by
   # year +y+, week-of-year +w+, and day-of-week +d+.
   #
   # Monday is day-of-week 1; Sunday is day-of-week 7.
@@ -774,197 +640,26 @@ class Date
     unless jd = valid_commercial?(y, w, d, sg)
       raise ArgumentError, 'invalid date'
     end
-    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+    new0(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:
+  def self.new_with_hash(elem, sg)
     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] = UNIX_EPOCH_IN_CJD + 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)
+    y, m, d = elem.values_at(:year, :mon, :mday)
+    if [y, m, d].include? nil
       raise ArgumentError, 'invalid date'
+    else
+      civil(y, m, d, sg)
     end
-    new!(jd_to_ajd(jd, 0, 0), 0, sg)
   end
 
-  private_class_method :new_by_frags
+  private_class_method :new_with_hash
 
   # 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
+  # +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
@@ -977,13 +672,13 @@ class Date
   # parsed.
   def self.strptime(str='-4712-01-01', fmt='%F', sg=ITALY)
     elem = _strptime(str, fmt)
-    new_by_frags(elem, sg)
+    new_with_hash(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.
+  # +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
@@ -997,7 +692,15 @@ class Date
   # +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)
+    new_with_hash(elem, sg)
+  end
+
+  # Create a new Date object representing today.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.today(sg=ITALY)
+    jd = civil_to_jd(*(Time.now.to_a[3..5].reverse << sg))
+    new0(jd_to_ajd(jd, 0, 0), 0, sg)
   end
 
   class << self
@@ -1018,9 +721,9 @@ class Date
 
   end
 
-  # *NOTE* this is the documentation for the method new!().  If
+  # *NOTE* this is the documentation for the method new0().  If
   # you are reading this as the documentation for new(), that is
-  # because rdoc doesn't fully support the aliasing of the
+  # 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
@@ -1028,9 +731,9 @@ class Date
   #
   # Create a new Date object.
   #
-  # +ajd+ is the Astronomical Julian Day Number.
+  # +ajd+ is the Astronomical Julian Day Number. 
   # +of+ is the offset from UTC as a fraction of a day.
-  # Both default to 0.
+  # Both default to 0. 
   #
   # +sg+ specifies the Day of Calendar Reform to use for this
   # Date object.
@@ -1063,19 +766,16 @@ class Date
   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:
+  def civil() self.class.jd_to_civil(jd, @sg) end
 
   # Get the date as an Ordinal Date, [year, day_of_year]
-  def ordinal() self.class.jd_to_ordinal(jd, @sg) end # :nodoc:
+  def ordinal() self.class.jd_to_ordinal(jd, @sg) end
 
   # 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 commercial() self.class.jd_to_commercial(jd, @sg) end
 
-  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
+  once :civil, :ordinal, :commercial
+  private :civil, :ordinal, :commercial
 
   # Get the year of this date.
   def year() civil[0] end
@@ -1096,14 +796,9 @@ class Date
   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:
+  def time() self.class.day_fraction_to_time(day_fraction) end
 
   once :time
   private :time
@@ -1117,20 +812,18 @@ class Date
   # 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.
+  # Get the fraction-of-a-second of this date.
   def sec_fraction() time[3] end
 
-=begin
-  alias_method :minute, :min
-  alias_method :second, :sec
-  alias_method :second_fraction, :sec_fraction
-=end
-
   private :hour, :min, :sec, :sec_fraction
-#	  :minute, :second, :second_fraction
 
-  def zone() strftime('%:z') end
+  def zone
+    ['Z',
+      format('%+.2d%02d',
+	     (@of     / (1.to_r/24)).to_i,
+	     (@of.abs % (1.to_r/24) / (1.to_r/1440)).to_i)
+    ][@of<=>0]
+  end
 
   private :zone
 
@@ -1151,38 +844,18 @@ class Date
 
   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
+  def os? () self.class.os?(jd, @sg) end
 
   # Is the current date new-style (Gregorian Calendar)?
-  def gregorian? () self.class.gregorian?(jd, @sg) end
+  def ns? () self.class.ns?(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
+  once :os?, :ns?
 
   # 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
+    self.class.jd_to_civil(self.class.civil_to_jd(year, 3, 1, ns?) - 1,
+		     ns?)[-1] == 29
   end
 
   once :leap?
@@ -1191,7 +864,7 @@ class Date
   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
+  def new_start(sg=self.class::ITALY) self.class.new0(@ajd, @of, sg) end
 
   # Create a copy of this Date object that uses the Italian/Catholic
   # Day of Calendar Reform.
@@ -1210,13 +883,7 @@ class Date
   def gregorian() new_start(self.class::GREGORIAN) end
 
   def offset() @of end
-
-  def new_offset(of=0)
-    if String === of
-      of = Rational(zone_to_diff(of) || 0, 86400)
-    end
-    self.class.new!(@ajd, of, @sg)
-  end
+  def new_offset(of=0) self.class.new0(@ajd, of, @sg) end
 
   private :offset, :new_offset
 
@@ -1231,7 +898,7 @@ class Date
   # particular, two Dates cannot be added to each other.
   def + (n)
     case n
-    when Numeric; return self.class.new!(@ajd + n, @of, @sg)
+    when Numeric; return self.class.new0(@ajd + n, @of, @sg)
     end
     raise TypeError, 'expected numeric'
   end
@@ -1246,7 +913,7 @@ class Date
   # 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 Numeric; return self.class.new0(@ajd - x, @of, @sg)
     when Date;    return @ajd - x.ajd
     end
     raise TypeError, 'expected numeric or date'
@@ -1254,7 +921,7 @@ class Date
 
   # Compare this date with another date.
   #
-  # +other+ can also be a Numeric value, in which case it is
+  # +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
@@ -1285,16 +952,6 @@ class Date
     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.
   #
@@ -1302,10 +959,10 @@ class Date
   # 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)
+    y, m = clfloor(year * 12 + (mon - 1) + n, 12)
+    m,   = clfloor(m + 1, 1)
     d = mday
-    d -= 1 until jd2 = self.class.valid_civil?(y, m, d, fix_style)
+    d -= 1 until jd2 = self.class.valid_civil?(y, m, d, ns?)
     self + (jd2 - jd)
   end
 
@@ -1317,33 +974,13 @@ class Date
   # 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
+  # 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
-    if step.zero?
-      raise ArgumentError, "step can't be 0"
-    end
-=end
-=begin
-    unless block_given?
-      return to_enum(:step, limit, step)
-    end
-=end
+  def step(limit, step)  # :yield: date
     da = self
-    op = %w(- <= >=)[step <=> 0]
+    op = [:-,:<=,:>=][step<=>0]
     while da.__send__(op, limit)
       yield da
       da += step
@@ -1353,20 +990,25 @@ class Date
 
   # 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
+  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)
+      step(min, -1, &block) 
   end
 
+  # Return a new Date one day after this one.
+  def succ() self + 1 end
+
+  alias_method :next, :succ
+
   # 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
+  def eql? (other) Date === other and self == other end
 
   # Calculate a hash value for this date.
   def hash() @ajd.hash end
@@ -1377,14 +1019,14 @@ class Date
   # Return the date as a human-readable string.
   #
   # The format used is YYYY-MM-DD.
-  def to_s() format('%.4d-%02d-%02d', year, mon, mday) end # 4p
+  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
+# def self._load(str) new0(*Marshal.load(str)) end
 
-  # Load from Marshal format.
+  # Load from Marshall format.
   def self._load(str)
     a = Marshal.load(str)
     if a.size == 2
@@ -1394,7 +1036,7 @@ class Date
     else
       ajd, of, sg = a
     end
-    new!(ajd, of, sg)
+    new0(ajd, of, sg)
   end
 
 end
@@ -1415,7 +1057,7 @@ end
 #
 # 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 after midnight is hour 0; the last hour of the day is 
 # hour 23.
 #
 # === min()
@@ -1429,8 +1071,7 @@ end
 # === 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.
+# a +Rational+.
 #
 # === zone()
 #
@@ -1450,6 +1091,25 @@ end
 #
 class DateTime < Date
 
+  # 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..24) === h and
+		  (0..59) === min and
+		  (0..59) === s
+    time_to_day_fraction(h, min, s)
+  end
+
   # Create a new DateTime object corresponding to the specified
   # Julian Day Number +jd+ and hour +h+, minute +min+, second +s+.
   #
@@ -1464,14 +1124,11 @@ class DateTime < Date
   #
   # 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)) &&
+    unless (jd = valid_jd?(jd, sg)) and
 	   (fr = valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
-    if String === of
-      of = Rational(zone_to_diff(of) || 0, 86400)
-    end
-    new!(jd_to_ajd(jd, fr, of), of, sg)
+    new0(jd_to_ajd(jd, fr, of), of, sg)
   end
 
   # Create a new DateTime object corresponding to the specified
@@ -1489,14 +1146,11 @@ class DateTime < Date
   # +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)) &&
+    unless (jd = valid_ordinal?(y, d, sg)) and
 	   (fr = valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
-    if String === of
-      of = Rational(zone_to_diff(of) || 0, 86400)
-    end
-    new!(jd_to_ajd(jd, fr, of), of, sg)
+    new0(jd_to_ajd(jd, fr, of), of, sg)
   end
 
   # Create a new DateTime object corresponding to the specified
@@ -1511,17 +1165,14 @@ class DateTime < Date
   # +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
+  # +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)) &&
+    unless (jd = valid_civil?(y, m, d, sg)) and
 	   (fr = valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
-    if String === of
-      of = Rational(zone_to_diff(of) || 0, 86400)
-    end
-    new!(jd_to_ajd(jd, fr, of), of, sg)
+    new0(jd_to_ajd(jd, fr, of), of, sg)
   end
 
   class << self; alias_method :new, :civil end
@@ -1542,66 +1193,53 @@ class DateTime < Date
   # 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)) &&
+    unless (jd = valid_commercial?(y, w, d, sg)) and
 	   (fr = valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
-    if String === of
-      of = Rational(zone_to_diff(of) || 0, 86400)
-    end
-    new!(jd_to_ajd(jd, fr, of), of, sg)
+    new0(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 = Rational(zone_to_diff(of) || 0, 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))
+  def self.new_with_hash(elem, sg)
+    elem ||= {}
+    y, m, d, h, min, s, of =
+      elem.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)
+    h   ||= 0
+    min ||= 0
+    s   ||= 0
+    of  ||= 0
+    if [y, m, d].include? nil
       raise ArgumentError, 'invalid date'
+    else
+      civil(y, m, d, h, min, s, of.to_r/86400, sg)
     end
-    fr += (elem[:sec_fraction] || 0) / 86400
-    of = Rational(elem[:offset] || 0, 86400)
-    new!(jd_to_ajd(jd, fr, of), of, sg)
   end
 
-  private_class_method :new_by_frags
+  private_class_method :new_with_hash
 
   # 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
+  # +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.
+  # The default +str+ is '-4712-01-01T00:00:00Z', 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)
+  def self.strptime(str='-4712-01-01T00:00:00Z', fmt='%FT%T%Z', sg=ITALY)
     elem = _strptime(str, fmt)
-    new_by_frags(elem, sg)
+    new_with_hash(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.
+  # +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
@@ -1609,151 +1247,74 @@ class DateTime < Date
   # 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
+  # The default +str+ is '-4712-01-01T00:00:00Z'; 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)
+  def self.parse(str='-4712-01-01T00:00:00Z', comp=false, sg=ITALY)
     elem = _parse(str, comp)
-    new_by_frags(elem, sg)
+    new_with_hash(elem, sg)
   end
 
-  public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset
-#	 :minute, :second, :second_fraction
-
-  def to_s # 4p
-    format('%.4d-%02d-%02dT%02d:%02d:%02d%s',
-	   year, mon, mday, hour, min, sec, zone)
-  end
-
-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) +
-      Rational(usec, 86400_000_000)
-    of = Rational(utc_offset, 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
+  class << self; undef_method :today 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
+  def self.now(sg=ITALY)
+    i = Time.now
+    a = i.to_a[0..5].reverse
+    jd = civil_to_jd(*(a[0,3] << sg))
+    fr = time_to_day_fraction(*(a[3,3])) + i.usec.to_r/86400000000
+    d = Time.gm(*i.to_a).to_i - i.to_i
+    d += d / d.abs if d.nonzero?
+    of = (d / 60).to_r/1440
+    new0(jd_to_ajd(jd, fr, of), of, sg)
   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
+  public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset
 
 end
 
 class Date
 
-  class << self
-
-    def deprecated_class_method_alias(old, new) # :nodoc:
-      module_eval <<-"end;"
-	class << self
-	  def #{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;
-    end
-
-    private :deprecated_class_method_alias
-
-    def deprecated_alias(old, new) # :nodoc:
-      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 :deprecated_alias
-
-  end
-
-  [ %w(os?	julian?),
-    %w(ns?	gregorian?),
-    %w(exist1?	valid_jd?),
+  [ %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|
-    deprecated_class_method_alias(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(sg	start),
     %w(newsg	new_start),
     %w(of	offset),
     %w(newof	new_offset)
   ].each do |old, new|
-    deprecated_alias(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
diff --git a/lib/date/format.rb b/lib/date/format.rb
index f89c1344a9..f00f60ab47 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -1,1190 +1,535 @@
-# format.rb: Written by Tadayoshi Funaba 1999-2008
-# $Id: format.rb,v 2.43 2008-01-17 20:16:31+09 tadf Exp $
-
-require 'rational'
+# format.rb: Written by Tadayoshi Funaba 1999-2003
+# $Id: format.rb,v 2.9 2003-04-19 19:19:35+09 tadf Exp $
 
 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,
-      'at'  => -2*3600, 'brst'=> -2*3600, 'ndt' => -(2*3600+1800),
-      'art' => -3*3600, 'adt' => -3*3600, 'brt' => -3*3600, 'clst'=> -3*3600,
-      'nst' => -(3*3600+1800),
-      'ast' => -4*3600, 'clt' => -4*3600,
-      'akdt'=> -8*3600, 'ydt' => -8*3600,
-      'akst'=> -9*3600, 'hadt'=> -9*3600, 'hdt' => -9*3600, 'yst' => -9*3600,
-      'ahst'=>-10*3600, 'cat' =>-10*3600, 'hast'=>-10*3600, 'hst' =>-10*3600,
-      'nt'  =>-11*3600,
-      'idlw'=>-12*3600,
-      'bst' =>  1*3600, 'cet' =>  1*3600, 'fwt' =>  1*3600, 'met' =>  1*3600,
-      'mewt'=>  1*3600, 'mez' =>  1*3600, 'swt' =>  1*3600, 'wat' =>  1*3600,
-      'west'=>  1*3600,
-      'cest'=>  2*3600, 'eet' =>  2*3600, 'fst' =>  2*3600, 'mest'=>  2*3600,
-      'mesz'=>  2*3600, 'sast'=>  2*3600, 'sst' =>  2*3600,
-      'bt'  =>  3*3600, 'eat' =>  3*3600, 'eest'=>  3*3600, 'msk' =>  3*3600,
-      'msd' =>  4*3600, 'zp4' =>  4*3600,
-      'zp5' =>  5*3600, 'ist' =>  (5*3600+1800),
-      'zp6' =>  6*3600,
-      'wast'=>  7*3600,
-      'cct' =>  8*3600, 'sgt' =>  8*3600, 'wadt'=>  8*3600,
-      'jst' =>  9*3600, 'kst' =>  9*3600,
-      'east'=> 10*3600, 'gst' => 10*3600,
-      'eadt'=> 11*3600,
-      'idle'=> 12*3600, 'nzst'=> 12*3600, 'nzt' => 12*3600,
-      'nzdt'=> 13*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?}
+  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
+  }
+
+  def self.__strptime(str, fmt, elem)
+    fmt.scan(/%[EO]?.|./o) do |c|
+      cc = c.sub(/\A%[EO]?(.)\Z/o, '%\\1')
+      case cc
+      when /\A\s/o
+	str.sub!(/\A[\s\v]+/o, '')
+      when '%A', '%a'
+	return unless str.sub!(/\A([a-z]+)\b/io, '')
+	val = DAYS[$1.downcase] || ABBR_DAYS[$1.downcase]
+	return unless val
+	elem[:wday] = val
+      when '%B', '%b', '%h'
+	return unless str.sub!(/\A([a-z]+)\b/io, '')
+	val = MONTHS[$1.downcase] || ABBR_MONTHS[$1.downcase]
+	return unless val
+	elem[:mon] = val
+      when '%C'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	elem[:cent] = val
+      when '%c'
+	return unless __strptime(str, '%a %b %e %H:%M:%S %Y', elem)
+      when '%D'
+	return unless __strptime(str, '%m/%d/%y', elem)
+      when '%d', '%e'
+	return unless str.sub!(/\A ?(\d+)/o, '')
+	val = $1.to_i
+	return unless (1..31) === val
+	elem[:mday] = val
+      when '%F'
+	return unless __strptime(str, '%Y-%m-%d', elem)
+      when '%G'
+	return unless str.sub!(/\A([-+]?\d+)/o, '')
+	val = $1.to_i
+	elem[:cwyear] = val
+      when '%g'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (0..99) === val
+	elem[:cwyear] = val
+	elem[:cent] ||= if val >= 69 then 19 else 20 end
+      when '%H', '%k'
+	return unless str.sub!(/\A ?(\d+)/o, '')
+	val = $1.to_i
+	return unless (0..24) === val
+	elem[:hour] = val
+      when '%I', '%l'
+	return unless str.sub!(/\A ?(\d+)/o, '')
+	val = $1.to_i
+	return unless (1..12) === val
+	elem[:hour] = val
+      when '%j'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (1..366) === val
+	elem[:yday] = val
+      when '%M'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (0..59) === val
+	elem[:min] = val
+      when '%m'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (1..12) === val
+	elem[:mon] = val
+      when '%n'
+	return unless __strptime(str, ' ', elem)
+      when '%p', '%P'
+	return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/io, '')
+	elem[:merid] = if $1.downcase == 'a' then 0 else 12 end
+      when '%R'
+	return unless __strptime(str, '%H:%M', elem)
+      when '%r'
+	return unless __strptime(str, '%I:%M:%S %p', elem)
+      when '%S'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (0..60) === val
+	elem[:sec] = val
+      when '%s'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	elem[:seconds] = val
+      when '%T'
+	return unless __strptime(str, '%H:%M:%S', elem)
+      when '%t'
+	return unless __strptime(str, ' ', elem)
+      when '%U', '%W'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (0..53) === val
+	elem[if c == '%U' then :wnum0 else :wnum1 end] = val
+      when '%u'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (1..7) === val
+	elem[:cwday] = val
+      when '%V'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (1..53) === val
+	elem[:cweek] = val
+      when '%v'
+	return unless __strptime(str, '%e-%b-%Y', elem)
+      when '%w'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (0..6) === val
+	elem[:wday] = val
+      when '%X'
+	return unless __strptime(str, '%H:%M:%S', elem)
+      when '%x'
+	return unless __strptime(str, '%m/%d/%y', elem)
+      when '%Y'
+	return unless str.sub!(/\A([-+]?\d+)/o, '')
+	val = $1.to_i
+	elem[:year] = val
+      when '%y'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	return unless (0..99) === val
+	elem[:year] = val
+	elem[:cent] ||= if val >= 69 then 19 else 20 end
+      when '%Z', '%z'
+	return unless str.sub!(/\A([-+:a-z0-9]+(?:\s+dst\b)?)/io, '')
+	val = $1
+	elem[:zone] = val
+	offset = zone_to_diff(val)
+	elem[:offset] = offset
+      when '%%'
+	return unless str.sub!(/\A%/o, '')
+      when '%+'
+	return unless __strptime(str, '%a %b %e %H:%M:%S %Z %Y', elem)
+      when '%1'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i
+	elem[:jd] = val
+      when '%2'
+	return unless __strptime(str, '%Y-%j', elem)
+      when '%3'
+	return unless __strptime(str, '%F', elem)
+      else
+	return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '')
       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 = {}
-      a = $&
-      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
+    if cent = elem.delete(:cent)
+      if elem[:cwyear]
+	elem[:cwyear] += cent * 100
       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', 'EC'; emit_sn((year / 100).floor, 2, f)
-      when 'c', 'Ec'; emit_a(strftime('%a %b %e %H:%M:%S %Y'), 0, f)
-      when 'D'; emit_a(strftime('%m/%d/%y'), 0, f)
-      when 'd', 'Od'; emit_n(mday, 2, f)
-      when 'e', 'Oe'; 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', 'OH'; emit_n(hour, 2, f)
-      when 'h'; emit_ad(strftime('%b'), 0, f)
-      when 'I', 'OI'; 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 / MILLISECONDS_IN_DAY).floor, 3, f)
-      when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f)
-      when 'M', 'OM'; emit_n(min, 2, f)
-      when 'm', 'Om'; emit_n(mon, 2, f)
-      when 'N'
-	emit_n((sec_fraction / NANOSECONDS_IN_DAY).floor, 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'
-	s = ((ajd - UNIX_EPOCH_IN_AJD) / MILLISECONDS_IN_DAY).round
-	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', 'OS'; emit_n(sec, 2, f)
-      when 's'
-	s = ((ajd - UNIX_EPOCH_IN_AJD) / SECONDS_IN_DAY).round
-	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', 'OU', 'OW'
-	emit_n(if c[-1,1] == 'U' then wnum0 else wnum1 end, 2, f)
-      when 'u', 'Ou'; emit_n(cwday, 1, f)
-      when 'V', 'OV'; emit_n(cweek, 2, f)
-      when 'v'; emit_a(strftime('%e-%b-%Y'), 0, f)
-      when 'w', 'Ow'; emit_n(wday, 1, f)
-      when 'X', 'EX'; emit_a(strftime('%H:%M:%S'), 0, f)
-      when 'x', 'Ex'; emit_a(strftime('%m/%d/%y'), 0, f)
-      when 'Y', 'EY'; emit_sn(year, 4, f)
-      when 'y', 'Ey', 'Oy'; 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
-	ss = fr.div(SECONDS_IN_DAY) # 4p
-	hh, ss = ss.divmod(3600)
-	mm, ss = ss.divmod(60)
-	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
-	a
+      if elem[:year]
+	elem[:year] += cent * 100
       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)
+    if merid = elem.delete(:merid)
+      if elem[:hour]
+	elem[:hour] %= 12
+	elem[:hour] += merid
       end
-      g + strftime('.%m.%d')
     end
-  end
 
-  def beat(n=0)
-    i, f = (new_offset(HOURS_IN_DAY).day_fraction * 1000).divmod(1)
-    ('@%03d' % i) +
-      if n < 1
-	''
-      else
-	'.%0*d' % [n, (f / Rational(1, 10**n)).round]
-      end
+    str
   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|
-      a = $&
-      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', 'EC'
-	  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', 'Ec'
-	  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', 'Od', 'Oe'
-	  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', 'OH'
-	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
-	  val = $1.to_i
-	  return unless (0..24) === val
-	  e.hour = val
-	when 'I', 'l', 'OI'
-	  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 = Rational($1.to_i, 10**3)
-	  val = Rational($1.to_i, 10**$1.size)
-	  e.sec_fraction = val
-	when 'M', 'OM'
-	  return unless str.sub!(/\A(\d{1,2})/, '')
-	  val = $1.to_i
-	  return unless (0..59) === val
-	  e.min = val
-	when 'm', 'Om'
-	  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 = Rational($1.to_i, 10**9)
-	  val = Rational($1.to_i, 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 = Rational($1.to_i, 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', 'OS'
-	  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', 'OU', 'OW'
-	  return unless str.sub!(/\A(\d{1,2})/, '')
-	  val = $1.to_i
-	  return unless (0..53) === val
-	  e.__send__(if s[-1,1] == 'U' then :wnum0= else :wnum1= end, val)
-	when 'u', 'Ou'
-	  return unless str.sub!(/\A(\d{1})/, '')
-	  val = $1.to_i
-	  return unless (1..7) === val
-	  e.cwday = val
-	when 'V', 'OV'
-	  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', 'EX'
-	  return unless _strptime_i(str, '%H:%M:%S', e)
-	when 'x', 'Ex'
-	  return unless _strptime_i(str, '%m/%d/%y', e)
-	when 'Y', 'EY'
-	  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', 'Ey', 'Oy'
-	  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+)?)?
-				    |[[:alpha:].\s]+(?:standard|daylight)\s+time\b
-				    |[[:alpha:]]+(?:\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(a)), '')
-	end
-      else
-	case c
-	when /\A[\s\v]/
-	  str.sub!(/\A[\s\v]+/, '')
-	else
-	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
-	end
-      end
-    end
-  end
-
-  private_class_method :_strptime_i
+  private_class_method :__strptime
 
   def self._strptime(str, fmt='%F')
-    str = str.dup
-    e = Format::Bag.new
-    return unless _strptime_i(str, 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
-
-    unless str.empty?
-      e.leftover = str
-    end
-
-    e.to_hash
+    elem = {}
+    elem if __strptime(str.dup, fmt, elem)
   end
 
-  def self.s3e(e, y, m, d, bc=false)
-    unless String === m
-      m = m.to_s
-    end
-
-    if y && m && !d
-      y, m, d = d, y, m
-    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
+  PARSE_MONTHPAT = ABBR_MONTHS.keys.join('|')
+  PARSE_DAYPAT   = ABBR_DAYS.  keys.join('|')
 
-  end
+  def self._parse(str, comp=false)
+    str = str.dup
 
-  private_class_method :s3e
+    str.gsub!(/[^-+.\/:0-9a-z]+/ino, ' ')
 
-  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
+    # day
+    if str.sub!(/(#{PARSE_DAYPAT})\S*/ino, ' ')
+      wday = ABBR_DAYS[$1.downcase]
     end
-  end
 
-  def self._parse_time(str, e) # :nodoc:
+    # time
     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\.)
-		 )
+		/(\d+):(\d+)(?::(\d+))?
+		 (?:
+		   \s*
+		   ([ap])(?:m\b|\.m\.)
+		 )?
 		 (?:
 		   \s*
 		   (
-		     (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+		     [a-z]+(?:\s+dst)?\b
 		   |
-		     [[:alpha:].\s]+(?:standard|daylight)\stime\b
-		   |
-		     [[:alpha:]]+(?:\sdst)?\b
+		     [-+]\d+(?::?\d+)
 		   )
 		 )?
-		/inx,
+		/inox,
 		' ')
+      hour = $1.to_i
+      min = $2.to_i
+      sec = $3.to_i if $3
 
-      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 = Rational($4.to_i, 10**$4.size) if $4
-
-      if $5
-	e.hour %= 12
-	if $5.downcase == 'p'
-	  e.hour += 12
+      if $4
+	hour %= 12
+	if $4.downcase == 'p'
+	  hour += 12
 	end
       end
-      true
-    end
-  end
 
-=begin
-  def self._parse_beat(str, e) # :nodoc:
-    if str.sub!(/@\s*(\d+)(?:[,.](\d*))?/, ' ')
-      beat = Rational($1.to_i)
-      beat += Rational($2.to_i, 10**$2.size) if $2
-      secs = Rational(beat, 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
+      zone = $5
     end
-  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:
+    # eu
     if str.sub!(
-		/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
-		 \s*
-		 ('?\d+)[^-\d\s']*
+		/(\d+)\S*
+		 \s+
+		 (#{PARSE_MONTHPAT})\S*
 		 (?:
-		   \s*
-		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
-		   \s*
-		   ('?-?\d+)
+		   \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
+		' ')
+      mday = $1.to_i
+      mon = ABBR_MONTHS[$2.downcase]
 
-  def self._parse_iso2(str, e) # :nodoc:
-    if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/in, ' ')
-      e.cwyear = $1.to_i if $1
-      e.cweek = $2.to_i
-      e.cwday = $3.to_i if $3
-      true
-    elsif str.sub!(/-w-(\d)\b/in, ' ')
-      e.cwday = $1.to_i
-      true
-    elsif str.sub!(/--(\d{2})?-(\d{2})\b/n, ' ')
-      e.mon = $1.to_i if $1
-      e.mday = $2.to_i
-      true
-    elsif str.sub!(/--(\d{2})(\d{2})?\b/n, ' ')
-      e.mon = $1.to_i
-      e.mday = $2.to_i if $2
-      true
-    elsif /[,.](\d{2}|\d{4})-\d{3}\b/n !~ str &&
-	str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/n, ' ')
-      e.year = $1.to_i
-      e.yday = $2.to_i
-      true
-    elsif /\d-\d{3}\b/n !~ str &&
-	str.sub!(/\b-(\d{3})\b/n, ' ')
-      e.yday = $1.to_i
-      true
-    end
-  end
+      if $3
+	year = $3.to_i
+	if $3.size > 2
+	  comp = false
+	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
+    # us
+    elsif str.sub!(
+		   /(#{PARSE_MONTHPAT})\S*
+		    \s+
+		    (\d+)\S*
+		    (?:
+		      \s+
+		      (-?\d+)
+		    )?
+		   /inox,
+		   ' ')
+      mon = ABBR_MONTHS[$1.downcase]
+      mday = $2.to_i
 
-  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
+      if $3
+	year = $3.to_i
+	if $3.size > 2
+	  comp = false
+	end
+      end
 
-  def self._parse_sla(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|n, ' ') # '
-      s3e(e, $3, $1, $2)
-      true
-    end
-  end
+    # iso
+    elsif str.sub!(/([-+]?\d+)-(\d+)-(-?\d+)/no, ' ')
+      year = $1.to_i
+      mon = $2.to_i
+      mday = $3.to_i
+
+      if $1.size > 2
+	comp = false
+      elsif $3.size > 2
+	comp = false
+	mday, mon, year = year, mon, mday
+      end
 
-  def self._parse_dot(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|n, ' ') # '
-      s3e(e, $1, $2, $3)
-      true
-    end
-  end
+    # jis
+    elsif str.sub!(/([MTSH])(\d+)\.(\d+)\.(\d+)/ino, ' ')
+      e = { 'm'=>1867,
+	    't'=>1911,
+	    's'=>1925,
+	    'h'=>1988
+	  }[$1.downcase]
+      year = $2.to_i + e
+      mon = $3.to_i
+      mday = $4.to_i
+
+    # vms
+    elsif str.sub!(/(-?\d+)-(#{PARSE_MONTHPAT})[^-]*-(-?\d+)/ino, ' ')
+      mday = $1.to_i
+      mon = ABBR_MONTHS[$2.downcase]
+      year = $3.to_i
+
+      if $1.size > 2
+	comp = false
+	year, mon, mday = mday, mon, year
+      elsif $3.size > 2
+	comp = false
+      end
 
-  def self._parse_year(str, e) # :nodoc:
-    if str.sub!(/'(\d+)\b/n, ' ')
-      e.year = $1.to_i
-      true
-    end
-  end
+    # sla
+    elsif str.sub!(%r|(-?\d+)/(\d+)(?:/(-?\d+))?|no, ' ')
+      mon = $1.to_i
+      mday = $2.to_i
 
-  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
+      if $3
+	year = $3.to_i
+	if $3.size > 2
+	  comp = false
+	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
+      if $3 && $1.size > 2
+	comp = false
+	year, mon, mday = mon, mday, year
+      end
 
-  def self._parse_ddd(str, e) # :nodoc:
-    if str.sub!(
-		/([-+]?)(\d{2,14})
-		  (?:
-		    \s*
-		    t?
-		    \s*
-		    (\d{2,6})?(?:[,.](\d*))?
-		  )?
-		  (?:
-		    \s*
-		    (
-		      z\b
-		    |
-		      [-+]\d{1,4}\b
-		    |
-		      \[[-+]?\d[^\]]*\]
-		    )
-		  )?
-		/inx,
-		' ')
+    # ddd
+    elsif str.sub!(
+		   /([-+]?)(\d{4,14})
+		    (?:
+		      \s*
+		      T?
+		      \s*
+		      (\d{2,6})
+		    )?
+		    (?:
+		      \s*
+		      (
+			Z
+		      |
+			[-+]\d{2,4}
+		      )
+		      \b
+		    )?
+		   /inox,
+		   ' ')
       case $2.size
-      when 2
-	if $3.nil? && $4
-	  e.sec  = $2[-2, 2].to_i
-	else
-	  e.mday = $2[ 0, 2].to_i
-	end
       when 4
-	if $3.nil? && $4
-	  e.sec  = $2[-2, 2].to_i
-	  e.min  = $2[-4, 2].to_i
-	else
-	  e.mon  = $2[ 0, 2].to_i
-	  e.mday = $2[ 2, 2].to_i
-	end
+	mon  = $2[ 0, 2].to_i
+	mday = $2[ 2, 2].to_i
       when 6
-	if $3.nil? && $4
-	  e.sec  = $2[-2, 2].to_i
-	  e.min  = $2[-4, 2].to_i
-	  e.hour = $2[-6, 2].to_i
-	else
-	  e.year = ($1 + $2[ 0, 2]).to_i
-	  e.mon  = $2[ 2, 2].to_i
-	  e.mday = $2[ 4, 2].to_i
-	end
+	year = ($1 + $2[ 0, 2]).to_i
+	mon  = $2[ 2, 2].to_i
+	mday = $2[ 4, 2].to_i
       when 8, 10, 12, 14
-	if $3.nil? && $4
-	  e.sec  = $2[-2, 2].to_i
-	  e.min  = $2[-4, 2].to_i
-	  e.hour = $2[-6, 2].to_i
-	  e.mday = $2[-8, 2].to_i
-	  if $2.size >= 10
-	    e.mon  = $2[-10, 2].to_i
-	  end
-	  if $2.size == 12
-	    e.year = ($1 + $2[-12, 2]).to_i
-	  end
-	  if $2.size == 14
-	    e.year = ($1 + $2[-14, 4]).to_i
-	    e._comp = false
-	  end
-	else
-	  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
-	end
-      when 3
-	if $3.nil? && $4
-	  e.sec  = $2[-2, 2].to_i
-	  e.min  = $2[-3, 1].to_i
-	else
-	  e.yday = $2[ 0, 3].to_i
-	end
-      when 5
-	if $3.nil? && $4
-	  e.sec  = $2[-2, 2].to_i
-	  e.min  = $2[-4, 2].to_i
-	  e.hour = $2[-5, 1].to_i
-	else
-	  e.year = ($1 + $2[ 0, 2]).to_i
-	  e.yday = $2[ 2, 3].to_i
-	end
-      when 7
-	if $3.nil? && $4
-	  e.sec  = $2[-2, 2].to_i
-	  e.min  = $2[-4, 2].to_i
-	  e.hour = $2[-6, 2].to_i
-	  e.mday = $2[-7, 1].to_i
-	else
-	  e.year = ($1 + $2[ 0, 4]).to_i
-	  e.yday = $2[ 4, 3].to_i
-	end
+	year = ($1 + $2[ 0, 4]).to_i
+	mon  = $2[ 4, 2].to_i
+	mday = $2[ 6, 2].to_i
+	hour = $2[ 8, 2].to_i if $2.size >= 10
+	min  = $2[10, 2].to_i if $2.size >= 12
+	sec  = $2[12, 2].to_i if $2.size >= 14
+	comp = false
       end
       if $3
-	if $4
-	  case $3.size
-	  when 2, 4, 6
-	    e.sec  = $3[-2, 2].to_i
-	    e.min  = $3[-4, 2].to_i if $3.size >= 4
-	    e.hour = $3[-6, 2].to_i if $3.size >= 6
-	  end
-	else
-	  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
+	case $3.size
+	when 2, 4, 6
+	  hour = $3[ 0, 2].to_i
+	  min  = $3[ 2, 2].to_i if $3.size >= 4
+	  sec  = $3[ 4, 2].to_i if $3.size >= 6
 	end
       end
-      if $4
-	e.sec_fraction = Rational($4.to_i, 10**$4.size)
-      end
-      if $5
-	e.zone = $5
-	if e.zone[0,1] == '['
-	  o, n, = e.zone[1..-2].split(':')
-	  e.zone = n || o
-	  if /\A\d/ =~ o
-	    o = format('+%s', o)
-	  end
-	  e.offset = zone_to_diff(o)
-	end
-      end
-      true
+      zone = $4
     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, :_parse_dot,
-	:_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!(/[^-+',.\/:@[:alnum:]\[\]\x80-\xff]+/n, ' ')
 
-    _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(str, e)    ||
-    _parse_dot(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
+    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/ino, ' ')
+      if year
+	year = -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
+    if comp and year
+      if year >= 0 and year <= 99
+	if year >= 69
+	  year += 1900
+	else
+	  year += 2000
 	end
       end
     end
 
-    if e._comp
-      if e.cwyear
-	if e.cwyear >= 0 && e.cwyear <= 99
-	  e.cwyear += if e.cwyear >= 69
-		      then 1900 else 2000 end
-	end
-      end
-      if e.year
-	if e.year >= 0 && e.year <= 99
-	  e.year += if e.year >= 69
-		    then 1900 else 2000 end
-	end
-      end
+    elem = {}
+    elem[:year] = year if year
+    elem[:mon] = mon if mon
+    elem[:mday] = mday if mday
+    elem[:hour] = hour if hour
+    elem[:min] = min if min
+    elem[:sec] = sec if sec
+    elem[:zone] = zone if zone
+    offset = zone_to_diff(zone) if zone
+    elem[:offset] = offset if offset
+    elem[:wday] = wday if wday
+    elem
+  end
+
+  def self.zone_to_diff(str)
+    abb, dst = str.downcase.split(/\s+/o, 2)
+    if ZONES.include?(abb)
+      offset  = ZONES[abb]
+      offset += 3600 if dst
+    elsif /\A([-+])(\d{2}):?(\d{2})?\Z/no =~ str
+      offset = $2.to_i * 3600 + $3.to_i * 60
+      offset *= -1 if $1 == '-'
     end
-
-    e.offset ||= zone_to_diff(e.zone) if e.zone
-
-    e.to_hash
+    offset
   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 = Rational(fr.to_i, 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
+  def strftime(fmt='%F')
+    o = ''
+    fmt.scan(/%[EO]?.|./o) do |c|
+      cc = c.sub(/^%[EO]?(.)$/o, '%\\1')
+      case cc
+      when '%A'; o << DAYNAMES[wday]
+      when '%a'; o << ABBR_DAYNAMES[wday]
+      when '%B'; o << MONTHNAMES[mon]
+      when '%b'; o << ABBR_MONTHNAMES[mon]
+      when '%C'; o << '%02d' % (year / 100.0).floor		# P2,ID
+      when '%c'; o << strftime('%a %b %e %H:%M:%S %Y')
+      when '%D'; o << strftime('%m/%d/%y')			# P2,ID
+      when '%d'; o << '%02d' % mday
+      when '%e'; o <<  '%2d' % mday
+      when '%F'; o << strftime('%Y-%m-%d')			# ID
+      when '%G'; o << '%.4d' %  cwyear				# ID
+      when '%g'; o << '%02d' % (cwyear % 100)			# ID
+      when '%H'; o << '%02d' %   hour
+      when '%h'; o << strftime('%b')				# P2,ID
+      when '%I'; o << '%02d' % ((hour % 12).nonzero? or 12)
+      when '%j'; o << '%03d' % yday
+      when '%k'; o <<  '%2d' %   hour				# AR,TZ,GL
+      when '%l'; o <<  '%2d' % ((hour % 12).nonzero? or 12)	# AR,TZ,GL
+      when '%M'; o << '%02d' % min
+      when '%m'; o << '%02d' % mon
+      when '%n'; o << "\n"					# P2,ID
+      when '%P'; o << if hour < 12 then 'am' else 'pm' end	# GL
+      when '%p'; o << if hour < 12 then 'AM' else 'PM' end
+      when '%R'; o << strftime('%H:%M')				# ID
+      when '%r'; o << strftime('%I:%M:%S %p')			# P2,ID
+      when '%S'; o << '%02d' % sec
+      when '%s'							# TZ,GL
+	d = ajd - self.class.jd_to_ajd(self.class.civil_to_jd(1970,1,1), 0)
+	s = (d * 86400).to_i
+	o << '%d' % s
+      when '%T'; o << strftime('%H:%M:%S')			# P2,ID
+      when '%t'; o << "\t"					# P2,ID
+      when '%U', '%W'
+	a = self.class.civil_to_jd(year, 1, 1, ns?) + 6
+	k = if c == '%U' then 0 else 1 end
+	w = (jd - (a - ((a - k) + 1) % 7) + 7) / 7
+	o << '%02d' % w
+      when '%u'; o <<   '%d' % cwday				# P2,ID
+      when '%V'; o << '%02d' % cweek				# P2,ID
+      when '%v'; o << strftime('%e-%b-%Y')			# AR,TZ
+      when '%w'; o <<   '%d' % wday
+      when '%X'; o << strftime('%H:%M:%S')
+      when '%x'; o << strftime('%m/%d/%y')
+      when '%Y'; o << '%.4d' %  year
+      when '%y'; o << '%02d' % (year % 100)
+      when '%Z'; o << zone
+      when '%z'; o << zone					# ID
+      when '%%'; o << '%'
+      when '%+'; o << strftime('%a %b %e %H:%M:%S %Z %Y')	# TZ
+      when '%1'; o <<   '%d' % jd
+      when '%2'; o << strftime('%Y-%j')
+      when '%3'; o << strftime('%Y-%m-%d')
+      else;      o << c
       end
-      offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
-      offset *= -1 if sign == '-'
     end
-    offset
+    o
   end
 
-end
-
-class DateTime < Date
+# alias_method :format, :strftime
 
-  def strftime(fmt='%FT%T%:z')
-    super(fmt)
-  end
+  def asctime() strftime('%c') end
 
-  def self._strptime(str, fmt='%FT%T%z')
-    super(str, fmt)
-  end
+  alias_method :ctime, :asctime
 
-=begin
-  def iso8601_timediv(n) # :nodoc:
-    strftime('T%T' +
-	     if n < 1
-	       ''
-	     else
-	       '.%0*d' % [n, (sec_fraction / SECONDS_IN_DAY / (10**n)).round]
-	     end +
-	     '%:z')
-  end
+end
 
-  private :iso8601_timediv
+class DateTime < Date
 
-  def iso8601(n=0)
-    super() + iso8601_timediv(n)
+  def self._strptime(str, fmt='%FT%T%Z')
+    super(str, fmt)
   end
 
-  def rfc3339(n=0) iso8601(n) end
-
-  def jisx0301(n=0)
-    super() + iso8601_timediv(n)
+  def strftime(fmt='%FT%T%Z')
+    super(fmt)
   end
-=end
 
 end
diff --git a/lib/debug.rb b/lib/debug.rb
index 9ae119f8fb..abb068f2c0 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -189,10 +189,10 @@ class Context
 
   def debug_variable_info(input, binding)
     case input
-    when /^\s*g(?:lobal)?\s*$/
+    when /^\s*g(?:lobal)?$/
       var_list(global_variables, binding)
 
-    when /^\s*l(?:ocal)?\s*$/
+    when /^\s*l(?:ocal)?$/
       var_list(eval("local_variables", binding), binding)
 
     when /^\s*i(?:nstance)?\s+/
@@ -255,9 +255,6 @@ class Context
 
   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
@@ -327,7 +324,7 @@ class Context
 	when /^\s*wat(?:ch)?\s+(.+)$/
 	  exp = $1
 	  break_points.push [true, 1, exp]
-	  stdout.printf "Set watchpoint %d:%s\n", break_points.size, exp
+	  stdout.printf "Set watchpoint %d\n", break_points.size, exp
 
 	when /^\s*b(?:reak)?$/
 	  if break_points.find{|b| b[1] == 0}
@@ -510,26 +507,23 @@ class Context
 	    exit!	# exit -> exit!: No graceful way to stop threads...
 	  end
 
-	when /^\s*v(?:ar)?\s+/
+	when /^\s*v(?:ar)?\s+$/
 	  debug_variable_info($', binding)
 
-	when /^\s*m(?:ethod)?\s+/
+	when /^\s*m(?:ethod)?\s+$/
 	  debug_method_info($', binding)
 
-	when /^\s*th(?:read)?\s+/
+	when /^\s*th(?:read)?\s+$/
 	  if DEBUGGER__.debug_thread_info($', binding) == :cont
 	    prompt = false
 	  end
 
-	when /^\s*pp\s+/
+	when /^\s*pp\s+$/
 	  PP.pp(debug_eval($', binding), stdout)
 
-	when /^\s*p\s+/
+	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()
 
@@ -547,11 +541,11 @@ class Context
     stdout.print <<EOHELP
 Debugger help v.-0.002b
 Commands
-  b[reak] [file:|class:]<line|method>
+  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
+  cat[ch] <an Exception>     set catchpoint to an exception
   b[reak]                    list breakpoints
   cat[ch]                    show catchpoint
   del[ete][ nnn]             delete some or all breakpoints
diff --git a/lib/delegate.rb b/lib/delegate.rb
index bd2b5e4813..1ba4cf1e1b 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -1,126 +1,23 @@
-# = delegate -- Support for the Delegation Pattern
+#  Delegation class that delegates even methods defined in super class,
+# which can not be covered with normal method_missing hack.
+#  
+#  Delegator is the abstract delegation class. Need to redefine
+# `__getobj__' method in the subclass.  SimpleDelegator is the 
+# concrete subclass for simple delegation.
 #
-# Documentation by James Edward Gray II and Gavin Sinclair
+# Usage:
+#   foo = Object.new
+#   foo2 = SimpleDelegator.new(foo)
+#   foo.hash == foo2.hash # => false
 #
-# == Introduction
+#   Foo = DelegateClass(Array)
 #
-# 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
+#  class ExtArray<DelegateClass(Array)
+#    ...
+#  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
-  IgnoreBacktracePat = %r"\A#{Regexp.quote(__FILE__)}:\d+:in `"
 
-  #
-  # 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","==","=~","==="]
@@ -130,16 +27,17 @@ class Delegator
       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, nil, __FILE__, __LINE__+1
+	eval <<-EOS
 	  def self.#{method}(*args, &block)
 	    begin
 	      __getobj__.__send__(:#{method}, *args, &block)
-	    ensure
-	      $@.delete_if{|s|IgnoreBacktracePat=~s} if $@
+	    rescue Exception
+	      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
+	      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
+	      raise
 	    end
 	  end
 	EOS
@@ -150,156 +48,58 @@ class Delegator
   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, include_private = false)
-    return true if super
-    return self.__getobj__.respond_to?(m, include_private)
-  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
-    new = super
-    new.__setobj__(__getobj__.clone)
-    new
-  end
-  # Duplication support for the object returned by \_\_getobj\_\_.
-  def dup
-    new = super
-    new.__setobj__(__getobj__.clone)
-    new
-  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 initialize
-#       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, include_private = false)  # :nodoc:
-      return true if super
-      return @_dc_obj.respond_to?(m, include_private)
-    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:
-      new = super
-      new.__setobj__(__getobj__.clone)
-      new
-    end
-    def dup  # :nodoc:
-      new = super
-      new.__setobj__(__getobj__.clone)
-      new
-    end
-  }
+  klass.module_eval <<-EOS
+  def initialize(obj)
+    @_dc_obj = obj
+  end
+  EOS
   for method in methods
     begin
-      klass.module_eval <<-EOS, __FILE__, __LINE__+1
+      klass.module_eval <<-EOS
         def #{method}(*args, &block)
 	  begin
 	    @_dc_obj.__send__(:#{method}, *args, &block)
-	  ensure
-	    $@.delete_if{|s| ::Delegator::IgnoreBacktracePat =~ s} if $@
+	  rescue
+	    $@[0,2] = nil
+	    raise
 	  end
 	end
       EOS
@@ -307,11 +107,12 @@ def DelegateClass(superclass)
       raise NameError, "invalid identifier %s" % method, caller(3)
     end
   end
-  return klass
+  def __getobj__
+    @_dc_obj
+  end
+  return klass;
 end
 
-# :enddoc:
-
 if __FILE__ == $0
   class ExtArray<DelegateClass(Array)
     def initialize()
diff --git a/lib/drb/acl.rb b/lib/drb/acl.rb
index 861c8a514d..aa86dbe70f 100644
--- a/lib/drb/acl.rb
+++ b/lib/drb/acl.rb
@@ -13,8 +13,6 @@ class ACL
     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)]
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 20e658e611..e9ac40773b 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1,14 +1,14 @@
 #
-# = drb/drb.rb
+# drb/drb.rb -- distributed Ruby --- dRuby 2.0.4
 #
-# 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.
+#++
 #
-# Copyright (c) 1999-2003 Masatoshi SEKI.  You can redistribute it and/or
-# modify it under the same terms as Ruby.
+# Author: Masatoshi SEKI
 #
-# Author:: Masatoshi SEKI
-#
-# Documentation:: William Webber (william@williamwebber.com)
+# Documentation: William Webber (william@williamwebber.com)
 #
 # == Overview
 #
@@ -54,7 +54,6 @@
 require 'socket'
 require 'thread'
 require 'fcntl'
-require 'drb/eq'
 
 #
 # == Overview
@@ -136,12 +135,12 @@ require 'drb/eq'
 # the collected values are finally returned to the local context as
 # the return value of the method invocation.
 # 
-# == Examples of usage
+# == Examples of usage.
 #
 # For more dRuby samples, see the +samples+ directory in the full
 # dRuby distribution.
 #
-# === dRuby in client/server mode
+# === dRuby in client/server mode.
 #
 # This illustrates setting up a simple client-server drb
 # system.  Run the server and client code in different terminals,
@@ -430,18 +429,6 @@ module DRb
     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
@@ -464,7 +451,7 @@ module DRb
     # when the unmarshalling failed.  It is used to determine the
     # name of the unmarshalled object.
     def initialize(err, buf)
-      case err.to_s
+      case err
       when /uninitialized constant (\S+)/
 	@name = $1
       when /undefined class\/module (\S+)/
@@ -551,12 +538,12 @@ module DRb
       @argc_limit = config[:argc_limit]
     end
 
-    def dump(obj, error=false)  # :nodoc:
-      obj = make_proxy(obj, error) if obj.kind_of? DRbUndumped
+    def dump(obj)  # :nodoc:
+      obj = DRbObject.new(obj) if obj.kind_of? DRbUndumped
       begin
 	str = Marshal::dump(obj)
       rescue
-	str = Marshal::dump(make_proxy(obj, error))
+	str = Marshal::dump(DRbObject.new(obj))
       end
       [str.size].pack('N') + str
     end
@@ -576,21 +563,12 @@ module DRb
       rescue
         raise(DRbConnError, $!.message, $!.backtrace)
       end
-      raise(DRbConnError, 'connection closed') if str.nil?
+      raise(DRbConnError, 'connection closed') if sz.nil?
       raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz
-      DRb.mutex.synchronize 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
+      begin
+	Marshal::load(str)
+      rescue NameError, ArgumentError
+	DRbUnknown.new($!, str)
       end
     end
 
@@ -623,7 +601,7 @@ module DRb
     end
 
     def send_reply(stream, succ, result)  # :nodoc:
-      stream.write(dump(succ) + dump(result, !succ))
+      stream.write(dump(succ) + dump(result))
     rescue
       raise(DRbConnError, $!.message, $!.backtrace)
     end
@@ -633,15 +611,6 @@ module DRb
       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.
@@ -722,7 +691,7 @@ module DRb
     #
     # 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
+    # URIby 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) 
@@ -827,46 +796,18 @@ module DRb
       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)
-      config = {:tcp_original_host => host}.update(config)
       if host.size == 0
-        host = getservername
-        soc = open_server_inaddr_any(host, port)
+	soc = TCPServer.open(port)
+	host = Socket.gethostname
       else
 	soc = TCPServer.open(host, port)
       end
       port = soc.addr[1] if port == 0
-      config[:tcp_port] = port
       uri = "druby://#{host}:#{port}"
       self.new(uri, soc, config)
     end
@@ -947,12 +888,7 @@ module DRb
 	break if (@acl ? @acl.allow_socket?(s) : true) 
 	s.close
       end
-      if @config[:tcp_original_host].to_s.size == 0
-        uri = "druby://#{s.addr[3]}:#{@config[:tcp_port]}"
-      else
-        uri = @uri
-      end
-      self.class.new(uri, s, @config)
+      self.class.new(nil, s, @config)
     end
 
     # Check to see if this connection is alive.
@@ -967,6 +903,7 @@ module DRb
 
     def set_sockopt(soc) # :nodoc:
       soc.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      soc.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK) if defined? Fcntl::O_NONBLOCK
       soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
     end
   end
@@ -1007,22 +944,12 @@ module DRb
     # 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
+	return DRb.to_obj(ref)
       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 = self.new(nil)
+      it.reinit(uri, ref)
       it
     end
 
@@ -1056,6 +983,12 @@ module DRb
       end
     end
 
+    # Reinitialise this object with the given +uri+ and +ref+
+    def reinit(uri, ref)
+      @uri = uri
+      @ref = ref
+    end
+
     # Get the URI of the remote object.
     def __drburi 
       @uri
@@ -1067,18 +1000,8 @@ module DRb
     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
+    undef :to_a
+    undef :respond_to?
 
     # Routes method calls to the referenced object.
     def method_missing(msg_id, *a, &b)
@@ -1088,58 +1011,26 @@ module DRb
 	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
+      succ, result = DRbConn.open(@uri) do |conn|
+	conn.send_message(self, msg_id, a, b)
       end
-
-      if succ
-        return result
-      elsif DRbUnknown === result
-        raise result
+      return result if succ
+      unless DRbUnknown === 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
+	raise result, result.message, bt + caller
       else
-        bt = self.class.prepare_backtrace(@uri, result)
-	result.set_backtrace(bt + caller)
-        raise result
+	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
@@ -1178,14 +1069,11 @@ module DRb
 	return succ, result
 
       ensure
-	if conn
-	  if succ
-	    @mutex.synchronize do
-	      @pool.unshift(conn)
-	      @pool.pop.close while @pool.size > POOL_SIZE
-	    end
+	@mutex.synchronize do
+	  if @pool.size > POOL_SIZE or ! succ
+	    conn.close if conn
 	  else
-	    conn.close
+	    @pool.unshift(conn)
 	  end
 	end
       end
@@ -1230,7 +1118,6 @@ module DRb
     @@argc_limit = 256
     @@load_limit = 256 * 102400
     @@verbose = false
-    @@safe_level = 0
 
     # Set the default value for the :argc_limit option.
     #
@@ -1260,10 +1147,6 @@ module DRb
       @@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.
@@ -1282,8 +1165,7 @@ module DRb
 	:verbose => @@verbose,
 	:tcp_acl => @@acl,
 	:load_limit => @@load_limit,
-	:argc_limit => @@argc_limit,
-        :safe_level => @@safe_level
+	:argc_limit => @@argc_limit
       }
       default_config.update(hash)
     end
@@ -1307,7 +1189,7 @@ module DRb
     #
     # :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
+    # :verbose :: if true, all unsucessful 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
@@ -1348,12 +1230,13 @@ module DRb
 
       @front = front
       @idconv = @config[:idconv]
-      @safe_level = @config[:safe_level]
 
       @grp = ThreadGroup.new
       @thread = run
 
-      DRb.regist_server(self)
+      Thread.exclusive do
+	DRb.primary_server = self unless DRb.primary_server
+      end
     end
 
     # The URI of this DRbServer.
@@ -1375,8 +1258,6 @@ module DRb
     # 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.
@@ -1394,12 +1275,7 @@ module DRb
 
     # 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
+      @thread.kill
     end
 
     # Convert a dRuby reference to the local object it refers to.
@@ -1458,9 +1334,7 @@ module DRb
     # 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__)      
+      obj.to_s rescue sprintf("#<%s:0x%lx>", obj.class, obj.__id__)      
     end
 
     # Check that a method is callable via dRuby.
@@ -1475,23 +1349,25 @@ module DRb
       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)
+      unless obj.respond_to?(msg_id)
 	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
+	if desc.nil? || desc[0] == '#'
+	  desc << ":#{obj.class}"
+	end
+	
+	if obj.private_methods.include?(msg_id.to_s)
+	  raise NameError, "private method `#{msg_id}' called for #{desc}"
+	else
+	  raise NameError, "undefined method `#{msg_id}' called for #{desc}"
+	end
       end
+      true
     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
 
@@ -1499,28 +1375,10 @@ module DRb
 	@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
+        if @block
+          @result = perform_with_block
         else
-          if @block
-            @result = perform_with_block
-          else
-            @result = perform_without_block
-          end
+          @result = perform_without_block
         end
 	@succ = true
 	if @msg_id == :to_ary && @result.class == Array
@@ -1602,11 +1460,10 @@ module DRb
 	    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
+	    unless succ
+	      client.close
+	      break
+	    end
 	  end
 	end
       end
@@ -1673,12 +1530,6 @@ module DRb
   #
   # This is the URI of the current server.  See #current_server.
   def uri
-    drb = Thread.current['DRb']
-    client = (drb && drb['client'])
-    if client
-      uri = client.uri
-      return uri if uri
-    end
     current_server.uri
   end
   module_function :uri
@@ -1750,31 +1601,6 @@ module DRb
     DRbServer.default_acl(acl)
   end
   module_function :install_acl
-
-  @mutex = Mutex.new
-  def mutex
-    @mutex
-  end
-  module_function :mutex
-
-  @server = {}
-  def regist_server(server)
-    @server[server.uri] = server
-    mutex.synchronize 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
diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb
index 7da8130c2b..f05bae5264 100644
--- a/lib/drb/extserv.rb
+++ b/lib/drb/extserv.rb
@@ -25,7 +25,10 @@ module DRb
       @invoker.unregist(@name)
       server = @server
       @server = nil
-      server.stop_service
+      Thread.new do
+	sleep 1
+	server.stop_service
+      end
       true
     end
 
@@ -57,7 +60,7 @@ if __FILE__ == $0
   when 'itest1', 'itest2'
     front = Foo.new(cmd)
     manager = DRb::DRbServer.new(nil, front)
-    es = DRb::ExtServ.new(ARGV.shift, ARGV.shift, manager)
+    es = DRb::ExtService.new(ARGV.shift, ARGV.shift, manager)
     es.server.thread.join
   end
 end
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index be40aea9f5..50009dbae2 100644
--- a/lib/drb/extservm.rb
+++ b/lib/drb/extservm.rb
@@ -5,12 +5,10 @@
 
 require 'drb/drb'
 require 'thread'
-require 'monitor'
 
 module DRb
   class ExtServManager
     include DRbUndumped
-    include MonitorMixin
 
     @@command = {}
 
@@ -23,37 +21,42 @@ module DRb
     end
       
     def initialize
-      super()
-      @cond = new_cond
       @servers = {}
       @waiting = []
       @queue = Queue.new
       @thread = invoke_thread
-      @uri = nil
     end
-    attr_accessor :uri
+    attr_reader :server
 
     def service(name)
-      synchronize do
-        while true
-          server = @servers[name]
-          return server if server && server.alive?
-          invoke_service(name)
-          @cond.wait
-        end
+      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)
-      synchronize do
-        @servers[name] = ro
-        @cond.signal
+      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)
-      synchronize do
+      Thread.exclusive do
 	@servers.delete(name)
       end
     end
@@ -69,20 +72,22 @@ module DRb
     end
 
     def invoke_service(name)
-      @queue.push(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
-      synchronize do
+      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}')
+      if RUBY_PLATFORM =~ /mswin32/
+	system("cmd /c start /b #{command} #{DRb.uri} #{name}")
       else
-	system("#{command} #{uri} #{name} &")
+	system("#{command} #{DRb.uri} #{name} &")
       end
     end
   end
diff --git a/lib/drb/gw.rb b/lib/drb/gw.rb
index b7a5f5383f..012a2b0a11 100644
--- a/lib/drb/gw.rb
+++ b/lib/drb/gw.rb
@@ -5,7 +5,9 @@ module DRb
   class GWIdConv < DRbIdConv
     def to_obj(ref)
       if Array === ref && ref[0] == :DRbObject
-        return DRbObject.new_with(ref[1], ref[2])
+        it = DRbObject.new(nil)
+        it.reinit(ref[1], ref[2])
+        return it
       end
       super(ref)
     end
@@ -38,7 +40,9 @@ module DRb
         return ref ? DRb.to_obj(ref) : DRb.front
       end
 
-      self.new_with(DRb.uri, [:DRbObject, uri, ref])
+      it = self.new(nil)
+      it.reinit(DRb.uri, [:DRbObject, uri, ref])
+      it
     end
 
     def _dump(lv)
@@ -54,69 +58,3 @@ module DRb
     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/lib/drb/ssl.rb b/lib/drb/ssl.rb
index 58d6b7d1e0..1a454a59cc 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -136,8 +136,8 @@ module DRb
       uri = 'drbssl://:0' unless uri
       host, port, opt = parse_uri(uri)
       if host.size == 0
-        host = getservername
-        soc = open_server_inaddr_any(host, port)
+	soc = TCPServer.open(port)
+	host = Socket.gethostname
       else
 	soc = TCPServer.open(host, port)
       end
@@ -171,7 +171,6 @@ module DRb
     end
       
     def accept
-      begin
       while true
 	soc = @socket.accept
 	break if (@acl ? @acl.allow_socket?(soc) : true) 
@@ -179,10 +178,6 @@ module DRb
       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
   
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index 57feed8301..f51e390808 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -29,7 +29,6 @@ module DRb
       filename, option = parse_uri(uri)
       if filename.size == 0
 	soc = temp_server
-        filename = soc.path
 	uri = 'drbunix:' + soc.path
       else
 	soc = UNIXServer.open(filename)
@@ -88,7 +87,7 @@ module DRb
     public
     def close
       return unless @socket
-      path = @socket.path if @server_mode
+      path = @socket.path
       @socket.close
       File.unlink(path) if @server_mode
       @socket = nil
@@ -100,6 +99,7 @@ module DRb
     end
 
     def set_sockopt(soc)
+      soc.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK) if defined? Fcntl::O_NONBLOCK
       soc.fcntl(Fcntl::F_SETFL, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
     end
   end
diff --git a/lib/erb.rb b/lib/erb.rb
index f1661f98cb..4e3aaf4a86 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -1,266 +1,29 @@
-# = 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
-#
+# Tiny eRuby --- ERB2
+# 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.1.0 #{ERB::Revision.split[1]}]"
+    "erb.rb [2.0.4 #{ERB::Revision.split[1]}]"
   end
 end
 
-#--
 # ERB::Compiler
 class ERB
-  class Compiler # :nodoc:
-    class PercentLine # :nodoc:
+  class Compiler
+    class PercentLine
       def initialize(str)
         @value = str
       end
       attr_reader :value
       alias :to_s :value
-
-      def empty?
-        @value.empty?
-      end
     end
 
-    class Scanner # :nodoc:
+    class Scanner
+      SplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
+
       @scanner_map = {}
       def self.regist_scanner(klass, trim_mode, percent)
 	@scanner_map[[trim_mode, percent]] = klass
@@ -284,7 +47,9 @@ class ERB
       def scan; end
     end
 
-    class TrimScanner < Scanner # :nodoc:
+    class TrimScanner < Scanner
+      TrimSplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>\n)|(%>)|(\n)/
+
       def initialize(src, trim_mode, percent)
 	super
 	@trim_mode = trim_mode
@@ -308,7 +73,9 @@ class ERB
 	    percent_line(line, &block)
 	  end
 	else
-          @scan_line.call(@src, &block)
+	  @src.each do |line|
+	    @scan_line.call(line, &block)
+	  end
 	end
 	nil
       end
@@ -327,66 +94,57 @@ class ERB
       end
 
       def scan_line(line)
-        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>|\n|\z)/m) do |tokens|
-          tokens.each do |token|
-            next if token.empty?
-            yield(token)
-          end
+	line.split(SplitRegexp).each do |token|
+	  next if token.empty?
+	  yield(token)
 	end
       end
 
       def trim_line1(line)
-        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\n|%>|\n|\z)/m) do |tokens|
-          tokens.each do |token|
-            next if token.empty?
-            if token == "%>\n"
-              yield('%>')
-              yield(:cr)
-            else
-              yield(token)
-            end
-          end
+	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.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\n|%>|\n|\z)/m) do |tokens|
-          tokens.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
-              head = nil
-            else
-              yield(token)
-              head = nil if token == "\n"
-            end
-          end
+	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.scan(/(.*?)(^[ \t]*<%\-|<%\-|<%%|%%>|<%=|<%#|<%|-%>\n|-%>|%>|\z)/m) do |tokens|
-          tokens.each do |token|
-            next if token.empty?
-            if @stag.nil? && /[ \t]*<%-/ =~ token
-              yield('<%')
-            elsif @stag && token == "-%>\n"
-              yield('%>')
-              yield(:cr)
-            elsif @stag && token == '-%>'
-              yield('%>')
-            else
-              yield(token)
-            end
-          end
-        end
+	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(<%= <%# <%)
@@ -397,13 +155,13 @@ class ERB
 
     Scanner.default_scanner = TrimScanner
 
-    class SimpleScanner < Scanner # :nodoc:
+    class SimpleScanner < Scanner
       def scan
-        @src.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>|\n|\z)/m) do |tokens|
-          tokens.each do |token|
-            next if token.empty?
-            yield(token)
-          end
+	@src.each do |line|
+	  line.split(SplitRegexp).each do |token|
+	    next if token.empty?
+	    yield(token)
+	  end
 	end
       end
     end
@@ -412,71 +170,77 @@ class ERB
 
     begin
       require 'strscan'
-      class SimpleScanner2 < Scanner # :nodoc:
+      class SimpleScanner2 < Scanner
         def scan
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\z)/m
-          etag_reg = /(.*?)(%%>|%>|\z)/m
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
+          etag_reg = /(.*?)(%%>|%>|\n|\z)/
           scanner = StringScanner.new(@src)
           while ! scanner.eos?
             scanner.scan(@stag ? etag_reg : stag_reg)
-            yield(scanner[1])
-            yield(scanner[2])
+            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(&blk)
-          stag_reg = /(.*?)(^%%|^%|<%%|<%=|<%#|<%|\z)/m
-          etag_reg = /(.*?)(%%>|%>|\z)/m
+      class PercentScanner < Scanner
+	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)
-            yield(scanner[1])
-
+            text = scanner[1]
             elem = scanner[2]
-            if elem == '%%'
-              yield('%')
-              inline_scan(scanner.scan(/.*?(\n|\z)/), &blk)
-            elsif elem == '%'
-              yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
-            else
-              yield(elem)
-            end
-          end
-        end
-
-        def inline_scan(line)
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\z)/m
-          etag_reg = /(.*?)(%%>|%>|\z)/m
-          scanner = StringScanner.new(line)
-          while ! scanner.eos?
-            scanner.scan(@stag ? etag_reg : stag_reg)
-            yield(scanner[1])
-            yield(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:
+      class ExplicitScanner < Scanner
 	def scan
-          stag_reg = /(.*?)(^[ \t]*<%-|<%%|<%=|<%#|<%-|<%|\z)/m
-          etag_reg = /(.*?)(%%>|-%>|%>|\z)/m
+	  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)
-            yield(scanner[1])
-
+            text = scanner[1]
             elem = scanner[2]
-            if /[ \t]*<%-/ =~ elem
-              yield('<%')
-            elsif elem == '-%>'
+	    new_line = (elem == "\n")
+            yield(text) unless text.empty?
+	    if elem == '-%>'
 	      yield('%>')
-	      yield(:cr) if scanner.scan(/(\n|\z)/)
+	      if scanner.scan(/(\n|\z)/)
+		yield(:cr)
+		new_line = true
+	      end
+	    elsif elem == '<%-'
+	      yield('<%')
 	    else
-	      yield(elem)
+	      yield(elem) unless elem.empty?
 	    end
           end
         end
@@ -486,7 +250,7 @@ class ERB
     rescue LoadError
     end
 
-    class Buffer # :nodoc:
+    class Buffer
       def initialize(compiler)
 	@compiler = compiler
 	@line = []
@@ -517,27 +281,16 @@ class ERB
       end
     end
 
-    def content_dump(s)
-      n = s.count("\n")
-      if n > 0
-        s.dump + "\n" * n
-      else
-        s.dump
-      end
-    end
-
     def compile(s)
       out = Buffer.new(self)
 
       content = ''
       scanner = make_scanner(s)
       scanner.scan do |token|
-        next if token.nil? 
-        next if token == ''
 	if scanner.stag.nil?
 	  case token
           when PercentLine
-	    out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
+	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
 	    content = ''
             out.push(token.to_s)
             out.cr
@@ -545,11 +298,12 @@ class ERB
 	    out.cr
 	  when '<%', '<%=', '<%#'
 	    scanner.stag = token
-	    out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
+	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
 	    content = ''
 	  when "\n"
 	    content << "\n"
-	    out.push("#{@put_cmd} #{content_dump(content)}")
+	    out.push("#{@put_cmd} #{content.dump}")
+	    out.cr
 	    content = ''
 	  when '<%%'
 	    content << '<%'
@@ -569,9 +323,9 @@ class ERB
 		out.push(content)
 	      end
 	    when '<%='
-	      out.push("#{@insert_cmd}((#{content}).to_s)")
+	      out.push("#{@put_cmd}((#{content}).to_s)")
 	    when '<%#'
-	      # out.push("# #{content_dump(content)}")
+	      # out.push("# #{content.dump}")
 	    end
 	    scanner.stag = nil
 	    content = ''
@@ -582,7 +336,7 @@ class ERB
 	  end
 	end
       end
-      out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
+      out.push("#{@put_cmd} #{content.dump}") if content.size > 0
       out.close
       out.script
     end
@@ -618,83 +372,16 @@ class ERB
     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
+    attr_accessor :put_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 variables
-  #      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)
@@ -702,22 +389,11 @@ class ERB
     @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} = ''"
@@ -730,165 +406,66 @@ class ERB
     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
-      proc { 
+      th = Thread.start { 
 	$SAFE = @safe_level
-	eval(@src, b, (@filename || '(erb)'), 1)
-      }.call
+	eval(@src, b)
+      }
+      return th.value
     else
-      eval(@src, b, (@filename || '(erb)'), 1)
+      return eval(@src, b, (@filename || '(erb)'), 1)
     end
   end
 
-  # Define _methodname_ as instance method of _mod_ from compiled ruby source.
-  #
-  # example:
-  #   filename = 'example.rhtml'   # 'arg1' and 'arg2' are used in example.rhtml
-  #   erb = ERB.new(File.read(filename))
-  #   erb.def_method(MyClass, 'render(arg1, arg2)', filename)
-  #   print MyClass.new.render('foo', 123)
   def def_method(mod, methodname, fname='(ERB)')
     mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
   end
 
-  # Create unnamed module, define _methodname_ as instance method of it, and return it.
-  #
-  # example:
-  #   filename = 'example.rhtml'   # 'arg1' and 'arg2' are used in example.rhtml
-  #   erb = ERB.new(File.read(filename))
-  #   erb.filename = filename
-  #   MyModule = erb.def_module('render(arg1, arg2)')
-  #   class MyClass
-  #     include MyModule
-  #   end
   def def_module(methodname='erb')
     mod = Module.new
-    def_method(mod, methodname, @filename || '(ERB)')
+    def_method(mod, methodname)
     mod
   end
 
-  # Define unnamed class which has _methodname_ as instance method, and return it.
-  #
-  # example:
-  #   class MyClass_
-  #     def initialize(arg1, arg2)
-  #       @arg1 = arg1;  @arg2 = arg2
-  #     end
-  #   end
-  #   filename = 'example.rhtml'  # @arg1 and @arg2 are used in example.rhtml
-  #   erb = ERB.new(File.read(filename))
-  #   erb.filename = filename
-  #   MyClass = erb.def_class(MyClass_, 'render()')
-  #   print MyClass.new('foo', 123).render()
   def def_class(superklass=Object, methodname='result')
     cls = Class.new(superklass)
-    def_method(cls, methodname, @filename || '(ERB)')
+    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
-  # Utility module to define eRuby script as instance method.
-  #
-  # === Example
-  #
-  # example.rhtml:
-  #   <% for item in @items %>
-  #   <b><%= item %></b>
-  #   <% end %>
-  #
-  # example.rb:
-  #   require 'erb'
-  #   class MyClass
-  #     extend ERB::DefMethod
-  #     def_erb_method('render()', 'example.rhtml')
-  #     def initialize(items)
-  #       @items = items
-  #     end
-  #   end
-  #   print MyClass.new([10,20,30]).render()
-  #
-  # result:
-  #
-  #   <b>10</b>
-  #
-  #   <b>20</b>
-  #
-  #   <b>30</b>
-  #
   module DefMethod
     public
-  # define _methodname_ as instance method of current module, using ERB object or eRuby file
-    def def_erb_method(methodname, erb_or_fname)
-      if erb_or_fname.kind_of? String
-        fname = erb_or_fname
-        erb = ERB.new(File.read(fname))
-        erb.def_method(self, methodname, fname)
+    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 = erb_or_fname
-        erb.def_method(self, methodname, erb.filename || '(ERB)')
+	erb.def_method(self, methodname)
       end
     end
     module_function :def_erb_method
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 3fdb6cbfe6..d34e6fec4b 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1,7 +1,7 @@
 # 
 # = fileutils.rb
 # 
-# Copyright (c) 2000-2006 Minero Aoki
+# Copyright (c) 2000-2003 Minero Aoki <aamine@loveruby.net>
 # 
 # This program is free software.
 # You can distribute/modify this program under the same terms of ruby.
@@ -16,11 +16,8 @@
 #   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)
@@ -37,60 +34,42 @@
 #   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.
+# +:force+, +:noop+, +:preserve+, and +:verbose+.  +:noop+ 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:
+# There are some `low level' methods, which does not accept any option:
 #
-#   copy_entry(src, dest, preserve = false, dereference = false)
-#   copy_file(src, dest, preserve = false, dereference = true)
+#   uptodate?(file, cmp_list)
+#   copy_file(srcfilename, destfilename)
 #   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_file(file_a, file_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.
+# before acting.  This equates to passing the +:verbose+ 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.
+# files/directories.  This equates to passing the +:noop+ flag to methods in
+# FileUtils.
 # 
 
-module FileUtils
 
-  def self.private_module_function(name)   #:nodoc:
-    module_function name
-    private_class_method name
-  end
+module FileUtils
 
-  # This hash table holds command options.
-  OPT_TABLE = {}   #:nodoc: internal use only
+  # All methods are module_function.
 
   #
   # Options: (none)
@@ -100,13 +79,11 @@ module FileUtils
   def pwd
     Dir.pwd
   end
-  module_function :pwd
 
   alias getwd pwd
-  module_function :getwd
 
   #
-  # Options: verbose
+  # Options: noop verbose
   # 
   # Changes the current directory to the directory +dir+.
   # 
@@ -116,18 +93,14 @@ module FileUtils
   #   FileUtils.cd('/', :verbose => true)   # chdir and report it
   # 
   def cd(dir, options = {}, &block) # :yield: dir
-    fu_check_options options, OPT_TABLE['cd']
+    fu_check_options options, :noop, :verbose
     fu_output_message "cd #{dir}" if options[:verbose]
-    Dir.chdir(dir, &block)
+    Dir.chdir(dir, &block) unless options[:noop]
     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)
@@ -150,7 +123,7 @@ module FileUtils
     end
     true
   end
-  module_function :uptodate?
+
 
   #
   # Options: mode noop verbose
@@ -163,18 +136,16 @@ module FileUtils
   #   FileUtils.mkdir 'tmp', :mode => 0700
   # 
   def mkdir(list, options = {})
-    fu_check_options options, OPT_TABLE['mkdir']
+    fu_check_options options, :mode, :noop, :verbose
     list = fu_list(list)
     fu_output_message "mkdir #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}" if options[:verbose]
     return if options[:noop]
 
+    mode = options[:mode] || (0777 & ~File.umask)
     list.each do |dir|
-      fu_mkdir dir, options[:mode]
+      Dir.mkdir dir.sub(%r</\z>, ''), mode
     end
   end
-  module_function :mkdir
-
-  OPT_TABLE['mkdir'] = [:mode, :noop, :verbose]
 
   #
   # Options: mode noop verbose
@@ -193,20 +164,13 @@ module FileUtils
   # You can pass several directories at a time in a list.
   # 
   def mkdir_p(list, options = {})
-    fu_check_options options, OPT_TABLE['mkdir_p']
+    fu_check_options options, :mode, :noop, :verbose
     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]
 
+    mode = options[:mode] || (0777 & ~File.umask)
     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
@@ -214,7 +178,7 @@ module FileUtils
       end
       stack.reverse_each do |path|
         begin
-          fu_mkdir path, options[:mode]
+          Dir.mkdir path, mode
         rescue SystemCallError => err
           raise unless File.directory?(path)
         end
@@ -223,27 +187,10 @@ module FileUtils
 
     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
@@ -256,61 +203,56 @@ module FileUtils
   #   FileUtils.rmdir 'somedir', :verbose => true, :noop => true
   # 
   def rmdir(list, options = {})
-    fu_check_options options, OPT_TABLE['rmdir']
+    fu_check_options options, :noop, :verbose
     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>
+  # <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 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 'gcc', 'cc', :verbose => true
   #   FileUtils.ln '/usr/bin/emacs21', '/usr/bin/emacs'
   # 
-  # <b><tt>ln(list, destdir, options = {})</tt></b>
+  # <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.
+  #   cd '/bin'
+  #   ln %w(cp mv mkdir), '/usr/bin'   # Now /usr/bin/cp and /bin/cp are linked.
   # 
   def ln(src, dest, options = {})
-    fu_check_options options, OPT_TABLE['ln']
+    fu_check_options options, :force, :noop, :verbose
     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>
+  # <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+
@@ -320,7 +262,7 @@ module FileUtils
   #   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>
+  # <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.
@@ -330,21 +272,17 @@ module FileUtils
   #   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_check_options options, :force, :noop, :verbose
     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
@@ -353,46 +291,41 @@ module FileUtils
   #   #ln_s(src, dest, :force)
   # 
   def ln_sf(src, dest, options = {})
-    fu_check_options options, OPT_TABLE['ln_sf']
+    fu_check_options options, :noop, :verbose
     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+.
+  # Copies a file +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_check_options options, :preserve, :noop, :verbose
     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]
+
+    fu_each_src_dest(src, dest) do |s,d|
+      fu_preserve_attr(options[:preserve], s, d) {
+          copy_file s, d
+      }
     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
+  # Options: preserve noop verbose
   # 
   # Copies +src+ to +dest+. If +src+ is a directory, this method copies
   # all its contents recursively. If +dest+ is a directory, copies
@@ -406,180 +339,184 @@ module FileUtils
   # 
   #   # 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.
+  #   FileUtils.cp_r Dir.glob('*.rb'), '/home/aamine/lib/ruby', :noop, :verbose
   # 
   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]
+    fu_check_options options, :preserve, :noop, :verbose
+    fu_output_message "cp -r#{options[:preserve] ? 'p' : ''} #{[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]
+
+    fu_each_src_dest(src, dest) do |s,d|
+      if File.directory?(s)
+        fu_copy_dir s, d, '.', options[:preserve]
+      else
+        fu_p_copy s, d, options[:preserve]
+      end
+    end
+  end
+
+  def fu_copy_dir(src, dest, rel, preserve) #:nodoc:
+    fu_preserve_attr(preserve, "#{src}/#{rel}", "#{dest}/#{rel}") {|s,d|
+        begin
+          Dir.mkdir File.expand_path(d)
+        rescue => err
+          raise unless File.directory?(d)
+        end
+    }
+    Dir.entries("#{src}/#{rel}").each do |fname|
+      if File.directory?(File.join(src,rel,fname))
+        next if /\A\.\.?\z/ === fname
+        fu_copy_dir src, dest, "#{rel}/#{fname}", preserve
+      else
+        fu_p_copy File.join(src,rel,fname), File.join(dest,rel,fname), preserve
+      end
     end
   end
-  module_function :cp_r
+  private :fu_copy_dir
 
-  OPT_TABLE['cp_r'] = [:preserve, :noop, :verbose,
-                       :dereference_root, :remove_destination]
+  def fu_p_copy(src, dest, really) #:nodoc:
+    fu_preserve_attr(really, src, dest) {
+        copy_file src, dest
+    }
+  end
+  private :fu_p_copy
 
-  #
-  # 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
+  def fu_preserve_attr(really, src, dest) #:nodoc:
+    unless really
+      yield src, dest
+      return
+    end
+
+    st = File.stat(src)
+    yield src, dest
+    File.utime st.atime, st.mtime, dest
+    begin
+      File.chown st.uid, st.gid, dest
+    rescue Errno::EPERM
+      File.chmod st.mode & 01777, dest   # clear setuid/setgid
+    else
+      File.chmod st.mode, dest
     end
   end
-  module_function :copy_entry
+  private :fu_preserve_attr
 
   #
-  # Copies file contents of +src+ to +dest+.
-  # Both of +src+ and +dest+ must be a path name.
+  # Copies file +src+ to +dest+.
+  # Both of +src+ and +dest+ must be a filename.
   #
-  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
+  def copy_file(src, dest)
+    File.open(src,  'rb') {|r|
+      File.open(dest, 'wb') {|w|
+        copy_stream r, w
+      }
+    }
   end
-  module_function :copy_file
 
   #
   # Copies stream +src+ to +dest+.
-  # +src+ must respond to #read(n) and
-  # +dest+ must respond to #write(str).
+  # Both of +src+ and +dest+ must be a IO.
   #
   def copy_stream(src, dest)
-    fu_copy_stream0 src, dest, fu_stream_blksize(src, dest)
+    bsize = fu_stream_blksize(src, dest)
+    begin
+      while true
+        dest.syswrite src.sysread(bsize)
+      end
+    rescue EOFError
+    end
   end
-  module_function :copy_stream
 
   #
-  # Options: force noop verbose
+  # Options: 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 'stuff.rb', 'lib/ruby', :force => true
   # 
   #   FileUtils.mv %w(junk.txt dust.txt), '/home/aamine/.trash/'
-  #   FileUtils.mv Dir.glob('test*.rb'), 'test', :noop => true, :verbose => true
+  #   FileUtils.mv Dir.glob('test*.rb'), 'test', :noop, :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]
+    fu_check_options options, :noop, :verbose
+    fu_output_message "mv #{[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)
+
+    fu_each_src_dest(src, dest) do |s,d|
+      if rename_cannot_overwrite_file? and File.file?(d)
+        File.unlink d
+      end
+
       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]
+        File.rename s, d
+      rescue
+        if File.symlink?(s)
+          File.symlink File.readlink(s), dest
+          File.unlink s
+        else
+          st = File.stat(s)
+          copy_file s, d
+          File.unlink s
+          File.utime st.atime, st.mtime, d
+          begin
+            File.chown st.uid, st.gid, d
+          rescue
+            # ignore
           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
+    /djgpp|cygwin|mswin|mingw|bccwin|wince|emx/ !~ RUBY_PLATFORM
   end
-  private_module_function :rename_cannot_overwrite_file?
+  private :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.
+  # All errors 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']
+    fu_check_options options, :force, :noop, :verbose
     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]
+    list.each do |fname|
+      remove_file fname, 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)
+  # Same as
+  #   #rm(list, :force)
   #
   def rm_f(list, options = {})
-    fu_check_options options, OPT_TABLE['rm_f']
+    fu_check_options options, :noop, :verbose
     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
+  # Options: force noop verbose
   # 
   # remove files +list+[0] +list+[1]... If +list+[n] is a directory,
   # removes its all contents recursively. This method ignores
@@ -587,201 +524,76 @@ module FileUtils
   # 
   #   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)
+    fu_check_options options, :force, :noop, :verbose
     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]
+
+    list.each do |fname|
+      begin
+        st = File.lstat(fname)
+      rescue
+        next if options[:force]
+        raise
+      end
+      if    st.symlink?   then remove_file fname, options[:force]
+      elsif st.directory? then remove_dir fname, options[:force]
+      else                     remove_file fname, options[:force]
       end
     end
   end
-  module_function :rm_r
-
-  OPT_TABLE['rm_r'] = [:force, :noop, :verbose, :secure]
 
   #
-  # Options: noop verbose secure
+  # Options: noop verbose
   # 
-  # Equivalent to
-  #
+  # Same as 
   #   #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']
+    fu_check_options options, :noop, :verbose
     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
+  def remove_file(fname, force = false) #:nodoc:
+    first_time_p = true
+    begin
+      File.unlink fname
+    rescue Errno::ENOENT
+      raise unless force
+    rescue
+      if first_time_p
+        # try once more for Windows
+        first_time_p = false
+        File.chmod 0777, fname
+        retry
+      end
+      raise
+    end
+  end
+
+  def remove_dir(dir, force = false) #:nodoc:
+    Dir.foreach(dir) do |file|
+      next if /\A\.\.?\z/ === file
+      path = "#{dir}/#{file}"
+      if File.directory?(path)
+        remove_dir path, force
+      else
+        remove_file path, 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
+    begin
+      Dir.rmdir dir.sub(%r</\z>, '')
+    rescue Errno::ENOENT
+      raise unless force
     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.
@@ -797,12 +609,9 @@ module FileUtils
       }
     }
   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.
@@ -821,24 +630,24 @@ module FileUtils
     end
     false
   end
-  module_function :compare_stream
+
 
   #
-  # Options: mode preserve noop verbose
+  # Options: mode 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_check_options options, :mode, :preserve, :noop, :verbose
     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)
+
+    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
@@ -847,9 +656,7 @@ module FileUtils
       end
     end
   end
-  module_function :install
 
-  OPT_TABLE['install'] = [:mode, :preserve, :noop, :verbose]
 
   #
   # Options: noop verbose
@@ -862,148 +669,13 @@ module FileUtils
   #   FileUtils.chmod 0755, '/usr/bin/ruby', :verbose => true
   # 
   def chmod(mode, list, options = {})
-    fu_check_options options, OPT_TABLE['chmod']
+    fu_check_options options, :noop, :verbose
     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
+    File.chmod mode, *list
   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
@@ -1015,407 +687,60 @@ module FileUtils
   #   FileUtils.touch Dir.glob('*.c');  system 'make'
   # 
   def touch(list, options = {})
-    fu_check_options options, OPT_TABLE['touch']
+    fu_check_options options, :noop, :verbose
     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
+    fu_output_message "touch #{list.join ' '}" if options[:verbose]
     return if options[:noop]
-    list.each do |path|
-      created = nocreate
+
+    t = Time.now
+    list.each do |fname|
       begin
-        File.utime(t, t, path)
+        File.utime(t, t, fname)
       rescue Errno::ENOENT
-        raise if created
-        File.open(path, 'a') {
+        File.open(fname, '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
+  def fu_check_options(options, *optdecl)
+    h = options.dup
+    optdecl.each do |name|
+      h.delete name
     end
+    raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless h.empty?
   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 }
+  def fu_list(arg)
+    Array(arg).map {|path| path.to_str }
   end
-  private_module_function :fu_list
 
-  def fu_each_src_dest(src, dest)   #:nodoc:
+  def fu_each_src_dest(src, dest)
     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:
+  def fu_each_src_dest0(src, dest)
     if src.is_a?(Array)
       src.each do |s|
-        s = s.to_str
-        yield s, File.join(dest, File.basename(s))
+        yield s.to_str, File.join(dest, File.basename(s))
       end
     else
-      src = src.to_str
       if File.directory?(dest)
-        yield src, File.join(dest, File.basename(src))
+        yield src.to_str, File.join(dest, File.basename(src))
       else
-        yield src, dest.to_str
+        yield src.to_str, dest.to_str
       end
     end
   end
-  private_module_function :fu_each_src_dest0
 
-  def fu_same?(a, b)   #:nodoc:
-    if fu_have_st_ino?
+  def fu_same?(a, b)
+    if have_st_ino?
       st1 = File.stat(a)
       st2 = File.stat(b)
       st1.dev == st2.dev and st1.ino == st2.ino
@@ -1425,167 +750,135 @@ module FileUtils
   rescue Errno::ENOENT
     return false
   end
-  private_module_function :fu_same?
 
-  def fu_have_st_ino?   #:nodoc:
-    not fu_windows?
+  def have_st_ino?
+    /mswin|mingw|bccwin|wince|emx/ !~ RUBY_PLATFORM
   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
+  def fu_stream_blksize(*streams)
+    streams.each do |s|
+      next unless s.respond_to?(:stat)
+      size = s.stat.blksize
+      return size unless size.nil? or size.zero?
     end
-    args
+    1024
   end
-  private_module_function :fu_update_option
 
   @fileutils_output = $stderr
   @fileutils_label  = ''
 
-  def fu_output_message(msg)   #:nodoc:
+  def fu_output_message(msg)
     @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)
+  def fu_update_option(args, new)
+    if args.last.is_a?(Hash)
+      args.last.update new
+    else
+      args.push new
+    end
+    args
   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
+  extend self
+
+
+  OPT_TABLE = {
+    'pwd'          => %w(),
+    'cd'           => %w( noop verbose ),
+    'chdir'        => %w( noop verbose ),
+    'chmod'        => %w( noop verbose ),
+    'copy'         => %w( preserve noop verbose ),
+    'cp'           => %w( preserve noop verbose ),
+    'cp_r'         => %w( preserve noop verbose ),
+    'install'      => %w( preserve mode noop verbose ),
+    'link'         => %w( force noop verbose ),
+    'ln'           => %w( force noop verbose ),
+    'ln_s'         => %w( force noop verbose ),
+    'ln_sf'        => %w( noop verbose ),
+    'makedirs'     => %w( noop verbose ),
+    'mkdir'        => %w( mode noop verbose ),
+    'mkdir_p'      => %w( mode noop verbose ),
+    'mkpath'       => %w( noop verbose ),
+    'move'         => %w( noop verbose ),
+    'mv'           => %w( noop verbose ),
+    'remove'       => %w( force noop verbose ),
+    'rm'           => %w( force noop verbose ),
+    'rm_f'         => %w( noop verbose ),
+    'rm_r'         => %w( force noop verbose ),
+    'rm_rf'        => %w( noop verbose ),
+    'rmtree'       => %w( noop verbose ),
+    'rmdir'        => %w( noop verbose ),
+    'safe_unlink'  => %w( noop verbose ),
+    'symlink'      => %w( force noop verbose ),
+    'touch'        => %w( noop verbose )
+  }
 
-  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.
+  # before acting.  This equates to passing the +:verbose+ flag to methods in
+  # FileUtils.
   # 
   module Verbose
+
     include FileUtils
+
     @fileutils_output  = $stderr
     @fileutils_label   = ''
-    ::FileUtils.collect_method(:verbose).each do |name|
+    @fileutils_verbose = true
+
+    FileUtils::OPT_TABLE.each do |name, opts|
+      next unless opts.include?('verbose')
       module_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def #{name}(*args)
-          super(*fu_update_option(args, :verbose => true))
+          @fileutils_verbose = true unless defined?(@fileutils_verbose)
+          super(*fu_update_option(args, :verbose => @fileutils_verbose))
         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.
+  # files/directories.  This equates to passing the +:noop+ flag to methods in
+  # FileUtils.
   # 
   module NoWrite
+
     include FileUtils
+
     @fileutils_output  = $stderr
     @fileutils_label   = ''
-    ::FileUtils.collect_method(:noop).each do |name|
+    @fileutils_nowrite = true
+
+    FileUtils::OPT_TABLE.each do |name, opts|
+      next unless opts.include?('noop')
       module_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def #{name}(*args)
+          unless defined?(@fileutils_nowrite)
+            @fileutils_nowrite ||= true
+          end
           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
+
+
+# Documentation comments:
+#  - Some RDoc markup used here doesn't work (namely, +file1+, +:noop+,
+#    +dir/file+).  I consider this a bug and expect that these will be valid in
+#    the near future.
diff --git a/lib/finalize.rb b/lib/finalize.rb
index 9b6b302cac..ed1ccc830f 100644
--- a/lib/finalize.rb
+++ b/lib/finalize.rb
@@ -1,51 +1,44 @@
-#--
+#
 #   finalizer.rb - 
 #   	$Release Version: 0.3$
 #   	$Revision: 1.4 $
 #   	$Date: 1998/02/27 05:34:33 $
 #   	by Keiju ISHITSUKA
-#++
 #
-# Usage:
+# --
+#
+#   Usage:
 #
-# add dependency R_method(obj, dependant)
 #   add(obj, dependant, method = :finalize, *opt)
 #   add_dependency(obj, dependant, method = :finalize, *opt)
+#	add dependency R_method(obj, dependant)
 #
-# 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 dependency R_method(obj, dependant)
 #   delete_all_dependency(obj_or_id, dependant)
-#
-# delete dependency R_method(*, dependant)
+#	delete dependency R_*(obj, dependant)
 #   delete_by_dependant(dependant, method = :finalize)
-#
-# delete dependency R_*(*, dependant)
+#	delete dependency R_method(*, dependant)
 #   delete_all_by_dependant(dependant)
-#
-# delete all dependency R_*(*, *)
+#	delete dependency R_*(*, dependant)
 #   delete_all
+#	delete all dependency R_*(*, *)
 #
-# 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 the dependant connected by dependency R_method(obj, dependtant).
 #   finalize_all_dependency(obj_or_id, dependant)
-#
-# finalize the dependant connected by dependency R_method(*, dependtant).
+#	finalize all dependants connected by dependency R_*(obj, dependtant).
 #   finalize_by_dependant(dependant, method = :finalize)
-#
-# finalize all dependants connected by dependency R_*(*, dependant).
+#	finalize the dependant connected by dependency R_method(*, dependtant).
 #   finalize_all_by_dependant(dependant)
-#
-# finalize all dependency registered to the Finalizer.
+#	finalize all dependants connected by dependency R_*(*, dependant).
 #   finalize_all
+#	finalize all dependency registered to the Finalizer.
 #
-# stop invoking Finalizer on GC.
 #   safe{..}
+#	stop invoking Finalizer on GC.
 #
 
 module Finalizer
diff --git a/lib/find.rb b/lib/find.rb
index 0d22dd62d6..9ca39cabcb 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -36,8 +36,7 @@ module Find
     paths.collect!{|d| d.dup}
     while file = paths.shift
       catch(:prune) do
-	yield file.dup.taint
-        next unless File.exist? file
+	yield file
 	begin
 	  if File.lstat(file).directory? then
 	    d = Dir.open(file)
@@ -51,13 +50,13 @@ module Find
 		else
 		  f = File.join(file, f)
 		end
-		paths.unshift f.untaint
+		paths.unshift f
 	      end
 	    ensure
 	      d.close
 	    end
 	  end
-        rescue Errno::ENOENT, Errno::EACCES
+       rescue Errno::ENOENT, Errno::EACCES
 	end
       end
     end
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index cc6e4ee418..b845f76ec4 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -1,145 +1,45 @@
-# = forwardable - Support for the Delegation Pattern
 #
-#    $Release Version: 1.1$
-#    $Revision$
-#    $Date$
-#    by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#   forwardable.rb - 
+#   	$Release Version: 1.1$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#	original definition by delegator.rb
+# --
+# Usage:
 #
-#    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
+#   class Foo
 #     extend Forwardable
-#     
-#     def initialize
-#       @q = [ ]    # prepare delegate object
-#     end
-#     
-#     # setup preferred 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
+#     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)
 #
-# 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
+#   g = Goo.new
+#   g.extend SingleForwardable
+#   g.def_delegator("@out", :puts)
+#   g.puts ...
 #
-# 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)
@@ -161,41 +61,13 @@ module Forwardable
   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)
@@ -216,3 +88,7 @@ module SingleForwardable
   alias def_delegators def_singleton_delegators
   alias def_delegator def_singleton_delegator
 end
+
+
+
+
diff --git a/lib/ftools.rb b/lib/ftools.rb
index 5f082331fb..0c6182b58b 100644
--- a/lib/ftools.rb
+++ b/lib/ftools.rb
@@ -1,59 +1,18 @@
-# 
-# = 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)
+  def catname from, to
+    if FileTest.directory? to
+      File.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)
+# copy file
+
+  def syscopy from, to
     to = catname(from, to)
 
     fmode = stat(from).mode
@@ -79,28 +38,20 @@ class << File
     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
+  def copy from, to, verbose = false
+    $deferr.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)
+# move file
+
+  def move from, to, verbose = false
     to = catname(from, to)
-    $stderr.print from, " -> ", to, "\n" if verbose
+    $deferr.print from, " -> ", to, "\n" if verbose
 
-    if RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ and file? to
+    if RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ and FileTest.file? to
       unlink to
     end
     fstat = stat(from)
@@ -108,7 +59,7 @@ class << File
       rename from, to
     rescue
       begin
-        symlink readlink(from), to and unlink from
+        symlink File.readlink(from), to and unlink from
       rescue
 	from_stat = stat(from)
 	syscopy from, to and unlink from
@@ -123,12 +74,12 @@ class << File
 
   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
+#  compare two files
+#   true:  identical
+#   false: not identical
+
+  def compare from, to, verbose = false
+    $deferr.print from, " <=> ", to, "\n" if verbose
 
     return false if stat(from).size != stat(to).size
 
@@ -160,61 +111,35 @@ class << File
 
   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.
-  #
+#  unlink files safely
+
   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
+    begin
+      $deferr.print files.join(" "), "\n" if verbose
+      chmod 0777, *files
+      unlink(*files)
+    rescue
+#      $deferr.print "warning: Couldn't unlink #{files.join ' '}\n"
     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 = if dirs[-1].is_a? Fixnum then dirs.pop else 0755 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
+      next if parent == dir or FileTest.directory? dir
+      makedirs parent unless FileTest.directory? parent
+      $deferr.print "mkdir ", dir, "\n" if verbose
       if basename(dir) != ""
         begin
           Dir.mkdir dir, mode
         rescue SystemCallError
-          raise unless directory? dir
+          raise unless File.directory? dir
         end
       end
     end
@@ -225,37 +150,21 @@ class << File
   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
+    $deferr.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
+    unless FileTest.exist? to and cmp from, to
+      safe_unlink to if FileTest.exist? to
       cp from, to, verbose
       chmod mode, to, verbose if mode
     end
   end
 
 end
-
 # vi:set sw=2:
diff --git a/lib/generator.rb b/lib/generator.rb
index dbdd0f40a9..196fc8f483 100644
--- a/lib/generator.rb
+++ b/lib/generator.rb
@@ -1,17 +1,16 @@
 #!/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
 #
+# generator.rb - converts an internal iterator to an external iterator
+#++
 # 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/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$
+#
 # == Overview
 #
 # This library provides the Generator class, which converts an
@@ -23,13 +22,12 @@
 #
 # 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.
+# continuation, which currently is slow.
 #
 # == Example
 #
@@ -125,7 +123,7 @@ class Generator
   # Returns the element at the current position and moves forward.
   def next()
     if end?
-      raise EOFError, "no more elements available"
+      raise EOFError, "no more element is supplied"
     end
 
     if @cont_next = callcc { |c| c }
@@ -140,7 +138,7 @@ class Generator
   # Returns the element at the current position.
   def current()
     if @queue.empty?
-      raise EOFError, "no more elements available"
+      raise EOFError, "no more element is supplied"
     end
 
     @queue.first
@@ -165,44 +163,6 @@ class Generator
   end
 end
 
-class Enumerable::Enumerator
-  def __generator
-    @generator ||= Generator.new(self)
-  end
-  private :__generator
-
-  # call-seq:
-  #   e.next   => object
-  #
-  # Returns the next object in the enumerator, and move the internal
-  # position forward.  When the position reached at the end, internal
-  # position is rewinded then StopIteration is raised.
-  #
-  # Note that enumeration sequence by next method does not affect other
-  # non-external enumeration methods, unless underlying iteration
-  # methods itself has side-effect, e.g. IO#each_line.
-  #
-  # Caution: This feature internally uses Generator, which uses callcc
-  # to stop and resume enumeration to fetch each value.  Use with care
-  # and be aware of the performance loss.
-  def next
-    g = __generator
-    return g.next unless g.end?
-
-    g.rewind
-    raise StopIteration, 'iteration reached at end' 
-  end
-
-  # call-seq:
-  #   e.rewind   => e
-  #
-  # Rewinds the enumeration sequence by the next method.
-  def rewind
-    __generator.rewind
-    self
-  end
-end
-
 #
 # SyncEnumerator creates an Enumerable object from multiple Enumerable
 # objects and enumerates them synchronously.
diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb
index 4d004419b1..7bb9baef2d 100644
--- a/lib/getoptlong.rb
+++ b/lib/getoptlong.rb
@@ -1,94 +1,17 @@
+#                                                         -*- Ruby -*-
+# Copyright (C) 1998, 1999, 2000  Motoyuki Kasahara
 #
-# GetoptLong for Ruby
-#
-# Copyright (C) 1998, 1999, 2000  Motoyuki Kasahara.
-#
-# You may redistribute and/or modify this library under the same license
+# You may redistribute it and/or modify it 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.
+# Documents and latest version of `getoptlong.rb' are found at:
+#    http://www.sra.co.jp/people/m-kasahr/ruby/getoptlong/
 #
-# 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
+# Parse command line options just like GNU getopt_long().
 #
 class GetoptLong
   #
@@ -117,20 +40,7 @@ class GetoptLong
   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.
+  # Initializer.
   #
   def initialize(*arguments)
     #
@@ -144,14 +54,14 @@ class GetoptLong
 
     #
     # Hash table of option names.
-    # Keys of the table are option names, and their values are canonical
+    # Keyes 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
+    # Keyes of the table are option names, and their values are argument
     # flags of the options.
     #
     @argument_flags = Hash.new
@@ -177,7 +87,7 @@ class GetoptLong
     @error_message = nil
 
     #
-    # Rest of catenated short options.
+    # Rest of catinated short options.
     #
     @rest_singles = ''
 
@@ -193,53 +103,7 @@ class GetoptLong
   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.
+  # Set ordering.
   #
   def ordering=(ordering)
     #
@@ -270,9 +134,7 @@ class GetoptLong
   attr_reader :ordering
 
   #
-  # Set options. Takes the same argument as GetoptLong.new.
-  #
-  # Raises a RuntimeError if option processing has already started.
+  # Set options
   #
   def set_options(*arguments)
     #
@@ -346,7 +208,7 @@ class GetoptLong
   end
 
   #
-  # Set/Unset `quiet' mode.
+  # Set/Unset `quit' mode.
   #
   attr_writer :quiet
 
@@ -361,7 +223,7 @@ class GetoptLong
   alias quiet? quiet
 
   #
-  # Explicitly terminate option processing.
+  # Termintate option processing.
   #
   def terminate
     return nil if @status == STATUS_TERMINATED
@@ -381,7 +243,7 @@ class GetoptLong
   end
 
   #
-  # Returns true if option processing has terminated, false otherwise.
+  # Examine whether option processing is termintated or not.
   #
   def terminated?
     return @status == STATUS_TERMINATED
@@ -414,23 +276,15 @@ class GetoptLong
   #
   alias error? error
 
-  # Return the appropriate error message in POSIX-defined format.
-  # If no error has occurred, returns nil.
+  #
+  # Return an error message.
   #
   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).
+  # Get next option name and its argument as an array.
   #
   def get
     option_name, option_argument = nil, ''
@@ -539,7 +393,7 @@ class GetoptLong
     elsif argument =~ /^(-(.))(.*)/
       #
       # This is a short style option, which start with `-' (not `--').
-      # Short options may be catenated (e.g. `-l -g' is equivalent to
+      # Short options may be catinated (e.g. `-l -g' is equivalent to
       # `-lg').
       #
       option_name, ch, @rest_singles = $1, $2, $3
@@ -596,15 +450,8 @@ class GetoptLong
   #
   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.
+  # Iterator version of `get'.
   #
   def each
     loop do
diff --git a/lib/getopts.rb b/lib/getopts.rb
index 7124269351..34fb0d6442 100644
--- a/lib/getopts.rb
+++ b/lib/getopts.rb
@@ -15,11 +15,8 @@
 # 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 = {}
diff --git a/lib/gserver.rb b/lib/gserver.rb
index eb5f31b7b3..14f765a90c 100644
--- a/lib/gserver.rb
+++ b/lib/gserver.rb
@@ -1,88 +1,10 @@
-#
 # Copyright (C) 2001 John W. Small All Rights Reserved
-#
-# Author::        John W. Small
-# Documentation:: Gavin Sinclair
-# Licence::       Freeware.
-#
-# See the class GServer for documentation.
-#
+# mailto:jsmall@laser.net  subject:ruby-generic-server
+# Freeware
 
 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"
diff --git a/lib/importenv.rb b/lib/importenv.rb
index 8e1ba33b1d..435d6f972a 100644
--- a/lib/importenv.rb
+++ b/lib/importenv.rb
@@ -7,8 +7,6 @@
 #  $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
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index 23d74af451..24543ce093 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -2,19 +2,34 @@
 # ipaddr.rb - A class to manipulate an IP address
 #
 # Copyright (c) 2002 Hajimu UMEMOTO <ume@mahoroba.org>.
-# Copyright (c) 2007 Akinori MUSHA <knu@iDaemons.org>.
 # All rights reserved.
 #
 # You can redistribute and/or modify it under the same terms as Ruby.
 #
 # $Id$
-#
-# Contact:
-#   - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
-#
+#--
 # TODO:
 #   - scope_id support
+#++
+#
+#== 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>
+
 require 'socket'
 
 unless Socket.const_defined? "AF_INET6"
@@ -60,27 +75,8 @@ unless Socket.const_defined? "AF_INET6"
   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>
-
+# IPAddr provides a set of methods to manipulate an IP address.  Both
+# IPv4 and IPv6 are supported.
 class IPAddr
 
   IN4MASK = 0xffffffff
@@ -112,12 +108,12 @@ class IPAddr
 
   # Returns a new ipaddr built by bitwise AND.
   def &(other)
-    return self.clone.set(@addr & coerce_other(other).to_i)
+    return self.clone.set(@addr & other.to_i)
   end
 
   # Returns a new ipaddr built by bitwise OR.
   def |(other)
-    return self.clone.set(@addr | coerce_other(other).to_i)
+    return self.clone.set(@addr | other.to_i)
   end
 
   # Returns a new ipaddr built by bitwise right-shift.
@@ -135,10 +131,12 @@ class IPAddr
     return self.clone.set(addr_mask(~@addr))
   end
 
-  # Returns true if two ipaddrs are equal.
+  # Returns true if two ipaddr are equal.
   def ==(other)
-    other = coerce_other(other)
-    return @family == other.family && @addr == other.to_i
+    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
@@ -152,12 +150,10 @@ class IPAddr
   # e.g.:
   #   require 'ipaddr'
   #   net1 = IPAddr.new("192.168.2.0/24")
-  #   net2 = IPAddr.new("192.168.2.100")
-  #   net3 = IPAddr.new("192.168.3.0")
-  #   p net1.include?(net2)	#=> true
-  #   p net1.include?(net3)	#=> false
+  #   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)
-    other = coerce_other(other)
     if ipv4_mapped?
       if (@mask_addr >> 32) != 0xffffffffffffffffffffffff
 	return false
@@ -170,12 +166,17 @@ class IPAddr
       addr = @addr
       family = @family
     end
-    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
+    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
@@ -206,7 +207,6 @@ class IPAddr
       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)
@@ -316,37 +316,6 @@ class IPAddr
     return _reverse + ".ip6.int"
   end
 
-  # Returns the successor to the ipaddr.
-  def succ
-    return self.clone.set(@addr + 1, @family)
-  end
-
-  # Compares the ipaddr with another.
-  def <=>(other)
-    other = coerce_other(other)
-
-    return nil if other.family != @family
-
-    return @addr <=> other.to_i
-  end
-  include Comparable
-
-  # Creates a Range object for the network address.
-  def to_range
-    begin_addr = (@addr & @mask_addr)
-
-    case @family
-    when Socket::AF_INET
-      end_addr = (@addr | (IN4MASK ^ @mask_addr))
-    when Socket::AF_INET6
-      end_addr = (@addr | (IN6MASK ^ @mask_addr))
-    else
-      raise "unsupported address family"
-    end
-
-    return clone.set(begin_addr, @family)..clone.set(end_addr, @family)
-  end
-
   # Returns a string containing a human-readable representation of the
   # ipaddr. ("#<IPAddr: family:address/mask>")
   def inspect
@@ -422,36 +391,22 @@ class IPAddr
 
   private
 
-  # Creates a new ipaddr object either from a human readable IP
-  # address representation in string, or from a packed in_addr value
-  # followed by an address family.
-  # 
-  # In the former case, the following are the valid formats that will
-  # be recognized: "address", "address/prefixlen" and "address/mask",
-  # where IPv6 address may be enclosed in square brackets (`[' and
-  # `]').  If a prefixlen or a mask is specified, it returns a masked
-  # IP address.  Although the address family is determined
-  # automatically from a specified string, you can specify one
-  # explicitly by the optional second argument.
-  # 
-  # Otherwise an IP addess is generated from a packed in_addr value
-  # and an address family.
+  # 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 `]'.
   #
-  # The IPAddr class defines many methods and operators, and some of
-  # those, such as &, |, include? and ==, accept a string, or a packed
-  # in_addr value instead of an IPAddr object.
+  # 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)
-      case family
-      when Socket::AF_INET, Socket::AF_INET6
-        set(addr.to_i, family)
-        @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
-        return
-      when Socket::AF_UNSPEC
-	raise ArgumentError, "address family must be specified"
-      else
-	raise ArgumentError, "unsupported address family: #{family}"
+      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
@@ -478,7 +433,7 @@ class IPAddr
       @family = Socket::AF_INET6
     end
     if family != Socket::AF_UNSPEC && @family != family
-      raise ArgumentError, "address family mismatch"
+      raise ArgumentError, "address family unmatch"
     end
     if prefixlen
       mask!(prefixlen)
@@ -487,22 +442,14 @@ class IPAddr
     end
   end
 
-  def coerce_other(other)
-    case other
-    when IPAddr
-      other
-    when String
-      self.class.new(other)
-    else
-      self.class.new(other, @family)
-    end
-  end
-
   def in_addr(addr)
     if addr =~ /^\d+\.\d+\.\d+\.\d+$/
-      return addr.split('.').inject(0) { |i, s|
-        i << 8 | s.to_i
+      n = 0
+      addr.split('.').each { |i|
+	n <<= 8
+	n += i.to_i
       }
+      return n
     end
     return nil
   end
@@ -526,20 +473,25 @@ class IPAddr
     if rest < 0
       return nil
     end
-    return (l + Array.new(rest, '0') + r).inject(0) { |i, s|
-      i << 16 | s.hex
+    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
-      return addr & IN4MASK
+      addr &= IN4MASK
     when Socket::AF_INET6
-      return addr & IN6MASK
+      addr &= IN6MASK
     else
       raise "unsupported address family"
     end
+    return addr
   end
 
   def _reverse
@@ -722,10 +674,6 @@ class TC_IPAddr < Test::Unit::TestCase
     }
   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
diff --git a/lib/irb.rb b/lib/irb.rb
index 7580e39d43..1e59d6f669 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -1,9 +1,9 @@
 #
 #   irb.rb - irb main module
-#   	$Release Version: 0.9.5 $
+#   	$Release Version: 0.9 $
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -88,8 +88,8 @@ module IRB
   # 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)
+    def initialize(workspace = nil, input_method = nil)
+      @context = Context.new(self, workspace, input_method)
       @context.main.extend ExtendCommandBundle
       @signal_status = :IN_IRB
 
@@ -106,8 +106,6 @@ module IRB
 	  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
@@ -119,7 +117,7 @@ module IRB
 	end
 	if @context.auto_indent_mode
 	  unless ltype
-            ind = prompt(@context.prompt_i, ltype, indent, line_no)[/.*\z/].size +
+	    ind = prompt(@context.prompt_i, ltype, indent, line_no).size + 
 	      indent * 2 - p.size
 	    ind += 2 if continue
 	    @context.io.prompt = p + " " * ind if ind > 0
@@ -149,15 +147,10 @@ module IRB
             line.untaint
 	    @context.evaluate(line, line_no)
 	    output_value if @context.echo?
-	    exc = nil
-	  rescue Interrupt => exc
-	  rescue SystemExit, SignalException
-	    raise
-	  rescue Exception => exc
-	  end
-	  if exc
-	    print exc.class, ": ", exc, "\n"
-	    if exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/
+	  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
@@ -166,7 +159,7 @@ module IRB
 	    messages = []
 	    lasts = []
 	    levels = 0
-	    for m in exc.backtrace
+	    for m in $@
 	      m = @context.workspace.filter_backtrace(m) unless irb_bug
 	      if m
 		if messages.size < @context.back_trace_limit
@@ -188,7 +181,8 @@ module IRB
 	    print "Maybe IRB bug!!\n" if irb_bug
 	  end
           if $SAFE > 2
-            abort "Error: irb does not work for $SAFE level higher than 2"
+            warn "Error: irb does not work for $SAFE level higher than 2"
+            exit 1
           end
 	end
       end
diff --git a/lib/irb/cmd/chws.rb b/lib/irb/cmd/chws.rb
index 88585b778b..84f06014ba 100644
--- a/lib/irb/cmd/chws.rb
+++ b/lib/irb/cmd/chws.rb
@@ -1,9 +1,9 @@
 #
 #   change-ws.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/cmd/fork.rb b/lib/irb/cmd/fork.rb
index 2866b1373b..30024dc5e0 100644
--- a/lib/irb/cmd/fork.rb
+++ b/lib/irb/cmd/fork.rb
@@ -1,23 +1,9 @@
-#
-#   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")
+	pid = send(ExtendCommand.irb_original_method_name("fork"))
 	unless pid 
 	  class<<self
 	    alias_method :exit, ExtendCommand.irb_original_method_name('exit')
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
deleted file mode 100644
index 3e8d1388e0..0000000000
--- a/lib/irb/cmd/help.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#   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/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb
index cbc5d91d03..99d20f500c 100644
--- a/lib/irb/cmd/load.rb
+++ b/lib/irb/cmd/load.rb
@@ -1,9 +1,9 @@
 #
 #   load.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/cmd/nop.rb b/lib/irb/cmd/nop.rb
index aa553c959e..73c52b1aa3 100644
--- a/lib/irb/cmd/nop.rb
+++ b/lib/irb/cmd/nop.rb
@@ -1,9 +1,9 @@
 #
 #   nop.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/cmd/pushws.rb b/lib/irb/cmd/pushws.rb
index eddaeae631..0d8130d5c6 100644
--- a/lib/irb/cmd/pushws.rb
+++ b/lib/irb/cmd/pushws.rb
@@ -1,9 +1,9 @@
 #
 #   change-ws.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/cmd/subirb.rb b/lib/irb/cmd/subirb.rb
index 79d654b172..7899f1bb43 100644
--- a/lib/irb/cmd/subirb.rb
+++ b/lib/irb/cmd/subirb.rb
@@ -1,10 +1,10 @@
 #!/usr/local/bin/ruby
 #
 #   multi.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
index 000658e2a3..46e6f24f30 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -99,27 +99,15 @@ module IRB
 	candidates = Symbol.instance_methods(true)
 	select_message(receiver, message, candidates)
 
-      when /^(-?(0[dbo])?[0-9_]+(\.[0-9_]+)?([eE]-?[0-9]+)?)\.([^.]*)$/
+      when /^([0-9_]+(\.[0-9_]+)?(e[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)
+	message = Regexp.quote($4)
 
 	begin
 	  candidates = eval(receiver, bind).methods
 	rescue Exception
-	  candidates = []
+	  candidates
 	end
 	select_message(receiver, message, candidates)
 
@@ -150,13 +138,8 @@ module IRB
 	  # 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
+	    next if m.name != "IRB::Context" and 
+	      /^(IRB|SLex|RubyLex|RubyToken)/ =~ m.name
 	    candidates.concat m.instance_methods(false)
 	  }
 	  candidates.sort!
@@ -199,7 +182,7 @@ module IRB
 end
 
 if Readline.respond_to?("basic_word_break_characters=")
-  Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{("
+  Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
 end
 Readline.completion_append_character = nil
 Readline.completion_proc = IRB::InputCompletor::CompletionProc
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index d01bd4aefa..9421608f85 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -1,9 +1,9 @@
 #
 #   irb/context.rb - irb context
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -19,7 +19,7 @@ module IRB
     #		      String -- File
     #		      other -- using this as InputMethod
     #
-    def initialize(irb, workspace = nil, input_method = nil, output_method = nil)
+    def initialize(irb, workspace = nil, input_method = nil)
       @irb = irb
       if workspace
 	@workspace = workspace
@@ -38,7 +38,7 @@ module IRB
       @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_tracer = IRB.conf[:USE_TRACER] if IRB.conf[:USE_TRASER]
       self.use_loader = IRB.conf[:USE_LOADER] if IRB.conf[:USE_LOADER]
       self.eval_history = IRB.conf[:EVAL_HISTORY] if IRB.conf[:EVAL_HISTORY]
 
@@ -58,24 +58,12 @@ module IRB
 
       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
+	if (defined?(ReadlineInputMethod) &&
+            (use_readline? || IRB.conf[:PROMPT_MODE] != :INF_RUBY && STDIN.tty?))
+	  @io = ReadlineInputMethod.new
+	else
 	  @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)
@@ -83,13 +71,6 @@ module IRB
       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]
@@ -115,14 +96,13 @@ module IRB
     attr_accessor :irb_name
     attr_accessor :irb_path
 
-    attr_reader :use_readline
+    attr_accessor :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
 
@@ -161,7 +141,6 @@ module IRB
 
     def set_last_value(value)
       @last_value = value
-      @workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
     end
 
     attr_reader :irb_name
@@ -172,7 +151,6 @@ module IRB
       @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
@@ -199,6 +177,7 @@ module IRB
       @inspect_mode
     end
 
+    undef use_readline=
     def use_readline=(opt)
       @use_readline = opt
       print "use readline module\n" if @use_readline
diff --git a/lib/irb/ext/change-ws.rb b/lib/irb/ext/change-ws.rb
index fff8f58fe5..f15391e202 100644
--- a/lib/irb/ext/change-ws.rb
+++ b/lib/irb/ext/change-ws.rb
@@ -1,9 +1,9 @@
 #
 #   irb/ext/cb.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/ext/history.rb b/lib/irb/ext/history.rb
index 40f8692e8b..d40a62e959 100644
--- a/lib/irb/ext/history.rb
+++ b/lib/irb/ext/history.rb
@@ -1,9 +1,9 @@
 #
 #   history.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
@@ -21,7 +21,7 @@ module IRB
     def set_last_value(value)
       _set_last_value(value)
 
-#      @workspace.evaluate self, "_ = IRB.CurrentContext.last_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}"
@@ -33,7 +33,7 @@ module IRB
     attr_reader :eval_history
     def eval_history=(no)
       if no
-	if defined?(@eval_history) && @eval_history
+	if @eval_history 
 	  @eval_history_values.size(no)
 	else
 	  @eval_history_values = History.new(no)
diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb
index 837e2553ac..26e36e1209 100644
--- a/lib/irb/ext/loader.rb
+++ b/lib/irb/ext/loader.rb
@@ -1,22 +1,8 @@
-#
-#   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
 
diff --git a/lib/irb/ext/math-mode.rb b/lib/irb/ext/math-mode.rb
index bd443b96ed..5e268bb3e5 100644
--- a/lib/irb/ext/math-mode.rb
+++ b/lib/irb/ext/math-mode.rb
@@ -1,9 +1,9 @@
 #
 #   math-mode.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb
index 4589b1d554..e815889383 100644
--- a/lib/irb/ext/multi-irb.rb
+++ b/lib/irb/ext/multi-irb.rb
@@ -1,9 +1,9 @@
 #
 #   irb/multi-irb.rb - multiple irb module
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb
deleted file mode 100644
index 5260bfcdd8..0000000000
--- a/lib/irb/ext/save-history.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/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/lib/irb/ext/tracer.rb b/lib/irb/ext/tracer.rb
index 805f630a4d..b2528f74b2 100644
--- a/lib/irb/ext/tracer.rb
+++ b/lib/irb/ext/tracer.rb
@@ -1,9 +1,9 @@
 #
 #   irb/lib/tracer.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/ext/use-loader.rb b/lib/irb/ext/use-loader.rb
index 1b4d480fcd..a81b3aca7b 100644
--- a/lib/irb/ext/use-loader.rb
+++ b/lib/irb/ext/use-loader.rb
@@ -1,9 +1,9 @@
 #
 #   use-loader.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/ext/workspaces.rb b/lib/irb/ext/workspaces.rb
index 79098570dc..2fe8f8a87b 100644
--- a/lib/irb/ext/workspaces.rb
+++ b/lib/irb/ext/workspaces.rb
@@ -1,9 +1,9 @@
 #
 #   push-ws.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index 508721c11d..cfb2c7c4be 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -1,9 +1,9 @@
 #
-#   irb/extend-command.rb - irb extend command 
-#   	$Release Version: 0.9.5$
+#   irb/extend-command.rb - irb command extend
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -100,20 +100,16 @@ module IRB
 	[: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
+    def EXCB.install_extend_commands
       for args in @EXTEND_COMMANDS
 	def_extend_command(*args)
       end
     end
 
-    # aliases = [commands_alias, flag], ...
-    def self.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
+    # aliases = [commans_alias, flag], ...
+    def EXCB.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
       case cmd_class
       when Symbol
 	cmd_class = cmd_class.id2name
@@ -172,7 +168,7 @@ module IRB
       "irb_" + method_name + "_org"
     end
 
-    def self.extend_object(obj)
+    def EXCB.extend_object(obj)
       unless (class<<obj;ancestors;end).include?(EXCB)
 	super
 	for ali, com, flg in @ALIASES
@@ -193,19 +189,17 @@ module IRB
       [: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
+    def CE.install_extend_commands
       for args in @EXTEND_COMMANDS
 	def_extend_command(*args)
       end
     end
 
-    def self.def_extend_command(cmd_name, load_file, *aliases)
+    def CE.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
@@ -217,48 +211,5 @@ module IRB
 
     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/lib/irb/help.rb b/lib/irb/help.rb
index 4921de6ec9..eb876a6dbe 100644
--- a/lib/irb/help.rb
+++ b/lib/irb/help.rb
@@ -1,6 +1,6 @@
 #
-#   irb/help.rb - print usage module
-#   	$Release Version: 0.9.5$
+#   irb/help.rb - print usase module
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index db22ca639b..9fd86e94a2 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -1,9 +1,9 @@
 #
 #   irb/init.rb - irb initialize module
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -54,43 +54,36 @@ module IRB
     @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",
@@ -98,14 +91,13 @@ module IRB
       },
       :XMP => {
 	:PROMPT_I => nil,
-	:PROMPT_N => nil,
 	:PROMPT_S => nil,
 	:PROMPT_C => nil,
 	:RETURN => "    ==>%s\n"
       }
     }
 
-    @CONF[:PROMPT_MODE] = (STDIN.tty? ? :DEFAULT : :NULL)
+    @CONF[:PROMPT_MODE] = :DEFAULT
     @CONF[:AUTO_INDENT] = false
 
     @CONF[:CONTEXT_MODE] = 3 # use binding in function on TOPLEVEL_BINDING
@@ -121,11 +113,8 @@ module IRB
     @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"
@@ -134,12 +123,9 @@ module IRB
 	@CONF[:MATH_MODE] = true
       when "-d"
 	$DEBUG = true
-      when /^-r(.+)?/
-	opt = $1 || ARGV.shift
+      when "-r"
+	opt = 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"
@@ -192,57 +178,34 @@ module IRB
 	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
+      rcs = []
+      rcs.push File.expand_path("~/.irbrc") if ENV.key?("HOME")
+      rcs.push ".irbrc"
+      rcs.push "irb.rc"
+      rcs.push "_irbrc"
+      rcs.push "$irbrc"
+      catch(:EXIT) do
+	for rc in rcs
+	  begin
+	    load rc
+	    throw :EXIT
+	  rescue LoadError, Errno::ENOENT
+	  rescue
+	    print "load error: #{rc}\n"
+	    print $!.class, ": ", $!, "\n"
+	    for err in $@[0, $@.size - 2]
+	      print "\t", err, "\n"
+	    end
+	    throw :EXIT
+	  end
 	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
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index bfb90fa59a..ec834b17bc 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -1,9 +1,9 @@
 #
-#   irb/input-method.rb - input methods used irb
-#   	$Release Version: 0.9.5$
+#   irb/input-method.rb - input methods using irb
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -94,8 +94,8 @@ module IRB
       end
 
       def gets
-	if l = readline(@prompt, false)
-          HISTORY.push(l) if !l.empty?
+	if l = readline(@prompt, true)
+	  HISTORY.pop if l.empty?
 	  @line[@line_no += 1] = l + "\n"
 	else
 	  @eof = true
diff --git a/lib/irb/lc/error.rb b/lib/irb/lc/error.rb
index 247596b7fe..68a488a48a 100644
--- a/lib/irb/lc/error.rb
+++ b/lib/irb/lc/error.rb
@@ -1,9 +1,9 @@
 #
 #   irb/lc/error.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message
index 32087d113c..42e861a343 100644
--- a/lib/irb/lc/help-message
+++ b/lib/irb/lc/help-message
@@ -1,9 +1,9 @@
 #
 #   irb/lc/help-message.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -14,7 +14,6 @@ Usage:  irb.rb [options] [programfile] [arguments]
   -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
diff --git a/lib/irb/lc/ja/error.rb b/lib/irb/lc/ja/error.rb
index 4c2fb3b839..e1afaf5d71 100644
--- a/lib/irb/lc/ja/error.rb
+++ b/lib/irb/lc/ja/error.rb
@@ -1,9 +1,9 @@
 #
 #   irb/lc/ja/error.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -25,3 +25,5 @@ module IRB
   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/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
index debbfe9355..1cf980f6ba 100644
--- a/lib/irb/lc/ja/help-message
+++ b/lib/irb/lc/ja/help-message
@@ -1,9 +1,9 @@
 #
 #   irb/lc/ja/help-message.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -14,7 +14,6 @@ Usage:  irb.rb [options] [programfile] [arguments]
   -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.
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index 5ed9f54507..b2c90e38e2 100644
--- a/lib/irb/locale.rb
+++ b/lib/irb/locale.rb
@@ -1,15 +1,16 @@
 #
 #   irb/locale.rb - internationalization module
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
 #   
 #
 
+autoload :Tempfile, "tempfile"
 autoload :Kconv, "kconv"
 
 module IRB
@@ -31,8 +32,6 @@ module IRB
         Kconv::EUC
       when "ja_JP.sjis", "ja_JP.SJIS"
         Kconv::SJIS
-      when /ja_JP.utf-?8/i
-	Kconv::UTF8
       end
     end
     private :lc2kconv
@@ -71,7 +70,7 @@ module IRB
     end
 
     def puts(*opts)
-      ary = opts.collect{|opt| String(opt)}
+      ary = opts.collect{|opt| String(opts)}
       super(*ary)
     end
 
@@ -127,12 +126,15 @@ module IRB
     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)
+      tmp_base = path.tr("./:", "___")
+      lc_file = Tempfile.new(tmp_base)
+      File.foreach(path) do |line|
+	line = self.String(line)
+	lc_file.print(line)
       end
+      lc_file.close
+      toplevel_load lc_file.path, priv
+      lc_file.close(true)
     end
     private :real_load
 
@@ -153,8 +155,8 @@ module IRB
     end
 
     def search_file(path, file)
-      if File.exist?(p1 = path + lc_path(file, "C"))
-	if File.exist?(p2 = path + lc_path(file))
+      if File.exists?(p1 = path + lc_path(file, "C"))
+	if File.exists?(p2 = path + lc_path(file))
 	  return p2
 	else
 	end
diff --git a/lib/irb/notifier.rb b/lib/irb/notifier.rb
deleted file mode 100644
index 0f79bc5a8d..0000000000
--- a/lib/irb/notifier.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-#   notifier.rb - output 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/lib/irb/output-method.rb b/lib/irb/output-method.rb
deleted file mode 100644
index b9a3a8851e..0000000000
--- a/lib/irb/output-method.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-#   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/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 313a809ccd..6b445a32b9 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -1,9 +1,9 @@
 #
-#   irb/ruby-lex.rb - ruby lexcal analyzer
-#   	$Release Version: 0.9.5$
+#   irb/ruby-lex.rb - ruby lexcal analizer
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -51,18 +51,10 @@ class RubyLex
 
     @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
@@ -100,8 +92,7 @@ class RubyLex
 
   def getc
     while @rests.empty?
-#      return nil unless buf_input
-      @rests.push nil unless buf_input
+      return nil unless buf_input
     end
     c = @rests.shift
     if @here_header
@@ -122,10 +113,9 @@ class RubyLex
   def gets
     l = ""
     while c = getc
-      l.concat(c)
+      l.concat c
       break if c == "\n"
     end
-    return nil if l == "" and c.nil?
     l
   end
 
@@ -193,7 +183,7 @@ class RubyLex
   end
   private :buf_input
 
-  def set_prompt(p = nil, &block)
+  def set_prompt(p=nil, &block)
     p = block if block_given?
     if p.respond_to?(:call)
       @prompt = p
@@ -287,7 +277,7 @@ class RubyLex
 	tk = @OP.match(self)
 	@space_seen = tk.kind_of?(TkSPACE)
       rescue SyntaxError
-	raise if @exception_on_syntax_error
+	abort if @exception_on_syntax_error
 	tk = TkError.new(@seek, @line_no, @char_no)
       end
     end while @skip_space and tk.kind_of?(TkSPACE)
@@ -309,7 +299,7 @@ class RubyLex
     "q" => "\'",
     "Q" => "\"",
     "x" => "\`",
-    "r" => "/",
+    "r" => "\/",
     "w" => "]",
     "W" => "]",
     "s" => ":"
@@ -326,35 +316,35 @@ class RubyLex
     "\'" => TkSTRING,
     "\"" => TkSTRING,
     "\`" => TkXSTRING,
-    "/" => TkREGEXP,
+    "\/" => TkREGEXP,
     "]" => TkDSTRING,
     ":" => TkSYMBOL
   }
   DLtype2Token = {
     "\"" => TkDSTRING,
     "\`" => TkDXSTRING,
-    "/" => TkDREGEXP,
+    "\/" => TkDREGEXP,
   }
 
   def lex_init()
-    @OP = IRB::SLex.new
-    @OP.def_rules("\0", "\004", "\032") do |op, io|
+    @OP = SLex.new
+    @OP.def_rules("\0", "\004", "\032") do
       Token(TkEND_OF_SCRIPT)
     end
 
-    @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |op, io|
+    @OP.def_rules(" ", "\t", "\f", "\r", "\13") do
       @space_seen = true
       while getc =~ /[ \t\f\r\13]/; end
       ungetc
       Token(TkSPACE)
     end
 
-    @OP.def_rule("#") do |op, io|
+    @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.def_rule("=begin", proc{@prev_char_no == 0 && peek(0) =~ /\s/}) do
       |op, io|
       @ltype = "="
       until getc == "\n"; end
@@ -366,7 +356,7 @@ class RubyLex
       Token(TkRD_COMMENT)
     end
 
-    @OP.def_rule("\n") do |op, io|
+    @OP.def_rule("\n") do
       print "\\n\n" if RubyLex.debug?
       case @lex_state
       when EXPR_BEG, EXPR_FNAME, EXPR_DOT
@@ -436,7 +426,6 @@ class RubyLex
     @OP.def_rules("`") do
       |op, io|
       if @lex_state == EXPR_FNAME
-	@lex_state = EXPR_END
 	Token(op)
       else
 	identify_string(op)
@@ -478,15 +467,13 @@ class RubyLex
       Token(TkOPASGN, $1)
     end
 
-    @OP.def_rule("+@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+    @OP.def_rule("+@", proc{@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.def_rule("-@", proc{@lex_state == EXPR_FNAME}) do
       |op, io|
-      @lex_state = EXPR_ARG
       Token(op)
     end
 
@@ -509,7 +496,6 @@ class RubyLex
     end
 
     @OP.def_rule(".") do
-      |op, io|
       @lex_state = EXPR_BEG
       if peek(0) =~ /[0-9]/
 	ungetc
@@ -540,7 +526,6 @@ class RubyLex
     end
 
     @OP.def_rule(":") do
-      |op, io|
       if @lex_state == EXPR_END || peek(0) =~ /\s/
 	@lex_state = EXPR_BEG
 	Token(TkCOLON)
@@ -551,7 +536,6 @@ class RubyLex
     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
@@ -579,7 +563,6 @@ class RubyLex
     end
 
     @OP.def_rules("^") do
-      |op, io|
       @lex_state = EXPR_BEG
       Token("^")
     end
@@ -607,19 +590,16 @@ class RubyLex
     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|
+    @OP.def_rule("~@", proc{@lex_state == EXPR_FNAME}) do
       @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
@@ -632,20 +612,15 @@ class RubyLex
       tk = Token(tk_c)
     end
 
-    @OP.def_rule("[]", proc{|op, io| @lex_state == EXPR_FNAME}) do
-      |op, io|
-      @lex_state = EXPR_ARG
+    @OP.def_rule("[]", proc{@lex_state == EXPR_FNAME}) do
       Token("[]")
     end
 
-    @OP.def_rule("[]=", proc{|op, io| @lex_state == EXPR_FNAME}) do
-      |op, io|
-      @lex_state = EXPR_ARG
+    @OP.def_rule("[]=", proc{@lex_state == EXPR_FNAME}) do
       Token("[]=")
     end
 
     @OP.def_rule("[") do
-      |op, io|
       @indent += 1
       if @lex_state == EXPR_FNAME
 	tk_c = TkfLBRACK
@@ -664,7 +639,6 @@ class RubyLex
     end
 
     @OP.def_rule("{") do
-      |op, io|
       @indent += 1
       if @lex_state != EXPR_END && @lex_state != EXPR_ARG
 	tk_c = TkLBRACE
@@ -677,7 +651,6 @@ class RubyLex
     end
 
     @OP.def_rule('\\') do
-      |op, io|
       if getc == "\n"
 	@space_seen = true
 	@continue = true
@@ -704,12 +677,10 @@ class RubyLex
     end
 
     @OP.def_rule('$') do
-      |op, io|
       identify_gvar
     end
 
     @OP.def_rule('@') do
-      |op, io|
       if peek(0) =~ /[\w_@]/
 	ungetc
 	identify_identifier
@@ -816,13 +787,14 @@ class RubyLex
 	else
 	  if @lex_state != EXPR_FNAME
 	    if ENINDENT_CLAUSE.include?(token)
-	      # check for ``class = val'' etc.
+	      # check for ``class = val''.
 	      valid = true
 	      case token
 	      when "class"
 		valid = false unless peek_match?(/^\s*(<<|\w|::)/)
 	      when "def"
 		valid = false if peek_match?(/^\s*(([+-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
+#		valid = false if peek_match?(/^\s*(([+-\/*&\|^]|<<|>>|\|\||\&\&)?=|\&\&|\|\|)/)
 	      when "do"
 		valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&)/)
 	      when *ENINDENT_CLAUSE
@@ -910,11 +882,7 @@ class RubyLex
     end
 
     @here_header = false
-    while l = gets
-      l = l.sub(/(:?\r)?\n\z/, '')
-      if (indent ? l.strip : l) == quoted
- 	break
-      end
+    while (l = gets.chomp) && (indent ? l.strip : l) != quoted
     end
 
     @here_header = true
@@ -949,51 +917,19 @@ class RubyLex
   def identify_number
     @lex_state = EXPR_END
 
-    if peek(0) == "0" && peek(1) !~ /[.eE]/
-      getc
-      case peek(0)
-      when /[xX]/
+    if ch = getc
+      if /[xX]/ =~ peek(0)
 	ch = getc
 	match = /[0-9a-fA-F_]/
-      when /[bB]/
+      elsif /[bB]/ =~ peek(0)
 	ch = getc
 	match = /[01_]/
-      when /[oO]/
-	ch = getc
-	match = /[0-7_]/
-      when /[dD]/
-	ch = getc
-	match = /[0-9_]/
-      when /[0-7]/
+      else
 	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
+	if ch !~ match
 	  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
@@ -1003,39 +939,24 @@ class RubyLex
     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 /[0-9_]/
       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
@@ -1052,7 +973,7 @@ class RubyLex
       while ch = getc
 	if @quoted == ch and nest == 0
 	  break
-	elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
+	elsif @ltype != "'" && @ltype != "]" and ch == "#"
 	  subtype = true
 	elsif ch == '\\' #'
 	  read_escape
@@ -1101,7 +1022,7 @@ class RubyLex
   def read_escape
     case ch = getc
     when "\n", "\r", "\f"
-    when "\\", "n", "t", "r", "f", "v", "a", "e", "b", "s" #"
+    when "\\", "n", "t", "r", "f", "v", "a", "e", "b" #"
     when /[0-7]/
       ungetc ch
       3.times do
@@ -1136,7 +1057,7 @@ class RubyLex
 	end
       end
 
-    when "C", "c" #, "^"
+    when "C", "c", "^"
       if ch == "C" and (ch = getc) != "-"
 	ungetc
       elsif (ch = getc) == "\\" #"
diff --git a/lib/irb/ruby-token.rb b/lib/irb/ruby-token.rb
index 525d4df14c..49b97e9c54 100644
--- a/lib/irb/ruby-token.rb
+++ b/lib/irb/ruby-token.rb
@@ -1,9 +1,9 @@
 #
 #   irb/ruby-token.rb - ruby tokens 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -64,7 +64,7 @@ module RubyToken
   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 = TkReading2Token[op] unless op.kind_of?(Symbol)
       @op = op
     end
     attr :op
diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb
index f7e3a3b2b2..ceee90b3d9 100644
--- a/lib/irb/slex.rb
+++ b/lib/irb/slex.rb
@@ -1,9 +1,9 @@
 #
-#   irb/slex.rb - simple lex analyzer
-#   	$Release Version: 0.9.5$
+#   irb/slex.rb - symple lex analizer
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishituska.com)
 #
 # --
 #
@@ -11,242 +11,236 @@
 #
 
 require "e2mmap"
-require "irb/notifier"
 
-module IRB
-  class SLex
-    @RCS_ID='-$Id$-'
+class SLex
+  @RCS_ID='-$Id$-'
 
-    extend Exception2MessageMapper
-    def_exception :ErrNodeNothing, "node nothing"
-    def_exception :ErrNodeAlreadyExists, "node already exists"
+  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("")
+  class << self
+    attr_accessor :debug_level
+    def debug?
+      debug_level > 0
     end
-    
-    def def_rule(token, preproc = nil, postproc = nil, &block)
-      D_DETAIL.pp token
+  end
+  @debug_level = 0
 
-      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
+  def initialize
+    @head = Node.new("")
+  end
+  
+  def def_rule(token, preproc = nil, postproc = nil, &block)
+    #      print node.inspect, "\n" if SLex.debug?
+    postproc = block if block_given?
+    node = create(token, preproc, postproc)
+  end
+  
+  def def_rules(*tokens, &block)
+    if block_given?
+      p = block
     end
-    
-    def preproc(token, proc)
-      node = search(token)
-      node.preproc=proc
+    for token in tokens
+      def_rule(token, nil, p)
     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 preproc(token, proc)
+    node = search(token)
+    node.preproc=proc
+  end
+  
+  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)
+    printf "match end: %s:%s", ret, token.inspect if SLex.debug?
+    ret
+  end
+  
+  def inspect
+    format("<SLex: @head = %s>", @head.inspect)
+  end
 
-    def create(token, preproc = nil, postproc = nil)
-      @head.create_subnode(token.split(//), preproc, postproc)
+  #----------------------------------------------------------------------
+  #
+  #   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 match(token)
-      case token
-      when Array
-      when String
-	return match(token.split(//))
+    def search(chrs, opt = nil)
+      return self if chrs.empty?
+      ch = chrs.shift
+      if node = @Tree[ch]
+	node.search(chrs, opt)
       else
-	return @head.match_io(token)
+	if opt
+	  chrs.unshift ch
+	  self.create_subnode(chrs)
+	else
+	  SLex.fail ErrNodeNothing
+	end
       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)
+    def create_subnode(chrs, preproc = nil, postproc = nil)
+      if chrs.empty?
+	if @postproc
+	  p node
+	  SLex.fail ErrNodeAlreadyExists
 	else
-	  if opt
-	    chrs.unshift ch
-	    self.create_subnode(chrs)
-	  else
-	    SLex.fail ErrNodeNothing
-	  end
+	  print "Warn: change abstruct node to real node\n" if SLex.debug?
+	  @preproc = preproc
+	  @postproc = postproc
 	end
+	return self
       end
       
-      def create_subnode(chrs, preproc = nil, postproc = nil)
+      ch = chrs.shift
+      if node = @Tree[ch]
 	if chrs.empty?
-	  if @postproc
-	    D_DETAIL.pp node
+	  if node.postproc
+	    p node
+	    p self
+	    p ch
+	    p chrs
 	    SLex.fail ErrNodeAlreadyExists
 	  else
-	    D_DEBUG.puts "change abstract node to real node."
-	    @preproc = preproc
-	    @postproc = postproc
+	    print "Warn: change abstruct node to real node\n" if SLex.debug?
+	    node.preproc = preproc
+	    node.postproc = postproc
 	  end
-	  return self
+	else
+	  node.create_subnode(chrs, preproc, postproc)
 	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
-	  if chrs.empty?
-	    node = Node.new(preproc, postproc)
-	  else
-	    node = Node.new
-	    node.create_subnode(chrs, preproc, postproc)
-	  end
-	  @Tree[ch] = node
+	  node = Node.new
+	  node.create_subnode(chrs, preproc, postproc)
 	end
-	node
+	@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
+    #
+    # 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 = "")
+      print "match>: ", chrs, "op:", op, "\n" if SLex.debug?
+      if chrs.empty?
+	if @preproc.nil? || @preproc.call(op, chrs)
+	  printf "op1: %s\n", op if SLex.debug?
+	  @postproc.call(op, chrs)
 	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
+	  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, "op3: %s\n", op)
-	      @postproc.call(op, chrs)
-	      return ""
+	      printf "op2: %s\n", op.inspect if SLex.debug?
+	      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)
+	    printf "op3: %s\n", op if SLex.debug?
+	    @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
+    def match_io(io, op = "")
+      if op == ""
+	ch = io.getc
+	if ch == nil
+	  return nil
 	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
+	ch = io.getc_of_rests
+      end
+      if ch.nil?
+	if @preproc.nil? || @preproc.call(op, io)
+	  printf "op1: %s\n", op if SLex.debug?
+	  @postproc.call(op, io)
 	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
+	  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)
-	      D_DETAIL.printf("op3: %s\n", op)
+	      printf "op2: %s\n", op.inspect if SLex.debug?
 	      @postproc.call(op, io)
 	    else
 	      nil
 	    end
 	  end
+	else
+	  io.ungetc ch
+	  if @postproc and @preproc.nil? || @preproc.call(op, io)
+	    printf "op3: %s\n", op if SLex.debug?
+	    @postproc.call(op, io)
+	  else
+	    nil
+	  end
 	end
       end
     end
   end
 end
 
-SLex=IRB::SLex
-
 if $0 == __FILE__
   #    Tracer.on
   case $1
@@ -282,4 +276,3 @@ if $0 == __FILE__
   end
   exit
 end
-
diff --git a/lib/irb/version.rb b/lib/irb/version.rb
index 28b079740a..a9e37f7e7b 100644
--- a/lib/irb/version.rb
+++ b/lib/irb/version.rb
@@ -1,6 +1,6 @@
 #
 #   irb/version.rb - irb version definition file
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
@@ -11,6 +11,6 @@
 #
 
 module IRB
-  @RELEASE_VERSION = "0.9.5"
-  @LAST_UPDATE_DATE = "05/04/13"
+  @RELEASE_VERSION = "0.9"
+  @LAST_UPDATE_DATE = "02/07/03"
 end
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
index 7d1794cd7b..531995fc44 100644
--- a/lib/irb/workspace.rb
+++ b/lib/irb/workspace.rb
@@ -1,9 +1,9 @@
 #
 #   irb/workspace-binding.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
@@ -81,7 +81,7 @@ EOF
       eval(statements, @binding, file, line)
     end
   
-    # error message manipulator
+    # error message manupilator
     def filter_backtrace(bt)
       case IRB.conf[:CONTEXT_MODE]
       when 0
diff --git a/lib/irb/ws-for-case-2.rb b/lib/irb/ws-for-case-2.rb
index afd49d23e1..1c58fb7dda 100644
--- a/lib/irb/ws-for-case-2.rb
+++ b/lib/irb/ws-for-case-2.rb
@@ -1,9 +1,9 @@
 #
 #   irb/ws-for-case-2.rb - 
-#   	$Release Version: 0.9.5$
+#   	$Release Version: 0.9$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
diff --git a/lib/jcode.rb b/lib/jcode.rb
index 78422f296f..8cd770be26 100644
--- a/lib/jcode.rb
+++ b/lib/jcode.rb
@@ -77,7 +77,7 @@ class String
 
   def succ!
     reg = end_regexp
-    if  $KCODE != 'NONE' && self =~ reg
+    if self =~ reg
       succ_table = SUCC[$KCODE[0,1].downcase]
       begin
 	self[-1] += succ_table[self[-1]]
@@ -90,8 +90,7 @@ class String
   end
 
   def succ
-    str = self.dup
-    str.succ! or str
+    (str = self.dup).succ! or str
   end
 
   private
@@ -175,7 +174,7 @@ class String
   def tr_s!(from, to)
     return self.delete!(from) if to.length == 0
 
-    pattern = SqueezePatternCache[from] ||= /([#{_regex_quote(from)}])\1*/
+    pattern = SqueezePatternCache[from] ||= /([#{_regex_quote(from)}])\1+/
     if from[0] == ?^
       last = /.$/.match(to)[0]
       self.gsub!(pattern, last)
diff --git a/lib/logger.rb b/lib/logger.rb
index 9030fa1d0d..e8e163ca93 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -1,175 +1,76 @@
-# logger.rb - simple 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.
-#
+# Logger -- Logging utility.
 #
-# == HOWTOs
+# $Id$
 #
-# === How to create a logger
+# This module is copyrighted free software by NAKAMURA, Hiroshi.
+# You can redistribute it and/or modify it under the same term as Ruby.
 #
-# 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."
+# See Logger at first.
+
+
+# DESCRIPTION
+#   Logger -- Logging utility.
 #
-# 3. With progname.
+# How to create a logger.
+#   1. Create logger which logs messages to STDERR/STDOUT.
+#     logger = Logger.new(STDERR)
+#     logger = Logger.new(STDOUT)
 #
-#      logger.info('initialize') { "Initializing..." }
+#   2. Create logger for the file which has the specified name.
+#     logger = Logger.new('logfile.log')
 #
-# 4. With severity.
+#   3. Create logger for the specified 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)
 #
-#      logger.add(Logger::FATAL) { 'Fatal error!' }
+#   4. Create logger which ages logfile automatically.  Leave 10 ages and each
+#      file is about 102400 bytes.
+#     logger = Logger.new('foo.log', 10, 102400)
 #
-# === How to close a logger
+#   5. Create logger which ages logfile daily/weekly/monthly automatically.
+#     logger = Logger.new('foo.log', 'daily')
+#     logger = Logger.new('foo.log', 'weekly')
+#     logger = Logger.new('foo.log', 'monthly')
 #
-#      logger.close
+# How to log a message.
 #
-# === Setting severity threshold
+#   1. Message in block.
+#     logger.fatal { "Argument 'foo' not given." }
 #
-# 1. Original interface.
+#   2. Message as a string.
+#     logger.error "Argument #{ @foo } mismatch."
 #
-#      logger.sev_threshold = Logger::WARN
+#   3. With progname.
+#     logger.info('initialize') { "Initializing..." }
 #
-# 2. Log4r (somewhat) compatible interface.
+#   4. With severity.
+#     logger.add(Logger::FATAL) { 'Fatal error!' }
 #
-#      logger.level = Logger::INFO
-#      
-#      DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+# How to close a logger.
 #
+#   logger.close
 #
-# == Format
+# Setting severity threshold.
 #
-# Log messages are rendered in the output stream in a certain format.  The
-# default format and a sample are shown below:
+#   1. Original interface.
+#     logger.level = Logger::WARN
 #
-# Log format:
-#   SeverityID, [Date Time mSec #pid] SeverityLabel -- ProgName: message
+#   2. Log4r (somewhat) compatible interface.
+#     logger.level = Logger::INFO
 #
-# Log sample:
-#   I, [Wed Mar 03 02:34:24 JST 1999 895701 #19074]  INFO -- Main: info.
+#   DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
 #
-# You may change the date and time format in this manner:
+# Format.
 #
-#   logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-#         # e.g. "2004-01-03 00:54:26"
+#   Log format:
+#     SeverityID, [Date Time mSec #pid] SeverityLabel -- ProgName: message
 #
-# There is currently no supported way to change the overall format, but you may
-# have some luck hacking the Format constant.
+#   Log sample:
+#     I, [Wed Mar 03 02:34:24 JST 1999 895701 #19074]  INFO -- Main: info.
 #
-
-
 class Logger
-  VERSION = "1.2.6"
   /: (\S+),v (\S+)/ =~ %q$Id$
   ProgName = "#{$1}/#{$2}"
 
@@ -187,151 +88,114 @@ class Logger
   end
   include Severity
 
-  # Logging severity threshold (e.g. <tt>Logger::INFO</tt>).
+  # Logging severity threshold.
   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
+  # Logging date-time format (string passed to strftime)
+  attr_accessor :datetime_format
 
   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
-  #
+  # 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
+  # ARGS
+  #   log	String as filename of logging.
+  #		or
+  #		IO as logging device(i.e. STDERR).
+  #   shift_age	An Integer	Num of files you want to keep aged logs.
+  #		'daily'		Daily shifting.
+  #		'weekly'	Weekly shifting (Every monday.)
+  #		'monthly'	Monthly shifting (Every 1th day.)
+  #   shift_size	Shift size threshold when shift_age is an integer.
+  #		Otherwise (like 'daily'), shift_size will be ignored.
   #
-  # Create an instance.
+  # DESCRIPTION
+  #   Create an instance.
   #
   def initialize(logdev, shift_age = 0, shift_size = 1048576)
+    @logdev = nil
     @progname = nil
     @level = DEBUG
-    @default_formatter = Formatter.new
-    @formatter = nil
+    @datetime_format = nil
     @logdev = nil
     if logdev
-      @logdev = LogDevice.new(logdev, :shift_age => shift_age,
-        :shift_size => shift_size)
+      @logdev = LogDevice.new(logdev, :shift_age => shift_age, :shift_size => shift_size)
     end
   end
 
+  # SYNOPSIS
+  #   Logger#add(severity, msg = nil, progname = nil) { ... } = nil
   #
-  # === 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.
+  # ARGS
+  #   severity	Severity.  Constants are defined in Logger namespace.
+  #		DEBUG, INFO, WARN, ERROR, FATAL, or UNKNOWN.
+  #   msg	Message.  A string, exception, or something. Can be omitted.
+  #   progname	Program name string.  Can be omitted.
+  #   		Logged as a msg if no msg and block are given.
+  #   block     Can be omitted.
+  #             Called to get a message string if msg is nil.
   #
-  # === Return
+  # RETURN
+  #   true if succeed, false if failed.
+  #   When the given severity is not enough severe,
+  #   Log no message, and returns true.
   #
-  # +true+ if successful, +false+ otherwise.
+  # DESCRIPTION
+  #   Log a log if the given severity is enough severe.
   #
-  # When the given severity is not high enough (for this particular logger), log
-  # no message, and return +true+.
+  # 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.
   #
-  # === 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)
+  def add(severity, msg = nil, progname = nil, &block)
     severity ||= UNKNOWN
     if @logdev.nil? or severity < @level
       return true
     end
     progname ||= @progname
-    if message.nil?
+    if msg.nil?
       if block_given?
-	message = yield
+	msg = yield
       else
-	message = progname
+	msg = progname
 	progname = @progname
       end
     end
     @logdev.write(
-      format_message(format_severity(severity), Time.now, progname, message))
+      format_message(
+	format_severity(severity),
+	format_datetime(Time.now),
+	msg2str(msg),
+	progname
+      )
+    )
     true
   end
   alias log add
 
+  # SYNOPSIS
+  #   Logger#<<(msg)
+  #
+  # ARGS
+  #   msg	Message.
   #
-  # Dump given message to the log device without any formatting.  If no log
-  # device exists, return +nil+.
+  # RETURN
+  #   Same as IO#<<.  If logdev is not given, returns nil.
+  #
+  # DESCRIPTION
+  #   Dump given message to log device without any formatting.
   #
   def <<(msg)
     unless @logdev.nil?
@@ -339,80 +203,55 @@ class Logger
     end
   end
 
+  # SYNOPSIS
+  #   Logger#debug(progname = nil) { ... } = nil
+  #   Logger#info(progname = nil) { ... } = nil
+  #   Logger#warn(progname = nil) { ... } = nil
+  #   Logger#error(progname = nil) { ... } = nil
+  #   Logger#fatal(progname = nil) { ... } = nil
+  #   Logger#unknown(progname = nil) { ... } = nil
+  #
+  # ARGS
+  #   progname	Program name string.  Can be omitted.
+  #   		Logged as a msg if no block are given.
+  #   block     Can be omitted.
+  #             Called to get a message string if msg is nil.
   #
-  # Log a +DEBUG+ message.
+  # RETURN
+  #   See Logger#add .
   #
-  # See #info for more information.
+  # DESCRIPTION
+  #   Log a log.
   #
   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
 
+  # SYNOPSIS
+  #   Logger#close
   #
-  # Close the logging device.
+  # DESCRIPTION
+  #   Close the logging device.
   #
   def close
     @logdev.close if @logdev
@@ -421,94 +260,113 @@ class Logger
 private
 
   # Severity label for logging. (max 5 char)
-  SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY)
+  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)]
+  def format_datetime(datetime)
+    if @datetime_format.nil?
+      datetime.strftime("%Y-%m-%dT%H:%M:%S.") << "%6d " % datetime.usec
+    else
+      datetime.strftime(@datetime_format)
     end
+  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
+  Format = "%s, [%s#%d] %5s -- %s: %s\n"
+  def format_message(severity, timestamp, msg, progname)
+    Format % [severity[0..0], timestamp, $$, severity, progname, msg]
+  end
 
-    def msg2str(msg)
-      case msg
-      when ::String
-        msg
-      when ::Exception
-        "#{ msg.message } (#{ msg.class })\n" <<
-          (msg.backtrace || []).join("\n")
-      else
-        msg.inspect
-      end
+  def msg2str(msg)
+    if msg.is_a?(::String)
+      msg
+    elsif msg.is_a?(::Exception)
+      "#{ msg.message } (#{ msg.class })\n" << (msg.backtrace || []).join("\n")
+    elsif msg.respond_to?(:to_str)
+      msg.to_str
+    else
+      msg.inspect
     end
   end
 
 
+  # LogDevice -- Logging device.
   class LogDevice
     attr_reader :dev
     attr_reader :filename
 
-    class LogDeviceMutex
-      include MonitorMixin
-    end
-
+    # SYNOPSIS
+    #   Logger::LogDev.new(name, opt = {})
+    #
+    # ARGS
+    #   log	String as filename of logging.
+    #		  or
+    #		IO as logging device(i.e. STDERR).
+    #	opt	Hash of options.
+    #
+    # DESCRIPTION
+    #   Log device class.  Output and shifting of log.
+    #	When a String was given, LogDevice opens the file and set sync = true.
+    #
+    # OPTIONS
+    #   :shift_age
+    #     An Integer	Num of files you want to keep aged logs.
+    #	  'daily'	Daily shifting.
+    #	  'weekly'	Weekly shifting (Shift every monday.)
+    #	  'monthly'	Monthly shifting (Shift every 1th day.)
+    #
+    #   :shift_size	Shift size threshold when :shift_age is an integer.
+    #			Otherwise (like 'daily'), it is ignored.
+    #
     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
+      elsif log.is_a?(String)
 	@dev = open_logfile(log)
 	@dev.sync = true
 	@filename = log
 	@shift_age = opt[:shift_age] || 7
 	@shift_size = opt[:shift_size] || 1048576
+      else
+	raise ArgumentError.new("Wrong argument: #{ log } for log.")
       end
     end
 
+    # SYNOPSIS
+    #   Logger::LogDev#write(message)
+    #
+    # ARGS
+    #   message		Message to be logged.
+    #
+    # DESCRIPTION
+    #   Log a message.  If needed, the log device is aged and the new device
+    #  	is prepared.  Log device 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 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)
+      if shift_log?
+       	begin
+  	  shift_log
+   	rescue
+  	  raise Logger::ShiftingError.new("Shifting failed. #{$!}")
+   	end
       end
+
+      @dev.write(message) 
     end
 
+    # SYNOPSIS
+    #   Logger::LogDev#close
+    #
+    # DESCRIPTION
+    #   Close the logging device.
+    #
     def close
-      @mutex.synchronize do
-        @dev.close
-      end
+      @dev.close
     end
 
   private
@@ -523,7 +381,6 @@ private
 
     def create_logfile(filename)
       logdev = open(filename, (File::WRONLY | File::APPEND | File::CREAT))
-      logdev.sync = true
       add_log_header(logdev)
       logdev
     end
@@ -536,76 +393,81 @@ private
 
     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
+    def shift_log?
+      if !@shift_age or !@dev.respond_to?(:stat)
+     	return false
+      end
+      if (@shift_age.is_a?(Integer))
+	# Note: always returns false if '0'.
+	return (@filename && (@shift_age > 0) && (@dev.stat.size > @shift_size))
       else
-        now = Time.now
-        if @dev.stat.mtime <= previous_period_end(now)
-          shift_log_period(now)
-        end
+	now = Time.now
+	limit_time = 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
+	return (@dev.stat.mtime <= limit_time)
       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
+    def shift_log
+      # At first, close the device if opened.
+      if @dev
+      	@dev.close
+       	@dev = nil
       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.")
+      if (@shift_age.is_a?(Integer))
+	(@shift_age-3).downto(0) do |i|
+	  if (FileTest.exist?("#{@filename}.#{i}"))
+	    File.rename("#{@filename}.#{i}", "#{@filename}.#{i+1}")
+	  end
+	end
+	File.rename("#{@filename}", "#{@filename}.0")
+      else
+	now = Time.now
+	postfix_time = 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
+	postfix = postfix_time.strftime("%Y%m%d")	# YYYYMMDD
+	age_file = "#{@filename}.#{postfix}"
+	if (FileTest.exist?(age_file))
+	  raise RuntimeError.new("'#{ age_file }' already exists.")
+	end
+	File.rename("#{@filename}", age_file)
       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.
   #
-  # == 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
+  # 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. Instanciate it and invoke 'start'.
   #
+  # EXAMPLE
   #   class FooApp < Application
   #     def initialize(foo_app, application_specific, arguments)
   #       super('FooApp') # Name of the application.
@@ -628,19 +490,14 @@ private
     attr_reader :appname
     attr_reader :logdev
 
-    #
-    # == Synopsis
-    #
+    # SYNOPSIS
     #   Application.new(appname = '')
     #
-    # == Args
+    # ARGS
+    #   appname	Name String of the application.
     #
-    # +appname+:: Name of the application.
-    #
-    # == Description
-    #
-    # Create an instance.  Log device is +STDERR+ by default.  This can be
-    # changed with #set_log.
+    # DESCRIPTION
+    #   Create an instance.  Log device is STDERR by default.
     #
     def initialize(appname = nil)
       @appname = appname
@@ -649,8 +506,14 @@ private
       @level = @log.level
     end
 
+    # SYNOPSIS
+    #   Application#start
+    #
+    # DESCRIPTION
+    #   Start the application.
     #
-    # Start the application.  Return the status code.
+    # RETURN
+    #   Status code.
     #
     def start
       status = -1
@@ -665,11 +528,16 @@ private
       status
     end
 
+    # SYNOPSIS
+    #   Application#set_log(log, shift_age, shift_size)
     #
-    # Sets the log device for this application.  See the class Logger for an
-    # explanation of the arguments.
+    # ARGS
+    #   (Args are explained in the class Logger)
     #
-    def set_log(logdev, shift_age = 0, shift_size = 1024000)
+    # DESCRIPTION
+    #   Set the log device for this application.
+    #
+    def set_log(logdev, shift_age = 0, shift_size = 102400)
       @log = Logger.new(logdev, shift_age, shift_size)
       @log.progname = @appname
       @log.level = @level
@@ -679,16 +547,40 @@ private
       set_log(logdev)
     end
 
+
+    # SYNOPSIS
+    #   Application#level=(severity)
     #
-    # Set the logging threshold, just like <tt>Logger#level=</tt>.
+    # ARGS
+    #   level	Severity threshold.
+    #
+    # DESCRIPTION
+    #   Set severity threshold.
     #
     def level=(level)
       @level = level
       @log.level = @level
     end
 
+  protected
+
+    # SYNOPSIS
+    #   Application#log(severity, comment = nil) { ... }
+    #
+    # ARGS
+    #   severity	Severity. See above to give this.
+    #   comment		Message String.
+    #   block     	Can be omitted.  Called to get a message String if
+    #			comment is nil or omitted.
+    #
+    # DESCRIPTION
+    #   Log a log if the given severity is enough severe.
+    #   For more detail, see Log.add.
     #
-    # See Logger#add.  This application's +appname+ is used.
+    # RETURN
+    #   true if succeed, false if failed.
+    #   When the given severity is not enough severe,
+    #   Log no message, and returns true.
     #
     def log(severity, message = nil, &block)
       @log.add(severity, message, @appname, &block) if @log
diff --git a/lib/mailread.rb b/lib/mailread.rb
index 08b33c92a4..7573d03ed4 100644
--- a/lib/mailread.rb
+++ b/lib/mailread.rb
@@ -1,14 +1,5 @@
-# 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")
@@ -43,19 +34,14 @@ class Mail
     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
diff --git a/lib/mathn.rb b/lib/mathn.rb
index a5a121c6c6..2257a4074a 100644
--- a/lib/mathn.rb
+++ b/lib/mathn.rb
@@ -43,7 +43,6 @@ class Integer
   end
   
   def prime_division
-    raise ZeroDivisionError if self == 0
     ps = Prime.new
     value = self
     pv = []
@@ -125,7 +124,6 @@ class Rational
 
   def ** (other)
     if other.kind_of?(Rational)
-      other2 = other
       if self < 0
 	return Complex.new!(self, 0) ** other
       elsif other == 0
@@ -146,7 +144,7 @@ class Rational
       for elm in npd
 	elm[1] = elm[1] * other
 	if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
-         return Float(self) ** other2
+	  return Float(self) ** other
 	end
 	elm[1] = elm[1].to_i
       end
@@ -154,7 +152,7 @@ class Rational
       for elm in dpd
 	elm[1] = elm[1] * other
 	if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
-         return Float(self) ** other2
+	  return Float(self) ** other
 	end
 	elm[1] = elm[1].to_i
       end
diff --git a/lib/matrix.rb b/lib/matrix.rb
index 470db19b05..8e56fcbd97 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -1,28 +1,170 @@
 #!/usr/local/bin/ruby
-#--
+#
 #   matrix.rb - 
-#       $Release Version: 1.0$
-#       $Revision: 1.11 $
-#       $Date: 1999/10/06 11:01:53 $
+#   	$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
-#++
+#	   on July 23, 1985 at 8:37:17 am
+#   	by Keiju ISHITSUKA
 #
-# = matrix.rb
+# --
 #
-# An implementation of Matrix and Vector classes.
+#   Matrix[[1,2,3],
+#	      :
+#	   [3,4,5]]
+#   Matrix[row0,
+#          row1,
+#	    :
+#          rown]
 #
-# Author:: Keiju ISHITSUKA
-# Documentation:: Gavin Sinclair (sourced from <i>Ruby in a Nutshell</i> (Matsumoto, O'Reilly)) 
 #
-# See classes Matrix and Vector for documentation. 
+# module ExceptionForMatrix::
+#   Exceptions:
+#	ErrDimensionMismatch
+#	    number of column/row do not match
+#	ErrNotRegular
+#	    not a regular matrix
+#	ErrOperationNotDefined
+#	    specified operator is not defined (yet)
 #
-
+# class Matrix
+#   include ExceptionForMatrix
+#
+#   Methods:
+#   class methods:
+#	Matrix.[](*rows)
+#	    creates a matrix where `rows' indicates rows. 
+#	    `rows' is an array of arrays, 
+#	    e.g, Matrix[[11, 12], [21, 22]]
+#	Matrix.rows(rows, copy = true)
+#	    creates a matrix where `rows' indicates rows. 
+#           if optional argument `copy' is false, use the array as
+#	    internal structure of the metrix without copying.
+#	Matrix.columns(columns)
+#           creates a new matrix using `columns` as set of colums vectors.
+#	Matrix.diagonal(*values)
+#	    creates a matrix where `columns' indicates columns. 
+#	Matrix.scalar(n, value)
+#	    creates a diagonal matrix such that the diagal compornents is
+#	    given by `values'.
+#	Matrix.scalar(n, value)
+#	    creates an n-by-n scalar matrix such that the diagal compornent is 
+#	    given by `value'.
+#	Matrix.identity(n)
+#	Matrix.unit(n)
+#	Matrix.I(n)
+#	    creates an n-by-n unit matrix.
+#	Matrix.zero(n)
+#	    creates an n-by-n zero matrix.
+#	Matrix.row_vector(row)
+#	    creates a 1-by-n matrix such the row vector is `row'. 
+#	    `row' is specifed as a Vector or an Array.
+#	Matrix.column_vector(column)
+#	    creates a 1-by-n matrix such that column vector is `column'. 
+#	    `column' is specifed as a Vector or an Array.
+#   accessing:
+#	[](i, j)
+#	    returns (i,j) compornent
+#	row_size
+#	    returns the number of rows
+#	column_size
+#	    returns the number of columns
+#	row(i)
+#	    returns the i-th row vector. 
+#	    when the block is supplied for the method, the block is iterated
+#	    over all row vectors. 
+#	column(j)
+#	    returns the jth column vector. 
+#	    when the block is supplied for the method, the block is iterated
+#	    over all column vectors. 
+#	collect
+#	map
+#	    creates a matrix which is the result of iteration of given
+#	    block over all compornents. 
+#	minor(*param)
+#	    returns sub matrix. parameter is specified as the following:
+#	    1. from_row, row_size, from_col, size_col
+#	    2. from_row..to_row, from_col..to_col
+#   TESTING:
+#	regular?
+#	    Is regular?
+#	singular?
+#	    Is singular? i.e. Is non-regular?
+#	square?
+#	    Is square?
+#   ARITHMETIC:
+#	*(m)
+#	    times
+#	+(m)
+#	    plus
+#	-(m)
+#	    minus
+#	/(m)
+#	    self * m.inv
+#	inverse
+#	inv
+#	    inverse
+#	**
+#	    power
+#   Matrix functions:
+#	determinant
+#	det
+#	    returns the determinant
+#	rank
+#	    returns the rank
+#	trace
+#	tr
+#	    returns the trace
+#	transpose
+#	t
+#	    returns the transposed
+#   CONVERTING:
+#	coerce(other)
+#	row_vectors
+#	    array of row vectors
+#	column_vectors
+#	    array of column vectors
+#	to_a
+#	    converts to Array of Arrays
+#   PRINTING:
+#	to_s
+#	    returns string representation
+#	inspect
+#
+# class Vector
+#   include ExceptionForMatrix
+#
+#   INSTANCE CREATION:
+#	Vector.[](*array)
+#	Vector.elements(array, copy = true)
+#   ACCSESSING:
+#	[](i)
+#	size
+#   ENUMRATIONS:
+#	each2(v)
+#	collect2(v)
+#   ARITHMETIC:
+#	*(x) "is matrix or number"
+#	+(v)
+#	-(v)
+#   VECTOR FUNCTIONS:
+#	inner_product(v)
+#	collect
+#	map
+#	map2(v)
+#	r
+#   CONVERTING:
+#	covector
+#	to_a
+#	coerce(other)
+#   PRINTING:
+#	to_s
+#	inspect
 
 require "e2mmap.rb"
 
-module ExceptionForMatrix # :nodoc:
+module ExceptionForMatrix
   extend Exception2MessageMapper
   def_e2message(TypeError, "wrong argument type %s (expected %s)")
   def_e2message(ArgumentError, "Wrong # of arguments(%d for %d)")
@@ -33,77 +175,18 @@ module ExceptionForMatrix # :nodoc:
 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).
+# 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).
+#
+# The capabilities of the class indicated in the above paragraph are probably
+# not exhaustive.  Browse the methods and their documentation for more
+# information.
 #
 # 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 $-'
   
@@ -145,8 +228,8 @@ class Matrix
     rows = (0 .. columns[0].size - 1).collect {
       |i|
       (0 .. columns.size - 1).collect {
-        |j|
-        columns[j][i]
+	|j|
+	columns[j][i]
       }
     }
     Matrix.rows(rows, false)
@@ -290,7 +373,7 @@ class Matrix
   def row(i) # :yield: e
     if block_given?
       for e in @rows[i]
-        yield e
+	yield e
       end
     else
       Vector.elements(@rows[i])
@@ -305,13 +388,13 @@ class Matrix
   def column(j) # :yield: e
     if block_given?
       0.upto(row_size - 1) do
-        |i|
-        yield @rows[i][j]
+	|i|
+	yield @rows[i][j]
       end
     else
       col = (0 .. row_size - 1).collect {
-        |i|
-        @rows[i][j]
+	|i|
+	@rows[i][j]
       }
       Vector.elements(col, false)
     end
@@ -432,7 +515,7 @@ class Matrix
     value = 0
     for row in @rows
       for e in row
-        value ^= e.hash
+	value ^= e.hash
       end
     end
     return value
@@ -452,11 +535,11 @@ class Matrix
     case(m)
     when Numeric
       rows = @rows.collect {
-        |row|
-        row.collect {
-          |e|
-          e * m
-        }
+	|row|
+	row.collect {
+	  |e|
+	  e * m
+	}
       }
       return Matrix.rows(rows, false)
     when Vector
@@ -467,16 +550,16 @@ class 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
-        }
+	|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
@@ -508,8 +591,8 @@ class Matrix
     rows = (0 .. row_size - 1).collect {
       |i|
       (0 .. column_size - 1).collect {
-        |j|
-        self[i, j] + m[i, j]
+	|j|
+	self[i, j] + m[i, j]
       }
     }
     Matrix.rows(rows, false)
@@ -538,8 +621,8 @@ class Matrix
     rows = (0 .. row_size - 1).collect {
       |i|
       (0 .. column_size - 1).collect {
-        |j|
-        self[i, j] - m[i, j]
+	|j|
+	self[i, j] - m[i, j]
       }
     }
     Matrix.rows(rows, false)
@@ -555,11 +638,11 @@ class Matrix
     case other
     when Numeric
       rows = @rows.collect {
-        |row|
-        row.collect {
-          |e|
-          e / other
-        }
+	|row|
+	row.collect {
+	  |e|
+	  e / other
+	}
       }
       return Matrix.rows(rows, false)
     when Matrix
@@ -590,44 +673,38 @@ class Matrix
     a = src.to_a
     
     for k in 0..size
-      i = k
-      akk = a[k][k].abs
-      for j in (k+1)..size
-        v = a[j][k].abs
-        if v > akk
-          i = j
-          akk = v
-        end
-      end
-      Matrix.Raise ErrNotRegular if akk == 0
-      if i != k
-        a[i], a[k] = a[k], a[i]
-        @rows[i], @rows[k] = @rows[k], @rows[i]
+      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
-      akk = a[k][k]
       
       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
+	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
+	|j|
+	a[k][j] /= akk
       end
       0.upto(size) do
-        |j|
-        @rows[k][j] /= akk
+	|j|
+	@rows[k][j] /= akk
       end
     end
     self
@@ -645,20 +722,20 @@ class Matrix
     if other.kind_of?(Integer)
       x = self
       if other <= 0
-        x = self.inverse
-        return Matrix.identity(self.column_size) if other == 0
-        other = -other
+	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
+	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)
@@ -688,28 +765,28 @@ class Matrix
     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
+	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
+	|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
@@ -731,44 +808,44 @@ class Matrix
     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
+	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
+	|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
@@ -884,113 +961,78 @@ class Matrix
     def +(other)
       case other
       when Numeric
-        Scalar.new(@value + other)
+	Scalar.new(@value + other)
       when Vector, Matrix
-        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
+	Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
       when Scalar
-        Scalar.new(@value + other.value)
+	Scalar.new(@value + other.value)
       else
-        x, y = other.coerce(self)
-        x + y
+	x, y = other.coerce(self)
+	x + y
       end
     end
     
     def -(other)
       case other
       when Numeric
-        Scalar.new(@value - other)
+	Scalar.new(@value - other)
       when Vector, Matrix
-        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
+	Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
       when Scalar
-        Scalar.new(@value - other.value)
+	Scalar.new(@value - other.value)
       else
-        x, y = other.coerce(self)
-        x - y
+	x, y = other.coerce(self)
+	x - y
       end
     end
     
     def *(other)
       case other
       when Numeric
-        Scalar.new(@value * other)
+	Scalar.new(@value * other)
       when Vector, Matrix
-        other.collect{|e| @value * e}
+	other.collect{|e| @value * e}
       else
-        x, y = other.coerce(self)
-        x * y
+	x, y = other.coerce(self)
+	x * y
       end
     end
     
     def / (other)
       case other
       when Numeric
-        Scalar.new(@value / other)
+	Scalar.new(@value / other)
       when Vector
-        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
+	Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
       when Matrix
-        self * _M.inverse
+	self * _M.inverse
       else
-        x, y = other.coerce(self)
-        x / y
+	x, y = other.coerce(self)
+	x / y
       end
     end
     
     def ** (other)
       case other
       when Numeric
-        Scalar.new(@value ** other)
+	Scalar.new(@value ** other)
       when Vector
-        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
+	Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
       when Matrix
-        other.powered_by(self)
+	other.powered_by(self)
       else
-        x, y = other.coerce(self)
-        x ** y
+	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
   
@@ -1032,8 +1074,8 @@ class Vector
     end
   end
   
-  # ACCESSING
-         
+  # ACCSESSING
+	 
   #
   # Returns element number +i+ (starting at zero) of the vector.
   #
@@ -1049,7 +1091,7 @@ class Vector
   end
   
   #--
-  # ENUMERATIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  # ENUMRATIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
 
   #
@@ -1138,8 +1180,8 @@ class Vector
     when Vector
       Vector.Raise ErrDimensionMismatch if size != v.size
       els = collect2(v) {
-        |v1, v2|
-        v1 + v2
+	|v1, v2|
+	v1 + v2
       }
       Vector.elements(els, false)
     when Matrix
@@ -1158,8 +1200,8 @@ class Vector
     when Vector
       Vector.Raise ErrDimensionMismatch if size != v.size
       els = collect2(v) {
-        |v1, v2|
-        v1 - v2
+	|v1, v2|
+	v1 - v2
       }
       Vector.elements(els, false)
     when Matrix
@@ -1276,3 +1318,5 @@ end
 
 # Documentation comments:
 #  - Matrix#coerce and Vector#coerce need to be documented
+#  - Matrix class methods (aliases) unit and I don't appear in RDoc output
+#    becuase of "class << Matrix".  This is an RDoc issue.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index a532b5c0a8..359a7418b1 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -8,13 +8,8 @@ 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
+SRC_EXT = ["c", "cc", "m", "cxx", "cpp", "C"]
 $static = $config_h = nil
-$default_static = $static
 
 unless defined? $configure_args
   $configure_args = {}
@@ -25,7 +20,6 @@ unless defined? $configure_args
   for arg in Shellwords::shellwords(args)
     arg, val = arg.split('=', 2)
     next unless arg
-    arg.tr!('_', '-')
     if arg.sub!(/^(?!--)/, '--')
       val or next
       arg.downcase!
@@ -36,7 +30,6 @@ unless defined? $configure_args
   for arg in ARGV
     arg, val = arg.split('=', 2)
     next unless arg
-    arg.tr!('_', '-')
     if arg.sub!(/^(?!--)/, '--')
       val or next
       arg.downcase!
@@ -45,16 +38,15 @@ unless defined? $configure_args
   end
 end
 
+$srcdir = CONFIG["srcdir"]
 $libdir = CONFIG["libdir"]
 $rubylibdir = CONFIG["rubylibdir"]
 $archdir = CONFIG["archdir"]
 $sitedir = CONFIG["sitedir"]
 $sitelibdir = CONFIG["sitelibdir"]
 $sitearchdir = CONFIG["sitearchdir"]
-$vendordir = CONFIG["vendordir"]
-$vendorlibdir = CONFIG["vendorlibdir"]
-$vendorarchdir = CONFIG["vendorarchdir"]
 
+$extmk = /extmk\.rb/ =~ $0
 $mswin = /mswin/ =~ RUBY_PLATFORM
 $bccwin = /bccwin/ =~ RUBY_PLATFORM
 $mingw = /mingw/ =~ RUBY_PLATFORM
@@ -62,84 +54,38 @@ $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/)
-
-# :stopdoc:
 
 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\}))?')
+  Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$\(target_prefix\)|\{target_prefix\})?')
 end
 
 INSTALL_DIRS = [
   [dir_re('commondir'), "$(RUBYCOMMONDIR)"],
-  [dir_re('sitedir'), "$(RUBYCOMMONDIR)"],
-  [dir_re('vendordir'), "$(RUBYCOMMONDIR)"],
+  [dir_re("sitedir"), "$(RUBYCOMMONDIR)"],
   [dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
   [dir_re('archdir'), "$(RUBYARCHDIR)"],
   [dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
-  [dir_re('vendorlibdir'), "$(RUBYLIBDIR)"],
-  [dir_re('sitearchdir'), "$(RUBYARCHDIR)"],
-  [dir_re('bindir'), "$(BINDIR)"],
-  [dir_re('vendorarchdir'), "$(RUBYARCHDIR)"],
+  [dir_re('sitearchdir'), "$(RUBYARCHDIR)"]
 ]
 
-def install_dirs(target_prefix = nil)
-  if $extout
-    dirs = [
-      ['BINDIR',        '$(extout)/bin'],
-      ['RUBYCOMMONDIR', '$(extout)/common'],
-      ['RUBYLIBDIR',    '$(RUBYCOMMONDIR)$(target_prefix)'],
-      ['RUBYARCHDIR',   '$(extout)/$(arch)$(target_prefix)'],
-      ['extout',        "#$extout"],
-      ['extout_prefix', "#$extout_prefix"],
-    ]
-  elsif $extmk
-    dirs = [
-      ['BINDIR',        '$(bindir)'],
-      ['RUBYCOMMONDIR', '$(rubylibdir)'],
-      ['RUBYLIBDIR',    '$(rubylibdir)$(target_prefix)'],
-      ['RUBYARCHDIR',   '$(archdir)$(target_prefix)'],
-    ]
-  elsif $configure_args.has_key?('--vendor')
-    dirs = [
-      ['BINDIR',        '$(bindir)'],
-      ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
-      ['RUBYLIBDIR',    '$(vendorlibdir)$(target_prefix)'],
-      ['RUBYARCHDIR',   '$(vendorarchdir)$(target_prefix)'],
-    ]
-  else
-    dirs = [
-      ['BINDIR',        '$(bindir)'],
-      ['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?(($hdrdir = Config::CONFIG["archdir"]) + "/ruby.h")
-  $topdir = $hdrdir
-elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir))  + "/ruby.h") and
-    File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h")
+if not $extmk and File.exist? Config::CONFIG["archdir"] + "/ruby.h"
+  $hdrdir = $archdir
+elsif File.exist? $srcdir + "/ruby.h"
+  $hdrdir = $srcdir
 else
-  abort "mkmf.rb can't find header files for ruby at #{$hdrdir}/ruby.h"
+  warn "can't find header files for ruby."
+  exit 1
 end
+$topdir = $hdrdir
 
 OUTFLAG = CONFIG['OUTFLAG']
 CPPOUTFILE = CONFIG['CPPOUTFILE']
@@ -147,18 +93,11 @@ CPPOUTFILE = CONFIG['CPPOUTFILE']
 CONFTEST_C = "conftest.c"
 
 class String
-  # Wraps a string in escaped quotes if it contains whitespace.
   def quote
-    /\s/ =~ self ? "\"#{self}\"" : "#{self}"
-  end
-
-  # Generates a string used as cpp macro name.
-  def tr_cpp
-    strip.upcase.tr_s("^A-Z0-9_", "_")
+    /\s/ =~ self ? "\"#{self}\"" : self
   end
 end
 class Array
-  # Wraps all strings in escaped quotes if they contain whitespace.
   def quote
     map {|s| s.quote}
   end
@@ -168,43 +107,17 @@ def rm_f(*files)
   FileUtils.rm_f(Dir[files.join("\0")])
 end
 
-# Returns time stamp of the +target+ file if it exists and is newer
-# than or equal to all of +times+.
 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
-
-# This is a custom logging module. It generates an mkmf.log file when you
-# run your extconf.rb script. This can be useful for debugging unexpected
-# failures.
-#
-# This module and its associated methods are meant for internal use only.
-#
 module Logging
   @log = nil
   @logfile = 'mkmf.log'
   @orgerr = $stderr.dup
   @orgout = $stdout.dup
-  @postpone = 0
-  @quiet = $extmk
 
   def self::open
     @log ||= File::open(@logfile, 'w')
@@ -233,7 +146,7 @@ module Logging
   end
   
   def self::postpone
-    tmplog = "mkmftmp#{@postpone += 1}.log"
+    tmplog = "mkmftmp.log"
     open do
       log, *save = @log, @logfile, @orgout, @orgerr
       @log, @logfile, @orgout, @orgerr = nil, tmplog, log, log
@@ -243,24 +156,14 @@ module Logging
         File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
       ensure
         @log, @logfile, @orgout, @orgerr = log, *save
-        @postpone -= 1
         rm_f tmplog
       end
     end
   end
-
-  class << self
-    attr_accessor :quiet
-  end
 end
 
 def xsystem command
-  varpat = /\$\((\w+)\)|\$\{(\w+)\}/
-  if varpat =~ command
-    vars = Hash.new {|h, k| h[k] = ''; ENV[k]}
-    command = command.dup
-    nil while command.gsub!(varpat) {vars[$1||$2]}
-  end
+  Config.expand(command)
   Logging::open do
     puts command.quote
     system(command)
@@ -268,6 +171,7 @@ def xsystem command
 end
 
 def xpopen command, *mode, &block
+  Config.expand(command)
   Logging::open do
     case mode[0]
     when nil, /^r/
@@ -280,23 +184,18 @@ def xpopen command, *mode, &block
 end
 
 def log_src(src)
-  src = src.split(/^/)
-  fmt = "%#{src.size.to_s.size}d: %s"
-  Logging::message <<"EOM"
+  Logging::message <<"EOM", src
 checked program was:
 /* begin */
-EOM
-  src.each_with_index {|line, no| Logging::message fmt, no+1, line}
-  Logging::message <<"EOM"
-/* end */
+%s/* 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|
+  src = src.sub(/[^\n]\z/, "\\&\n")
+  open(CONFTEST_C, "w") do |cfile|
     cfile.print src
   end
   src
@@ -309,40 +208,34 @@ 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)
+def link_command(ldflags, opt="", libpath=$LIBPATH)
+  Config::expand(TRY_LINK.dup,
+		 'hdrdir' => $hdrdir,
+		 'src' => CONFTEST_C,
+		 'INCFLAGS' => $INCFLAGS,
+		 'CPPFLAGS' => $CPPFLAGS,
+		 'CFLAGS' => "#$CFLAGS",
+		 'ARCH_FLAG' => "#$ARCH_FLAG",
+		 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
+		 'DLDFLAGS' => "#$DLDFLAGS",
+		 'LIBPATH' => libpathflag(libpath),
+		 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
+		 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
 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)
+  "$(CC) -c #$INCFLAGS -I#{$hdrdir} " \
+  "#$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} #{CONFTEST_C}"
 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)
+  "$(CPP) #$INCFLAGS -I#{$hdrdir} " \
+  "#$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}"
 end
 
-def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
+def libpathflag(libpath=$LIBPATH)
   libpath.map{|x|
-    case x
-    when "$(topdir)", /\A\./
-      LIBPATHFLAG
-    else
-      LIBPATHFLAG+RPATHFLAG
-    end % x.quote
+    (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % %["#{x}"]
   }.join
 end
 
@@ -377,78 +270,54 @@ def cpp_include(header)
   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];
+int tmp[(#{expr}) ? 1 : -1];
 SRC
 end
 
 def try_constant(const, headers = nil, opt = "", &b)
-  includes = cpp_include(headers)
+  headers = cpp_include(headers)
   if CROSS_COMPILING
-    if try_static_assert("#{const} > 0", headers, opt)
-      # positive constant
-    elsif try_static_assert("#{const} < 0", headers, opt)
+    unless try_compile(<<"SRC", opt, &b)
+#{COMMON_HEADERS}
+#{headers}
+/*top*/
+int tmp = #{const};
+SRC
+      return nil
+    end
+    if 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)
+    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
+    until try_static_assert("#{const} == #{upper}", headers, opt)
+      if try_static_assert("#{const} > #{(upper+lower)/2}", headers, opt)
+        lower = (upper+lower)/2
       else
-        upper = mid
+        upper = (upper+lower)/2
       end
     end
     upper = -upper if neg
     return upper
   else
     src = %{#{COMMON_HEADERS}
-#{includes}
+#{headers}
 #include <stdio.h>
 /*top*/
-int conftest_const = (int)(#{const});
-int main() {printf("%d\\n", conftest_const); return 0;}
+int main() {printf("%d\\n", (int)(#{const})); return 0;}
 }
     if try_link0(src, opt, &b)
       xpopen("./conftest") do |f|
@@ -462,27 +331,16 @@ 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 = &(&#{var})[0]; return 0; }
+int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
 end
 
@@ -512,14 +370,12 @@ ensure
   log_src(src)
 end
 
-# This is used internally by the have_macro? method.
 def macro_defined?(macro, src, opt = "", &b)
   src = src.sub(/[^\n]\z/, "\\&\n")
-  try_compile(src + <<"SRC", opt, &b)
+  try_cpp(src + <<"SRC", opt, &b)
 /*top*/
 #ifndef #{macro}
 # error
->>>>>> #{macro} undefined <<<<<<
 #endif
 SRC
 end
@@ -536,15 +392,14 @@ end
 
 def install_files(mfile, ifiles, map = nil, srcprefix = nil)
   ifiles or return
-  ifiles.empty? and 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 /\A\.\// =~ files
+    prefix = %r|\A#{Regexp.quote(prefix)}/?| if prefix
+    if( files[0,2] == "./" )
       # install files which are in current working directory.
       files = files[2..-1]
       len = nil
@@ -556,10 +411,6 @@ def install_files(mfile, ifiles, map = nil, srcprefix = nil)
     f = nil
     Dir.glob(files) do |f|
       f[0..len] = "" if len
-      case File.basename(f)
-      when *$NONINSTALLFILES
-        next
-      end
       d = File.dirname(f)
       d.sub!(prefix, "") if prefix
       d = (d.empty? || d == ".") ? dir : File.join(dir, d)
@@ -580,30 +431,25 @@ def install_rb(mfile, dest, srcdir = nil)
   install_files(mfile, [["lib/**/*.rb", dest, "lib"]], nil, srcdir)
 end
 
-def append_library(libs, lib) # :no-doc:
+def append_library(libs, lib)
   format(LIBARG, lib) + " " + libs
 end
 
 def message(*s)
-  unless Logging.quiet and not $VERBOSE
+  unless $extmk and not $VERBOSE
     printf(*s)
     $stdout.flush
   end
 end
 
-# This emits a string to stdout that allows users to see the results of the
-# various have* and find* methods as they are tested.
-#
-# Internal use only.
-#
-def checking_for(m, fmt = nil)
+def checking_for(m)
   f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim
-  m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
+  m = "checking for #{m}... "
   message "%s", m
   a = r = nil
   Logging::postpone do
     r = yield
-    a = (fmt ? fmt % r : r ? "yes" : "no") << "\n"
+    a = r ? "yes\n" : "no\n"
     "#{f}#{m}-------------------- #{a}\n"
   end
   message(a)
@@ -611,53 +457,15 @@ def checking_for(m, fmt = nil)
   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
-
-# :startdoc:
-
-# 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+.
-#
-# The 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)
+def have_library(lib, func = nil, &b)
   func = "main" if !func or func.empty?
   lib = with_config(lib+'lib', lib)
-  checking_for checking_message("#{func}()", LIBARG%lib) do
+  checking_for "#{func}() in #{LIBARG%lib}" do
     if COMMON_LIBS.include?(lib)
       true
     else
       libs = append_library($libs, lib)
-      if try_func(func, libs, headers, &b)
+      if try_func(func, libs, &b)
         $libs = libs
         true
       else
@@ -667,17 +475,9 @@ def have_library(lib, func = nil, headers = nil, &b)
   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)
@@ -696,37 +496,10 @@ def find_library(lib, func, *paths, &b)
   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
+  checking_for "#{func}()" do
     if try_func(func, $libs, headers, &b)
-      $defs.push(format("-DHAVE_%s", func.tr_cpp))
-      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.tr_cpp))
+      $defs.push(format("-DHAVE_%s", func.upcase))
       true
     else
       false
@@ -734,13 +507,6 @@ def have_var(var, headers = nil, &b)
   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)
@@ -752,54 +518,16 @@ def have_header(header, &b)
   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)
-  message = checking_message(header, paths)
-  header = cpp_include(header)
-  checking_for message 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('struct 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
+def have_struct_member(type, member, header = nil, &b)
+  checking_for "#{type}.#{member}" do
     if try_compile(<<"SRC", &b)
 #{COMMON_HEADERS}
-#{cpp_include(headers)}
+#{cpp_include(header)}
 /*top*/
 int main() { return 0; }
 int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
 SRC
-      $defs.push(format("-DHAVE_ST_%s", member.tr_cpp))
+      $defs.push(format("-DHAVE_ST_%s", member.upcase))
       true
     else
       false
@@ -807,198 +535,44 @@ SRC
   end
 end
 
-def try_type(type, headers = nil, opt = "", &b)
-  if try_compile(<<"SRC", opt, &b)
+def have_type(type, header = nil, opt = "", &b)
+  checking_for type do
+    header = cpp_include(header)
+    if try_compile(<<"SRC", opt, &b) or try_compile(<<"SRC", opt, &b)
 #{COMMON_HEADERS}
-#{cpp_include(headers)}
+#{header}
 /*top*/
-typedef #{type} conftest_type;
-int conftestval[sizeof(conftest_type)?1:-1];
+static #{type} t;
 SRC
-    $defs.push(format("-DHAVE_TYPE_%s", type.tr_cpp))
-    true
-  else
-    false
-  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
-    try_type(type, headers, opt, &b)
-  end
-end
-
-# Returns where the static type +type+ is defined.
-#
-# You may also pass additional flags to +opt+ which are then passed along to
-# the compiler.
-#
-# See also +have_type+.
-#
-def find_type(type, opt, *headers, &b)
-  opt ||= ""
-  fmt = "not found"
-  def fmt.%(x)
-    x ? x.respond_to?(:join) ? x.join(",") : x : self
-  end
-  checking_for checking_message(type, nil, opt), fmt do
-    headers.find do |h|
-      try_type(type, h, opt, &b)
-    end
-  end
-end
-
-def try_const(const, headers = nil, opt = "", &b)
-  const, type = *const
-  if try_compile(<<"SRC", opt, &b)
 #{COMMON_HEADERS}
-#{cpp_include(headers)}
+#{header}
 /*top*/
-typedef #{type || 'int'} conftest_type;
-conftest_type conftestval = #{type ? '' : '(int)'}#{const};
+static #{type} *t;
 SRC
-    $defs.push(format("-DHAVE_CONST_%s", const.tr_cpp))
-    true
-  else
-    false
-  end
-end
-
-# Returns whether or not the constant +const+ is defined.  You may
-# optionally pass the +type+ of +const+ as <code>[const, type]</code>,
-# like as:
-#
-#   have_const(%w[PTHREAD_MUTEX_INITIALIZER pthread_mutex_t], "pthread.h")
-#
-# You may also pass additional +headers+ to check against in addition
-# to the common header files, and 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_CONST_'.
-#
-# For example, if have_const('foo') returned true, then the HAVE_CONST_FOO
-# preprocessor macro would be passed to the compiler.
-#
-def have_const(const, headers = nil, opt = "", &b)
-  checking_for checking_message([*const].compact.join(' '), headers, opt) do
-    try_const(const, headers, opt, &b)
-  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.tr_cpp, size))
-      size
+      $defs.push(format("-DHAVE_TYPE_%s", type.upcase))
+      true
+    else
+      false
     end
   end
 end
 
-# :stopdoc:
-
-# Used internally by the what_type? method to determine if +type+ is a scalar
-# pointer.
-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
-
-# Used internally by the what_type? method to determine if +type+ is a scalar
-# pointer.
-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
+def check_sizeof(type, header = nil, &b)
+  expr = "sizeof(#{type})"
+  m = "checking size of #{type}... "
+  message "%s", m
+  Logging::message "check_sizeof: %s--------------------\n", m
+  if size = try_constant(expr, header, &b)
+    $defs.push(format("-DSIZEOF_%s", type.upcase))
   end
+  message(a = size ? "#{size}\n" : "failed\n")
+  Logging::message "-------------------- %s\n", a
+  r
 end
 
-# This method is used internally by the find_executable method.
-#
-# Internal use only.
-#
 def find_executable0(bin, path = nil)
+  path = (path || ENV['PATH']).split(File::PATH_SEPARATOR)
   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))
@@ -1007,161 +581,63 @@ def find_executable0(bin, path = nil)
   nil
 end
 
-# :startdoc:
-
-# Searches for the executable +bin+ on +path+. The default path is your
-# PATH environment variable. If that isn't defined, it will resort to
-# searching /usr/local/bin, /usr/ucb, /usr/bin and /bin.
-#
-# If found, it will return the full path, including the executable name,
-# of where it was found.
-#
-# Note that this method does not actually affect the generated Makefile.
-#
 def find_executable(bin, path = nil)
-  checking_for checking_message(bin, path) do
+  checking_for bin do
     find_executable0(bin, path)
   end
 end
 
-# :stopdoc:
-
-def arg_config(config, *defaults, &block)
-  $arg_config << [config, *defaults]
-  defaults << nil if !block and defaults.empty?
-  $configure_args.fetch(config.tr('_', '-'), *defaults, &block)
+def arg_config(config, default=nil)
+  $configure_args.fetch(config, default)
 end
 
-# :startdoc:
-
-# Tests for the presence of a --with-<tt>config</tt> or --without-<tt>config</tt>
-# option. Returns true if the with option is given, false if the without
-# option is given, and the default value otherwise.
-#
-# This can be useful for adding custom definitions, such as debug information.
-#
-# Example:
-#
-#    if with_config("debug")
-#       $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
-#    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
+def with_config(config, default=nil)
+  unless /^--with-/ =~ config
+    config = '--with-' + config
   end
+  arg_config(config, default)
 end
 
-# Tests for the presence of an --enable-<tt>config</tt> or
-# --disable-<tt>config</tt> option. Returns true if the enable option is given,
-# false if the disable option is given, and the default value otherwise.
-#
-# This can be useful for adding custom definitions, such as debug information.
-#
-# Example:
-#
-#    if enable_config("debug")
-#       $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
-#    end
-#
-def enable_config(config, *defaults)
+def enable_config(config, default=nil)
   if arg_config("--enable-"+config)
     true
   elsif arg_config("--disable-"+config)
     false
-  elsif block_given?
-    yield(config, *defaults)
   else
-    return *defaults
+    default
   end
 end
 
-# Generates a header file consisting of the various macro definitions generated
-# by other methods such as have_func and have_header. These are then wrapped in
-# a custom #ifndef based on the +header+ file name, which defaults to
-# 'extconf.h'.
-#
-# For example:
-# 
-#    # extconf.rb
-#    require 'mkmf'
-#    have_func('realpath')
-#    have_header('sys/utime.h')
-#    create_header
-#    create_makefile('foo')
-#
-# The above script would generate the following extconf.h file:
-#
-#    #ifndef EXTCONF_H
-#    #define EXTCONF_H
-#    #define HAVE_REALPATH 1
-#    #define HAVE_SYS_UTIME_H 1
-#    #endif
-#
-# Given that the create_header method generates a file based on definitions
-# set earlier in your extconf.rb file, you will probably want to make this
-# one of the last methods you call in your script.
-#
 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)
+  if $defs.length > 0
+    sym = header.tr("a-z./\055", "A-Z___")
     open(header, "w") do |hfile|
-      hfile.write(hdr)
+      hfile.print "#ifndef #{sym}\n#define #{sym}\n"
+      for line in $defs
+	case line
+	when /^-D(.*)(?:=(.*))?/
+	  hfile.print "#define #$1 #{$2 || 1}\n"
+	when /^-U(.*)/
+	  hfile.print "#undef #$1\n"
+	end
+      end
+      hfile.print "#endif\n"
     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)
+    defaults = 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) : []
+#  idirs = idir ? idir.split(File::PATH_SEPARATOR) : []
+  idirs = idir.split(File::PATH_SEPARATOR) rescue []
   if defaults
     idirs.concat(defaults.collect {|dir| dir + "/include"})
     idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
@@ -1170,42 +646,31 @@ def dir_config(target, idefault=nil, ldefault=nil)
     idirs.collect! {|dir| "-I" + dir}
     idirs -= Shellwords.shellwords($CPPFLAGS)
     unless idirs.empty?
-      $CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
+      $CPPFLAGS = (idirs << $CPPFLAGS).join(" ")
     end
   end
 
-  ldirs = ldir ? Array === ldir ? ldir : ldir.split(File::PATH_SEPARATOR) : []
+  ldirs = 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
+  $LIBPATH |= ldirs
 
   [idir, ldir]
 end
 
-# :stopdoc:
-
-# Handles meta information about installed libraries. Uses your platform's
-# pkg-config program if it has one.
 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}
+  unless defined?($PKGCONFIG)
+    if pkgconfig = with_config("pkg-config", !CROSS_COMPILING && "pkg-config")
+      find_executable0(pkgconfig) or pkgconfig = nil
+    end
+    $PKGCONFIG = pkgconfig
   end
-  if get
-    cflags = get['cflags']
-    ldflags = get['libs']
-    libs = get['libs-only-l']
+  if $PKGCONFIG and system("#{$PKGCONFIG} --exists #{pkg}")
+    cflags = `#{$PKGCONFIG} --cflags #{pkg}`.chomp
+    ldflags = `#{$PKGCONFIG} --libs #{pkg}`.chomp
+    libs = `#{$PKGCONFIG} --libs-only-l #{pkg}`.chomp
     ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
     $CFLAGS += " " << cflags
     $LDFLAGS += " " << ldflags
@@ -1214,74 +679,42 @@ def pkg_config(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
+  /^\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
 end
 
-# Converts forward slashes to backslashes. Aimed at MS Windows.
-#
-# Internal use only.
-#
 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. ####
-#{
-if $extmk
-  "top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/")
-end
-}
-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'])}
+
+srcdir = #{srcdir}
+topdir = #{$topdir}
+hdrdir = #{$hdrdir}
+VPATH = #{$mingw && CONFIG['build_os'] == 'cygwin' ? '$(shell cygpath -u $(srcdir))' : '$(srcdir)'}
 }
-  if $extmk
-    mk << "RUBYLIB = -\nRUBYOPT = -rpurelib.rb\n"
-  end
-  if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
+  drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/
+  if destdir = CONFIG["prefix"].scan(drive)[0] and !destdir.empty?
     mk << "\nDESTDIR = #{destdir}\n"
   end
   CONFIG.each do |key, var|
     next unless /prefix$/ =~ key
-    mk << "#{key} = #{with_destdir(var)}\n"
+    mk << "#{key} = #{with_destdir(var.sub(drive, ''))}\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"
+    next unless /^(?:src|top|(.*))dir$/ =~ key and $1
+    mk << "#{key} = #{with_destdir(var.sub(drive, ''))}\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']}
@@ -1289,16 +722,10 @@ 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
-DEFS     = #{CONFIG['DEFS']}
-CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
+CFLAGS   = #{CONFIG['CCDLFLAGS'] unless $static} #$CFLAGS #$ARCH_FLAG
+CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) #{$defs.join(" ")} #{$CPPFLAGS}
 CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
-ldflags  = #{$LDFLAGS}
-dldflags = #{$DLDFLAGS}
-archflag = #{$ARCH_FLAG}
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG
 LDSHARED = #{CONFIG['LDSHARED']}
 AR = #{CONFIG['AR']}
 EXEEXT = #{CONFIG['EXEEXT']}
@@ -1308,18 +735,14 @@ 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'}
+RUBY = #{$ruby}
+RM = $(RUBY) -run -e rm -- -f
+MAKEDIRS = $(RUBY) -run -e mkdir -- -p
+INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755
+INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644
 
 #### End of system configuration section. ####
 
-preload = #{$preload ? $preload.join(' ') : ''}
 }
   if $nmake == ?b
     mk.each do |x|
@@ -1334,71 +757,12 @@ preload = #{$preload ? $preload.join(' ') : ''}
 end
 
 def dummy_makefile(srcdir)
-  configuration(srcdir) << <<RULES << CLEANINGS
-CLEANFILES = #{$cleanfiles.join(' ')}
-DISTCLEANFILES = #{$distcleanfiles.join(' ')}
-
-all install static install-so install-rb: Makefile
-
-RULES
+  configuration(srcdir) << "all install: Makefile\n" << CLEANINGS
 end
-# :startdoc:
-
-# 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'".
-#
-# The +srcprefix+ should be used when your source files are not in the same
-# directory as your build script. This will not only eliminate the need for
-# you to manually copy the source files into the same directory as your build
-# script, but it also sets the proper +target_prefix+ in the generated
-# Makefile.
-#
-# Setting the +target_prefix+ will, in turn, install the generated binary in
-# a directory under your Config::CONFIG['sitearchdir'] that mimics your local
-# filesystem when you run 'make install'.
-#
-# For example, given the following file tree:
-#
-#    ext/
-#       extconf.rb
-#       test/
-#          foo.c
-#
-# And given the following code:
-#
-#    create_makefile('test/foo', 'test')
-#
-# That will set the +target_prefix+ in the generated Makefile to 'test'. That,
-# in turn, will create the following file tree when installed via the
-# 'make install' command:
-#
-#    /path/to/ruby/sitearchdir/test/foo.so
-#
-# It is recommended that you use this approach to generate your makefiles,
-# instead of copying files around manually, because some third party
-# libraries may depend on the +target_prefix+ being set properly.
-#
-# The +srcprefix+ argument can be used to override the default source
-# directory, i.e. the current directory . It is included as part of the VPATH
-# and added to the list of INCFLAGS.
-#
+
 def create_makefile(target, srcprefix = nil)
   $target = target
-  libpath = $DEFLIBPATH|$LIBPATH
+  libpath = $LIBPATH
   message "creating Makefile\n"
   rm_f "conftest*"
   if CONFIG["DLEXT"] == $OBJEXT
@@ -1418,19 +782,15 @@ def create_makefile(target, srcprefix = nil)
   srcprefix ||= '$(srcdir)'
   Config::expand(srcdir = srcprefix.dup)
 
-  if not $objs
+  unless $objs then
     $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)
+    for f in Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
+      $objs.push(File.basename(f, ".*") << "." << $OBJEXT)
+    end
+  else
+    for i in $objs
+      i.sub!(/\.o\z/, ".#{$OBJEXT}")
     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(" ")
 
@@ -1451,122 +811,86 @@ def create_makefile(target, srcprefix = nil)
       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(" ")}
+  mfile.print configuration(srcdir)
+  mfile.print %{
 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" : ""}
-"
+STATIC_LIB = #{staticlib}
+}
+  if $extmk
+    mfile.print %{
+RUBYCOMMONDIR = $(rubylibdir)
+RUBYLIBDIR    = $(rubylibdir)$(target_prefix)
+RUBYARCHDIR   = $(archdir)$(target_prefix)
+}
+  else
+    mfile.print %{
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+}
+  end
+  mfile.print %{
+CLEANLIBS     = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB)
+CLEANOBJS     = "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}"
+
+all:		#{target ? "$(DLLIB)" : "Makefile"}
+static:		$(STATIC_LIB)
+}
   mfile.print CLEANINGS
   dirs = []
-  mfile.print "install: install-so install-rb\n\n"
-  sodir = (dir = "$(RUBYARCHDIR)").dup
-  mfile.print("install-so: ")
-  if target
+  if not $static and target
+    dirs << (dir = "$(RUBYARCHDIR)")
+    mfile.print("install: #{dir}\n")
     f = "$(DLLIB)"
     dest = "#{dir}/#{f}"
-    mfile.puts dir, "install-so: #{dest}"
-    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
-  else
-    mfile.puts "Makefile"
+    mfile.print "install: #{dest}\n"
+    mfile.print "#{dest}: #{f} #{dir}\n\t@$(INSTALL_PROG) #{f} #{dir}\n"
   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]]
+  for i in [[["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"
+	mfile.print("install: #{dir}\n")
       end
       files.each do |f|
 	dest = "#{dir}/#{File.basename(f)}"
-	mfile.print("install-rb#{sfx}: #{dest}\n")
-	mfile.print("#{dest}: #{f} #{dir}\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
+	mfile.print("install: #{dest}\n")
+	mfile.print("#{dest}: #{f} #{dir}\n\t@$(INSTALL_DATA) #{f} #{dir}\n")
       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
+  if dirs.empty?
+    mfile.print("install:\n")
+  else
+    dirs.each {|dir| mfile.print "#{dir}:\n\t@$(MAKEDIRS) #{dir}\n"}
+  end
 
-  SITEINSTALL
+  mfile.print "\nsite-install: install\n\n"
 
   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|
+  %w[cc cpp cxx C].each do |ext|
     COMPILE_RULES.each do |rule|
       mfile.printf(rule, ext, $OBJEXT)
       mfile.printf("\n\t%s\n\n", COMPILE_CXX)
@@ -1579,18 +903,18 @@ site-install-rb: install-rb
     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
+  if makedef
+    mfile.print "$(DLLIB): $(OBJS) $(DEFFILE)\n\t"
+  else
+    mfile.print "$(DLLIB): $(OBJS)\n\t"
+  end
+  mfile.print "@-$(RM) $@\n\t"
+  mfile.print "@-$(RM) $(TARGET).lib\n\t" if $mswin
+  mfile.print LINK_SO, "\n\n"
+  mfile.print "$(STATIC_LIB): $(OBJS)\n\t"
+  mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
+  if ranlib = config_string('RANLIB')
+    mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true"
   end
   mfile.print "\n\n"
   if makedef
@@ -1600,84 +924,28 @@ site-install-rb: install-rb
 
   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!(/\$\((?:hdr|top)dir\)\/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
+	line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if $nmake
+	line.gsub!(/\$\(hdrdir\)\/config.h/, $config_h) if $config_h
+	mfile.print line
       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
 
-# :stopdoc:
-
 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)"
+  $LDFLAGS = (with_config("ldflags") || "").dup
+  $INCFLAGS = "-I#{$topdir}"
   $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
   $LIBEXT = config['LIBEXT'].dup
   $OBJEXT = config["OBJEXT"].dup
@@ -1685,54 +953,24 @@ def init_mkmf(config = CONFIG)
   $LIBRUBYARG = ""
   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
-  $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
-  $DEFLIBPATH.unshift(".")
-  $LIBPATH = []
-  $INSTALLFILES = []
-  $NONINSTALLFILES = [/~\z/, /\A#.*#\z/, /\A\.#/, /\.bak\z/i, /\.orig\z/, /\.rej\z/, /\.l[ao]\z/, /\.o\z/]
+  $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"]
+  $LIBPATH.unshift("$(topdir)") if $extmk
+  $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
+  
+  $cleanfiles = []
+  $distcleanfiles = []
+  
   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
-
-# Returns whether or not the Makefile was successfully generated. If not,
-# the script will abort with an error message.
-#
-# Internal use only.
-#
-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
-
-# :startdoc:
-
 init_mkmf
 
 $make = with_config("make-prog", ENV["MAKE"] || "make")
@@ -1748,17 +986,10 @@ 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
+Config::CONFIG["topdir"] = CONFIG["topdir"] =
+  $curdir = arg_config("--curdir", Dir.pwd)
 $configure_args["--topdir"] ||= $curdir
-$ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"]))
+$ruby = arg_config("--ruby", CONFIG["ruby_install_name"])
 
 split = Shellwords.method(:shellwords).to_proc
 
@@ -1766,46 +997,41 @@ 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(" ")
+  Shellwords.shellwords(s).each do |s|
+    /(.*?)(?:=(.*))/ =~ s
+    hdr << "#define #$1 #$2"
   end
 end
 config_string('COMMON_HEADERS') do |s|
   Shellwords.shellwords(s).each {|s| hdr << "#include <#{s}>"}
 end
-COMMON_HEADERS = hdr.join("\n")
+COMMON_HEADERS = (hdr.join("\n") unless hdr.empty?)
 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 $<'
+COMPILE_C = config_string('COMPILE_C') || '$(CC) $(CFLAGS) $(CPPFLAGS) -c $<'
+COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<'
 TRY_LINK = config_string('TRY_LINK') ||
-  "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
-  "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
+  "$(CC) #{OUTFLAG}conftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) " \
+  "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(DLDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
 LINK_SO = config_string('LINK_SO') ||
   if CONFIG["DLEXT"] == $OBJEXT
-    "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n"
+    "ld $(DLDFLAGS) -r -o $(DLLIB) $(OBJS)\n"
   else
-    "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \
-    "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)"
+    "$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$(DLLIB) " \
+    "$(OBJS) $(LOCAL_LIBS) $(LIBS)"
   end
-LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
+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})
+		@$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
 distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
+		@$(RM) Makefile extconf.h conftest.* mkmf.log
+		@$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
 
 realclean:	distclean
 "
-
-if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0)
-  END {mkmf_failed($0)}
-end
diff --git a/lib/monitor.rb b/lib/monitor.rb
index 4c146c8086..5d5c623646 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -86,16 +86,12 @@ module MonitorMixin
   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()}
+      @monitor.__send__(:mon_check_owner)
       timer = create_timer(timeout)
       
       Thread.critical = true
-      count = @monitor.instance_eval {mon_exit_for_cond()}
+      count = @monitor.__send__(:mon_exit_for_cond)
       @waiters.push(Thread.current)
 
       begin
@@ -105,38 +101,31 @@ module MonitorMixin
         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
+	if timer && timer.alive?
+	  Thread.kill(timer)
 	end
+	if @waiters.include?(Thread.current)  # interrupted?
+	  @waiters.delete(Thread.current)
+	end
+        @monitor.__send__(:mon_enter_for_cond, count)
+	Thread.critical = false
       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()}
+      @monitor.__send__(:mon_check_owner)
       Thread.critical = true
       t = @waiters.shift
       t.wakeup if t
@@ -144,9 +133,8 @@ module MonitorMixin
       Thread.pass
     end
     
-    # Wake up all the waiters.
     def broadcast
-      @monitor.instance_eval {mon_check_owner()}
+      @monitor.__send__(:mon_check_owner)
       Thread.critical = true
       for t in @waiters
 	t.wakeup
@@ -184,7 +172,7 @@ module MonitorMixin
   
   def self.extend_object(obj)
     super(obj)
-    obj.instance_eval {mon_initialize()}
+    obj.__send__(:mon_initialize)
   end
   
   #
@@ -207,13 +195,12 @@ module MonitorMixin
   alias try_mon_enter mon_try_enter
 
   #
-  # Enters exclusive section.
+  # Enters exlusive section.
   #
   def mon_enter
     Thread.critical = true
     mon_acquire(@mon_entering_queue)
     @mon_count += 1
-  ensure
     Thread.critical = false
   end
   
@@ -248,9 +235,6 @@ module MonitorMixin
   
   #
   # 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)
@@ -263,7 +247,6 @@ module MonitorMixin
     mon_initialize
   end
 
-  # called by initialize method to set defaults for instance variables.
   def mon_initialize
     @mon_owner = nil
     @mon_count = 0
@@ -271,8 +254,6 @@ module MonitorMixin
     @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"
@@ -303,23 +284,11 @@ module MonitorMixin
   def mon_exit_for_cond
     count = @mon_count
     @mon_count = 0
-    return count
-  ensure
     mon_release
+    return count
   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
diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb
index 8e0d42bc8d..0192d83bee 100644
--- a/lib/mutex_m.rb
+++ b/lib/mutex_m.rb
@@ -1,4 +1,4 @@
-#--
+#
 #   mutex_m.rb - 
 #   	$Release Version: 3.0$
 #   	$Revision: 1.7 $
@@ -7,26 +7,22 @@
 #   	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:
+# --
+#   Usage:
+#	require "mutex_m.rb"
+#	obj = Object.new
+#	obj.extend Mutex_m
+#	...
+#	extended object can be handled like Mutex
+#       or
+#	class Foo
+#	  include Mutex_m
+#	  ...
+#	end
+#	obj = Foo.new
+#	this obj can be handled like Mutex
 #
-#   class Foo
-#     include Mutex_m
-#     # ...
-#   end
-#   
-#   obj = Foo.new
 
 module Mutex_m
   def Mutex_m.define_aliases(cl)
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index ca2c00a790..203029ed3d 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -1,5 +1,5 @@
 # 
-# = net/ftp.rb - FTP Client Library
+# = net/ftp.rb
 # 
 # Written by Shugo Maeda <shugo@ruby-lang.org>.
 #
@@ -17,7 +17,7 @@
 require "socket"
 require "monitor"
 
-module Net
+module Net # :nodoc:
 
   # :stopdoc:
   class FTPError < StandardError; end
@@ -58,7 +58,7 @@ module Net
   # == Major Methods
   #
   # The following are the methods most likely to be useful to users:
-  # - FTP.open
+  # - FTP::open
   # - #getbinaryfile
   # - #gettextfile
   # - #putbinaryfile
@@ -81,7 +81,7 @@ module Net
     # When +true+, transfers are performed in binary mode.  Default: +true+.
     attr_accessor :binary
 
-    # When +true+, the connection is in passive mode.  Default: +false+.
+    # When +true+, the connection is in passive mode.  Default: false.
     attr_accessor :passive
 
     # When +true+, all traffic to and from the server is written
@@ -103,7 +103,7 @@ module Net
     attr_reader :last_response
     
     #
-    # A synonym for <tt>FTP.new</tt>, but with a mandatory host parameter.
+    # A synonym for +FTP.new+, 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.
@@ -165,7 +165,7 @@ module Net
     # 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.
+    # +Errno::ECONNREFUSED+) if the connection cannot be established.
     #
     def connect(host, port = FTP_PORT)
       if @debug_mode
@@ -278,9 +278,12 @@ module Net
     def sendport(host, port)
       af = (@sock.peeraddr)[0]
       if af == "AF_INET"
-	cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",")
+	hbytes = host.split(".")
+	pbytes = [port / 256, port % 256]
+	bytes = hbytes + pbytes
+	cmd = "PORT " + bytes.join(",")
       elsif af == "AF_INET6"
-	cmd = sprintf("EPRT |2|%s|%d|", host, port)
+	cmd = "EPRT |2|" + host + "|" + sprintf("%d", port) + "|"
       else
 	raise FTPProtoError, host
       end
@@ -319,8 +322,6 @@ module Net
 	  end
 	end
 	resp = sendcmd(cmd)
-        # skip 2XX for some ftp servers
-        resp = getresp if resp[0] == ?2
 	if resp[0] != ?1
 	  raise FTPReplyError, resp
 	end
@@ -333,8 +334,6 @@ module Net
 	  end
 	end
 	resp = sendcmd(cmd)
-        # skip 2XX for some ftp servers
-        resp = getresp if resp[0] == ?2
 	if resp[0] != ?1
 	  raise FTPReplyError, resp
 	end
@@ -578,7 +577,7 @@ module Net
     end
 
     #
-    # Transfers +localfile+ to the server in whatever mode the session is set
+    # Tranfers +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),
@@ -690,7 +689,7 @@ module Net
       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:
+    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
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 7dd1f24d4c..e50a39cf5c 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1,12 +1,10 @@
 #
 # = net/http.rb
 #
-# Copyright (c) 1999-2006 Yukihiro Matsumoto
-# Copyright (c) 1999-2006 Minero Aoki
-# Copyright (c) 2001 GOTOU Yuuzou
+# Copyright (c) 1999-2003 Yukihiro Matsumoto
+# Copyright (c) 1999-2003 Minero Aoki
 # 
-# Written and maintained by Minero Aoki <aamine@loveruby.net>.
-# HTTPS support added by GOTOU Yuuzou <gotoyuzo@notwork.org>.
+# Written & maintained by Minero Aoki <aamine@loveruby.net>.
 #
 # This file is derived from "http-access.rb".
 #
@@ -16,7 +14,7 @@
 # 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. 
+# 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
@@ -28,7 +26,8 @@
 require 'net/protocol'
 require 'uri'
 
-module Net   #:nodoc:
+
+module Net # :nodoc:
 
   # :stopdoc:
   class HTTPBadResponse < StandardError; end
@@ -40,72 +39,37 @@ module Net   #:nodoc:
   # 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).
+  # ((<URL:http://www.ietf.org/rfc/rfc2616.txt>)).
   # 
   # == Examples
   # 
   # === Getting Document From WWW Server
   # 
-  # Example #1: Simple GET+print
+  # (formal version)
   # 
   #     require 'net/http'
-  #     Net::HTTP.get_print 'www.example.com', '/index.html'
+  #     Net::HTTP.start('www.example.com', 80) { |http|
+  #         response = http.get('/index.html')
+  #         puts response.body
+  #     }
   # 
-  # Example #2: Simple GET+print by URL
+  # (shorter version)
   # 
   #     require 'net/http'
-  #     require 'uri'
-  #     Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
+  #     Net::HTTP.get_print 'www.example.com', '/index.html'
   # 
-  # Example #3: More generic GET+print
+  #             or
   # 
   #     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
+  #     Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
   # 
   # === 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
+  #     Net::HTTP.start('some.www.server', 80) { |http|
+  #         response = http.post('/cgi-bin/search.rb', 'query=ruby')
+  #     }
   # 
   # === Accessing via Proxy
   # 
@@ -119,7 +83,7 @@ module Net   #:nodoc:
   #     proxy_port = 8080
   #             :
   #     Net::HTTP::Proxy(proxy_addr, proxy_port).start('www.example.com') {|http|
-  #       # always connect to your.proxy.addr:8080
+  #         # always connect to your.proxy.addr:8080
   #             :
   #     }
   # 
@@ -154,9 +118,9 @@ module Net   #:nodoc:
   #     require 'net/http'
   #     require 'uri'
   # 
-  #     def fetch(uri_str, limit = 10)
+  #     def fetch( uri_str, limit = 10 )
   #       # You should choose better exception. 
-  #       raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+  #       raise ArgumentError, 'http redirect too deep' if limit == 0
   # 
   #       response = Net::HTTP.get_response(URI.parse(uri_str))
   #       case response
@@ -185,78 +149,9 @@ module Net   #:nodoc:
   #       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
+  # TODO: write me.
   # 
   # == Switching Net::HTTP versions
   # 
@@ -265,13 +160,13 @@ module Net   #:nodoc:
   # allows you to use 1.2 features again.
   # 
   #     # example
-  #     Net::HTTP.start {|http1| ...(http1 has 1.2 features)... }
+  #     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.start { |http2| ...(http2 has 1.1 features)... }
   # 
   #     Net::HTTP.version_1_2
-  #     Net::HTTP.start {|http3| ...(http3 has 1.2 features)... }
+  #     Net::HTTP.start { |http3| ...(http3 has 1.2 features)... }
   # 
   # This function is NOT thread-safe.
   #
@@ -280,7 +175,7 @@ module Net   #:nodoc:
     # :stopdoc:
     Revision = %q$Revision$.split[1]
     HTTPVersion = '1.1'
-    @newimpl = true
+    @@newimpl = true    # for backward compatability
     # :startdoc:
 
     # Turns on net/http 1.2 (ruby 1.8) features.
@@ -292,25 +187,25 @@ module Net   #:nodoc:
     #   Net::HTTP.version_1_2
     #
     def HTTP.version_1_2
-      @newimpl = true
+      @@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
+      @@newimpl = false
     end
 
     # true if net/http is in version 1.2 mode.
     # Defaults to true.
     def HTTP.version_1_2?
-      @newimpl
+      @@newimpl
     end
 
     # true if net/http is in version 1.1 compatible mode.
     # Defaults to true.
     def HTTP.version_1_1?
-      not @newimpl
+      not @@newimpl
     end
 
     class << HTTP
@@ -318,6 +213,12 @@ module Net   #:nodoc:
       alias is_version_1_2? version_1_2?   #:nodoc:
     end
 
+    def HTTP.setimplversion( obj )   #:nodoc:
+      f = @@newimpl
+      obj.instance_eval { @newimpl = f }
+    end
+    private_class_method :setimplversion
+
     #
     # short cut methods
     #
@@ -331,13 +232,19 @@ module Net   #:nodoc:
     #
     # or:
     #
-    #    Net::HTTP.get_print 'www.example.com', '/index.html'
+    #    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
+    def HTTP.get_print( arg1, arg2 = nil, port = nil )
+      if arg2
+        addr, path = arg1, arg2
+      else
+        uri = arg1
+        addr = uri.host
+        path = uri.request_uri
+        port = uri.port
+      end
+      new(addr, port || HTTP.default_port).start {|http|
+        http.get path, nil, $stdout
       }
       nil
     end
@@ -352,8 +259,8 @@ module Net   #:nodoc:
     #
     #    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
+    def HTTP.get( arg1, arg2 = nil, arg3 = nil )
+      get_response(arg1,arg2,arg3).body
     end
 
     # Send a GET request to the target and return the response
@@ -368,43 +275,29 @@ module Net   #:nodoc:
     #    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)
-        }
+    def HTTP.get_response( arg1, arg2 = nil, arg3 = nil )
+      if arg2
+        get_by_path(arg1, arg2, arg3)
       else
-        uri = uri_or_host
-        new(uri.host, uri.port).start {|http|
-          return http.request_get(uri.request_uri, &block)
-        }
+        get_by_uri(arg1)
       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)
+    def HTTP.get_by_path( addr, path, port = nil )   #:nodoc:
+      new(addr, port || HTTP.default_port).start {|http|
+        return http.request(Get.new(path))
+      }
+    end
+    private_class_method :get_by_path
+
+    def HTTP.get_by_uri( uri )   #:nodoc:
+      # Should we allow this?
+      # uri = URI.parse(uri) unless uri.respond_to?(:host)
+      new(uri.host, uri.port).start {|http|
+        return http.request(Get.new(uri.request_uri))
       }
     end
+    private_class_method :get_by_uri
 
     #
     # HTTP session management
@@ -412,64 +305,53 @@ module Net   #:nodoc:
 
     # 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)
+      InternetMessageIO
     end
 
     class << HTTP
+      # 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 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
+
       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
+      # 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 new( address, port = nil, p_addr = nil, p_port = nil, p_user = nil, p_pass = nil )
+        obj = Proxy(p_addr, p_port, p_user, p_pass).newobj(address, port)
+        setimplversion obj
+        obj
+      end
     end
 
     # Creates a new Net::HTTP object for the specified +address+.
     # This method does not open the TCP connection.
-    def initialize(address, port = nil)
+    def initialize( address, port = nil )
       @address = address
-      @port    = (port || HTTP.default_port)
+      @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
+
+      @open_timeout = 30
       @read_timeout = 60
+
       @debug_output = nil
-      @use_ssl = false
-      @ssl_context = nil
     end
 
     def inspect
@@ -485,7 +367,7 @@ module Net   #:nodoc:
     #   http.set_debug_output $stderr
     #   http.start { .... }
     #
-    def set_debug_output(output)
+    def set_debug_output( output )
       warn 'Net::HTTP#set_debug_output called after HTTP started' if started?
       @debug_output = output
     end
@@ -497,17 +379,17 @@ module Net   #:nodoc:
     attr_reader :port
 
     # Seconds to wait until connection is opened.
-    # If the HTTP object cannot open a connection in this many seconds,
+    # If the HTTP object cannot open a conection 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,
+    # If the HTTP object cannot open a conection in this many seconds,
     # it raises a TimeoutError exception.
     attr_reader :read_timeout
 
     # Setter for the read_timeout attribute.
-    def read_timeout=(sec)
+    def read_timeout=( sec )
       @socket.read_timeout = sec if @socket
       @read_timeout = sec
     end
@@ -521,11 +403,6 @@ module Net   #:nodoc:
 
     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
@@ -550,48 +427,14 @@ module Net   #:nodoc:
     end
 
     def do_start
-      connect
+      @socket = self.class.socket_type.open(conn_address(), conn_port(),
+                                            @open_timeout, @read_timeout,
+                                            @debug_output)
+      on_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
-        if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-          s.post_connection_check(@address)
-        end
-      end
-      on_connect
-    end
-    private :connect
-
     def on_connect
     end
     private :on_connect
@@ -599,7 +442,7 @@ module Net   #:nodoc:
     # Finishes HTTP session and closes TCP connection.
     # Raises IOError if not started.
     def finish
-      raise IOError, 'HTTP session not yet started' unless started?
+      raise IOError, 'HTTP session not started yet' unless started?
       do_finish
     end
 
@@ -638,8 +481,9 @@ module Net   #:nodoc:
     #                     :
     #     }
     # 
-    def HTTP.Proxy(p_addr, p_port = nil, p_user = nil, p_pass = nil)
+    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 {
@@ -666,7 +510,7 @@ module Net   #:nodoc:
       attr_reader :proxy_pass
     end
 
-    # True if self is a HTTP proxy class.
+    # True if self is a HTTP proxy class
     def proxy?
       self.class.proxy_class?
     end
@@ -699,20 +543,22 @@ module Net   #:nodoc:
     # without proxy
 
     def conn_address
-      address()
+      address
     end
 
     def conn_port
-      port()
+      port
     end
 
-    def edit_path(path)
+    def edit_path( path )
       path
     end
 
     module ProxyDelta   #:nodoc: internal use only
       private
 
+      # with proxy
+    
       def conn_address
         proxy_address()
       end
@@ -721,8 +567,8 @@ module Net   #:nodoc:
         proxy_port()
       end
 
-      def edit_path(path)
-        use_ssl? ? path : "http://#{addr_port()}#{path}"
+      def edit_path( path )
+        'http://' + addr_port() + path
       end
     end
 
@@ -767,7 +613,7 @@ module Net   #:nodoc:
     #       end
     #     }
     #
-    def get(path, initheader = nil, dest = nil, &block) # :yield: +body_segment+
+    def get( path, initheader = nil, dest = nil, &block ) # :yield: +body_segment+
       res = nil
       request(Get.new(path, initheader)) {|r|
         r.read_body dest, &block
@@ -797,7 +643,7 @@ module Net   #:nodoc:
     #     }
     #     p response['content-type']
     #
-    def head(path, initheader = nil) 
+    def head( path, initheader = nil ) 
       res = request(Head.new(path, initheader))
       res.value unless @newimpl
       res
@@ -808,15 +654,21 @@ module Net   #:nodoc:
     # 
     # 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.
+    # In version 1.2 (ruby 1.8), this method returns a Net::HTTPReponse 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.
+    # +dest+ is an alternative method of collecting the body.  It
+    # must be an object responding to the "<<" operator (such as
+    # a String or an Array).  Each fragment of the entity body
+    # will be "<<"-ed in turn onto +dest+ if provided, and it will
+    # also become the body of the returned response object.
+    #
+    # You must *not* provide both +dest+ and a block; doing so
+    # will result in an ArgumentError.
     # 
     # In version 1.1, this method might raise an exception for 
     # 3xx (redirect). In this case you can get an HTTPResponse object
@@ -835,12 +687,7 @@ module Net   #:nodoc:
     #         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+
+    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
@@ -850,75 +697,16 @@ module Net   #:nodoc:
         res.value
         return res, res.body
       end
+
       res
     end
 
-    def put(path, data, initheader = nil)   #:nodoc:
+    def put( path, data, initheader = nil )   #:nodoc:
       res = request(Put.new(path, initheader), data)
-      res.value unless @newimpl
+      @newimpl or res.value
       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.
     # 
@@ -944,8 +732,8 @@ module Net   #:nodoc:
     #       end
     #     }
     #
-    def request_get(path, initheader = nil, &block) # :yield: +response+
-      request(Get.new(path, initheader), &block)
+    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,
@@ -958,8 +746,8 @@ module Net   #:nodoc:
     #     response = http.request_head('/index.html')
     #     p response['content-type']
     #
-    def request_head(path, initheader = nil, &block)
-      request(Head.new(path, initheader), &block)
+    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,
@@ -987,12 +775,11 @@ module Net   #:nodoc:
     #         print str
     #       end
     #     }
-    #
-    def request_post(path, data, initheader = nil, &block) # :yield: +response+
+    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:
+    def request_put( path, data, initheader = nil, &block )   #:nodoc:
       request Put.new(path, initheader), data, &block
     end
 
@@ -1012,7 +799,7 @@ module Net   #:nodoc:
     #    response = http.send_request('GET', '/index.html')
     #    puts response.body
     #
-    def send_request(name, path, data = nil, header = nil)
+    def send_request( name, path, data = nil, header = nil )
       r = HTTPGenericRequest.new(name,(data ? true : false),true,path,header)
       request r, data
     end
@@ -1029,29 +816,25 @@ module Net   #:nodoc:
     # Returns a HTTPResponse object.
     # 
     # This method never raises Net::* exceptions.
-    #
-    def request(req, body = nil, &block)  # :yield: +response+
+    def request( req, body = nil, &block )  # :yield: +response+
       unless started?
         start {
-          req['connection'] ||= 'close'
+          req['connection'] = 'close'
           return request(req, body, &block)
         }
       end
       if proxy_user()
-        unless use_ssl?
-          req.proxy_basic_auth proxy_user(), proxy_pass()
-        end
+        req.proxy_basic_auth proxy_user(), proxy_pass()
       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?
-        }
+          req.exec @socket, @curr_http_version, edit_path(req.path), body
+          begin
+            res = HTTPResponse.read_new(@socket)
+          end while HTTPContinue === res
+          res.reading_body(@socket, req.response_body_permitted?) {
+            yield res if block_given?
+          }
       end_transport req, res
 
       res
@@ -1059,25 +842,27 @@ module Net   #:nodoc:
 
     private
 
-    def begin_transport(req)
+    def begin_transport( req )
       if @socket.closed?
-        connect
+        @socket.reopen @open_timeout
+        on_connect
       end
       if @seems_1_0_server
-        req['connection'] ||= 'close'
+        req['connection'] = 'close'
       end
       if not req.response_body_permitted? and @close_on_empty_response
-        req['connection'] ||= 'close'
+        req['connection'] = 'close'
       end
-      req['host'] ||= addr_port()
+      req['host'] = addr_port()
     end
 
-    def end_transport(req, res)
+    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)
+      elsif keep_alive? req, res
         D 'Conn keep-alive'
         if @socket.closed?
           D 'Conn (but seems 1.0 server)'
@@ -1089,14 +874,17 @@ module Net   #:nodoc:
       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')
+    def keep_alive?( req, res )
+      /close/i === req['connection'].to_s            and return false
+      @seems_1_0_server                              and return false
+
+      /keep-alive/i === res['connection'].to_s       and return true
+      /close/i      === res['connection'].to_s       and return false
+      /keep-alive/i === res['proxy-connection'].to_s and return true
+      /close/i      === res['proxy-connection'].to_s and return false
+
+      @curr_http_version == '1.1'                    and return true
+      false
     end
 
     #
@@ -1106,24 +894,20 @@ module Net   #:nodoc:
     private
 
     def addr_port
-      if use_ssl?
-        address() + (port == HTTP.https_default_port ? '' : ":#{port()}")
-      else
-        address() + (port == HTTP.http_default_port ? '' : ":#{port()}")
-      end
+      address + (port == HTTP.default_port ? '' : ":#{port}")
     end
 
-    def D(msg)
-      return unless @debug_output
-      @debug_output << msg
-      @debug_output << "\n"
+    def D( msg )
+      if @debug_output
+        @debug_output << msg
+        @debug_output << "\n"
+      end
     end
 
   end
 
   HTTPSession = HTTP
 
-
   #
   # Header module.
   #
@@ -1134,15 +918,6 @@ module Net   #:nodoc:
   #
   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
@@ -1151,104 +926,46 @@ module Net   #:nodoc:
 
     # 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(', ')
+    def []( key )
+      @header[key.downcase]
     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
+    def []=( key, val )
+      @header[key.downcase] = val
     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(', ')
+    def fetch( key, *args, &block )  # :yield: +key+
+      @header.fetch(key.downcase, *args, &block)
     end
 
     # Iterates for each header names and values.
-    def each_header   #:yield: +key+, +value+
-      @header.each do |k,va|
-        yield k, va.join(', ')
-      end
+    def each_header( &block ) # :yield: +key+, +value+
+      @header.each(&block)
     end
 
     alias each each_header
 
     # Iterates for each header names.
-    def each_name(&block)   #:yield: +key+
+    def each_key( &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
+    def each_value( &block ) # :yield: +value+
+      @header.each_value(&block)
     end
 
     # Removes a header field.
-    def delete(key)
+    def delete( key )
       @header.delete(key.downcase)
     end
 
     # true if +key+ header exists.
-    def key?(key)
+    def key?( key )
       @header.key?(key.downcase)
     end
 
@@ -1257,25 +974,24 @@ module Net   #:nodoc:
       @header.dup
     end
 
-    # As for #each_header, except the keys are provided in capitalized form.
-    def each_capitalized
+    # As for #each_header, except the keys are provided in
+    # canonical form, which is to say, capitalized.
+    def canonical_each
       @header.each do |k,v|
-        yield capitalize(k), v.join(', ')
+        yield canonical(k), v
       end
     end
 
-    alias canonical_each each_capitalized
-
-    def capitalize(name)
-      name.split(/-/).map {|s| s.capitalize }.join('-')
+    def canonical( k )
+      k.split(/-/).map {|i| i.capitalize }.join('-')
     end
-    private :capitalize
+    private :canonical
 
-    # Returns an Array of Range objects which represents Range: header field,
+    # Returns a Range object 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|
+      s = @header['range'] or return nil
+      s.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
@@ -1290,57 +1006,45 @@ module Net   #:nodoc:
     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
+    # length from it (arg i&len).
+    def range=( r, fin = nil )
+      r = (r ... r + fin) if fin
+
       case r
       when Numeric
-        n = r.to_i
-        rangestr = (n > 0 ? "0-#{n-1}" : "-#{-n}")
+        s = r > 0 ? "0-#{r - 1}" : "-#{-r}"
       when Range
         first = r.first
         last = r.last
-        last -= 1 if r.exclude_end?
+        if r.exclude_end?
+          last -= 1
+        end
+
         if last == -1
-          rangestr = (first > 0 ? "#{first}-" : "-#{-first}")
+          s = 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}"
+          first >= 0 or raise HTTPHeaderSyntaxError, 'range.first is negative' 
+          last > 0  or raise HTTPHeaderSyntaxError, 'range.last is negative' 
+          first < last or raise HTTPHeaderSyntaxError, 'must be .first < .last'
+          s = "#{first}-#{last}"
         end
       else
         raise TypeError, 'Range/Integer is required'
       end
-      @header['range'] = ["bytes=#{rangestr}"]
+
+      @header['range'] = "bytes=#{s}"
       r
     end
 
-    alias range= set_range
+    alias set_range 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]
+      s = @header['content-length'] or return nil
+      m = /\d+/.match(s) or
+              raise HTTPHeaderSyntaxError, 'wrong Content-Length format'
+      m[0].to_i
     end
 
     # Returns "true" if the "transfer-encoding" header is present and
@@ -1348,111 +1052,43 @@ module Net   #:nodoc:
     # 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
+      s = @header['transfer-encoding']
+      (s and /(?:\A|[^\-\w])chunked(?:[^\-\w]|\z)/i === s) ? 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'
+      s = @header['content-range'] or return nil
+      m = %r<bytes\s+(\d+)-(\d+)/(?:\d+|\*)>i.match(s) 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.
+    # The length of the range represented in 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
+      r = self.content_range
+      r and (r.end - r.begin)
     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)]
+    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)]
+    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")
+    def basic_encode( account, password )
+      'Basic ' + ["#{account}:#{password}"].pack('m').strip
     end
     private :basic_encode
 
   end
 
-
   #
   # Parent of HTTPRequest class.  Do not use this directly; use
   # a subclass of HTTPRequest.
@@ -1463,16 +1099,20 @@ module Net   #:nodoc:
 
     include HTTPHeader
 
-    def initialize(m, reqbody, resbody, path, initheader = nil)
+    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
+
+      @header = {}
+      return unless initheader
+      initheader.each do |k,v|
+        key = k.downcase
+        $stderr.puts "net/http: warning: duplicated HTTP header: #{k}" if @header.key?(key) and $VERBOSE
+        @header[key] = v.strip
+      end
+      @header['accept'] ||= '*/*'
     end
 
     attr_reader :method
@@ -1490,85 +1130,45 @@ module Net   #:nodoc:
       @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
+    alias body_exist? response_body_permitted?
 
     #
     # 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
+    def exec( sock, ver, path, body )   #:nodoc: internal use only
+      if body
+        check_body_permitted
+        send_request_with_body sock, ver, path, body
       else
-        write_header sock, ver, path
+        request 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
+    def check_body_permitted
+      request_body_permitted? or
+          raise ArgumentError, 'HTTP request body is not permitted'
     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
+    def send_request_with_body( sock, ver, path, body )
+      @header['content-length'] = body.length.to_s
+      @header.delete 'transfer-encoding'
+
+      unless @header['content-type']
+        $stderr.puts 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
+        @header['content-type'] = 'application/x-www-form-urlencoded'
       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'
+      request sock, ver, path
+      sock.write body
     end
 
-    def write_header(sock, ver, path)
+    def request( sock, ver, path )
       buf = "#{@method} #{path} HTTP/#{ver}\r\n"
-      each_capitalized do |k,v|
-        buf << "#{k}: #{v}\r\n"
+      canonical_each do |k,v|
+        buf << k + ': ' + v + "\r\n"
       end
       buf << "\r\n"
       sock.write buf
@@ -1584,7 +1184,7 @@ module Net   #:nodoc:
   class HTTPRequest < HTTPGenericRequest
 
     # Creates HTTP request object.
-    def initialize(path, initheader = nil)
+    def initialize( path, initheader = nil )
       super self.class::METHOD,
             self.class::REQUEST_HAS_BODY,
             self.class::RESPONSE_HAS_BODY,
@@ -1593,10 +1193,7 @@ module Net   #:nodoc:
   end
 
 
-  class HTTP   # reopen
-    #
-    # HTTP 1.1 methods --- RFC2616
-    #
+  class HTTP
 
     class Get < HTTPRequest
       METHOD = 'GET'
@@ -1622,69 +1219,6 @@ module Net   #:nodoc:
       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
 
 
@@ -1695,7 +1229,7 @@ module Net   #:nodoc:
   # HTTP exception class.
   # You must use its subclasses.
   module HTTPExceptions
-    def initialize(msg, res)   #:nodoc:
+    def initialize( msg, res )   #:nodoc:
       super msg
       @response = res
     end
@@ -1780,7 +1314,7 @@ module Net   #:nodoc:
   #     xxx        HTTPUnknownResponse
   #
   class HTTPResponse
-    # true if the response has body.
+    # true if the reponse has body.
     def HTTPResponse.body_permitted?
       self::HAS_BODY
     end
@@ -1788,7 +1322,7 @@ module Net   #:nodoc:
     def HTTPResponse.exception_type   # :nodoc: internal use only
       self::EXCEPTION_TYPE
     end
-  end   # reopened after
+  end   # redefined after
 
   # :stopdoc:
 
@@ -1948,7 +1482,7 @@ module Net   #:nodoc:
   # :startdoc:
 
 
-  class HTTPResponse   # reopen
+  class HTTPResponse   # redefine
 
     CODE_CLASS_TO_OBJ = {
       '1' => HTTPInformation,
@@ -1996,7 +1530,7 @@ module Net   #:nodoc:
       '416' => HTTPRequestedRangeNotSatisfiable,
       '417' => HTTPExpectationFailed,
 
-      '500' => HTTPInternalServerError,
+      '501' => HTTPInternalServerError,
       '501' => HTTPNotImplemented,
       '502' => HTTPBadGateway,
       '503' => HTTPServiceUnavailable,
@@ -2004,40 +1538,48 @@ module Net   #:nodoc:
       '505' => HTTPVersionNotSupported
     }
 
-    class << HTTPResponse
-      def read_new(sock)   #:nodoc: internal use only
+
+    class << self
+
+      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
+          if res.key? k
+            res[k] << ', ' << v
+          else
+            res[k] = v
+          end
         end
+
         res
       end
 
       private
 
-      def read_status_line(sock)
+      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
+                raise HTTPBadResponse, "wrong status line: #{str.dump}"
+        m.to_a[1,3]
       end
 
-      def response_class(code)
+      def response_class( code )
         CODE_TO_OBJ[code] or
         CODE_CLASS_TO_OBJ[code[0,1]] or
         HTTPUnknownResponse
       end
 
-      def each_response_header(sock)
+      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'
+                  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
@@ -2046,11 +1588,12 @@ module Net   #:nodoc:
 
     include HTTPHeader
 
-    def initialize(httpv, code, msg)   #:nodoc: internal use only
+    def initialize( httpv, code, msg )   #:nodoc: internal use only
       @http_version = httpv
       @code         = code
       @message      = msg
-      initialize_http_header nil
+
+      @header = {}
       @body = nil
       @read = false
     end
@@ -2068,7 +1611,7 @@ module Net   #:nodoc:
     alias msg message   # :nodoc: obsolete
 
     def inspect
-      "#<#{self.class} #{@code} #{@message} readbody=#{@read}>"
+      "#<#{self.class} #{@code} readbody=#{@read}>"
     end
 
     # For backward compatibility.
@@ -2078,11 +1621,7 @@ module Net   #:nodoc:
     # 
     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]
+      [self, body()]
     end
 
     #
@@ -2103,7 +1642,7 @@ module Net   #:nodoc:
 
     # Raises HTTP error if the response is not 2xx.
     def value
-      error! unless self.kind_of?(HTTPSuccess)
+      error! unless HTTPSuccess === self
     end
 
     #
@@ -2111,25 +1650,17 @@ module Net   #:nodoc:
     #
 
     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
+    alias header response        #:nodoc:
+    alias read_header response   #:nodoc:
 
     #
     # body
     #
 
-    def reading_body(sock, reqmethodallowbody)  #:nodoc: internal use only
+    def reading_body( sock, reqmethodallowbody )  #:nodoc: internal use only
       @socket = sock
       @body_exist = reqmethodallowbody && self.class.body_permitted?
       begin
@@ -2162,11 +1693,12 @@ module Net   #:nodoc:
     #     end
     #   }
     #
-    def read_body(dest = nil, &block)
+    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
@@ -2202,31 +1734,32 @@ module Net   #:nodoc:
 
     private
 
-    def read_body_0(dest)
+    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
+      else
+        clen = content_length()
+        if clen
+          @socket.read clen, dest, true   # ignore EOF
+        else
+          clen = range_length()
+          if clen
+            @socket.read clen, dest
+          else
+            @socket.read_all dest
+          end
+        end
       end
-      @socket.read_all dest
     end
 
-    def read_chunked(dest)
+    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}"
+                raise HTTPBadResponse, "wrong chunk size line: #{line}"
         len = hexlen.hex
         break if len == 0
         @socket.read len, dest; total += len
@@ -2238,12 +1771,12 @@ module Net   #:nodoc:
     end
 
     def stream_check
-      raise IOError, 'attempt to read body out of block' if @socket.closed?
+      raise IOError, 'try 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
+    def procdest( dest, block )
+      raise ArgumentError, 'both of arg and block are given for HTTP method'\
+                      if dest and block
       if block
         ReadAdapter.new(block)
       else
diff --git a/lib/net/https.rb b/lib/net/https.rb
deleted file mode 100644
index 7847c3ffea..0000000000
--- a/lib/net/https.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-=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 extension.)
-
-: cert, cert=((|cert|))
-    Sets an OpenSSL::X509::Certificate object as client certificate
-    (This method is appeared in Michal Rokos's OpenSSL extension).
-
-: 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/lib/net/imap.rb b/lib/net/imap.rb
index f8c0d3be4c..086717b97e 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -7,9 +7,7 @@
 # You can freely distribute/modify this library.
 #
 # Documentation: Shugo Maeda, with RDoc conversion and overview by William
-# Webber.
-#
-# See Net::IMAP for documentation. 
+# Webber. 
 #
 
 
@@ -21,13 +19,13 @@ begin
 rescue LoadError
 end
 
-module Net
+module Net # :nodoc:
 
   #
   # Net::IMAP implements Internet Message Access Protocol (IMAP) client
   # functionality.  The protocol is described in [IMAP].
   #
-  # == IMAP Overview
+  # == IMAP OVERVIEW
   #
   # An IMAP client connects to a server, and then authenticates
   # itself using either #authenticate() or #login().  Having
@@ -65,7 +63,7 @@ module Net
   # UIDs have to be reassigned.  An IMAP client cannot thus
   # rearrange message orders.
   #
-  # == Examples of Usage
+  # == EXAMPLES OF USAGE
   #
   # === List sender and subject of all recent messages in the default mailbox
   #
@@ -91,7 +89,7 @@ module Net
   #   end
   #   imap.expunge
   # 
-  # == Thread Safety
+  # == THREAD-SAFENESS
   #
   # Net::IMAP supports concurrent threads. For example,
   # 
@@ -105,7 +103,7 @@ module Net
   # 
   # This script invokes the FETCH command and the SEARCH command concurrently.
   #
-  # == Errors
+  # == ERRORS
   #
   # An IMAP server can send three different types of responses to indicate
   # failure:
@@ -284,20 +282,11 @@ module Net
 
     # Disconnects from the server.
     def disconnect
-      if SSL::SSLSocket === @sock
-        @sock.io.shutdown
-      else
-        @sock.shutdown
-      end
+      @sock.shutdown unless @usessl
       @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
@@ -310,8 +299,8 @@ module Net
     # using it.
     def capability
       synchronize do
-        send_command("CAPABILITY")
-        return @responses.delete("CAPABILITY")[-1]
+	send_command("CAPABILITY")
+	return @responses.delete("CAPABILITY")[-1]
       end
     end
 
@@ -354,17 +343,15 @@ module Net
     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)
+	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
+	if resp.instance_of?(ContinuationRequest)
+	  data = authenticator.process(resp.data.text.unpack("m")[0])
+	  send_data([data].pack("m").gsub(/\n/, ""))
+	end
       end
     end
 
@@ -392,8 +379,8 @@ module Net
     # exist or is for some reason non-selectable.
     def select(mailbox)
       synchronize do
-        @responses.clear
-        send_command("SELECT", mailbox)
+	@responses.clear
+	send_command("SELECT", mailbox)
       end
     end
 
@@ -405,8 +392,8 @@ module Net
     # exist or is for some reason non-examinable.
     def examine(mailbox)
       synchronize do
-        @responses.clear
-        send_command("EXAMINE", mailbox)
+	@responses.clear
+	send_command("EXAMINE", mailbox)
       end
     end
 
@@ -462,7 +449,7 @@ module Net
     # 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.
+    # a mailbox or (via wilcards) 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 '%',
@@ -482,8 +469,8 @@ module Net
     #        #<Net::IMAP::MailboxList attr=[:Noinferiors], delim="/", name="foo/baz">]
     def list(refname, mailbox)
       synchronize do
-        send_command("LIST", refname, mailbox)
-        return @responses.delete("LIST")
+	send_command("LIST", refname, mailbox)
+	return @responses.delete("LIST")
       end
     end
 
@@ -507,8 +494,8 @@ module Net
     # command generally is only available to server admin.
     def getquota(mailbox)
       synchronize do
-        send_command("GETQUOTA", mailbox)
-        return @responses.delete("QUOTA")
+	send_command("GETQUOTA", mailbox)
+	return @responses.delete("QUOTA")
       end
     end
 
@@ -543,8 +530,8 @@ module Net
     # Net::IMAP::MailboxACLItem will be returned.
     def getacl(mailbox)
       synchronize do
-        send_command("GETACL", mailbox)
-        return @responses.delete("ACL")[-1]
+	send_command("GETACL", mailbox)
+	return @responses.delete("ACL")[-1]
       end
     end
 
@@ -555,8 +542,8 @@ module Net
     # 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")
+	send_command("LSUB", refname, mailbox)
+	return @responses.delete("LSUB")
       end
     end
 
@@ -578,14 +565,14 @@ module Net
     # does not exist.
     def status(mailbox, attr)
       synchronize do
-        send_command("STATUS", mailbox, attr)
-        return @responses.delete("STATUS")[-1].attr
+	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
+    # flags to initially assing 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:
@@ -604,7 +591,7 @@ module Net
     def append(mailbox, message, flags = nil, date_time = nil)
       args = []
       if flags
-        args.push(flags)
+	args.push(flags)
       end
       args.push(date_time) if date_time
       args.push(Literal.new(message))
@@ -630,8 +617,8 @@ module Net
     # selected mailbox all messages that have the \Deleted flag set.
     def expunge
       synchronize do
-        send_command("EXPUNGE")
-        return @responses.delete("EXPUNGE")
+	send_command("EXPUNGE")
+	return @responses.delete("EXPUNGE")
       end
     end
 
@@ -824,28 +811,28 @@ module Net
     # 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
+	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
+	if $1
+	  "&-"
+	else
+	  base64 = [u8tou16(x)].pack("m")
+	  "&" + base64.delete("=\n").tr("/", ",") + "-"
+	end
       }
     end
 
@@ -872,7 +859,7 @@ module Net
     #                       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.
+    # Errno::NETUNREACH:: 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.
@@ -889,38 +876,32 @@ module Net
           raise "SSL extension not installed"
         end
         @usessl = true
+        @sock = SSLSocket.new(@sock)
 
         # 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.ca_file = certs if certs && FileTest::file?(certs)
+        @sock.ca_path = certs if certs && FileTest::directory?(certs)
+        @sock.verify_mode = VERIFY_PEER if verify
+        @sock.verify_callback = VerifyCallbackProc if defined?(VerifyCallbackProc)
+
         @sock.connect   # start ssl session.
-        @sock.post_connection_check(@host) if verify
       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
+      @tag_arrival = new_cond
 
       @greeting = get_response
-      if @greeting.name == "BYE"
-        @sock.close
-        raise ByeResponseError, @greeting.raw_data
+      if /\ABYE\z/ni =~ @greeting.name
+	@sock.close
+	raise ByeResponseError, resp[0]
       end
 
       @client_thread = Thread.current
       @receiver_thread = Thread.start {
-        receive_responses
+	receive_responses
       }
     end
 
@@ -939,23 +920,13 @@ module Net
             case resp
             when TaggedResponse
               @tagged_responses[resp.tag] = resp
-              @response_arrival.broadcast
-              if resp.tag == @logout_command_tag
-                return
-              end
+              @tag_arrival.broadcast
             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)
@@ -967,37 +938,33 @@ module Net
       end
     end
 
-    def get_tagged_response(tag)
+    def get_tagged_response(tag, cmd)
       until @tagged_responses.key?(tag)
-        @response_arrival.wait
+	@tag_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
+	raise NoResponseError, resp.data.text
       when /\A(?:BAD)\z/ni
-        raise BadResponseError, resp.data.text
+	raise BadResponseError, resp.data.text
       else
-        return resp
+	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
+	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
@@ -1008,33 +975,30 @@ module Net
 
     def record_response(name, data)
       unless @responses.has_key?(name)
-        @responses[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
+	tag = generate_tag
+	data = args.collect {|i| format_data(i)}.join(" ")
+	if data.length > 0
+	  put_line(tag + " " + cmd + " " + data)
+	else
+	  put_line(tag + " " + cmd)
+	end
+	if block
+	  add_response_handler(block)
+	end
+	begin
+	  return get_tagged_response(tag, cmd)
+	ensure
+	  if block
+	    remove_response_handler(block)
+	  end
+	end
       end
     end
 
@@ -1042,144 +1006,115 @@ module Net
       @tagno += 1
       return format("%s%04d", @tag_prefix, @tagno)
     end
-    
-    def put_string(str)
-      @sock.print(str)
+
+    def send_data(*args)
+      data = args.collect {|i| format_data(i)}.join(" ")
+      put_line(data)
+    end
+
+    def put_line(line)
+      line = line + CRLF
+      @sock.print(line)
       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
+        $stderr.print(line.gsub(/^/n, "C: "))
       end
     end
 
-    def send_data(data)
+    def format_data(data)
       case data
       when nil
-        put_string("NIL")
+	return "NIL"
       when String
-        send_string_data(data)
+	return format_string(data)
       when Integer
-        send_number_data(data)
+	return format_number(data)
       when Array
-        send_list_data(data)
+	return format_list(data)
       when Time
-        send_time_data(data)
+	return format_time(data)
       when Symbol
-        send_symbol_data(data)
+	return format_symbol(data)
       else
-        data.send_data(self)
+	return data.format_data
       end
     end
 
-    def send_string_data(str)
+    def format_string(str)
       case str
       when ""
-        put_string('""')
+	return '""'
       when /[\x80-\xff\r\n]/n
-        # literal
-        send_literal(str)
+	# literal
+	return "{" + str.length.to_s + "}" + CRLF + str
       when /[(){ \x00-\x1f\x7f%*"\\]/n
-        # quoted string
-        send_quoted_string(str)
+	# quoted string
+	return '"' + str.gsub(/["\\]/n, "\\\\\\&") + '"'
       else
-        put_string(str)
+	# atom
+	return 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)
+    def format_number(num)
       if num < 0 || num >= 4294967296
-        raise DataFormatError, num.to_s
+	raise DataFormatError, num.to_s
       end
-      put_string(num.to_s)
+      return 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(")")
+    def format_list(list)
+      contents = list.collect {|i| format_data(i)}.join(" ")
+      return "(" + contents + ")"
     end
 
     DATE_MONTH = %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)
 
-    def send_time_data(time)
+    def format_time(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)
+      return format('"%2d-%3s-%4d %02d:%02d:%02d +0000"',
+		    t.day, DATE_MONTH[t.month - 1], t.year,
+		    t.hour, t.min, t.sec)
     end
 
-    def send_symbol_data(symbol)
-      put_string("\\" + symbol.to_s)
+    def format_symbol(symbol)
+      return "\\" + symbol.to_s
     end
 
     def search_internal(cmd, keys, charset)
       if keys.instance_of?(String)
-        keys = [RawData.new(keys)]
+	keys = [RawData.new(keys)]
       else
-        normalize_searching_criteria(keys)
+	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]
+	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)
+	attr = RawData.new(attr)
       end
       synchronize do
-        @responses.delete("FETCH")
-        send_command(cmd, MessageSet.new(set), attr)
-        return @responses.delete("FETCH")
+	@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)
+	attr = RawData.new(attr)
       end
       synchronize do
-        @responses.delete("FETCH")
-        send_command(cmd, MessageSet.new(set), attr, flags)
-        return @responses.delete("FETCH")
+	@responses.delete("FETCH")
+	send_command(cmd, MessageSet.new(set), attr, flags)
+	return @responses.delete("FETCH")
       end
     end
 
@@ -1189,22 +1124,22 @@ module Net
 
     def sort_internal(cmd, sort_keys, search_keys, charset)
       if search_keys.instance_of?(String)
-        search_keys = [RawData.new(search_keys)]
+	search_keys = [RawData.new(search_keys)]
       else
-        normalize_searching_criteria(search_keys)
+	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]
+	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)]
+	search_keys = [RawData.new(search_keys)]
       else
-        normalize_searching_criteria(search_keys)
+	normalize_searching_criteria(search_keys)
       end
       normalize_searching_criteria(search_keys)
       send_command(cmd, algorithm, charset, *search_keys)
@@ -1213,62 +1148,62 @@ module Net
 
     def normalize_searching_criteria(keys)
       keys.collect! do |i|
-        case i
-        when -1, Range, Array
-          MessageSet.new(i)
-        else
-          i
-        end
+	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 ""
+	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
+	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
@@ -1279,157 +1214,155 @@ module Net
       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
+	c = s[i]
+	if (c & 0x80) == 0
+	  buf.concat(0x00)
+	  buf.concat(c)
+	  i += 1
+	elsif (c & 0xe0) == 0xc0 &&
+	    inlen >= 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)
+      def format_data
+	return @data
       end
 
       private
 
       def initialize(data)
-        @data = data
+	@data = data
       end
     end
 
     class Atom # :nodoc:
-      def send_data(imap)
-        imap.send(:put_string, @data)
+      def format_data
+	return @data
       end
 
       private
 
       def initialize(data)
-        @data = data
+	@data = data
       end
     end
 
     class QuotedString # :nodoc:
-      def send_data(imap)
-        imap.send(:send_quoted_string, @data)
+      def format_data
+	return '"' + @data.gsub(/["\\]/n, "\\\\\\&") + '"'
       end
 
       private
 
       def initialize(data)
-        @data = data
+	@data = data
       end
     end
 
     class Literal # :nodoc:
-      def send_data(imap)
-        imap.send(:send_literal, @data)
+      def format_data
+	return "{" + @data.length.to_s + "}" + CRLF + @data
       end
 
       private
 
       def initialize(data)
-        @data = data
+	@data = data
       end
     end
 
     class MessageSet # :nodoc:
-      def send_data(imap)
-        imap.send(:put_string, format_internal(@data))
+      def format_data
+	return format_internal(@data)
       end
 
       private
 
       def initialize(data)
-        @data = 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
+	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
+	if num < -1 || num == 0 || num >= 4294967296
+	  raise DataFormatError, num.inspect
+	end
       end
     end
 
@@ -1671,7 +1604,7 @@ module Net
     # 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)
+			  :to, :cc, :bcc, :in_reply_to, :message_id)
 
     # 
     # Net::IMAP::Address represents electronic mail addresses.
@@ -1748,21 +1681,21 @@ module Net
     # multipart?:: Returns false.
     # 
     class BodyTypeBasic < Struct.new(:media_type, :subtype,
-                                     :param, :content_id,
-                                     :description, :encoding, :size,
-                                     :md5, :disposition, :language,
-                                     :extension)
+				     :param, :content_id,
+				     :description, :encoding, :size,
+				     :md5, :disposition, :language,
+				     :extension)
       def multipart?
-        return false
+	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
+	$stderr.printf("warning: media_subtype is obsolete.\n")
+	$stderr.printf("         use subtype instead.\n")
+	return subtype
       end
     end
 
@@ -1775,22 +1708,22 @@ module Net
     # 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)
+				    :param, :content_id,
+				    :description, :encoding, :size,
+				    :lines,
+				    :md5, :disposition, :language,
+				    :extension)
       def multipart?
-        return false
+	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
+	$stderr.printf("warning: media_subtype is obsolete.\n")
+	$stderr.printf("         use subtype instead.\n")
+	return subtype
       end
     end
 
@@ -1805,22 +1738,22 @@ module Net
     # 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)
+				       :param, :content_id,
+				       :description, :encoding, :size,
+				       :envelope, :body, :lines,
+				       :md5, :disposition, :language,
+				       :extension)
       def multipart?
-        return false
+	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
+	$stderr.printf("warning: media_subtype is obsolete.\n")
+	$stderr.printf("         use subtype instead.\n")
+	return subtype
       end
     end
 
@@ -1848,683 +1781,666 @@ module Net
     # multipart?:: Returns true.
     # 
     class BodyTypeMultipart < Struct.new(:media_type, :subtype,
-                                         :parts,
-                                         :param, :disposition, :language,
-                                         :extension)
+					 :parts,
+					 :param, :disposition, :language,
+					 :extension)
       def multipart?
-        return true
+	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
+	$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
+	@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
+      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
+(?# 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	)"((?:[^\x80-\xff\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
+(?# 1:	SPACE	)( )|\
+(?# 2:	NIL	)(NIL)|\
+(?# 3:	NUMBER	)(\d+)|\
+(?# 4:	QUOTED	)"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)"|\
+(?# 5:	LITERAL	)\{(\d+)\}\r\n|\
+(?# 6:	LPAR	)(\()|\
+(?# 7:	RPAR	)(\)))/ni
 
       TEXT_REGEXP = /\G(?:\
-(?# 1:  TEXT    )([^\x00\r\n]*))/ni
+(?# 1:	TEXT	)([^\x00\x80-\xff\r\n]*))/ni
 
       RTEXT_REGEXP = /\G(?:\
-(?# 1:  LBRA    )(\[)|\
-(?# 2:  TEXT    )([^\x00\r\n]*))/ni
+(?# 1:	LBRA	)(\[)|\
+(?# 2:	TEXT	)([^\x00\x80-\xff\r\n]*))/ni
 
       CTEXT_REGEXP = /\G(?:\
-(?# 1:  TEXT    )([^\x00\r\n\]]*))/ni
+(?# 1:	TEXT	)([^\x00\x80-\xff\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
+	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)
+	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
+	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)
+	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)
+	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
+	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
+	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
+	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
+	@lex_state = EXPR_DATA
+	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)
+	@lex_state = EXPR_BEG
+	return Envelope.new(date, subject, from, sender, reply_to,
+			    to, cc, bcc, in_reply_to, message_id)
       end
 
       def flags_data
-        token = match(T_ATOM)
-        name = token.value.upcase
-        match(T_SPACE)
-        return name, flag_list
+	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
+	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
+	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
+	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
+	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
+	@lex_state = EXPR_DATA
+	match(T_LPAR)
+	token = lookahead
+	if token.symbol == T_LPAR
+	  result = body_type_mpart
+	else
+	  result = body_type_1part
+	end
+	match(T_RPAR)
+	@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
+	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)
+	mtype, msubtype = media_type
+	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)
+	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)
+	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)
+	parts = []
+	while true
+	  token = lookahead
+	  if token.symbol == T_SPACE
+	    shift_token
+	    break
+	  end
+	  parts.push(body)
+	end
+	mtype = "MULTIPART"
+	msubtype = string.upcase
+	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
+	mtype = string.upcase
+	match(T_SPACE)
+	msubtype = string.upcase
+	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
+	param = body_fld_param
+	match(T_SPACE)
+	content_id = nstring
+	match(T_SPACE)
+	desc = nstring
+	match(T_SPACE)
+	enc = string.upcase
+	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
+	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 = string.upcase
+	  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
+	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
+	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)
+	token = lookahead
+	if token.symbol == T_NIL
+	  shift_token
+	  return nil
+	end
+	match(T_LPAR)
+	dsp_type = string.upcase
+	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
+	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(string.upcase)
+	  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
+	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
+	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
+	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
+	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
+	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)
+	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)
+	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)
+	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)
+	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
@@ -2601,525 +2517,505 @@ module Net
             data.push(MailboxACLItem.new(user, rights))
           end
         end
-        return UntaggedResponse.new(name, data, @str)
+	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)
+	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
+	token = match(T_ATOM)
+	name = token.value.upcase
+	token = lookahead
 
-        if token.symbol == T_SPACE
-          threads = []
+	if token.symbol == T_SPACE
+	  threads = []
 
-          while true
-            shift_token
-            token = lookahead
+	  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
+	    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)
+	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
+	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)
+	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)
+	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)
+	@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
+	@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)\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
+	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"\\]|\\["\\])*)")\
+(?# 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)
+	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
+#  	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
+#  	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
+(?# 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
+	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
+	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
+	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
+	token = match(T_QUOTED, T_LITERAL)
+	return token.value
       end
 
-      STRING_TOKENS = [T_QUOTED, T_LITERAL, T_NIL]
+      STRING_TOKENS = [T_QUOTED, T_LITERAL]
 
       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
+	return STRING_TOKENS.include?(token.symbol)
       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
+  	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
+	T_ATOM,
+	T_NUMBER,
+	T_NIL,
+	T_LBRA,
+	T_RBRA,
+	T_PLUS
       ]
 
       def atom_token?(token)
-        return ATOM_TOKENS.include?(token.symbol)
+	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
+	token = match(T_NUMBER)
+	return token.value.to_i
       end
 
       def nil_atom
-        match(T_NIL)
-        return nil
+	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
+	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
+	unless @token
+	  @token = next_token
+	end
+	return @token
       end
 
       def shift_token
-        @token = nil
+	@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
+	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] BEG_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)
+	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.symbol
+	    $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
 
@@ -3127,13 +3023,13 @@ module Net
     # #authenticate().
     class LoginAuthenticator
       def process(data)
-        case @state
-        when STATE_USER
-          @state = STATE_PASSWORD
-          return @user
-        when STATE_PASSWORD
-          return @password
-        end
+	case @state
+	when STATE_USER
+	  @state = STATE_PASSWORD
+	  return @user
+	when STATE_PASSWORD
+	  return @password
+	end
       end
 
       private
@@ -3142,9 +3038,9 @@ module Net
       STATE_PASSWORD = :PASSWORD
 
       def initialize(user, password)
-        @user = user
-        @password = password
-        @state = STATE_USER
+	@user = user
+	@password = password
+	@state = STATE_USER
       end
     end
     add_authenticator "LOGIN", LoginAuthenticator
@@ -3153,32 +3049,32 @@ module Net
     # #authenticate().
     class CramMD5Authenticator
       def process(challenge)
-        digest = hmac_md5(challenge, @password)
-        return @user + " " + digest
+	digest = hmac_md5(challenge, @password)
+	return @user + " " + digest
       end
 
       private
 
       def initialize(user, password)
-        @user = user
-        @password = password
+	@user = user
+	@password = password
       end
 
       def hmac_md5(text, key)
-        if key.length > 64
-          key = Digest::MD5.digest(key)
-        end
+	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
+	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)
+	digest = Digest::MD5.digest(k_ipad + text)
 
-        return Digest::MD5.hexdigest(k_opad + digest)
+	return Digest::MD5.hexdigest(k_opad + digest)
       end
     end
     add_authenticator "CRAM-MD5", CramMD5Authenticator
@@ -3224,10 +3120,9 @@ if __FILE__ == $0
   require "getoptlong"
 
   $stdout.sync = true
-  $port = nil
+  $port = "imap2"
   $user = ENV["USER"] || ENV["LOGNAME"]
-  $auth = "login"
-  $ssl = false
+  $auth = "cram-md5"
 
   def usage
     $stderr.print <<EOF
@@ -3237,7 +3132,6 @@ usage: #{$0} [options] <host>
   --port=PORT                   specifies port
   --user=USER                   specifies user
   --auth=AUTH                   specifies auth type
-  --ssl                         use ssl
 EOF
   end
 
@@ -3262,28 +3156,22 @@ EOF
   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])
+  parser.set_options(['--help', GetoptLong::NO_ARGUMENT],
+		     ['--port', GetoptLong::REQUIRED_ARGUMENT],
+		     ['--user', GetoptLong::REQUIRED_ARGUMENT],
+		     ['--auth', GetoptLong::REQUIRED_ARGUMENT])
   begin
     parser.each_option do |name, arg|
       case name
       when "--port"
-        $port = arg
+	$port = arg
       when "--user"
-        $user = arg
+	$user = arg
       when "--auth"
-        $auth = arg
-      when "--ssl"
-        $ssl = true
-      when "--debug"
-        Net::IMAP.debug = true
+	$auth = arg
       when "--help"
-        usage
-        exit(1)
+	usage
+	exit(1)
       end
     end
   rescue
@@ -3296,9 +3184,8 @@ EOF
     usage
     exit(1)
   end
-  $port ||= $ssl ? 993 : 143
     
-  imap = Net::IMAP.new($host, $port, $ssl)
+  imap = Net::IMAP.new($host, $port)
   begin
     password = get_password
     imap.authenticate($auth, $user, password)
@@ -3306,61 +3193,61 @@ EOF
       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
+	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
+	else
+	  print "unknown command: ", cmd, "\n"
+	end
       rescue Net::IMAP::Error
-        puts $!
+	puts $!
       end
     end
   ensure
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 82cc9a747b..5ada68fd4d 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -1,33 +1,173 @@
 # = net/pop.rb
 #
-# Copyright (c) 1999-2007 Yukihiro Matsumoto.
-#
-# Copyright (c) 1999-2007 Minero Aoki.
+#--
+# 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.
+# written & 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.
+# Ruby Distribute License or GNU General Public License.
 # 
-# NOTE: You can find Japanese version of this document at:
-# http://www.ruby-lang.org/ja/man/html/net_pop.html
+# 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.
+# $Id$
+#++
 #
+# == 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') {|f|
+#           f.write m.pop
+#         }
+#         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') {|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') {|f|
+#             f.write m.pop
+#           }
+#           m.delete
+#           i += 1
+#         end
+#         puts "#{pop.mails.size} mails popped."
+#       end
+#     }
+# 
+# POP3#delete_all alternates #each_mail and m.delete.
+# 
+#     require 'net/pop'
+# 
+#     Net::POP3.start('pop.example.com', 110,
+#                     'YourAccount', 'YourPassword') {|pop|
+#       if pop.mails.empty?
+#         puts 'no mail.'
+#       else
+#         i = 1
+#         pop.delete_all do |m|
+#           File.open("inbox/#{i}", 'w') {|f|
+#             f.write m.pop
+#           }
+#           i += 1
+#         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') {|f|
+#         f.write m.pop
+#       }
+#       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') {|f|
+#         m.pop do |chunk|    # get a message little by little.
+#           f.write chunk
+#         end
+#         i += 1
+#       }
+#     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') {|pop|
+#       # Rest code is same.
+#     }
+# 
+# === 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') {|pop|
+#       pop.mails.select {|m| need_pop?(m.unique_id) }.each do |m|
+#         do_something(m.pop)
+#       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.
+# 
 
 require 'net/protocol'
 require 'digest/md5'
-require 'timeout'
-
-begin
-  require "openssl/ssl"
-rescue LoadError
-end
 
 module Net
 
@@ -41,159 +181,12 @@ module Net
   # Unexpected response from the server.
   class POPBadResponse < POPError; end
 
+
   #
-  # = Net::POP3
+  # Class providing POP3 client functionality.
   #
-  # == 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.
+  # See documentation for the file pop.rb for examples of usage.
   #
-  # 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]
@@ -202,19 +195,10 @@ module Net
     # Class Parameters
     #
 
-    def POP3.default_port
-      default_pop3_port()
-    end
-
     # The default port for POP3 connections, port 110
-    def POP3.default_pop3_port
+    def POP3.default_port
       110
     end
-    
-    # The default port for POP3S connections, port 995
-    def POP3.default_pop3s_port
-      995
-    end
 
     def POP3.socket_type   #:nodoc: obsolete
       Net::InternetMessageIO
@@ -231,11 +215,11 @@ module Net
     #     pop = Net::POP3::APOP($is_apop).new(addr, port)
     #
     #     # Example 2
-    #     Net::POP3::APOP($is_apop).start(addr, port) do |pop|
+    #     Net::POP3::APOP($is_apop).start(addr, port) {|pop|
     #       ....
-    #     end
+    #     }
     #
-    def POP3.APOP(isapop)
+    def POP3.APOP( isapop )
       isapop ? APOP : POP3
     end
 
@@ -243,25 +227,24 @@ module Net
     # yielding it to the +block+.
     # This method is equivalent to:
     #
-    #     Net::POP3.start(address, port, account, password) do |pop|
+    #     Net::POP3.start(address, port, account, password) {|pop|
     #       pop.each_mail do |m|
     #         yield m
     #       end
-    #     end
+    #     }
     #
     # This method raises a POPAuthenticationError if authentication fails.
     #
-    # === Example
-    #
+    #     # Typical usage
     #     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
+    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)
       }
@@ -273,16 +256,15 @@ module Net
     #
     # This method raises a POPAuthenticationError if authentication fails.
     #
-    # === Example
-    #
+    #     # 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)
+    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)
       }
@@ -292,127 +274,66 @@ module Net
     #
     # This method raises POPAuthenticationError if authentication fails.
     #
-    # === Example: normal POP3
-    #
+    #     # Example 1: normal POP3
     #     Net::POP3.auth_only('pop.example.com', 110,
     #                         'YourAccount', 'YourPassword')
     #
-    # === Example: APOP
-    #
+    #     # Example 2: 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)
+    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?
+    def auth_only( account, password )
+      raise IOError, 'opening already opened POP session' if started?
       start(account, password) {
         ;
       }
     end
 
     #
-    # SSL
-    #
-
-    @ssl_params = nil
-
-    # call-seq:
-    #    Net::POP.enable_ssl(params = {})
-    #
-    # Enable SSL for all new instances.
-    # +params+ is passed to OpenSSL::SSLContext#set_params.
-    def POP3.enable_ssl(*args)
-      @ssl_params = create_ssl_params(*args)
-    end
-
-    def POP3.create_ssl_params(verify_or_params = {}, certs = nil)
-      begin
-        params = verify_or_params.to_hash
-      rescue NoMethodError
-        params = {}
-        params[:verify_mode] = verify_or_params
-        if certs
-          if File.file?(certs)
-            params[:ca_file] = certs
-          elsif File.directory?(certs)
-            params[:ca_path] = certs
-          end
-        end
-      end
-      return params
-    end
-
-    # Disable SSL for all new instances.
-    def POP3.disable_ssl
-      @ssl_params = nil
-    end
-
-    def POP3.ssl_params
-      return @ssl_params
-    end
-
-    def POP3.use_ssl?
-      return !@ssl_params.nil?
-    end
-
-    def POP3.verify
-      return @ssl_params[:verify_mode]
-    end
-
-    def POP3.certs
-      return @ssl_params[:ca_file] || @ssl_params[:ca_path]
-    end
-
-    #
     # Session management
     #
 
     # Creates a new POP3 object and open the connection.  Equivalent to 
-    #
-    #   Net::POP3.new(address, port, isapop).start(account, password)
+    # 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
+    # Typical usage:
     #
-    #    Net::POP3.start(addr, port, account, password) do |pop|
+    #    Net::POP3.start(addr, port, account, password) {|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
+    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.
-    #
+    # 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)
+    def initialize( addr, port = nil, isapop = false )
       @address = addr
-      @ssl_params = POP3.ssl_params
-      @port = port
+      @port = port || self.class.default_port
       @apop = isapop
-      
+
       @command = nil
       @socket = nil
       @started = false
@@ -430,32 +351,6 @@ module Net
       @apop
     end
 
-    # does this instance use SSL?
-    def use_ssl?
-      return !@ssl_params.nil?
-    end
-   
-    # call-seq:
-    #    Net::POP#enable_ssl(params = {})
-    #
-    # Enables SSL for this instance.  Must be called before the connection is
-    # established to have any effect.
-    # +params[:port]+ is port to establish the SSL connection on; Defaults to 995.
-    # +params+ (except :port) is passed to OpenSSL::SSLContext#set_params.
-    def enable_ssl(verify_or_params = {}, certs = nil, port = nil)
-      begin
-        @ssl_params = verify_or_params.to_hash.dup
-        @port = @ssl_params.delete(:port) || @port
-      rescue NoMethodError
-        @ssl_params = POP3.create_ssl_params(verify_or_params, certs)
-        @port = port || @port
-      end
-    end
-    
-    def disable_ssl
-      @ssl_params = nil
-    end
-
     # Provide human-readable stringification of class state.
     def inspect
       "#<#{self.class} #{@address}:#{@port} open=#{@started}>"
@@ -466,15 +361,14 @@ module Net
     #
     # Set an output stream for debugging.
     #
-    # === Example
-    #
+    #   # Example
     #   pop = Net::POP.new(addr, port)
     #   pop.set_debug_output $stderr
-    #   pop.start(account, passwd) do |pop|
+    #   pop.start(account, passwd) {
     #     ....
-    #   end
+    #   }
     #
-    def set_debug_output(arg)
+    def set_debug_output( arg )
       @debug_output = arg
     end
 
@@ -482,9 +376,7 @@ module Net
     attr_reader :address
 
     # The port number to connect to.
-    def port
-      return @port || (use_ssl? ? POP3.default_pop3s_port : POP3.default_pop3_port)
-    end
+    attr_reader :port
 
     # Seconds to wait until a connection is opened.
     # If the POP3 object cannot open a connection within this time,
@@ -497,7 +389,7 @@ module Net
     attr_reader :read_timeout
 
     # Set the read timeout.
-    def read_timeout=(sec)
+    def read_timeout=( sec )
       @command.socket.read_timeout = sec if @command
       @read_timeout = sec
     end
@@ -515,8 +407,9 @@ module Net
     # closes the session after block call finishes.
     #
     # This method raises a POPAuthenticationError if authentication fails.
-    def start(account, password) # :yield: pop
+    def start( account, password ) # :yield: pop
       raise IOError, 'POP session already started' if @started
+
       if block_given?
         begin
           do_start account, password
@@ -530,23 +423,9 @@ module Net
       end
     end
 
-    def do_start(account, password)
-      s = timeout(@open_timeout) { TCPSocket.open(@address, port) }
-      if use_ssl?
-        raise 'openssl library not installed' unless defined?(OpenSSL)
-        context = OpenSSL::SSL::SSLContext.new
-        context.set_params(@ssl_params)
-        s = OpenSSL::SSL::SSLSocket.new(s, context)
-        s.sync_close = true
-        s.connect
-        if context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-          s.post_connection_check(@address)
-        end
-      end
-      @socket = InternetMessageIO.new(s)
-      logging "POP session started: #{@address}:#{@port} (#{@apop ? 'APOP' : 'POP'})"
-      @socket.read_timeout = @read_timeout
-      @socket.debug_output = @debug_output
+    def do_start( account, password )
+      @socket = self.class.socket_type.open(@address, @port,
+                                   @open_timeout, @read_timeout, @debug_output)
       on_connect
       @command = POP3Command.new(@socket)
       if apop?
@@ -556,12 +435,7 @@ module Net
       end
       @started = true
     ensure
-      # Authentication failed, clean up connection.
-      unless @started
-        s.close if s and not s.closed?
-        @socket = nil
-        @command = nil
-      end
+      do_finish if not @started
     end
     private :do_start
 
@@ -571,14 +445,12 @@ module Net
 
     # Finishes a POP3 session and closes TCP connection.
     def finish
-      raise IOError, 'POP session not yet started' unless started?
+      raise IOError, 'POP session not started yet' unless started?
       do_finish
     end
 
     def do_finish
       @mails = nil
-      @n_mails = nil
-      @n_bytes = nil
       @command.quit if @command
     ensure
       @started = false
@@ -641,7 +513,7 @@ module Net
     #   end
     #
     # This method raises a POPError if an error occurs.
-    def each_mail(&block)  # :yield: message
+    def each_mail( &block )  # :yield: message
       mails().each(&block)
     end
 
@@ -651,18 +523,16 @@ module Net
     #
     # If called with a block, yields each message in turn before deleting it.
     #
-    # === Example
-    #
+    #     # Example
     #     n = 1
     #     pop.delete_all do |m|
-    #       File.open("inbox/#{n}") do |f|
+    #       File.open("inbox/#{n}") {|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?
@@ -688,10 +558,6 @@ module Net
       end
     end
 
-    def logging(msg)
-      @debug_output << msg + "\n" if @debug_output
-    end
-
   end   # class POP3
 
   # class aliases
@@ -719,7 +585,7 @@ module Net
   #
   class POPMail
 
-    def initialize(num, len, pop, cmd)   #:nodoc:
+    def initialize( num, len, pop, cmd )   #:nodoc:
       @number = num
       @length = len
       @pop = pop
@@ -740,44 +606,40 @@ module Net
       "#<#{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
-    #
+    #     # Example without block
     #     POP3.start('pop.example.com', 110,
-    #                'YourAccount, 'YourPassword') do |pop|
+    #                'YourAccount, 'YourPassword') {|pop|
     #       n = 1
     #       pop.mails.each do |popmail|
-    #         File.open("inbox/#{n}", 'w') do |f|
+    #         File.open("inbox/#{n}", 'w') {|f|
     #           f.write popmail.pop              
-    #         end
+    #         }
     #         popmail.delete
     #         n += 1
     #       end
-    #     end
-    #
-    # === Example with block
+    #     }
     #
+    #     # Example with block
     #     POP3.start('pop.example.com', 110,
-    #                'YourAccount, 'YourPassword') do |pop|
+    #                'YourAccount, 'YourPassword') {|pop|
     #       n = 1
     #       pop.mails.each do |popmail|
-    #         File.open("inbox/#{n}", 'w') do |f|
+    #         File.open("inbox/#{n}", 'w') {|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)
@@ -794,11 +656,10 @@ module Net
     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 = '')
+    def top( lines, dest = '' )
       @command.top(@number, lines) do |chunk|
         dest << chunk
       end
@@ -806,11 +667,10 @@ module Net
     end
 
     # Fetches the message header.     
-    #
     # The optional +dest+ argument is obsolete.
     #
     # This method raises a POPError if an error occurs.
-    def header(dest = '')
+    def header( dest = '' )
       top(0, dest)
     end
 
@@ -820,19 +680,18 @@ module Net
     #
     # This method raises a POPError if an error occurs.
     #
-    # === Example
-    #
+    #     # Example
     #     POP3.start('pop.example.com', 110,
-    #                'YourAccount, 'YourPassword') do |pop|
+    #                'YourAccount, 'YourPassword') {|pop|
     #       n = 1
     #       pop.mails.each do |popmail|
-    #         File.open("inbox/#{n}", 'w') do |f|
+    #         File.open("inbox/#{n}", 'w') {|f|
     #           f.write popmail.pop
-    #         end
+    #         }
     #         popmail.delete         ####
     #         n += 1
     #       end
-    #     end
+    #     }
     #
     def delete
       @command.dele @number
@@ -858,7 +717,7 @@ module Net
 
     alias uidl unique_id
 
-    def uid=(uid)   #:nodoc: internal use only
+    def uid=( uid )   #:nodoc: internal use only (used from POP3#set_all_uids)
       @uid = uid
     end
 
@@ -867,7 +726,7 @@ module Net
 
   class POP3Command   #:nodoc: internal use only
 
-    def initialize(sock)
+    def initialize( sock )
       @socket = sock
       @error_occured = false
       res = check_response(critical { recv_response() })
@@ -878,14 +737,14 @@ module Net
       "#<#{self.class} socket=#{@socket}>"
     end
 
-    def auth(account, password)
+    def auth( account, password )
       check_response_auth(critical {
-        check_response_auth(get_response('USER %s', account))
-        get_response('PASS %s', password)
+        check_response_auth(get_response('USER ' + account))
+        get_response('PASS ' + password)
       })
     end
 
-    def apop(account, password)
+    def apop( account, password )
       raise POPAuthenticationError, 'not APOP server; cannot login' \
                                                       unless @apop_stamp
       check_response_auth(critical {
@@ -916,28 +775,28 @@ module Net
     end
 
     def rset
-      check_response(critical { get_response('RSET') })
+      check_response(critical { get_response 'RSET' })
     end
 
-    def top(num, lines = 0, &block)
+    def top( num, lines = 0, &block )
       critical {
         getok('TOP %d %d', num, lines)
         @socket.each_message_chunk(&block)
       }
     end
 
-    def retr(num, &block)
+    def retr( num, &block )
       critical {
         getok('RETR %d', num)
         @socket.each_message_chunk(&block)
       }
     end
     
-    def dele(num)
+    def dele( num )
       check_response(critical { get_response('DELE %d', num) })
     end
 
-    def uidl(num = nil)
+    def uidl( num = nil )
       if num
         res = check_response(critical { get_response('UIDL %d', num) })
         return res.split(/ /)[1]
@@ -960,12 +819,12 @@ module Net
 
     private
 
-    def getok(fmt, *fargs)
+    def getok( fmt, *fargs )
       @socket.writeline sprintf(fmt, *fargs)
       check_response(recv_response())
     end
 
-    def get_response(fmt, *fargs)
+    def get_response( fmt, *fargs )
       @socket.writeline sprintf(fmt, *fargs)
       recv_response()
     end
@@ -974,13 +833,13 @@ module Net
       @socket.readline
     end
 
-    def check_response(res)
-      raise POPError, res unless /\A\+OK/i =~ res
+    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
+    def check_response_auth( res )
+      raise POPAuthenticationError, res unless /\A\+OK/i === res
       res
     end
 
@@ -997,3 +856,4 @@ module Net
   end   # class POP3Command
 
 end   # module Net
+
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index dc23c14dfa..316f5e51a2 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -2,8 +2,8 @@
 # = net/protocol.rb
 #
 #--
-# Copyright (c) 1999-2005 Yukihiro Matsumoto
-# Copyright (c) 1999-2005 Minero Aoki
+# Copyright (c) 1999-2003 Yukihiro Matsumoto
+# Copyright (c) 1999-2003 Minero Aoki
 #
 # written and maintained by Minero Aoki <aamine@loveruby.net>
 #
@@ -25,7 +25,7 @@ module Net # :nodoc:
 
   class Protocol   #:nodoc: internal use only
     private
-    def Protocol.protocol_param(name, val)
+    def Protocol.protocol_param( name, val )
       module_eval(<<-End, __FILE__, __LINE__ + 1)
         def #{name}
           #{val}
@@ -34,7 +34,6 @@ module Net # :nodoc:
     end
   end
 
-
   class ProtocolError          < StandardError; end
   class ProtoSyntaxError       < ProtocolError; end
   class ProtoFatalError        < ProtocolError; end
@@ -46,284 +45,336 @@ module Net # :nodoc:
   ProtocRetryError = ProtoRetriableError
 
 
-  class BufferedIO   #:nodoc: internal use only
-    def initialize(io)
-      @io = io
-      @read_timeout = 60
-      @debug_output = nil
-      @rbuf = ''
+  class InternetMessageIO   #:nodoc: internal use only
+
+    class << self
+      alias open new
+    end
+
+    def initialize( addr, port,
+                    open_timeout = nil, read_timeout = nil,
+                    debug_output = nil )
+      @address      = addr
+      @port         = port
+      @read_timeout = read_timeout
+      @debug_output = debug_output
+      @socket       = nil
+      @rbuf         = nil   # read buffer
+      @wbuf         = nil   # write buffer
+      connect open_timeout
+      LOG 'opened'
+    end
+
+    attr_reader :address
+    attr_reader :port
+
+    def ip_address
+      return '' unless @socket
+      @socket.addr[3]
     end
 
-    attr_reader :io
     attr_accessor :read_timeout
-    attr_accessor :debug_output
 
-    def inspect
-      "#<#{self.class} io=#{@io}>"
+    attr_reader :socket
+
+    def connect( open_timeout )
+      LOG "opening connection to #{@address}..."
+      timeout(open_timeout) {
+        @socket = TCPsocket.new(@address, @port)
+      }
+      @rbuf = ''
+    end
+    private :connect
+
+    def close
+      if @socket
+        @socket.close
+        LOG 'closed'
+      else
+        LOG 'close call for already closed socket'
+      end
+      @socket = nil
+      @rbuf = ''
+    end
+
+    def reopen( open_timeout = nil )
+      LOG 'reopening...'
+      close
+      connect open_timeout
+      LOG 'reopened'
     end
 
     def closed?
-      @io.closed?
+      not @socket
     end
 
-    def close
-      @io.close
+    def inspect
+      "#<#{self.class} #{closed?() ? 'closed' : 'opened'}>"
     end
 
-    #
-    # Read
-    #
+    ###
+    ###  READ
+    ###
 
     public
 
-    def read(len, dest = '', ignore_eof = false)
+    def read( len, dest = '', ignore_eof = false )
       LOG "reading #{len} bytes..."
+      # LOG_off()   # experimental: [ruby-list:38800]
       read_bytes = 0
       begin
         while read_bytes + @rbuf.size < len
-          dest << (s = rbuf_consume(@rbuf.size))
-          read_bytes += s.size
+          read_bytes += rbuf_moveto(dest, @rbuf.size)
           rbuf_fill
         end
-        dest << (s = rbuf_consume(len - read_bytes))
-        read_bytes += s.size
+        rbuf_moveto dest, len - read_bytes
       rescue EOFError
         raise unless ignore_eof
       end
+      # LOG_on()
       LOG "read #{read_bytes} bytes"
       dest
     end
 
-    def read_all(dest = '')
+    def read_all( dest = '' )
       LOG 'reading all...'
+      # LOG_off()   # experimental: [ruby-list:38800]
       read_bytes = 0
       begin
         while true
-          dest << (s = rbuf_consume(@rbuf.size))
-          read_bytes += s.size
+          read_bytes += rbuf_moveto(dest, @rbuf.size)
           rbuf_fill
         end
       rescue EOFError
         ;
       end
+      # LOG_on()
       LOG "read #{read_bytes} bytes"
       dest
     end
 
-    def readuntil(terminator, ignore_eof = false)
+    def readuntil( terminator, ignore_eof = false )
+      dest = ''
       begin
         until idx = @rbuf.index(terminator)
           rbuf_fill
         end
-        return rbuf_consume(idx + terminator.size)
+        rbuf_moveto dest, idx + terminator.size
       rescue EOFError
         raise unless ignore_eof
-        return rbuf_consume(@rbuf.size)
+        rbuf_moveto dest, @rbuf.size
       end
+      dest
     end
         
     def readline
       readuntil("\n").chop
     end
 
-    private
+    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
 
-    BUFSIZE = 1024 * 16
+    private
 
     def rbuf_fill
-      timeout(@read_timeout) {
-        @rbuf << @io.sysread(BUFSIZE)
-      }
+      until IO.select([@socket], nil, nil, @read_timeout)
+        raise TimeoutError, "socket read timeout (#{@read_timeout} sec)"
+      end
+      @rbuf << @socket.sysread(1024)
     end
 
-    def rbuf_consume(len)
-      s = @rbuf.slice!(0, len)
+    def rbuf_moveto( dest, len )
+      dest << (s = @rbuf.slice!(0, len))
       @debug_output << %Q[-> #{s.dump}\n] if @debug_output
-      s
+      len
     end
 
-    #
-    # Write
-    #
+    ###
+    ###  WRITE
+    ###
 
     public
 
-    def write(str)
+    def write( str )
       writing {
         write0 str
       }
     end
 
-    def writeline(str)
+    def writeline( str )
       writing {
         write0 str + "\r\n"
       }
     end
 
+    def write_message( src )
+      LOG "writing message from #{src.class}"
+      LOG_off()
+      len = 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 = 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 writing
       @written_bytes = 0
       @debug_output << '<- ' if @debug_output
       yield
+      @socket.flush
       @debug_output << "\n" if @debug_output
       bytes = @written_bytes
       @written_bytes = nil
       bytes
     end
 
-    def write0(str)
+    def write0( str )
       @debug_output << str.dump if @debug_output
-      len = @io.write(str)
+      len = @socket.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
+    # Reads string from src calling :each, and write to @socket.
+    # Escapes '.' on the each line head.
     #
-
-    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)
+    def write_message_0( src )
       prev = @written_bytes
       each_crlf_line(src) do |line|
-        write0 line.sub(/\A\./, '..')
+        if line[0] == ?.
+        then write0 '.' + line
+        else write0       line
+        end
       end
       @written_bytes - prev
     end
 
     #
-    # Write
+    # setup @wbuf for each_crlf_line.
     #
-
-    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
+    def using_each_crlf_line
+      writing {
+          @wbuf = ''
+          yield
+          if not @wbuf.empty?       # unterminated last line
+            if @wbuf[-1] == ?\r
+              @wbuf.chop!
+            end
+            @wbuf.concat "\r\n"
+            write0 @wbuf
+          elsif @written_bytes == 0   # empty src
+            write0 "\r\n"
           end
-        }
+          write0 ".\r\n"
+          @wbuf = nil
       }
-      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"
+    #
+    # extract a CR-LF-terminating-line from @wbuf and yield it.
+    #
+    def each_crlf_line( src )
+      adding(src) do
+        beg = 0
+        buf = @wbuf
+        while buf.index(/\n|\r\n|\r/, beg)
+          m = Regexp.last_match
+          if (m.begin(0) == buf.length - 1) and buf[-1] == ?\r
+            # "...\r" : can follow "\n..."
+            break
+          end
+          str = buf[beg ... m.begin(0)]
+          str.concat "\r\n"
+          yield str
+          beg = m.end(0)
         end
+        @wbuf = buf[beg ... buf.length]
       end
     end
 
-    def buffer_filling(buf, src)
+    #
+    # Reads strings from SRC and add to @wbuf, then yield.
+    #
+    def adding( src )
       case src
       when String    # for speeding up.
-        0.step(src.size - 1, 1024) do |i|
-          buf << src[i, 1024]
+        0.step(src.size - 1, 2048) do |i|
+          @wbuf << src[i,2048]
           yield
         end
+
       when File    # for speeding up.
-        while s = src.read(1024)
-          buf << s
+        while s = src.read(2048)
+          s[0,0] = @wbuf
+          @wbuf = s
           yield
         end
+
       else    # generic reader
         src.each do |s|
-          buf << s
-          yield if buf.size > 1024
+          @wbuf << s
+          yield if @wbuf.size > 2048
         end
-        yield unless buf.empty?
+        yield unless @wbuf.empty?
       end
     end
+
+    ###
+    ### DEBUG
+    ###
+
+    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
+      @debug_output << "\n"
+    end
+  
   end
 
 
@@ -331,38 +382,41 @@ module Net # :nodoc:
   # The writer adapter class
   #
   class WriteAdapter
-    def initialize(socket, method)
-      @socket = socket
-      @method_id = method
+
+    def initialize( sock, mid )
+      @socket = sock
+      @method_id = mid
     end
 
     def inspect
       "#<#{self.class} socket=#{@socket.inspect}>"
     end
 
-    def write(str)
+    def write( str )
       @socket.__send__(@method_id, str)
     end
 
     alias print write
 
-    def <<(str)
+    def <<( str )
       write str
       self
     end
 
-    def puts(str = '')
-      write str.chomp("\n") + "\n"
+    def puts( str = '' )
+      write str.sub(/\n?/, "\n")
     end
 
-    def printf(*args)
+    def printf( *args )
       write sprintf(*args)
     end
+  
   end
 
 
   class ReadAdapter   #:nodoc: internal use only
-    def initialize(block)
+
+    def initialize( block )
       @block = block
     end
 
@@ -370,18 +424,21 @@ module Net # :nodoc:
       "#<#{self.class}>"
     end
 
-    def <<(str)
+    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)
+    #
+    def call_block( str )
       yield str
     end
+  
   end
 
 
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 5cce6cc50c..21c04812fe 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -1,38 +1,133 @@
 # = net/smtp.rb
 # 
-# Copyright (c) 1999-2007 Yukihiro Matsumoto.
-#
-# Copyright (c) 1999-2007 Minero Aoki.
+#--
+# 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.
+# written & 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.
+# 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 at:
-# http://www.ruby-lang.org/ja/man/html/net_smtp.html
+# 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. 
+#++
 # 
+# == 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) {|smtp|
+#       # use the SMTP object smtp only in this block
+#     }
+# 
+# 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) {|smtp|
+#       smtp.send_message msgstr,
+#                         'your@mail.address',
+#                         'his_addess@example.com'
+#     }
+# 
+# === 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) {|smtp|
+#       smtp.send_message msgstr, 'from@address', 'to@address'
+#     }
+# 
+# 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)
 
 require 'net/protocol'
 require 'digest/md5'
-require 'timeout'
-begin
-  require 'openssl'
-rescue LoadError
-end
 
-module Net
+
+module Net # :nodoc:
 
   # Module mixed in to all SMTP error classes
   module SMTPError
-    # This *class* is a module for backward compatibility.
-    # In later release, this module becomes a class.
+    # This *class* is module for some reason.
+    # In ruby 1.9.x, this module becomes a class.
   end
 
   # Represents an SMTP authentication error.
@@ -60,170 +155,36 @@ module Net
     include SMTPError
   end
 
-  # Command is not supported on server.
-  class SMTPUnsupportedCommand < ProtocolError
-    include SMTPError
-  end
-
   #
-  # = Net::SMTP
+  # Class providing SMTP client functionality.
   #
-  # == 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)
+  # See documentation for the file smtp.rb for examples of usage.
   #
   class SMTP
 
     Revision = %q$Revision$.split[1]
 
-    # The default SMTP port number, 25.
+    # The default SMTP port, port 25.
     def SMTP.default_port
       25
     end
 
-    # The default mail submission port number, 587.
-    def SMTP.default_submission_port
-      587
-    end
-
-    # The default SMTPS port number, 465.
-    def SMTP.default_tls_port
-      465
-    end
-
-    class << self
-      alias default_ssl_port default_tls_port
-    end
-
-    def SMTP.default_ssl_context
-      OpenSSL::SSL::SSLContext.new
-    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)
+    # 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.
+    def initialize( address, port = nil )
       @address = address
       @port = (port || SMTP.default_port)
       @esmtp = true
-      @capabilities = nil
       @socket = nil
       @started = false
       @open_timeout = 30
       @read_timeout = 60
       @error_occured = false
       @debug_output = nil
-      @tls = false
-      @starttls = false
-      @ssl_context = nil
     end
-    
+
     # Provide human-readable stringification of class state.
     def inspect
       "#<#{self.class} #{@address}:#{@port} started=#{@started}>"
@@ -234,134 +195,17 @@ module Net
       @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)
+    def esmtp=( bool )
       @esmtp = bool
     end
 
     alias esmtp esmtp?
 
-    # true if server advertises STARTTLS.
-    # You cannot get valid value before opening SMTP session.
-    def capable_starttls?
-      capable?('STARTTLS')
-    end
-
-    def capable?(key)
-      return nil unless @capabilities
-      @capabilities[key] ? true : false
-    end
-    private :capable?
-
-    # true if server advertises AUTH PLAIN.
-    # You cannot get valid value before opening SMTP session.
-    def capable_plain_auth?
-      auth_capable?('PLAIN')
-    end
-
-    # true if server advertises AUTH LOGIN.
-    # You cannot get valid value before opening SMTP session.
-    def capable_login_auth?
-      auth_capable?('LOGIN')
-    end
-
-    # true if server advertises AUTH CRAM-MD5.
-    # You cannot get valid value before opening SMTP session.
-    def capable_cram_md5_auth?
-      auth_capable?('CRAM-MD5')
-    end
-
-    def auth_capable?(type)
-      return nil unless @capabilities
-      return false unless @capabilities['AUTH']
-      @capabilities['AUTH'].include?(type)
-    end
-    private :auth_capable?
-
-    # Returns supported authentication methods on this server.
-    # You cannot get valid value before opening SMTP session.
-    def capable_auth_types
-      return [] unless @capabilities
-      return [] unless @capabilities['AUTH']
-      @capabilities['AUTH']
-    end
-
-    # true if this object uses SMTP/TLS (SMTPS).
-    def tls?
-      @tls
-    end
-
-    alias ssl? tls?
-
-    # Enables SMTP/TLS (SMTPS: SMTP over direct TLS connection) for
-    # this object.  Must be called before the connection is established
-    # to have any effect.  +context+ is a OpenSSL::SSL::SSLContext object.
-    def enable_tls(context = SMTP.default_ssl_context)
-      raise 'openssl library not installed' unless defined?(OpenSSL)
-      raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @starttls
-      @tls = true
-      @ssl_context = context
-    end
-
-    alias enable_ssl enable_tls
-    
-    # Disables SMTP/TLS for this object.  Must be called before the
-    # connection is established to have any effect.
-    def disable_tls
-      @tls = false
-      @ssl_context = nil
-    end
-
-    alias disable_ssl disable_tls
-
-    # Returns truth value if this object uses STARTTLS.
-    # If this object always uses STARTTLS, returns :always.
-    # If this object uses STARTTLS when the server support TLS, returns :auto.
-    def starttls?
-      @starttls
-    end
-
-    # true if this object uses STARTTLS.
-    def starttls_always?
-      @starttls == :always
-    end
-
-    # true if this object uses STARTTLS when server advertises STARTTLS.
-    def starttls_auto?
-      @starttls == :auto
-    end
-    
-    # Enables SMTP/TLS (STARTTLS) for this object.
-    # +context+ is a OpenSSL::SSL::SSLContext object.
-    def enable_starttls(context = SMTP.default_ssl_context)
-      raise 'openssl library not installed' unless defined?(OpenSSL)
-      raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @tls
-      @starttls = :always
-      @ssl_context = context
-    end
-
-    # Enables SMTP/TLS (STARTTLS) for this object if server accepts.
-    # +context+ is a OpenSSL::SSL::SSLContext object.
-    def enable_starttls_auto(context = SMTP.default_ssl_context)
-      raise 'openssl library not installed' unless defined?(OpenSSL)
-      raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @tls
-      @starttls = :auto
-      @ssl_context = context
-    end
-
-    # Disables SMTP/TLS (STARTTLS) for this object.  Must be called
-    # before the connection is established to have any effect.
-    def disable_starttls
-      @starttls = false
-      @ssl_context = nil
-    end
-
     # The address of the SMTP server to connect to.
     attr_reader :address
 
@@ -380,12 +224,11 @@ module Net
 
     # Set the number of seconds to wait until timing-out a read(2)
     # call.
-    def read_timeout=(sec)
+    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.
     #
@@ -395,34 +238,27 @@ module Net
     #   # example
     #   smtp = Net::SMTP.new(addr, port)
     #   smtp.set_debug_output $stderr
-    #   smtp.start do |smtp|
+    #   smtp.start {
     #     ....
-    #   end
-    #
-    def debug_output=(arg)
+    #   }
+    def set_debug_output( arg )
       @debug_output = arg
     end
 
-    alias set_debug_output debug_output=
-
     #
     # 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)
+    #     Net::SMTP.new(address,port).start(helo_domain,account,password,authtype)
     #
-    # === Example
-    #
-    #     Net::SMTP.start('your.smtp.server') do |smtp|
+    #     # example
+    #     Net::SMTP.start('your.smtp.server') {
     #       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
@@ -430,23 +266,16 @@ module Net
     # 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'. 
-    #
+    # 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
@@ -456,10 +285,10 @@ module Net
     # * Net::SMTPUnknownError
     # * IOError
     # * TimeoutError
-    #
-    def SMTP.start(address, port = nil, helo = 'localhost',
-                   user = nil, secret = nil, authtype = nil,
-                   &block)   # :yield: smtp
+    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
 
@@ -468,43 +297,21 @@ module Net
       @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 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.
     #
     # If session has already been started, an IOError will be raised.
     #
@@ -517,90 +324,55 @@ module Net
     # * Net::SMTPUnknownError
     # * IOError
     # * TimeoutError
-    #
-    def start(helo = 'localhost',
-              user = nil, secret = nil, authtype = nil)   # :yield: smtp
+    def start( helo = 'localhost.localdomain',
+               user = nil, secret = nil, authtype = nil ) # :yield: smtp
       if block_given?
         begin
-          do_start helo, user, secret, authtype
+          do_start(helo, user, secret, authtype)
           return yield(self)
         ensure
           do_finish
         end
       else
-        do_start helo, user, secret, authtype
+        do_start(helo, user, secret, authtype)
         return self
       end
     end
 
-    # 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
-
-    private
-
-    def do_start(helo_domain, user, secret, authtype)
+    def do_start( helodomain, user, secret, authtype )
       raise IOError, 'SMTP session already started' if @started
-      if user or secret
-        check_auth_method(authtype || DEFAULT_AUTH_TYPE)
-        check_auth_args user, secret
-      end
-      s = timeout(@open_timeout) { TCPSocket.open(@address, @port) }   
-      logging "Connection opened: #{@address}:#{@port}"
-      @socket = new_internet_message_io(tls? ? tlsconnect(s) : s)
-      check_response critical { recv_response() }
-      do_helo helo_domain
-      if starttls_always? or (capable_starttls? and starttls_auto?)
-        unless capable_starttls?
-          raise SMTPUnsupportedCommand,
-              "STARTTLS is not supported on this server"
+      check_auth_args user, secret, authtype if user or secret
+
+      @socket = InternetMessageIO.open(@address, @port,
+                                       @open_timeout, @read_timeout,
+                                       @debug_output)
+      check_response(critical { recv_response() })
+      begin
+        if @esmtp
+          ehlo helodomain
+        else
+          helo helodomain
         end
-        starttls
-        @socket = new_internet_message_io(tlsconnect(s))
-        # helo response may be different after STARTTLS
-        do_helo helo_domain
+      rescue ProtocolError
+        if @esmtp
+          @esmtp = false
+          @error_occured = false
+          retry
+        end
+        raise
       end
-      authenticate user, secret, (authtype || DEFAULT_AUTH_TYPE) if user
+      authenticate user, secret, authtype if user
       @started = true
     ensure
-      unless @started
-        # authentication failed, cancel connection.
-        s.close if s and not s.closed?
-        @socket = nil
-      end
-    end
-
-    def tlsconnect(s)
-      s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
-      logging "TLS connection started"
-      s.sync_close = true
-      s.connect
-      if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-        s.post_connection_check(@address)
-      end
-      s
+      @socket.close if not @started and @socket and not @socket.closed?
     end
+    private :do_start
 
-    def new_internet_message_io(s)
-      io = InternetMessageIO.new(s)
-      io.read_timeout = @read_timeout
-      io.debug_output = @debug_output
-      io
-    end
-
-    def do_helo(helo_domain)
-      res = @esmtp ? ehlo(helo_domain) : helo(helo_domain)
-      @capabilities = res.capabilities
-    rescue SMTPError
-      if @esmtp
-        @esmtp = false
-        @error_occured = false
-        retry
-      end
-      raise
+    # Finishes the SMTP session and closes TCP connection.
+    # Raises IOError if not started.
+    def finish
+      raise IOError, 'not started yet' unless started?
+      do_finish
     end
 
     def do_finish
@@ -611,33 +383,29 @@ module Net
       @socket.close if @socket and not @socket.closed?
       @socket = nil
     end
+    private :do_finish
 
     #
-    # Message Sending
+    # 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|
+    #     # example
+    #     Net::SMTP.start('smtp.example.com') {|smtp|
     #       smtp.send_message msgstr,
     #                         'from@example.com',
     #                         ['dest@example.com', 'dest2@example.com']
-    #     end
-    #
-    # === Errors
+    #     }
     #
     # This method may raise:
     #
@@ -647,51 +415,42 @@ module Net
     # * Net::SMTPUnknownError
     # * IOError
     # * TimeoutError
-    #
-    def send_message(msgstr, from_addr, *to_addrs)
-      raise IOError, 'closed session' unless @socket
-      mailfrom from_addr
-      rcptto_list to_addrs
-      data msgstr
+    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.
+    # 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|
+    #     # example
+    #     Net::SMTP.start('smtp.example.com', 25) {|smtp|
+    #       smtp.open_message_stream('from@example.com', ['dest@example.com']) {|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:
     #
@@ -701,221 +460,166 @@ module Net
     # * Net::SMTPUnknownError
     # * IOError
     # * TimeoutError
-    #
-    def open_message_stream(from_addr, *to_addrs, &block)   # :yield: stream
-      raise IOError, 'closed session' unless @socket
-      mailfrom from_addr
-      rcptto_list to_addrs
-      data(&block)
+    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
 
-    #
-    # Authentication
-    #
-
-    public
-
-    DEFAULT_AUTH_TYPE = :plain
-
-    def authenticate(user, secret, authtype = DEFAULT_AUTH_TYPE)
-      check_auth_method authtype
-      check_auth_args user, secret
-      send auth_method(authtype), user, secret
-    end
+    private
 
-    def auth_plain(user, secret)
-      check_auth_args user, secret
-      res = critical {
-        get_response('AUTH PLAIN ' + base64_encode("\0#{user}\0#{secret}"))
-      }
-      check_auth_response res
-      res
-    end
+    def send0( from_addr, to_addrs )
+      raise IOError, 'closed session' unless @socket
+      raise ArgumentError, 'mail destination does 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
 
-    def auth_login(user, secret)
-      check_auth_args user, secret
+      mailfrom from_addr
+      to_addrs.each do |to|
+        rcptto to
+      end
       res = critical {
-        check_auth_continue get_response('AUTH LOGIN')
-        check_auth_continue get_response(base64_encode(user))
-        get_response(base64_encode(secret))
+        check_response(get_response('DATA'), true)
+        yield
+        recv_response()
       }
-      check_auth_response res
-      res
+      check_response(res)
     end
 
-    def auth_cram_md5(user, secret)
-      check_auth_args user, secret
-      res = critical {
-        res0 = get_response('AUTH CRAM-MD5')
-        check_auth_continue res0
-        crammed = cram_md5_response(secret, res0.cram_md5_challenge)
-        get_response(base64_encode("#{user} #{crammed}"))
-      }
-      check_auth_response res
-      res
-    end
+    #
+    # auth
+    #
 
     private
 
-    def check_auth_method(type)
-      unless respond_to?(auth_method(type), true)
-        raise ArgumentError, "wrong authentication type #{type}"
-      end
-    end
-
-    def auth_method(type)
-      "auth_#{type.to_s.downcase}".intern
+    def check_auth_args( user, secret, authtype )
+      raise ArgumentError, 'both of 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 check_auth_args(user, secret)
-      unless user
-        raise ArgumentError, 'SMTP-AUTH requested but missing user name'
-      end
-      unless secret
-        raise ArgumentError, 'SMTP-AUTH requested but missing secret phrase'
-      end
+    def authenticate( user, secret, authtype )
+      __send__("auth_#{authtype || 'cram_md5'}", user, secret)
     end
 
-    def base64_encode(str)
-      # expects "str" may not become too long
-      [str].pack('m').gsub(/\s+/, '')
+    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
 
-    IMASK = 0x36
-    OMASK = 0x5c
+    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)
 
-    # CRAM-MD5: [RFC2195]
-    def cram_md5_response(secret, challenge)
-      tmp = Digest::MD5.digest(cram_secret(secret, IMASK) + challenge)
-      Digest::MD5.hexdigest(cram_secret(secret, OMASK) + tmp)
+        res = get_response(base64_encode(user + ' ' + tmp))
+      }
+      raise SMTPAuthenticationError, res unless /\A2../ === res
     end
 
-    CRAM_BUFSIZE = 64
-
-    def cram_secret(secret, mask)
-      secret = Digest::MD5.digest(secret) if secret.size > CRAM_BUFSIZE
-      buf = secret.ljust(CRAM_BUFSIZE, "\0")
-      0.upto(buf.size - 1) do |i|
-        buf[i] = (buf[i].ord ^ mask).chr
-      end
-      buf
+    def base64_encode( str )
+      # expects "str" may not become too long
+      [str].pack('m').gsub(/\s+/, '')
     end
 
     #
     # SMTP command dispatcher
     #
 
-    public
-
-    def starttls
-      getok('STARTTLS')
-    end
-
-    def helo(domain)
-      getok("HELO #{domain}")
-    end
+    private
 
-    def ehlo(domain)
-      getok("EHLO #{domain}")
+    def helo( domain )
+      getok('HELO %s', domain)
     end
 
-    def mailfrom(from_addr)
-      if $SAFE > 0
-        raise SecurityError, 'tainted from_addr' if from_addr.tainted?
-      end
-      getok("MAIL FROM:<#{from_addr}>")
+    def ehlo( domain )
+      getok('EHLO %s', domain)
     end
 
-    def rcptto_list(to_addrs)
-      raise ArgumentError, 'mail destination not given' if to_addrs.empty?
-      to_addrs.flatten.each do |addr|
-        rcptto addr
-      end
+    def mailfrom( fromaddr )
+      getok('MAIL FROM:<%s>', fromaddr)
     end
 
-    def rcptto(to_addr)
-      if $SAFE > 0
-        raise SecurityError, 'tainted to_addr' if to.tainted?
-      end
-      getok("RCPT TO:<#{to_addr}>")
-    end
-
-    # This method sends a message.
-    # If +msgstr+ is given, sends it as a message.
-    # If block is given, yield a message writer stream.
-    # You must write message before the block is closed.
-    #
-    #   # Example 1 (by string)
-    #   smtp.data(<<EndMessage)
-    #   From: john@example.com
-    #   To: betty@example.com
-    #   Subject: I found a bug
-    #   
-    #   Check vm.c:58879.
-    #   EndMessage
-    #
-    #   # Example 2 (by block)
-    #   smtp.data {|f|
-    #     f.puts "From: john@example.com"
-    #     f.puts "To: betty@example.com"
-    #     f.puts "Subject: I found a bug"
-    #     f.puts ""
-    #     f.puts "Check vm.c:58879."
-    #   }
-    #
-    def data(msgstr = nil, &block)   #:yield: stream
-      if msgstr and block
-        raise ArgumentError, "message and block are exclusive"
-      end
-      unless msgstr or block
-        raise ArgumentError, "message or block is required"
-      end
-      res = critical {
-        check_continue get_response('DATA')
-        if msgstr
-          @socket.write_message msgstr
-        else
-          @socket.write_message_by_block(&block)
-        end
-        recv_response()
-      }
-      check_response res
-      res
+    def rcptto( to )
+      getok('RCPT TO:<%s>', to)
     end
 
     def quit
       getok('QUIT')
     end
 
+    #
+    # row level library
+    #
+
     private
 
-    def getok(reqline)
+    def getok( fmt, *args )
       res = critical {
-        @socket.writeline reqline
+        @socket.writeline sprintf(fmt, *args)
         recv_response()
       }
-      check_response res
-      res
+      return check_response(res)
     end
 
-    def get_response(reqline)
-      @socket.writeline reqline
+    def get_response( fmt, *args )
+      @socket.writeline sprintf(fmt, *args)
       recv_response()
     end
 
     def recv_response
-      buf = ''
+      res = ''
       while true
         line = @socket.readline
-        buf << line << "\n"
-        break unless line[3,1] == '-'   # "210-PIPELINING"
+        res << line << "\n"
+        break unless line[3] == ?-   # "210-PIPELINING"
       end
-      Response.parse(buf)
+      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)
+    def critical( &block )
       return '200 dummy reply code' if @error_occured
       begin
         return yield()
@@ -925,90 +629,8 @@ module Net
       end
     end
 
-    def check_response(res)
-      unless res.success?
-        raise res.exception_class, res.message
-      end
-    end
-
-    def check_continue(res)
-      unless res.continue?
-        raise SMTPUnknownError, "could not get 3xx (#{res.status})"
-      end
-    end
-
-    def check_auth_response(res)
-      unless res.success?
-        raise SMTPAuthenticationError, res.message
-      end
-    end
-
-    def check_auth_continue(res)
-      unless res.continue?
-        raise res.exception_class, res.message
-      end
-    end
-
-    class Response
-      def Response.parse(str)
-        new(str[0,3], str)
-      end
-
-      def initialize(status, string)
-        @status = status
-        @string = string
-      end
-
-      attr_reader :status
-      attr_reader :string
-
-      def status_type_char
-        @status[0, 1]
-      end
-
-      def success?
-        status_type_char() == '2'
-      end
-
-      def continue?
-        status_type_char() == '3'
-      end
-
-      def message
-        @string.lines.first
-      end
-
-      def cram_md5_challenge
-        @string.split(/ /)[1].unpack('m')[0]
-      end
-
-      def capabilities
-        return {} unless @string[3, 1] == '-'
-        h = {}
-        @string.lines.drop(1).each do |line|
-          k, *v = line[4..-1].chomp.split(nil)
-          h[k] = v
-        end
-        h
-      end
-
-      def exception_class
-        case @status
-        when /\A4/  then SMTPServerBusy
-        when /\A50/ then SMTPSyntaxError
-        when /\A53/ then SMTPAuthenticationError
-        when /\A5/  then SMTPFatalError
-        else             SMTPUnknownError
-        end
-      end
-    end
-
-    def logging(msg)
-      @debug_output << msg + "\n" if @debug_output
-    end
-
   end   # class SMTP
 
   SMTPSession = SMTP
 
-end
+end   # module Net
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 73471c3327..095be45334 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -1,98 +1,94 @@
-# = net/telnet.rb - Simple Telnet Client Library
+# = net/telnet.rb - simple telnet client library
 # 
-# Author:: Wakou Aoyama <wakou@ruby-lang.org>
-# Documentation:: William Webber and Wakou Aoyama 
+# Wakou Aoyama <wakou@ruby-lang.org>
+#
+# == Overview
 #
 # This file holds the class Net::Telnet, which provides client-side
 # telnet functionality.
 #
-# For documentation, see Net::Telnet.
+# 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 of use.
+# 
+# === 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
+
 
 require "socket"
 require "delegate"
 require "timeout"
 require "English"
- 
-module Net
 
-  #
-  # == Net::Telnet
-  #
+module Net # :nodoc:
+
   # 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
+  # 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 new()).  This provides methods
+  # such as #close() to end the session and #sysread() to
+  # read data directly from the host, instead of via the
+  # #waitfor() mechanism.  Note that if you do use #sysread() 
+  # directly when in telnet mode, you should probably pass
+  # the output through #preprocess() to extract telnet command
+  # sequences.
   #
+  # See the documentation to the telnet.rb file for an overview
+  # and examples of usage.
   class Telnet < SimpleDelegator
 
     # :stopdoc:
@@ -167,7 +163,6 @@ module Net
     REVISION = '$Id$'
     # :startdoc:
 
-    #
     # Creates a new Net::Telnet object.
     #
     # Attempts to connect to the host (unless the Proxy option is
@@ -181,7 +176,7 @@ module Net
     # +options+ is a hash of options.  The following example lists
     # all options and their default values.
     # 
-    #   host = Net::Telnet::new(
+    #   host = Net::Telnet::new({
     #            "Host"       => "localhost",  # default: "localhost"
     #            "Port"       => 23,           # default: 23
     #            "Binmode"    => false,        # default: false
@@ -194,7 +189,7 @@ module Net
     #            "Waittime"   => 0,            # default: 0
     #            "Proxy"      => proxy         # default: nil
     #                            # proxy is Net::Telnet or IO object
-    #          )
+    #          })
     #
     # The options have the following meanings:
     #
@@ -246,7 +241,7 @@ module Net
     # 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
+    #           #cmd(), and #login()).  Exceding 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
@@ -271,7 +266,6 @@ module Net
     #         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")
@@ -520,15 +514,10 @@ module Net
     #            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.
-    # FailEOF:: if true, when the remote end closes the connection then an
-    #           EOFError will be raised. Otherwise, defaults to the old
-    #           behaviour that the function will return whatever data
-    #           has been received already, or nil if nothing was received.
     #           
     def waitfor(options) # :yield: recvdata
       time_out = @options["Timeout"]
       waittime = @options["Waittime"]
-      fail_eof = @options["FailEOF"]
 
       if options.kind_of?(Hash)
         prompt   = if options.has_key?("Match")
@@ -540,7 +529,6 @@ module Net
                    end
         time_out = options["Timeout"]  if options.has_key?("Timeout")
         waittime = options["Waittime"] if options.has_key?("Waittime")
-        fail_eof = options["FailEOF"]  if options.has_key?("FailEOF")
       else
         prompt = options
       end
@@ -557,7 +545,7 @@ module Net
           raise TimeoutError, "timed out while waiting for more data"
         end
         begin
-          c = @sock.readpartial(1024 * 1024)
+          c = @sock.sysread(1024 * 1024)
           @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
           if @options["Telnetmode"]
             c = rest + c
@@ -565,8 +553,7 @@ module Net
                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) ||
-                       c.rindex(/\r\z/no)
+            elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no)
               buf = preprocess(c[0 ... pt])
               rest = c[pt .. -1]
             else
@@ -578,21 +565,14 @@ module Net
            #
            # We cannot use preprocess() on this data, because that
            # method makes some Telnetmode-specific assumptions.
-           buf = rest + c
+           buf = c
+           buf.gsub!(/#{EOL}/no, "\n") unless @options["Binmode"]
            rest = ''
-           unless @options["Binmode"]
-             if pt = buf.rindex(/\r\z/no)
-               buf = buf[0 ... pt]
-               rest = buf[pt .. -1]
-             end
-             buf.gsub!(/#{EOL}/no, "\n")
-           end
           end
           @log.print(buf) if @options.has_key?("Output_log")
           line += buf
           yield buf if block_given?
         rescue EOFError # End of file reached
-          raise if fail_eof
           if line == ''
             line = nil
             yield nil if block_given?
@@ -718,31 +698,27 @@ module Net
     # 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 = /[Pp]ass(?:word|phrase)[: ]*\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 }
+        line = waitfor(/login[: ]*\z/n){|c| yield c }
         if password
           line += cmd({"String" => username,
-                       "Match" => password_prompt}){|c| yield c }
+                       "Match" => /Password[: ]*\z/n}){|c| yield c }
           line += cmd(password){|c| yield c }
         else
           line += cmd(username){|c| yield c }
         end
       else
-        line = waitfor(login_prompt)
+        line = waitfor(/login[: ]*\z/n)
         if password
           line += cmd({"String" => username,
-                       "Match" => password_prompt})
+                       "Match" => /Password[: ]*\z/n})
           line += cmd(password)
         else
           line += cmd(username)
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 54b42f336f..116644ce07 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -1,3 +1,59 @@
+#= open-uri.rb
+#
+#open-uri.rb is easy-to-use wrapper for net/http and net/ftp.
+# 
+#== Example
+#
+#It is possible to open http/ftp URL as usual 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 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 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>
+
 require 'uri'
 require 'stringio'
 require 'time'
@@ -10,21 +66,20 @@ module Kernel
   # 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://,
+  # If the first argument is a string and 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,
+  # Since open-uri.rb provides URI::HTTP#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:
+  # http:// and ftp://.  In this http and ftp case, the opened file object
+  # is extended by OpenURI::Meta.
+  def open(name, *rest, &block)
     if name.respond_to?(:open)
       name.open(*rest, &block)
-    elsif name.respond_to?(:to_str) &&
+    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)
@@ -35,67 +90,14 @@ module Kernel
   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
@@ -161,26 +163,25 @@ module OpenURI
     while true
       redirect = catch(:open_uri_redirect) {
         buf = Buffer.new
-        uri.buffer_open(buf, find_proxy.call(uri), options)
+        if proxy_uri = find_proxy.call(uri)
+          proxy_uri.proxy_open(buf, uri, options)
+        else
+          uri.direct_open(buf, options)
+        end
         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.
+          # Although it violates RFC 2616, Location: field may have relative
+          # URI.  It is converted to absolute URI using 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
+        uri_set[uri.to_s] = true 
       else
         break
       end
@@ -198,86 +199,6 @@ module OpenURI
     (/\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 {
-      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)
@@ -300,15 +221,14 @@ module OpenURI
       if StringIO === @io && StringMax < @size
         require 'tempfile'
         io = Tempfile.new('open-uri')
-        io.binmode
-        Meta.init io, @io if @io.respond_to? :meta
+        Meta.init io, @io if Meta === @io
         io << @io.string
         @io = io
       end
     end
 
     def io
-      Meta.init @io unless @io.respond_to? :meta
+      Meta.init @io unless Meta === @io
       @io
     end
   end
@@ -330,7 +250,7 @@ module OpenURI
       end
     end
 
-    # returns an Array which consists status code and message.
+    # returns an Array which consits status code and message.
     attr_accessor :status
 
     # returns a URI which is base of relative URIs in the data.
@@ -356,17 +276,16 @@ module OpenURI
 
     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_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
+      if v && %r{\A#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?/(#{RE_TOKEN})#{RE_LWS}?(#{RE_PARAMETERS})\z}o =~ 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|
+        $3.scan(/;#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?=#{RE_LWS}?(?:(#{RE_TOKEN})|(#{RE_QUOTED_STRING}))/o) {|att, val, qval|
           val = qval.gsub(/[\r\n\t !#-\[\]-~\x80-\xff]+|(\\[\x00-\x7f])/) { $1 ? $1[1,1] : $& } if qval
           parameters << [att.downcase, val]
         }
@@ -441,75 +360,60 @@ module OpenURI
     # field for HTTP.
     # I.e. it is ignored for FTP without HTTP proxy.
     #
-    # The hash may include other options which key is a symbol:
+    # The hash may include other option which key is a symbol:
+    #
+    # :proxy => "http://proxy.foo.com:8000/"
+    # :proxy => URI.parse("http://proxy.foo.com:8000/")
+    # :proxy => true
+    # :proxy => false
+    # :proxy => nil
     #
-    # [: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.
+    #    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'(or `SCHEME_PROXY') is examined.
+    #    `scheme' is replaced by `http' 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]
+    # :content_length_proc => lambda {|content_length| ... }
     #
-    #  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.
+    #   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.
     #
-    # [: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.
+    #   If two or more transfer is done by HTTP redirection, the procedure
+    #   is called only one for a last transfer.
     #
-    # [:progress_proc]
-    #  Synopsis:
-    #    :progress_proc => lambda {|size| ...}
+    #   When expected content length is unknown, the procedure is called with
+    #   nil.
+    #   It is happen when HTTP response has no Content-Length header.
     #
-    #  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.
+    # :progress_proc => lambda {|size| ...}
     #
-    #  If two or more transfer is done by HTTP redirection, the procedure
-    #  is called only one for a last transfer.
+    #   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.
     #
-    #  :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.
+    #   If two or more transfer is done by HTTP redirection, the procedure
+    #   is called only one for a last transfer.
     #
-    #    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| ... }
+    #   :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.
@@ -545,14 +449,14 @@ module URI
     # 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.
+    # http_proxy is not used too if the variable is case insentitive.
     # 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.
+        # HTTP_* for header informatin in CGI.
         # So it should be careful to use it.
         pairs = ENV.reject {|k, v| /\Ahttp_proxy\z/i !~ k }
         case pairs.length
@@ -561,37 +465,22 @@ module URI
         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.
+            # http_proxy is safe to use becase 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.to_hash[name]
+        else # http_proxy is safe to use becase 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'
@@ -612,60 +501,67 @@ module URI
   end
 
   class HTTP
-    def buffer_open(buf, proxy, options) # :nodoc:
-      OpenURI.open_http(buf, self, proxy, options)
+    def direct_open(buf, options) # :nodoc:
+      proxy_open(buf, request_uri, options)
+    end
+
+    def proxy_open(buf, uri, options) # :nodoc:
+      header = {}
+      options.each {|k, v| header[k] = v if String === k }
+
+      require 'net/http'
+      resp = nil
+      Net::HTTP.start(self.host, self.port) {|http|
+        http.request_get(uri.to_s, header) {|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
 
     include OpenURI::OpenRead
   end
 
   class FTP
-    def buffer_open(buf, proxy, options) # :nodoc:
-      if proxy
-        OpenURI.open_http(buf, self, proxy, options)
-        return
-      end
+    def direct_open(buf, options) # :nodoc:
       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 = Net::FTP.open(self.host)
       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))
+        options[:content_length_proc].call(ftp.size(self.path))
       end
-      ftp.retrbinary("RETR #{filename}", 4096) { |str|
+      ftp.getbinaryfile(self.path, '/dev/null', Net::FTP::DEFAULT_BLOCKSIZE) {|str|
         buf << str
         options[:progress_proc].call(buf.size) if options[:progress_proc]
       }
diff --git a/lib/open3.rb b/lib/open3.rb
index c4dacc9473..407cd7662c 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -1,48 +1,17 @@
+# open3.rb: Spawn a program like popen, but with stderr, too. You might also
+# want to use this if you want to bypass the shell. (By passing multiple args,
+# which IO#popen does not allow)
 #
-# = 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| ... }
+# Usage:
+#	require "open3"
 #
+#      stdin, stdout, stderr = Open3.popen3('nroff -man')
+#  or
+#	include Open3
+#      stdin, stdout, stderr = popen3('nroff -man')
 
 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.
-  #
+  #[stdin, stdout, stderr] = popen3(command);
   def popen3(*cmd)
     pw = IO::pipe   # pipe[0] for read, pipe[1] for write
     pr = IO::pipe
@@ -66,7 +35,7 @@ module Open3
 
 	exec(*cmd)
       }
-      exit!(0)
+      exit!
     }
 
     pw[0].close
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 134b540cfb..fe597987c0 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -4,85 +4,64 @@
 # 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.
+# OptionParser (in optparse.rb) is a library 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.
+# 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
+# All of these features are demonstrated in the example below.
 #
-#   require 'optparse'
-#
-#   options = {}
-#   OptionParser.new do |opts|
-#     opts.banner = "Usage: example.rb [options]"
+# === Class tree
 #
-#     opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-#       options[:verbose] = v
-#     end
-#   end.parse!
+# - 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
 #
-#   p options
-#   p ARGV
+# === Object relationship diagram
 #
-# === Complete example
+#  +--------------+
+#  | OptionParser |<>-----+
+#  +--------------+       |                      +--------+
+#                         |                    ,-| Switch |
+#       on_head -------->+---------------+    /  +--------+
+#       accept/reject -->| List          |<|>-
+#                        |               |<|>-  +----------+
+#       on ------------->+---------------+    `-| argument |
+#                          :           :        |  class   |
+#                        +---------------+      |==========|
+#       on_tail -------->|               |      |pattern   |
+#                        +---------------+      |----------|
+#  OptionParser.accept ->| DefaultList   |      |converter |
+#               reject   |(shared between|      +----------+
+#                        | all instances)|
+#                        +---------------+
+# === 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+.
+# effect of specifying various options.
 #
 #   require 'optparse'
 #   require 'optparse/time'
@@ -92,7 +71,7 @@
 #   class OptparseExample
 #   
 #     CODES = %w[iso-2022-jp shift_jis euc-jp utf8 binary]
-#     CODE_ALIASES = { "jis" => "iso-2022-jp", "sjis" => "shift_jis" }
+#     CODE_ALIASES = {"jis" => "iso-2022-jp", "sjis" => "shift_jis"}
 #   
 #     #
 #     # Return a structure describing the options.
@@ -159,8 +138,7 @@
 #         end
 #       
 #         # Optional argument with keyword completion.
-#         opts.on("--type [TYPE]", [:text, :binary, :auto],
-#                 "Select transfer type (text, binary, auto)") do |t|
+#         opts.on("--type [TYPE]", [:text, :binary, :auto], "Select transfer type (text, binary, auto)") do |t|
 #           options.transfer_type = t
 #         end
 #       
@@ -195,11 +173,9 @@
 #   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.
+# Note: if you get errors or strange results from any of the above code, make
+# sure you have the latest version installed.  Some changes have been made since
+# Ruby 1.8.0 was released. 
 #
 class OptionParser
   # :stopdoc:
@@ -215,12 +191,13 @@ class OptionParser
 
   #
   # Keyword completion module.  This allows partial arguments to be specified
-  # and resolved against a list of acceptable values.
+  # and resolved against a list of acceptable values.  The average user does not
+  # need to comprehend this.
   #
-  module Completion
-    def complete(key, icase = false, pat = nil)
+  module Completion # :nodoc:
+    def complete(key, pat = nil)
       pat ||= Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'),
-                         icase)
+                         ignore_case?)
       canon, sw, k, v, cn = nil
       candidates = []
       each do |k, *v|
@@ -261,6 +238,10 @@ class OptionParser
     def convert(opt = nil, val = nil, *)
       val
     end
+
+    def ignore_case?
+      false
+    end
   end
 
 
@@ -270,13 +251,15 @@ class OptionParser
   class OptionMap < Hash
     include Completion
   end
+  class OptionCaseMap < OptionMap
+    def ignore_case?
+      true
+    end
+  end
 
 
   #
-  # Individual switch class.  Not important to the user.
-  #
-  # Defined within Switch are several Switch-derived classes: NoArgument,
-  # RequiredArgument, etc. 
+  # Individual switch class.
   #
   class Switch
     attr_reader :pattern, :conv, :short, :long, :arg, :desc, :block
@@ -316,10 +299,19 @@ class OptionParser
         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.
-    #
+=begin
+=== Instance methods
+=end
+=begin private
+--- OptionParser::Switch#parse_arg(arg) {non-serious error handler}
+    Parses argument and returns rest of ((|arg|)), and matched portion
+    to the argument pattern.
+    :Parameters:
+      : ((|arg|))
+        option argument to be parsed.
+      : (({block}))
+        yields when the pattern doesn't match sub-string.
+=end #'#"#`#
     def parse_arg(arg)
       pattern or return nil, arg
       unless m = pattern.match(arg)
@@ -340,33 +332,53 @@ class OptionParser
     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.
-    #
+=begin private
+--- OptionParser::Switch#conv_arg(arg, val) {semi-error handler}
+    Parses argument, convert and returns ((|arg|)), ((|block|)) and
+    result of conversion.
+    : Arguments to ((|@conv|))
+      substrings matched to ((|@pattern|)), ((|$&|)), ((|$1|)),
+      ((|$2|)) and so on.
+    :Parameters:
+      : ((|arg|))
+        argument string follows the switch.
+      : ((|val|))
+        following argument.
+      : (({block}))
+        (({yields})) at semi-error condition, instead of raises exception.
+=end #'#"#`#
     def conv_arg(arg, val = nil)
-      if conv
-        val = conv.call(*val)
+      if block
+        if conv
+          val = conv.call(*val)
+        else
+          val = *val
+        end
+        return arg, block, val
       else
-        val = proc {|val| val}.call(*val)
+        return arg, nil
       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.
-    #
+=begin private
+--- OptionParser::Switch#summarize(sdone, ldone, width, max, indent)
+    Makes summary strings.
+    :Parameters:
+      : ((|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 word, right side,
+        description part strings start at ((|width|)) column.
+      : ((|max|))
+        maximum width of left side, options are filled within ((|max|)) columns.
+      : ((|indent|))
+        prefix string indents each summarized lines.
+      : (({block}))
+        to be passed each lines(without newline).
+=end #'#"#`#
     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
@@ -379,7 +391,7 @@ class OptionParser
       while s = lopts.shift
         l = left[-1].length + s.length
         l += arg.length if left.size == 1 && arg
-        l < max or sopts.empty? or left << ''
+        l < max or left << ''
         left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s
       end
 
@@ -390,7 +402,7 @@ class OptionParser
         yield(indent + l)
       end
 
-      while begin l = left.shift; r = right.shift; l or r end
+      while (l = left.shift; r = right.shift; l or r)
         l = l.to_s.ljust(width) + ' ' + r if r and !r.empty?
         yield(indent + l)
       end
@@ -398,71 +410,60 @@ class OptionParser
       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.
-    #
+=begin private
+== Switch classes
+=end #'#"#`#
+
+=begin private
+=== ((:OptionParser::Switch::NoArgument:))
+Switch that takes no arguments.
+==== Superclass
+((<OptionParser::Switch>))
+==== Instance methods
+--- OptionParser::Switch::NoArgument#parse
+    Raises an exception if any arguments given.
+=end #'#"#`#
     class NoArgument < self
-
-      #
-      # Raises an exception if any arguments given.
-      #
-      def parse(arg, argv)
+      def parse(arg, argv, &error)
         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.
-    #
+=begin private
+=== ((:OptionParser::Switch::RequiredArgument:))
+Switch that takes an argument.
+==== Superclass
+((<OptionParser::Switch>))
+==== Instance methods
+--- OptionParser::Switch::RequiredArgument#parse
+    Raises an exception if argument is not present.
+=end #'#"#`#
     class RequiredArgument < self
-
-      #
-      # Raises an exception if argument is not present.
-      #
-      def parse(arg, argv)
+      def parse(arg, argv, &error)
         unless arg
           raise MissingArgument if argv.empty?
           arg = argv.shift
         end
-        conv_arg(*parse_arg(arg) {|*exc| raise(*exc)})
+        conv_arg(*parse_arg(arg, &error))
       end
     end
 
-    #
-    # Switch that can omit argument.
-    #
+=begin private
+=== ((:OptionParser::Switch::OptionalArgument:))
+Switch that can omit argument.
+==== Superclass
+((<OptionParser::Switch>))
+==== Instance methods
+--- OptionParser::Switch::OptionalArgument#parse
+    Parses argument if given, or uses default value.
+=end #'#"#`#
     class OptionalArgument < self
-
-      #
-      # Parses argument if given, or uses default value.
-      #
       def parse(arg, argv, &error)
         if arg
           conv_arg(*parse_arg(arg, &error))
@@ -472,14 +473,7 @@ class OptionParser
       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
@@ -496,38 +490,51 @@ class OptionParser
     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.
-  #
+
+=begin
+== ((:OptionParser::List:))
+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.
+=end #'#"#`#
   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.
-    #
+=begin
+=== Class methods
+=end #'#"#`#
+=begin private
+--- OptionParser::List.new
+    Just initializes all instance variables.
+=end #'#"#`#
     def initialize
       @atype = {}
       @short = OptionMap.new
-      @long = OptionMap.new
+      @long = OptionCaseMap.new
       @list = []
     end
 
-    #
-    # See OptionParser.accept.
-    #
-    def accept(t, pat = /.*/nm, &block)
+=begin
+=== Instance methods
+=end #'#"#`#
+=begin
+--- OptionParser::List#atype
+    Map from acceptable argument types to pattern and converter pairs.
+--- OptionParser::List#short
+    Map from short style option switches to actual switch objects.
+--- OptionParser::List#long
+    Map from long style option switches to actual switch objects.
+--- OptionParser::List#list
+    List of all switches and summary string.
+=end #'#"#`#
+    attr_reader :atype, :short, :long, :list
+
+=begin private
+--- OptionParser::List#accept(type[, pattern]) {...}
+    see ((<OptionParser.accept>)).
+--- OptionParser::List#reject(type)
+    see ((<OptionParser.reject>)).
+=end #'#"#`#
+    def accept(t, pat = /.*/, &block)
       if pat
         pat.respond_to?(:match) or raise TypeError, "has no `match'"
       else
@@ -539,21 +546,24 @@ class OptionParser
       @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.
-    #
+=begin private
+--- OptionParser::List#update(sw, sopts, lopts, nlopts = nil)
+    Adds ((|sw|)) according to ((|sopts|)), ((|lopts|)) and
+    ((|nlopts|)).
+    :Parameters:
+      : ((|sw|))
+        ((<OptionParser::Switch>)) instance to be added.
+      : ((|sopts|))
+        short style options list.
+      : ((|lopts|))
+        long style options list.
+      : ((|nlopts|))
+        negated long style options list.
+=end #'#"#`#
     def update(sw, sopts, lopts, nsw = nil, nlopts = nil)
       o = nil
       sopts.each {|o| @short[o] = sw} if sopts
@@ -564,104 +574,109 @@ class OptionParser
     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)
-    #
+=begin
+--- OptionParser::List#prepend(switch, short_opts, long_opts, nolong_opts)
+    Inserts ((|switch|)) at head of the list, and associates short,
+    long and negated long options.
+--- OptionParser::List#append(switch, short_opts, long_opts, nolong_opts)
+    Appends ((|switch|)) at tail of the list, and associates short,
+    long and negated long options.
+    :Parameters:
+      : ((|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.
+=end #'#"#`#
     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.
-    #
+=begin
+--- OptionParser::List#search(id, key) [{block}]
+    Searches ((|key|)) in ((|id|)) list.
+    :Parameters:
+      : ((|id|))
+        searching list.
+      : ((|k|))
+        searching key.
+      : (({block}))
+        yielded with the found value when succeeded.
+=end #'#"#`#
     def search(id, key)
       if list = __send__(id)
         val = list.fetch(key) {return nil}
-        block_given? ? yield(val) : val
+        return val unless block_given?
+        yield(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)
+=begin
+--- OptionParser::List#complete(id, opt, *pat, &block)
+    Searches list ((|id|)) for ((|opt|)) and ((|*pat|)).
+    :Parameters:
+      : ((|id|))
+        searching list.
+      : ((|opt|))
+        searching key.
+      : ((|*pat|))
+        optional pattern for completion.
+      : (({block}))
+        yielded with the found value when succeeded.
+=end #'#"#`#
+    def complete(id, opt, *pat, &block)
+      __send__(id).complete(opt, *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.
-    #
+=begin
+--- OptionParser::List#summarize(*args) {...}
+    Making summary table, yields the (({block})) with each lines.
+    Each elements of (({@list})) should be able to (({summarize})).
+    :Parameters:
+      : ((|args|))
+        passed to elements#summarize through.
+      : (({block}))
+        to be passed each lines(without newline).
+=end #'#"#`#
     def summarize(*args, &block)
       list.each do |opt|
         if opt.respond_to?(:summarize) # perhaps OptionParser::Switch
           opt.summarize(*args, &block)
-        elsif !opt
+        elsif opt.empty?
           yield("")
-        elsif opt.respond_to?(:each_line)
-          opt.each_line(&block)
         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.
-  #
+
+=begin private
+== ((:OptionParser::CompletingHash:))
+(({Hash})) with completion search feature.
+=== Superclass
+(({Hash}))
+=== Including modules
+((<OptionParser::Completion>))
+=end #'#"#`#
   class CompletingHash < Hash
     include Completion
 
-    #
-    # Completion for hash key.
-    #
+=begin private
+=== Instance methods
+--- OptionParser::CompletingHash#match(key)
+    Completion for hash key.
+=end #'#"#`#
     def match(key)
       return key, *fetch(key) {
         raise AmbiguousArgument, catch(:ambiguous) {return complete(key)}
@@ -669,94 +684,106 @@ class OptionParser
     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.
-  #
+
+=begin
+== ((:OptionParser:))
+The front-end of (({OptionParser})).
+=end #'#"#`#
+
+=begin
+=== Constants
+=end #'#"#`#
+
+=begin
+--- OptionParser::ArgumentStyle
+    Enumeration of acceptable argument styles; possible values are:
+    : OptionParser::NO_ARGUMENT
+      the switch takes no arguments. ((({:NONE}))) 
+    : OptionParser::REQUIRED_ARGUMENT
+      the switch requires an argument. ((({:REQUIRED})))
+    : OptionParser::OPTIONAL_ARGUMENT
+      the switch requires an optional argument, that is, may take or
+      not. ((({:OPTIONAL})))
+
+    Use like (({--switch=argument}))(long style) or
+    (({-Xargument}))(short style). For short style, only portion
+    matched to ((<argument pattern>)) is dealed as argument.
+=end #'#"#`#
   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
-  #
+=begin private
+--- OptionParser::DefaultList
+    Switches common used such as '--', and also provides default
+    argument classes
+=end #'#"#`#
   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
+=begin undocumented
+=== Default options
+Default options, which never appear in option summary.
+--- --help
+    Shows option summary.
+--- --version
+    Shows version string if (({::Version})) is defined.
+=end #'#"#`#
+  DefaultList.long['help'] = Switch::NoArgument.new do
+    puts ARGV.options
+    exit
   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
+  DefaultList.long['version'] = Switch::OptionalArgument.new do |pkg|
+    if pkg
+      begin
+        require 'optparse/version'
+      rescue LoadError
+        pkg = nil
+      else
+        show_version(*pkg.split(/,/))
       end
-      v = parser.ver or abort("#{parser.program_name}: version unknown")
-      puts v
-      exit
     end
+    unless pkg
+      v = ARGV.options.ver and puts v
+    end
+    exit
   end
 
-  # :startdoc:
-
-  #
-  # Class methods
-  #
+=begin
+=== Class methods
+=end #'#"#`#
 
-  #
-  # 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.
-  #
+=begin
+--- OptionParser.with([banner[, width[, indent]]]) [{...}]
+    Initializes new instance, and evaluates the block in context of
+    the instance if called as iterator.  This behavior is equivalent
+    to older (({new})).  This is ((*deprecated*)) method.
+    
+    cf. ((<OptionParser.new>))
+    :Parameters:
+      : ((|banner|))
+        banner message.
+      : ((|width|))
+        summary width.
+      : ((|indent|))
+        summary indent.
+      : (({block}))
+        to be evaluated in the new instance context.
+=end #'#"#`#
   def self.with(*args, &block)
     opts = new(*args)
     opts.instance_eval(&block)
     opts
   end
 
-  #
-  # Returns an incremented value of +default+ according to +arg+.
-  #
+=begin
+--- OptionParser.inc(arg[, default])
+--- OptionParser#inc(arg[, default])
+    Returns incremented value of ((|default|)) according to ((|arg|)).
+=end
   def self.inc(arg, default = nil)
     case arg
     when Integer
@@ -769,35 +796,36 @@ class OptionParser
     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.
-  #
+=begin
+--- OptionParser.new([banner[, width[, indent]]]) [{...}]
+    Initializes the instance, and yields itself if called as iterator.
+    :Parameters:
+      : ((|banner|))
+        banner message.
+      : ((|width|))
+        summary width.
+      : ((|indent|))
+        summary indent.
+      : (({block}))
+        to be evaluated in the new instance context.
+=end #'#"#`#
   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.
-  #
+=begin
+--- OptionParser.terminate([arg])
+    Terminates option parsing. Optional parameter ((|arg|)) would be
+    pushed back if given.
+    :Parameters:
+      : ((|arg|))
+        string pushed back to be first non-option argument
+=end #'#"#`#
   def terminate(arg = nil)
     self.class.terminate(arg)
   end
@@ -808,101 +836,90 @@ class OptionParser
   @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)
-  #
+=begin
+--- OptionParser.accept(t, [pat]) {...}
+--- OptionParser#accept(t, [pat]) {...}
+    Directs to accept specified class argument.
+    :Parameters:
+      : ((|t|))
+        argument class specifier, any object including Class.
+      : ((|pat|))
+        pattern for argument, defaulted to ((|t|)) if it respond to (({match})).
+      : (({block}))
+        receives argument string and should be convert to desired class.
+=end #'#"#`#
   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 specifier, any object including Class.
-  #
-  #   reject(t)
-  #
+=begin
+--- OptionParser.reject(t)
+--- OptionParser#reject(t)
+    Directs to reject specified class argument.
+    :Parameters:
+      : ((|t|))
+        argument class specifier, any object including Class.
+=end #'#"#`#
   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
+
+=begin
+=== Instance methods
+=end #'#"#`#
+
+=begin
+--- OptionParser#banner
+--- OptionParser#banner=(heading)
+    Heading banner preceding summary.
+--- OptionParser#summary_width
+--- OptionParser#summary_width=(width)
+    Width for option list portion of summary. Must be (({Numeric})).
+--- OptionParser#summary_indent
+--- OptionParser#summary_indent=(indent)
+    Indentation for summary. Must be (({String})) (or have (({+ String}))).
+--- OptionParser#program_name
+--- OptionParser#program_name=(name)
+    Program name to be emitted in error message and default banner,
+    defaulted to (({$0})).
+=end #'#"#`#
+  attr_writer :banner, :program_name
+  attr_accessor :summary_width, :summary_indent
 
-  # 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
+    @banner ||= "Usage: #{program_name} [options]"
   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 :-)
+# 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
+=begin
+--- OptionParser#version
+--- OptionParser#version=(ver)
+    Version.
+--- OptionParser#release
+--- OptionParser#release=(rel)
+    Release code.
+--- OptionParser#ver
+    Returns version string from ((<program_name>)), (({version})) and
+    (({release})).
+=end #'#"#`#
+  attr_writer :version, :release
 
-  #
-  # Version
-  #
   def version
-    @version || (defined?(::Version) && ::Version)
+    @version || (defined?(::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('.')}"
@@ -912,30 +929,33 @@ class OptionParser
   end
 
   def warn(mesg = $!)
-    super("#{program_name}: #{mesg}")
+    super(program_name + ': ' + mesg)
   end
 
   def abort(mesg = $!)
-    super("#{program_name}: #{mesg}")
+    super(program_name + ': ' + mesg)
   end
 
-  #
-  # Subject of #on / #on_head, #accept / #reject
-  #
+=begin
+--- OptionParser#top
+    Subject of ((<on>))/((<on_head>)), ((<accept>))/((<reject>)).
+=end #'#"#`#
   def top
     @stack[-1]
   end
 
-  #
-  # Subject of #on_tail.
-  #
+=begin
+--- OptionParser#base
+    Subject of ((<on_tail>)).
+=end #'#"#`#
   def base
     @stack[1]
   end
 
-  #
-  # Pushes a new List.
-  #
+=begin
+--- OptionParser#new
+    Pushes a new (({List})).
+=end #'#"#`#
   def new
     @stack.push(List.new)
     if block_given?
@@ -945,46 +965,99 @@ class OptionParser
     end
   end
 
-  #
-  # Removes the last List.
-  #
+=begin
+--- OptionParser#remove
+    Removes the last (({List})).
+=end #'#"#`#
   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.
-  #
+
+=begin
+--- OptionParser#summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent)
+    Puts option summary into ((|to|)), and returns ((|to|)).
+    :Parameters:
+      : ((|to|))
+        output destination, which must have method ((|<<|)). Defaulted to (({[]})).
+      : ((|width|))
+        width of left side. Defaulted to ((|@summary_width|))
+      : ((|max|))
+        maximum length allowed for left side. Defaulted to (({((|width|)) - 1}))
+      : ((|indent|))
+        indentation. Defaulted to ((|@summary_indent|))
+      : (({block}))
+        yields with each line if called as iterator.
+=end #'#"#`#
   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.
-  #
+=begin
+--- OptionParser#help
+--- OptionParser#to_s
+    Returns option summary string.
+=end #'#"#`#
   def help; summarize(banner.to_s.sub(/\n?\z/, "\n")) end
   alias to_s help
 
-  #
-  # Returns option summary list.
-  #
+=begin
+--- OptionParser#to_a
+    Returns option summary list.
+=end #'#"#`#
   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.
-  #
+
+=begin
+--- OptionParser#switch
+    Creates ((<OptionParser::Switch>)).
+    :Parameters:
+      : ((|*opts|))
+        option definition:
+        : argument style
+          see ((<OptionParser::ArgumentStyle>))
+        : argument pattern
+          acceptable option argument format, must pre-defined with
+          ((<OptionParser.accept>)) or ((<OptionParser#accept>)), or
+          (({Regexp})). This can appear once or assigned as (({String}))
+          if not present, otherwise causes exception (({ArgumentError})).
+          
+          cf. ((<Acceptable argument classes>)).
+        : Hash
+        : Array
+          possible argument values.
+        : Proc
+        : Method
+          alternative way to give the ((*handler*)).
+        : "--switch=MANDATORY", "--switch[=OPTIONAL]", "--switch"
+          specifies long style switch that takes ((*mandatory*)),
+          ((*optional*)) and ((*no*)) argument, respectively.
+        : "-xMANDATORY", "-x[OPTIONAL]", "-x"
+          specifies short style switch that takes ((*mandatory*)),
+          ((*optional*)) and ((*no*)) argument, respectively.
+        : "-[a-z]MANDATORY", "-[a-z][OPTIONAL]", "-[a-z]"
+          special form short style switch that matches character
+          range(not fullset of regular expression).
+        : "=MANDATORY", "=[OPTIONAL]"
+          argument style and description.
+        : "description", ...
+          ((*description*)) for this option.
+      : (({block}))
+        ((*handler*)) to convert option argument to arbitrary (({Class})).
+=end #'#"#`#
+=begin private
+--- OptionParser#notwice(obj, prv, msg)
+    Checks never given twice an argument.
+    ((*Called from OptionParser#switch only*))
+    :Parameters:
+      : ((|obj|))
+        new argument.
+      : ((|prv|))
+        previously specified argument.
+      : ((|msg|))
+        exception message
+=end #'#"#`#
   def notwice(obj, prv, msg)
     unless !prv or prv == obj
       begin
@@ -998,65 +1071,7 @@ class OptionParser
   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 regular expression):
-  #     "-[a-z]MANDATORY"
-  #     "-[a-z][OPTIONAL]" 
-  #     "-[a-z]"
-  #
-  # [Argument style and description:]
-  #   Instead of specifying mandatory or optional arguments 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)
+  def make_switch(*opts, &block)
     short, long, nolong, style, pattern, conv, not_pattern, not_conv, not_style = [], [], []
     ldesc, sdesc, desc, arg = [], [], []
     default_style = Switch::NoArgument
@@ -1079,7 +1094,7 @@ class OptionParser
       # 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)
+        conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
         next
       end
 
@@ -1092,7 +1107,7 @@ class OptionParser
         when CompletingHash
         when nil
           pattern = CompletingHash.new
-          conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
+          conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
         else
           raise ArgumentError, "argument pattern given twice"
         end
@@ -1159,31 +1174,35 @@ class OptionParser
     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,
+    s = if short.empty? and long.empty?
+          raise ArgumentError, "no switch given" if style or pattern or block
+          desc
+        else
+          (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
+        end
     return s, short, long,
       (not_style.new(not_pattern, not_conv, sdesc, ldesc, nil, desc, block) if not_style),
       nolong
   end
 
+=begin
+--- OptionParser#on(*opts) [{...}]
+--- OptionParser#def_option(*opts) [{...}]
+--- OptionParser#on_head(*opts) [{...}]
+--- OptionParser#def_head_option(*opts) [{...}]
+--- OptionParser#on_tail(*opts) [{...}]
+--- OptionParser#def_tail_option(*opts) [{...}]
+    Defines option switch and handler. (({on_head})), (({def_head_option}))
+    and (({on_tail})), (({def_tail_option})) put the switch at head
+    and tail of summary, respectively.
+
+    cf. ((<OptionParser#switch>)).
+=end #'#"#`#
   def define(*opts, &block)
-    top.append(*(sw = make_switch(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
@@ -1191,13 +1210,9 @@ class OptionParser
   alias def_option define
 
   def define_head(*opts, &block)
-    top.prepend(*(sw = make_switch(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
@@ -1205,72 +1220,68 @@ class OptionParser
   alias def_head_option define_head
 
   def define_tail(*opts, &block)
-    base.append(*(sw = make_switch(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.
-  #
+
+=begin
+--- OptionParser#order(*argv) [{...}]
+--- OptionParser#order!([argv = ARGV]) [{...}]
+    Parses ((|argv|)) in order. When non-option argument encountered,
+    yields it if called as iterator, otherwise terminates the parse
+    process.
+    Returns rest of ((|argv|)) left unparsed.
+    
+    (({order!})) takes argument array itself, and removes switches
+    destructively.
+    Defaults to parse ((|ARGV|)).
+    :Parameters:
+      : ((|argv|))
+        command line arguments to be parsed.
+      : (({block}))
+        called with each non-option argument.
+=end #'#"#`#
   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:
+  def order!(argv = ARGV, &nonopt)
     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
+        when /\A--([^=]*)(?:=(.*))?/
           opt, rest = $1, $2
           begin
-            sw, = complete(:long, opt, true)
+            sw, = complete(:long, opt)
           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
+            opt, sw, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
+            sw.call(val) if sw
           rescue ParseError
             raise $!.set_option(arg, rest)
           end
 
         # short option
-        when /\A-(.)((=).*|.+)?/nm
+        when /\A-(.)((=).*|.+)?/
           opt, has_arg, eq, val, rest = $1, $3, $3, $2, $2
           begin
-            sw, = search(:short, opt)
-            unless sw
+            unless sw = search(:short, opt)
               begin
                 sw, = complete(:short, opt)
                 # short option matched.
@@ -1287,48 +1298,45 @@ class OptionParser
             raise $!.set_option(arg, true)
           end
           begin
-            opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
+            opt, sw, 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
+            sw.call(val) if sw
           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
+          nonopt.call(arg)
         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.
-  #
+=begin
+--- OptionParser#permute(*argv)
+--- OptionParser#permute!([argv = ARGV])
+    Parses ((|argv|)) in permutation mode, and returns list of
+    non-option arguments.
+    
+    (({permute!})) takes argument array itself, and removes switches
+    destructively.
+    Defaults to parse ((|ARGV|)).
+    :Parameters:
+      : ((|argv|))
+        command line arguments to be parsed.
+=end #'#"#`#
   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)
+  def permute!(argv = ARGV)
     nonopts = []
     arg = nil
     order!(argv) {|arg| nonopts << arg}
@@ -1336,19 +1344,25 @@ class OptionParser
     argv
   end
 
-  #
-  # Parses command line arguments +argv+ in order when environment variable
-  # POSIXLY_CORRECT is set, and in permutation mode otherwise.
-  #
+=begin
+--- OptionParser#parse(*argv)
+--- OptionParser#parse!([argv = ARGV])
+    Parses ((|argv|)) in order when environment variable (({POSIXLY_CORRECT}))
+    is set, otherwise permutation mode
+    
+    (({parse!})) takes argument array itself, and removes switches
+    destructively.
+    Defaults to parse ((|ARGV|)).
+    :Parameters:
+      : ((|argv|))
+        command line arguments to be parsed.
+=end #'#"#`#
   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)
+  def parse!(argv = ARGV)
     if ENV.include?('POSIXLY_CORRECT')
       order!(argv)
     else
@@ -1356,57 +1370,18 @@ class OptionParser
     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+.
-  #
+
+=begin private
+--- OptionParser#visit(id, *args) {block}
+    Traverses (({stack}))s calling method ((|id|)) with ((|*args|)).
+    :Parameters:
+      : ((|id|))
+        called method in each elements of (({stack}))s.
+      : ((|*args|))
+        passed to ((|id|)).
+      : (({block}))
+        passed to ((|id|)).
+=end #'#"#`#
   def visit(id, *args, &block)
     el = nil
     @stack.reverse_each do |el|
@@ -1416,44 +1391,60 @@ class OptionParser
   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
+=begin private
+--- OptionParser#search(id, k)
+    Searches ((|k|)) in stack for ((|id|)) hash, and returns it or yielded
+    value if called as iterator.
+    :Parameters:
+      : ((|id|))
+        searching table.
+      : ((|k|))
+        searching key.
+      : (({block}))
+        yielded with the found value when succeeded.
+=end #'#"#`#
+  def search(id, k)
+    visit(:search, id, k) do |k|
+      return k unless block_given?
+      return yield(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)
+=begin private
+--- OptionParser#complete(typ, opt, *etc)
+    Completes shortened long style option switch, and returns pair of
+    canonical switch and switch descriptor((<OptionParser::Switch>)).
+    :Parameters:
+      : ((|id|))
+        searching table.
+      : ((|opt|))
+        searching key.
+      : ((|*pat|))
+        optional pattern for completion.
+      : (({block}))
+        yielded with the found value when succeeded.
+=end #'#"#`#
+  def complete(typ, opt, *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}
+      visit(:complete, typ, opt, *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.
-  #
+=begin undocumented
+--- OptionParser#load([filename])
+    Loads options from file named as ((|filename|)). Does nothing when
+    the file is not present. Returns whether successfuly loaded.
+    :Parameters:
+      : ((|filename|))
+        option file name.  defaulted to basename of the program without
+        suffix in a directory ((%~/.options%)).
+=end #'#"#`#
   def load(filename = nil)
     begin
       filename ||= File.expand_path(File.basename($0, '.*'), '~/.options')
@@ -1468,38 +1459,44 @@ class OptionParser
     end
   end
 
-  #
-  # Parses environment variable +env+ or its uppercase with splitting like a
-  # shell.
-  #
-  # +env+ defaults to the basename of the program.
-  #
+=begin undocumented
+--- OptionParser#environment([env])
+    Parses environment variable ((|env|)) or its uppercase with spliting
+    like as shell.
+    :Parameters:
+      : ((|env|))
+        defaulted to basename of the program.
+=end #'#"#`#
   def environment(env = File.basename($0, '.*'))
     env = ENV[env] || ENV[env.upcase] or return
     parse(*Shellwords.shellwords(env))
   end
 
-  #
-  # Acceptable argument classes
-  #
+
+=begin
+= Acceptable argument classes
+=end #'#"#`#
 
-  #
-  # Any string and no conversion. This is fall-back.
-  #
+=begin
+: Object
+  any string, and no conversion. this is fall-back.
+=end #'#"#`#
   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.
-  #
+=begin
+: String
+  any none-empty string, and no conversion.
+=end #'#"#`#
+  accept(String, /.+/) {|s,*|s}
+
+=begin
+: Integer
+  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})).
+=end #'#"#`#
   decimal = '\d+(?:_\d+)*'
   binary = 'b[01]+(?:_[01]+)*'
   hex = 'x[\da-f]+(?:_[\da-f]+)*'
@@ -1507,57 +1504,63 @@ class OptionParser
   integer = "#{octal}|#{decimal}"
   accept(Integer, %r"\A[-+]?(?:#{integer})"io) {|s,| Integer(s) if s}
 
-  #
-  # Float number format, and converts to Float.
-  #
+=begin
+: Float
+  Float number format, and converts to (({Float})).
+=end #'#"#`#
   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.
-  #
+=begin
+: Numeric
+  Generic numeric format, and converts to (({Integer})) for integer
+  format, (({Float})) for float format.
+=end #'#"#`#
   accept(Numeric, %r"\A[-+]?(?:#{octal}|#{float})"io) {|s,| eval(s) if s}
 
-  #
-  # Decimal integer format, to be converted to Integer.
-  #
+=begin
+: OptionParser::DecimalInteger
+  Decimal integer format, to be converted to (({Integer})).
+=end #'#"#`#
   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.
-  #
+=begin
+: OptionParser::OctalInteger
+  Ruby/C like octal/hexadecimal/binary integer format, to be converted
+  to (({Integer})).
+=end #'#"#`#
   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.
-  #
+=begin
+: OptionParser::DecimalNumeric
+  Decimal integer/float number format, to be converted to
+  (({Integer})) for integer format, (({Float})) for float format.
+=end #'#"#`#
   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/+/-.
-  #
+=begin
+: TrueClass
+  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/+/-})).
+: FalseClass
+  Similar to ((<TrueClass>)), but defaulted to (({false})).
+=end #'#"#`#
   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 ",".
-  #
+=begin
+: Array
+  List of strings separated by ","
+=end #'#"#`#
   accept(Array) do |s,|
     if s
       s = s.split(',').collect {|s| s unless s.empty?}
@@ -1565,29 +1568,32 @@ class OptionParser
     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.
-  #
+
+=begin
+= Exceptions
+=end #'#"#`#
+
+=begin
+== ((:OptionParser::ParseError:))
+Base class of exceptions from ((<OptionParser>))
+=== Superclass
+(({RuntimeError}))
+=== Constants
+: OptionParser::ParseError::Reason
+  Reason caused error.
+=== Instance methods
+--- OptionParser::ParseError#recover(argv)
+    Push backs erred argument(s) to ((|argv|)).
+--- OptionParser::ParseError#reason
+    Returns error reason. Override this to I18N.
+--- OptionParser::ParseError#inspect
+    Returns inspection string.
+--- OptionParser::ParseError#message
+--- OptionParser::ParseError#to_s
+--- OptionParser::ParseError#to_str
+    Default stringizing method to emit standard error message.
+=end #'#"#`#
   class ParseError < RuntimeError
-    # Reason which caused the error.
     Reason = 'parse error'.freeze
 
     def initialize(*args)
@@ -1598,9 +1604,6 @@ class OptionParser
     attr_reader :args
     attr_writer :reason
 
-    #
-    # Pushes back erred argument(s) to +argv+.
-    #
     def recover(argv)
       argv[0, 0] = @args
       argv
@@ -1615,9 +1618,6 @@ class OptionParser
       self
     end
 
-    #
-    # Returns error reason. Override this for I18N.
-    #
     def reason
       @reason || self.class::Reason
     end
@@ -1626,73 +1626,93 @@ class OptionParser
       "#<#{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
+    alias to_str message
   end
 
-  #
-  # Raises when ambiguously completable string is encountered.
-  #
+=begin
+== ((:OptionParser::AmbiguousOption:))
+Raises when encountered ambiguously completable string.
+=== Superclass
+((<OptionParser::ParseError>))
+=end #'#"#`#
   class AmbiguousOption < ParseError
     const_set(:Reason, 'ambiguous option'.freeze)
   end
 
-  #
-  # Raises when there is an argument for a switch which takes no argument.
-  #
+=begin
+== ((:OptionParser::NeedlessArgument:))
+Raises when encountered argument for switch defined as which takes no
+argument.
+=== Superclass
+((<OptionParser::ParseError>))
+=end #'#"#`#
   class NeedlessArgument < ParseError
-    const_set(:Reason, 'needless argument'.freeze)
+    const_set(:Reason, 'needles argument'.freeze)
   end
 
-  #
-  # Raises when a switch with mandatory argument has no argument.
-  #
+=begin
+== ((:OptionParser::MissingArgument:))
+Raises when no argument found for switch defined as which needs
+argument.
+=== Superclass
+((<OptionParser::ParseError>))
+=end #'#"#`#
   class MissingArgument < ParseError
     const_set(:Reason, 'missing argument'.freeze)
   end
 
-  #
-  # Raises when switch is undefined.
-  #
+=begin
+== ((:OptionParser::InvalidOption:))
+Raises when undefined switch.
+=== Superclass
+((<OptionParser::ParseError>))
+=end #'#"#`#
   class InvalidOption < ParseError
     const_set(:Reason, 'invalid option'.freeze)
   end
 
-  #
-  # Raises when the given argument does not match required format.
-  #
+=begin
+== ((:OptionParser::InvalidArgument:))
+Raises when the given argument does not match required format.
+=== Superclass
+((<OptionParser::ParseError>))
+=end #'#"#`#
   class InvalidArgument < ParseError
     const_set(:Reason, 'invalid argument'.freeze)
   end
 
-  #
-  # Raises when the given argument word can't be completed uniquely.
-  #
+=begin
+== ((:OptionParser::AmbiguousArgument:))
+Raises when the given argument word can't completed uniquely.
+=== Superclass
+((<OptionParser::InvalidArgument>))
+=end #'#"#`#
   class AmbiguousArgument < InvalidArgument
     const_set(:Reason, 'ambiguous argument'.freeze)
   end
 
-  #
-  # Miscellaneous
-  #
-
-  #
-  # Extends command line arguments array (ARGV) to parse itself.
-  #
+
+=begin
+= Miscellaneous
+=end #'#"#`#
+=begin
+== ((:OptionParser::Arguable:))
+Extends command line arguments array to parse itself.
+=end #'#"#`#
   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.
-    #
+=begin
+--- OptionParser::Arguable#options=(opt)
+    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.
+=end #'#"#`#
     def options=(opt)
       unless @optparse = opt
         class << self
@@ -1702,17 +1722,23 @@ class OptionParser
       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.
-    #
+=begin
+--- OptionParser::Arguable#options
+    Actual ((<OptionParser>)) object, automatically created if not
+    yet.
+
+    If called as iterator, yields with the ((<OptionParser>)) object
+    and returns the result of the block. In this case, rescues any
+    ((<OptionParser::ParseError>)) exceptions in the block, just emits
+    error message to ((<STDERR>)) and returns (({nil})).
+
+    :Parameters:
+      : (({block}))
+        Yielded with the ((<OptionParser>)) instance.
+
+=end #'#"#`#
     def options
       @optparse ||= OptionParser.new
-      @optparse.default_argv = self
       block_given? or return @optparse
       begin
         yield @optparse
@@ -1722,42 +1748,20 @@ class OptionParser
       end
     end
 
-    #
-    # Parses +self+ destructively in order and returns +self+ containing the
-    # rest arguments left unparsed.
-    #
+=begin
+--- OptionParser::Arguable#order!
+--- OptionParser::Arguable#permute!
+--- OptionParser::Arguable#parse!
+    Parses ((|self|)) destructively, and returns ((|self|)) just contains
+    rest arguments left without parsed.
+=end #'#"#`#
     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.
-    #
+=begin private
+Initializes instance variable.
+=end #'#"#`#
     def self.extend_object(obj)
       super
       obj.instance_eval {@optparse = nil}
@@ -1768,10 +1772,12 @@ class OptionParser
     end
   end
 
-  #
-  # Acceptable argument classes. Now contains DecimalInteger, OctalInteger
-  # and DecimalNumeric. See Acceptable argument classes (in source code).
-  #
+=begin
+== OptionParser::Acceptables
+Acceptable argument classes.  Now contains (({DecimalInteger})),
+(({OctalInteger})) and (({DecimalNumeric})).
+see ((<Acceptable argument classes>)).
+=end #'#"#`#
   module Acceptables
     const_set(:DecimalInteger, OptionParser::DecimalInteger)
     const_set(:OctalInteger, OptionParser::OctalInteger)
@@ -1782,9 +1788,15 @@ 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)
+  } or exit 1
 end
+__END__
+=begin example
+= Example
+<<< opttest.rb
+=end #'#"#`#
diff --git a/lib/optparse/version.rb b/lib/optparse/version.rb
index 558d9d710b..8e99836878 100644
--- a/lib/optparse/version.rb
+++ b/lib/optparse/version.rb
@@ -3,47 +3,45 @@
 class << OptionParser
   def show_version(*pkg)
     progname = ARGV.options.program_name
-    result = false
-    show = proc do |klass, cname, version|
+    show = proc do |klass, version|
+      version = version.join(".") if Array === 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
+      str << ": #{klass}" unless klass == Object
+      str << " version #{version}"
+      case
+      when klass.const_defined?(:Release)
+        str << " (#{klass.const_get(:Release)})"
+      when klass.const_defined?(:RELEASE)
+        str << " (#{klass.const_get(:Release)})"
       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)
+          show.call(klass, version)
         end
       end
     else
       pkg.each do |pkg|
+        /\A[A-Z]\w*((::|\/)[A-Z]\w*)*\z/ni =~ pkg or next
         begin
-          pkg = pkg.split(/::|\//).inject(::Object) {|m, c| m.const_get(c)}
+          pkg = eval(pkg)
           v = case
               when pkg.const_defined?(:Version)
-                pkg.const_get(n = :Version)
+                pkg.const_get(:Version)
               when pkg.const_defined?(:VERSION)
-                pkg.const_get(n = :VERSION)
+                pkg.const_get(:VERSION)
               else
-                n = nil
                 "unknown"
               end
-          show.call(pkg, n, v)
+          show.call(pkg, v)
         rescue NameError
+          puts "#{progname}: #$!"
         end
       end
     end
-    result
+    exit
   end
 
   def each_const(path, klass = ::Object)
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index 6af5bbdac0..eea7132ca0 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -1,93 +1,34 @@
+# ostruct.rb - Python Style Object
+#  just assign to create field
 #
-# = 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.
-#
+# s = OpenStruct.new
+# s.foo = 25
+# p s.foo
+# s.bar = 2
+# p s.bar
+# p s
 
-#
-# 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)
+	@table[k.to_sym] = v
       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:
+  def method_missing(mid, *args)
     mname = mid.id2name
     len = args.length
     if mname =~ /=$/
       if len != 1
-        raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
+	raise ArgumentError, "wrong # of arguments (#{len} for 1)", caller(1)
       end
       if self.frozen?
-        raise TypeError, "can't modify frozen #{self.class}", caller(1)
+	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]
@@ -96,49 +37,21 @@ class OpenStruct
     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
+    str = "<#{self.class}"
+    for k,v in @table
+      str << " #{k}=#{v.inspect}"
     end
-
     str << ">"
   end
-  alias :to_s :inspect
 
-  attr_reader :table # :nodoc:
+  attr_reader :table
   protected :table
 
-  #
-  # Compare this object and +other+ for equality.
-  #
   def ==(other)
     return false unless(other.kind_of?(OpenStruct))
     return @table == other.table
diff --git a/lib/parsearg.rb b/lib/parsearg.rb
index cab2dba789..d5f3c9638d 100644
--- a/lib/parsearg.rb
+++ b/lib/parsearg.rb
@@ -10,8 +10,6 @@
 #	
 #
 
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: parsearg is deprecated after Ruby 1.8.1; use optparse instead"
-
 $RCS_ID=%q$Header$
 
 require "getopts"
@@ -57,8 +55,6 @@ def setExpression(ex, opt, op)
   return ex
 end
 
-# parseArgs is obsolete.  Use OptionParser instead.
-
 def parseArgs(argc, nopt, single_opts, *opts)
   if (noOptions = getopts(single_opts, *opts)) == nil
     printUsageAndExit()
diff --git a/lib/parsedate.rb b/lib/parsedate.rb
index b52a79ba47..405ab46907 100644
--- a/lib/parsedate.rb
+++ b/lib/parsedate.rb
@@ -1,48 +1,10 @@
-#
-# = 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].
+# parsedate.rb: Written by Tadayoshi Funaba 2001, 2002
+# $Id: parsedate.rb,v 2.6 2002-05-14 07:43:18+09 tadf Exp $
 
 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)
diff --git a/lib/pathname.rb b/lib/pathname.rb
index e4ca5489ce..bf4dcf4d94 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -1,225 +1,23 @@
-#
-# = 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.
+# It supports only Unix style pathnames.
 #
 # 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.
-#
+# pathname.rb is distributed with Ruby since 1.8.0.
 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
+    @path = path.to_str.dup
+    @path.freeze
 
     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
@@ -227,82 +25,33 @@ class Pathname
   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:
+  def hash
     @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
+  # to_str is implemented for Pathname object usable with File.open, etc.
+  alias to_str to_s
 
-  def inspect # :nodoc:
+  def inspect
     "#<#{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.
+  # cleanpath returns clean pathname of self which is without consecutive
+  # slashes and useless dots.
   #
-  # 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.
+  # If true is given as the optional argument consider_symlink,
+  # symbolic links are considered.  It makes more dots are retained.
   #
+  # cleanpath doesn't access actual filesystem.
   def cleanpath(consider_symlink=false)
     if consider_symlink
       cleanpath_conservative
@@ -311,326 +60,200 @@ class Pathname
     end
   end
 
-  #
-  # Clean the path simply by resolving and removing excess "." and ".." entries.
-  # Nothing more, nothing less.
-  #
-  def cleanpath_aggressive
-    path = @path
+  def cleanpath_aggressive # :nodoc:
+    # cleanpath_aggressive assumes:
+    # * no symlink
+    # * all pathname prefix contained in the pathname is existing directory
+    return Pathname.new('') if @path == ''
+    absolute = absolute?
     names = []
-    pre = path
-    while r = chop_basename(pre)
-      pre, base = r
-      case base
-      when '.'
-      when '..'
-        names.unshift base
-      else
-        if names[0] == '..'
-          names.shift
+    @path.scan(%r{[^/]+}) {|name|
+      next if name == '.'
+      if name == '..'
+        if names.empty?
+          next if absolute
         else
-          names.unshift base
+          if names.last != '..'
+            names.pop
+            next
+          end
         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)))
+      names << name
+    }
+    return Pathname.new(absolute ? '/' : '.') if names.empty?
+    path = absolute ? '/' : ''
+    path << names.join('/')
+    Pathname.new(path)
   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
+  def cleanpath_conservative # :nodoc:
+    return Pathname.new('') if @path == ''
+    names = @path.scan(%r{[^/]+})
+    last_dot = names.last == '.'
+    names.delete('.')
+    names.shift while names.first == '..' if absolute?
+    return Pathname.new(absolute? ? '/' : '.') if names.empty?
+    path = absolute? ? '/' : ''
+    path << names.join('/')
+    if names.last != '..'
+      if last_dot
+        path << '/.'
+      elsif %r{/\z} =~ @path
+        path << '/'
+      end
     end
+    Pathname.new(path)
   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
+  # realpath returns a real pathname of self in actual filesystem.
+  # The real pathname doesn't contain a symlink and useless dots.
+  #
+  # It returns absolute pathname.
+  def realpath(*args)
+    unless args.empty?
+      warn "The argument for Pathname#realpath is obsoleted."
     end
-  end
-  private :del_trailing_separator
+    force_absolute = args.fetch(0, true)
 
-  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))
+    if %r{\A/} =~ @path
+      top = '/'
+      unresolved = @path.scan(%r{[^/]+})
+    elsif force_absolute
+      # Although POSIX getcwd returns a pathname which contains no symlink,
+      # 4.4BSD-Lite2 derived getcwd may return the environment variable $PWD
+      # which may contain a symlink.
+      # So the return value of Dir.pwd should be examined.
+      top = '/'
+      unresolved = Dir.pwd.scan(%r{[^/]+}) + @path.scan(%r{[^/]+})
     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
+      top = ''
+      unresolved = @path.scan(%r{[^/]+})
     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
+      case unresolved.last
+      when '.'
+        unresolved.pop
+      when '..'
+        resolved.unshift unresolved.pop
       else
-        path = prepend_prefix(prefix, File.join(*(resolved + [n])))
-        if h.include? path
-          if h[path] == :resolving
-            raise Errno::ELOOP.new(path)
+        loop_check = {}
+        while (stat = File.lstat(path = top + unresolved.join('/'))).symlink?
+          symlink_id = "#{stat.dev}:#{stat.ino}"
+          raise Errno::ELOOP.new(path) if loop_check[symlink_id]
+          loop_check[symlink_id] = true
+          if %r{\A/} =~ (link = File.readlink(path))
+            top = '/'
+            unresolved = link.scan(%r{[^/]+})
           else
-            prefix, *resolved = h[path]
+            unresolved[-1,1] = link.scan(%r{[^/]+})
           end
+        end
+        next if (filename = unresolved.pop) == '.'
+        if filename != '..' && resolved.first == '..'
+          resolved.shift
         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
+          resolved.unshift filename
         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
+    if top == '/'
+      resolved.shift while resolved[0] == '..'
+    end
+    
+    if resolved.empty?
+      Pathname.new(top.empty? ? '.' : '/')
+    else
+      Pathname.new(top + resolved.join('/'))
     end
-    prefix, *names = realpath_rec(prefix, names, {})
-    self.class.new(prepend_prefix(prefix, File.join(*names)))
   end
 
-  # #parent returns the parent directory.
+  # parent method returns parent directory.
   #
-  # This is same as <tt>self + '..'</tt>.
+  # This is same as self + '..'.
   def parent
     self + '..'
   end
 
-  # #mountpoint? returns +true+ if <tt>self</tt> points to a mountpoint.
+  # mountpoint? method returns true if self points a mountpoint.
   def mountpoint?
     begin
       stat1 = self.lstat
       stat2 = self.parent.lstat
       stat1.dev == stat2.dev && stat1.ino == stat2.ino ||
-        stat1.dev != stat2.dev
+      stat1.dev != stat2.dev
     rescue Errno::ENOENT
       false
     end
   end
 
+  # root? method is a predicate for root directory.
+  # I.e. it returns true if the pathname consists of consecutive slashes.
   #
-  # #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>.
-  #
+  # It doesn't access actual filesystem.
+  # So it may return false for some pathnames
+  # which points root such as "/usr/..".
   def root?
-    !!(chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o =~ @path)
+    %r{\A/+\z} =~ @path ? true : false
   end
 
-  # Predicate method for testing whether a path is absolute.
-  # It returns +true+ if the pathname begins with a slash.
+  # absolute? method is a predicate for absolute pathname.
+  # It returns true if self is beginning with a slash.
   def absolute?
-    !relative?
+    %r{\A/} =~ @path ? true : false
   end
 
-  # The opposite of #absolute?
+  # relative? method is a predicate for relative pathname.
+  # It returns true unless self is beginning with a slash.
   def relative?
-    path = @path
-    while r = chop_basename(path)
-      path, basename = r
-    end
-    path == ''
+    !absolute?
   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
+  # each_filename iterates over self for each filename components.
+  def each_filename
+    @path.scan(%r{[^/]+}) { yield $& }
   end
 
+  # Pathname#+ concatenates self and an argument.
+  # I.e. a result is basically same as the argument but the base directory 
+  # is changed to self if the argument is relative.
   #
-  # 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. 
-  #
+  # Pathname#+ doesn't access actual filesystem.
   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
+    return other if other.absolute?
+
+    path1 = @path
+    path2 = other.to_s
+    while m2 = %r{\A\.\.(?:/+|\z)}.match(path2) and
+          m1 = %r{(\A|/+)([^/]+)\z}.match(path1) and
+          %r{\A(?:\.|\.\.)\z} !~ m1[2]
+      path1 = m1[1].empty? ? '.' : '/' if (path1 = m1.pre_match).empty?
+      path2 = '.' if (path2 = m2.post_match).empty?
     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
+    if %r{\A/+\z} =~ path1
+      while m2 = %r{\A\.\.(?:/+|\z)}.match(path2)
+        path2 = '.' if (path2 = m2.post_match).empty?
       end
     end
-    if !basename_list2.empty?
-      suffix2 = path2[index_list2.first..-1]
-      r1 ? File.join(prefix1, suffix2) : prefix1 + suffix2
+
+    return Pathname.new(path2) if path1 == '.'
+    return Pathname.new(path1) if path2 == '.'
+
+    if %r{/\z} =~ path1
+      Pathname.new(path1 + path2)
     else
-      r1 ? prefix1 : File.dirname(prefix1)
+      Pathname.new(path1 + '/' + path2)
     end
   end
-  private :plus
 
-  #
   # Pathname#join joins pathnames.
   #
-  # <tt>path0.join(path1, ..., pathN)</tt> is the same as
-  # <tt>path0 + path1 + ... + pathN</tt>.
-  #
+  # path0.join(path1, ... pathN) is same as path0 + path1 + ... + pathN.
   def join(*args)
     args.unshift self
     result = args.pop
@@ -644,205 +267,140 @@ class Pathname
     result
   end
 
+  # Pathname#children returns the children of the directory as an array of
+  # pathnames.  
   #
-  # 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, ... ]
+  # By default, the returned pathname can be used to access the corresponding
+  # file in the directory.
+  # This is because the pathname contains self as a prefix unless self is `.'.
   #
-  # Note that the result never contain the entries <tt>.</tt> and <tt>..</tt> in
-  # the directory because they are not children.
+  # If false is given for the optional argument `with_directory',
+  # just filenames of children is returned.
+  # In this case, the returned pathname cannot be used directly to access the
+  # corresponding file when self doesn't point working directory.
   #
-  # This method has existed since 1.8.1.
+  # Note that the result never contain the entry `.' and `..' in the directory
+  # because they are not child.
   #
+  # This method is exist 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))
+        result << Pathname.new(File.join(@path, e))
       else
-        result << self.class.new(e)
+        result << Pathname.new(e)
       end
     }
     result
   end
 
+  # Pathname#relative_path_from returns a relative path from the argument to
+  # self.
+  # If self is absolute, the argument must be absolute too.
+  # If self is relative, the argument must be relative too.
   #
-  # #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.
+  # relative_path_from doesn't access actual filesystem.
+  # It assumes no symlinks.
   #
   # ArgumentError is raised when it cannot find a relative path.
   #
-  # This method has existed since 1.8.1.
-  #
+  # This method is exist 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}"
+    if self.absolute? != base_directory.absolute?
+      raise ArgumentError,
+        "relative path between absolute and relative path: #{self.inspect}, #{base_directory.inspect}"
     end
-    while !dest_names.empty? &&
-          !base_names.empty? &&
-          dest_names.first == base_names.first
-      dest_names.shift
-      base_names.shift
+
+    dest = []
+    self.cleanpath.each_filename {|f|
+      next if f == '.'
+      dest << f
+    }
+
+    base = []
+    base_directory.cleanpath.each_filename {|f|
+      next if f == '.'
+      base << f
+    }
+
+    while !base.empty? && !dest.empty? && base[0] == dest[0]
+      base.shift
+      dest.shift
     end
-    if base_names.include? '..'
+
+    if base.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('.')
+
+    base.fill '..'
+    relpath = base + dest
+    if relpath.empty?
+      Pathname.new(".")
     else
-      Pathname.new(File.join(*relpath_names))
+      Pathname.new(relpath.join('/'))
     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.
+# IO
+class Pathname
+  # Pathname#each_line iterates over lines of the file.
+  # It's yields a String object for each line.
   #
-  def each_line(*args, &block) # :yield: line
-    IO.foreach(@path, *args, &block)
-  end
+  # This method is exist since 1.8.1.
+  def each_line(*args, &block) IO.foreach(@path, *args, &block) end
 
-  # Pathname#foreachline is *obsoleted* at 1.8.1.  Use #each_line.
-  def foreachline(*args, &block)
+  # Pathname#foreachline is obsoleted at 1.8.1.
+  #
+  def foreachline(*args, &block) # compatibility to 1.8.0.  obsoleted.
     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.
+# File
+class Pathname
   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 lchmod(mode) File.chmod(mode, @path) end
   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 open(*args, &block) File.open(@path, *args, &block) end
+  def readlink() Pathname.new(File.readlink(@path)) end
   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 basename(*args) Pathname.new(File.basename(@path, *args)) end
+  def dirname() Pathname.new(File.dirname(@path)) end
   def extname() File.extname(@path) end
+  def expand_path(*args) Pathname.new(File.expand_path(@path, *args)) end
+  def split() File.split(@path).map {|f| Pathname.new(f) } 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
+  # 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
+  # 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.'
@@ -850,172 +408,108 @@ class Pathname    # * File *
   end
 end
 
-
-class Pathname    # * FileTest *
-
-  # See <tt>FileTest.blockdev?</tt>.
+# FileTest
+class Pathname
   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
+# Dir
+class Pathname
+  def Pathname.glob(*args)
     if block_given?
-      Dir.glob(*args) {|f| yield self.new(f) }
+      Dir.glob(*args) {|f| yield Pathname.new(f) }
     else
-      Dir.glob(*args).map {|f| self.new(f) }
+      Dir.glob(*args).map {|f| Pathname.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
+  def Pathname.getwd() Pathname.new(Dir.getwd) end
   class << self; alias pwd getwd end
 
-  # Pathname#chdir is *obsoleted* at 1.8.1.
-  def chdir(&block)
+  # Pathname#chdir is obsoleted at 1.8.1.
+  #
+  def chdir(&block) # compatibility to 1.8.0.
     warn "Pathname#chdir is obsoleted.  Use Dir.chdir."
     Dir.chdir(@path, &block)
   end
 
-  # Pathname#chroot is *obsoleted* at 1.8.1.
-  def chroot
+  # Pathname#chroot is obsoleted at 1.8.1.
+  #
+  def chroot # compatibility to 1.8.0.
     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
+  def rmdir() Dir.rmdir(@path) end
+  def entries() Dir.entries(@path).map {|f| Pathname.new(f) } end
 
-  # Iterates over the entries (files and subdirectories) in the directory.  It
-  # yields a Pathname object for each entry.
+  # Pathname#each_entry iterates over entries of the directory.
+  # It's yields Pathname objects 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
+  # This method is exist since 1.8.1.
+  def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end
 
-  # Pathname#dir_foreach is *obsoleted* at 1.8.1.
-  def dir_foreach(*args, &block)
+  # Pathname#dir_foreach is obsoleted at 1.8.1.
+  #
+  def dir_foreach(*args, &block) # compatibility to 1.8.0.  obsoleted.
     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
+  def opendir(&block) 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.
+# Find
+class Pathname
+  # Pathname#find is a iterator to traverse directory tree in depth first
+  # manner.  It yields a pathname for each file under the directory which
+  # is pointed by self.
   #
-  # If +self+ is <tt>.</tt>, yielded pathnames begin with a filename in the
-  # current directory, not <tt>./</tt>.
+  # Since it is implemented by find.rb, Find.prune can be used to control the
+  # traverse.
   #
-  def find(&block) # :yield: p
+  # If self is `.', yielded pathnames begin with a filename in the current
+  # directory, not `./'.
+  def find(&block)
     require 'find'
     if @path == '.'
-      Find.find(@path) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) }
+      Find.find(@path) {|f| yield Pathname.new(f.sub(%r{\A\./}, '')) }
     else
-      Find.find(@path) {|f| yield self.class.new(f) }
+      Find.find(@path) {|f| yield Pathname.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.
+# FileUtils
+class Pathname
   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".
@@ -1025,21 +519,20 @@ class Pathname    # * FileUtils *
   end
 end
 
-
-class Pathname    # * mixed *
-  # Removes a file or directory, using <tt>File.unlink</tt> or
-  # <tt>Dir.unlink</tt> as necessary.
+# mixed
+class Pathname
   def unlink()
-    begin
+    if FileTest.directory? @path
       Dir.unlink @path
-    rescue Errno::ENOTDIR
+    else
       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)
+  # This method is obsoleted at 1.8.1.
+  #
+  def foreach(*args, &block) # compatibility to 1.8.0.  obsoleted.
     warn "Pathname#foreach is obsoleted.  Use each_line or each_entry."
     if FileTest.directory? @path
       # For polymorphism between Dir.foreach and IO.foreach,
@@ -1051,12 +544,241 @@ class Pathname    # * mixed *
   end
 end
 
-module Kernel
-  # create a pathname object.
-  #
-  # This method is available since 1.8.5.
-  def Pathname(path) # :doc:
-    Pathname.new(path)
+if $0 == __FILE__
+  require 'test/unit'
+
+  class PathnameTest < Test::Unit::TestCase # :nodoc:
+    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 test_syntactical
+      assert_equal(true, Pathname.new("/").root?)
+      assert_equal(true, Pathname.new("//").root?)
+      assert_equal(true, Pathname.new("///").root?)
+      assert_equal(false, Pathname.new("").root?)
+      assert_equal(false, Pathname.new("a").root?)
+    end
+
+    def test_cleanpath
+      assert_equal('/', Pathname.new('/').cleanpath(true).to_s)
+      assert_equal('/', Pathname.new('//').cleanpath(true).to_s)
+      assert_equal('', Pathname.new('').cleanpath(true).to_s)
+
+      assert_equal('.', Pathname.new('.').cleanpath(true).to_s)
+      assert_equal('..', Pathname.new('..').cleanpath(true).to_s)
+      assert_equal('a', Pathname.new('a').cleanpath(true).to_s)
+      assert_equal('/', Pathname.new('/.').cleanpath(true).to_s)
+      assert_equal('/', Pathname.new('/..').cleanpath(true).to_s)
+      assert_equal('/a', Pathname.new('/a').cleanpath(true).to_s)
+      assert_equal('.', Pathname.new('./').cleanpath(true).to_s)
+      assert_equal('..', Pathname.new('../').cleanpath(true).to_s)
+      assert_equal('a/', Pathname.new('a/').cleanpath(true).to_s)
+
+      assert_equal('a/b', Pathname.new('a//b').cleanpath(true).to_s)
+      assert_equal('a/.', Pathname.new('a/.').cleanpath(true).to_s)
+      assert_equal('a/.', Pathname.new('a/./').cleanpath(true).to_s)
+      assert_equal('a/..', Pathname.new('a/../').cleanpath(true).to_s)
+      assert_equal('/a/.', Pathname.new('/a/.').cleanpath(true).to_s)
+      assert_equal('..', Pathname.new('./..').cleanpath(true).to_s)
+      assert_equal('..', Pathname.new('../.').cleanpath(true).to_s)
+      assert_equal('..', Pathname.new('./../').cleanpath(true).to_s)
+      assert_equal('..', Pathname.new('.././').cleanpath(true).to_s)
+      assert_equal('/', Pathname.new('/./..').cleanpath(true).to_s)
+      assert_equal('/', Pathname.new('/../.').cleanpath(true).to_s)
+      assert_equal('/', Pathname.new('/./../').cleanpath(true).to_s)
+      assert_equal('/', Pathname.new('/.././').cleanpath(true).to_s)
+
+      assert_equal('a/b/c', Pathname.new('a/b/c').cleanpath(true).to_s)
+      assert_equal('b/c', Pathname.new('./b/c').cleanpath(true).to_s)
+      assert_equal('a/c', Pathname.new('a/./c').cleanpath(true).to_s)
+      assert_equal('a/b/.', Pathname.new('a/b/.').cleanpath(true).to_s)
+      assert_equal('a/..', Pathname.new('a/../.').cleanpath(true).to_s)
+
+      assert_equal('/a', Pathname.new('/../.././../a').cleanpath(true).to_s)
+      assert_equal('a/b/../../../../c/../d',
+        Pathname.new('a/b/../../../../c/../d').cleanpath(true).to_s)
+    end
+
+    def test_cleanpath_no_symlink
+      assert_equal('/', Pathname.new('/').cleanpath.to_s)
+      assert_equal('/', Pathname.new('//').cleanpath.to_s)
+      assert_equal('', Pathname.new('').cleanpath.to_s)
+
+      assert_equal('.', Pathname.new('.').cleanpath.to_s)
+      assert_equal('..', Pathname.new('..').cleanpath.to_s)
+      assert_equal('a', Pathname.new('a').cleanpath.to_s)
+      assert_equal('/', Pathname.new('/.').cleanpath.to_s)
+      assert_equal('/', Pathname.new('/..').cleanpath.to_s)
+      assert_equal('/a', Pathname.new('/a').cleanpath.to_s)
+      assert_equal('.', Pathname.new('./').cleanpath.to_s)
+      assert_equal('..', Pathname.new('../').cleanpath.to_s)
+      assert_equal('a', Pathname.new('a/').cleanpath.to_s)
+
+      assert_equal('a/b', Pathname.new('a//b').cleanpath.to_s)
+      assert_equal('a', Pathname.new('a/.').cleanpath.to_s)
+      assert_equal('a', Pathname.new('a/./').cleanpath.to_s)
+      assert_equal('.', Pathname.new('a/../').cleanpath.to_s)
+      assert_equal('/a', Pathname.new('/a/.').cleanpath.to_s)
+      assert_equal('..', Pathname.new('./..').cleanpath.to_s)
+      assert_equal('..', Pathname.new('../.').cleanpath.to_s)
+      assert_equal('..', Pathname.new('./../').cleanpath.to_s)
+      assert_equal('..', Pathname.new('.././').cleanpath.to_s)
+      assert_equal('/', Pathname.new('/./..').cleanpath.to_s)
+      assert_equal('/', Pathname.new('/../.').cleanpath.to_s)
+      assert_equal('/', Pathname.new('/./../').cleanpath.to_s)
+      assert_equal('/', Pathname.new('/.././').cleanpath.to_s)
+
+      assert_equal('a/b/c', Pathname.new('a/b/c').cleanpath.to_s)
+      assert_equal('b/c', Pathname.new('./b/c').cleanpath.to_s)
+      assert_equal('a/c', Pathname.new('a/./c').cleanpath.to_s)
+      assert_equal('a/b', Pathname.new('a/b/.').cleanpath.to_s)
+      assert_equal('.', Pathname.new('a/../.').cleanpath.to_s)
+
+      assert_equal('/a', Pathname.new('/../.././../a').cleanpath.to_s)
+      assert_equal('../../d', Pathname.new('a/b/../../../../c/../d').cleanpath.to_s)
+    end
+
+    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_raises(ArgumentError) { Pathname.new("\0") }
+    end
+
+    def assert_relpath(result, dest, base)
+      assert_equal(Pathname.new(result),
+        Pathname.new(dest).relative_path_from(Pathname.new(base)))
+    end
+
+    def assert_relpath_err(dest, base)
+      assert_raises(ArgumentError) {
+        Pathname.new(dest).relative_path_from(Pathname.new(base))
+      }
+    end
+
+    def test_relative_path_from
+      assert_relpath("../a", "a", "b")
+      assert_relpath("../a", "a", "b/")
+      assert_relpath("../a", "a/", "b")
+      assert_relpath("../a", "a/", "b/")
+      assert_relpath("../a", "/a", "/b")
+      assert_relpath("../a", "/a", "/b/")
+      assert_relpath("../a", "/a/", "/b")
+      assert_relpath("../a", "/a/", "/b/")
+
+      assert_relpath("../b", "a/b", "a/c")
+      assert_relpath("../a", "../a", "../b")
+
+      assert_relpath("a", "a", ".")
+      assert_relpath("..", ".", "a")
+
+      assert_relpath(".", ".", ".")
+      assert_relpath(".", "..", "..")
+      assert_relpath("..", "..", ".")
+
+      assert_relpath("c/d", "/a/b/c/d", "/a/b")
+      assert_relpath("../..", "/a/b", "/a/b/c/d")
+      assert_relpath("../../../../e", "/e", "/a/b/c/d")
+      assert_relpath("../b/c", "a/b/c", "a/d")
+
+      assert_relpath("../a", "/../a", "/b")
+      assert_relpath("../../a", "../a", "b")
+      assert_relpath(".", "/a/../../b", "/b")
+      assert_relpath("..", "a/..", "a")
+      assert_relpath(".", "a/../b", "b")
+
+      assert_relpath("a", "a", "b/..")
+      assert_relpath("b/c", "b/c", "b/..")
+
+      assert_relpath_err("/", ".")
+      assert_relpath_err(".", "/")
+      assert_relpath_err("a", "..")
+      assert_relpath_err(".", "..")
+    end
+
+    def assert_pathname_plus(a, b, c)
+      a = Pathname.new(a)
+      b = Pathname.new(b)
+      c = Pathname.new(c)
+      d = b + c
+      assert(a == d,
+        "#{b.inspect} + #{c.inspect}: #{a.inspect} expected but was #{d.inspect}")
+    end
+
+    def test_plus
+      assert_pathname_plus('a/b', 'a', 'b')
+      assert_pathname_plus('a', 'a', '.')
+      assert_pathname_plus('b', '.', 'b')
+      assert_pathname_plus('.', '.', '.')
+      assert_pathname_plus('/b', 'a', '/b')
+
+      assert_pathname_plus('/', '/', '..')
+      assert_pathname_plus('.', 'a', '..')
+      assert_pathname_plus('a', 'a/b', '..')
+      assert_pathname_plus('/c', '/', '../c')
+      assert_pathname_plus('c', 'a', '../c')
+      assert_pathname_plus('a/c', 'a/b', '../c')
+    end
   end
-  private :Pathname
 end
diff --git a/lib/ping.rb b/lib/ping.rb
index c2966b619c..d90551e671 100644
--- a/lib/ping.rb
+++ b/lib/ping.rb
@@ -1,46 +1,46 @@
 #
-# = ping.rb: Check a host for upness
+# 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.
+#= SYNOPSIS
 #
-
-require 'timeout'
-require "socket"
-
-# 
-# Ping contains routines to test for the reachability of remote hosts.
-# Currently the only routine implemented is pingecho().
+#   require 'ping'
+#    print "'jimmy' is alive and kicking\n" if Ping.pingecho('jimmy', 10) ;
 #
-# Ping.pingecho uses a TCP echo (not an ICMP echo) to determine if the
+#= DESCRIPTION
+#
+# This module contains routines to test for the reachability of remote hosts.
+# Currently the only routine implemented is pingecho(). 
+#
+# pingecho() uses a TCP echo (I<not> an ICMP one) 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.
+# host is available to rsh(1), ftp(1), or telnet(1) onto.
 #
-# Warning: Ping.pingecho may block for a long time if DNS resolution is
-# slow. Requiring 'resolv-replace' allows non-blocking name resolution.
+#== Parameters
 #
-# Usage:
-# 
-#   require 'ping'
+#  : hostname
 #
-#   puts "'jimmy' is alive and kicking" if Ping.pingecho('jimmy', 10)
+#    The remote host to check, specified either as a hostname or as an
+#    IP address.
 #
-module Ping
+#  : timeout
+#
+#    The timeout in seconds. If not specified it will default to 5 seconds.
+#
+#  : service
+#
+#    The service port to connect.  The default is "echo".
+#
+#= WARNING
+#
+# pingecho() uses user-level thread to implement the timeout, so it may block
+# for long period if named does not respond for some reason.
+#
+#=end
 
-  # 
-  # 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
-  #
+require 'timeout'
+require "socket"
+
+module Ping
   def pingecho(host, timeout=5, service="echo")
     begin
       timeout(timeout) do
@@ -49,7 +49,7 @@ module Ping
       end
     rescue Errno::ECONNREFUSED
       return true
-    rescue Timeout::Error, StandardError
+    rescue
       return false
     end
     return true
diff --git a/lib/pp.rb b/lib/pp.rb
index 14fe62ee95..03d9248218 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -1,61 +1,130 @@
-# == 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>
+# $Id$
+
+=begin
+= 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.
+
+= PP
+== super class
+((<PrettyPrint>))
+
+== class methods
+--- PP.pp(obj[, out[, width]])
+    outputs ((|obj|)) to ((|out|)) in pretty printed format of
+    ((|width|)) columns in width.
+
+    If ((|out|)) is ommitted, (({$>})) is assumed.
+    If ((|width|)) is ommitted, 79 is assumed.
+
+    PP.pp returns ((|out|)).
+
+--- PP.singleline_pp(obj[, out])
+    outputs ((|obj|)) to ((|out|)) like (({PP.pp})) but with no indent and
+    newline.
+
+    PP.singleline_pp returns ((|out|)).
+
+--- PP.sharing_detection
+    returns the sharing detection flag as a boolean value.
+    It is false by default.
+
+--- PP.sharing_detection = boolean_value
+    sets the sharing detection flag.
+
+== methods
+--- pp(obj)
+    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.
+
+--- object_group(obj) { ... }
+    is a convenience method which is same as follows:
+
+      group(1, '#<' + obj.class.name, '>') { ... }
+
+--- comma_breakable
+    is a convenience method which is same as follows:
+
+      text ','
+      breakable
+
+= Object
+--- pretty_print(pp)
+    is 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.
+
+--- pretty_print_cycle(pp)
+    is a default pretty printing method for general objects that are
+    detected as part of a cycle.
+
+--- pretty_print_instance_variables
+    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]})).
+
+--- pretty_print_inspect
+    is (({inspect})) implementation using (({pretty_print})).
+    If you implement (({pretty_print})), it can be used as follows.
+
+      alias inspect pretty_print_inspect
+
+== AUTHOR
+Tanaka Akira <akr@m17n.org>
+=end
 
 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:
+  def pp(*objs)
     objs.each {|obj|
       PP.pp(obj)
     }
@@ -65,13 +134,6 @@ module Kernel
 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}
@@ -80,10 +142,6 @@ class PP < PrettyPrint
     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}
@@ -91,16 +149,8 @@ class PP < PrettyPrint
     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
 
@@ -122,11 +172,6 @@ class PP < PrettyPrint
       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__
 
@@ -143,70 +188,25 @@ class PP < PrettyPrint
       end
     end
 
-    # A convenience method which is same as follows:
-    # 
-    #   group(1, '#<' + obj.class.name, '>') { ... }
-    def object_group(obj, &block) # :yield:
+    def object_group(obj, &block)
       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)
+      group(1, sprintf('#<%s:0x%x', obj.class.to_s, obj.__id__ * 2), '>', &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
+        obj.pretty_print_instance_variables.each {|v|
           v = v.to_s if Symbol === v
+          text ',' unless first?
+          breakable
           text v
           text '='
           group(1) {
@@ -219,7 +219,8 @@ class PP < PrettyPrint
 
     def pp_hash(obj)
       group(1, '{', '}') {
-        seplist(obj, nil, :each_pair) {|k, v|
+        obj.each {|k, v|
+          comma_breakable unless first?
           group {
             pp k
             text '=>'
@@ -245,27 +246,16 @@ class PP < PrettyPrint
     # 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\)#/ !~ Object.instance_method(:method).bind(self).call(:inspect).inspect
+      if /\(Kernel\)#/ !~ method(:inspect).inspect
         q.text self.inspect
-      elsif /\(Kernel\)#/ !~ Object.instance_method(:method).bind(self).call(:to_s).inspect && instance_variables.empty?
+      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
@@ -273,24 +263,13 @@ class PP < PrettyPrint
       }
     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\)#/ =~ Object.instance_method(:method).bind(self).call(:pretty_print).inspect
-        raise "pretty_print is not overridden for #{self.class}"
+      if /\(PP::ObjectMixin\)#/ =~ method(:pretty_print).inspect
+        raise "pretty_print is not overriden."
       end
       PP.singleline_pp(self, '')
     end
@@ -300,7 +279,8 @@ end
 class Array
   def pretty_print(q)
     q.group(1, '[', ']') {
-      q.seplist(self) {|v|
+      self.each {|v|
+        q.comma_breakable unless q.first?
         q.pp v
       }
     }
@@ -329,8 +309,9 @@ 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.object_group(self) {
+      self.members.each {|member|
+        q.text "," unless q.first?
         q.breakable
         q.text member.to_s
         q.text '='
@@ -343,7 +324,7 @@ class Struct
   end
 
   def pretty_print_cycle(q)
-    q.text sprintf("#<struct %s:...>", PP.mcall(self, Kernel, :class).name)
+    q.text sprintf("#<%s:...>", self.class.name)
   end
 end
 
@@ -389,23 +370,19 @@ class File
         q.group {
           q.text "uid="; q.pp self.uid
           begin
-            pw = Etc.getpwuid(self.uid)
+            name = Etc.getpwuid(self.uid).name
+            q.breakable; q.text "(#{name})"
           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)
+            name = Etc.getgrgid(self.gid).name
+            q.breakable; q.text "(#{name})"
           rescue ArgumentError
           end
-          if gr
-            q.breakable; q.text "(#{gr.name})"
-          end
         }
         q.comma_breakable
         q.group {
@@ -443,7 +420,8 @@ class MatchData
   def pretty_print(q)
     q.object_group(self) {
       q.breakable
-      q.seplist(1..self.size, lambda { q.breakable }) {|i|
+      1.upto(self.size) {|i|
+        q.breakable unless q.first?
         q.pp self[i-1]
       }
     }
@@ -462,15 +440,6 @@ 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'
 
@@ -482,19 +451,6 @@ if __FILE__ == $0
     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
-
-    def test_redefined_method
-      o = ""
-      def o.method
-      end
-      assert_equal(%(""\n), PP.pp(o, ""))
-    end
   end
 
   class HasInspect
@@ -563,7 +519,7 @@ if __FILE__ == $0
       a = PrettyPrintInspect.new(1)
       assert_equal("<pretty_print:1>", a.inspect)
       a = PrettyPrintInspectWithoutPrettyPrint.new
-      assert_raise(RuntimeError) { a.inspect }
+      assert_raises(RuntimeError) { a.inspect }
     end
 
     def test_proc
@@ -578,10 +534,6 @@ if __FILE__ == $0
       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
@@ -598,22 +550,19 @@ if __FILE__ == $0
       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, ''))
+      assert_equal("#<Struct::S a=1, b=#<Struct::S:...>>\n", PP.pp(a, ''))
     end
 
     def test_object
@@ -631,7 +580,6 @@ if __FILE__ == $0
       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
@@ -644,11 +592,4 @@ if __FILE__ == $0
       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/lib/prettyprint.rb b/lib/prettyprint.rb
index 315c422e9e..0aa54e91f9 100644
--- a/lib/prettyprint.rb
+++ b/lib/prettyprint.rb
@@ -1,45 +1,129 @@
 # $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
+=begin
+= PrettyPrint
+The class implements 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 situasions
+by giving suitable arguments for some methods:
+newline object and space generation block for (({PrettyPrint.new})),
+optional width argument for (({PrettyPrint#text})),
+(({PrettyPrint#breakable})), etc.
+There are several candidates to use them:
+text formatting using proportional fonts,
+multibyte characters which has columns diffrent to number of bytes,
+non-string formatting, etc.
+
+== class methods
+--- PrettyPrint.new([output[, maxwidth[, newline]]]) [{|width| ...}]
+    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.
+
+--- PrettyPrint.format([output[, maxwidth[, newline[, genspace]]]]) {|q| ...}
+    is a convenience method which is same as follows:
+
+      begin
+        q = PrettyPrint.new(output, maxwidth, newline, &genspace)
+        ...
+        q.flush
+        output
+      end
+
+--- PrettyPrint.singleline_format([output[, maxwidth[, newline[, genspace]]]]) {|q| ...}
+    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
+    treated as just an invocation of (({text})).
+
+== methods
+--- text(obj[, width])
+    adds ((|obj|)) as a text of ((|width|)) columns in width.
+
+    If ((|width|)) is not specified, (({((|obj|)).length})) is used.
+
+--- breakable([sep[, width]])
+    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.
+
+--- nest(indent) {...}
+    increases left margin after newline with ((|indent|)) for line breaks added
+    in the block.
+
+--- group([indent[, open_obj[, close_obj[, open_width[, close_width]]]]]) {...}
+    groups line break hints added in the block.
+    The line break hints are all to be breaked or not.
+
+    If ((|indent|)) is specified, the method call is regarded as nested by
+    (({nest(((|indent|))) { ... }})).
+
+    If ((|open_obj|)) is specified, (({text open_obj, open_width})) is called
+    at first.
+    If ((|close_obj|)) is specified, (({text close_obj, close_width})) is
+    called at last.
 
-  # This is a convenience method which is same as follows:
-  # 
-  #   begin
-  #     q = PrettyPrint.new(output, maxwidth, newline, &genspace)
-  #     ...
-  #     q.flush
-  #     output
-  #   end
-  # 
+--- flush
+    outputs buffered data.
+
+--- 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 ...
+        }
+      }
+
+== Bugs
+* Box based formatting?  Other (better) model/algorithm?
+
+== References
+Christian Lindig, Strictly Pretty, March 2000,
+((<URL:http://www.gaertner.de/~lindig/papers/strictly-pretty.html>))
+
+Philip Wadler, A prettier printer, March 1998,
+((<URL:http://www.research.avayalabs.com/user/wadler/topics/recent.html#prettier>))
+
+== AUTHOR
+Tanaka Akira <akr@m17n.org>
+=end
+
+class PrettyPrint
   def PrettyPrint.format(output='', maxwidth=79, newline="\n", genspace=lambda {|n| ' ' * n})
     q = PrettyPrint.new(output, maxwidth, newline, &genspace)
     yield q
@@ -47,36 +131,12 @@ class PrettyPrint
     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
@@ -99,25 +159,7 @@ class PrettyPrint
     @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
 
@@ -137,10 +179,6 @@ class PrettyPrint
     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
@@ -161,14 +199,6 @@ class PrettyPrint
     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?
@@ -184,16 +214,6 @@ class PrettyPrint
     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 {
@@ -218,9 +238,6 @@ class PrettyPrint
     end
   end
 
-  # Increases left margin after newline with +indent+ for line breaks added in
-  # the block.
-  #
   def nest(indent)
     @indent += indent
     begin
@@ -230,8 +247,6 @@ class PrettyPrint
     end
   end
 
-  # outputs buffered data.
-  #
   def flush
     @buffer.each {|data|
       @output_width = data.output(@output, @output_width)
@@ -381,7 +396,7 @@ end
 if __FILE__ == $0
   require 'test/unit'
 
-  class WadlerExample < Test::Unit::TestCase # :nodoc:
+  class WadlerExample < Test::Unit::TestCase
     def setup
       @tree = Tree.new("aaaa", Tree.new("bbbbb", Tree.new("ccc"),
                                                  Tree.new("dd")),
@@ -561,7 +576,7 @@ End
       assert_equal(expected, tree_alt(50))
     end
 
-    class Tree # :nodoc:
+    class Tree
       def initialize(string, *children)
         @string = string
         @children = children
@@ -618,7 +633,7 @@ End
     end
   end
 
-  class StrictPrettyExample < Test::Unit::TestCase # :nodoc:
+  class StrictPrettyExample < Test::Unit::TestCase
     def prog(width)
       PrettyPrint.format('', width) {|q|
         q.group {
@@ -763,7 +778,7 @@ End
 
   end
 
-  class TailGroup < Test::Unit::TestCase # :nodoc:
+  class TailGroup < Test::Unit::TestCase
     def test_1
       out = PrettyPrint.format('', 10) {|q|
         q.group {
@@ -783,7 +798,7 @@ End
     end
   end
 
-  class NonString < Test::Unit::TestCase # :nodoc:
+  class NonString < Test::Unit::TestCase
     def format(width)
       PrettyPrint.format([], width, 'newline', lambda {|n| "#{n} spaces"}) {|q|
         q.text(3, 3)
@@ -802,7 +817,7 @@ End
 
   end
 
-  class Fill < Test::Unit::TestCase # :nodoc:
+  class Fill < Test::Unit::TestCase
     def format(width)
       PrettyPrint.format('', width) {|q|
         q.group {
diff --git a/lib/profiler.rb b/lib/profiler.rb
index 9762fa1181..74e9b96295 100644
--- a/lib/profiler.rb
+++ b/lib/profiler.rb
@@ -1,29 +1,40 @@
 module Profiler__
+  Times = if defined? Process.times then Process else Time end
   # 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]
+      now = Float(Times::times[0])
+      @@stack.push [now, 0.0, id]
     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]
+      now = Float(Times::times[0])
+      tick = @@stack.pop
+      name = klass.to_s
+      if name.nil? then name = '' end
+      if klass.kind_of? Class
+	name += "#"
+      else
+	name += "."
       end
+      name += id.id2name
+      data = @@map[name]
+      unless data
+	data = [0.0, 0.0, 0.0, name]
+	@@map[name] = data
+      end
+      data[0] += 1
+      cost = now - tick[0]
+      data[1] += cost
+      data[2] += cost - tick[1]
+      @@stack[-1][1] += cost
     end
   }
 module_function
   def start_profile
-    @@start = Process.times[0]
-    @@stack = []
-    @@map = {}
+    @@start = Float(Times::times[0])
+    @@stack = [[0, 0, :toplevel], [0, 0, :dummy]]
+    @@map = {"#toplevel" => [1, 0, 0, "#toplevel"]}
     set_trace_func PROFILE_PROC
   end
   def stop_profile
@@ -31,29 +42,18 @@ module_function
   end
   def print_profile(f)
     stop_profile
-    total = Process.times[0] - @@start
+    total = Float(Times::times[0]) - @@start
     if total == 0 then total = 0.01 end
+    @@map["#toplevel"][1] = total
     data = @@map.values
     data.sort!{|a,b| b[2] <=> a[2]}
     sum = 0
-    f.printf "  %%   cumulative   self              self     total\n"
+    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 += "."
+      f.printf "%8.2f %8.2f  %s\n", d[2]*1000/d[0], d[1]*1000/d[0], d[3]
     end
-    name + id.id2name
   end
-  private :get_name
 end
diff --git a/lib/pstore.rb b/lib/pstore.rb
index ab495d9ed7..93795495fc 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -1,96 +1,24 @@
-# = PStore -- Transactional File Storage for Ruby Objects
 #
-# pstore.rb -
-#   originally by matz
-#   documentation by Kev Jackson and James Edward Gray II
+# How to use:
 #
-# See PStore for documentation.
-
-
-require "fileutils"
+# db = PStore.new("/tmp/foo")
+# db.transaction do
+#   p db.roots
+#   ary = db["root"] = [1,2,3,4]
+#   ary[0] = [1,1.5]
+# end
+
+# db.transaction do
+#   p db["root"]
+# end
+
+require "ftools"
 require "digest/md5"
 
-#
-# PStore implements a file based persistence 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 updated 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
@@ -104,219 +32,81 @@ class PStore
     @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
+  private :in_transaction
 
-  #
-  # 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
+	default
       end
     end
-    @table[name]
+    self[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()
+    in_transaction
     @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()
+    in_transaction
     @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
+  def transaction(read_only=false)
     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
+      backup = @filename+"~"
+      begin
+	file = File::open(@filename, read_only ? "rb" : "rb+")
+	orig = true
+      rescue Errno::ENOENT
+	raise if read_only
+	file = File::open(@filename, "wb+")
       end
-
-      if content != ""
-	@table = load(content)
-        if !read_only
-          size = content.size
-          md5 = Digest::MD5.digest(content)
-        end
+      file.flock(read_only ? File::LOCK_SH : File::LOCK_EX)
+      if read_only
+	@table = Marshal::load(file)
+      elsif orig and (content = file.read) != ""
+	@table = Marshal::load(content)
+	size = content.size
+	md5 = Digest::MD5.digest(content)
+	content = nil		# unreference huge data
       else
 	@table = {}
       end
-      content = nil		# unreference huge data
-
       begin
 	catch(:pstore_abort_transaction) do
 	  value = yield(self)
@@ -326,15 +116,24 @@ class PStore
 	raise
       ensure
 	if !read_only and !@abort
-          tmp_file = @filename + ".tmp"
-	  content = dump(@table)
+	  file.rewind
+	  content = Marshal::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
+	    File::copy @filename, backup
+	    begin
+	      file.write(content)
+	      file.truncate(file.pos)
+	      content = nil		# unreference huge data
+	    rescue
+	      File::rename backup, @filename if File::exist?(backup)
+	      raise
+	    end
+	  end
 	end
+	if @abort and !orig
+	  File.unlink(@filename)
+	end
+	@abort = false
       end
     ensure
       @table = nil
@@ -343,37 +142,8 @@ class PStore
     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
diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb
index a7408dd00a..07858f6775 100644
--- a/lib/racc/parser.rb
+++ b/lib/racc/parser.rb
@@ -1,7 +1,7 @@
 #
-# $originalId: parser.rb,v 1.8 2006/07/06 11:42:07 aamine Exp $
+# parser.rb
 #
-# Copyright (c) 1999-2006 Minero Aoki
+# Copyright (c) 1999-2003 Minero Aoki <aamine@loveruby.net>
 #
 # This program is free software.
 # You can distribute/modify this program under the same terms of ruby.
@@ -10,6 +10,8 @@
 # into a Racc output file, you may use that output file
 # without restriction.
 #
+# $raccId: parser.rb,v 1.4 2003/11/03 13:41:47 aamine Exp $
+#
 
 unless defined?(NotImplementedError)
   NotImplementedError = NotImplementError
@@ -22,6 +24,7 @@ unless defined?(::ParseError)
   ParseError = Racc::ParseError
 end
 
+
 module Racc
 
   unless defined?(Racc_No_Extentions)
@@ -30,11 +33,11 @@ module Racc
 
   class Parser
 
-    Racc_Runtime_Version = '1.4.5'
-    Racc_Runtime_Revision = '$originalRevision: 1.8 $'.split[1]
+    Racc_Runtime_Version = '1.4.4'
+    Racc_Runtime_Revision = '$raccRevision: 1.4 $'.split[1]
 
-    Racc_Runtime_Core_Version_R = '1.4.5'
-    Racc_Runtime_Core_Revision_R = '$originalRevision: 1.8 $'.split[1]
+    Racc_Runtime_Core_Version_R = '1.4.4'
+    Racc_Runtime_Core_Revision_R = '$raccRevision: 1.4 $'.split[1]
     begin
       require 'racc/cparse'
     # Racc_Runtime_Core_Version_C  = (defined in extention)
@@ -103,7 +106,7 @@ module Racc
       raise NotImplementedError, "#{self.class}\#next_token is not defined"
     end
 
-    def _racc_do_parse_rb(arg, in_debug)
+    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,
@@ -148,11 +151,11 @@ module Racc
     ### yyparse
     ###
 
-    def yyparse(recv, mid)
+    def yyparse( recv, mid )
       __send__(Racc_YY_Parse_Method, recv, mid, _racc_setup(), true)
     end
 
-    def _racc_yyparse_rb(recv, mid, arg, c_debug)
+    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,
@@ -171,6 +174,7 @@ module Racc
           end
         end
         recv.__send__(mid) do |tok, val|
+# $stderr.puts "rd: tok=#{tok}, val=#{val}"
           unless tok
             @racc_t = 0
           else
@@ -184,7 +188,12 @@ module Racc
                  act = action_table[i] and
                  action_check[i] == @racc_state[-1]
             act = action_default[@racc_state[-1]]
+# $stderr.puts "02: act=#{act}"
+# $stderr.puts "curstate=#{@racc_state[-1]}"
+          else
+# $stderr.puts "01: act=#{act}"
           end
+
           while act = _racc_evalact(act, arg)
             ;
           end
@@ -197,6 +206,9 @@ module Racc
                    act = action_table[i] and
                    action_check[i] == @racc_state[-1]
               act = action_default[@racc_state[-1]]
+# $stderr.puts "04: act=#{act}"
+            else
+# $stderr.puts "03: act=#{act}"
             end
             while act = _racc_evalact(act, arg)
               ;
@@ -210,12 +222,13 @@ module Racc
     ### common
     ###
 
-    def _racc_evalact(act, arg)
+    def _racc_evalact( act, arg )
+# $stderr.puts "ea: act=#{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
-      nerr = 0   # tmp
+nerr = 0   # tmp
 
       if act > 0 and act < shift_n
         #
@@ -248,7 +261,7 @@ module Racc
           when 2 # yyaccept
             return shift_n
           else
-            raise '[Racc Bug] unknown jump code'
+            raise RuntimeError, '[Racc Bug] unknown jump code'
           end
         end
 
@@ -286,6 +299,7 @@ module Racc
               break
             end
           end
+
           throw :racc_end_parse, nil if @racc_state.size <= 1
           @racc_state.pop
           @racc_vstack.pop
@@ -297,7 +311,7 @@ module Racc
         return act
 
       else
-        raise "[Racc Bug] unknown action #{act.inspect}"
+        raise RuntimeError, "[Racc Bug] unknown action #{act.inspect}"
       end
 
       racc_next_state(@racc_state[-1], @racc_state) if @yydebug
@@ -305,7 +319,7 @@ module Racc
       nil
     end
 
-    def _racc_do_reduce(arg, act)
+    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,
@@ -346,7 +360,7 @@ module Racc
       goto_default[k1]
     end
 
-    def on_error(t, val, vstack)
+    def on_error( t, val, vstack )
       raise ParseError, sprintf("\nparse error on value %s (%s)",
                                 val.inspect, token_to_str(t) || '?')
     end
@@ -367,20 +381,20 @@ module Racc
     # for debugging output
     #
 
-    def racc_read_token(t, tok, val)
+    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)
+    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)
+    def racc_reduce( toks, sim, tstack, vstack )
       out = @racc_debug_out
       out.print 'reduce '
       if toks.empty?
@@ -399,20 +413,20 @@ module Racc
       @racc_debug_out.puts
     end
 
-    def racc_e_pop(state, tstack, vstack)
+    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)
+    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)
+    def racc_print_stacks( t, v )
       out = @racc_debug_out
       out.print '        ['
       t.each_index do |i|
@@ -421,19 +435,19 @@ module Racc
       out.puts ' ]'
     end
 
-    def racc_print_states(s)
+    def racc_print_states( s )
       out = @racc_debug_out
       out.print '        ['
       s.each {|st| out.print ' ', st }
       out.puts ' ]'
     end
 
-    def racc_token2str(tok)
+    def racc_token2str( tok )
       self.class::Racc_token_to_s_table[tok] or
-          raise "[Racc Bug] can't convert token #{tok} to string"
+          raise RuntimeError, "[Racc Bug] can't convert token #{tok} to string"
     end
 
-    def token_to_str(t)
+    def token_to_str( t )
       self.class::Racc_token_to_s_table[t]
     end
 
diff --git a/lib/rational.rb b/lib/rational.rb
index 69a3b76bf1..38af7b8a81 100644
--- a/lib/rational.rb
+++ b/lib/rational.rb
@@ -1,33 +1,41 @@
 #
-#   rational.rb -
-#       $Release Version: 0.5 $
-#       $Revision: 1.7 $
-#       $Date: 1999/08/24 12:49:28 $
-#       by Keiju ISHITSUKA(SHL Japan Inc.)
+#   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:
+# --
+#   Usage:
+#   class Rational < Numeric
+#      (include Comparable)
 #
-#   1.quo(2)              # -> 0.5
-#   require 'rational'
-#   1.quo(2)              # -> Rational(1,2)
-# 
-# See Rational for full documentation.
+#   Rational(a, b) --> a/b
 #
-
-
-#
-# Creates a Rational number (i.e. a fraction).  +a+ and +b+ should be Integers:
-# 
-#   Rational(1,3)           # -> 1/3
+#   Rational::+
+#   Rational::-
+#   Rational::*
+#   Rational::/
+#   Rational::**
+#   Rational::%
+#   Rational::divmod
+#   Rational::abs
+#   Rational::<=>
+#   Rational::to_i
+#   Rational::to_f
+#   Rational::to_s
 #
-# Note: trying to construct a Rational with floating point or real values
-# produces errors:
+#   Integer::gcd
+#   Integer::lcm
+#   Integer::gcdlcm
+#   Integer::to_r
 #
-#   Rational(1.1, 2.3)      # -> NoMethodError
+#   Fixnum::**
+#   Fixnum::quo
+#   Bignum::**
+#   Bignum::quo
 #
+
 def Rational(a, b = 1)
   if a.kind_of?(Rational) && b == 1
     a
@@ -35,41 +43,12 @@ def Rational(a, b = 1)
     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
+    raise ZeroDivisionError, "denominator is 0" if den == 0
 
     if den < 0
       num = -num
@@ -84,21 +63,13 @@ class Rational < Numeric
       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
@@ -112,15 +83,7 @@ class Rational < Numeric
       @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
@@ -135,16 +98,7 @@ class Rational < Numeric
       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
@@ -159,17 +113,7 @@ class Rational < Numeric
       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
@@ -184,21 +128,14 @@ class Rational < Numeric
       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
+      raise ZeroDivisionError, "divided by 0" if a == 0
       self / Rational.new!(a, 1)
     elsif a.kind_of?(Float)
       Float(self) / a
@@ -207,16 +144,7 @@ class Rational < Numeric
       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
@@ -239,58 +167,25 @@ class Rational < Numeric
       x ** y
     end
   end
-
-  def div(other)
-    (self / other).floor
-  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).floor
+    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).floor
+    value = (self / other).to_i
     return value, self - other * value
   end
-
-  #
-  # Returns the absolute value.
-  #
+  
   def abs
     if @numerator > 0
-      self
+      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
@@ -303,9 +198,6 @@ class Rational < Numeric
     end
   end
 
-  #
-  # Standard comparison operator.
-  #
   def <=> (other)
     if other.kind_of?(Rational)
       num = @numerator * other.denominator
@@ -340,63 +232,14 @@ class Rational < Numeric
     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             # -> -1
-  #   (-1.75).to_i                    # -> -1
-  #
-  # In other words:
-  #   Rational(-7,4) == -1.75                 # -> true
-  #   Rational(-7,4).to_i == (-1.75).to_i     # -> true
-  #
-
-
-  def floor()
-    @numerator.div(@denominator)
+  def to_i
+    Integer(@numerator.div(@denominator))
   end
-
-  def ceil()
-    -((-@numerator).div(@denominator))
-  end
-
-  def truncate()
-    if @numerator < 0
-      return -((-@numerator).div(@denominator))
-    end
-    @numerator.div(@denominator)
-  end
-
-  alias_method :to_i, :truncate
-
-  def round()
-    if @numerator < 0
-      num = -@numerator
-      num = num * 2 + @denominator
-      den = @denominator * 2
-      -(num.div(den))
-    else
-      num = @numerator * 2 + @denominator
-      den = @denominator * 2
-      num.div(den)
-    end
-  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
@@ -404,144 +247,119 @@ class Rational < Numeric
       @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
+  
+  def gcd(n)
+    m = self.abs
+    n = n.abs
 
-  #
-  # 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
+    return n if m == 0
+    return m if n == 0
 
-  #
-  # 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
+    b = 0
+    while n[0] == 0 && m[0] == 0
+      b += 1; n >>= 1; m >>= 1
     end
+    m >>= 1 while m[0] == 0
+    n >>= 1 while n[0] == 0
+    while m != n
+      m, n = n, m if n > m
+      m -= n; m >>= 1 while m[0] == 0
+    end
+    m << b
+  end
+  
+  def gcd2(int)
+    a = self.abs
+    b = int.abs
+  
+    a, b = b, a if a < b
+  
+    while b != 0
+      void, a = a.divmod(b)
+      a, b = b, a
+    end
+    return a
   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
+  def lcm(int)
+    a = self.abs
+    b = int.abs
+    gcd = a.gcd(b)
+    (a.div(gcd)) * b
   end
+  
+  def gcdlcm(int)
+    a = self.abs
+    b = int.abs
+    gcd = a.gcd(b)
+    return gcd, (a.div(gcd)) * b
+  end
+  
 end
 
 class Fixnum
-  remove_method :quo
-
-  # If Rational is defined, returns a Rational number instead of a Float.
+  undef quo
   def quo(other)
-    Rational.new!(self, 1) / 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
+      Rational.new!(self,1)**other
     end
   end
 
+  unless defined? 1.power!
+    alias power! ** 
+    alias ** rpower
+  end
 end
 
 class Bignum
-  remove_method :quo
+  unless defined? Complex
+    alias power! **
+  end
 
-  # If Rational is defined, returns a Rational number instead of a Float.
+  undef quo
   def quo(other)
-    Rational.new!(self, 1) / 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)
@@ -549,16 +367,8 @@ class Bignum
       Rational.new!(self, 1)**other
     end
   end
-
-end
-
-unless defined? 1.power!
-  class Fixnum
-    alias power! **
-    alias ** rpower
-  end
-  class Bignum
-    alias power! **
+  
+  unless defined? Complex
     alias ** rpower
   end
 end
diff --git a/lib/rdoc/README b/lib/rdoc/README
index 89ea0fbd3f..1b8671182f 100644
--- a/lib/rdoc/README
+++ b/lib/rdoc/README
@@ -82,6 +82,9 @@ 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:
@@ -161,10 +164,7 @@ Options are:
     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.
+    set the class, module, or file to appear on the index page
 
 [<tt>--merge</tt>]
     when generating _ri_ output, if classes being processed already
@@ -196,12 +196,11 @@ Options are:
 [<tt>--quiet</tt>]
     do not display progress messages
 
-[<tt>--ri</tt>, <tt>--ri-site</tt>, _and_ <tt>--ri-system</tt>]
+[<tt>--ri</tt> _and_ <tt>--ri-site</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
+    By default --ri places its output in ~/.rdoc, and --ri-site in
+    $datadir/ri/<ver>/site. Both can be overridden with a subsequent
+    --op option. Both default directories are in ri's default search
     path.
 
 [<tt>--show-hash</tt>]
@@ -240,15 +239,7 @@ can see the formatted result in EXAMPLE.rb and Anagram.
 
 = 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
+Comment blocks can be written fairly naturally. 
 
 Paragraphs are lines that share the left margin. Text indented past
 this margin are formatted verbatim.
@@ -333,8 +324,7 @@ this margin are formatted verbatim.
 
    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>.
+   used as the target.
        
 9. Method parameter lists are extracted and displayed with
    the method description. If a method calls +yield+, then
@@ -419,28 +409,6 @@ this margin are formatted verbatim.
 
 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
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index d6c4f1bdb9..bfacff1321 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -23,9 +23,6 @@ module RDoc
 
     attr_accessor :done_documenting
 
-    # Which section are we in
-
-    attr_accessor :section
 
     # do we document ourselves?
 
@@ -114,51 +111,7 @@ module RDoc
   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()
@@ -170,9 +123,6 @@ module RDoc
       @parent  = nil
       @visibility = :public
 
-      @current_section = Section.new(nil, nil)
-      @sections = [ @current_section ]
-
       initialize_methods_etc
       initialize_classes_and_modules
     end
@@ -196,22 +146,9 @@ module RDoc
     # visibility of the corresponding AnyMethod object
 
     def set_visibility_for(methods, vis, singleton=false)
-      count = 0
-      @method_list.each do |m|
+      @method_list.each_with_index do |m,i|
         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
@@ -245,7 +182,7 @@ module RDoc
     end
 
     def add_alias(an_alias)
-      meth = find_instance_method_named(an_alias.old_name)
+      meth = find_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
@@ -283,18 +220,15 @@ module RDoc
       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
+        collection[name] = cls
         cls.parent = self
-        cls.section = @current_section
       end
       cls
     end
 
     def add_to(array, thing)
-      array <<  thing if @document_self  && !@done_documenting
+      array <<  thing if @document_self
       thing.parent = self
-      thing.section = @current_section
     end
 
     # If a class's documentation is turned off after we've started
@@ -329,11 +263,6 @@ module RDoc
       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
 
@@ -378,7 +307,7 @@ module RDoc
       result = nil
       case symbol
       when /^::(.*)/
-        result = toplevel.find_symbol($1)
+        result = toplevel.find_symbol(symbol)
       when /::/
         modules = symbol.split(/::/)
         unless modules.empty?
@@ -387,33 +316,21 @@ module RDoc
           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
+        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
       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
@@ -426,13 +343,6 @@ module RDoc
             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
@@ -440,11 +350,6 @@ module RDoc
       @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}
@@ -506,10 +411,10 @@ module RDoc
         cls = all[name]
         if !cls
           cls = class_type.new(name, superclass)
-          all[name] = cls  unless @done_documenting
+          all[name] = cls
         end
         puts "Adding class/module #{name} to #@name" if $DEBUG
-        collection[name] = cls unless @done_documenting
+        collection[name] = cls
         cls.parent = self
       end
       cls
@@ -537,12 +442,6 @@ module RDoc
       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
@@ -663,12 +562,6 @@ module RDoc
       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] == ?(
@@ -717,14 +610,13 @@ $stderr.puts p
 
   # Represent attributes
   class Attr < CodeObject
-    attr_accessor :text, :name, :rw, :visibility
+    attr_accessor :text, :name, :rw
 
     def initialize(text, name, rw, comment)
       super()
       @text = text
       @name = name
       @rw = rw
-      @visibility = :public
       self.comment = comment
     end
 
diff --git a/lib/rdoc/diagram.rb b/lib/rdoc/diagram.rb
index 9fdc49c02e..94ab17bb35 100644
--- a/lib/rdoc/diagram.rb
+++ b/lib/rdoc/diagram.rb
@@ -38,7 +38,6 @@ module RDoc
       @options = options
       @counter = 0
       File.makedirs(DOT_PATH)
-      @diagram_cache = {}
     end
 
     # Draw the diagrams. We traverse the files, drawing a diagram for
@@ -56,6 +55,7 @@ module RDoc
         @local_names = find_names(i)
         @global_names = []
         @global_graph = graph = DOT::DOTDigraph.new('name' => 'TopLevel',
+                                    'label' => i.file_absolute_name,
                                     'fontname' => FONT,
                                     'fontsize' => '8',
                                     'bgcolor'  => 'lightcyan1',
@@ -73,7 +73,7 @@ module RDoc
         end
         add_classes(i, graph, i.file_relative_name)
 
-        i.diagram = convert_to_png("f_#{file_count}", graph)
+        i.diagram = convert_to_png("f_#{file_count}", graph, i.name)
         
         # now go through and document each top level class and
         # module independently
@@ -83,6 +83,7 @@ module RDoc
           @global_names = []
 
           @global_graph = graph = DOT::DOTDigraph.new('name' => 'TopLevel',
+                                      'label' => i.full_name,
                                       'fontname' => FONT,
                                       'fontsize' => '8',
                                       'bgcolor'  => 'lightcyan1',
@@ -94,7 +95,8 @@ module RDoc
                                     'fontsize' => 8)
           draw_module(mod, graph, true)
           mod.diagram = convert_to_png("m_#{file_count}_#{count}", 
-                                       graph) 
+                                       graph, 
+                                       "Module: #{mod.name}")
         end
       end
       $stderr.puts unless @options.quiet
@@ -278,9 +280,7 @@ module RDoc
       
     end
 
-    def convert_to_png(file_base, graph)
-      str = graph.to_s
-      return @diagram_cache[str] if @diagram_cache[str]
+    def convert_to_png(file_base, graph, name)
       op_type = Options.instance.image_format
       dotfile = File.join(DOT_PATH, file_base)
       src = dotfile + ".dot"
@@ -292,17 +292,15 @@ module RDoc
       end
 
       File.open(src, 'w+' ) do |f|
-        f << str << "\n"
+        f << graph.to_s << "\n"
       end
       
-      system "dot", "-T#{op_type}", src, "-o", dot
+      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
+      return wrap_in_image_map(src, dot, name)
     end
 
     # Extract the client-side image map from dot, and use it
@@ -310,8 +308,8 @@ module RDoc
     # <map>..<img> combination, suitable for inclusion on
     # the page
 
-    def wrap_in_image_map(src, dot)
-      res = %{<map id="map" name="map">\n}
+    def wrap_in_image_map(src, dot, name)
+      res = %{<map name="map">\n}
       dot_map = `dot -Tismap #{src}`
       dot_map.each do |area|
         unless area =~ /^rectangle \((\d+),(\d+)\) \((\d+),(\d+)\) ([\/\w.]+)\s*(.*)/
@@ -319,16 +317,16 @@ module RDoc
           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}
+        blx = $1; bly = $2
+        trx = $3; try = $4
+        url = $5; area_name = $6
+        res <<  %{  <area shape="RECT" coords="#{blx},#{try},#{trx},#{bly}" }
+        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}">}
+      res << %{<img src="#{dot}" usemap="#map" border=0 alt="#{name}">}
       return res
     end
   end
diff --git a/lib/rdoc/dot/dot.rb b/lib/rdoc/dot/dot.rb
index 6dbb7cb237..3f23e5389c 100644
--- a/lib/rdoc/dot/dot.rb
+++ b/lib/rdoc/dot/dot.rb
@@ -1,15 +1,15 @@
 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',
@@ -27,7 +27,7 @@ module DOT
         'style',
         'URL',
     ]
-
+    
     # options for edge declaration
     EDGE_OPTS = [
         'color',
@@ -45,7 +45,7 @@ module DOT
         'style',
         'weight'
     ]
-
+    
     # options for graph declaration
     GRAPH_OPTS = [
         'bgcolor',
@@ -75,7 +75,7 @@ module DOT
         'style',
         'URL'
     ]
-
+    
     # a root class for any element in dot notation
     class DOTSimpleElement
         attr_accessor :name
@@ -88,7 +88,7 @@ module DOT
             @name
         end
     end
-
+    
     # an element that has options ( node, edge or graph )
     class DOTElement < DOTSimpleElement
         #attr_reader :parent
@@ -96,7 +96,7 @@ module DOT
 
         def initialize( params = {}, option_list = [] )
             super( params )
-            @name = params['name'] ? params['name'] : nil
+            @name = params['name'] ? params['name'] : nil 
             @parent = params['parent'] ? params['parent'] : nil
             @options = {}
             option_list.each{ |i|
@@ -104,7 +104,7 @@ module DOT
             }
             @options['label'] ||= @name if @name != 'node'
         end
-
+        
         def each_option
             @options.each{ |i| yield i }
         end
@@ -118,13 +118,13 @@ module DOT
         #    @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'] : ''
@@ -133,7 +133,7 @@ module DOT
             ( @name && @name != "" ? "<#{@name}>" : "" ) + "#{@label}"
         end
     end
-
+    
     # node element
     class DOTNode < DOTElement
 
@@ -161,7 +161,7 @@ module DOT
         def to_s( t = '' )
 
             label = @options['shape'] != 'record' && @ports.length == 0 ?
-                @options['label'] ?
+                @options['label'] ? 
                     t + $tab + "label = \"#{@options['label']}\"\n" :
                     '' :
                 t + $tab + 'label = "' + " \\\n" +
@@ -170,14 +170,14 @@ module DOT
                     t + $tab2 + i.to_s
                 }.join( "| \\\n" ) + " \\\n" +
                 t + $tab + '"' + "\n"
-
+            
             t + "#{@name} [\n" +
             @options.to_a.collect{ |i|
-                i[1] && i[0] != 'label' ?
+                i[1] && i[0] != 'label' ? 
                     t + $tab + "#{i[0]} = #{i[1]}" : nil
-            }.compact.join( ",\n" ) + ( label != '' ? ",\n" : "\n" ) +
+            }.compact.join( ",\n" ) + ( label != '' ? ",\n" : "\n" ) + 
             label +
-            t + "]\n"
+            t + "]\n" 
         end
     end
 
@@ -198,7 +198,7 @@ module DOT
         def << ( thing )
             @nodes << thing
         end
-
+       
         def push( thing )
             @nodes.push( thing )
         end
@@ -211,14 +211,14 @@ module DOT
           hdr = t + "#{@dot_string} #{@name} {\n"
 
           options = @options.to_a.collect{ |name, val|
-            val && name != 'label' ?
-            t + $tab + "#{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"
+          }.join( "\n" ) + "\n" 
           hdr + options + nodes + t + "}\n"
         end
     end
@@ -239,12 +239,12 @@ module DOT
             @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] && 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
diff --git a/lib/rdoc/generators/chm_generator.rb b/lib/rdoc/generators/chm_generator.rb
index 51eeda8dd1..1c46769cc2 100644
--- a/lib/rdoc/generators/chm_generator.rb
+++ b/lib/rdoc/generators/chm_generator.rb
@@ -4,7 +4,7 @@ module Generators
 
   class CHMGenerator < HTMLGenerator
 
-    HHC_PATH = "c:/Program Files/HTML Help Workshop/hhc.exe"
+    HHC_PATH = "c:\\Program Files\\HTML Help Workshop\\hhc.exe"
 
     # Standard generator factory
     def CHMGenerator.for(options)
@@ -103,7 +103,7 @@ module Generators
 
     # Invoke the windows help compiler to compiler the project
     def compile_project
-      system(HHC_PATH, @project_name)
+      system("\"#{HHC_PATH}\" #@project_name")
     end
 
   end
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index 1f9b808e8d..c5a12eee39 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -61,7 +61,7 @@ module Generators
 
   class AllReferences
     @@refs = {}
-    
+
     def AllReferences::reset
       @@refs = {}
     end
@@ -73,10 +73,6 @@ module Generators
     def AllReferences.[](name)
       @@refs[name]
     end
-
-    def AllReferences.keys
-      @@refs.keys
-    end
   end
 
 
@@ -114,12 +110,7 @@ module Generators
         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
+      if /([A-Z].*)[.\#](.*)/ =~ lookup
         container = $1
         method = $2
         ref = @context.find_symbol(container, method)
@@ -134,10 +125,15 @@ module Generators
       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.
 
-    # 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)
+    def handle_special_HYPERLINK(special)
+      url = special.text
       if url =~ /([A-Za-z]+):(.*)/
         type = $1
         path = $2
@@ -158,37 +154,29 @@ module Generators
       if (type == "http" || type == "link") && 
           url =~ /\.(gif|png|jpg|jpeg|bmp)$/
 
-        "<img src=\"#{url}\" />"
+        "<img src=\"#{url}\">"
       else
-        "<a href=\"#{url}\">#{text.sub(%r{^#{type}:/*}, '')}</a>"
+        "<a href=\"#{url}\">#{url.sub(%r{^\w+:/*}, '')}</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+)\[(.*?)\]/ 
+      unless text =~ /(\S+)\[(.*?)\]/
         return text
       end
       label = $1
       url   = $2
-      gen_url(url, label)
+      
+      unless url =~ /\w+?:/
+        url = "http://#{url}"
+      end
+      
+      "<a href=\"#{url}\">#{label}</a>"
     end
 
   end
@@ -211,23 +199,20 @@ module Generators
       unless defined? @markup
         @markup = SM::SimpleMarkup.new
 
-        # class names, variable names, or instance variables
+        # class names, variable names, file 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+)*[.\#]\w+)  #    A::B.meth
                              | \b([A-Z]\w+(::\w+)*)       #    A::B..
                              | \#\w+[!?=]?                #    #meth_name 
-                             | \b\w+([_\/\.]+\w+)*[!?=]?  #    meth_name
+                             | \b\w+([_\/\.]+\w+)+[!?=]?  #    meth_name
                              )/x, 
                             :CROSSREF)
 
         # external hyperlinks
-        @markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK)
+        @markup.add_special(/((link:|http:|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)
+        @markup.add_special(/\b(\S+?\[\S+?\.\S+?\])/, :TIDYLINK)
 
       end
       unless defined? @html_formatter
@@ -321,7 +306,7 @@ module Generators
     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 }
+        list = list.find_all {|m| m.visibility == :public || m.force_documentation }
       end
       @methods = list.collect {|m| HtmlMethod.new(m, self, @options) }
     end
@@ -341,37 +326,26 @@ module Generators
     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 = {
+    # Build a list of aliases fo which we couldn't find a corresponding method
+    def build_alias_summary_list
+      @context.aliases.map do |al|
+        {
           '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
+    def build_constants_summary_list
+      @context.constants.map do |co|
         res = {
           'name'  => co.name,
-          'value' => CGI.escapeHTML(co.value)
+          'value' => co.value
         }
         res['desc'] = markup(co.comment, true) if co.comment && !co.comment.empty?
-        values << res
+        res
       end
-      values
     end
     
     def build_requires_list(context)
@@ -395,18 +369,6 @@ module Generators
       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?
@@ -429,7 +391,7 @@ module Generators
     # methods, the other for instance methods. The inner arrays contain
     # a hash for each method
 
-    def build_method_detail_list(section)
+    def build_method_detail_list
       outer = []
 
       methods = @methods.sort
@@ -437,13 +399,10 @@ module Generators
         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
+            if m.document_self and m.visibility == vis and m.singleton == singleton
               row = {}
               if m.call_seq
-                row["callseq"] = m.call_seq.gsub(/->/, '&rarr;')
+                row["callseq"] = m.call_seq
               else
                 row["name"]        = CGI.escapeHTML(m.name)
                 row["params"]      = m.params
@@ -453,18 +412,14 @@ module Generators
               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 << {
+              unless m.aliases.empty?
+                row["aka"] = m.aliases.map do |other| 
+                  {
                     '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
@@ -494,12 +449,11 @@ module Generators
     # Build the structured list of classes and modules contained
     # in this context. 
 
-    def build_class_list(level, from, section, infile=nil)
+    def build_class_list(level, from, 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 << 
@@ -507,12 +461,11 @@ module Generators
             "Module " <<
             href(url(mod.viewer.path), "link", mod.full_name) <<
             "<br />\n" <<
-            build_class_list(level + 1, mod, section, infile)
+            build_class_list(level + 1, mod, 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      <<
@@ -520,7 +473,7 @@ module Generators
             "Class " <<
             href(url(cls.viewer.path), "link", cls.full_name) <<
             "<br />\n" <<
-            build_class_list(level + 1, cls, section, infile)
+            build_class_list(level + 1, cls, infile)
         end
       end
 
@@ -559,24 +512,6 @@ module Generators
       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
 
   #####################################################################
@@ -640,7 +575,6 @@ module Generators
 
     def value_hash
       class_attribute_values
-      add_table_of_sections
 
       @values["charset"] = @options.charset
       @values["style_url"] = style_url(path, @options.css)
@@ -651,54 +585,35 @@ module Generators
       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|
+      al = build_alias_summary_list
+      @values["aliases"] = al unless al.empty?
 
-        secdata = {
-          "sectitle" => section.title,
-          "secsequence" => section.sequence,
-          "seccomment" => markup(section.comment)
-        }
+      co = build_constants_summary_list
+      @values["constants"] = co unless co.empty?
 
-        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?
+      il = build_include_list(@context)
+      @values["includes"] = il unless il.empty?
 
-        secdata
-      end
+      al = build_attribute_list
+      @values["attributes"] = al unless al.empty?
+      
+      cl = build_class_list(0, @context)
+      @values["classlist"] = cl unless cl.empty?
 
+      mdl = build_method_detail_list
+      @values["method_list"] = mdl unless mdl.empty?
       @values
     end
 
-    def build_attribute_list(section)
+    def build_attribute_list
       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
+        res << {
+          "name"   => CGI.escapeHTML(att.name), 
+          "rw"     => att.rw, 
+          "a_desc" => markup(att.comment, true)
+        }
       end
       res
     end
@@ -751,6 +666,7 @@ module Generators
       end
 
       @values['infiles'] = files
+
     end
 
     def <=>(other)
@@ -808,7 +724,6 @@ module Generators
 
     def value_hash
       file_attribute_values
-      add_table_of_sections
 
       @values["charset"]   = @options.charset
       @values["href"]      = path
@@ -828,36 +743,20 @@ module Generators
       rl = build_requires_list(@context)
       @values["requires"] = rl unless rl.empty?
 
+      co = build_constants_summary_list
+      @values["constants"] = co unless co.empty?
+
       if @options.promiscuous
         file_context = nil
       else
         file_context = @context
       end
 
+      cl = build_class_list(0, @context, file_context)
+      @values["classlist"] = cl unless cl.empty?
 
-      @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
-      
+      mdl = build_method_detail_list
+      @values["method_list"] = mdl unless mdl.empty?
       @values
     end
     
@@ -948,10 +847,6 @@ module Generators
       @context.name
     end
 
-    def section
-      @context.section
-    end
-
     def index_name
       "#{@context.name} (#{@html_class.name})"
     end
@@ -1007,11 +902,6 @@ module Generators
         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] == ?(
@@ -1033,7 +923,7 @@ module Generators
         values = {
           'title'     => CGI.escapeHTML(index_name),
           'code'      => code_body,
-          'style_url' => style_url(file_path, @options.css),
+          'style_url' => style_url(path, @options.css),
           'charset'   => @options.charset
         }
         template.write_html_on(f, values)
@@ -1200,15 +1090,11 @@ module Generators
     private
 
     ##
-    # Load up the HTML template specified in the options.
-    # If the template name contains a slash, use it literally
+    # Load up the HTML template specified in the options
     #
     def load_html_template
-      template = @options.template
-      unless template =~ %r{/|\\}
-        template = File.join("rdoc/generators/template",
-                             @options.generator.key, template)
-      end
+      template = File.join("rdoc/generators/template",
+                           @options.generator.key, @options.template)
       require template
       extend RDoc::Page
     rescue LoadError
@@ -1370,20 +1256,7 @@ module Generators
         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 = @files[0].path unless ref
 
       ref
     end
diff --git a/lib/rdoc/generators/ri_generator.rb b/lib/rdoc/generators/ri_generator.rb
index c7d0bbd8f0..705ad7da06 100644
--- a/lib/rdoc/generators/ri_generator.rb
+++ b/lib/rdoc/generators/ri_generator.rb
@@ -69,7 +69,7 @@ module Generators
 
     def initialize(options) #:not-new:
       @options   = options
-      @ri_writer = RI::RiWriter.new(".")
+      @ri_writer = RI::RiWriter.new(options.op_dir)
       @markup    = SM::SimpleMarkup.new
       @to_flow   = SM::ToFlow.new
     end
@@ -97,10 +97,10 @@ module Generators
 
     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
+      else
+        cls_desc = RI::ModuleDescription.new
       end
       cls_desc.name        = cls.name
       cls_desc.full_name   = cls.full_name
@@ -172,7 +172,7 @@ module Generators
       list = cls.method_list
       unless @options.show_all
         list = list.find_all do |m|
-          m.visibility == :public || m.visibility == :protected || m.force_documentation
+          m.visibility == :public || m.force_documentation 
         end
       end
 
diff --git a/lib/rdoc/generators/template/chm/chm.rb b/lib/rdoc/generators/template/chm/chm.rb
index 4a89c26520..6df83a7773 100644
--- a/lib/rdoc/generators/template/chm/chm.rb
+++ b/lib/rdoc/generators/template/chm/chm.rb
@@ -7,7 +7,6 @@ require "rdoc/generators/template/html/html"
 # tag, so...
 
 BODY.sub!(/<\?xml.*\?>/, '')
-SRC_PAGE.sub!(/<\?xml.*\?>/, '')
 
 HPP_FILE = %{
 [OPTIONS]
diff --git a/lib/rdoc/generators/template/html/hefss.rb b/lib/rdoc/generators/template/html/hefss.rb
index e68ca85823..ff4f557b71 100644
--- a/lib/rdoc/generators/template/html/hefss.rb
+++ b/lib/rdoc/generators/template/html/hefss.rb
@@ -114,7 +114,7 @@ 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" />
+  <link rel=StyleSheet href="%style_url%" type="text/css" media=screen>
   <script type="text/javascript" language="JavaScript">
   <!--
   function popCode(url) {
@@ -138,9 +138,9 @@ IF:description
 ENDIF:description
 
 IF:requires
-<table cellpadding="5" width="100%">
+<table cellpadding=5 width="100%">
 <tr><td class="tablesubtitle">Required files</td></tr>
-</table><br />
+</table><br>
 <div class="name-list">
 START:requires
 HREF:aref:name:
@@ -149,9 +149,9 @@ ENDIF:requires
 </div>
 
 IF:methods
-<table cellpadding="5" width="100%">
+<table cellpadding=5 width="100%">
 <tr><td class="tablesubtitle">Subroutines and Functions</td></tr>
-</table><br />
+</table><br>
 <div class="name-list">
 START:methods
 HREF:aref:name:,
@@ -160,10 +160,10 @@ END:methods
 ENDIF:methods
 
 IF:attributes
-<table cellpadding="5" width="100%">
+<table cellpadding=5 width="100%">
 <tr><td class="tablesubtitle">Arguments</td></tr>
-</table><br />
-<table cellspacing="5">
+</table><br>
+<table cellspacing=5>
 START:attributes
      <tr valign="top">
 IF:rw
@@ -180,10 +180,10 @@ END:attributes
 ENDIF:attributes
 
 IF:classlist
-<table cellpadding="5" width="100%">
+<table cellpadding=5 width="100%">
 <tr><td class="tablesubtitle">Modules</td></tr>
-</table><br />
-%classlist%<br />
+</table><br>
+%classlist%<br>
 ENDIF:classlist
 
   !INCLUDE!  <!-- method descriptions -->
@@ -198,13 +198,13 @@ 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">
+   <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>)
+				&nbsp;(<a href="%cvsurl%">CVS</a>)
 ENDIF:cvsurl
            </td>
          </tr>
@@ -215,26 +215,26 @@ ENDIF:cvsurl
         </table>
     </td></tr></table></td>
   </tr>
-</table><br />
+</table><br>
 _FILE_PAGE_
 
 ###################################################################
 
 CLASS_PAGE = %{
-<table width="100%" border="0" cellspacing="0">
+<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%
+   <font size=-3><B>%classmod%</B><BR></font>%full_name%
  </td>
  <td align="right">
-   <table cellspacing="0" cellpadding="2">
+   <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>)
+&nbsp;(<a href="%cvsurl%">CVS</a>)
 ENDIF:cvsurl
 END:infiles
       </td>
@@ -256,14 +256,14 @@ ENDIF:parent
    </table>
   </td>
   </tr>
-</table><br />
+</table><br>
 }
 
 ###################################################################
 
 METHOD_LIST = %{
 IF:includes
-<div class="tablesubsubtitle">Uses</div><br />
+<div class="tablesubsubtitle">Uses</div><br>
 <div class="name-list">
 START:includes
     <span class="method-name">HREF:aref:name:</span>
@@ -274,11 +274,11 @@ ENDIF:includes
 IF:method_list
 START:method_list
 IF:methods
-<table cellpadding="5" width="100%">
+<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">
+<table width="100%" cellspacing = 0 cellpadding=5 border=0>
 <tr><td class="methodtitle">
 <a name="%aref%">
 <b>%name%</b>%params% 
@@ -307,7 +307,7 @@ SRC_PAGE = %{
 <html>
 <head><title>%title%</title>
 <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<style type="text/css">
+<style>
   .kw { color: #3333FF; font-weight: bold }
   .cmt { color: green; font-style: italic }
   .str { color: #662222; font-style: italic }
@@ -339,7 +339,7 @@ FILE_INDEX = %{
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<style type="text/css">
+<style>
 <!--
   body {
 background-color: #bbbbbb;
@@ -368,7 +368,7 @@ div.banner {
 <body>
 <div class="banner">%list_title%</div>
 START:entries
-<a href="%href%">%name%</a><br />
+<a href="%href%">%name%</a><br>
 END:entries
 </body></html>
 }
diff --git a/lib/rdoc/generators/template/html/html.rb b/lib/rdoc/generators/template/html/html.rb
index 7f9e599465..8ac631490c 100644
--- a/lib/rdoc/generators/template/html/html.rb
+++ b/lib/rdoc/generators/template/html/html.rb
@@ -20,22 +20,18 @@
 #
 
 module RDoc
-  module Page
+	module Page
 
-    FONTS = "Verdana,Arial,Helvetica,sans-serif"
+		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%; }
+h1 { font-size: 120%; }
 h2,h3,h4 { margin-top: 1em; }
 
 a { background: #eef; color: #039; text-decoration: none; }
@@ -43,75 +39,61 @@ 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;
+	background: transparent;
+	color: #039;
+	text-decoration: none;
 }
 
 /* === Structural elements =================================== */
 
 div#index {
     margin: 0;
-    margin-left: -40px;
     padding: 0;
-    font-size: 90%;
+    font-size: 0.9em;
 }
 
-
 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 {
+div#classHeader {
     width: auto;
+    background: #039;
     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 {
+div#classHeader a {
     background: inherit;
     color: white;
 }
 
-div#classHeader td, div#fileHeader td {
+div#classHeader td {
     background: inherit;
     color: white;
 }
 
-
 div#fileHeader {
-    background: #057;
+    width: auto;
+    background: #039;
+    color: white;
+    padding: 0.5em 1.5em 0.5em 1.5em;
+    margin: 0;
+    border-bottom: 3px solid #006;
 }
 
-div#classHeader {
-    background: #048;
+div#fileHeader a {
+    background: inherit;
+    color: white;
 }
 
-
-.class-name-in-header {
-  font-size:  180%;
-  font-weight: bold;
+div#fileHeader td {
+    background: inherit;
+    color: white;
 }
 
-
 div#bodyContent {
     padding: 0 1.5em 0 1.5em;
 }
@@ -123,7 +105,7 @@ div#description {
 }
 
 div#description h1,h2,h3,h4,h5,h6 {
-    color: #125;;
+    color: black;
     background: transparent;
 }
 
@@ -154,51 +136,35 @@ table.header-table {
     color: #DEDEDE;
 }
 
-.xxsection-bar {
+.section-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 }
+.top-aligned-row { vertical-align: vertical-align: top }
 
 /* --- 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; }
+.context-item-value { font-size: x-small; color: #448; }
+.context-item-desc { background: #efefef; }
 
 /* --- Method classes -------------------------- */
 .method-detail {
-    background: #efefef;
+    background: #EFEFEF;
     padding: 0;
     margin-top: 0.5em;
-    margin-bottom: 1em;
-    border: 1px dotted #ccc;
+    margin-bottom: 0.5em;
+    border: 1px dotted #DDD;
 }
 .method-heading {
-  color: black;
-  background: #ccc;
-  border-bottom: 1px solid #666;
-  padding: 0.2em 0.5em 0 0.5em;
+	color: black;
+	background: #AAA;
+	border-bottom: 1px solid #666;
+	padding: 0.2em 0.5em 0 0.5em;
 }
 .method-signature { color: black; background: inherit; }
 .method-name { font-weight: bold; }
@@ -211,7 +177,7 @@ a.source-toggle { font-size: 90%; }
 div.method-source-code {
     background: #262626;
     color: #ffdead;
-    margin: 1em;
+	margin: 1em;
     padding: 0.5em;
     border: 1px dashed #999;
     overflow: hidden;
@@ -220,69 +186,67 @@ div.method-source-code {
 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; }
+/* (requires a hacked html_generator.rb to add more class-types) */
+.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; }
+.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  
+###	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">
+     "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>
+	<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>
@@ -290,15 +254,117 @@ HEADER = XHTML_PREAMBLE + %{
 
 
 #####################################################################
-### C O N T E X T   C O N T E N T   T E M P L A T E
+###	C O N T E X T   C O N T E N T   T E M P L A T E
 #####################################################################
 
 CONTEXT_CONTENT = %{
+	<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">
+			<h2 class="section-bar">Required files</h2>
+
+			<div class="name-list">
+START:requires
+			HREF:aref:name:&nbsp;&nbsp;
+END:requires
+			</div>
+		</div>
+ENDIF:requires
+
+IF:methods
+		<div id="method-list">
+			<h2 class="section-bar">Methods</h2>
+
+			<div class="name-list">
+START:methods
+			HREF:aref:name:&nbsp;&nbsp;
+END:methods
+			</div>
+		</div>
+ENDIF:methods
+
+IF:constants
+		<div id="constants-list">
+			<h2 class="section-bar">Constants</h2>
+
+			<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>
+				</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:constants
+				</table>
+			</div>
+		</div>
+ENDIF:constants
+
+IF:aliases
+		<div id="aliases-list">
+			<h2 class="section-bar">External Aliases</h2>
+
+			<div class="name-list">
+START:aliases
+			%old_name% -> %new_name% <br />
+END:aliases
+			</div>
+		</div>
+ENDIF:aliases
+
+
+IF:attributes
+		<div id="attribute-list">
+			<h2 class="section-bar">Attributes</h2>
+
+			<div class="name-list">
+				<table>
+START:attributes
+				<tr class="top-aligned-row context-row">
+					<td class="context-item-name">%name%</td>
+					<td class="context-item-value">&nbsp;[%rw%]&nbsp;</td>
+					<td class="context-item-desc">%a_desc%</td>
+				</tr>
+END:attributes
+				</table>
+			</div>
+		</div>
+ENDIF:attributes
+			
+IF:classlist
+		<div id="class-list">
+			<h2 class="section-bar">Classes and Modules</h2>
+
+			%classlist%
+		</div>
+ENDIF:classlist
+
+	</div>
+
 }
 
 
 #####################################################################
-### F O O T E R   T E M P L A T E
+###	F O O T E R   T E M P L A T E
 #####################################################################
 FOOTER = %{
 <div id="validator-badges">
@@ -311,42 +377,39 @@ FOOTER = %{
 
 
 #####################################################################
-### F I L E   P A G E   H E A D E R   T E M P L A T E
+###	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%
+	<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>)
+				&nbsp;(<a href="%cvsurl%">CVS</a>)
 ENDIF:cvsurl
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>%dtm_modified%</td>
-    </tr>
-    </table>
-  </div>
+			</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
+###	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">
+        <h1>%full_name% <sup class="type-note">(%classmod%)</sup></h1>
         <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
@@ -358,9 +421,9 @@ IF:full_path_url
                 </a>
 ENDIF:full_path_url
 IF:cvsurl
-        &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+				&nbsp;(<a href="%cvsurl%">CVS</a>)
 ENDIF:cvsurl
-        <br />
+				<br />
 END:infiles
             </td>
         </tr>
@@ -385,263 +448,126 @@ ENDIF:parent
 
 
 #####################################################################
-### M E T H O D   L I S T   T E M P L A T E
+###	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 -->
 IF:includes
-    <div id="includes">
-      <h3 class="section-bar">Included Modules</h3>
+		<div id="includes">
+			<h2 class="section-bar">Included Modules</h2>
 
-      <div id="includes-list">
+			<div id="includes-list">
 START:includes
-        <span class="include-name">HREF:aref:name:</span>
+		    <span class="include-name">HREF:aref:name:</span>
 END:includes
-      </div>
-    </div>
+			</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 -->
 IF:method_list
-    <div id="methods">
+		<div id="methods">
 START:method_list
 IF:methods
-      <h3 class="section-bar">%type% %category% methods</h3>
+			<h2 class="section-bar">%type% %category% methods</h2>
 
 START:methods
-      <div id="method-%aref%" class="method-detail">
-        <a name="%aref%"></a>
+			<div id="method-%aref%" class="method-detail">
+				<a name="%aref%"></a>
 
-        <div class="method-heading">
+				<div class="method-heading">
 IF:codeurl
-          <a href="%codeurl%" target="Code" class="method-signature"
-            onclick="popupCode('%codeurl%');return false;">
+					<a href="%codeurl%" target="Code" class="method-signature"
+						onclick="popupCode('%codeurl%');return false;">
 ENDIF:codeurl
 IF:sourcecode
-          <a href="#%aref%" class="method-signature">
+					<a href="#%aref%" class="method-signature">
 ENDIF:sourcecode
 IF:callseq
-          <span class="method-name">%callseq%</span>
+					<span class="method-name">%callseq%</span>
 ENDIF:callseq
 IFNOT:callseq
-          <span class="method-name">%name%</span><span class="method-args">%params%</span>
+					<span class="method-name">%name%</span><span class="method-args">%params%</span>
 ENDIF:callseq
 IF:codeurl
-          </a>
+					</a>
 ENDIF:codeurl
 IF:sourcecode
-          </a>
+					</a>
 ENDIF:sourcecode
-        </div>
-      
-        <div class="method-description">
+				</div>
+			
+				<div class="method-description">
 IF:m_desc
-          %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">
+					<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>
+					</div>
 ENDIF:sourcecode
-        </div>
-      </div>
+				</div>
+			</div>
 
 END:methods
 ENDIF:methods
 END:method_list
 
-    </div>
+		</div>
 ENDIF:method_list
-END:sections
 }
 
 
 #####################################################################
-### B O D Y   T E M P L A T E
+###	B O D Y   T E M P L A T E
 #####################################################################
 
 BODY = HEADER + %{
 
 !INCLUDE!  <!-- banner header -->
 
-  <div id="bodyContent">
+	<div id="bodyContent">
 
-} +  METHOD_LIST + %{
+} + CONTEXT_CONTENT + METHOD_LIST + %{
 
-  </div>
+	</div>
 
 } + FOOTER
 
 
 
 #####################################################################
-### S O U R C E   C O D E   T E M P L A T E
+###	S O U R C E   C O D E   T E M P L A T E
 #####################################################################
 
 SRC_PAGE = XHTML_PREAMBLE + %{
+<!--
+
+    %title%
+
+  -->
 <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" />
+	<title>%title%</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+	<link rel="stylesheet" href="http://www.FaerieMUD.org/stylesheets/rdoc.css" type="text/css" />
 </head>
-<body class="standalone-code">
-  <pre>%code%</pre>
+<body>
+	<pre>%code%</pre>
 </body>
 </html>
 }
 
 
 #####################################################################
-### I N D E X   F I L E   T E M P L A T E S
+###	I N D E X   F I L E   T E M P L A T E S
 #####################################################################
 
 FR_INDEX_BODY = %{
@@ -656,19 +582,19 @@ FILE_INDEX = XHTML_PREAMBLE + %{
   -->
 <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" />
+	<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">
+	<h1 class="section-bar">%list_title%</h1>
+	<div id="index-entries">
 START:entries
-    <a href="%href%">%name%</a><br />
+		<a href="%href%">%name%</a><br />
 END:entries
-  </div>
+	</div>
 </div>
 </body>
 </html>
@@ -680,7 +606,7 @@ 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">
+     "DTD/xhtml1-frameset.dtd">
 
 <!--
 
@@ -689,8 +615,8 @@ INDEX = %{<?xml version="1.0" encoding="%charset%"?>
   -->
 <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%" />
+	<title>%title%</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
 </head>
 <frameset rows="20%, 80%">
     <frameset cols="25%,35%,45%">
@@ -704,8 +630,6 @@ INDEX = %{<?xml version="1.0" encoding="%charset%"?>
 }
 
 
-
-  end # module Page
+	end # module Page
 end # class RDoc
 
-require 'rdoc/generators/template/html/one_page_html'
diff --git a/lib/rdoc/generators/template/html/kilmer.rb b/lib/rdoc/generators/template/html/kilmer.rb
index 55071fc026..7326fb09ac 100644
--- a/lib/rdoc/generators/template/html/kilmer.rb
+++ b/lib/rdoc/generators/template/html/kilmer.rb
@@ -94,7 +94,7 @@ 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" />
+  <link rel=StyleSheet href="%style_url%" type="text/css" media=screen>
   <script type="text/javascript" language="JavaScript">
   <!--
   function popCode(url) {
@@ -118,9 +118,9 @@ IF:description
 ENDIF:description
 
 IF:requires
-<table cellpadding="5" width="100%">
+<table cellpadding=5 width="100%">
 <tr><td class="tablesubtitle">Required files</td></tr>
-</table><br />
+</table><br>
 <div class="name-list">
 START:requires
 HREF:aref:name:
@@ -129,9 +129,9 @@ ENDIF:requires
 </div>
 
 IF:methods
-<table cellpadding="5" width="100%">
+<table cellpadding=5 width="100%">
 <tr><td class="tablesubtitle">Methods</td></tr>
-</table><br />
+</table><br>
 <div class="name-list">
 START:methods
 HREF:aref:name:,
@@ -139,23 +139,11 @@ 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%">
+<table cellpadding=5 width="100%">
 <tr><td class="tablesubtitle">Attributes</td></tr>
-</table><br />
-<table cellspacing="5">
+</table><br>
+<table cellspacing=5>
 START:attributes
      <tr valign="top">
 IF:rw
@@ -172,16 +160,14 @@ END:attributes
 ENDIF:attributes
 
 IF:classlist
-<table cellpadding="5" width="100%">
+<table cellpadding=5 width="100%">
 <tr><td class="tablesubtitle">Classes and Modules</td></tr>
-</table><br />
-%classlist%<br />
+</table><br>
+%classlist%<br>
 ENDIF:classlist
 
   !INCLUDE!  <!-- method descriptions -->
 
-END:sections
-
 </body>
 </html>
 }
@@ -192,13 +178,13 @@ 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">
+   <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>)
+				&nbsp;(<a href="%cvsurl%">CVS</a>)
 ENDIF:cvsurl
            </td>
          </tr>
@@ -209,26 +195,26 @@ ENDIF:cvsurl
         </table>
     </td></tr></table></td>
   </tr>
-</table><br />
+</table><br>
 _FILE_PAGE_
 
 ###################################################################
 
 CLASS_PAGE = %{
-<table width="100%" border="0" cellspacing="0">
+<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%
+   <font size=-3><B>%classmod%</B><BR></font>%full_name%
  </td>
  <td align="right">
-   <table cellspacing="0" cellpadding="2">
+   <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>)
+&nbsp;(<a href="%cvsurl%">CVS</a>)
 ENDIF:cvsurl
 END:infiles
       </td>
@@ -250,14 +236,14 @@ ENDIF:parent
    </table>
   </td>
   </tr>
-</table><br />
+</table><br>
 }
 
 ###################################################################
 
 METHOD_LIST = %{
 IF:includes
-<div class="tablesubsubtitle">Included modules</div><br />
+<div class="tablesubsubtitle">Included modules</div><br>
 <div class="name-list">
 START:includes
     <span class="method-name">HREF:aref:name:</span>
@@ -272,15 +258,10 @@ IF:methods
 <tr><td class="tablesubtitle">%type% %category% methods</td></tr>
 </table>
 START:methods
-<table width="100%" cellspacing="0" cellpadding="5" border="0">
+<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
+<b>%name%</b>%params% 
 IF:codeurl
 <a href="%codeurl%" target="source" class="srclink">src</a>
 ENDIF:codeurl
@@ -319,7 +300,7 @@ SRC_PAGE = %{
 <html>
 <head><title>%title%</title>
 <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<style type="text/css">
+<style>
 .ruby-comment    { color: green; font-style: italic }
 .ruby-constant   { color: #4433aa; font-weight: bold; }
 .ruby-identifier { color: #222222;  }
@@ -380,7 +361,7 @@ div.banner {
 <body>
 <div class="banner">%list_title%</div>
 START:entries
-<a href="%href%">%name%</a><br />
+<a href="%href%">%name%</a><br>
 END:entries
 </body></html>
 }
diff --git a/lib/rdoc/generators/template/html/old_html.rb b/lib/rdoc/generators/template/html/old_html.rb
index ca66302a08..3398dc808f 100644
--- a/lib/rdoc/generators/template/html/old_html.rb
+++ b/lib/rdoc/generators/template/html/old_html.rb
@@ -299,7 +299,7 @@ li {
 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">
+"DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>%title%</title>
@@ -497,7 +497,7 @@ FILE_PAGE = <<_FILE_PAGE_
            <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>)
+				&nbsp;(<a href="%cvsurl%">CVS</a>)
 ENDIF:cvsurl
            </td>
          </tr>
@@ -533,7 +533,7 @@ IF:full_path_url
          </a>
 ENDIF:full_path_url
 IF:cvsurl
-         &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+         &nbsp;(<a href="%cvsurl%">CVS</a>)
 ENDIF:cvsurl
 <br />
 END:infiles
@@ -570,7 +570,7 @@ SRC_PAGE = %{
 <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" />
+<link rel=StyleSheet href="%style_url%" type="text/css" media="screen" />
 </head>
 <body bgcolor="white">
 <pre>%code%</pre>
@@ -721,8 +721,48 @@ 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
-
-require 'rdoc/generators/template/html/one_page_html'
diff --git a/lib/rdoc/generators/template/html/one_page_html.rb b/lib/rdoc/generators/template/html/one_page_html.rb
deleted file mode 100644
index 19441f4725..0000000000
--- a/lib/rdoc/generators/template/html/one_page_html.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-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/lib/rdoc/markup/.document b/lib/rdoc/markup/.document
deleted file mode 100644
index 3cf4f21bd7..0000000000
--- a/lib/rdoc/markup/.document
+++ /dev/null
@@ -1,2 +0,0 @@
-simple_markup
-simple_markup.rb
diff --git a/lib/rdoc/markup/simple_markup.rb b/lib/rdoc/markup/simple_markup.rb
index 8193ca02d4..18971e23e1 100644
--- a/lib/rdoc/markup/simple_markup.rb
+++ b/lib/rdoc/markup/simple_markup.rb
@@ -194,7 +194,8 @@ module SM  #:nodoc:
     LABEL_LIST_RE = /^(
                         (  \[.*?\]    (?# labeled  )
                           |\S.*::     (?# note     )
-                        )(?:\s+|$)
+                        )(?=\s|$)
+                        \s*
                       )/x
 
 
@@ -452,7 +453,7 @@ module SM  #:nodoc:
           else
             wantedType = line.type
           end
-          wantedLevel = line.type == Line::HEADING ? line.param : line.level
+          wantedLevel = line.level
         end
       end
 
diff --git a/lib/rdoc/markup/simple_markup/fragments.rb b/lib/rdoc/markup/simple_markup/fragments.rb
index 6ca06382ab..83388fcc0b 100644
--- a/lib/rdoc/markup/simple_markup/fragments.rb
+++ b/lib/rdoc/markup/simple_markup/fragments.rb
@@ -1,5 +1,5 @@
 require 'rdoc/markup/simple_markup/lines.rb'
-#require 'rdoc/markup/simple_markup/to_flow.rb'
+require 'rdoc/markup/simple_markup/inline.rb'
 
 module SM
 
diff --git a/lib/rdoc/markup/simple_markup/inline.rb b/lib/rdoc/markup/simple_markup/inline.rb
index d54fe1e667..7b476e559d 100644
--- a/lib/rdoc/markup/simple_markup/inline.rb
+++ b/lib/rdoc/markup/simple_markup/inline.rb
@@ -97,6 +97,20 @@ module SM
     # be optimistic
     #
 
+=begin
+    ATTR_FLAG  = 001
+    A_START    = 002
+    A_END      = 003
+    A_SPECIAL_START = 005
+    A_SPECIAL_END   = 006
+
+    START_ATTR   = ATTR_FLAG.chr + A_START.chr
+    END_ATTR     = ATTR_FLAG.chr + A_END.chr
+
+    START_SPECIAL = ATTR_FLAG.chr + A_SPECIAL_START.chr
+    END_SPECIAL   = ATTR_FLAG.chr + A_SPECIAL_END.chr
+
+=end
     A_PROTECT  = 004
     PROTECT_ATTR  = A_PROTECT.chr
 
@@ -183,7 +197,7 @@ module SM
       unless SPECIAL.empty?
         SPECIAL.each do |regexp, attr|
           str.scan(regexp) do
-            attrs.set_attrs($`.length, $&.length, attr | Attribute::SPECIAL)
+            attrs.set_attrs($`.length, $1.length, attr | Attribute::SPECIAL)
           end
         end
       end
@@ -202,7 +216,7 @@ module SM
     end
 
     def unmask_protected_sequences
-      @str.gsub!(/(.)#{PROTECT_ATTR}/, "\\1\000")
+      @str.gsub!(/(.)#{PROTECT_ATTR}/, '\1')
     end
 
     def initialize
@@ -215,8 +229,6 @@ module SM
       add_html("b",  :BOLD)
       add_html("tt",   :TT)
       add_html("code", :TT)
-
-      add_special(/<!--(.*?)-->/, :COMMENT)
     end
 
     def add_word_pair(start, stop, name)
@@ -245,13 +257,10 @@ module SM
 
     def flow(str)
       @str = str
+      @attrs = AttrSpan.new(str.length)
 
       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)
diff --git a/lib/rdoc/markup/simple_markup/preprocess.rb b/lib/rdoc/markup/simple_markup/preprocess.rb
index 101c9bdeb1..09892c2b6c 100644
--- a/lib/rdoc/markup/simple_markup/preprocess.rb
+++ b/lib/rdoc/markup/simple_markup/preprocess.rb
@@ -19,14 +19,14 @@ module SM
 
     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)
+          include_file($3, $1)
 
         else
           yield(directive, param)
@@ -43,12 +43,7 @@ module SM
     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
+        res = content.gsub(/^#?/, indent)
       else
         $stderr.puts "Couldn't find file to include: '#{name}'"
         ''
diff --git a/lib/rdoc/markup/simple_markup/to_flow.rb b/lib/rdoc/markup/simple_markup/to_flow.rb
index 048e71abce..b91bb12e1f 100644
--- a/lib/rdoc/markup/simple_markup/to_flow.rb
+++ b/lib/rdoc/markup/simple_markup/to_flow.rb
@@ -1,6 +1,6 @@
 require 'rdoc/markup/simple_markup/fragments'
 require 'rdoc/markup/simple_markup/inline'
-require 'cgi'
+
 
 module SM
 
@@ -23,13 +23,14 @@ module SM
   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>" ],
+      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)
@@ -88,9 +89,7 @@ module SM
     end
 
     def accept_rule(am, fragment)
-      size = fragment.param
-      size = 10 if size > 10
-      @res << Flow::RULE.new(size)
+      @res << Rule.new(size)
     end
 
     def accept_list_start(am, fragment)
@@ -113,7 +112,7 @@ module SM
     end
 
     def accept_heading(am, fragment)
-      @res << Flow::H.new(fragment.head_level, convert_flow(am.flow(fragment.txt)))
+      @res << Flow::H.new(fragment.head_level, am.flow(fragment.txt))
     end
 
 
diff --git a/lib/rdoc/markup/test/TestInline.rb b/lib/rdoc/markup/test/TestInline.rb
index a067d4c24c..c76f21dce5 100644
--- a/lib/rdoc/markup/test/TestInline.rb
+++ b/lib/rdoc/markup/test/TestInline.rb
@@ -141,9 +141,6 @@ class TestInline < Test::Unit::TestCase
                   @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
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index 7e35abdb0b..ab99c18b86 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -91,9 +91,6 @@ class Options
   # multiple files
   attr_reader :promiscuous
 
-  # scan newer sources than the flag file if true.
-  attr_reader :force_update
-
   module OptionList
 
     OPTION_LIST = [
@@ -137,10 +134,6 @@ class Options
         "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)" ],
 
@@ -205,12 +198,6 @@ class Options
        "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" +
@@ -353,7 +340,7 @@ class Options
       @show_all = false
       @main_page = nil
       @marge     = false
-      @exclude   = []
+      @exclude   = nil
       @quiet = false
       @generator_name = 'html'
       @generator = generators[@generator_name]
@@ -370,7 +357,6 @@ class Options
       @include_line_numbers = false
       @extra_accessor_flags = {}
       @promiscuous = false
-      @force_update = false
 
       @css = nil
       @webcvs = nil
@@ -394,12 +380,12 @@ class Options
         when "--all"           then @show_all      = true
         when "--charset"       then @charset       = arg
         when "--debug"         then $DEBUG         = true
-        when "--exclude"       then @exclude       << Regexp.new(arg)
+        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 "--one-file"      then @all_one_file  = true
         when "--op"            then @op_dir        = arg
         when "--opname"        then @op_name       = arg
         when "--promiscuous"   then @promiscuous   = true
@@ -445,14 +431,9 @@ class Options
         when "--include"   
           @rdoc_include.concat arg.split(/\s*,\s*/)
 
-        when "--ri", "--ri-site", "--ri-system"
+        when "--ri", "--ri-site"
           @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
+          @op_dir = opt == "--ri" ? RI::Paths::HOMEDIR : RI::Paths::SITEDIR
           setup_generator(generators)
 
         when "--tab-width"
@@ -470,9 +451,6 @@ class Options
             OptionList.error("Unknown extension .#{old} to -E")
           end
 
-        when "--force-update"
-          @force_update = true
-
 	when "--version"
 	  puts VERSION_STRING
 	  exit
@@ -484,12 +462,6 @@ class Options
 
       @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
@@ -544,18 +516,18 @@ class Options
   # so we'll bypass the test under Windows
 
   def check_diagram
-    return if RUBY_PLATFORM =~ /mswin|cygwin|mingw|bccwin/
+    return if RUBY_PLATFORM =~ /win/
 
     ok = false
     ver = nil
     IO.popen("dot -V 2>&1") do |io|
       ver = io.read
-      if ver =~ /dot.+version(?:\s+gviz)?\s+(\d+)\.(\d+)/
+      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/
+      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,
diff --git a/lib/rdoc/parsers/parse_c.rb b/lib/rdoc/parsers/parse_c.rb
index 7eefa29706..83fd3a0209 100644
--- a/lib/rdoc/parsers/parse_c.rb
+++ b/lib/rdoc/parsers/parse_c.rb
@@ -1,15 +1,58 @@
-# Classes and modules built in to the interpreter. We need
-# these to define superclasses of user objects
+  # 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
+
+  # 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.
+module RDoc
 
   KNOWN_CLASSES = {
     "rb_cObject"           => "Object",
@@ -70,119 +113,25 @@ module RDoc
     "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 diagrammed (see /tc/dl/ruby/ruby/error.c), and RDoc
-  # integrates C and Ruby source into one tree
-  #
-  # The comment blocks may include special directives:
-  #
-  # [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 descriptive names to Ruby-level parameters,
-  #   you need to document the calling sequence explicitly
-  #
-  # In addition, 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.
-  #   */
-  #
+  # See rdoc/c_parse.rb
 
   class C_Parser
 
-    attr_accessor :progress
 
     extend ParserFactory
-    parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
+    parse_files_matching(/\.(c|cc|cpp|CC)$/)
 
-    @@known_bodies = {}
 
     # prepare to parse a C file
-    def initialize(top_level, file_name, body, options, stats)
+    def initialize(top_level, file_name, body, options)
       @known_classes = KNOWN_CLASSES.dup
-      @body = handle_tab_width(handle_ifdefs_in(body))
+      @body = 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
@@ -190,10 +139,8 @@ module RDoc
     def scan
       remove_commented_out_lines
       do_classes
-      do_constants
       do_methods
       do_includes
-      do_aliases
       @top_level
     end
 
@@ -201,61 +148,31 @@ module RDoc
     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
+    # remove 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")
+          $stderr.puts("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)
 
@@ -263,66 +180,26 @@ module RDoc
       @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
+                     (static\s+)?void\s+Init_#{class_name}\s*\(\)}xm
         comment = $1
-      elsif @body =~ %r{Document-(class|module):\s#{class_name}\s*?\n((?>.*?\*/))}m
+      elsif @body =~ %r{Document-(class|module):\s#{class_name}.*?\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 
+      @body.scan(/(\w+)\s* = \s*rb_define_module\(\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*
+      @body.scan(/(\w+)\s* = \s*rb_define_class
                 \( 
                    \s*"(\w+)",
                    \s*(\w+)\s*
@@ -332,114 +209,58 @@ module RDoc
         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
+      @body.scan(/(\w+)\s*=\s*boot_defclass\(\s*"(\w+?)",\s*(\w+?)\)/) 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*
+      @body.scan(/(\w+)\s* = \s*rb_define_module_under
                 \( 
                    \s*(\w+),
                    \s*"(\w+)"
-                \s*\)/mx) do 
+                \)/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*
+      @body.scan(/(\w+)\s* = \s*rb_define_class_under
                 \( 
                    \s*(\w+),
                    \s*"(\w+)",
                    \s*(\w+)\s*
-                \s*\)/mx) do 
+                \)/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\.]+),
+      @body.scan(/rb_define_(singleton_method|method|module_function)\(\s*(\w+),
                                \s*"([^"]+)",
-                               \s*(\d+),
-                               \s*(\d+)\s*\);
-                  }xm) do  #"
-        |var_name, attr_name, attr_reader, attr_writer|
+                               \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+                               \s*(-?\w+)\s*\)/xm) do  #"
+        |type, var_name, meth_name, meth_body, param_count|
         
-        #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)
+        next if meth_name == "initialize_copy"
+
+        handle_method(type, var_name, meth_name, meth_body, param_count)
       end
 
-      @body.scan(%r{rb_define_global_function\s*\(
+      @body.scan(/rb_define_global_function\(
                                \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)
+                               \s*(-?\w+)\s*\)/xm) do  #"
+        |meth_name, meth_body, param_count|
+        
+        handle_method("method", "rb_mKernel", meth_name, meth_body, param_count)
       end
   
-      @body.scan(/define_filetest_function\s*\(
+      @body.scan(/define_filetest_function\(
                                \s*"([^"]+)",
                                \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
                                \s*(-?\w+)\s*\)/xm) do  #"
@@ -450,141 +271,9 @@ module RDoc
       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
 
+    def handle_method(type, var_name, meth_name, meth_body, param_count)
+      class_name = @known_classes[var_name] || var_name
       class_obj  = find_class(var_name, class_name)
       
       if class_obj
@@ -593,8 +282,7 @@ module RDoc
           type = "singleton_method"
         end
         meth_obj = AnyMethod.new("", meth_name)
-        meth_obj.singleton =
-	  %w{singleton_method module_function}.include?(type) 
+        meth_obj.singleton = type == "singleton_method" 
         
         p_count = (Integer(param_count) rescue -1)
         
@@ -607,127 +295,57 @@ module RDoc
                             (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
+        
+        find_body(meth_body, meth_obj)
+        class_obj.add_method(meth_obj)
       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
+    # Find the C code corresponding to a c method
+    def find_body(meth_name, meth_obj)
+      if @body =~ %r{((?>/\*.*?\*/\s+))(static\s+)?VALUE\s+#{meth_name}
+                    \s*(\(.*?\)).*?^}xm
+        comment, params = $1, $3
         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)
+        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
+        # If the comment block contains a section that looks like
+        #    call-seq:
+        #        Array.new
+        #        Array.new(10)
+        # use it for the parameters
 
-        override_comment = find_override_comment(meth_obj.name)
-        comment = override_comment if override_comment
-
-        find_modifiers(comment, meth_obj) if comment
+        if comment.sub!(/call-seq:(.*?)^\s*\*?\s*$/m, '')
+          seq = $1
+          seq.gsub!(/^\s*\*\s*/, '')
+          meth_obj.call_seq = seq
+        end
         
 #        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:
-    #
+    # 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|
+      @body.scan(/rb_include_module\(\s*(\w+?),\s*(\w+?)\s*\)/) do |c,m|
         if cls = @classes[c]
-          m = @known_classes[m] || m
+          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)
@@ -747,27 +365,6 @@ module RDoc
       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/lib/rdoc/parsers/parse_f95.rb b/lib/rdoc/parsers/parse_f95.rb
index f1a1ae4d4b..3adf29d933 100644
--- a/lib/rdoc/parsers/parse_f95.rb
+++ b/lib/rdoc/parsers/parse_f95.rb
@@ -1,160 +1,15 @@
-#= 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
-#
-
+# Parse a Fortran 95 file.
 
 require "rdoc/code_objects"
 
 module RDoc
 
+  # See rdoc/parsers/parse_f95.rb
+ 
   class Token
 
     NO_TEXT = "??".freeze
-
+    
     def initialize(line_no, char_no)
       @line_no = line_no
       @char_no = char_no
@@ -171,996 +26,83 @@ module RDoc
 
   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"
-
+    parse_files_matching(/\.(f9(0|5)|F)$/)
+    
     # prepare to parse a Fortran 95 file
-    def initialize(top_level, file_name, body, options, stats)
+    def initialize(top_level, file_name, body, options)
       @body = body
-      @stats = stats
-      @file_name  = file_name
       @options = options
       @top_level = top_level
       @progress = $stderr unless options.quiet
     end
-
-    # define code constructs
+    
+    # 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
+      # modules and programs
+      if @body =~ /^(module|program)\s+(\w+)/i
+	progress "m"
+	f9x_module = @top_level.add_module NormalClass, $2
+	f9x_module.record_location @top_level
+	first_comment, second_comment = $`.gsub(/^!\s?/,"").split "\n\s*\n"
+	if second_comment
+	  @top_level.comment = first_comment if first_comment
+	  f9x_module.comment = second_comment
+	else
+	  f9x_module.comment = first_comment if first_comment
+	end
+      end
+
+      # use modules
+      remaining_code = @body
+      while remaining_code =~ /^\s*use\s+(\w+)/i
+	remaining_code = $~.post_match
+	progress "."
+	f9x_module.add_include Include.new($1, "") if f9x_module
+      end
+
+      # subroutines
+      remaining_code = @body
+      while remaining_code =~ /^\s*subroutine\s+(\w+)\s*\((.*?)\)/im
+	remaining_code = $~.post_match
+        subroutine = AnyMethod.new("Text", $1)
+	subroutine.singleton = false
+
+        prematchText = $~.pre_match
+        params = $2
+        params.gsub!(/&/,'')
+	subroutine.params = params
+        comment = find_comments prematchText
+	subroutine.comment = comment if comment
+
+        subroutine.start_collecting_tokens
+        remaining_code =~ /^\s*end\s+subroutine/i
+        code = "subroutine #{subroutine.name} (#{subroutine.params})\n"
+        code += $~.pre_match
+        code += "\nend subroutine\n"
+        subroutine.add_token Token.new(1,1).set_text(code)
+        
+        progress "s"
+        f9x_module.add_method subroutine if f9x_module
       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 example, 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
+      @top_level
 
-    # 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
-    # returned. If "COMMENTS_ARE_UPPER" is true, comments just before
-    # modules or subprograms are returned
-    #
     def find_comments text
-      return "" unless text
-      lines = text.split("\n")
-      lines.reverse! if COMMENTS_ARE_UPPER
+      lines = text.split("\n").reverse
       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
+	break if line =~ /^\s*\w/
+        comment_block.unshift line.sub(/^!\s?/,"")
       end
-      nice_lines = comment_block.join("\n").split "\n\s*?\n"
-      nice_lines[0] ||= ""
+      nice_lines = comment_block.join("\n").split "\n\s*\n"
+      nice_lines.shift
+      nice_lines.shift
       nice_lines.shift
     end
 
@@ -1171,671 +113,6 @@ EOF
       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/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 750c483c15..08d906c00d 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -13,6 +13,7 @@
 #   	by Keiju ISHITSUKA (Nippon Rational Inc.)
 #
 
+require "tracer"
 require "e2mmap"
 require "irb/slex"
 
@@ -435,7 +436,6 @@ class RubyLex
   def_exception(:SyntaxError, "%s")
   
   include RubyToken
-  include IRB
 
   attr_reader :continue
   attr_reader :lex_state
@@ -560,7 +560,7 @@ class RubyLex
     "q" => "\'",
     "Q" => "\"",
     "x" => "\`",
-    "r" => "/",
+    "r" => "\/",
     "w" => "]"
   }
   
@@ -575,7 +575,7 @@ class RubyLex
     "\'" => TkSTRING,
     "\"" => TkSTRING,
     "\`" => TkXSTRING,
-    "/" => TkREGEXP,
+    "\/" => TkREGEXP,
     "]" => TkDSTRING
   }
   Ltype2Token.default = TkSTRING
@@ -583,7 +583,7 @@ class RubyLex
   DLtype2Token = {
     "\"" => TkDSTRING,
     "\`" => TkDXSTRING,
-    "/" => TkDREGEXP,
+    "\/" => TkDREGEXP,
   }
 
   def lex_init()
@@ -624,14 +624,7 @@ class RubyLex
       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
+      Token(TkRD_COMMENT).set_text(str)
     end
 
     @OP.def_rule("\n") do
@@ -924,7 +917,7 @@ class RubyLex
     end
 
     @OP.def_rule('@') do
-      if peek(0) =~ /[@\w_]/
+      if peek(0) =~ /[\w_]/
 	ungetc
 	identify_identifier
       else
@@ -999,8 +992,6 @@ class RubyLex
   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
@@ -1012,7 +1003,7 @@ class RubyLex
     end
     # fix token
 
-    # $stderr.puts "identifier - #{token}, state = #@lex_state"
+#    puts "identifier - #{token}, state = #@lex_state"
 
     case token
     when /^\$/
@@ -1123,7 +1114,6 @@ class RubyLex
   def identify_quotation(initial_char)
     ch = getc
     if lt = PERCENT_LTYPE[ch]
-      initial_char += ch
       ch = getc
     elsif ch =~ /\W/
       lt = "\""
@@ -1334,7 +1324,7 @@ class RubyLex
 	end
       end
 
-    when "C", "c" #, "^"
+    when "C", "c", "^"
       res << ch
       if ch == "C" and (ch = getc) != "-"
 	ungetc
@@ -1384,9 +1374,8 @@ module RDoc
     parse_files_matching(/\.rbw?$/)
 
 
-    def initialize(top_level, file_name, content, options, stats)
+    def initialize(top_level, file_name, content, options)
       @options = options
-      @stats   = stats
       @size = 0
       @token_listeners = nil
       @input_file_name = file_name
@@ -1401,24 +1390,22 @@ module RDoc
       @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
+        begin
+          parse_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
       @top_level
@@ -1426,23 +1413,16 @@ module RDoc
 
     private 
 
-    def make_message(msg)
+    def warn(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
+      $stderr.puts prefix + msg
     end
 
     def error(msg)
-      msg = make_message msg
-      $stderr.puts msg
+      warn msg
       exit(1)
     end
 
@@ -1485,7 +1465,7 @@ module RDoc
             obj.pop_token
           end if @token_listeners
         else
-          warn("':' not followed by identifier or operator")
+          warn("':' not followed by identified or operator")
           tk = tk1
         end
       end
@@ -1529,10 +1509,6 @@ module RDoc
       read
     end
 
-    def peek_read
-      @read.join('')
-    end
-
     NORMAL = "::"
     SINGLE = "<<"
 
@@ -1546,15 +1522,10 @@ module RDoc
 
       tk = get_tk
       while tk.kind_of?(TkCOMMENT)
-        if first_line && /\A#!/ =~ tk.text
-          skip_tkspace
-          tk = get_tk
-        elsif first_line && /\A#\s*-\*-/ =~ tk.text
-          first_line = false
+        if first_line && tk.text[0,2] == "#!"
           skip_tkspace
           tk = get_tk
         else
-          first_line = false
           res << tk.text << "\n"
           tk = get_tk
           if tk.kind_of? TkNL
@@ -1562,35 +1533,49 @@ module RDoc
             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='')
+    def parse_statements(container, single=NORMAL, current_method = nil)
       nest = 1
       save_visibility = container.visibility
-      
-#      if container.kind_of?(TopLevel)
-#      else
-#        comment = ''
-#      end
+
+      if container.kind_of?(TopLevel)
+        comment = collect_first_comment
+        look_for_directives_in(container, comment)
+        container.comment = comment unless comment.empty?
+      else
+        comment = ''
+      end
 
       non_comment_seen = true
-      
+
       while tk = get_tk
-        
+
         keep_comment = false
-        
+
         non_comment_seen = true unless tk.kind_of?(TkCOMMENT)
-        
+
+#         $stderr.puts "===== #{tk.inspect}"
+#         blank_line_seen = true
+#         while tk.kind_of?(TkNL)
+#           skip_tkspace(false)
+#           if peek_tk.kind_of?(TkCOMMENT)
+#             if blank_line_seen
+#               comment = ''
+#               blank_line_seen = false
+#             end
+#             tk = get_tk
+#             comment << tk.text << "\n"
+#           else
+#             blank_line_seen = true
+#           end
+#           tk = get_tk
+#         end
+
 	case tk
 
         when TkNL
@@ -1611,7 +1596,7 @@ module RDoc
               look_for_directives_in(container, comment) 
               if container.done_documenting
                 container.ongoing_visibility = save_visibility
-#                return
+                return
               end
             end
             keep_comment = true
@@ -1670,15 +1655,7 @@ module RDoc
             "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
+	when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN, TkFOR
 	  nest += 1
           puts "Found #{tk.class} in #{container.name}, nest = #{nest}, " +
             "line #{tk.line_no}" if $DEBUG
@@ -1729,19 +1706,17 @@ module RDoc
 
       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)
@@ -1754,7 +1729,7 @@ module RDoc
 	else
 	  cls_type = NormalClass
 	end
-
+        
         cls = container.add_class(cls_type, name, superclass)
         read_documentation_modifiers(cls, CLASS_MODIFIERS)
         cls.record_location(@top_level)
@@ -1763,18 +1738,21 @@ module RDoc
 
       when TkLSHFT
 	case name = get_class_specification
-	when "self", container.name
+	when "self"
 	  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)
+
+          # Special case: class << X inside class 'X' adds singleton methods
+          if name == 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)
+            end
+            parse_statements(other, SINGLE, &block)
           end
-          read_documentation_modifiers(other, CLASS_MODIFIERS)
-          parse_statements(other, SINGLE, &block)
 	end
 
       else
@@ -1784,7 +1762,6 @@ module RDoc
 
     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
@@ -1820,7 +1797,6 @@ module RDoc
         get_tk
         name_t = get_tk
       end
-      skip_tkspace(false)
       return [container, name_t]
     end
 
@@ -1834,10 +1810,6 @@ module RDoc
         return
       end
 
-
-      nest = 0
-      get_tkread
-
       tk = get_tk
       if tk.kind_of? TkGT
         unget_tk(tk)
@@ -1845,10 +1817,11 @@ module RDoc
         return
       end
 
+      nest = 0
+      get_tkread
       loop do
         puts("Param: #{tk}, #{@scanner.continue} " +
           "#{@scanner.lex_state} #{nest}")  if $DEBUG
-
         case tk
         when TkSEMICOLON
           break
@@ -1869,7 +1842,6 @@ module RDoc
         end
         tk = get_tk
       end
-
       res = get_tkread.tr("\n", " ").strip
       res = "" if res == ";"
       con = Constant.new(name, res, comment)
@@ -1881,10 +1853,9 @@ module RDoc
 
     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)
@@ -1894,7 +1865,6 @@ module RDoc
       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)
@@ -1909,21 +1879,8 @@ module RDoc
           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
+            warn("Couldn't find #{name_t.name}. Assuming it's a module")
+            container = prev_container.add_module(NormalModule, name_t.name)
           end
 	else
 	  # warn("Unexpected token '#{name_t2.inspect}'")
@@ -1965,9 +1922,7 @@ module RDoc
       parse_method_parameters(meth)
 
       if meth.document_self
-        container.add_method(meth)
-      elsif added_container
-        container.document_self = false
+	container.add_method(meth)
       end
 
       # Having now read the method parameters and documentation modifiers, we
@@ -1982,30 +1937,20 @@ module RDoc
           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
+      remove_token_listener(meth)
 
-      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 
     #
@@ -2015,7 +1960,6 @@ module RDoc
 
     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)
@@ -2043,18 +1987,11 @@ module RDoc
       nest = 0
 
       loop do
-        puts("Param: #{tk.inspect}, #{@scanner.continue} " +
-          "#{@scanner.lex_state} #{nest}")  if $DEBUG
+        puts("Param: #{tk}, #{@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
@@ -2075,15 +2012,6 @@ module RDoc
       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)
@@ -2322,9 +2250,8 @@ module RDoc
           ""
 
         when "enddoc"
-          #context.done_documenting = true
-          #""
-          throw :enddoc
+          context.done_documenting = true
+          ""
 
         when "main"
           options = Options.instance
@@ -2336,10 +2263,6 @@ module RDoc
           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
@@ -2372,10 +2295,6 @@ module RDoc
     
     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
@@ -2384,7 +2303,6 @@ module RDoc
         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
@@ -2416,29 +2334,23 @@ module RDoc
     case tk
     when TkSTRING
       name = tk.text
-#    when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
-#      name = tk.name
+    when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
+      name = tk.name
     when TkDSTRING
       warn "Skipping require of dynamic string: #{tk.text}"
- #   else
- #     warn "'require' used as variable"
+    else
+      error("Unknown argument type to require: #{tk}")
     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
+    skip_tkspace_comment
+    name = get_constant_with_optional_parens
+    unless name.empty?
+      context.add_include(Include.new(name, comment))
     end
   end
 
@@ -2474,7 +2386,7 @@ module RDoc
 	  context.add_attribute(att)
 	end
       else
-	warn("'attr' ignored - looks like a variable")
+	error("Missing argument to 'attr'")
       end    
 
     end
@@ -2495,13 +2407,7 @@ module RDoc
             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
+      if peek_tk.kind_of? TkNL
 #        error("Missing argument") if singleton        
         container.ongoing_visibility = vis
       else
@@ -2562,7 +2468,7 @@ module RDoc
 	    break
 	  when TkCOMMA
 	  else
-           warn("unexpected token: '#{tk2.inspect}'") if $DEBUG
+	    warn("unexpected token: '#{tk.inspect}'")
 	    break
 	  end
 	end
diff --git a/lib/rdoc/parsers/parse_simple.rb b/lib/rdoc/parsers/parse_simple.rb
index 3f1a546964..754f650793 100644
--- a/lib/rdoc/parsers/parse_simple.rb
+++ b/lib/rdoc/parsers/parse_simple.rb
@@ -12,7 +12,7 @@ module RDoc
   class SimpleParser
     
     # prepare to parse a plain file
-    def initialize(top_level, file_name, body, options, stats)
+    def initialize(top_level, file_name, body, options)
       
       preprocess = SM::PreProcess.new(file_name, options.rdoc_include)
       
@@ -30,12 +30,8 @@ module RDoc
     
     def scan
       #    @body.gsub(/^(\s\n)+/, '')
-      @top_level.comment = remove_private_comments(@body)
+      @top_level.comment = @body
       @top_level
     end
-
-    def remove_private_comments(comment)
-      comment.gsub(/^--.*?^\+\+/m, '').sub(/^--.*/m, '')
-    end
   end
 end
diff --git a/lib/rdoc/parsers/parserfactory.rb b/lib/rdoc/parsers/parserfactory.rb
index 00a82cf4b1..dc7d629903 100644
--- a/lib/rdoc/parsers/parserfactory.rb
+++ b/lib/rdoc/parsers/parserfactory.rb
@@ -13,7 +13,7 @@ module RDoc
   # 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
@@ -37,10 +37,6 @@ module RDoc
   #        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
 
 
 
@@ -77,23 +73,14 @@ module RDoc
     # 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
+    def ParserFactory.parser_for(top_level, file_name, body, options)
       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)
+      parser.new(top_level, file_name, body, options)
     end
   end
 end
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index 91f5611196..ca9c5da2bf 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -2,7 +2,14 @@
 #
  
 
-VERSION_STRING = %{RDoc V1.0.1 - 20041108}
+RDOC_VERSION = "1.0pr1"
+
+rcs = '$Date$ $Revision$'.
+  gsub(/\$/, '').
+  sub(/Date: /, ': ').
+  sub(/ Revision: (\S+)/) { "(#$1)" }
+
+VERSION_STRING = %{RDoc V} + RDOC_VERSION + rcs
 
 
 require 'rdoc/parsers/parse_rb.rb'
@@ -16,38 +23,14 @@ 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.
 
@@ -107,85 +90,45 @@ module RDoc
     # 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)
+    def setup_output_dir(op_dir)
+      flag_file = File.join(op_dir, "created.rid")
       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
+        unless File.file?(flag_file)
           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
+      File.open(flag_file, "w") {|f| f.puts Time.now }
     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)
+    
+    def normalized_file_list(options, *relative_files)
       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
+
+        case type = File.stat(rel_file_name).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)
+          file_list << 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))
+          next if options.exclude && options.exclude =~ rel_file_name
+          Find.find(rel_file_name) do |fn|
+            next if options.exclude && options.exclude =~ fn
+            next unless ParserFactory.can_parse(fn)
+            next unless File.file?(fn)
+            
+            file_list << fn.sub(%r{\./}, '')
           end
         else
           raise RDocError.new("I can't deal with a #{type} #{rel_file_name}")
@@ -194,16 +137,6 @@ module RDoc
       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
 
@@ -214,7 +147,7 @@ module RDoc
       files = options.files
       files = ["."] if files.empty?
 
-      file_list = normalized_file_list(options, files, true)
+      file_list = normalized_file_list(options, *files)
 
       file_list.each do |fn|
         $stderr.printf("\n%35s: ", File.basename(fn)) unless options.quiet
@@ -222,9 +155,8 @@ module RDoc
         content = File.open(fn, "r") {|f| f.read}
 
         top_level = TopLevel.new(fn)
-        parser = ParserFactory.parser_for(top_level, fn, content, options, @stats)
+        parser = ParserFactory.parser_for(top_level, fn, content, options)
         file_info << parser.scan
-        @stats.num_files += 1
       end
 
       file_info
@@ -250,47 +182,36 @@ module RDoc
 
       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 = options.generator
+      
+      $stderr.puts "\nGenerating #{gen.key.upcase}..." unless options.quiet
+      
+      require gen.file_name
+      
+      gen_class = Generators.const_get(gen.class_name)
+      
+      unless file_info.empty?
         gen = gen_class.for(options)
 
         pwd = Dir.pwd
 
-        Dir.chdir(options.op_dir)  unless options.all_one_file
+        unless options.all_one_file
+          setup_output_dir(options.op_dir)
+          Dir.chdir(options.op_dir)
+        end
 
         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
diff --git a/lib/rdoc/ri/ri_cache.rb b/lib/rdoc/ri/ri_cache.rb
index 1844ac969e..8d7c982409 100644
--- a/lib/rdoc/ri/ri_cache.rb
+++ b/lib/rdoc/ri/ri_cache.rb
@@ -3,10 +3,10 @@ module RI
   class ClassEntry
 
     attr_reader :name
-    attr_reader :path_names
+    attr_reader :path_name
     
     def initialize(path_name, name, in_class)
-      @path_names = [ path_name ]
+      @path_name = path_name
       @name = name
       @in_class = in_class
       @class_methods    = []
@@ -14,12 +14,6 @@ module RI
       @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,
@@ -44,14 +38,9 @@ module RI
         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 = ClassEntry.new(full_name, name, self)
             inf_class.load_from(full_name)
+            @inferior_classes << inf_class
           end
         end
       end
@@ -98,13 +87,6 @@ module RI
       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.
diff --git a/lib/rdoc/ri/ri_descriptions.rb b/lib/rdoc/ri/ri_descriptions.rb
index e5ea9f2fbf..9bd5c2d13b 100644
--- a/lib/rdoc/ri/ri_descriptions.rb
+++ b/lib/rdoc/ri/ri_descriptions.rb
@@ -1,5 +1,4 @@
 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
@@ -94,11 +93,6 @@ module RI
       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
 
@@ -106,12 +100,6 @@ module RI
       "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)
@@ -128,14 +116,6 @@ module RI
     def display_name
       "Class"
     end
-
-    def superclass_string
-      if @superclass && @superclass != "Object"
-        @superclass
-      else
-        nil
-      end
-    end
   end
 
 
diff --git a/lib/rdoc/ri/ri_display.rb b/lib/rdoc/ri/ri_display.rb
deleted file mode 100644
index 67962fc2c1..0000000000
--- a/lib/rdoc/ri/ri_display.rb
+++ /dev/null
@@ -1,255 +0,0 @@
-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/lib/rdoc/ri/ri_driver.rb b/lib/rdoc/ri/ri_driver.rb
deleted file mode 100644
index a00f20ee3b..0000000000
--- a/lib/rdoc/ri/ri_driver.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-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/lib/rdoc/ri/ri_formatter.rb b/lib/rdoc/ri/ri_formatter.rb
index 34eb561ca3..03fee89d8f 100644
--- a/lib/rdoc/ri/ri_formatter.rb
+++ b/lib/rdoc/ri/ri_formatter.rb
@@ -1,6 +1,19 @@
 module RI
   class TextFormatter
 
+    def TextFormatter.list
+      "plain, bs, ansi"
+    end
+
+    def TextFormatter.for(name)
+      case name
+      when /plain/i then TextFormatter
+      when /bs/i then OverstrikeFormatter
+      when /ansi/i then AnsiFormatter
+      else nil
+      end
+    end
+
     attr_reader :indent
     
     def initialize(options, indent)
@@ -43,7 +56,7 @@ module RI
         end
       end
       res << work if work.length.nonzero?
-      puts(prefix + res.join("\n" + next_prefix))
+      puts (prefix +  res.join("\n" + next_prefix))
     end
 
     ######################################################################
@@ -54,27 +67,12 @@ module RI
     
     ######################################################################
 
-    # 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.
@@ -161,14 +159,13 @@ module RI
         display_list(item)
 
       when SM::Flow::VERB
-        display_verbatim_flow_item(item, @indent)
+        item.body.split(/\n/).each do |line|
+          print @indent, conv_html(line), "\n"
+        end
+        blankline
 
       when SM::Flow::H
-        display_heading(conv_html(item.text), item.level, @indent)
-
-      when SM::Flow::RULE
-        draw_line
-
+        display_heading(conv_html(item.text.join), item.level, @indent)
       else
         fail "Unknown flow element: #{item.class}"
       end
@@ -176,17 +173,7 @@ module RI
 
     ######################################################################
 
-    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
@@ -206,36 +193,19 @@ module RI
       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
+  # to handle bold and underlinig, while another using ANSI escape
   # sequences
   
   class AttributeFormatter < TextFormatter
@@ -265,8 +235,6 @@ module RI
 
     
     class AttributeString
-      attr_reader :txt
-
       def initialize
         @txt = []
         @optr = 0
@@ -306,30 +274,27 @@ module RI
       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
+        if word.size + line.size > linelen - @indent.size
+          write_attribute_text(line)
           line = []
         end
         line.concat(word)
       end
 
-      write_attribute_text(prefix, line) if line.length > 0
+      write_attribute_text(line) if line.length > 0
     end
 
     protected
 
     # overridden in specific formatters
 
-    def write_attribute_text(prefix, line)
-      print prefix
+    def write_attribute_text(line)
+      print @indent
       line.each do |achar|
         print achar.char
       end
@@ -365,14 +330,14 @@ module RI
   ##################################################
   
   # This formatter generates overstrike-style formatting, which
-  # works with pagers such as man and less.
+  # works with pages such as man and less.
 
   class OverstrikeFormatter < AttributeFormatter
 
     BS = "\C-h"
 
-    def write_attribute_text(prefix, line)
-      print prefix
+    def write_attribute_text(line)
+      print @indent
       line.each do |achar|
         attr = achar.attr
         if (attr & (ITALIC+CODE)) != 0
@@ -402,13 +367,15 @@ module RI
 
   class AnsiFormatter < AttributeFormatter
 
+    BS = "\C-h"
+
     def initialize(*args)
       print "\033[0m"
       super
     end
 
-    def write_attribute_text(prefix, line)
-      print prefix
+    def write_attribute_text(line)
+      print @indent
       curr_attr = 0
       line.each do |achar|
         attr = achar.attr
@@ -428,18 +395,16 @@ module RI
     end
 
     HEADINGS = {
-      1 => [ "\033[1;32m", "\033[m" ] ,
-      2 => ["\033[4;32m", "\033[m" ],
-      3 => ["\033[32m", "\033[m" ]
+      1 => "\033[1;32m%s\033[m",
+      2 => "\033[4;32m%s\033[m",
+      3 => "\033[32m%s\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]
+      printf(HEADINGS[level], text)
+      puts
     end
     
     private
@@ -461,212 +426,24 @@ module RI
     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
-
+# options = "options"
+# def options.width
+#   70
+# end
+# a = OverstrikeFormatter.new(options, "   ")  
+# a.wrap(
+# "The quick <b>brown</b> and <i>italic</i> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " +
+# "The quick <b>brown and <i>italic</i></b> dog " 
+# )
 end
 
 
diff --git a/lib/rdoc/ri/ri_options.rb b/lib/rdoc/ri/ri_options.rb
index 179ef96cea..9b0704d421 100644
--- a/lib/rdoc/ri/ri_options.rb
+++ b/lib/rdoc/ri/ri_options.rb
@@ -3,10 +3,7 @@
 
 module RI
 
-  require 'rdoc/ri/ri_paths'
-  require 'rdoc/ri/ri_display'
-
-  VERSION_STRING = "ri v1.0.1 - 20041108"
+  VERSION_STRING = "alpha 0.1"
 
   class Options
     
@@ -19,87 +16,41 @@ module RI
     # 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.map { |dir| "  #{dir}/doc/*/ri" }.join("\n") :
-           "No Rubygems ri found.") ],
+         "you're looking at it" ],
 
         [ "--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"
-        ],
+         "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\n" +
+         "tell your pager to allow control characters\n" +
+         "(for example using the -R option to less)"],
 
         [ "--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"
-        ],
+        "set the width of the output" ],
 
       ]
 
       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
+          [ long, 
+           short, 
+           arg ? GetoptLong::REQUIRED_ARGUMENT : GetoptLong::NO_ARGUMENT 
+          ]
         end
       end
 
@@ -117,8 +68,7 @@ module RI
       def OptionList.error(msg)
         $stderr.puts
         $stderr.puts msg
-        name = File.basename $PROGRAM_NAME
-        $stderr.puts "\nFor help on options, try '#{name} --help'\n\n"
+        $stderr.puts "\nFor help on options, try 'ri --help'\n\n"
         exit 1
       end
       
@@ -131,21 +81,6 @@ module RI
         puts
         
         name = File.basename($0)
-
-        directories = [
-          RI::Paths::SYSDIR,
-          RI::Paths::SITEDIR,
-          RI::Paths::HOMEDIR
-        ]
-
-        if RI::Paths::GEMDIRS then
-          Gem.path.each do |dir|
-            directories << "#{dir}/doc/*/ri"
-          end
-        end
-
-        directories = directories.join("\n    ")
-
         OptionList.strip_output(<<-EOT)
           Usage:
 
@@ -163,115 +98,78 @@ module RI
 
           For example:
 
-              #{name}  File
-              #{name}  File.new
-              #{name}  F.n
-              #{name}  zip
+              ri  File
+              ri  File.new
+              ri  F.n
+              ri  zip
 
           Note that shell quoting may be required for method names
-          containing punctuation:
-
-              #{name} 'Array.[]'
-              #{name} 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 '#{name} -h'"
-          puts "For a list of classes I know about, type '#{name} -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
+          containing puncuation:
+
+              ri 'Array.[]'
+              ri compact\\!
+
+      EOT
+
+      if short_form
+        class_list
+        puts "For help, type 'ri -h'"
+      else
+        puts "Options:\n\n"
+        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
-          puts "Options may also be passed in the 'RI' environment variable"
-          exit 0
+          desc.each do |line|
+            puts(" "*28 + line)
+          end
+          puts
         end
+
+        exit 0
       end
     end
 
-    # Show the version and exit
-    def show_version
-      puts VERSION_STRING
-      exit(0)
+    def OptionList.class_list
+      paths = RI::Paths::PATH
+      if paths.empty?
+        puts "Before using ri, you need to generate documentation"
+        puts "using 'rdoc' with the --ri option"
+      else
+        @ri_reader = RI::RiReader.new(RI::RiCache.new(paths))
+        puts
+        puts "Classes and modules I know about:"
+        puts
+        puts @ri_reader.class_names.sort.join(", ")
+        puts
+      end
     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
+  end
 
     # Parse command line options.
 
-    def parse(args)
-    
-      old_argv = ARGV.dup
+    def parse
 
-      ARGV.replace(args)
+      @use_stdout = !STDOUT.tty?
+      @width = 72
+      @formatter = RI::TextFormatter.for("plain") 
 
       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 "--help"      then OptionList.usage
+          when "--no-pager"  then @use_stdout = true
           when "--format"
             @formatter = RI::TextFormatter.for(arg)
             unless @formatter
@@ -288,32 +186,12 @@ module RI
             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/lib/rdoc/ri/ri_paths.rb b/lib/rdoc/ri/ri_paths.rb
index 9768f12b7d..ff8257a546 100644
--- a/lib/rdoc/ri/ri_paths.rb
+++ b/lib/rdoc/ri/ri_paths.rb
@@ -41,61 +41,5 @@ module RI
 
     # This is the search path for 'ri'
     PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
-
-    begin
-      require 'rubygems'
-
-      # HACK dup'd from Gem.latest_partials and friends
-      all_paths = []
-
-      all_paths = Gem.path.map do |dir|
-        Dir[File.join(dir, 'doc', '*', 'ri')]
-      end.flatten
-
-      ri_paths = {}
-
-      all_paths.each do |dir|
-        base = File.basename File.dirname(dir)
-        if base =~ /(.*)-((\d+\.)*\d+)/ then
-          name, version = $1, $2
-          ver = Gem::Version.new version
-          if ri_paths[name].nil? or ver > ri_paths[name][0] then
-            ri_paths[name] = [ver, dir]
-          end
-        end
-      end
-
-      GEMDIRS = ri_paths.map { |k,v| v.last }.sort
-      GEMDIRS.each { |dir| RI::Paths::PATH << dir }
-    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 { |directory| File.directory? directory }
-    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/lib/rdoc/ri/ri_reader.rb b/lib/rdoc/ri/ri_reader.rb
index fb2c373e38..ddce38f101 100644
--- a/lib/rdoc/ri/ri_reader.rb
+++ b/lib/rdoc/ri/ri_reader.rb
@@ -48,53 +48,23 @@ module RI
 
     # 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
+      path = RiWriter.class_desc_path(class_entry.path_name, class_entry)
+      File.open(path) {|f| RI::Description.deserialize(f) }
     end
 
     # return the names of all classes and modules
-    def full_class_names
+    def 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
+        res << c.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/lib/rdoc/ri/ri_util.rb b/lib/rdoc/ri/ri_util.rb
index 8a01255897..6e52cd069f 100644
--- a/lib/rdoc/ri/ri_util.rb
+++ b/lib/rdoc/ri/ri_util.rb
@@ -43,7 +43,6 @@ class NameDescriptor
       @class_names << tokens.shift
       unless tokens.empty?
         separator = tokens.shift
-        break unless separator == "::"
       end
     end
     
@@ -65,11 +64,4 @@ class NameDescriptor
       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/lib/rdoc/usage.rb b/lib/rdoc/usage.rb
deleted file mode 100644
index def516b3d7..0000000000
--- a/lib/rdoc/usage.rb
+++ /dev/null
@@ -1,210 +0,0 @@
-# = 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/lib/readbytes.rb b/lib/readbytes.rb
index ebb5fc0bd4..d6a3b10afe 100644
--- a/lib/readbytes.rb
+++ b/lib/readbytes.rb
@@ -1,22 +1,17 @@
-# TruncatedDataError is raised when IO#readbytes fails to read enough data.
+# readbytes.rb
+#
+# add IO#readbytes, which reads fixed sized data.
+# it guarantees read data size.
 
 class TruncatedDataError<IOError
-  def initialize(mesg, data) # :nodoc:
+  def initialize(mesg, data)
     @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
diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb
index 5d15b4577c..560a813d66 100644
--- a/lib/resolv-replace.rb
+++ b/lib/resolv-replace.rb
@@ -1,62 +1,50 @@
 require 'socket'
 require 'resolv'
 
+class BasicSocket
+  alias original_resolv_send send
+  def send(mesg, flags, *rest)
+    rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty?
+    original_resolv_send(mesg, flags, *rest)
+  end
+end
+
 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
+    return Resolv.getaddress(host).to_s
   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)
+    rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty?
+    original_resolv_initialize(Resolv.getaddress(host).to_s, serv, *rest)
   end
 end
 
 class UDPSocket
   alias original_resolv_bind bind
   def bind(host, port)
-    original_resolv_bind(IPSocket.getaddress(host), port)
+    original_resolv_bind(Resolv.getaddress(host).to_s, port)
   end
 
   alias original_resolv_connect connect
   def connect(host, port)
-    original_resolv_connect(IPSocket.getaddress(host), port)
+    original_resolv_connect(Resolv.getaddress(host).to_s, 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
+    rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty?
+    original_resolv_send(mesg, flags, *rest)
   end
 end
 
 class SOCKSSocket
   alias original_resolv_initialize initialize
   def initialize(host, serv)
-    original_resolv_initialize(IPSocket.getaddress(host), port)
+    original_resolv_initialize(Resolv.getaddress(host).to_s, port)
   end
 end if defined? SOCKSSocket
diff --git a/lib/resolv.rb b/lib/resolv.rb
index a3ed32ed6d..edc17c2f19 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -1,105 +1,231 @@
+=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
+  Resolv.getaddress("www.ruby-lang.org")
+  Resolv.getname("210.251.121.214")
+
+  dns = Resolv::DNS.new
+  dns.getresources("www.ruby-lang.org", Resolv::DNS::Resource::IN::A).collect {|r| r.address}
+  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(resolv_conf='/etc/resolv.conf')
+
+--- Resolv::DNS.open(resolv_conf='/etc/resolv.conf')
+--- Resolv::DNS.open(resolv_conf='/etc/resolv.conf') {|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'
 
-# Resolv is a thread-aware DNS resolver library written in Ruby.  Resolv can
-# handle multiple DNS requests concurrently without blocking.  The ruby
-# interpreter.
-#
-# See also resolv-replace.rb to replace the libc resolver with # Resolv.
-# 
-# Resolv can look up various DNS resources using the DNS module directly.
-# 
-# Examples:
-# 
-#   p Resolv.getaddress "www.ruby-lang.org"
-#   p Resolv.getname "210.251.121.214"
-# 
-#   Resolv::DNS.open do |dns|
-#     ress = dns.getresources "www.ruby-lang.org", Resolv::DNS::Resource::IN::A
-#     p ress.map { |r| r.address }
-#     ress = dns.getresources "ruby-lang.org", Resolv::DNS::Resource::IN::MX
-#     p ress.map { |r| [r.exchange.to_s, r.preference] }
-#   end
-# 
-# 
-# == Bugs
-# 
-# * NIS is not supported.
-# * /etc/nsswitch.conf is not supported.
-
 class Resolv
-
-  ##
-  # Looks up the first IP address for +name+.
-  
   def self.getaddress(name)
     DefaultResolver.getaddress(name)
   end
 
-  ##
-  # Looks up all IP address for +name+.
-  
   def self.getaddresses(name)
     DefaultResolver.getaddresses(name)
   end
 
-  ##
-  # Iterates over all IP addresses for +name+.
-
   def self.each_address(name, &block)
     DefaultResolver.each_address(name, &block)
   end
 
-  ##
-  # Looks up the hostname of +address+.
-
   def self.getname(address)
     DefaultResolver.getname(address)
   end
 
-  ##
-  # Looks up all hostnames for +address+.
-
   def self.getnames(address)
     DefaultResolver.getnames(address)
   end
 
-  ##
-  # Iterates over all hostnames for +address+.
-
   def self.each_name(address, &proc)
     DefaultResolver.each_name(address, &proc)
   end
 
-  ##
-  # Creates a new Resolv using +resolvers+.
-
   def initialize(resolvers=[Hosts.new, DNS.new])
     @resolvers = resolvers
   end
 
-  ##
-  # Looks up the first IP address for +name+.
-  
   def getaddress(name)
     each_address(name) {|address| return address}
     raise ResolvError.new("no address for #{name}")
   end
 
-  ##
-  # Looks up all IP address for +name+.
-  
   def getaddresses(name)
     ret = []
     each_address(name) {|address| ret << address}
     return ret
   end
 
-  ##
-  # Iterates over all IP addresses for +name+.
-
   def each_address(name)
     if AddressRegex =~ name
       yield name
@@ -115,26 +241,17 @@ class Resolv
     }
   end
 
-  ##
-  # Looks up the hostname of +address+.
-
   def getname(address)
     each_name(address) {|name| return name}
     raise ResolvError.new("no name for #{address}")
   end
 
-  ##
-  # Looks up all hostnames for +address+.
-
   def getnames(address)
     ret = []
     each_name(address) {|name| ret << name}
     return ret
   end
 
-  ##
-  # Iterates over all hostnames for +address+.
-
   def each_name(address)
     yielded = false
     @resolvers.each {|r|
@@ -146,37 +263,27 @@ class Resolv
     }
   end
 
-  ##
-  # Indicates a failure to resolve a name or address.
-
-  class ResolvError < StandardError; end
-
-  ##
-  # Indicates a timeout resolving a name or address.
-
-  class ResolvTimeout < TimeoutError; end
+  class ResolvError < StandardError
+  end
 
-  ##
-  # DNS::Hosts is a hostname resolver that uses the system hosts file.
+  class ResolvTimeout < TimeoutError
+  end
 
   class Hosts
-    if /mswin32|mingw|bccwin/ =~ RUBY_PLATFORM
+    if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
       require 'win32/resolv'
       DefaultFileName = Win32::Resolv.get_hosts_path
     else
       DefaultFileName = '/etc/hosts'
     end
 
-    ##
-    # Creates a new DNS::Hosts, using +filename+ for its data source.
-
     def initialize(filename = DefaultFileName)
       @filename = filename
       @mutex = Mutex.new
       @initialized = nil
     end
 
-    def lazy_initialize # :nodoc:
+    def lazy_initialize
       @mutex.synchronize {
         unless @initialized
           @name2addr = {}
@@ -204,29 +311,19 @@ class Resolv
           @initialized = true
         end
       }
-      self
     end
 
-    ##
-    # Gets the IP address of +name+ from the hosts file.
-
     def getaddress(name)
       each_address(name) {|address| return address}
       raise ResolvError.new("#{@filename} has no name: #{name}")
     end
 
-    ##
-    # Gets all IP addresses for +name+ from the hosts file.
-
     def getaddresses(name)
       ret = []
       each_address(name) {|address| ret << address}
       return ret
     end
 
-    ##
-    # Iterates over all IP addresses for +name+ retrieved from the hosts file.
-
     def each_address(name, &proc)
       lazy_initialize
       if @name2addr.include?(name)
@@ -234,26 +331,17 @@ class Resolv
       end
     end
 
-    ##
-    # Gets the hostname of +address+ from the hosts file.
-
     def getname(address)
       each_name(address) {|name| return name}
       raise ResolvError.new("#{@filename} has no address: #{address}")
     end
 
-    ##
-    # Gets all hostnames for +address+ from the hosts file.
-
     def getnames(address)
       ret = []
       each_name(address) {|name| ret << name}
       return ret
     end
 
-    ##
-    # Iterates over all hostnames for +address+ retrieved from the hosts file.
-
     def each_name(address, &proc)
       lazy_initialize
       if @addr2name.include?(address)
@@ -262,39 +350,15 @@ class Resolv
     end
   end
 
-  ##
-  # Resolv::DNS is a DNS stub resolver.
-  #
-  # Information taken from the following places:
-  #
-  # * STD0013
-  # * RFC 1035
-  # * ftp://ftp.isi.edu/in-notes/iana/assignments/dns-parameters
-  # * etc.
-
   class DNS
-
-    ##
-    # Default DNS Port
+    # STD0013 (RFC 1035, etc.)
+    # ftp://ftp.isi.edu/in-notes/iana/assignments/dns-parameters
 
     Port = 53
-
-    ##
-    # Default DNS UDP packet size
-
     UDPSize = 512
 
-    ##
-    # Group of DNS resolver threads
-
     DNSThreadGroup = ThreadGroup.new
 
-    ##
-    # Creates a new DNS resolver.  See Resolv::DNS.new for argument details.
-    #
-    # Yields the created DNS resolver to the block, if given, otherwise
-    # returns it.
-
     def self.open(*args)
       dns = new(*args)
       return dns unless block_given?
@@ -305,28 +369,13 @@ class Resolv
       end
     end
 
-    ##
-    # Creates a new DNS resolver.
-    #
-    # +config_info+ can be:
-    # 
-    # nil:: Uses /etc/resolv.conf.
-    # String:: Path to a file using /etc/resolv.conf's format.
-    # Hash:: Must contain :nameserver, :search and :ndots keys.
-    #
-    # Example:
-    #
-    #   Resolv::DNS.new(:nameserver => ['210.251.121.21'],
-    #                   :search => ['ruby-lang.org'],
-    #                   :ndots => 1)
-
-    def initialize(config_info=nil)
+    def initialize(config="/etc/resolv.conf")
       @mutex = Mutex.new
-      @config = Config.new(config_info)
+      @config = Config.new(config)
       @initialized = nil
     end
 
-    def lazy_initialize # :nodoc:
+    def lazy_initialize
       @mutex.synchronize {
         unless @initialized
           @config.lazy_initialize
@@ -340,12 +389,8 @@ class Resolv
           @initialized = true
         end
       }
-      self
     end
 
-    ##
-    # Closes the DNS resolver.
-
     def close
       @mutex.synchronize {
         if @initialized
@@ -356,71 +401,32 @@ class Resolv
       }
     end
 
-    ##
-    # Gets the IP address of +name+ from the DNS resolver.
-    #
-    # +name+ can be a Resolv::DNS::Name or a String.  Retrieved address will
-    # be a Resolv::IPv4 or Resolv::IPv6
-
     def getaddress(name)
       each_address(name) {|address| return address}
       raise ResolvError.new("DNS result has no information for #{name}")
     end
 
-    ##
-    # Gets all IP addresses for +name+ from the DNS resolver.
-    #
-    # +name+ can be a Resolv::DNS::Name or a String.  Retrieved addresses will
-    # be a Resolv::IPv4 or Resolv::IPv6
-
     def getaddresses(name)
       ret = []
       each_address(name) {|address| ret << address}
       return ret
     end
 
-    ##
-    # Iterates over all IP addresses for +name+ retrieved from the DNS
-    # resolver.
-    #
-    # +name+ can be a Resolv::DNS::Name or a String.  Retrieved addresses will
-    # be a Resolv::IPv4 or Resolv::IPv6
-
     def each_address(name)
       each_resource(name, Resource::IN::A) {|resource| yield resource.address}
-      each_resource(name, Resource::IN::AAAA) {|resource| yield resource.address}
     end
 
-    ##
-    # Gets the hostname for +address+ from the DNS resolver.
-    #
-    # +address+ must be a Resolv::IPv4, Resolv::IPv6 or a String.  Retrieved
-    # name will be a Resolv::DNS::Name.
-
     def getname(address)
       each_name(address) {|name| return name}
       raise ResolvError.new("DNS result has no information for #{address}")
     end
 
-    ##
-    # Gets all hostnames for +address+ from the DNS resolver.
-    #
-    # +address+ must be a Resolv::IPv4, Resolv::IPv6 or a String.  Retrieved
-    # names will be Resolv::DNS::Name instances.
-
     def getnames(address)
       ret = []
       each_name(address) {|name| ret << name}
       return ret
     end
 
-    ##
-    # Iterates over all hostnames for +address+ retrieved from the DNS
-    # resolver.
-    #
-    # +address+ must be a Resolv::IPv4, Resolv::IPv6 or a String.  Retrieved
-    # names will be Resolv::DNS::Name instances.
-
     def each_name(address)
       case address
       when Name
@@ -435,48 +441,17 @@ class Resolv
       each_resource(ptr, Resource::IN::PTR) {|resource| yield resource.name}
     end
 
-    ##
-    # Look up the +typeclass+ DNS resource of +name+.
-    #
-    # +name+ must be a Resolv::DNS::Name or a String.
-    #
-    # +typeclass+ should be one of the following:
-    #
-    # * Resolv::DNS::Resource::IN::A
-    # * Resolv::DNS::Resource::IN::AAAA
-    # * Resolv::DNS::Resource::IN::ANY
-    # * Resolv::DNS::Resource::IN::CNAME
-    # * Resolv::DNS::Resource::IN::HINFO
-    # * Resolv::DNS::Resource::IN::MINFO
-    # * Resolv::DNS::Resource::IN::MX
-    # * Resolv::DNS::Resource::IN::NS
-    # * Resolv::DNS::Resource::IN::PTR
-    # * Resolv::DNS::Resource::IN::SOA
-    # * Resolv::DNS::Resource::IN::TXT
-    # * Resolv::DNS::Resource::IN::WKS
-    #
-    # Returned resource is represented as a Resolv::DNS::Resource instance,
-    # i.e. Resolv::DNS::Resource::IN::A.
-
     def getresource(name, typeclass)
       each_resource(name, typeclass) {|resource| return resource}
       raise ResolvError.new("DNS result has no information for #{name}")
     end
 
-    ##
-    # Looks up all +typeclass+ DNS resources for +name+.  See #getresource for
-    # argument details.
-  
     def getresources(name, typeclass)
       ret = []
       each_resource(name, typeclass) {|resource| ret << resource}
       return ret
     end
 
-    ##
-    # Iterates over all +typeclass+ DNS resources for +name+.  See
-    # #getresource for argument details.
-  
     def each_resource(name, typeclass, &proc)
       lazy_initialize
       q = Queue.new
@@ -508,7 +483,7 @@ class Resolv
       end
     end
 
-    def extract_resources(msg, name, typeclass) # :nodoc:
+    def extract_resources(msg, name, typeclass)
       if typeclass < Resource::ANY
         n0 = Name.create(name)
         msg.each_answer {|n, ttl, data|
@@ -539,7 +514,7 @@ class Resolv
       }
     end
 
-    class Requester # :nodoc:
+    class Requester
       def initialize
         @senders = {}
       end
@@ -567,7 +542,7 @@ class Resolv
         end
       end
 
-      class Sender # :nodoc:
+      class Sender
         def initialize(msg, data, sock, queue)
           @msg = msg
           @data = data
@@ -581,7 +556,7 @@ class Resolv
         end
       end
 
-      class UnconnectedUDP < Requester # :nodoc:
+      class UnconnectedUDP < Requester
         def initialize
           super()
           @sock = UDPSocket.new
@@ -618,7 +593,7 @@ class Resolv
             Sender.new(request, data, @sock, host, port, queue)
         end
 
-        class Sender < Requester::Sender # :nodoc:
+        class Sender < Requester::Sender
           def initialize(msg, data, sock, host, port, queue)
             super(msg, data, sock, queue)
             @host = host
@@ -631,12 +606,12 @@ class Resolv
         end
       end
 
-      class ConnectedUDP < Requester # :nodoc:
+      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 = UDPSocket.new
           @sock.connect(host, port)
           @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
           @id = -1
@@ -669,14 +644,14 @@ class Resolv
           return @senders[id] = Sender.new(request, data, @sock, queue)
         end
 
-        class Sender < Requester::Sender # :nodoc:
+        class Sender < Requester::Sender
           def send
             @sock.send(@msg, 0)
           end
         end
       end
 
-      class TCP < Requester # :nodoc:
+      class TCP < Requester
         def initialize(host, port=Port)
           super()
           @host = host
@@ -716,7 +691,7 @@ class Resolv
           return @senders[id] = Sender.new(request, data, @sock, queue)
         end
 
-        class Sender < Requester::Sender # :nodoc:
+        class Sender < Requester::Sender
           def send
             @sock.print(@msg)
             @sock.flush
@@ -724,99 +699,52 @@ class Resolv
         end
       end
 
-      ##
-      # Indicates a problem with the DNS request.
-
       class RequestError < StandardError
       end
     end
 
-    class Config # :nodoc:
-      def initialize(config_info=nil)
+    class Config
+      def initialize(filename="/etc/resolv.conf")
         @mutex = Mutex.new
-        @config_info = config_info
+        @filename = filename
         @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
-            require 'win32/resolv'
-            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]]
+            begin
+              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'
+                    @search = [Label.split(args[0])]
+                  when 'search'
+                    @search = args.map {|arg| Label.split(arg)}
+                  end
+                }
+              }
+            rescue Errno::ENOENT
+              if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+                search, nameserver = Win32::Resolv.get_resolv_info
+                @search = [search] if search
+                @nameserver = nameserver if nameserver
               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
+            unless @search
               hostname = Socket.gethostname
               if /\./ =~ hostname
                 @search = [Label.split($')]
@@ -824,25 +752,9 @@ class Resolv
                 @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?
@@ -898,24 +810,20 @@ class Resolv
             rescue NXDomain
             end
           }
-        rescue ResolvError
+        rescue OtherResolvError
+          raise ResolvError.new("DNS error: #{$!.message}")
         end
+        raise ResolvError.new("DNS resolv error: #{name}")
       end
 
-      ##
-      # Indicates no such domain was found.
-
       class NXDomain < ResolvError
       end
 
-      ##
-      # Indicates some other unhandled resolver error was encountered.
-
       class OtherResolvError < ResolvError
       end
     end
 
-    module OpCode # :nodoc:
+    module OpCode
       Query = 0
       IQuery = 1
       Status = 2
@@ -923,7 +831,7 @@ class Resolv
       Update = 5
     end
 
-    module RCode # :nodoc:
+    module RCode
       NoError = 0
       FormErr = 1
       ServFail = 2
@@ -944,26 +852,20 @@ class Resolv
       BADALG = 21
     end
 
-    ##
-    # Indicates that the DNS response was unable to be decoded.
-
     class DecodeError < StandardError
     end
 
-    ##
-    # Indicates that the DNS request was unable to be encoded.
-
     class EncodeError < StandardError
     end
 
-    module Label # :nodoc:
+    module Label
       def self.split(arg)
         labels = []
         arg.scan(/[^\.]+/) {labels << Str.new($&)}
         return labels
       end
 
-      class Str # :nodoc:
+      class Str
         def initialize(string)
           @string = string
           @downcase = string.downcase
@@ -992,17 +894,7 @@ class Resolv
       end
     end
 
-    ##
-    # A representation of a DNS name.
-
     class Name
-      
-      ##
-      # Creates a new DNS name from +arg+.  +arg+ can be:
-      #
-      # Name:: returns +arg+.
-      # String:: Creates a new Name.
-
       def self.create(arg)
         case arg
         when Name
@@ -1014,84 +906,42 @@ class Resolv
         end
       end
 
-      def initialize(labels, absolute=true) # :nodoc:
+      def initialize(labels, absolute=true)
         @labels = labels
         @absolute = absolute
       end
 
-      def inspect # :nodoc:
-        "#<#{self.class}: #{self.to_s}#{@absolute ? '.' : ''}>"
-      end
-
-      ##
-      # True if this name is absolute.
-
       def absolute?
         return @absolute
       end
 
-      def ==(other) # :nodoc:
-        return false unless Name === other
-        return @labels.join == other.to_a.join && @absolute == other.absolute?
-      end
-
-      alias eql? == # :nodoc:
-
-      ##
-      # Returns true if +other+ is a subdomain.
-      #
-      # Example:
-      #
-      #   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
+      def ==(other)
+        return @labels == other.to_a && @absolute == other.absolute?
       end
+      alias eql? ==
 
-      def hash # :nodoc:
+      def hash
         return @labels.hash ^ @absolute.hash
       end
 
-      def to_a # :nodoc:
+      def to_a
         return @labels
       end
 
-      def length # :nodoc:
+      def length
         return @labels.length
       end
 
-      def [](i) # :nodoc:
+      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.
-      #
-      # Example:
-      #
-      #   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 # :nodoc:
+    class Message
       @@identifier = -1
 
       def initialize(id = (@@identifier += 1) & 0xffff)
@@ -1204,7 +1054,7 @@ class Resolv
         }.to_s
       end
 
-      class MessageEncoder # :nodoc:
+      class MessageEncoder
         def initialize
           @data = ''
           @names = {}
@@ -1237,12 +1087,6 @@ class Resolv
           @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
@@ -1262,7 +1106,7 @@ class Resolv
         end
 
         def put_label(d)
-          self.put_string(d.to_s)
+          self.put_string(d.string)
         end
       end
 
@@ -1299,7 +1143,7 @@ class Resolv
         return o
       end
 
-      class MessageDecoder # :nodoc:
+      class MessageDecoder
         def initialize(data)
           @data = data
           @index = 0
@@ -1313,9 +1157,9 @@ class Resolv
           @limit = @index + len
           d = yield(len)
           if @index < @limit
-            raise DecodeError.new("junk exists")
+            raise DecodeError.new("junk exist")
           elsif @limit < @index
-            raise DecodeError.new("limit exceeded")
+            raise DecodeError.new("limit exceed")
           end
           @limit = save_limit
           return d
@@ -1341,7 +1185,7 @@ class Resolv
               raise StandardError.new("unsupported template: '#{byte.chr}' in '#{template}'")
             end
           }
-          raise DecodeError.new("limit exceeded") if @limit < @index + len
+          raise DecodeError.new("limit exceed") if @limit < @index + len
           arr = @data.unpack("@#{@index}#{template}")
           @index += len
           return arr
@@ -1349,20 +1193,12 @@ class Resolv
 
         def get_string
           len = @data[@index]
-          raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len
+          raise DecodeError.new("limit exceed") 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
@@ -1411,51 +1247,39 @@ class Resolv
       end
     end
 
-    ##
-    # A DNS query abstract class.
-
     class Query
-      def encode_rdata(msg) # :nodoc:
+      def encode_rdata(msg)
         raise EncodeError.new("#{self.class} is query.") 
       end
 
-      def self.decode_rdata(msg) # :nodoc:
+      def self.decode_rdata(msg)
         raise DecodeError.new("#{self.class} is query.") 
       end
     end
 
-    ##
-    # A DNS resource abstract class.
-
     class Resource < Query
+      ClassHash = {}
 
-      ##
-      # Remaining Time To Live for this Resource.
-
-      attr_reader :ttl
-
-      ClassHash = {} # :nodoc:
-
-      def encode_rdata(msg) # :nodoc:
+      def encode_rdata(msg)
         raise NotImplementedError.new
       end
 
-      def self.decode_rdata(msg) # :nodoc:
+      def self.decode_rdata(msg)
         raise NotImplementedError.new
       end
 
-      def ==(other) # :nodoc:
+      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) # :nodoc:
+      def eql?(other)
         return self == other
       end
 
-      def hash # :nodoc:
+      def hash
         h = 0
         self.instance_variables.each {|name|
           h ^= self.instance_eval("#{name}.hash")
@@ -1463,37 +1287,26 @@ class Resolv
         return h
       end
 
-      def self.get_class(type_value, class_value) # :nodoc:
+      def self.get_class(type_value, class_value)
         return ClassHash[[type_value, class_value]] ||
                Generic.create(type_value, class_value)
       end
 
-      ##
-      # A generic resource abstract class.
-
       class Generic < Resource
-
-        ##
-        # Creates a new generic resource.
-
         def initialize(data)
           @data = data
         end
-
-        ##
-        # Data for this generic resource.
-
         attr_reader :data
 
-        def encode_rdata(msg) # :nodoc:
+        def encode_rdata(msg)
           msg.put_bytes(data)
         end
 
-        def self.decode_rdata(msg) # :nodoc:
+        def self.decode_rdata(msg)
           return self.new(msg.get_bytes)
         end
 
-        def self.create(type_value, class_value) # :nodoc:
+        def self.create(type_value, class_value)
           c = Class.new(Generic)
           c.const_set(:TypeValue, type_value)
           c.const_set(:ClassValue, class_value)
@@ -1503,60 +1316,34 @@ class Resolv
         end
       end
 
-      ##
-      # Domain Name resource abstract class.
-
       class DomainName < Resource
-
-        ##
-        # Creates a new DomainName from +name+.
-
         def initialize(name)
           @name = name
         end
-
-        ##
-        # The name of this DomainName.
-
         attr_reader :name
 
-        def encode_rdata(msg) # :nodoc:
+        def encode_rdata(msg)
           msg.put_name(@name)
         end
 
-        def self.decode_rdata(msg) # :nodoc:
+        def self.decode_rdata(msg)
           return self.new(msg.get_name)
         end
       end
 
       # Standard (class generic) RRs
-
-      ClassValue = nil # :nodoc:
-
-      ##
-      # An authoritative name server.
+      ClassValue = nil
 
       class NS < DomainName
-        TypeValue = 2 # :nodoc:
+        TypeValue = 2
       end
 
-      ##
-      # The canonical name for an alias.
-
       class CNAME < DomainName
-        TypeValue = 5 # :nodoc:
+        TypeValue = 5
       end
 
-      ##
-      # Start Of Authority resource.
-
       class SOA < Resource
-
-        TypeValue = 6 # :nodoc:
-
-        ##
-        # Creates a new SOA record.  See the attr documentation for the
-        # details of each argument.
+        TypeValue = 6
 
         def initialize(mname, rname, serial, refresh, retry_, expire, minimum)
           @mname = mname
@@ -1567,52 +1354,15 @@ class Resolv
           @expire = expire
           @minimum = minimum
         end
+        attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
 
-        ##
-        # Name of the host where the master zone file for this zone resides.
-
-        attr_reader :mname
-
-        ##
-        # The person responsible for this domain name.
-
-        attr_reader :rname
-
-        ##
-        # The version number of the zone file.
-
-        attr_reader :serial
-
-        ##
-        # How often, in seconds, a secondary name server is to check for
-        # updates from the primary name server.
-
-        attr_reader :refresh
-
-        ##
-        # How often, in seconds, a secondary name server is to retry after a
-        # failure to check for a refresh.
-
-        attr_reader :retry
-
-        ##
-        # Time in seconds that a secondary name server is to use the data
-        # before refreshing from the primary name server.
-
-        attr_reader :expire
-
-        ##
-        # The minimum number of seconds to be used for TTL values in RRs.
-
-        attr_reader :minimum
-
-        def encode_rdata(msg) # :nodoc:
+        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) # :nodoc:
+        def self.decode_rdata(msg)
           mname = msg.get_name
           rname = msg.get_name
           serial, refresh, retry_, expire, minimum = msg.get_unpack('NNNNN')
@@ -1621,172 +1371,102 @@ class Resolv
         end
       end
 
-      ##
-      # A Pointer to another DNS name.
-
       class PTR < DomainName
-        TypeValue = 12 # :nodoc:
+        TypeValue = 12
       end
 
-      ##
-      # Host Information resource.
-
       class HINFO < Resource
-
-        TypeValue = 13 # :nodoc:
-
-        ##
-        # Creates a new HINFO running +os+ on +cpu+.
+        TypeValue = 13
 
         def initialize(cpu, os)
           @cpu = cpu
           @os = os
         end
+        attr_reader :cpu, :os
 
-        ##
-        # CPU architecture for this resource.
-
-        attr_reader :cpu
-
-        ##
-        # Operating system for this resource.
-
-        attr_reader :os
-
-        def encode_rdata(msg) # :nodoc:
+        def encode_rdata(msg)
           msg.put_string(@cpu)
           msg.put_string(@os)
         end
 
-        def self.decode_rdata(msg) # :nodoc:
+        def self.decode_rdata(msg)
           cpu = msg.get_string
           os = msg.get_string
           return self.new(cpu, os)
         end
       end
 
-      ##
-      # Mailing list or mailbox information.
-
       class MINFO < Resource
-
-        TypeValue = 14 # :nodoc:
+        TypeValue = 14
 
         def initialize(rmailbx, emailbx)
           @rmailbx = rmailbx
           @emailbx = emailbx
         end
+        attr_reader :rmailbx, :emailbx
 
-        ##
-        # Domain name responsible for this mail list or mailbox.
-
-        attr_reader :rmailbx
-
-        ##
-        # Mailbox to use for error messages related to the mail list or mailbox.
-
-        attr_reader :emailbx
-
-        def encode_rdata(msg) # :nodoc:
+        def encode_rdata(msg)
           msg.put_name(@rmailbx)
           msg.put_name(@emailbx)
         end
 
-        def self.decode_rdata(msg) # :nodoc:
+        def self.decode_rdata(msg)
           rmailbx = msg.get_string
           emailbx = msg.get_string
           return self.new(rmailbx, emailbx)
         end
       end
 
-      ##
-      # Mail Exchanger resource.
-
       class MX < Resource
-
-        TypeValue= 15 # :nodoc:
-
-        ##
-        # Creates a new MX record with +preference+, accepting mail at
-        # +exchange+.
+        TypeValue= 15
 
         def initialize(preference, exchange)
           @preference = preference
           @exchange = exchange
         end
+        attr_reader :preference, :exchange
 
-        ##
-        # The preference for this MX.
-
-        attr_reader :preference
-
-        ##
-        # The host of this MX.
-
-        attr_reader :exchange
-
-        def encode_rdata(msg) # :nodoc:
+        def encode_rdata(msg)
           msg.put_pack('n', @preference)
           msg.put_name(@exchange)
         end
 
-        def self.decode_rdata(msg) # :nodoc:
+        def self.decode_rdata(msg)
           preference, = msg.get_unpack('n')
           exchange = msg.get_name
           return self.new(preference, exchange)
         end
       end
 
-      ##
-      # Unstructured text resource.
-
       class TXT < Resource
+        TypeValue = 16
 
-        TypeValue = 16 # :nodoc:
-
-        def initialize(first_string, *rest_strings)
-          @strings = [first_string, *rest_strings]
-        end
-
-        ##
-        # Returns an Array of Strings for this TXT record.
-
-        attr_reader :strings
-
-        ##
-        # Returns the first string from +strings+.
-
-        def data
-          @strings[0]
+        def initialize(data)
+          @data = data
         end
+        attr_reader :data
 
-        def encode_rdata(msg) # :nodoc:
-          msg.put_string_list(@strings)
+        def encode_rdata(msg)
+          msg.put_string(@data)
         end
 
-        def self.decode_rdata(msg) # :nodoc:
-          strings = msg.get_string_list
-          return self.new(*strings)
+        def self.decode_rdata(msg)
+          data = msg.get_string
+          return self.new(data)
         end
       end
 
-      ##
-      # A Query type requesting any RR.
-
       class ANY < Query
-        TypeValue = 255 # :nodoc:
+        TypeValue = 255
       end
 
-      ClassInsensitiveTypes = [ # :nodoc:
+      ClassInsensitiveTypes = [
         NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, ANY
       ]
 
-      ##
-      # module IN contains ARPA Internet specific RRs.
-
+      # ARPA Internet specific RRs
       module IN
-
-        ClassValue = 1 # :nodoc:
+        ClassValue = 1
 
         ClassInsensitiveTypes.each {|s|
           c = Class.new(s)
@@ -1796,76 +1476,40 @@ class Resolv
           self.const_set(s.name.sub(/.*::/, ''), c)
         }
 
-        ##
-        # IPv4 Address resource
-
         class A < Resource
-          TypeValue = 1
-          ClassValue = IN::ClassValue
-          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
-
-          ##
-          # Creates a new A for +address+.
+          ClassHash[[TypeValue = 1, ClassValue = ClassValue]] = self
 
           def initialize(address)
             @address = IPv4.create(address)
           end
-
-          ##
-          # The Resolv::IPv4 address for this A.
-
           attr_reader :address
 
-          def encode_rdata(msg) # :nodoc:
+          def encode_rdata(msg)
             msg.put_bytes(@address.address)
           end
 
-          def self.decode_rdata(msg) # :nodoc:
+          def self.decode_rdata(msg)
             return self.new(IPv4.new(msg.get_bytes(4)))
           end
         end
 
-        ##
-        # Well Known Service resource.
-
         class WKS < Resource
-          TypeValue = 11
-          ClassValue = IN::ClassValue
-          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+          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
 
-          ##
-          # The host these services run on.
-
-          attr_reader :address
-
-          ##
-          # IP protocol number for these services.
-
-          attr_reader :protocol
-
-          ##
-          # A bit map of enabled services on this host.
-          #
-          # If protocol is 6 (TCP) then the 26th bit corresponds to the SMTP
-          # service (port 25).  If this bit is set, then an SMTP server should
-          # be listening on TCP port 25; if zero, SMTP service is not
-          # supported.
-
-          attr_reader :bitmap
-
-          def encode_rdata(msg) # :nodoc:
+          def encode_rdata(msg)
             msg.put_bytes(@address.address)
             msg.put_pack("n", @protocol)
             msg.put_bytes(@bitmap)
           end
 
-          def self.decode_rdata(msg) # :nodoc:
+          def self.decode_rdata(msg)
             address = IPv4.new(msg.get_bytes(4))
             protocol, = msg.get_unpack("n")
             bitmap = msg.get_bytes
@@ -1873,120 +1517,27 @@ class Resolv
           end
         end
 
-        ##
-        # An IPv6 address record.
-
         class AAAA < Resource
-          TypeValue = 28
-          ClassValue = IN::ClassValue
-          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
-
-          ##
-          # Creates a new AAAA for +address+.
+          ClassHash[[TypeValue = 28, ClassValue = ClassValue]] = self
 
           def initialize(address)
             @address = IPv6.create(address)
           end
-          
-          ##
-          # The Resolv::IPv6 address for this AAAA.
-
           attr_reader :address
 
-          def encode_rdata(msg) # :nodoc:
+          def encode_rdata(msg)
             msg.put_bytes(@address.address)
           end
 
-          def self.decode_rdata(msg) # :nodoc:
+          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.
-
-        class SRV < Resource
-          TypeValue = 33
-          ClassValue = IN::ClassValue
-          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
-
-          # Create a SRV resource record.
-          #
-          # See the documentation for #priority, #weight, #port and #target
-          # for +priority+, +weight+, +port and +target+ respectively.
-
-          def initialize(priority, weight, port, target)
-            @priority = priority.to_int
-            @weight = weight.to_int
-            @port = port.to_int
-            @target = Name.create(target)
-          end
-
-          # 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.
-
-          attr_reader :priority
-
-          # 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.
-
-          attr_reader :weight
-
-          # The port on this target host of this service.
-          #
-          # The range is 0-65535.
-
-          attr_reader :port
-
-          # The domain name of the target host.
-          #
-          # A target of "." means that the service is decidedly not available
-          # at this domain.
-
-          attr_reader :target
-
-          def encode_rdata(msg) # :nodoc:
-            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) # :nodoc:
-            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
 
-  ##
-  # A Resolv::DNS IPv4 address.
-
   class IPv4
-
-    ##
-    # Regular expression IPv4 addresses must match.
-
     Regex = /\A(\d+)\.(\d+)\.(\d+)\.(\d+)\z/
 
     def self.create(arg)
@@ -2003,105 +1554,71 @@ class Resolv
           raise ArgumentError.new("IPv4 address with invalid value: " + arg)
         end
       else
-        raise ArgumentError.new("cannot interpret as IPv4 address: #{arg.inspect}")
+        raise ArgumentError.new("cannot interprete as IPv4 address: #{arg.inspect}")
       end
     end
 
-    def initialize(address) # :nodoc:
+    def initialize(address)
       unless address.kind_of?(String) && address.length == 4
         raise ArgumentError.new('IPv4 address must be 4 bytes')
       end
       @address = address
     end
-
-    ##
-    # A String representation of this IPv4 address.
-
-    ##
-    # The raw IPv4 address as a String.
-
     attr_reader :address
 
-    def to_s # :nodoc:
+    def to_s
       return sprintf("%d.%d.%d.%d", *@address.unpack("CCCC"))
     end
 
-    def inspect # :nodoc:
+    def inspect
       return "#<#{self.class} #{self.to_s}>"
     end
 
-    ##
-    # Turns this IPv4 address into a Resolv::DNS::Name.
-
     def to_name
       return DNS::Name.create(
         '%d.%d.%d.%d.in-addr.arpa.' % @address.unpack('CCCC').reverse)
     end
 
-    def ==(other) # :nodoc:
+    def ==(other)
       return @address == other.address
     end
 
-    def eql?(other) # :nodoc:
+    def eql?(other)
       return self == other
     end
 
-    def hash # :nodoc:
+    def hash
       return @address.hash
     end
   end
 
-  ##
-  # A Resolv::DNS IPv6 address.
-
   class IPv6
-
-    ##
-    # IPv6 address format a:b:c:d:e:f:g:h
     Regex_8Hex = /\A
       (?:[0-9A-Fa-f]{1,4}:){7}
          [0-9A-Fa-f]{1,4}
       \z/x
 
-    ##
-    # Compressed IPv6 address format a::b
-
     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
 
-    ##
-    # IPv4 mapped IPv6 address format a:b:c:d:e:f:w.x.y.z
-
     Regex_6Hex4Dec = /\A
       ((?:[0-9A-Fa-f]{1,4}:){6,6})
       (\d+)\.(\d+)\.(\d+)\.(\d+)
       \z/x
 
-    ##
-    # Compressed IPv4 mapped IPv6 address format a::b:w.x.y.z
-
     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
 
-    ##
-    # A composite IPv6 address Regexp.
-
     Regex = /
-      (?:#{Regex_8Hex}) |
-      (?:#{Regex_CompressedHex}) |
-      (?:#{Regex_6Hex4Dec}) |
-      (?:#{Regex_CompressedHex4Dec})/x
-
-    ##
-    # Creates a new IPv6 address from +arg+ which may be:
-    #
-    # IPv6:: returns +arg+.
-    # String:: +arg+ must match one of the IPv6::Regex* constants
+      (?:#{Regex_8Hex.source}) |
+      (?:#{Regex_CompressedHex.source}) |
+      (?:#{Regex_6Hex4Dec.source}) |
+      (?:#{Regex_CompressedHex4Dec.source})/x
 
     def self.create(arg)
       case arg
@@ -2145,23 +1662,19 @@ class Resolv
         end
         return IPv6.new(address)
       else
-        raise ArgumentError.new("cannot interpret as IPv6 address: #{arg.inspect}")
+        raise ArgumentError.new("cannot interprete as IPv6 address: #{arg.inspect}")
       end
     end
 
-    def initialize(address) # :nodoc:
+    def initialize(address)
       unless address.kind_of?(String) && address.length == 16
         raise ArgumentError.new('IPv6 address must be 16 bytes')
       end
       @address = address
     end
-
-    ##
-    # The raw IPv6 address as a String.
-
     attr_reader :address
 
-    def to_s # :nodoc:
+    def to_s
       address = sprintf("%X:%X:%X:%X:%X:%X:%X:%X", *@address.unpack("nnnnnnnn"))
       unless address.sub!(/(^|:)0(:0)+(:|$)/, '::')
         address.sub!(/(^|:)0(:|$)/, '::')
@@ -2169,42 +1682,29 @@ class Resolv
       return address
     end
 
-    def inspect # :nodoc:
+    def inspect
       return "#<#{self.class} #{self.to_s}>"
     end
 
-    ##
-    # Turns this IPv6 address into a Resolv::DNS::Name.
-    #--
-    # ip6.arpa should be searched too. [RFC3152]
-
     def to_name
+      # ip6.arpa should be searched too. [RFC3152]
       return DNS::Name.new(
-        @address.unpack("H32")[0].split(//).reverse + ['ip6', 'arpa'])
+        @address.unpack("H32")[0].split(//).reverse + ['ip6', 'int'])
     end
 
-    def ==(other) # :nodoc:
+    def ==(other)
       return @address == other.address
     end
 
-    def eql?(other) # :nodoc:
+    def eql?(other)
       return self == other
     end
 
-    def hash # :nodoc:
+    def hash
       return @address.hash
     end
   end
 
-  ##
-  # Default resolver to use for Resolv class methods.
-
   DefaultResolver = self.new
-
-  ##
-  # Address Regexp to use for matching IP addresses.
-
-  AddressRegex = /(?:#{IPv4::Regex})|(?:#{IPv6::Regex})/
-
+  AddressRegex = /(?:#{IPv4::Regex.source})|(?:#{IPv6::Regex.source})/
 end
-
diff --git a/lib/rexml/attlistdecl.rb b/lib/rexml/attlistdecl.rb
index ef4721b5ce..d4b5c38af6 100644
--- a/lib/rexml/attlistdecl.rb
+++ b/lib/rexml/attlistdecl.rb
@@ -44,7 +44,7 @@ module REXML
 			@pairs.keys.include? key
 		end
 
-		# Iterate over the key/value pairs:
+		# Itterate over the key/value pairs:
 		#  attlist_decl.each { |attribute_name, attribute_value| ... }
 		def each(&block)
 			@pairs.each(&block)
diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb
index 89c1ada36c..4aef0944dc 100644
--- a/lib/rexml/attribute.rb
+++ b/lib/rexml/attribute.rb
@@ -18,43 +18,27 @@ module REXML
 		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( source )
 		#  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
+				@value = first.value
 				if second.kind_of? Element
 					@element = second
 				else
 					@element = first.element
 				end
 			elsif first.kind_of? String
-				@element = parent
+				@element = parent if parent.kind_of? Element
 				self.name = first
-				@normalized = second.to_s
+				@value = second
 			else
-				raise "illegal argument #{first.class.name} to Attribute constructor"
+				raise "illegal argument #{first.type} to Attribute constructor"
 			end
 		end
 
@@ -88,7 +72,7 @@ module REXML
 		# 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
+			other.kind_of?(Attribute) and other.name==name and other.value==@value
 		end
 
 		# Creates (and returns) a hash from both the name and value
@@ -103,11 +87,7 @@ module REXML
 		#  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
+			"#@expanded_name='#{to_s().gsub(/'/, '&apos;')}'"
 		end
 
 		# Returns the attribute value, with entities replaced
@@ -120,23 +100,21 @@ module REXML
 				doctype = doc.doctype if doc
 			end
 
-			@normalized = Text::normalize( @unnormalized, doctype )
 			@unnormalized = nil
-      @normalized
+			@value = @normalized = Text::normalize( @value, doctype )
 		end
 
 		# Returns the UNNORMALIZED value of this attribute.  That is, entities
 		# have been expanded to their values
 		def value
-			return @unnormalized if @unnormalized
+			@unnormalized if @unnormalized
 			doctype = nil
 			if @element
 				doc = @element.document
 				doctype = doc.doctype if doc
 			end
-			@unnormalized = Text::unnormalize( @normalized, doctype )
 			@normalized = nil
-      @unnormalized
+			@value = @unnormalized = Text::unnormalize( @value, doctype )
 		end
 
 		# Returns a copy of this attribute
@@ -168,18 +146,6 @@ module REXML
     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/lib/rexml/cdata.rb b/lib/rexml/cdata.rb
index efcb71160a..402a0187ff 100644
--- a/lib/rexml/cdata.rb
+++ b/lib/rexml/cdata.rb
@@ -35,29 +35,30 @@ module REXML
 			@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
+		#   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::
-    #   Ignored
+		#   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::
-    #   Ignored
+		#   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.
 		#
 		# _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
diff --git a/lib/rexml/comment.rb b/lib/rexml/comment.rb
index 2b9b4b89c9..e439ddf9d8 100644
--- a/lib/rexml/comment.rb
+++ b/lib/rexml/comment.rb
@@ -2,15 +2,13 @@ require "rexml/child"
 
 module REXML
 	##
-	# Represents an XML comment; that is, text between \<!-- ... -->
+	# Represents an XML comment; that is, text between <!-- ... -->
 	class Comment < Child
 		include Comparable
 		START = "<!--"
 		STOP = "-->"
 
-		# The content text
-
-		attr_accessor :string
+		attr_accessor :string			# The content text
 
 		##
 		# Constructor.  The first argument can be one of three types:
@@ -34,21 +32,22 @@ module REXML
 			Comment.new self
 		end
 
-    # == DEPRECATED
-    # See REXML::Formatters
-    #
 		# output::
-		#	 Where to write the string
+		#   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.
+		#   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.
+		#   Who knows?
 		# ie_hack::
-		#	 Needed for conformity to the child API, but not used by this class.
+		#   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.
+		#
 		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
diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb
index 05cd4ab331..084676afa9 100644
--- a/lib/rexml/doctype.rb
+++ b/lib/rexml/doctype.rb
@@ -6,266 +6,191 @@ 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
+	# 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
+		#	 source = Source.new( '<!DOCTYPE foo "bar">' )
+		#	 dt = DocType.new( source )
+		#	 # <!DOCTYPE foo "bar">
+		#	 dt = DocType.new( source, some_document )
+		#	 # Creates a doctype, and adds to the supplied document
+		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]
+			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 indenting will be used; otherwise, the
+		#   indentation will be this number of spaces, and children will be
+		#   indented an additional amount.
+		# transitive::
+		#   Who knows?
+		# 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.
+		#
+		def write( output, indent=0, transitive=false, ie_hack=false )
+			indent( output, indent )
+			output << START
+			output << ' '
+			output << @name
+			output << " #@external_id" if @external_id
+			output << " #@long_name" if @long_name
+			output << " #@uri" if @uri
+			unless @children.empty?
+				next_indent = indent + 2
+				output << ' ['
+				child = nil		# speed
+				@children.each { |child|
+					output << "\n"
+					child.write( output, next_indent )
+				}
+				output << "\n"
+				#output << '   '*next_indent
+				output << "]"
+			end
+			output << STOP
+		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
+	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
+
+		def write( output, indent )
+			output << ('   '*indent) if indent > 0
+			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
+			output << "\n"
+		end
+	end
+
+	class NotationDecl < Child
+		def initialize name, middle, rest
+			@name = name
+			@middle = middle
+			@rest = rest
+		end
+
+		def to_s
+			"<!NOTATION #@name #@middle #@rest>"
+		end
+
+		def write( output, indent=-1 )
+			output << ('   '*indent) if indent > 0
+			output << to_s
+		end
+	end
 end
diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb
index 54aa691ad8..1eefaea92a 100644
--- a/lib/rexml/document.rb
+++ b/lib/rexml/document.rb
@@ -9,7 +9,6 @@ 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
@@ -31,6 +30,9 @@ module REXML
 	  # to be sources of valid XML documents.
 	  # @param context if supplied, contains the context of the document;
 	  # this should be a Hash.
+	  # NOTE that I'm not sure what the context is for; I cloned it out of
+	  # the Electric XML API (in which it also seems to do nothing), and it
+	  # is now legacy.  It may do something, someday... it may disappear.
 		def initialize( source = nil, context = {} )
 			super()
 			@context = context
@@ -66,25 +68,12 @@ module REXML
 		def add( child )
 			if child.kind_of? XMLDecl
 				@children.unshift child
-        child.parent = self
 			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
+				if @children[0].kind_of? XMLDecl
+					@children[1,0] = child
+				else
+					@children.unshift child
+				end
 				child.parent = self
 			else
 				rv = super
@@ -103,9 +92,7 @@ module REXML
 		# @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 }
+			@children.find { |item| item.kind_of? Element }
 		end
 
 		# @return the DocType child of the document, if one exists,
@@ -140,59 +127,38 @@ module REXML
 			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 unnecessary 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 trans
-            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 )
+		# 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.
+		#
+		#
+		# 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::
+		#   What the heck does this do? Defaults to false
+		# 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, transitive=false, ie_hack=false )
+			output = Output.new( output, xml_decl.encoding ) if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
+			@children.each { |node|
+				indent( output, indent) if node.node_type == :element
+				node.write( output, indent, transitive, ie_hack )
+				output << "\n" unless indent<0 or node == @children[-1]
+			}
 		end
 
 		
@@ -202,7 +168,73 @@ module REXML
 
 		private
 		def build( source )
-      Parsers::TreeParser.new( source, self ).parse
+			build_context = self
+			parser = Parsers::BaseParser.new( source )
+			tag_stack = []
+			in_doctype = false
+			entities = nil
+			while true
+				event = parser.pull
+				case event[0]
+				when :end_document
+					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], true, nil, true ) 
+							) unless (
+								event[1].strip.size==0 and 
+								build_context.ignore_whitespace_nodes
+							)
+						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
 		end
 	end
 end
diff --git a/lib/rexml/dtd/dtd.rb b/lib/rexml/dtd/dtd.rb
index 4f735d4812..81119cfa9b 100644
--- a/lib/rexml/dtd/dtd.rb
+++ b/lib/rexml/dtd/dtd.rb
@@ -25,7 +25,7 @@ module REXML
 					when ElementDecl.PATTERN_RE
 						match = $&
 						source = $'
-						contents << ElementDecl.new( match )
+						contents << EleemntDecl.new( match )
 					when AttlistDecl.PATTERN_RE
 						matchdata = $~
 						source = $'
diff --git a/lib/rexml/dtd/entitydecl.rb b/lib/rexml/dtd/entitydecl.rb
index a5f1520f2b..164825570f 100644
--- a/lib/rexml/dtd/entitydecl.rb
+++ b/lib/rexml/dtd/entitydecl.rb
@@ -42,7 +42,7 @@ module REXML
 			end
 
 			def write( output, indent )
-        indent( output, indent )
+				output << ('   '*indent) if indent > 0
 				output << to_s
 			end
 
diff --git a/lib/rexml/dtd/notationdecl.rb b/lib/rexml/dtd/notationdecl.rb
index a47ff8f24b..d577ce0631 100644
--- a/lib/rexml/dtd/notationdecl.rb
+++ b/lib/rexml/dtd/notationdecl.rb
@@ -25,7 +25,7 @@ module REXML
 			end
 
 			def write( output, indent )
-        indent( output, indent )
+				output << ('   '*indent) if indent > 0
 				output << to_s
 			end
 
diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb
index 3db87c6126..ffaeddbf54 100644
--- a/lib/rexml/element.rb
+++ b/lib/rexml/element.rb
@@ -6,1222 +6,1142 @@ 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 iterate
-    #   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
+	# 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.
+		# 	If a Source, the source will be scanned and parsed for an Element,
+		# 	and all child elements will be recursively parsed as well.
+		# 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
+
+		# 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
+			Element.new self
+		end
+
+		# Evaluates to the root element 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.
+		#  d = Document.new '<a><b><c/></b></a>'
+		#  a = d[1] ; c = a[1][1]
+		#  d.root        # These all evaluate to the same Element,
+		#  a.root        # namely, <a>
+		#  c.root        #
+		def root
+			parent.nil? ? self : 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
+			root.parent if root
+		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 |= 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=nil, attrs=nil
+			el = @elements.add(element)
+			if attrs.kind_of? Hash
+				attrs.each do |key, value|
+					el.attributes[key]=value if key =~ /^xmlns:/
+				end
+				attrs.each do |key, value|
+					el.attributes[key]=value if key !~ /^xmlns:/
+				end
+			end
+			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 = 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 )
+			text = Text.new( text, whitespace(), nil, raw() ) if text.kind_of? String
+			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
-      prefix = nil if prefix == 'xmlns'
-      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
-
-    # Iterates 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
-
-    # Iterates 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
+		#################################################
+		# Attributes                                    #
+		#################################################
+
+		def attribute( name, namespace=nil )
+			prefix = ''
+			if namespace
+				prefix = attributes.prefixes.each { |prefix|
+					return "#{prefix}:" if namespace( prefix ) == namespace
+				} || ''
+			end
+			attributes.get_attribute( "#{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.
+		# 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
+
+		# 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::
+		#   What the heck does this do? Defaults to false
+		# 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)
+			#print "ID:#{indent}"
+			writer << "<#@expanded_name"
+
+			@attributes.each_attribute do |attr|
+				writer << " "
+				attr.write( writer, indent )
+			end unless @attributes.empty?
+
+			if @children.empty?
+				writer << " " if ie_hack
+				writer << "/" 
+			else
+				if transitive and indent>-1 and !@children[0].kind_of? Text
+					writer << "\n"
+					indent writer, indent+2
+				end
+				writer << ">"
+				write_children( writer, indent, transitive, ie_hack )
+				writer << "</#{expanded_name}"
+			end
+			if transitive and indent>-1
+				writer << "\n"
+				indent -= 2 if next_sibling.nil?
+				indent(writer, indent)
+			end
+			writer << ">"
+		end
+
+
+		private
+		# 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
+
+		# A private helper method
+		def write_children( writer, indent, transitive, ie_hack )
+			cr = (indent < 0) ? '' : "\n"
+			#if size == 1 and @children[0].kind_of?(Text)
+			#	self[0].write( writer, -1 )
+			if indent == -1
+				each { |child| child.write( writer, indent, transitive, ie_hack ) }
+			else
+				next_indent = indent+2
+				last_child=nil
+				each { |child|
+					unless child.kind_of? Text or last_child.kind_of? Text or transitive
+						writer << cr
+						indent(writer, next_indent)
+					end
+					child.write( writer, next_indent, transitive, ie_hack )
+					last_child = child
+				}
+				unless last_child.kind_of? Text or transitive
+					writer << cr
+					indent( writer, indent )
+				end
+			end
+		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
+
+		# 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.
+		# 
+		#  doc = Document.new "<a foo:att='1' bar:att='2' att='3'/>"
+		#  doc.root.attributes['att']         #-> '3'
+		#  doc.root.attributes['bar:att']     #-> '2'
+		def [](name)
+			attr = get_attribute(name)
+			return attr.value unless attr.nil?
+			return nil
+		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
+				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
+			value = Attribute.new(name, value) unless value.kind_of? Attribute
+			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.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.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
+	end
 end
diff --git a/lib/rexml/encoding.rb b/lib/rexml/encoding.rb
index a01763be99..92ae1e8c21 100644
--- a/lib/rexml/encoding.rb
+++ b/lib/rexml/encoding.rb
@@ -1,71 +1,56 @@
-# -*- 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
+	module Encoding
+		@@uconv_available = false
 
-    # 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'
+		# 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
+		# ID ---> Encoding name
+		attr_reader :encoding
+		def encoding=( enc )
+			old_verbosity = $VERBOSE
+			begin
+				$VERBOSE = false
+				return if defined? @encoding and enc == @encoding
+				if enc and enc != UTF_8
+					@encoding = enc.upcase
+					begin
+            load 'rexml/encodings/ICONV.rb'
+						instance_eval @@__REXML_encoding_methods
+						Iconv::iconv( UTF_8, @encoding, "" )
+					rescue LoadError, Exception => err
+						raise "Bad encoding name #@encoding" unless @encoding =~ /^[\w-]+$/
+						@encoding.untaint 
+						enc_file = File.join( "rexml", "encodings", "#@encoding.rb" )
+						begin
+              load enc_file
+							instance_eval @@__REXML_encoding_methods
+						rescue LoadError
+              puts $!.message
+							raise Exception.new( "No decoder found for encoding #@encoding.  Please install iconv." )
+						end
+					end
+				else
+					enc = UTF_8
+					@encoding = enc.upcase
+          load 'rexml/encodings/UTF-8.rb' 
+					instance_eval @@__REXML_encoding_methods
+				end
+			ensure
+				$VERBOSE = old_verbosity
+			end
+		end
 
-    def check_encoding str
-      # We have to recognize UTF-16, LSB UTF-16, and UTF-8
-      if str[0] == 0xfe && str[1] == 0xff
-        str[0,2] = ""
-        return UTF_16
-      elsif str[0] == 0xff && str[1] == 0xfe
-        str[0,2] = ""
-        return UNILE
-      end
-      str =~ /^\s*<\?xml\s+version\s*=\s*(['"]).*?\1\s+encoding\s*=\s*(["'])(.*?)\2/um
-      return $3.upcase if $3
-      return UTF_8
-    end
-  end
+		def check_encoding str
+			# We have to recognize UTF-16, LSB UTF-16, and UTF-8
+			return UTF_16 if str[0] == 254 && str[1] == 255
+			return UNILE if str[0] == 255 && str[1] == 254
+			str =~ /^\s*<?xml\s*version=(['"]).*?\2\s*encoding=(["'])(.*?)\2/um
+			return $1.upcase if $1
+			return UTF_8
+		end
+	end
 end
diff --git a/lib/rexml/encodings/CP-1252.rb b/lib/rexml/encodings/CP-1252.rb
deleted file mode 100644
index 8675f9ff98..0000000000
--- a/lib/rexml/encodings/CP-1252.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# 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/lib/rexml/encodings/EUC-JP.rb b/lib/rexml/encodings/EUC-JP.rb
index db37b6bf0d..a1314d0856 100644
--- a/lib/rexml/encodings/EUC-JP.rb
+++ b/lib/rexml/encodings/EUC-JP.rb
@@ -1,35 +1,37 @@
-module REXML
-  module Encoding
-    begin
-      require 'uconv'
+begin
+  require 'iconv'
 
-      def decode_eucjp(str)
-        Uconv::euctou8(str)
+  module REXML
+    module Encoding
+      @@__REXML_encoding_methods =<<-EOL
+      def decode(str)
+        return Iconv::iconv("utf-8", "euc-jp", str)[0]
       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)
+      def encode content
+        return Iconv::iconv("euc-jp", "utf-8", content)[0]
       end
+      EOL
     end
+  end
+rescue LoadError
+  begin
+    require 'uconv'
+
+    module REXML
+      module Encoding
+        @@__REXML_encoding_methods =<<-EOL
+        def decode(str)
+          return Uconv::euctou8(str)
+        end
 
-    register("EUC-JP") do |obj|
-      class << obj
-        alias decode decode_eucjp
-        alias encode encode_eucjp
+        def encode content
+          return Uconv::u8toeuc(content)
+        end
+        EOL
       end
     end
+  rescue LoadError
+		raise "uconv or iconv is required for Japanese encoding support."
   end
 end
diff --git a/lib/rexml/encodings/ICONV.rb b/lib/rexml/encodings/ICONV.rb
index 172fba7cd1..384758d7b2 100644
--- a/lib/rexml/encodings/ICONV.rb
+++ b/lib/rexml/encodings/ICONV.rb
@@ -3,20 +3,14 @@ raise LoadError unless defined? Iconv
 
 module REXML
   module Encoding
-    def decode_iconv(str)
-      Iconv.conv(UTF_8, @encoding, str)
+    @@__REXML_encoding_methods =<<-EOL
+    def decode( str )
+      return Iconv::iconv("utf-8", @encoding, str)[0]
     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
+    def encode( content )
+      return Iconv::iconv(@encoding, "utf-8", content)[0]
     end
+    EOL
   end
 end
diff --git a/lib/rexml/encodings/ISO-8859-1.rb b/lib/rexml/encodings/ISO-8859-1.rb
index 2873d13bf0..5beefbd408 100644
--- a/lib/rexml/encodings/ISO-8859-1.rb
+++ b/lib/rexml/encodings/ISO-8859-1.rb
@@ -1,7 +1,25 @@
-require 'rexml/encodings/US-ASCII'
-
 module REXML
   module Encoding
-    register("ISO-8859-1", &encoding_method("US-ASCII"))
+    @@__REXML_encoding_methods =<<-EOL
+    # Convert from UTF-8
+    def encode content
+      array_utf8 = content.unpack('U*')
+      array_enc = []
+      array_utf8.each do |num|
+        if num <= 0xFF
+          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(str)
+      str.unpack('C*').pack('U*')
+    end
+    EOL
   end
 end
diff --git a/lib/rexml/encodings/ISO-8859-15.rb b/lib/rexml/encodings/ISO-8859-15.rb
deleted file mode 100644
index 8dea0d38a4..0000000000
--- a/lib/rexml/encodings/ISO-8859-15.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# 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/lib/rexml/encodings/SHIFT-JIS.rb b/lib/rexml/encodings/SHIFT-JIS.rb
index 9e0f4af20e..e7dc6339ae 100644
--- a/lib/rexml/encodings/SHIFT-JIS.rb
+++ b/lib/rexml/encodings/SHIFT-JIS.rb
@@ -1,37 +1,37 @@
-module REXML
-  module Encoding
-    begin
-      require 'uconv'
+begin
+  require 'iconv'
 
-      def decode_sjis content
-        Uconv::sjistou8(content)
+  module REXML
+    module Encoding
+      @@__REXML_encoding_methods =<<-EOL
+      def decode(str)
+        return Iconv::iconv("utf-8", "shift-jis", str)[0]
       end
 
-      def encode_sjis(str)
-        Uconv::u8tosjis(str)
-      end
-    rescue LoadError
-      require 'nkf'
-
-      SJISTOU8 = '-Swm0x'
-      U8TOSJIS = '-Wsm0x'
-
-      def decode_sjis(str)
-        NKF.nkf(SJISTOU8, str)
-      end
-
-      def encode_sjis content
-        NKF.nkf(U8TOSJIS, content)
+      def encode content
+        return Iconv::iconv("shift-jis", "utf-8", content)[0]
       end
+      EOL
     end
+  end
+rescue LoadError
+  begin 
+    require 'uconv'
+
+    module REXML
+      module Encoding
+        @@__REXML_encoding_methods =<<-EOL
+        def to_shift_jis content
+          Uconv::u8tosjis(content)
+        end
 
-    b = proc do |obj|
-      class << obj
-        alias decode decode_sjis
-        alias encode encode_sjis
+        def from_shift_jis(str)
+          Uconv::sjistou8(str)
+        end
+        EOL
       end
     end
-    register("SHIFT-JIS", &b)
-    register("SHIFT_JIS", &b)
+  rescue LoadError
+    raise "uconv or iconv is required for Japanese encoding support."
   end
 end
diff --git a/lib/rexml/encodings/SHIFT_JIS.rb b/lib/rexml/encodings/SHIFT_JIS.rb
index e355704a7c..27e4569403 100644
--- a/lib/rexml/encodings/SHIFT_JIS.rb
+++ b/lib/rexml/encodings/SHIFT_JIS.rb
@@ -1 +1,33 @@
-require 'rexml/encodings/SHIFT-JIS'
+begin
+	require 'uconv'
+
+	module REXML
+		module Encoding
+			def to_shift_jis content
+				Uconv::u8tosjis(content)
+			end
+
+			def from_shift_jis(str)
+				Uconv::sjistou8(str)
+			end
+		end
+	end
+rescue LoadError
+  begin
+	require 'iconv'
+	module REXML
+		module Encoding
+			def from_shift_jis(str)
+				return Iconv::iconv("utf-8", "shift_jis", str).join('')
+			end
+
+			def to_shift_jis content
+				return Iconv::iconv("shift_jis", "utf-8", content).join('')
+			end
+		end
+	end
+  rescue LoadError
+	raise "uconv or iconv is required for Japanese encoding support."
+  end
+
+end
diff --git a/lib/rexml/encodings/UNILE.rb b/lib/rexml/encodings/UNILE.rb
index d054140c40..95141093b5 100644
--- a/lib/rexml/encodings/UNILE.rb
+++ b/lib/rexml/encodings/UNILE.rb
@@ -1,6 +1,7 @@
 module REXML
   module Encoding
-    def encode_unile content
+    @@__REXML_encoding_methods =<<-EOL
+    def encode content
       array_utf8 = content.unpack("U*")
       array_enc = []
       array_utf8.each do |num|
@@ -15,20 +16,14 @@ module REXML
       array_enc.pack('C*')
     end
 
-    def decode_unile(str)
+    def decode(str)
       array_enc=str.unpack('C*')
       array_utf8 = []
-      0.step(array_enc.size-1, 2){|i| 
+      2.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
+    EOL
   end
 end
diff --git a/lib/rexml/encodings/US-ASCII.rb b/lib/rexml/encodings/US-ASCII.rb
index fb4c217074..32ddfbc909 100644
--- a/lib/rexml/encodings/US-ASCII.rb
+++ b/lib/rexml/encodings/US-ASCII.rb
@@ -1,11 +1,12 @@
 module REXML
   module Encoding
+    @@__REXML_encoding_methods =<<-'EOL'
     # Convert from UTF-8
-    def encode_ascii content
+    def encode content
       array_utf8 = content.unpack('U*')
       array_enc = []
       array_utf8.each do |num|
-        if num <= 0x7F
+        if num <= 0xFF
           array_enc << num
         else
           # Numeric entity (&#nnnn;); shard by  Stefan Scholl
@@ -16,15 +17,9 @@ module REXML
     end
 
     # Convert to UTF-8
-    def decode_ascii(str)
+    def decode(str)
       str.unpack('C*').pack('U*')
     end
-
-    register("US-ASCII") do |obj|
-      class << obj
-        alias decode decode_ascii
-        alias encode encode_ascii
-      end
-    end
+    EOL
   end
 end
diff --git a/lib/rexml/encodings/UTF-16.rb b/lib/rexml/encodings/UTF-16.rb
index 007c493d9c..bd92fce18d 100644
--- a/lib/rexml/encodings/UTF-16.rb
+++ b/lib/rexml/encodings/UTF-16.rb
@@ -1,6 +1,7 @@
 module REXML
   module Encoding
-    def encode_utf16 content
+    @@__REXML_encoding_methods =<<-EOL
+    def encode content
       array_utf8 = content.unpack("U*")
       array_enc = []
       array_utf8.each do |num|
@@ -15,21 +16,14 @@ module REXML
       array_enc.pack('C*')
     end
 
-    def decode_utf16(str)
-      str = str[2..-1] if /^\376\377/n =~ str
+    def decode(str)
       array_enc=str.unpack('C*')
       array_utf8 = []
-      0.step(array_enc.size-1, 2){|i| 
+      2.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
+    EOL
   end
 end
diff --git a/lib/rexml/encodings/UTF-8.rb b/lib/rexml/encodings/UTF-8.rb
index bb08f44100..33a7e490c4 100644
--- a/lib/rexml/encodings/UTF-8.rb
+++ b/lib/rexml/encodings/UTF-8.rb
@@ -1,18 +1,13 @@
 module REXML
   module Encoding
-    def encode_utf8 content
+    @@__REXML_encoding_methods =<<-EOL
+    def encode content
       content
     end
 
-    def decode_utf8(str)
+    def decode(str)
       str
     end
-
-    register(UTF_8) do |obj|
-      class << obj
-        alias decode decode_utf8
-        alias encode encode_utf8
-      end
-    end
+    EOL
   end
 end
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb
index ff2d45f39b..4b88a3c553 100644
--- a/lib/rexml/entity.rb
+++ b/lib/rexml/entity.rb
@@ -89,12 +89,6 @@ module REXML
 
 		# 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
diff --git a/lib/rexml/formatters/default.rb b/lib/rexml/formatters/default.rb
deleted file mode 100644
index 77381bdf84..0000000000
--- a/lib/rexml/formatters/default.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-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/lib/rexml/formatters/pretty.rb b/lib/rexml/formatters/pretty.rb
deleted file mode 100644
index d21175d34a..0000000000
--- a/lib/rexml/formatters/pretty.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-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)
-        # Recursively 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/lib/rexml/formatters/transitive.rb b/lib/rexml/formatters/transitive.rb
deleted file mode 100644
index 1d80f21fbb..0000000000
--- a/lib/rexml/formatters/transitive.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-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/lib/rexml/functions.rb b/lib/rexml/functions.rb
index fefc9ef940..d64ba7e378 100644
--- a/lib/rexml/functions.rb
+++ b/lib/rexml/functions.rb
@@ -1,382 +1,366 @@
 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
+	# 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
+		@@node = nil
+    @@index = nil
+    @@size = nil
+		@@variables = {}
+		@@namespace_context = {}
+
+		def Functions::node=(value); @@node = value; end
+		def Functions::index=(value); @@index = value; end
+		def Functions::size=(value); @@size = value; end
+		def Functions::variables=(value); @@variables = value; end
+		def Functions::namespace_context=(value)
+			@@namespace_context = value
+		end
+		def Functions::node; @@node; end
+		def Functions::index; @@index; end
+		def Functions::size; @@size; end
+		def Functions::variables; @@variables; end
+		def Functions::namespace_context; @@namespace_context; end
+
+		def Functions::text( )
+			if @@node.node_type == :element
+				return @@node.text
+			elsif @@node.node_type == :text
+				return @@node.value
+			else
+				return false
+			end
+		end
+
+		def Functions::last( )
+			@@size
+		end
+
+		def Functions::position( )
+			@@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 @@node if defined? @@node.namespace
+			else	
+				if node_set.namespace
+					yield node_set
+				else
+					return unless node_set.kind_of? Enumerable
+					node_set.each { |node| yield node if defined? node.namespace }
+				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.text
+				else
+					object.to_s
+				end
+			else
+				object.to_s
+			end
+		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 character 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
+		# Kouhei fixed this too
+		def Functions::substring_after( string, test )
+			ruby_string = string(string)
+			ruby_index = ruby_string.index(string(test))
+			if ruby_index.nil?
+				""
+			else
+				ruby_string[ ruby_index+1..-1 ]
+			end
+		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(@@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 = @@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 = @@node unless object
+			if object == true
+				Float(1)
+			elsif object == false
+				Float(0)
+			elsif object.kind_of? Array
+				string( object ).to_f
+			elsif object.kind_of? Float
+				object
+			else
+				object.to_s.to_f
+			end
+		end
+
+		def Functions::sum( nodes )
+		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::method_missing( id )
+			puts "METHOD MISSING #{id.id2name}"
+			XPath.match( @@node, id.id2name )
+		end
+	end
 end
diff --git a/lib/rexml/instruction.rb b/lib/rexml/instruction.rb
index c16b894b4a..0b770d4b3d 100644
--- a/lib/rexml/instruction.rb
+++ b/lib/rexml/instruction.rb
@@ -38,11 +38,7 @@ module REXML
 			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
@@ -62,9 +58,5 @@ module REXML
     def node_type
       :processing_instruction
     end
-
-    def inspect
-      "<?p-i #{target} ...?>"
-    end
 	end
 end
diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb
index d5e8456e53..41d9eee43b 100644
--- a/lib/rexml/node.rb
+++ b/lib/rexml/node.rb
@@ -1,6 +1,4 @@
 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
@@ -20,56 +18,18 @@ module REXML
 			@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 = "" )
-      else
-        f = REXML::Formatters::Default.new
-        f.write( self, rv = "" )
-      end
-      return rv
+		def to_s indent=-1
+			rv = ""
+			write rv,indent
+			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
+			to << " "*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/lib/rexml/parent.rb b/lib/rexml/parent.rb
index a20aaaef6b..5c1ed97324 100644
--- a/lib/rexml/parent.rb
+++ b/lib/rexml/parent.rb
@@ -1,166 +1,165 @@
 require "rexml/child"
 
 module REXML
-  # A parent has children, and has methods for accessing them.  The Parent
+	# 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
+	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 )
+			return unless @children.include? object
+			@children.delete object
+			object.parent = nil
+		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
+
+		# 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 )
+			ind = @children.index( to_replace )
+			to_replace.parent = nil
+			@children[ind,0] = replacement
+			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/lib/rexml/parseexception.rb b/lib/rexml/parseexception.rb
index feb7a7e638..66a4214548 100644
--- a/lib/rexml/parseexception.rb
+++ b/lib/rexml/parseexception.rb
@@ -1,51 +1,49 @@
 module REXML
-  class ParseException < RuntimeError
-    attr_accessor :source, :parser, :continued_exception
+	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 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
+		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
+			# 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
+			# 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 position
+			@source.current_line[0] if @source and @source.current_line
+		end
 
-    def line
-      @source.current_line[2] if @source and defined? @source.current_line and 
-      @source.current_line
-    end
+		def line
+			@source.current_line[2] if @source and @source.current_line
+		end
 
-    def context
-      @source.current_line
-    end
-  end  
+		def context
+			@source.current_line
+		end
+	end	
 end
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index fc2354a67f..057617d6e8 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -1,503 +1,408 @@
 require 'rexml/parseexception'
-require 'rexml/undefinednamespaceexception'
 require 'rexml/source'
-require 'set'
 
 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})"
-      UNAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
+	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}/
+			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*(["'])(.*?)\4/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+#{UNAME_STR}\s*=\s*(["']).*?\5)*)\s*(\/)?>/um
-      CLOSE_MATCH = /^\s*<\/(#{NAME_STR})\s*>/um
+			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
+			VERSION = /\bversion\s*=\s*["'](.*?)['"]/um
+			ENCODING = /\bencoding=["'](.*?)['"]/um
+			STANDALONE = /\bstandalone=["'](.*?)['"]/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
+			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+((["']).*?\4)\s*>/um
+			SYSTEM = /^\s*<!NOTATION\s+(\w[\-\w]*)\s+(SYSTEM)\s+((["']).*?\4)\s*>/um
 
-      TEXT_PATTERN = /\A([^<]*)/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
+			# 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};)/
+			EREFERENCE = /&(?!#{NAME};)/
 
-      DEFAULT_ENTITIES = { 
-        'gt' => [/&gt;/, '&gt;', '>', />/], 
-        'lt' => [/&lt;/, '&lt;', '<', /</], 
-        'quot' => [/&quot;/, '&quot;', '"', /"/], 
-        "apos" => [/&apos;/, "&apos;", "'", /'/] 
-      }
+			DEFAULT_ENTITIES = { 
+				'gt' => [/&gt;/, '&gt;', '>', />/], 
+				'lt' => [/&lt;/, '&lt;', '<', /</], 
+				'quot' => [/&quot;/, '&quot;', '"', /"/], 
+				"apos" => [/&apos;/, "&apos;", "'", /'/] 
+			}
 
+			def initialize( source )
+				self.stream = source
+			end
 
-      ######################################################################
-      # 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 stream=( source )
+				if source.kind_of? String
+					@source = Source.new(source)
+				elsif source.kind_of? IO
+					@source = IOSource.new(source)
+				elsif source.kind_of? Source
+					@source = source
+				elsif defined? StringIO and source.kind_of? StringIO
+					@source = IOSource.new(source)
+				else
+					raise "#{source.class} is not a valid input stream.  It must be \n"+
+					"either a String, IO, StringIO or Source."
+				end
+				@closed = nil
+				@document_status = nil
+				@tags = []
+				@stack = []
+				@entities = []
+			end
 
-      def initialize( source )
-        self.stream = source
-      end
+			# Returns true if there are no more events
+			def empty?
+				!has_next?
+			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
+			# Returns true if there are more events.  Synonymous with !empty?
+			def has_next?
+				return true if @closed
+				@source.read if @source.buffer.size==0 and !@source.empty?
+				(!@source.empty? and @source.buffer.strip.size>0) or @stack.size>0 or @closed
+			end
 
-      attr_reader :source
+			# Push an event back on the head of the stream.  This method
+			# has (theoretically) infinite depth.
+			def unshift token
+				@stack.unshift(token)
+			end
 
-      def stream=( source )
-        @source = SourceFactory.create_from( source )
-        @closed = nil
-        @document_status = nil
-        @tags = []
-        @stack = []
-        @entities = []
-        @nsstack = []
-      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
 
-      def position
-        if @source.respond_to? :position
-          @source.position
-        else
-          # FIXME
-          0
-        end
-      end
+			# Returns the next event.  This is a +PullEvent+ object.
+			def pull
+				return [ :end_document ] if empty?
+				if @closed
+					x, @closed = @closed, nil
+					return [ :end_element, x ]
+				end
+				return @stack.shift if @stack.size > 0
+				@source.read if @source.buffer.size==0
+				if @document_status == nil
+					@source.consume( /^\s*/um )
+					word = @source.match( /(<[^>]*)>/um )
+					word = word[1] unless word.nil?
+					case word
+					when COMMENT_START
+						return [ :comment, @source.match( COMMENT_PATTERN, true )[1] ]
+					when XMLDECL_START
+						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("DOCTYPE is missing a name") if name.nil?
+						pub_sys = $2.nil? ? nil : $2.strip
+						long_name = $3.nil? ? nil : $3.strip
+						uri = $4.nil? ? nil : $4.strip
+						args = [ :start_doctype, name, pub_sys, long_name, uri ]
+						if close == ">"
+							@document_status = :after_doctype
+							@source.read if @source.buffer.size==0
+							md = @source.match(/^\s*/um, true)
+							@stack << [ :end_doctype ]
+						else
+							@document_status = :in_doctype
+						end
+						return args
+					else
+						@document_status = :after_doctype
+						@source.read if @source.buffer.size==0
+						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 ]
 
-      # Returns true if there are no more events
-      def empty?
-        return (@source.empty? and @stack.empty?)
-      end
+					when ELEMENTDECL_START
+						return [ :elementdecl, @source.match( ELEMENTDECL_PATTERN, true )[1] ]
 
-      # Returns true if there are more events.  Synonymous with !empty?
-      def has_next?
-        return !(@source.empty? and @stack.empty?)
-      end
+					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]
 
-      # Push an event back on the head of the stream.  This method
-      # has (theoretically) infinite depth.
-      def unshift token
-        @stack.unshift(token)
-      end
+						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 )
+						elsif @source.match( SYSTEM )
+							md = @source.match( SYSTEM, true )
+						else
+							raise REXML::ParseException.new( "error parsing notation: no matching pattern", @source )
+						end
+						return [ :notationdecl, md[1], md[2], md[3] ]
+					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)
+							#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)
+							raise REXML::ParseException.new("malformed XML: missing tag start", @source) unless md
+							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 )
+						#md = @source.match_to_consume( '<', TEXT_PATTERN )
+						#@source.read
+						raise REXML::ParseException("no text to add") 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
 
-      # 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
+			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
 
-      # 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
-        #STDERR.puts @source.encoding
-        @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 )
-            @nsstack.unshift(curr_ns=Set.new)
-            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 ]
+			# 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
 
-          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
-                if attdef[0] =~ /^xmlns:(.*)/
-                  @nsstack[0] << $1
-                end
-              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] == ?/
-              @nsstack.shift
-              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
-              attributes = {}
-              prefixes = Set.new
-              prefixes << md[2] if md[2]
-              @nsstack.unshift(curr_ns=Set.new)
-              if md[4].size > 0
-                attrs = md[4].scan( ATTRIBUTE_PATTERN )
-                raise REXML::ParseException.new( "error parsing attributes: [#{attrs.join ', '}], excess = \"#$'\"", @source) if $' and $'.strip.size > 0
-                attrs.each { |a,b,c,d,e| 
-                  if b == "xmlns"
-                    if c == "xml"
-                      if d != "http://www.w3.org/XML/1998/namespace"
-                        msg = "The 'xml' prefix must not be bound to any other namespace "+
-                        "(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
-                        raise REXML::ParseException.new( msg, @source, self )
-                      end
-                    elsif c == "xmlns"
-                      msg = "The 'xmlns' prefix must not be declared "+
-                      "(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
-                      raise REXML::ParseException.new( msg, @source, self)
-                    end
-                    curr_ns << c
-                  elsif b
-                    prefixes << b unless b == "xml"
-                  end
-                  attributes[a] = e 
-                }
-              end
-        
-              # Verify that all of the prefixes have been defined
-              for prefix in prefixes
-                unless @nsstack.find{|k| k.member?(prefix)}
-                  raise UndefinedNamespaceException.new(prefix,@source,self)
-                end
-              end
-
-              if md[6]
-                @closed = md[1]
-                @nsstack.shift
-              else
-                @tags.push( md[1] )
-              end
-              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::UndefinedNamespaceException
-          raise
-        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
+			# 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/lib/rexml/parsers/lightparser.rb b/lib/rexml/parsers/lightparser.rb
index 0f35034993..8c555f7960 100644
--- a/lib/rexml/parsers/lightparser.rb
+++ b/lib/rexml/parsers/lightparser.rb
@@ -10,10 +10,6 @@ module REXML
 				@parser = REXML::Parsers::BaseParser.new( stream )
 			end
 
-      def add_listener( listener )
-        @parser.add_listener( listener )
-      end
-
       def rewind
         @stream.rewind
         @parser.stream = @stream
diff --git a/lib/rexml/parsers/pullparser.rb b/lib/rexml/parsers/pullparser.rb
index 36dc7160c3..aeda6251fe 100644
--- a/lib/rexml/parsers/pullparser.rb
+++ b/lib/rexml/parsers/pullparser.rb
@@ -1,196 +1,143 @@
-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
+	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 < BaseParser
+			include XMLTokens
+
+			def initialize stream
+				super
+				@entities = {}
+			end
+
+			def each
+				while has_next?
+					yield self.pull
+				end
+			end
+
+			def peek depth=0
+				PullEvent.new(super)
+			end
+
+			def pull
+				event = super
+				case event[0]
+				when :entitydecl
+					@entities[ event[1] ] = 
+						event[2] unless event[2] =~ /PUBLIC|SYSTEM/
+				when :text
+					unnormalized = unnormalize( event[1], @entities )
+					event << unnormalized
+				end
+				PullEvent.new( event )
+			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 []( index )
+				@contents[index+1]
+			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/lib/rexml/parsers/sax2parser.rb b/lib/rexml/parsers/sax2parser.rb
index e402eb7747..aab87caae4 100644
--- a/lib/rexml/parsers/sax2parser.rb
+++ b/lib/rexml/parsers/sax2parser.rb
@@ -1,11 +1,9 @@
 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)
@@ -14,17 +12,8 @@ module REXML
 				@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
@@ -42,10 +31,6 @@ module REXML
 			# :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.
@@ -60,7 +45,7 @@ module REXML
 					if args.size == 2
 						args[1].each { |match| @procs << [args[0], match, blok] }
 					else
-						add( [args[0], nil, blok] )
+						add( [args[0], /.*/, blok] )
 					end
 				elsif args[0].kind_of? Array
 					if args.size == 2
@@ -69,7 +54,7 @@ module REXML
 						args[0].each { |match| add( [ :start_element, match, blok ] ) }
 					end
 				else
-					add([nil, nil, args[0]])
+					add([nil, /.*/, args[0]])
 				end
 			end
 			
@@ -94,8 +79,6 @@ module REXML
 					when :end_document
 						handle( :end_document )
 						break
-          when :start_doctype
-            handle( :doctype, *event[1..-1])
 					when :end_doctype
 						context = context[1]
 					when :start_element
@@ -106,7 +89,6 @@ module REXML
 						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({})
@@ -156,24 +138,12 @@ module REXML
 							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
+						normalized = @parser.normalize( event[1] )
+						handle( :characters, normalized )
+					when :processing_instruction, :comment, :doctype, :attlistdecl, 
+						:elementdecl, :entitydecl, :cdata, :notationdecl, :xmldecl
 						handle( *event )
 					end
-          handle( :progress, @parser.position )
 				end
 			end
 
@@ -194,10 +164,9 @@ module REXML
 			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.nil? or (
 							(name == match) or
 							(match.kind_of? Regexp and name =~ match)
 							)
@@ -210,7 +179,7 @@ module REXML
 				@listeners.find_all do |sym, match, block|
 					(
 						(sym.nil? or symbol == sym) and 
-						((name.nil? and match.nil?) or match.nil? or (
+						(name.nil? or (
 							(name == match) or
 							(match.kind_of? Regexp and name =~ match)
 							)
diff --git a/lib/rexml/parsers/streamparser.rb b/lib/rexml/parsers/streamparser.rb
index 256d0f611c..51441289d9 100644
--- a/lib/rexml/parsers/streamparser.rb
+++ b/lib/rexml/parsers/streamparser.rb
@@ -1,46 +1,33 @@
 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
+	module Parsers
+		class StreamParser
+			def initialize source, listener
+				@listener = listener
+				@parser = BaseParser.new( source )
+			end
+
+			def parse
+				# entity string
+				while true
+					event = @parser.pull
+					case event[0]
+					when :end_document
+						return
+					when :start_element
+						@listener.tag_start( event[1], event[2] )
+					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 :comment, :doctype, :attlistdecl, 
+						:elementdecl, :entitydecl, :cdata, :notationdecl, :xmldecl
+						@listener.send( event[0].to_s, *event[1..-1] )
+					end
+				end
+			end
+		end
+	end
 end
diff --git a/lib/rexml/parsers/treeparser.rb b/lib/rexml/parsers/treeparser.rb
deleted file mode 100644
index 5c3e142ea7..0000000000
--- a/lib/rexml/parsers/treeparser.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require 'rexml/validation/validationexception'
-require 'rexml/undefinednamespaceexception'
-
-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])
-              el = @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 REXML::UndefinedNamespaceException
-          raise
-        rescue
-          raise ParseException.new( $!.message, @parser.source, @parser, $! )
-        end
-      end
-    end
-  end
-end
diff --git a/lib/rexml/parsers/ultralightparser.rb b/lib/rexml/parsers/ultralightparser.rb
index adc4af18e2..f3b208bf0f 100644
--- a/lib/rexml/parsers/ultralightparser.rb
+++ b/lib/rexml/parsers/ultralightparser.rb
@@ -9,10 +9,6 @@ module REXML
 				@parser = REXML::Parsers::BaseParser.new( stream )
 			end
 
-      def add_listener( listener )
-        @parser.add_listener( listener )
-      end
-
       def rewind
         @stream.rewind
         @parser.stream = @stream
diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb
index de2530e347..082f8255ad 100644
--- a/lib/rexml/parsers/xpathparser.rb
+++ b/lib/rexml/parsers/xpathparser.rb
@@ -20,7 +20,7 @@ module REXML
         path.gsub!(/([\(\[])\s+/, '\1') # Strip ignorable spaces
         path.gsub!( /\s+([\]\)])/, '\1' )
         parsed = []
-        path = OrExpr(path, parsed)
+        path = LocationPath(path, parsed)
         parsed
       end
 
@@ -30,126 +30,46 @@ module REXML
         parsed
       end
 
-      def abbreviate( path )
-        path = path.kind_of?(String) ? parse( path ) : path
+      def to_string( 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
+          case path[0]
+          when :ancestor, :ancestor_or_self, :attribute, :child, :descendant, :descendant_or_self, :following, :following_sibling, :namespace, :parent, :preceding, :preceding_sibling, :self
+            op = path.shift
             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 << op.to_s
             string << "::"
           when :any
+            path.shift
             string << "*"
           when :qname
+            path.shift
             prefix = path.shift
             name = path.shift
             string << prefix+":" if prefix.size > 0
             string << name
           when :predicate
+            path.shift
             string << '['
-            string << predicate_to_string( path.shift ) { |x| expand(x) }
-            string << ']'
-          when :document
-            document = true
+            string << predicate_to_string( path.shift )
+            string << ' ]'
           else
             string << "/" unless string.size == 0
             string << "UNKNOWN("
-            string << op.inspect
+            string << path.shift.inspect
             string << ")"
           end
         end
-        string = "/"+string if document
         return string
       end
 
-      def predicate_to_string( path, &block )
+      def predicate_to_string( path )
         string = ""
         case path[0]
-        when :and, :or, :mult, :plus, :minus, :neq, :eq, :lt, :gt, :lteq, :gteq, :div, :mod, :union
+        when :and, :or, :mult, :plus, :minus, :neq, :eq, :lt, :gt, :lteq, :gteq, :div, :mod, :neq, :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 )
+          left = predicate_to_string( path.shift )
+          right = predicate_to_string( path.shift )
           string << " "
           string << left
           string << " "
@@ -162,7 +82,7 @@ module REXML
           name = path.shift
           string << name
           string << "( "
-          string << predicate_to_string( path.shift, &block )
+          string << predicate_to_string( path.shift )
           string << " )"
         when :literal
           path.shift
@@ -171,7 +91,7 @@ module REXML
           string << " "
         else
           string << " "
-          string << yield( path )
+          string << to_string( path )
           string << " "
         end
         return string.squeeze(" ")
@@ -302,7 +222,7 @@ module REXML
             path = path[1..-1]
           end
           parsed << :processing_instruction
-          parsed << (literal || '')
+          parsed << literal
         when NCNAMETEST
           #puts "NCNAMETEST"
           prefix = $1
@@ -551,7 +471,7 @@ module REXML
           end
         end
         #puts "BEFORE WITH '#{rest}'"
-        rest = LocationPath(rest, n) if rest =~ /\A[\/\.\@\[\w_*]/
+        rest = LocationPath(rest, n) if rest =~ /^[\/\.\@\[\w_*]/
         parsed.concat(n)
         return rest
       end
@@ -589,20 +509,13 @@ module REXML
         when /^(\w[-\w]*)(?:\()/
           #puts "PrimaryExpr :: Function >>> #$1 -- '#$''"
           fname = $1
-          tmp = $'
+          path = $'
           #puts "#{fname} =~ #{NT.inspect}"
-          return path if fname =~ NT
-          path = tmp
+          #return nil if fname =~ NT
           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
+        when LITERAL, NUMBER
           #puts "LITERAL or NUMBER: #$1"
           varname = $1.nil? ? $2 : $1
           path = $'
@@ -621,6 +534,7 @@ module REXML
       #| FUNCTION_NAME '(' ( expr ( ',' expr )* )? ')'
       def FunctionCall rest, parsed
         path, arguments = parse_args(rest)
+        #puts "Function call >>> (#{arguments.inspect})" 
         argset = []
         for argument in arguments
           args = []
@@ -653,39 +567,28 @@ module REXML
       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
+          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 = 0
             end
           end
           ind += 1
diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb
index 8af1697e51..b632188571 100644
--- a/lib/rexml/rexml.rb
+++ b/lib/rexml/rexml.rb
@@ -1,32 +1,26 @@
-# -*- encoding: utf-8 -*-
-# 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.2
-# Date:: 2007/275
-# Revision:: $Revision$
+# REXML is an XML parser for Ruby, in Ruby.
 # 
-# This API documentation can be downloaded from the REXML home page, or can
-# be accessed online[http://www.germane-software.com/software/rexml_doc]
+# URL: http://www.germane-software.com/software/rexml
+# Author: Sean Russell <ser@germane-software.com>
+# Version: @ANT_VERSION@
+# Date: @ANT_DATE@
+
+
+
+# 
+# Short Description:
+# Why did I write REXML?   At the time of this writing, there were already
+# two XML parsers for Ruby. The first is a Ruby binding to a native XML
+# parser.  This is a fast parser, using proven technology. However,
+# it isn't very portable. The second is a native Ruby implementation, but
+# I didn't like its API very much.  I wrote REXML for myself, so that I'd
+# have an XML parser that had an intuitive API.
 #
-# 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]
+# API documentation can be downloaded from the REXML home page, or can
+# be accessed online at http://www.germane-software.com/software/rexml_doc
+# A tutorial is available in docs/tutorial.html
 module REXML
-  COPYRIGHT = "Copyright \xC2\xA9 2001-2006 Sean Russell <ser@germane-software.com>"
-  VERSION = "3.1.7.2"
-  DATE = "2007/275"
-  REVISION = "$Revision$".gsub(/\$Revision:|\$/,'').strip
-
-  Copyright = COPYRIGHT
-  Version = VERSION
+	Copyright = "Copyright #{Time.now.year} Sean Russell <ser@germane-software.com>"
+	Date = "+2003/346"
+	Version = "2.7.3"
 end
diff --git a/lib/rexml/sax2listener.rb b/lib/rexml/sax2listener.rb
index 8db1389d06..40a77ed464 100644
--- a/lib/rexml/sax2listener.rb
+++ b/lib/rexml/sax2listener.rb
@@ -70,7 +70,7 @@ module REXML
 		#  ["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
+		def entitydecl content
 		end
 		# <!NOTATION ...>
 		def notationdecl content
@@ -84,14 +84,11 @@ module REXML
 		# @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/lib/rexml/source.rb b/lib/rexml/source.rb
index ce7a2c98b0..2110e6db66 100644
--- a/lib/rexml/source.rb
+++ b/lib/rexml/source.rb
@@ -1,251 +1,207 @@
 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 "#{arg.class} is not a valid input stream.  It must walk \n"+
-          "like either a String, an IO, or a 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 0xfe == str[0] && 0xff == str[1]
-        @line_break = "\000>"
-      elsif 0xff == str[0] && 0xfe == str[1]
-        @line_break = ">\000"
-      elsif 0xef == str[0] && 0xbb == str[1]
-        str += @source.read(1)
-        str = '' if (0xbf == str[2])
-        @line_break = ">"
-      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
+	# 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#, slurp=true
+			if arg.kind_of? String
+				source = Source.new(arg)
+			elsif arg.kind_of? IO
+				source = IOSource.new(arg)
+			end
+			source
+		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
+		def initialize(arg)
+			@orig = @buffer = arg
+			self.encoding = check_encoding( @buffer )
+			#@buffer = decode(@buffer) unless @encoding == UTF_8
+			@line = 0
+		end
+
+		# Inherited from Encoding
+		# Overridden to support optimized en/decoding
+		def encoding=(enc)
+			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.nil?
+		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
+
+		def initialize(arg, block_size=500)
+			@er_source = @source = arg
+			@to_utf = false
+			# READLINE OPT
+			# The following was commented out when IOSource started using readline
+			# to pull the data from the stream.
+			#@block_size = block_size
+			#super @source.read(@block_size)
+			@line_break = '>'
+			#super @source.readline( "\n" )
+			super @source.readline( @line_break )+@source.read
+			@line_break = encode( '>' )
+		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
+						@source = nil
+					end
+				end
+				rv = super
+			end
+			rv.taint
+			rv
+		end
+
+		def read
+			begin
+				str = @source.readline('>')
+				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('>')
+					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
+
+		# @return the current line in the source
+		def current_line
+			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
+			[pos, lineno, line]
+		end
+	end
 end
diff --git a/lib/rexml/streamlistener.rb b/lib/rexml/streamlistener.rb
index 6f401125b5..3c3c5e3684 100644
--- a/lib/rexml/streamlistener.rb
+++ b/lib/rexml/streamlistener.rb
@@ -39,9 +39,6 @@ module REXML
 		# @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
diff --git a/lib/rexml/syncenumerator.rb b/lib/rexml/syncenumerator.rb
deleted file mode 100644
index 955e006cb2..0000000000
--- a/lib/rexml/syncenumerator.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-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/lib/rexml/text.rb b/lib/rexml/text.rb
index 2bc00429b3..2494ad9e8a 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -1,344 +1,279 @@
 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 ]
+	# 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
+		# 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]+));/ 
+		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 )
+		# 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.
+		#   Text.new( "<&", false, nil, false ) #-> "&lt;&amp;"
+		#   Text.new( "<&", false, nil, true )  #-> IllegalArgumentException
+		#   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
+			@raw = false
 
-      if parent
-        super( parent )
-        @raw = parent.raw 
-      else
-        @parent = nil
-      end
+			if parent
+				super( parent )
+				@raw = parent.raw 
+			else
+				@parent = nil
+			end
 
-      @raw = raw unless raw.nil?
-      @entity_filter = entity_filter
-      @normalized = @unnormalized = nil
+			@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
+			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 Exception.new( "Illegal argument of type #{arg.type} for Text constructor (#{arg})" )
+			end
 
-      @string.gsub!( /\r\n?/, "\n" )
+			@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
+			# check for illegal characters
+			if @raw
+				if @string =~ illegal
+					raise Exception.new(
+						"Illegal character '#{$1}' in raw string \"#{@string}\""
+					)
+				end
+			end
+		end
 
-    def node_type
-      :text
-    end
+		def node_type
+			:text
+		end
 
-    def empty?
-      @string.size==0
-    end
+		def empty?
+			@string.size==0
+		end
 
 
-    def clone
-      return Text.new(self)
-    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
+		# 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
+		# +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
+		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
+			doctype = nil
+			if @parent
+				doc = @parent.document
+				doctype = doc.doctype if doc
+			end
 
-      @normalized = Text::normalize( @string, doctype, @entity_filter )
-    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.string   #-> "< & sean russell"
+		#   t = Text.new( "< & &s; russell", false, nil, false )
+		#   t.string   #-> "< & sean russell"
+		#   u = Text.new( "sean russell", false, nil, true )
+		#   u.string   #-> "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
 
-    # 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
+		def write( writer, indent=-1, transitive=false, ie_hack=false ) 
+			writer << to_s()
+		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)
-       # Recursively 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
+		# 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
 
-    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
+		# Reads text, substituting entities
+		def Text::read_with_substitution( input, illegal=nil )
+			copy = input.clone
 
-    # FIXME
-    # This probably won't work properly
-    def xpath
-      path = @parent.xpath
-      path += "/text()"
-      return path
-    end
+			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
 
-    # 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
+		EREFERENCE = /&(?!#{Entity::NAME};)/
+		# Escapes all possible entities
+		def Text::normalize( input, doctype=nil, entity_filter=nil )
+			copy = input.clone
+			# Doing it like this rather than in a loop improves the speed
+			if doctype
+				copy.gsub!( EREFERENCE, '&amp;' )
+				doctype.entities.each_value do |entity|
+					copy.gsub!( entity.value, 
+						"&#{entity.name};" ) if entity.value and 
+							not( entity_filter and entity_filter.include?(entity) )
+				end
+			else
+				copy.gsub!( EREFERENCE, '&amp;' )
+				DocType::DEFAULT_ENTITIES.each_value do |entity|
+					copy.gsub!(entity.value, "&#{entity.name};" )
+				end
+			end
+			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
+		# 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/lib/rexml/undefinednamespaceexception.rb b/lib/rexml/undefinednamespaceexception.rb
deleted file mode 100644
index 8ebfdfd0a9..0000000000
--- a/lib/rexml/undefinednamespaceexception.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'rexml/parseexception'
-module REXML
-  class UndefinedNamespaceException < ParseException
-    def initialize( prefix, source, parser )
-      super( "Undefined prefix #{prefix} found" )
-    end
-  end
-end
diff --git a/lib/rexml/validation/relaxng.rb b/lib/rexml/validation/relaxng.rb
deleted file mode 100644
index 969f51bc95..0000000000
--- a/lib/rexml/validation/relaxng.rb
+++ /dev/null
@@ -1,559 +0,0 @@
-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/lib/rexml/validation/validation.rb b/lib/rexml/validation/validation.rb
deleted file mode 100644
index 160ea96b31..0000000000
--- a/lib/rexml/validation/validation.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-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/lib/rexml/validation/validationexception.rb b/lib/rexml/validation/validationexception.rb
deleted file mode 100644
index 4723d9e4d3..0000000000
--- a/lib/rexml/validation/validationexception.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module REXML
-  module Validation
-    class ValidationException < RuntimeError
-      def initialize msg
-        super
-      end
-    end
-  end
-end
diff --git a/lib/rexml/xmldecl.rb b/lib/rexml/xmldecl.rb
index 427eb78cf8..1c0bde8f4d 100644
--- a/lib/rexml/xmldecl.rb
+++ b/lib/rexml/xmldecl.rb
@@ -13,7 +13,7 @@ module REXML
 		STOP = '\?>';
 
 		attr_accessor :version, :standalone
-    attr_reader :writeencoding, :writethis
+    attr_reader :writeencoding
 
 		def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
       @writethis = true
@@ -37,14 +37,9 @@ module REXML
 			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
+		def write writer, indent=-1, transitive=false, ie_hack=false
+      return "" unless @writethis or writer.kind_of? Output
+			indent( writer, indent )
 			writer << START.sub(/\\/u, '')
       if writer.kind_of? Output
         writer << " #{content writer.encoding}"
@@ -85,11 +80,6 @@ module REXML
       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
@@ -104,10 +94,6 @@ module REXML
       @writethis = true
     end
 
-    def inspect
-      START.sub(/\\/u, '') + " ... " + STOP.sub(/\\/u, '')
-    end
-
 		private
 		def content(enc)
 			rv = "version='#@version'"
diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb
index e8813efd3e..c9c216fe27 100644
--- a/lib/rexml/xpath.rb
+++ b/lib/rexml/xpath.rb
@@ -19,18 +19,16 @@ module REXML
 		#  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)
+		def XPath::first element, path=nil, namespaces={}, variables={}
 			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]
+			parser.parse(path, element)[0]
 		end
 
-		# Iterates over nodes that match the given path, calling the supplied
+		# Itterates over nodes that match the given path, calling the supplied
 		# block with the match.
 		# element::
 		#   The context element
@@ -42,9 +40,7 @@ module REXML
 		#  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)
+		def XPath::each element, path=nil, namespaces={}, variables={}, &block
 			parser = XPathParser.new
 			parser.namespaces = namespaces
 			parser.variables = variables
@@ -54,7 +50,7 @@ module REXML
 		end
 
 		# Returns an array of nodes matching a given XPath.  
-		def XPath::match element, path=nil, namespaces=nil, variables={}
+		def XPath::match element, path=nil, namespaces={}, variables={}
 			parser = XPathParser.new
 			parser.namespaces = namespaces
 			parser.variables = variables
diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb
index eb608fdb34..9cd1e5d64c 100644
--- a/lib/rexml/xpath_parser.rb
+++ b/lib/rexml/xpath_parser.rb
@@ -1,792 +1,523 @@
 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
-
+	# 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 = {}
+			@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
+			path_stack = @parser.parse( path )
+			#puts "PARSE: #{path} => #{path_stack.inspect}"
+			match( path_stack, nodeset )
+		end
+
+		def predicate path, nodeset
+			path_stack = @parser.predicate( path )
+			return Predicate( path_stack, nodeset )
+		end
+
+		def []=( variable_name, value )
+			@variables[ variable_name ] = value
+		end
+
+		private
+
+		def match( path_stack, nodeset ) 
+			while ( path_stack.size > 0 and nodeset.size > 0 ) 
+				#puts "PARSE: #{path_stack.inspect} '#{nodeset.collect{|n|n.type}.inspect}'"
+				nodeset = internal_parse( path_stack, nodeset )
+				#puts "NODESET: #{nodeset.size}"
+				#puts "PATH_STACK: #{path_stack.inspect}"
+			end
+			nodeset
+		end
+
+		def internal_parse path_stack, nodeset
+			return nodeset if nodeset.size == 0 or path_stack.size == 0
+			#puts "INTERNAL_PARSE: #{path_stack.inspect}, #{nodeset.collect{|n| n.type}.inspect}"
+			case path_stack.shift
+			when :document
+				return [ nodeset[0].root.parent ]
+
+			when :qname
+				prefix = path_stack.shift
+				name = path_stack.shift
+				#puts "QNAME #{prefix}#{prefix.size>0?':':''}#{name}"
+				n = nodeset.clone
+				ns = @namespaces[prefix]
+				ns = ns ? ns : ''
+				n.delete_if do |node|
+					# FIXME: This DOUBLES the time XPath searches take
+					ns = node.namespace( prefix ) if node.node_type == :element and ns == ''
+					#puts "NODE: '#{node.to_s}'; node.has_name?( #{name.inspect}, #{ns.inspect} ): #{ node.has_name?( name, ns )}; node.namespace() = #{node.namespace().inspect}; node.prefix = #{node.prefix().inspect}" if node.node_type == :element
+					!(node.node_type == :element and node.name == name and node.namespace == ns )
+				end
+				return n
+
+			when :any
+				n = nodeset.clone
+				n.delete_if { |node| node.node_type != :element }
+				return n
+
+			when :self
+				# THIS SPACE LEFT INTENTIONALLY BLANK
+
+			when :processing_instruction
+				target = path_stack.shift
+				n = nodeset.clone
+				n.delete_if do |node|
+					(node.node_type != :processing_instruction) or 
+					( !target.nil? and ( node.target != target ) )
+				end
+				return n
+
+			when :text
+				#puts ":TEXT"
+				n = nodeset.clone
+				n.delete_if do |node|
+					#puts "#{node} :: #{node.node_type}"
+					node.node_type != :text
+				end
+				return n
+
+			when :comment
+				n = nodeset.clone
+				n.delete_if do |node|
+					node.node_type != :comment
+				end
+				return n
+
+			when :node
+				return nodeset
+				#n = nodeset.clone
+				#n.delete_if do |node|
+				#	!node.node?
+				#end
+				#return n
+			
+			# FIXME:  I suspect the following XPath will fail:
+			# /a/*/*[1]
+			when :child
+				#puts "CHILD"
+				new_nodeset = []
+				nt = nil
+				for node in nodeset
+					nt = node.node_type
+					new_nodeset += node.children if nt == :element or nt == :document
+				end
+				#path_stack[0,(path_stack.size-ps_clone.size)] = []
+				return new_nodeset
+
+			when :literal
+				literal = path_stack.shift
+				if literal =~ /^\d+(\.\d+)?$/
+					return ($1 ? literal.to_f : literal.to_i) 
+				end
+				#puts "RETURNING '#{literal}'"
+				return literal
+				
+			when :attribute
+				#puts ":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
+							#puts "looking for attribute #{name} in '#{@namespaces[prefix]}'"
+							attr = element.attribute( name, @namespaces[prefix] )
+							#puts ":ATTRIBUTE: attr => #{attr}"
+							new_nodeset << attr if attr
+						end
+					end
+				when :any
+					for element in nodeset
+						if element.node_type == :element
+							attr = element.attributes
+						end
+					end
+				end
+				#puts "RETURNING #{new_nodeset.collect{|n|n.to_s}.inspect}"
+				return new_nodeset
+
+			when :parent
+				return internal_parse( path_stack, nodeset.collect{|n| n.parent}.compact )
+
+			when :ancestor
+				#puts "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.uniq
+				return new_nodeset
+
+			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.includes? node
+						end
+					end
+				end
+				#nodeset = new_nodeset.uniq
+				return new_nodeset
+
+			when :predicate
+				#puts "@"*80
+				#puts "NODESET = #{nodeset.collect{|n|n.to_s}.inspect}"
+				predicate = path_stack.shift
+				new_nodeset = []
+				Functions::size = nodeset.size
+				nodeset.size.times do |index|
+					node = nodeset[index]
+					Functions::node = node
+					Functions::index = index+1
+					#puts "Node #{node} and index=#{index+1}"
+					result = Predicate( predicate, node )
+					#puts "Predicate returned #{result} (#{result.type}) for #{node.type}"
+					if result.kind_of? Numeric
+						#puts "#{result} == #{index} => #{result == index}"
+						new_nodeset << node if result == (index+1)
+					elsif result.instance_of? Array
+						new_nodeset << node if result.size > 0
+					else
+						new_nodeset << node if result
+					end
+				end
+				#puts "Nodeset after predicate #{predicate.inspect} has #{new_nodeset.size} nodes"
+				#puts "NODESET: #{new_nodeset.collect{|n|n.to_s}.inspect}"
+				return new_nodeset
+
+			when :descendant_or_self
+				rv = descendant_or_self( path_stack, nodeset )
+				path_stack.clear
+				return rv
+
+			when :descendant
+				#puts ":DESCENDANT"
+				results = []
+				nt = nil
+				for node in nodeset
+					nt = node.node_type
+					results += internal_parse( path_stack.clone.unshift( :descendant_or_self ),
+						node.children ) if nt == :element or nt == :document
+				end
+				return results
+
+			when :following_sibling
+				results = []
+				for node in nodeset
+					all_siblings = node.parent.children
+					current_index = all_siblings.index( node )
+					following_siblings = all_siblings[ current_index+1 .. -1 ]
+					results += internal_parse( path_stack.clone, following_siblings )
+				end
+				return results
+
+			when :preceding_sibling
+				results = []
+				for node in nodeset
+					all_siblings = node.parent.children
+					current_index = all_siblings.index( node )
+					preceding_siblings = all_siblings[ 0 .. current_index-1 ]
+					results += internal_parse( path_stack.clone, preceding_siblings )
+				end
+				return results
+
+			when :preceding
+				new_nodeset = []
+				for node in nodeset
+					new_nodeset += preceding( node )
+				end
+				return new_nodeset
+
+			when :following
+				new_nodeset = []
+				for node in nodeset
+					new_nodeset += following( node )
+				end
+				return new_nodeset
+
+			when :namespace
+				new_set = []
+				for node in nodeset
+					new_nodeset << node.namespace if node.node_type == :element or node.node_type == :attribute
+				end
+				return new_nodeset
+
+			when :variable
+				var_name = path_stack.shift
+				return @variables[ var_name ]
+
+			end
+			nodeset
+		end
+
+		##########################################################
+		# 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 took me three days to get it to work at all.
+		# ########################################################
+		
+		def descendant_or_self( path_stack, nodeset )
+			rs = []
+			d_o_s( path_stack, nodeset, rs )
+			#puts "RS = #{rs.collect{|n|n.to_s}.inspect}"
+			rs.flatten.compact
+		end
+
+		def d_o_s( p, ns, r )
+			#puts r.collect{|n|n.to_s}.inspect
+			#puts ns.collect{|n|n.to_s}.inspect
+			nt = nil
+			ns.each_index do |i|
+				n = ns[i]
+				x = match( p.clone, [ n ] )
+				#puts "Got a match on #{p.inspect} for #{ns.collect{|n|n.to_s+"("+n.type.to_s+")"}.inspect}"
+				nt = n.node_type
+				d_o_s( p, n.children, x ) if nt == :element or nt == :document
+				r[i,0] = [x] if x.size > 0
+			end
+		end
 
     def recurse( nodeset, &block )
       for node in nodeset
-        yield node
+	      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
+		# Given a predicate, a node, and a context, evaluates to true or false.
+		def Predicate( predicate, node )
+			predicate = predicate.clone
+			#puts "#"*20
+			#puts "Predicate( #{predicate.inspect}, #{node.type} )"
+			results = []
+			case (predicate[0])
+			when :and, :or, :eq, :neq, :lt, :lteq, :gt, :gteq
+				eq = predicate.shift
+				left = Predicate( predicate.shift, node )
+				right = Predicate( predicate.shift, node )
+				return equality_relational_compare( left, eq, right )
+
+			when :div, :mod, :mult, :plus, :minus, :union
+				op = predicate.shift
+				left = Predicate( predicate.shift, node )
+				right = Predicate( predicate.shift, node )
+				left = Functions::number( left )
+				right = Functions::number( right )
+				case op
+				when :div
+					return left.to_f / right.to_f
+				when :mod
+					return left % right
+				when :mult
+					return left * right
+				when :plus
+					return left + right
+				when :minus
+					return left - right
+				when :union
+					return (left | right)
+				end
+
+			when :neg
+				predicate.shift
+				operand = Functions::number(Predicate( predicate, node ))
+				return -operand
+
+			when :not
+				predicate.shift
+				return !Predicate( predicate.shift, node )
+
+			when :function
+				predicate.shift
+				func_name = predicate.shift.tr('-', '_')
+				arguments = predicate.shift
+				#puts "\nFUNCTION: #{func_name}"
+				#puts "ARGUMENTS: #{arguments.inspect} #{node.to_s}"
+				args = arguments.collect { |arg| Predicate( arg, node ) }
+				#puts "FUNCTION: #{func_name}( #{args.collect{|n|n.to_s}.inspect} )"
+				result = Functions.send( func_name, *args )
+				#puts "RESULTS: #{result.inspect}"
+				return result
+
+			else
+				return match( predicate, [ node ] )
+
+			end
+		end
+
+		# Builds a nodeset of all of the following nodes of the supplied node,
+		# in document order
+		def following( node )
+			all_siblings = node.parent.children
+			current_index = all_siblings.index( node )
+			following_siblings = all_siblings[ current_index+1 .. -1 ]
+			following = []
+			recurse( following_siblings ) { |node| following << node }
+			following.shift
+			#puts "following is returning #{puta following}"
+			following
+		end
+
+		# Builds a nodeset of all of the preceding nodes of the supplied node,
+		# in reverse document order
+		def preceding( node )
+			all_siblings = node.parent.children
+			current_index = all_siblings.index( node )
+			preceding_siblings = all_siblings[ 0 .. current_index-1 ]
+
+			preceding_siblings.reverse!
+			preceding = []
+			recurse( preceding_siblings ) { |node| preceding << node }
+			preceding.reverse
+		end
+
+		def equality_relational_compare( set1, op, set2 )
+			#puts "EQ_REL_COMP: #{set1.to_s}, #{op}, #{set2.to_s}"
+			if set1.kind_of? Array and set2.kind_of? Array
+				if set1.size == 1 and set2.size == 1
+					set1 = set1[0]
+					set2 = set2[0]
+				else
+					set1.each do |i1| 
+						i1 = i1.to_s
+						set2.each do |i2| 
+							i2 = i2.to_s
+							return true if compare( i1, op, i2 )
+						end
+					end
+					return false
+				end
+			end
+			#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.to_s
+				else
+					a = set2
+					b = set1.to_s
+				end
+
+				case b
+				when 'true', 'false'
+					b = Functions::boolean( b )
+					for v in a
+						v = Functions::boolean(v)
+						return true if compare( v, op, b )
+					end
+				when /^\d+(\.\d+)?$/
+					b = Functions::number( b )
+					for v in a
+						v = Functions::number(v)
+						return true if compare( v, op, b )
+					end
+				else
+					b = Functions::string( b )
+					for v in a
+						v = Functions::string(v)
+						return true if compare( v, op, b )
+					end
+				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}"
+				return compare( set1, op, set2 )
+			end
+			return false
+		end
+
+		def compare a, op, b
+			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/lib/rinda/rinda.rb b/lib/rinda/rinda.rb
index 6c59e68654..273560b1de 100644
--- a/lib/rinda/rinda.rb
+++ b/lib/rinda/rinda.rb
@@ -1,283 +1,129 @@
-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)
+      if Hash === ary_or_hash
+	init_with_hash(ary_or_hash)
       else
-        init_with_ary(ary_or_hash)
+	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) }
+	@tuple.each { |k, v| yield(k, v) }
       else
-        @tuple.each_with_index { |v, k| yield(k, v) }
+	@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 = ary.size
+      @tuple = Array.new(@tuple_size)
       @tuple.size.times do |i|
-        @tuple[i] = ary[i]
+	@tuple[i] = ary[i]
       end
     end
 
-    ##
-    # Ensures +hash+ is a valid Tuple.
-
     def init_with_hash(hash)
+      @tuple_size = hash[:size]
       @tuple = Hash.new
       hash.each do |k, v|
-        raise InvalidHashTupleKey unless String === k
-        @tuple[k] = v
+	next 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
+      return false unless tuple.respond_to?(:[])
+      return false if @tuple_size && (@tuple_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
+	next if v.nil?
+	return false unless (v === tuple[k] rescue 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)
+	return false unless (@drb_uri === ro.__drburi rescue false)
       end
       unless @drb_ref.nil?
-        return false unless (@drb_ref === ro.__drbref rescue false)
+	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/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 1fad92dbc7..7152dfb72e 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -6,29 +6,10 @@ 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 receives 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
@@ -37,23 +18,15 @@ module Rinda
       @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)
+	  msg, addr = @soc.recvfrom(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
@@ -64,9 +37,6 @@ module Rinda
       end
     end
 
-    ##
-    # Creates a thread that notifies waiting clients from the TupleSpace.
-
     def reply_service
       Thread.new do
 	loop do
@@ -75,34 +45,15 @@ module Rinda
       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])
+      tuple = @ts.take([:lookup_ring, DRbObject])
       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
@@ -111,56 +62,27 @@ module Rinda
       @@finger
     end
 
-    ##
-    # Returns the first advertised TupleSpace.
-
     def self.primary
       finger.primary
     end
 
-    ##
-    # Contains all discovered 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+.
-
+    @@broadcast_list = ['<broadcast>', 'localhost']
     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.
+    attr_accessor :broadcast_list, :port, :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
@@ -168,11 +90,6 @@ module Rinda
       @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?
 
@@ -191,10 +108,6 @@ module Rinda
       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
 
@@ -212,38 +125,19 @@ module Rinda
       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
@@ -268,4 +162,3 @@ if __FILE__ == $0
     end
   end
 end
-
diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb
index b0409dde3b..4bd4a42af5 100644
--- a/lib/rinda/tuplespace.rb
+++ b/lib/rinda/tuplespace.rb
@@ -2,67 +2,29 @@ require 'monitor'
 require 'thread'
 require 'drb/drb'
 require 'rinda/rinda'
-require 'enumerator'
-require 'forwardable'
 
 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)
+      @ary = make_tuple(ary)
       @renewer = nil
       renew(sec)
     end
-
-    ##
-    # Marks this TupleEntry as canceled.
+    attr_accessor :expires
 
     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 value; @ary.value; end
     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
@@ -72,124 +34,76 @@ module Rinda
       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
+	Time.now + sec
       when true
-        Time.at(1)
+	Time.at(1)
       when nil
-        Time.at(2**31-1)
+	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)
+      @ary[key]
     end
 
-    ##
-    # The size of the tuple.
-
     def size
-      @tuple.size
+      @ary.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
+	return it, nil
       else
-        begin
-          return it.renew, it
-        rescue Exception
-          return it, nil
-        end
+	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 initialize(ary, expires=nil)
+      super(ary, expires)
+      @template = Rinda::Template.new(ary)
+    end
 
     def match(tuple)
-      @tuple.match(tuple)
+      @template.match(tuple)
     end
-    
-    alias === match
 
-    def make_tuple(ary) # :nodoc:
-      Rinda::Template.new(ary)
+    def ===(tuple)
+      match(tuple)
     end
 
+    def make_tuple(ary)
+      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
+    attr_reader :found
 
     def cancel
       super
@@ -199,79 +113,39 @@ module Rinda
     def wait
       @cond.wait
     end
-
+    
     def read(tuple)
       @found = tuple
       signal
     end
-
+    
     def signal
       @place.synchronize do
-        @cond.signal
+	@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
+ 
+    def each
       while !@done
         it = pop
         yield(it)
@@ -280,363 +154,203 @@ module Rinda
     ensure
       cancel
     end
-
   end
 
-  ##
-  # TupleBag is an unordered collection of tuples. It is the basis
-  # of Tuplespace.
-
   class TupleBag
-    class TupleBin
-      extend Forwardable
-      def_delegators '@bin', :find_all, :delete_if, :each, :empty?
-
-      def initialize
-        @bin = []
-      end
-      
-      def add(tuple)
-        @bin.push(tuple)
-      end
-      
-      def delete(tuple)
-        idx = @bin.rindex(tuple)
-        @bin.delete_at(idx) if idx
-      end
-      
-      def find(&blk)
-        @bin.reverse_each do |x|
-          return x if yield(x)
-        end
-        nil
-      end
-    end
-
-    def initialize # :nodoc:
+    def initialize
       @hash = {}
-      @enum = Enumerable::Enumerator.new(self, :each_entry)
     end
-
-    ##
-    # +true+ if the TupleBag to see if it has any expired entries.
-
-    def has_expires?
-      @enum.find do |tuple|
-        tuple.expires
-      end
-    end
-
-    ##
-    # Add +tuple+ to the TupleBag.
-
-    def push(tuple)
-      key = bin_key(tuple)
-      @hash[key] ||= TupleBin.new
-      @hash[key].add(tuple)
+    
+    def push(ary)
+      size = ary.size
+      @hash[size] ||= []
+      @hash[size].push(ary)
     end
-
-    ##
-    # Removes +tuple+ from the TupleBag.
-
-    def delete(tuple)
-      key = bin_key(tuple)
-      bin = @hash[key]
-      return nil unless bin
-      bin.delete(tuple)
-      @hash.delete(key) if bin.empty?
-      tuple
+    
+    def delete(ary)
+      size = ary.size
+      @hash.fetch(size, []).delete(ary)
     end
 
-    ##
-    # Finds all live tuples that match +template+.
     def find_all(template)
-      bin_for_find(template).find_all do |tuple|
-        tuple.alive? && template.match(tuple)
+      @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)
-      bin_for_find(template).find do |tuple|
-        tuple.alive? && template.match(tuple)
+      @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)
-      @enum.find_all do |template|
-        template.alive? && template.match(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.each do |key, bin|
-        bin.delete_if do |tuple|
-          if tuple.alive?
-            false
-          else
-            deleted.push(tuple)
-            true
-          end
-        end
+      @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
-
-    private
-    def each_entry(&blk)
-      @hash.each do |k, v|
-        v.each(&blk)
-      end
-    end
-
-    def bin_key(tuple)
-      head = tuple[0]
-      if head.class == Symbol
-        return head
-      else
-        false
-      end
-    end
-
-    def bin_for_find(template)
-      key = bin_key(template)
-      key ? @hash.fetch(key, []) : @enum
-    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)
+    def initialize(timeout=60)
       super()
       @bag = TupleBag.new
       @read_waiter = TupleBag.new
       @take_waiter = TupleBag.new
       @notify_waiter = TupleBag.new
-      @period = period
-      @keeper = nil
+      @timeout = timeout
+      @period = timeout * 2
+      @keeper = keeper
     end
 
-    ##
-    # Adds +tuple+
-
     def write(tuple, sec=nil)
-      entry = create_entry(tuple, sec)
+      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
+	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)
+	  @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
+	entry = @bag.find(template)
+	if entry
+	  port.push(entry.value) if port
+	  @bag.delete(entry)
+	  notify_event('take', entry.value)
+	  return entry.value
+	end
+	return nil if template.expired?
+
+	begin
+	  @take_waiter.push(template)
+	  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
+	entry = @bag.find(template)
+	return entry.value if entry
+	return nil if template.expired?
+
+	begin
+	  @read_waiter.push(template)
+	  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
+	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)
+	@notify_waiter.push(template)
       end
       template
     end
-
+    
     private
-
-    def create_entry(tuple, sec)
-      TupleEntry.new(tuple, sec)
-    end
-
-    ##
-    # 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
+	@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)
+	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
-          sleep(@period)
-          synchronize do
-            break unless need_keeper?
-            keep_clean
-          end
-        end
+    def keeper
+      Thread.new do
+	loop do
+	  sleep(@period)
+	  keep_clean
+	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/lib/rss.rb b/lib/rss.rb
deleted file mode 100644
index a1d0f76ba1..0000000000
--- a/lib/rss.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2003-2007 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/atom'
-require 'rss/content'
-require 'rss/dublincore'
-require 'rss/image'
-require 'rss/itunes'
-require 'rss/slash'
-require 'rss/syndication'
-require 'rss/taxonomy'
-require 'rss/trackback'
-
-require "rss/maker"
diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb
deleted file mode 100644
index 7b24e7596d..0000000000
--- a/lib/rss/0.9.rb
+++ /dev/null
@@ -1,428 +0,0 @@
-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_writer :feed_version
-    alias_method(:rss_version, :feed_version)
-    alias_method(:rss_version=, :feed_version=)
-
-    def initialize(feed_version, version=nil, encoding=nil, standalone=nil)
-      super
-      @feed_type = "rss"
-    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
-      image.setup_maker(maker) if image
-      textinput.setup_maker(maker) if textinput
-    end
-
-    private
-    def _attrs
-      [
-        ["version", true, "feed_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 initial_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
-      pr = Proc.new do |text, tags|
-        @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate
-      end
-      @proc_stack.push(pr)
-    end
-    
-  end
-
-end
diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb
deleted file mode 100644
index f04e61c5eb..0000000000
--- a/lib/rss/1.0.rb
+++ /dev/null
@@ -1,452 +0,0 @@
-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
-
-    alias_method(:rss_version, :feed_version)
-    def initialize(version=nil, encoding=nil, standalone=nil)
-      super('1.0', version, encoding, standalone)
-      @feed_type = "rss"
-    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 initial_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
-      pr = Proc.new do |text, tags|
-        @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate
-      end
-      @proc_stack.push(pr)
-    end
-  end
-
-end
diff --git a/lib/rss/2.0.rb b/lib/rss/2.0.rb
deleted file mode 100644
index 3798da4eb7..0000000000
--- a/lib/rss/2.0.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-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/lib/rss/atom.rb b/lib/rss/atom.rb
deleted file mode 100644
index 7cba934feb..0000000000
--- a/lib/rss/atom.rb
+++ /dev/null
@@ -1,749 +0,0 @@
-require 'base64'
-require 'rss/parser'
-
-module RSS
-  module Atom
-    URI = "http://www.w3.org/2005/Atom"
-    XHTML_URI = "http://www.w3.org/1999/xhtml"
-
-    module CommonModel
-      NSPOOL = {}
-      ELEMENTS = []
-
-      def self.append_features(klass)
-        super
-        klass.install_must_call_validator("atom", URI)
-        [
-         ["lang", :xml],
-         ["base", :xml],
-        ].each do |name, uri, required|
-          klass.install_get_attribute(name, uri, required, [nil, :inherit])
-        end
-        klass.class_eval do
-          class << self
-            def required_uri
-              URI
-            end
-
-            def need_parent?
-              true
-            end
-          end
-        end
-      end
-    end
-
-    module ContentModel
-      module ClassMethods
-        def content_type
-          @content_type ||= nil
-        end
-      end
-
-      class << self
-        def append_features(klass)
-          super
-          klass.extend(ClassMethods)
-          klass.content_setup(klass.content_type, klass.tag_name)
-        end
-      end
-
-      def maker_target(target)
-        target
-      end
-
-      private
-      def setup_maker_element_writer
-        "#{self.class.name.split(/::/).last.downcase}="
-      end
-
-      def setup_maker_element(target)
-        target.__send__(setup_maker_element_writer, content)
-        super
-      end
-    end
-
-    module URIContentModel
-      class  << self
-        def append_features(klass)
-          super
-          klass.class_eval do
-            @content_type = [nil, :uri]
-            include(ContentModel)
-          end
-        end
-      end
-    end
-
-    module TextConstruct
-      def self.append_features(klass)
-        super
-        klass.class_eval do
-          [
-           ["type", ""],
-          ].each do |name, uri, required|
-            install_get_attribute(name, uri, required, :text_type)
-          end
-
-          content_setup
-          add_need_initialize_variable("xhtml")
-
-          class << self
-            def xml_getter
-              "xhtml"
-            end
-
-            def xml_setter
-              "xhtml="
-            end
-          end
-        end
-      end
-
-      attr_writer :xhtml
-      def xhtml
-        return @xhtml if @xhtml.nil?
-        if @xhtml.is_a?(XML::Element) and
-            [@xhtml.name, @xhtml.uri] == ["div", XHTML_URI]
-          return @xhtml
-        end
-
-        children = @xhtml
-        children = [children] unless children.is_a?(Array)
-        XML::Element.new("div", nil, XHTML_URI,
-                         {"xmlns" => XHTML_URI}, children)
-      end
-
-      def have_xml_content?
-        @type == "xhtml"
-      end
-
-      def atom_validate(ignore_unknown_element, tags, uri)
-        if have_xml_content?
-          if @xhtml.nil?
-            raise MissingTagError.new("div", tag_name)
-          end
-          unless [@xhtml.name, @xhtml.uri] == ["div", XHTML_URI]
-            raise NotExpectedTagError.new(@xhtml.name, @xhtml.uri, tag_name)
-          end
-        end
-      end
-
-      private
-      def maker_target(target)
-        target.__send__(self.class.name.split(/::/).last.downcase) {|x| x}
-      end
-
-      def setup_maker_attributes(target)
-        target.type = type
-        target.content = content
-        target.xml_content = @xhtml
-      end
-    end
-
-    module PersonConstruct
-      def self.append_features(klass)
-        super
-        klass.class_eval do
-          [
-           ["name", nil],
-           ["uri", "?"],
-           ["email", "?"],
-          ].each do |tag, occurs|
-            install_have_attribute_element(tag, URI, occurs, nil, :content)
-          end
-        end
-      end
-
-      def maker_target(target)
-        target.__send__("new_#{self.class.name.split(/::/).last.downcase}")
-      end
-
-      class Name < RSS::Element
-        include CommonModel
-        include ContentModel
-      end
-
-      class Uri < RSS::Element
-        include CommonModel
-        include URIContentModel
-      end
-
-      class Email < RSS::Element
-        include CommonModel
-        include ContentModel
-      end
-    end
-
-    module DateConstruct
-      def self.append_features(klass)
-        super
-        klass.class_eval do
-          @content_type = :w3cdtf
-          include(ContentModel)
-        end
-      end
-
-      def atom_validate(ignore_unknown_element, tags, uri)
-        raise NotAvailableValueError.new(tag_name, "") if content.nil?
-      end
-    end
-
-    module DuplicateLinkChecker
-      def validate_duplicate_links(links)
-        link_infos = {}
-        links.each do |link|
-          rel = link.rel || "alternate"
-          next unless rel == "alternate"
-          key = [link.hreflang, link.type]
-          if link_infos.has_key?(key)
-            raise TooMuchTagError.new("link", tag_name)
-          end
-          link_infos[key] = true
-        end
-      end
-    end
-
-    class Feed < RSS::Element
-      include RootElementMixin
-      include CommonModel
-      include DuplicateLinkChecker
-
-      install_ns('', URI)
-
-      [
-       ["author", "*", :children],
-       ["category", "*", :children, "categories"],
-       ["contributor", "*", :children],
-       ["generator", "?"],
-       ["icon", "?", nil, :content],
-       ["id", nil, nil, :content],
-       ["link", "*", :children],
-       ["logo", "?"],
-       ["rights", "?"],
-       ["subtitle", "?", nil, :content],
-       ["title", nil, nil, :content],
-       ["updated", nil, nil, :content],
-       ["entry", "*", :children, "entries"],
-      ].each do |tag, occurs, type, *args|
-        type ||= :child
-        __send__("install_have_#{type}_element",
-                 tag, URI, occurs, tag, *args)
-      end
-
-      def initialize(version=nil, encoding=nil, standalone=nil)
-        super("1.0", version, encoding, standalone)
-        @feed_type = "atom"
-        @feed_subtype = "feed"
-      end
-
-      alias_method :items, :entries
-
-      def have_author?
-        authors.any? {|author| !author.to_s.empty?} or
-          entries.any? {|entry| entry.have_author?(false)}
-      end
-
-      private
-      def atom_validate(ignore_unknown_element, tags, uri)
-        unless have_author?
-          raise MissingTagError.new("author", tag_name)
-        end
-        validate_duplicate_links(links)
-      end
-
-      def have_required_elements?
-        super and have_author?
-      end
-
-      def maker_target(maker)
-        maker.channel
-      end
-
-      def setup_maker_element(channel)
-        prev_dc_dates = channel.dc_dates.to_a.dup
-        super
-        channel.about = id.content if id
-        channel.dc_dates.replace(prev_dc_dates)
-      end
-
-      def setup_maker_elements(channel)
-        super
-        items = channel.maker.items
-        entries.each do |entry|
-          entry.setup_maker(items)
-        end
-      end
-
-      class Author < RSS::Element
-        include CommonModel
-        include PersonConstruct
-      end
-
-      class Category < RSS::Element
-        include CommonModel
-
-        [
-         ["term", "", true],
-         ["scheme", "", false, [nil, :uri]],
-         ["label", ""],
-        ].each do |name, uri, required, type|
-          install_get_attribute(name, uri, required, type)
-        end
-
-        private
-        def maker_target(target)
-          target.new_category
-        end
-      end
-
-      class Contributor < RSS::Element
-        include CommonModel
-        include PersonConstruct
-      end
-
-      class Generator < RSS::Element
-        include CommonModel
-        include ContentModel
-
-        [
-         ["uri", "", false, [nil, :uri]],
-         ["version", ""],
-        ].each do |name, uri, required, type|
-          install_get_attribute(name, uri, required, type)
-        end
-
-        private
-        def setup_maker_attributes(target)
-          target.generator do |generator|
-            generator.uri = uri if uri
-            generator.version = version if version
-          end
-        end
-      end
-
-      class Icon < RSS::Element
-        include CommonModel
-        include URIContentModel
-      end
-
-      class Id < RSS::Element
-        include CommonModel
-        include URIContentModel
-      end
-
-      class Link < RSS::Element
-        include CommonModel
-
-        [
-         ["href", "", true, [nil, :uri]],
-         ["rel", ""],
-         ["type", ""],
-         ["hreflang", ""],
-         ["title", ""],
-         ["length", ""],
-        ].each do |name, uri, required, type|
-          install_get_attribute(name, uri, required, type)
-        end
-
-        private
-        def maker_target(target)
-          target.new_link
-        end
-      end
-
-      class Logo < RSS::Element
-        include CommonModel
-        include URIContentModel
-
-        def maker_target(target)
-          target.maker.image
-        end
-
-        private
-        def setup_maker_element_writer
-          "url="
-        end
-      end
-
-      class Rights < RSS::Element
-        include CommonModel
-        include TextConstruct
-      end
-
-      class Subtitle < RSS::Element
-        include CommonModel
-        include TextConstruct
-      end
-
-      class Title < RSS::Element
-        include CommonModel
-        include TextConstruct
-      end
-
-      class Updated < RSS::Element
-        include CommonModel
-        include DateConstruct
-      end
-
-      class Entry < RSS::Element
-        include CommonModel
-        include DuplicateLinkChecker
-
-        [
-         ["author", "*", :children],
-         ["category", "*", :children, "categories"],
-         ["content", "?", :child],
-         ["contributor", "*", :children],
-         ["id", nil, nil, :content],
-         ["link", "*", :children],
-         ["published", "?", :child, :content],
-         ["rights", "?", :child],
-         ["source", "?"],
-         ["summary", "?", :child],
-         ["title", nil],
-         ["updated", nil, :child, :content],
-        ].each do |tag, occurs, type, *args|
-          type ||= :attribute
-          __send__("install_have_#{type}_element",
-                   tag, URI, occurs, tag, *args)
-        end
-
-        def have_author?(check_parent=true)
-          authors.any? {|author| !author.to_s.empty?} or
-            (check_parent and @parent and @parent.have_author?) or
-            (source and source.have_author?)
-        end
-
-        private
-        def atom_validate(ignore_unknown_element, tags, uri)
-          unless have_author?
-            raise MissingTagError.new("author", tag_name)
-          end
-          validate_duplicate_links(links)
-        end
-
-        def have_required_elements?
-          super and have_author?
-        end
-
-        def maker_target(items)
-          if items.respond_to?("items")
-            # For backward compatibility
-            items = items.items
-          end
-          items.new_item
-        end
-
-        Author = Feed::Author
-        Category = Feed::Category
-
-        class Content < RSS::Element
-          include CommonModel
-
-          class << self
-            def xml_setter
-              "xml="
-            end
-
-            def xml_getter
-              "xml"
-            end
-          end
-
-          [
-           ["type", ""],
-           ["src", "", false, [nil, :uri]],
-          ].each do |name, uri, required, type|
-            install_get_attribute(name, uri, required, type)
-          end
-
-          content_setup
-          add_need_initialize_variable("xml")
-
-          attr_writer :xml
-          def have_xml_content?
-            inline_xhtml? or inline_other_xml?
-          end
-
-          def xml
-            return @xml unless inline_xhtml?
-            return @xml if @xml.nil?
-            if @xml.is_a?(XML::Element) and
-                [@xml.name, @xml.uri] == ["div", XHTML_URI]
-              return @xml
-            end
-
-            children = @xml
-            children = [children] unless children.is_a?(Array)
-            XML::Element.new("div", nil, XHTML_URI,
-                             {"xmlns" => XHTML_URI}, children)
-          end
-
-          def xhtml
-            if inline_xhtml?
-              xml
-            else
-              nil
-            end
-          end
-
-          def atom_validate(ignore_unknown_element, tags, uri)
-            if out_of_line?
-              raise MissingAttributeError.new(tag_name, "type") if @type.nil?
-              unless (content.nil? or content.empty?)
-                raise NotAvailableValueError.new(tag_name, content)
-              end
-            elsif inline_xhtml?
-              if @xml.nil?
-                raise MissingTagError.new("div", tag_name)
-              end
-              unless @xml.name == "div" and @xml.uri == XHTML_URI
-                raise NotExpectedTagError.new(@xml.name, @xml.uri, tag_name)
-              end
-            end
-          end
-
-          def inline_text?
-            !out_of_line? and [nil, "text", "html"].include?(@type)
-          end
-
-          def inline_html?
-            return false if out_of_line?
-            @type == "html" or mime_split == ["text", "html"]
-          end
-
-          def inline_xhtml?
-            !out_of_line? and @type == "xhtml"
-          end
-
-          def inline_other?
-            return false if out_of_line?
-            media_type, subtype = mime_split
-            return false if media_type.nil? or subtype.nil?
-            true
-          end
-
-          def inline_other_text?
-            return false unless inline_other?
-            return false if inline_other_xml?
-
-            media_type, subtype = mime_split
-            return true if "text" == media_type.downcase
-            false
-          end
-
-          def inline_other_xml?
-            return false unless inline_other?
-
-            media_type, subtype = mime_split
-            normalized_mime_type = "#{media_type}/#{subtype}".downcase
-            if /(?:\+xml|^xml)$/ =~ subtype or
-                %w(text/xml-external-parsed-entity
-                   application/xml-external-parsed-entity
-                   application/xml-dtd).find {|x| x == normalized_mime_type}
-              return true
-            end
-            false
-          end
-
-          def inline_other_base64?
-            inline_other? and !inline_other_text? and !inline_other_xml?
-          end
-
-          def out_of_line?
-            not @src.nil?
-          end
-
-          def mime_split
-            media_type = subtype = nil
-            if /\A\s*([a-z]+)\/([a-z\+]+)\s*(?:;.*)?\z/i =~ @type.to_s
-              media_type = $1.downcase
-              subtype = $2.downcase
-            end
-            [media_type, subtype]
-          end
-
-          def need_base64_encode?
-            inline_other_base64?
-          end
-
-          private
-          def empty_content?
-            out_of_line? or super
-          end
-        end
-
-        Contributor = Feed::Contributor
-        Id = Feed::Id
-        Link = Feed::Link
-
-        class Published < RSS::Element
-          include CommonModel
-          include DateConstruct
-        end
-
-        Rights = Feed::Rights
-
-        class Source < RSS::Element
-          include CommonModel
-
-          [
-           ["author", "*", :children],
-           ["category", "*", :children, "categories"],
-           ["contributor", "*", :children],
-           ["generator", "?"],
-           ["icon", "?"],
-           ["id", "?", nil, :content],
-           ["link", "*", :children],
-           ["logo", "?"],
-           ["rights", "?"],
-           ["subtitle", "?"],
-           ["title", "?"],
-           ["updated", "?", nil, :content],
-          ].each do |tag, occurs, type, *args|
-            type ||= :attribute
-            __send__("install_have_#{type}_element",
-                     tag, URI, occurs, tag, *args)
-          end
-
-          def have_author?
-            !author.to_s.empty?
-          end
-
-          Author = Feed::Author
-          Category = Feed::Category
-          Contributor = Feed::Contributor
-          Generator = Feed::Generator
-          Icon = Feed::Icon
-          Id = Feed::Id
-          Link = Feed::Link
-          Logo = Feed::Logo
-          Rights = Feed::Rights
-          Subtitle = Feed::Subtitle
-          Title = Feed::Title
-          Updated = Feed::Updated
-        end
-
-        class Summary < RSS::Element
-          include CommonModel
-          include TextConstruct
-        end
-
-        Title = Feed::Title
-        Updated = Feed::Updated
-      end
-    end
-
-    class Entry < RSS::Element
-      include RootElementMixin
-      include CommonModel
-      include DuplicateLinkChecker
-
-      [
-       ["author", "*", :children],
-       ["category", "*", :children, "categories"],
-       ["content", "?"],
-       ["contributor", "*", :children],
-       ["id", nil, nil, :content],
-       ["link", "*", :children],
-       ["published", "?", :child, :content],
-       ["rights", "?"],
-       ["source", "?"],
-       ["summary", "?"],
-       ["title", nil],
-       ["updated", nil, nil, :content],
-      ].each do |tag, occurs, type, *args|
-        type ||= :attribute
-        __send__("install_have_#{type}_element",
-                 tag, URI, occurs, tag, *args)
-      end
-
-      def initialize(version=nil, encoding=nil, standalone=nil)
-        super("1.0", version, encoding, standalone)
-        @feed_type = "atom"
-        @feed_subtype = "entry"
-      end
-
-      def items
-        [self]
-      end
-
-      def setup_maker(maker)
-        maker = maker.maker if maker.respond_to?("maker")
-        super(maker)
-      end
-
-      def have_author?
-        authors.any? {|author| !author.to_s.empty?} or
-          (source and source.have_author?)
-      end
-
-      private
-      def atom_validate(ignore_unknown_element, tags, uri)
-        unless have_author?
-          raise MissingTagError.new("author", tag_name)
-        end
-        validate_duplicate_links(links)
-      end
-
-      def have_required_elements?
-        super and have_author?
-      end
-
-      def maker_target(maker)
-        maker.items.new_item
-      end
-
-      Author = Feed::Entry::Author
-      Category = Feed::Entry::Category
-      Content = Feed::Entry::Content
-      Contributor = Feed::Entry::Contributor
-      Id = Feed::Entry::Id
-      Link = Feed::Entry::Link
-      Published = Feed::Entry::Published
-      Rights = Feed::Entry::Rights
-      Source = Feed::Entry::Source
-      Summary = Feed::Entry::Summary
-      Title = Feed::Entry::Title
-      Updated = Feed::Entry::Updated
-    end
-  end
-
-  Atom::CommonModel::ELEMENTS.each do |name|
-    BaseListener.install_get_text_element(Atom::URI, name, "#{name}=")
-  end
-
-  module ListenerMixin
-    private
-    def initial_start_feed(tag_name, prefix, attrs, ns)
-      check_ns(tag_name, prefix, ns, Atom::URI)
-
-      @rss = Atom::Feed.new(@version, @encoding, @standalone)
-      @rss.do_validate = @do_validate
-      @rss.xml_stylesheets = @xml_stylesheets
-      @rss.lang = attrs["xml:lang"]
-      @rss.base = attrs["xml:base"]
-      @last_element = @rss
-      pr = Proc.new do |text, tags|
-        @rss.validate_for_stream(tags) if @do_validate
-      end
-      @proc_stack.push(pr)
-    end
-
-    def initial_start_entry(tag_name, prefix, attrs, ns)
-      check_ns(tag_name, prefix, ns, Atom::URI)
-
-      @rss = Atom::Entry.new(@version, @encoding, @standalone)
-      @rss.do_validate = @do_validate
-      @rss.xml_stylesheets = @xml_stylesheets
-      @rss.lang = attrs["xml:lang"]
-      @rss.base = attrs["xml:base"]
-      @last_element = @rss
-      pr = Proc.new do |text, tags|
-        @rss.validate_for_stream(tags) if @do_validate
-      end
-      @proc_stack.push(pr)
-    end
-  end
-end
diff --git a/lib/rss/content.rb b/lib/rss/content.rb
deleted file mode 100644
index b12ee918aa..0000000000
--- a/lib/rss/content.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "rss/rss"
-
-module RSS
-  CONTENT_PREFIX = 'content'
-  CONTENT_URI = "http://purl.org/rss/1.0/modules/content/"
-
-  module ContentModel
-    extend BaseModel
-
-    ELEMENTS = ["#{CONTENT_PREFIX}_encoded"]
-
-    def self.append_features(klass)
-      super
-
-      klass.install_must_call_validator(CONTENT_PREFIX, CONTENT_URI)
-      ELEMENTS.each do |full_name|
-        name = full_name[(CONTENT_PREFIX.size + 1)..-1]
-        klass.install_text_element(name, CONTENT_URI, "?", full_name)
-      end
-    end
-  end
-
-  prefix_size = CONTENT_PREFIX.size + 1
-  ContentModel::ELEMENTS.each do |full_name|
-    name = full_name[prefix_size..-1]
-    BaseListener.install_get_text_element(CONTENT_URI, name, full_name)
-  end
-end
-
-require 'rss/content/1.0'
-require 'rss/content/2.0'
diff --git a/lib/rss/content/1.0.rb b/lib/rss/content/1.0.rb
deleted file mode 100644
index e7c0c19685..0000000000
--- a/lib/rss/content/1.0.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'rss/1.0'
-require 'rss/content'
-
-module RSS
-  RDF.install_ns(CONTENT_PREFIX, CONTENT_URI)
-
-  class RDF
-    class Item; include ContentModel; end
-  end
-end
diff --git a/lib/rss/content/2.0.rb b/lib/rss/content/2.0.rb
deleted file mode 100644
index 8671b5b1a6..0000000000
--- a/lib/rss/content/2.0.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require "rss/2.0"
-require "rss/content"
-
-module RSS
-  Rss.install_ns(CONTENT_PREFIX, CONTENT_URI)
-
-  class Rss
-    class Channel
-      class Item; include ContentModel; end
-    end
-  end
-end
diff --git a/lib/rss/converter.rb b/lib/rss/converter.rb
deleted file mode 100644
index 415a319188..0000000000
--- a/lib/rss/converter.rb
+++ /dev/null
@@ -1,162 +0,0 @@
-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'
-        if NKF.const_defined?(:UTF8)
-          def_convert(1) do |value|
-            "NKF.nkf(#{nkf_arg.dump}, #{value})"
-          end
-        else
-          def_iconv_convert(to_enc, from_enc, 1)
-        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/lib/rss/dublincore.rb b/lib/rss/dublincore.rb
deleted file mode 100644
index 7ba239f8f1..0000000000
--- a/lib/rss/dublincore.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-require "rss/rss"
-
-module RSS
-  DC_PREFIX = 'dc'
-  DC_URI = "http://purl.org/dc/elements/1.1/"
-
-  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))
-        if method_defined?(:date)
-          alias date_without_#{DC_PREFIX}_date= date=
-
-          def date=(value)
-            self.date_without_#{DC_PREFIX}_date = value
-            self.#{DC_PREFIX}_date = value
-          end
-        else
-          alias date #{DC_PREFIX}_date
-          alias date= #{DC_PREFIX}_date=
-        end
-
-        # For backward compatibility
-        alias #{DC_PREFIX}_rightses #{DC_PREFIX}_rights_list
-      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" => "rights_list"
-    }
-
-    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|
-      tag_name = "#{DC_PREFIX}:#{name}"
-      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}, #{tag_name.dump})
-
-          alias_method(:value=, :content=)
-        end
-      EOC
-    end
-  end
-
-  # For backward compatibility
-  DublincoreModel = DublinCoreModel
-
-  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
-
-require 'rss/dublincore/1.0'
-require 'rss/dublincore/2.0'
-require 'rss/dublincore/atom'
diff --git a/lib/rss/dublincore/1.0.rb b/lib/rss/dublincore/1.0.rb
deleted file mode 100644
index e193c6d2c2..0000000000
--- a/lib/rss/dublincore/1.0.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "rss/1.0"
-require "rss/dublincore"
-
-module RSS
-  RDF.install_ns(DC_PREFIX, DC_URI)
-
-  class RDF
-    class Channel; include DublinCoreModel; end
-    class Image; include DublinCoreModel; end
-    class Item; include DublinCoreModel; end
-    class Textinput; include DublinCoreModel; end
-  end
-end
diff --git a/lib/rss/dublincore/2.0.rb b/lib/rss/dublincore/2.0.rb
deleted file mode 100644
index 82ed1888c5..0000000000
--- a/lib/rss/dublincore/2.0.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "rss/2.0"
-require "rss/dublincore"
-
-module RSS
-  Rss.install_ns(DC_PREFIX, DC_URI)
-
-  class Rss
-    class Channel
-      include DublinCoreModel
-      class Item; include DublinCoreModel; end
-    end
-  end
-end
diff --git a/lib/rss/dublincore/atom.rb b/lib/rss/dublincore/atom.rb
deleted file mode 100644
index e78df4821b..0000000000
--- a/lib/rss/dublincore/atom.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "rss/atom"
-require "rss/dublincore"
-
-module RSS
-  module Atom
-    Feed.install_ns(DC_PREFIX, DC_URI)
-
-    class Feed
-      include DublinCoreModel
-      class Entry; include DublinCoreModel; end
-    end
-
-    class Entry
-      include DublinCoreModel
-    end
-  end
-end
diff --git a/lib/rss/image.rb b/lib/rss/image.rb
deleted file mode 100644
index c4714aea12..0000000000
--- a/lib/rss/image.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-require 'rss/1.0'
-require 'rss/dublincore'
-
-module RSS
-
-  IMAGE_PREFIX = 'image'
-  IMAGE_URI = 'http://purl.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 :set_size, :size=
-      private :set_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
-        set_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/lib/rss/itunes.rb b/lib/rss/itunes.rb
deleted file mode 100644
index f95ca7aa2e..0000000000
--- a/lib/rss/itunes.rb
+++ /dev/null
@@ -1,410 +0,0 @@
-require 'rss/2.0'
-
-module RSS
-  ITUNES_PREFIX = 'itunes'
-  ITUNES_URI = 'http://www.itunes.com/dtds/podcast-1.0.dtd'
-
-  Rss.install_ns(ITUNES_PREFIX, ITUNES_URI)
-
-  module ITunesModelUtils
-    include Utils
-
-    def def_class_accessor(klass, name, type, *args)
-        normalized_name = name.gsub(/-/, "_")
-      full_name = "#{ITUNES_PREFIX}_#{normalized_name}"
-      klass_name = "ITunes#{Utils.to_class_name(normalized_name)}"
-
-      case type
-      when :element, :attribute
-        klass::ELEMENTS << full_name
-        def_element_class_accessor(klass, name, full_name, klass_name, *args)
-      when :elements
-        klass::ELEMENTS << full_name
-        def_elements_class_accessor(klass, name, full_name, klass_name, *args)
-      else
-        klass.install_must_call_validator(ITUNES_PREFIX, ITUNES_URI)
-        klass.install_text_element(normalized_name, ITUNES_URI, "?",
-                                   full_name, type, name)
-      end
-    end
-
-    def def_element_class_accessor(klass, name, full_name, klass_name,
-                                   recommended_attribute_name=nil)
-      klass.install_have_child_element(name, ITUNES_PREFIX, "?", full_name)
-    end
-
-    def def_elements_class_accessor(klass, name, full_name, klass_name,
-                                    plural_name, recommended_attribute_name=nil)
-      full_plural_name = "#{ITUNES_PREFIX}_#{plural_name}"
-      klass.install_have_children_element(name, ITUNES_PREFIX, "*",
-                                          full_name, full_plural_name)
-    end
-  end
-
-  module ITunesBaseModel
-    extend ITunesModelUtils
-
-    ELEMENTS = []
-
-    ELEMENT_INFOS = [["author"],
-                     ["block", :yes_other],
-                     ["explicit", :yes_clean_other],
-                     ["keywords", :csv],
-                     ["subtitle"],
-                     ["summary"]]
-  end
-
-  module ITunesChannelModel
-    extend BaseModel
-    extend ITunesModelUtils
-    include ITunesBaseModel
-
-    ELEMENTS = []
-
-    class << self
-      def append_features(klass)
-        super
-
-        return if klass.instance_of?(Module)
-        ELEMENT_INFOS.each do |name, type, *additional_infos|
-          def_class_accessor(klass, name, type, *additional_infos)
-        end
-      end
-    end
-
-    ELEMENT_INFOS = [
-                     ["category", :elements, "categories", "text"],
-                     ["image", :attribute, "href"],
-                     ["owner", :element],
-                     ["new-feed-url"],
-                    ] + ITunesBaseModel::ELEMENT_INFOS
-
-    class ITunesCategory < Element
-      include RSS09
-
-      @tag_name = "category"
-
-      class << self
-        def required_prefix
-          ITUNES_PREFIX
-        end
-
-        def required_uri
-          ITUNES_URI
-        end
-      end
-
-      [
-        ["text", "", true]
-      ].each do |name, uri, required|
-        install_get_attribute(name, uri, required)
-      end
-
-      ITunesCategory = self
-      install_have_children_element("category", ITUNES_URI, "*",
-                                    "#{ITUNES_PREFIX}_category",
-                                    "#{ITUNES_PREFIX}_categories")
-
-      def initialize(*args)
-        if Utils.element_initialize_arguments?(args)
-          super
-        else
-          super()
-          self.text = args[0]
-        end
-      end
-
-      def full_name
-        tag_name_with_prefix(ITUNES_PREFIX)
-      end
-
-      private
-      def maker_target(categories)
-        if text or !itunes_categories.empty?
-          categories.new_category
-        else
-          nil
-        end
-      end
-
-      def setup_maker_attributes(category)
-        category.text = text if text
-      end
-
-      def setup_maker_elements(category)
-        super(category)
-        itunes_categories.each do |sub_category|
-          sub_category.setup_maker(category)
-        end
-      end
-    end
-
-    class ITunesImage < Element
-      include RSS09
-
-      @tag_name = "image"
-
-      class << self
-        def required_prefix
-          ITUNES_PREFIX
-        end
-
-        def required_uri
-          ITUNES_URI
-        end
-      end
-
-      [
-        ["href", "", 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.href = args[0]
-        end
-      end
-
-      def full_name
-        tag_name_with_prefix(ITUNES_PREFIX)
-      end
-
-      private
-      def maker_target(target)
-        if href
-          target.itunes_image {|image| image}
-        else
-          nil
-        end
-      end
-
-      def setup_maker_attributes(image)
-        image.href = href
-      end
-    end
-
-    class ITunesOwner < Element
-      include RSS09
-
-      @tag_name = "owner"
-
-      class << self
-        def required_prefix
-          ITUNES_PREFIX
-        end
-
-        def required_uri
-          ITUNES_URI
-        end
-      end
-
-      install_must_call_validator(ITUNES_PREFIX, ITUNES_URI)
-      [
-        ["name"],
-        ["email"],
-      ].each do |name,|
-        ITunesBaseModel::ELEMENT_INFOS << name
-        install_text_element(name, ITUNES_URI, nil, "#{ITUNES_PREFIX}_#{name}")
-      end
-
-      def initialize(*args)
-        if Utils.element_initialize_arguments?(args)
-          super
-        else
-          super()
-          self.itunes_name = args[0]
-          self.itunes_email = args[1]
-        end
-      end
-
-      def full_name
-        tag_name_with_prefix(ITUNES_PREFIX)
-      end
-
-      private
-      def maker_target(target)
-        target.itunes_owner
-      end
-
-      def setup_maker_element(owner)
-        super(owner)
-        owner.itunes_name = itunes_name
-        owner.itunes_email = itunes_email
-      end
-    end
-  end
-
-  module ITunesItemModel
-    extend BaseModel
-    extend ITunesModelUtils
-    include ITunesBaseModel
-
-    class << self
-      def append_features(klass)
-        super
-
-        return if klass.instance_of?(Module)
-        ELEMENT_INFOS.each do |name, type|
-          def_class_accessor(klass, name, type)
-        end
-      end
-    end
-
-    ELEMENT_INFOS = ITunesBaseModel::ELEMENT_INFOS +
-      [["duration", :element, "content"]]
-
-    class ITunesDuration < Element
-      include RSS09
-
-      @tag_name = "duration"
-
-      class << self
-        def required_prefix
-          ITUNES_PREFIX
-        end
-
-        def required_uri
-          ITUNES_URI
-        end
-
-        def parse(duration, do_validate=true)
-          if do_validate and /\A(?:
-                                  \d?\d:[0-5]\d:[0-5]\d|
-                                  [0-5]?\d:[0-5]\d
-                                )\z/x !~ duration
-            raise ArgumentError,
-                    "must be one of HH:MM:SS, H:MM:SS, MM::SS, M:SS: " +
-                    duration.inspect
-          end
-
-          components = duration.split(':')
-          components[3..-1] = nil if components.size > 3
-
-          components.unshift("00") until components.size == 3
-
-          components.collect do |component|
-            component.to_i
-          end
-        end
-
-        def construct(hour, minute, second)
-          components = [minute, second]
-          if components.include?(nil)
-            nil
-          else
-            components.unshift(hour) if hour and hour > 0
-            components.collect do |component|
-              "%02d" % component
-            end.join(":")
-          end
-        end
-      end
-
-      content_setup
-      alias_method(:value, :content)
-      remove_method(:content=)
-
-      attr_reader :hour, :minute, :second
-      def initialize(*args)
-        if Utils.element_initialize_arguments?(args)
-          super
-        else
-          super()
-          args = args[0] if args.size == 1 and args[0].is_a?(Array)
-          if args.size == 1
-            self.content = args[0]
-          elsif args.size > 3
-            raise ArgumentError,
-                    "must be (do_validate, params), (content), " +
-                    "(minute, second), ([minute, second]), "  +
-                    "(hour, minute, second) or ([hour, minute, second]): " +
-                    args.inspect
-          else
-            @second, @minute, @hour = args.reverse
-            update_content
-          end
-        end
-      end
-
-      def content=(value)
-        if value.nil?
-          @content = nil
-        elsif value.is_a?(self.class)
-          self.content = value.content
-        else
-          begin
-            @hour, @minute, @second = self.class.parse(value, @do_validate)
-          rescue ArgumentError
-            raise NotAvailableValueError.new(tag_name, value)
-          end
-          @content = value
-        end
-      end
-      alias_method(:value=, :content=)
-
-      def hour=(hour)
-        @hour = @do_validate ? Integer(hour) : hour.to_i
-        update_content
-        hour
-      end
-
-      def minute=(minute)
-        @minute = @do_validate ? Integer(minute) : minute.to_i
-        update_content
-        minute
-      end
-
-      def second=(second)
-        @second = @do_validate ? Integer(second) : second.to_i
-        update_content
-        second
-      end
-
-      def full_name
-        tag_name_with_prefix(ITUNES_PREFIX)
-      end
-
-      private
-      def update_content
-        @content = self.class.construct(hour, minute, second)
-      end
-
-      def maker_target(target)
-        if @content
-          target.itunes_duration {|duration| duration}
-        else
-          nil
-        end
-      end
-
-      def setup_maker_element(duration)
-        super(duration)
-        duration.content = @content
-      end
-    end
-  end
-
-  class Rss
-    class Channel
-      include ITunesChannelModel
-      class Item; include ITunesItemModel; end
-    end
-  end
-
-  element_infos =
-    ITunesChannelModel::ELEMENT_INFOS + ITunesItemModel::ELEMENT_INFOS
-  element_infos.each do |name, type|
-    case type
-    when :element, :elements, :attribute
-      class_name = Utils.to_class_name(name)
-      BaseListener.install_class_name(ITUNES_URI, name, "ITunes#{class_name}")
-    else
-      accessor_base = "#{ITUNES_PREFIX}_#{name.gsub(/-/, '_')}"
-      BaseListener.install_get_text_element(ITUNES_URI, name, accessor_base)
-    end
-  end
-end
diff --git a/lib/rss/maker.rb b/lib/rss/maker.rb
deleted file mode 100644
index bcba1aaff3..0000000000
--- a/lib/rss/maker.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require "rss/rss"
-
-module RSS
-  module Maker
-    MAKERS = {}
-
-    class << self
-      def make(version, &block)
-        m = maker(version)
-        raise UnsupportedMakerVersionError.new(version) if m.nil?
-        m[:maker].make(m[:version], &block)
-      end
-
-      def maker(version)
-        MAKERS[version]
-      end
-
-      def add_maker(version, normalized_version, maker)
-        MAKERS[version] = {:maker => maker, :version => normalized_version}
-      end
-
-      def versions
-        MAKERS.keys.uniq.sort
-      end
-
-      def makers
-        MAKERS.values.collect {|info| info[:maker]}.uniq
-      end
-    end
-  end
-end
-
-require "rss/maker/1.0"
-require "rss/maker/2.0"
-require "rss/maker/feed"
-require "rss/maker/entry"
-require "rss/maker/content"
-require "rss/maker/dublincore"
-require "rss/maker/slash"
-require "rss/maker/syndication"
-require "rss/maker/taxonomy"
-require "rss/maker/trackback"
-require "rss/maker/image"
-require "rss/maker/itunes"
diff --git a/lib/rss/maker/0.9.rb b/lib/rss/maker/0.9.rb
deleted file mode 100644
index 72b14dc977..0000000000
--- a/lib/rss/maker/0.9.rb
+++ /dev/null
@@ -1,467 +0,0 @@
-require "rss/0.9"
-
-require "rss/maker/base"
-
-module RSS
-  module Maker
-    
-    class RSS09 < RSSBase
-      
-      def initialize(feed_version="0.92")
-        super
-        @feed_type = "rss"
-      end
-      
-      private
-      def make_feed
-        Rss.new(@feed_version, @version, @encoding, @standalone)
-      end
-
-      def setup_elements(rss)
-        setup_channel(rss)
-      end
-
-      class Channel < ChannelBase
-        def to_feed(rss)
-          channel = Rss::Channel.new
-          set = setup_values(channel)
-          _not_set_required_variables = not_set_required_variables
-          if _not_set_required_variables.empty?
-            rss.channel = channel
-            set_parent(channel, rss)
-            setup_items(rss)
-            setup_image(rss)
-            setup_textinput(rss)
-            setup_other_elements(rss, channel)
-            rss
-          else
-            raise NotSetError.new("maker.channel", _not_set_required_variables)
-          end
-        end
-        
-        private
-        def setup_items(rss)
-          @maker.items.to_feed(rss)
-        end
-        
-        def setup_image(rss)
-          @maker.image.to_feed(rss)
-        end
-        
-        def setup_textinput(rss)
-          @maker.textinput.to_feed(rss)
-        end
-        
-        def variables
-          super + ["pubDate"]
-        end
-
-        def required_variable_names
-          %w(link language)
-        end
-
-        def not_set_required_variables
-          vars = super
-          vars << "description" unless description {|d| d.have_required_values?}
-          vars << "title" unless title {|t| t.have_required_values?}
-          vars
-        end
-
-        class SkipDays < SkipDaysBase
-          def to_feed(rss, channel)
-            unless @days.empty?
-              skipDays = Rss::Channel::SkipDays.new
-              channel.skipDays = skipDays
-              set_parent(skipDays, channel)
-              @days.each do |day|
-                day.to_feed(rss, skipDays.days)
-              end
-            end
-          end
-          
-          class Day < DayBase
-            def to_feed(rss, days)
-              day = Rss::Channel::SkipDays::Day.new
-              set = setup_values(day)
-              if set
-                days << day
-                set_parent(day, days)
-                setup_other_elements(rss, day)
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(content)
-            end
-          end
-        end
-        
-        class SkipHours < SkipHoursBase
-          def to_feed(rss, channel)
-            unless @hours.empty?
-              skipHours = Rss::Channel::SkipHours.new
-              channel.skipHours = skipHours
-              set_parent(skipHours, channel)
-              @hours.each do |hour|
-                hour.to_feed(rss, skipHours.hours)
-              end
-            end
-          end
-          
-          class Hour < HourBase
-            def to_feed(rss, hours)
-              hour = Rss::Channel::SkipHours::Hour.new
-              set = setup_values(hour)
-              if set
-                hours << hour
-                set_parent(hour, hours)
-                setup_other_elements(rss, hour)
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(content)
-            end
-          end
-        end
-        
-        class Cloud < CloudBase
-          def to_feed(*args)
-          end
-        end
-
-        class Categories < CategoriesBase
-          def to_feed(*args)
-          end
-
-          class Category < CategoryBase
-          end
-        end
-
-        class Links < LinksBase
-          def to_feed(rss, channel)
-            return if @links.empty?
-            @links.first.to_feed(rss, channel)
-          end
-
-          class Link < LinkBase
-            def to_feed(rss, channel)
-              if have_required_values?
-                channel.link = href
-              else
-                raise NotSetError.new("maker.channel.link",
-                                      not_set_required_variables)
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(href)
-            end
-          end
-        end
-
-        class Authors < AuthorsBase
-          def to_feed(rss, channel)
-          end
-
-          class Author < AuthorBase
-            def to_feed(rss, channel)
-            end
-          end
-        end
-
-        class Contributors < ContributorsBase
-          def to_feed(rss, channel)
-          end
-
-          class Contributor < ContributorBase
-          end
-        end
-
-        class Generator < GeneratorBase
-          def to_feed(rss, channel)
-          end
-        end
-
-        class Copyright < CopyrightBase
-          def to_feed(rss, channel)
-            channel.copyright = content if have_required_values?
-          end
-
-          private
-          def required_variable_names
-            %w(content)
-          end
-        end
-
-        class Description < DescriptionBase
-          def to_feed(rss, channel)
-            channel.description = content if have_required_values?
-          end
-
-          private
-          def required_variable_names
-            %w(content)
-          end
-        end
-
-        class Title < TitleBase
-          def to_feed(rss, channel)
-            channel.title = content if have_required_values?
-          end
-
-          private
-          def required_variable_names
-            %w(content)
-          end
-        end
-      end
-
-      class Image < ImageBase
-        def to_feed(rss)
-          image = Rss::Channel::Image.new
-          set = setup_values(image)
-          if set
-            image.link = link
-            rss.channel.image = image
-            set_parent(image, rss.channel)
-            setup_other_elements(rss, image)
-          elsif required_element?
-            raise NotSetError.new("maker.image", not_set_required_variables)
-          end
-        end
-
-        private
-        def required_variable_names
-          %w(url title link)
-        end
-
-        def required_element?
-          true
-        end
-      end
-      
-      class Items < ItemsBase
-        def to_feed(rss)
-          if rss.channel
-            normalize.each do |item|
-              item.to_feed(rss)
-            end
-            setup_other_elements(rss, rss.items)
-          end
-        end
-        
-        class Item < ItemBase
-          def to_feed(rss)
-            item = Rss::Channel::Item.new
-            set = setup_values(item)
-            _not_set_required_variables = not_set_required_variables
-            if _not_set_required_variables.empty?
-              rss.items << item
-              set_parent(item, rss.channel)
-              setup_other_elements(rss, item)
-            elsif variable_is_set?
-              raise NotSetError.new("maker.items", _not_set_required_variables)
-            end
-          end
-
-          private
-          def required_variable_names
-            []
-          end
-
-          def not_set_required_variables
-            vars = super
-            if @maker.feed_version == "0.91"
-              vars << "title" unless title {|t| t.have_required_values?}
-              vars << "link" unless link {|l| l.have_required_values?}
-            end
-            vars
-          end
-
-          class Guid < GuidBase
-            def to_feed(*args)
-            end
-          end
-
-          class Enclosure < EnclosureBase
-            def to_feed(*args)
-            end
-          end
-
-          class Source < SourceBase
-            def to_feed(*args)
-            end
-
-            class Authors < AuthorsBase
-              def to_feed(*args)
-              end
-
-              class Author < AuthorBase
-              end
-            end
-
-            class Categories < CategoriesBase
-              def to_feed(*args)
-              end
-
-              class Category < CategoryBase
-              end
-            end
-
-            class Contributors < ContributorsBase
-              def to_feed(*args)
-              end
-
-              class Contributor < ContributorBase
-              end
-            end
-
-            class Generator < GeneratorBase
-              def to_feed(*args)
-              end
-            end
-
-            class Icon < IconBase
-              def to_feed(*args)
-              end
-            end
-
-            class Links < LinksBase
-              def to_feed(*args)
-              end
-
-              class Link < LinkBase
-              end
-            end
-
-            class Logo < LogoBase
-              def to_feed(*args)
-              end
-            end
-
-            class Rights < RightsBase
-              def to_feed(*args)
-              end
-            end
-
-            class Subtitle < SubtitleBase
-              def to_feed(*args)
-              end
-            end
-
-            class Title < TitleBase
-              def to_feed(*args)
-              end
-            end
-          end
-
-          class Categories < CategoriesBase
-            def to_feed(*args)
-            end
-
-            class Category < CategoryBase
-            end
-          end
-
-          class Authors < AuthorsBase
-            def to_feed(*args)
-            end
-
-            class Author < AuthorBase
-            end
-          end
-
-          class Links < LinksBase
-            def to_feed(rss, item)
-              return if @links.empty?
-              @links.first.to_feed(rss, item)
-            end
-
-            class Link < LinkBase
-              def to_feed(rss, item)
-                if have_required_values?
-                  item.link = href
-                else
-                  raise NotSetError.new("maker.link",
-                                        not_set_required_variables)
-                end
-              end
-
-              private
-              def required_variable_names
-                %w(href)
-              end
-            end
-          end
-
-          class Contributors < ContributorsBase
-            def to_feed(rss, item)
-            end
-
-            class Contributor < ContributorBase
-            end
-          end
-
-          class Rights < RightsBase
-            def to_feed(rss, item)
-            end
-          end
-
-          class Description < DescriptionBase
-            def to_feed(rss, item)
-              item.description = content if have_required_values?
-            end
-
-            private
-            def required_variable_names
-              %w(content)
-            end
-          end
-
-          class Content < ContentBase
-            def to_feed(rss, item)
-            end
-          end
-
-          class Title < TitleBase
-            def to_feed(rss, item)
-              item.title = content if have_required_values?
-            end
-
-            private
-            def required_variable_names
-              %w(content)
-            end
-          end
-        end
-      end
-      
-      class Textinput < TextinputBase
-        def to_feed(rss)
-          textInput = Rss::Channel::TextInput.new
-          set = setup_values(textInput)
-          if set
-            rss.channel.textInput = textInput
-            set_parent(textInput, rss.channel)
-            setup_other_elements(rss, textInput)
-          end
-        end
-
-        private
-        def required_variable_names
-          %w(title description name link)
-        end
-      end
-    end
-    
-    add_maker("0.9", "0.92", RSS09)
-    add_maker("0.91", "0.91", RSS09)
-    add_maker("0.92", "0.92", RSS09)
-    add_maker("rss0.91", "0.91", RSS09)
-    add_maker("rss0.92", "0.92", RSS09)
-  end
-end
diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb
deleted file mode 100644
index a1e2594f70..0000000000
--- a/lib/rss/maker/1.0.rb
+++ /dev/null
@@ -1,434 +0,0 @@
-require "rss/1.0"
-
-require "rss/maker/base"
-
-module RSS
-  module Maker
-
-    class RSS10 < RSSBase
-
-      def initialize(feed_version="1.0")
-        super
-        @feed_type = "rss"
-      end
-
-      private
-      def make_feed
-        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_feed(rss)
-          set_default_values do
-            _not_set_required_variables = not_set_required_variables
-            if _not_set_required_variables.empty?
-              channel = RDF::Channel.new(@about)
-              set = setup_values(channel)
-              channel.dc_dates.clear
-              rss.channel = channel
-              set_parent(channel, rss)
-              setup_items(rss)
-              setup_image(rss)
-              setup_textinput(rss)
-              setup_other_elements(rss, channel)
-            else
-              raise NotSetError.new("maker.channel", _not_set_required_variables)
-            end
-          end
-        end
-
-        private
-        def setup_items(rss)
-          items = RDF::Channel::Items.new
-          seq = items.Seq
-          set_parent(items, seq)
-          target_items = @maker.items.normalize
-          raise NotSetError.new("maker", ["items"]) if target_items.empty?
-          target_items.each do |item|
-            li = RDF::Channel::Items::Seq::Li.new(item.link)
-            seq.lis << li
-            set_parent(li, seq)
-          end
-          rss.channel.items = items
-          set_parent(rss.channel, items)
-        end
-        
-        def setup_image(rss)
-          if @maker.image.have_required_values?
-            image = RDF::Channel::Image.new(@maker.image.url)
-            rss.channel.image = image
-            set_parent(image, rss.channel)
-          end
-        end
-
-        def setup_textinput(rss)
-          if @maker.textinput.have_required_values?
-            textinput = RDF::Channel::Textinput.new(@maker.textinput.link)
-            rss.channel.textinput = textinput
-            set_parent(textinput, rss.channel)
-          end
-        end
-
-        def required_variable_names
-          %w(about link)
-        end
-
-        def not_set_required_variables
-          vars = super
-          vars << "description" unless description {|d| d.have_required_values?}
-          vars << "title" unless title {|t| t.have_required_values?}
-          vars
-        end
-
-        class SkipDays < SkipDaysBase
-          def to_feed(*args)
-          end
-          
-          class Day < DayBase
-          end
-        end
-        
-        class SkipHours < SkipHoursBase
-          def to_feed(*args)
-          end
-
-          class Hour < HourBase
-          end
-        end
-        
-        class Cloud < CloudBase
-          def to_feed(*args)
-          end
-        end
-
-        class Categories < CategoriesBase
-          def to_feed(*args)
-          end
-
-          class Category < CategoryBase
-          end
-        end
-
-        class Links < LinksBase
-          def to_feed(rss, channel)
-            return if @links.empty?
-            @links.first.to_feed(rss, channel)
-          end
-
-          class Link < LinkBase
-            def to_feed(rss, channel)
-              if have_required_values?
-                channel.link = href
-              else
-                raise NotSetError.new("maker.channel.link",
-                                      not_set_required_variables)
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(href)
-            end
-          end
-        end
-
-        class Authors < AuthorsBase
-          def to_feed(rss, channel)
-          end
-
-          class Author < AuthorBase
-            def to_feed(rss, channel)
-            end
-          end
-        end
-
-        class Contributors < ContributorsBase
-          def to_feed(rss, channel)
-          end
-
-          class Contributor < ContributorBase
-          end
-        end
-
-        class Generator < GeneratorBase
-          def to_feed(rss, channel)
-          end
-        end
-
-        class Copyright < CopyrightBase
-          def to_feed(rss, channel)
-          end
-        end
-
-        class Description < DescriptionBase
-          def to_feed(rss, channel)
-            channel.description = content if have_required_values?
-          end
-
-          private
-          def required_variable_names
-            %w(content)
-          end
-        end
-
-        class Title < TitleBase
-          def to_feed(rss, channel)
-            channel.title = content if have_required_values?
-          end
-
-          private
-          def required_variable_names
-            %w(content)
-          end
-        end
-      end
-
-      class Image < ImageBase
-        def to_feed(rss)
-          if @url
-            image = RDF::Image.new(@url)
-            set = setup_values(image)
-            if set
-              rss.image = image
-              set_parent(image, rss)
-              setup_other_elements(rss, image)
-            end
-          end
-        end
-
-        def have_required_values?
-          super and @maker.channel.have_required_values?
-        end
-
-        private
-        def variables
-          super + ["link"]
-        end
-
-        def required_variable_names
-          %w(url title link)
-        end
-      end
-
-      class Items < ItemsBase
-        def to_feed(rss)
-          if rss.channel
-            normalize.each do |item|
-              item.to_feed(rss)
-            end
-            setup_other_elements(rss, rss.items)
-          end
-        end
-
-        class Item < ItemBase
-          def to_feed(rss)
-            set_default_values do
-              item = RDF::Item.new(link)
-              set = setup_values(item)
-              if set
-                item.dc_dates.clear
-                rss.items << item
-                set_parent(item, rss)
-                setup_other_elements(rss, item)
-              elsif !have_required_values?
-                raise NotSetError.new("maker.item", not_set_required_variables)
-              end
-            end
-          end
-
-          private
-          def required_variable_names
-            %w(link)
-          end
-
-          def variables
-            super + %w(link)
-          end
-
-          def not_set_required_variables
-            set_default_values do
-              vars = super
-              vars << "title" unless title {|t| t.have_required_values?}
-              vars
-            end
-          end
-
-          class Guid < GuidBase
-            def to_feed(*args)
-            end
-          end
-
-          class Enclosure < EnclosureBase
-            def to_feed(*args)
-            end
-          end
-
-          class Source < SourceBase
-            def to_feed(*args)
-            end
-
-            class Authors < AuthorsBase
-              def to_feed(*args)
-              end
-
-              class Author < AuthorBase
-              end
-            end
-
-            class Categories < CategoriesBase
-              def to_feed(*args)
-              end
-
-              class Category < CategoryBase
-              end
-            end
-
-            class Contributors < ContributorsBase
-              def to_feed(*args)
-              end
-
-              class Contributor < ContributorBase
-              end
-            end
-
-            class Generator < GeneratorBase
-              def to_feed(*args)
-              end
-            end
-
-            class Icon < IconBase
-              def to_feed(*args)
-              end
-            end
-
-            class Links < LinksBase
-              def to_feed(*args)
-              end
-
-              class Link < LinkBase
-              end
-            end
-
-            class Logo < LogoBase
-              def to_feed(*args)
-              end
-            end
-
-            class Rights < RightsBase
-              def to_feed(*args)
-              end
-            end
-
-            class Subtitle < SubtitleBase
-              def to_feed(*args)
-              end
-            end
-
-            class Title < TitleBase
-              def to_feed(*args)
-              end
-            end
-          end
-
-          class Categories < CategoriesBase
-            def to_feed(*args)
-            end
-
-            class Category < CategoryBase
-            end
-          end
-
-          class Authors < AuthorsBase
-            def to_feed(*args)
-            end
-
-            class Author < AuthorBase
-            end
-          end
-
-          class Links < LinksBase
-            def to_feed(*args)
-            end
-
-            class Link < LinkBase
-            end
-          end
-
-          class Contributors < ContributorsBase
-            def to_feed(rss, item)
-            end
-
-            class Contributor < ContributorBase
-            end
-          end
-
-          class Rights < RightsBase
-            def to_feed(rss, item)
-            end
-          end
-
-          class Description < DescriptionBase
-            def to_feed(rss, item)
-              item.description = content if have_required_values?
-            end
-
-            private
-            def required_variable_names
-              %w(content)
-            end
-          end
-
-          class Content < ContentBase
-            def to_feed(rss, item)
-            end
-          end
-
-          class Title < TitleBase
-            def to_feed(rss, item)
-              item.title = content if have_required_values?
-            end
-
-            private
-            def required_variable_names
-              %w(content)
-            end
-          end
-        end
-      end
-      
-      class Textinput < TextinputBase
-        def to_feed(rss)
-          if @link
-            textinput = RDF::Textinput.new(@link)
-            set = setup_values(textinput)
-            if set
-              rss.textinput = textinput
-              set_parent(textinput, rss)
-              setup_other_elements(rss, textinput)
-            end
-          end
-        end
-
-        def have_required_values?
-          super and @maker.channel.have_required_values?
-        end
-
-        private
-        def required_variable_names
-          %w(title description name link)
-        end
-      end
-    end
-
-    add_maker("1.0", "1.0", RSS10)
-    add_maker("rss1.0", "1.0", RSS10)
-  end
-end
diff --git a/lib/rss/maker/2.0.rb b/lib/rss/maker/2.0.rb
deleted file mode 100644
index 67d68126ac..0000000000
--- a/lib/rss/maker/2.0.rb
+++ /dev/null
@@ -1,223 +0,0 @@
-require "rss/2.0"
-
-require "rss/maker/0.9"
-
-module RSS
-  module Maker
-    
-    class RSS20 < RSS09
-      
-      def initialize(feed_version="2.0")
-        super
-      end
-
-      class Channel < RSS09::Channel
-
-        private
-        def required_variable_names
-          %w(link)
-        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_feed(rss, channel)
-            cloud = Rss::Channel::Cloud.new
-            set = setup_values(cloud)
-            if set
-              channel.cloud = cloud
-              set_parent(cloud, channel)
-              setup_other_elements(rss, cloud)
-            end
-          end
-
-          private
-          def required_variable_names
-            %w(domain port path registerProcedure protocol)
-          end
-        end
-
-        class Categories < RSS09::Channel::Categories
-          def to_feed(rss, channel)
-            @categories.each do |category|
-              category.to_feed(rss, channel)
-            end
-          end
-          
-          class Category < RSS09::Channel::Categories::Category
-            def to_feed(rss, channel)
-              category = Rss::Channel::Category.new
-              set = setup_values(category)
-              if set
-                channel.categories << category
-                set_parent(category, channel)
-                setup_other_elements(rss, category)
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(content)
-            end
-          end
-        end
-
-        class Generator < GeneratorBase
-          def to_feed(rss, channel)
-            channel.generator = content
-          end
-
-          private
-          def required_variable_names
-            %w(content)
-          end
-        end
-      end
-      
-      class Image < RSS09::Image
-        private
-        def required_element?
-          false
-        end
-      end
-      
-      class Items < RSS09::Items
-        class Item < RSS09::Items::Item
-          private
-          def required_variable_names
-            []
-          end
-
-          def not_set_required_variables
-            vars = super
-            if !title {|t| t.have_required_values?} and
-                !description {|d| d.have_required_values?}
-              vars << "title or description"
-            end
-            vars
-          end
-
-          def variables
-            super + ["pubDate"]
-          end
-
-          class Guid < RSS09::Items::Item::Guid
-            def to_feed(rss, item)
-              guid = Rss::Channel::Item::Guid.new
-              set = setup_values(guid)
-              if set
-                item.guid = guid
-                set_parent(guid, item)
-                setup_other_elements(rss, guid)
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(content)
-            end
-          end
-
-          class Enclosure < RSS09::Items::Item::Enclosure
-            def to_feed(rss, item)
-              enclosure = Rss::Channel::Item::Enclosure.new
-              set = setup_values(enclosure)
-              if set
-                item.enclosure = enclosure
-                set_parent(enclosure, item)
-                setup_other_elements(rss, enclosure)
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(url length type)
-            end
-          end
-
-          class Source < RSS09::Items::Item::Source
-            def to_feed(rss, item)
-              source = Rss::Channel::Item::Source.new
-              set = setup_values(source)
-              if set
-                item.source = source
-                set_parent(source, item)
-                setup_other_elements(rss, source)
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(url content)
-            end
-
-            class Links < RSS09::Items::Item::Source::Links
-              def to_feed(rss, source)
-                return if @links.empty?
-                @links.first.to_feed(rss, source)
-              end
-
-              class Link < RSS09::Items::Item::Source::Links::Link
-                def to_feed(rss, source)
-                  source.url = href
-                end
-              end
-            end
-          end
-
-          class Categories < RSS09::Items::Item::Categories
-            def to_feed(rss, item)
-              @categories.each do |category|
-                category.to_feed(rss, item)
-              end
-            end
-          
-            class Category < RSS09::Items::Item::Categories::Category
-              def to_feed(rss, item)
-                category = Rss::Channel::Item::Category.new
-                set = setup_values(category)
-                if set
-                  item.categories << category
-                  set_parent(category, item)
-                  setup_other_elements(rss)
-                end
-              end
-
-              private
-              def required_variable_names
-                %w(content)
-              end
-            end
-          end
-
-          class Authors < RSS09::Items::Item::Authors
-            def to_feed(rss, item)
-              return if @authors.empty?
-              @authors.first.to_feed(rss, item)
-            end
-
-            class Author < RSS09::Items::Item::Authors::Author
-              def to_feed(rss, item)
-                item.author = name
-              end
-            end
-          end
-        end
-      end
-      
-      class Textinput < RSS09::Textinput
-      end
-    end
-    
-    add_maker("2.0", "2.0", RSS20)
-    add_maker("rss2.0", "2.0", RSS20)
-  end
-end
diff --git a/lib/rss/maker/atom.rb b/lib/rss/maker/atom.rb
deleted file mode 100644
index fd3198cd9e..0000000000
--- a/lib/rss/maker/atom.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-require "rss/atom"
-
-require "rss/maker/base"
-
-module RSS
-  module Maker
-    module AtomPersons
-      module_function
-      def def_atom_persons(klass, name, maker_name, plural=nil)
-        plural ||= "#{name}s"
-        klass_name = Utils.to_class_name(name)
-        plural_klass_name = Utils.to_class_name(plural)
-
-        klass.class_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          class #{plural_klass_name} < #{plural_klass_name}Base
-            class #{klass_name} < #{klass_name}Base
-              def to_feed(feed, current)
-                #{name} = feed.class::#{klass_name}.new
-                set = setup_values(#{name})
-                unless set
-                  raise NotSetError.new(#{maker_name.dump},
-                                        not_set_required_variables)
-                end
-                current.#{plural} << #{name}
-                set_parent(#{name}, current)
-                setup_other_elements(#{name})
-              end
-
-              private
-              def required_variable_names
-                %w(name)
-              end
-            end
-          end
-EOC
-      end
-    end
-
-    module AtomTextConstruct
-      class << self
-        def def_atom_text_construct(klass, name, maker_name, klass_name=nil,
-                                    atom_klass_name=nil)
-          klass_name ||= Utils.to_class_name(name)
-          atom_klass_name ||= Utils.to_class_name(name)
-
-          klass.class_eval(<<-EOC, __FILE__, __LINE__ + 1)
-            class #{klass_name} < #{klass_name}Base
-              include #{self.name}
-              def to_feed(feed, current)
-                #{name} = current.class::#{atom_klass_name}.new
-                if setup_values(#{name})
-                  current.#{name} = #{name}
-                  set_parent(#{name}, current)
-                  setup_other_elements(feed)
-                elsif variable_is_set?
-                  raise NotSetError.new(#{maker_name.dump},
-                                        not_set_required_variables)
-                end
-              end
-            end
-          EOC
-        end
-      end
-
-      private
-      def required_variable_names
-        if type == "xhtml"
-          %w(xml_content)
-        else
-          %w(content)
-        end
-      end
-
-      def variables
-        if type == "xhtml"
-          super + %w(xhtml)
-        else
-          super
-        end
-      end
-    end
-
-    module AtomCategory
-      def to_feed(feed, current)
-        category = feed.class::Category.new
-        set = setup_values(category)
-        if set
-          current.categories << category
-          set_parent(category, current)
-          setup_other_elements(feed)
-        else
-          raise NotSetError.new(self.class.not_set_name,
-                                not_set_required_variables)
-        end
-      end
-
-      private
-      def required_variable_names
-        %w(term)
-      end
-
-      def variables
-        super + ["term", "scheme"]
-      end
-    end
-
-    module AtomLink
-      def to_feed(feed, current)
-        link = feed.class::Link.new
-        set = setup_values(link)
-        if set
-          current.links << link
-          set_parent(link, current)
-          setup_other_elements(feed)
-        else
-          raise NotSetError.new(self.class.not_set_name,
-                                not_set_required_variables)
-        end
-      end
-
-      private
-      def required_variable_names
-        %w(href)
-      end
-    end
-
-    module AtomGenerator
-      def to_feed(feed, current)
-        generator = current.class::Generator.new
-        if setup_values(generator)
-          current.generator = generator
-          set_parent(generator, current)
-          setup_other_elements(feed)
-        elsif variable_is_set?
-          raise NotSetError.new(self.class.not_set_name,
-                                not_set_required_variables)
-        end
-      end
-
-      private
-      def required_variable_names
-        %w(content)
-      end
-    end
-
-    module AtomLogo
-      def to_feed(feed, current)
-        logo = current.class::Logo.new
-        class << logo
-          alias_method(:uri=, :content=)
-        end
-        set = setup_values(logo)
-        class << logo
-          remove_method(:uri=)
-        end
-        if set
-          current.logo = logo
-          set_parent(logo, current)
-          setup_other_elements(feed)
-        elsif variable_is_set?
-          raise NotSetError.new(self.class.not_set_name,
-                                not_set_required_variables)
-        end
-      end
-
-      private
-      def required_variable_names
-        %w(uri)
-      end
-    end
-  end
-end
diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb
deleted file mode 100644
index 56bf04657e..0000000000
--- a/lib/rss/maker/base.rb
+++ /dev/null
@@ -1,868 +0,0 @@
-require 'forwardable'
-
-require 'rss/rss'
-
-module RSS
-  module Maker
-    class Base
-      extend Utils::InheritedReader
-
-      OTHER_ELEMENTS = []
-      NEED_INITIALIZE_VARIABLES = []
-
-      class << self
-        def other_elements
-          inherited_array_reader("OTHER_ELEMENTS")
-        end
-        def need_initialize_variables
-          inherited_array_reader("NEED_INITIALIZE_VARIABLES")
-        end
-
-        def inherited_base
-          ::RSS::Maker::Base
-        end
-
-        def inherited(subclass)
-          subclass.const_set("OTHER_ELEMENTS", [])
-          subclass.const_set("NEED_INITIALIZE_VARIABLES", [])
-        end
-
-        def add_other_element(variable_name)
-          self::OTHER_ELEMENTS << variable_name
-        end
-
-        def add_need_initialize_variable(variable_name, init_value="nil")
-          self::NEED_INITIALIZE_VARIABLES << [variable_name, init_value]
-        end
-
-        def def_array_element(name, plural=nil, klass_name=nil)
-          include Enumerable
-          extend Forwardable
-
-          plural ||= "#{name}s"
-          klass_name ||= Utils.to_class_name(name)
-          def_delegators("@#{plural}", :<<, :[], :[]=, :first, :last)
-          def_delegators("@#{plural}", :push, :pop, :shift, :unshift)
-          def_delegators("@#{plural}", :each, :size, :empty?, :clear)
-
-          add_need_initialize_variable(plural, "[]")
-
-          module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-            def new_#{name}
-              #{name} = self.class::#{klass_name}.new(@maker)
-              @#{plural} << #{name}
-              if block_given?
-                yield #{name}
-              else
-                #{name}
-              end
-            end
-            alias new_child new_#{name}
-
-            def to_feed(*args)
-              @#{plural}.each do |#{name}|
-                #{name}.to_feed(*args)
-              end
-            end
-
-            def replace(elements)
-              @#{plural}.replace(elements.to_a)
-            end
-          EOC
-        end
-
-        def def_classed_element_without_accessor(name, class_name=nil)
-          class_name ||= Utils.to_class_name(name)
-          add_other_element(name)
-          add_need_initialize_variable(name, "make_#{name}")
-          module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-            private
-            def setup_#{name}(feed, current)
-              @#{name}.to_feed(feed, current)
-            end
-
-            def make_#{name}
-              self.class::#{class_name}.new(@maker)
-            end
-          EOC
-        end
-
-        def def_classed_element(name, class_name=nil, attribute_name=nil)
-          def_classed_element_without_accessor(name, class_name)
-          if attribute_name
-            module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-              def #{name}
-                if block_given?
-                  yield(@#{name})
-                else
-                  @#{name}.#{attribute_name}
-                end
-              end
-
-              def #{name}=(new_value)
-                @#{name}.#{attribute_name} = new_value
-              end
-            EOC
-          else
-            attr_reader name
-          end
-        end
-
-        def def_classed_elements(name, attribute, plural_class_name=nil,
-                                 plural_name=nil, new_name=nil)
-          plural_name ||= "#{name}s"
-          new_name ||= name
-          def_classed_element(plural_name, plural_class_name)
-          local_variable_name = "_#{name}"
-          new_value_variable_name = "new_value"
-          additional_setup_code = nil
-          if block_given?
-            additional_setup_code = yield(local_variable_name,
-                                          new_value_variable_name)
-          end
-          module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-            def #{name}
-              #{local_variable_name} = #{plural_name}.first
-              #{local_variable_name} ? #{local_variable_name}.#{attribute} : nil
-            end
-
-            def #{name}=(#{new_value_variable_name})
-              #{local_variable_name} =
-                #{plural_name}.first || #{plural_name}.new_#{new_name}
-              #{additional_setup_code}
-              #{local_variable_name}.#{attribute} = #{new_value_variable_name}
-            end
-          EOC
-        end
-
-        def def_other_element(name)
-          attr_accessor name
-          def_other_element_without_accessor(name)
-        end
-
-        def def_other_element_without_accessor(name)
-          add_need_initialize_variable(name)
-          add_other_element(name)
-          module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-            def setup_#{name}(feed, current)
-              if !@#{name}.nil? and current.respond_to?(:#{name}=)
-                current.#{name} = @#{name}
-              end
-            end
-          EOC
-        end
-
-        def def_csv_element(name, type=nil)
-          def_other_element_without_accessor(name)
-          attr_reader(name)
-          converter = ""
-          if type == :integer
-            converter = "{|v| Integer(v)}"
-          end
-          module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-            def #{name}=(value)
-              @#{name} = Utils::CSV.parse(value)#{converter}
-            end
-          EOC
-        end
-      end
-
-      attr_reader :maker
-      def initialize(maker)
-        @maker = maker
-        @default_values_are_set = false
-        initialize_variables
-      end
-
-      def have_required_values?
-        not_set_required_variables.empty?
-      end
-
-      def variable_is_set?
-        variables.any? {|var| not __send__(var).nil?}
-      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(feed, current=nil)
-        current ||= current_element(feed)
-        self.class.other_elements.each do |element|
-          __send__("setup_#{element}", feed, current)
-        end
-      end
-
-      def current_element(feed)
-        feed
-      end
-
-      def set_default_values(&block)
-        return yield if @default_values_are_set
-
-        begin
-          @default_values_are_set = true
-          _set_default_values(&block)
-        ensure
-          @default_values_are_set = false
-        end
-      end
-
-      def _set_default_values(&block)
-        yield
-      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 set_parent(target, parent)
-        target.parent = parent if target.class.need_parent?
-      end
-
-      def variables
-        self.class.need_initialize_variables.find_all do |name, init|
-          "nil" == init
-        end.collect do |name, init|
-          name
-        end
-      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
-
-    module AtomPersonConstructBase
-      def self.append_features(klass)
-        super
-
-        klass.class_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          %w(name uri email).each do |element|
-            attr_accessor element
-            add_need_initialize_variable(element)
-          end
-        EOC
-      end
-    end
-
-    module AtomTextConstructBase
-      module EnsureXMLContent
-        class << self
-          def included(base)
-            super
-            base.class_eval do
-              %w(type content xml_content).each do |element|
-                attr_reader element
-                attr_writer element if element != "xml_content"
-                add_need_initialize_variable(element)
-              end
-
-              alias_method(:xhtml, :xml_content)
-            end
-          end
-        end
-
-        def ensure_xml_content(content)
-          xhtml_uri = ::RSS::Atom::XHTML_URI
-          unless content.is_a?(RSS::XML::Element) and
-              ["div", xhtml_uri] == [content.name, content.uri]
-            children = content
-            children = [children] unless content.is_a?(Array)
-            children = set_xhtml_uri_as_default_uri(children)
-            content = RSS::XML::Element.new("div", nil, xhtml_uri,
-                                            {"xmlns" => xhtml_uri},
-                                            children)
-          end
-          content
-        end
-
-        def xml_content=(content)
-          @xml_content = ensure_xml_content(content)
-        end
-
-        def xhtml=(content)
-          self.xml_content = content
-        end
-
-        private
-        def set_xhtml_uri_as_default_uri(children)
-          children.collect do |child|
-            if child.is_a?(RSS::XML::Element) and
-                child.prefix.nil? and child.uri.nil?
-              RSS::XML::Element.new(child.name, nil, ::RSS::Atom::XHTML_URI,
-                                    child.attributes.dup,
-                                    set_xhtml_uri_as_default_uri(child.children))
-            else
-              child
-            end
-          end
-        end
-      end
-
-      def self.append_features(klass)
-        super
-
-        klass.class_eval do
-          include EnsureXMLContent
-        end
-      end
-    end
-
-    module SetupDefaultDate
-      private
-      def _set_default_values(&block)
-        keep = {
-          :date => date,
-          :dc_dates => dc_dates.to_a.dup,
-        }
-        _date = date
-        if _date and !dc_dates.any? {|dc_date| dc_date.value == _date}
-          dc_date = self.class::DublinCoreDates::DublinCoreDate.new(self)
-          dc_date.value = _date.dup
-          dc_dates.unshift(dc_date)
-        end
-        self.date ||= self.dc_date
-        super(&block)
-      ensure
-        date = keep[:date]
-        dc_dates.replace(keep[:dc_dates])
-      end
-    end
-
-    class RSSBase < Base
-      class << self
-        def make(version, &block)
-          new(version).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}(feed)
-            @#{element}.to_feed(feed)
-          end
-
-          def make_#{element}
-            self.class::#{Utils.to_class_name(element)}.new(self)
-          end
-        EOC
-      end
-      
-      attr_reader :feed_version
-      alias_method(:rss_version, :feed_version)
-      attr_accessor :version, :encoding, :standalone
-
-      def initialize(feed_version)
-        super(self)
-        @feed_type = nil
-        @feed_subtype = nil
-        @feed_version = feed_version
-        @version = "1.0"
-        @encoding = "UTF-8"
-        @standalone = nil
-      end
-      
-      def make
-        if block_given?
-          yield(self)
-          to_feed
-        else
-          nil
-        end
-      end
-
-      def to_feed
-        feed = make_feed
-        setup_xml_stylesheets(feed)
-        setup_elements(feed)
-        setup_other_elements(feed)
-        if feed.valid?
-          feed
-        else
-          nil
-        end
-      end
-      
-      private
-      remove_method :make_xml_stylesheets
-      def make_xml_stylesheets
-        XMLStyleSheets.new(self)
-      end
-    end
-
-    class XMLStyleSheets < Base
-      def_array_element("xml_stylesheet", nil, "XMLStyleSheet")
-
-      class XMLStyleSheet < Base
-
-        ::RSS::XMLStyleSheet::ATTRIBUTES.each do |attribute|
-          attr_accessor attribute
-          add_need_initialize_variable(attribute)
-        end
-        
-        def to_feed(feed)
-          xss = ::RSS::XMLStyleSheet.new
-          guess_type_if_need(xss)
-          set = setup_values(xss)
-          if set
-            feed.xml_stylesheets << xss
-          end
-        end
-
-        private
-        def guess_type_if_need(xss)
-          if @type.nil?
-            xss.href = @href
-            @type = xss.type
-          end
-        end
-
-        def required_variable_names
-          %w(href type)
-        end
-      end
-    end
-    
-    class ChannelBase < Base
-      include SetupDefaultDate
-
-      %w(cloud categories skipDays skipHours).each do |name|
-        def_classed_element(name)
-      end
-
-      %w(generator copyright description title).each do |name|
-        def_classed_element(name, nil, "content")
-      end
-
-      [
-       ["link", "href", Proc.new {|target,| "#{target}.href = 'self'"}],
-       ["author", "name"],
-       ["contributor", "name"],
-      ].each do |name, attribute, additional_setup_maker|
-        def_classed_elements(name, attribute, &additional_setup_maker)
-      end
-
-      %w(id about language
-         managingEditor webMaster rating docs date
-         lastBuildDate ttl).each do |element|
-        attr_accessor element
-        add_need_initialize_variable(element)
-      end
-
-      def pubDate
-        date
-      end
-
-      def pubDate=(date)
-        self.date = date
-      end
-
-      def updated
-        date
-      end
-
-      def updated=(date)
-        self.date = date
-      end
-
-      alias_method(:rights, :copyright)
-      alias_method(:rights=, :copyright=)
-
-      alias_method(:subtitle, :description)
-      alias_method(:subtitle=, :description=)
-
-      def icon
-        image_favicon.about
-      end
-
-      def icon=(url)
-        image_favicon.about = url
-      end
-
-      def logo
-        maker.image.url
-      end
-
-      def logo=(url)
-        maker.image.url = url
-      end
-
-      class SkipDaysBase < Base
-        def_array_element("day")
-
-        class DayBase < Base
-          %w(content).each do |element|
-            attr_accessor element
-            add_need_initialize_variable(element)
-          end
-        end
-      end
-      
-      class SkipHoursBase < Base
-        def_array_element("hour")
-
-        class HourBase < Base
-          %w(content).each do |element|
-            attr_accessor element
-            add_need_initialize_variable(element)
-          end
-        end
-      end
-      
-      class CloudBase < Base
-        %w(domain port path registerProcedure protocol).each do |element|
-          attr_accessor element
-          add_need_initialize_variable(element)
-        end
-      end
-
-      class CategoriesBase < Base
-        def_array_element("category", "categories")
-
-        class CategoryBase < Base
-          %w(domain content label).each do |element|
-            attr_accessor element
-            add_need_initialize_variable(element)
-          end
-
-          alias_method(:term, :domain)
-          alias_method(:term=, :domain=)
-          alias_method(:scheme, :content)
-          alias_method(:scheme=, :content=)
-        end
-      end
-
-      class LinksBase < Base
-        def_array_element("link")
-
-        class LinkBase < Base
-          %w(href rel type hreflang title length).each do |element|
-            attr_accessor element
-            add_need_initialize_variable(element)
-          end
-        end
-      end
-
-      class AuthorsBase < Base
-        def_array_element("author")
-
-        class AuthorBase < Base
-          include AtomPersonConstructBase
-        end
-      end
-
-      class ContributorsBase < Base
-        def_array_element("contributor")
-
-        class ContributorBase < Base
-          include AtomPersonConstructBase
-        end
-      end
-
-      class GeneratorBase < Base
-        %w(uri version content).each do |element|
-          attr_accessor element
-          add_need_initialize_variable(element)
-        end
-      end
-
-      class CopyrightBase < Base
-        include AtomTextConstructBase
-      end
-
-      class DescriptionBase < Base
-        include AtomTextConstructBase
-      end
-
-      class TitleBase < Base
-        include AtomTextConstructBase
-      end
-    end
-    
-    class ImageBase < 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
-    end
-    
-    class ItemsBase < Base
-      def_array_element("item")
-
-      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
-
-      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 < Base
-        include SetupDefaultDate
-
-        %w(guid enclosure source categories content).each do |name|
-          def_classed_element(name)
-        end
-
-        %w(rights description title).each do |name|
-          def_classed_element(name, nil, "content")
-        end
-
-        [
-         ["author", "name"],
-         ["link", "href", Proc.new {|target,| "#{target}.href = 'alternate'"}],
-         ["contributor", "name"],
-        ].each do |name, attribute|
-          def_classed_elements(name, attribute)
-	end
-
-        %w(date comments id published).each do |element|
-          attr_accessor element
-          add_need_initialize_variable(element)
-        end
-
-        def pubDate
-          date
-        end
-
-        def pubDate=(date)
-          self.date = date
-        end
-
-        def updated
-          date
-        end
-
-        def updated=(date)
-          self.date = date
-        end
-
-        alias_method(:summary, :description)
-        alias_method(:summary=, :description=)
-
-        def <=>(other)
-          _date = date || dc_date
-          _other_date = other.date || other.dc_date
-          if _date and _other_date
-            _date <=> _other_date
-          elsif _date
-            1
-          elsif _other_date
-            -1
-          else
-            0
-          end
-        end
-
-        class GuidBase < Base
-          %w(isPermaLink content).each do |element|
-            attr_accessor element
-            add_need_initialize_variable(element)
-          end
-        end
-
-        class EnclosureBase < Base
-          %w(url length type).each do |element|
-            attr_accessor element
-            add_need_initialize_variable(element)
-          end
-        end
-
-        class SourceBase < Base
-          %w(authors categories contributors generator icon
-             logo rights subtitle title).each do |name|
-            def_classed_element(name)
-          end
-
-          [
-           ["link", "href"],
-          ].each do |name, attribute|
-            def_classed_elements(name, attribute)
-          end
-
-          %w(id content date).each do |element|
-            attr_accessor element
-            add_need_initialize_variable(element)
-          end
-
-          alias_method(:url, :link)
-          alias_method(:url=, :link=)
-
-          def updated
-            date
-          end
-
-          def updated=(date)
-            self.date = date
-          end
-
-          private
-          AuthorsBase = ChannelBase::AuthorsBase
-          CategoriesBase = ChannelBase::CategoriesBase
-          ContributorsBase = ChannelBase::ContributorsBase
-          GeneratorBase = ChannelBase::GeneratorBase
-
-          class IconBase < Base
-            %w(url).each do |element|
-              attr_accessor element
-              add_need_initialize_variable(element)
-            end
-          end
-
-          LinksBase = ChannelBase::LinksBase
-
-          class LogoBase < Base
-            %w(uri).each do |element|
-              attr_accessor element
-              add_need_initialize_variable(element)
-            end
-          end
-
-          class RightsBase < Base
-            include AtomTextConstructBase
-          end
-
-          class SubtitleBase < Base
-            include AtomTextConstructBase
-          end
-
-          class TitleBase < Base
-            include AtomTextConstructBase
-          end
-        end
-
-        CategoriesBase = ChannelBase::CategoriesBase
-        AuthorsBase = ChannelBase::AuthorsBase
-        LinksBase = ChannelBase::LinksBase
-        ContributorsBase = ChannelBase::ContributorsBase
-
-        class RightsBase < Base
-          include AtomTextConstructBase
-        end
-
-        class DescriptionBase < Base
-          include AtomTextConstructBase
-        end
-
-        class ContentBase < Base
-          include AtomTextConstructBase::EnsureXMLContent
-
-          %w(src).each do |element|
-            attr_accessor(element)
-            add_need_initialize_variable(element)
-          end
-
-          def xml_content=(content)
-            content = ensure_xml_content(content) if inline_xhtml?
-            @xml_content = content
-          end
-
-          alias_method(:xml, :xml_content)
-          alias_method(:xml=, :xml_content=)
-
-          def inline_text?
-            [nil, "text", "html"].include?(@type)
-          end
-
-          def inline_html?
-            @type == "html"
-          end
-
-          def inline_xhtml?
-            @type == "xhtml"
-          end
-
-          def inline_other?
-            !out_of_line? and ![nil, "text", "html", "xhtml"].include?(@type)
-          end
-
-          def inline_other_text?
-            return false if @type.nil? or out_of_line?
-            /\Atext\//i.match(@type) ? true : false
-          end
-
-          def inline_other_xml?
-            return false if @type.nil? or out_of_line?
-            /[\+\/]xml\z/i.match(@type) ? true : false
-          end
-
-          def inline_other_base64?
-            return false if @type.nil? or out_of_line?
-            @type.include?("/") and !inline_other_text? and !inline_other_xml?
-          end
-
-          def out_of_line?
-            not @src.nil? and @content.nil?
-          end
-        end
-
-        class TitleBase < Base
-          include AtomTextConstructBase
-        end
-      end
-    end
-
-    class TextinputBase < Base
-      %w(title description name link).each do |element|
-        attr_accessor element
-        add_need_initialize_variable(element)
-      end
-    end
-  end
-end
diff --git a/lib/rss/maker/content.rb b/lib/rss/maker/content.rb
deleted file mode 100644
index 46c4911f73..0000000000
--- a/lib/rss/maker/content.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'rss/content'
-require 'rss/maker/1.0'
-require 'rss/maker/2.0'
-
-module RSS
-  module Maker
-    module ContentModel
-      def self.append_features(klass)
-        super
-
-        ::RSS::ContentModel::ELEMENTS.each do |name|
-          klass.def_other_element(name)
-        end
-      end
-    end
-
-    class ItemsBase
-      class ItemBase; include ContentModel; end
-    end
-  end
-end
diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb
deleted file mode 100644
index ff4813fe19..0000000000
--- a/lib/rss/maker/dublincore.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-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.def_classed_elements(full_name, "value", plural_klass_name,
-                                     full_plural_name, name)
-          klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-            def new_#{full_name}(value=nil)
-              _#{full_name} = #{full_plural_name}.new_#{name}
-              _#{full_name}.value = value
-              if block_given?
-                yield _#{full_name}
-              else
-                _#{full_name}
-              end
-            end
-          EOC
-        end
-
-        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          # For backward compatibility
-          alias #{DC_PREFIX}_rightses #{DC_PREFIX}_rights_list
-        EOC
-      end
-
-      ::RSS::DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name|
-        plural_name ||= "#{name}s"
-        full_name ||= "#{DC_PREFIX}_#{name}"
-        full_plural_name ||= "#{DC_PREFIX}_#{plural_name}"
-        klass_name = Utils.to_class_name(name)
-        full_klass_name = "DublinCore#{klass_name}"
-        plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}"
-        module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        class #{plural_klass_name}Base < Base
-          def_array_element(#{name.dump}, #{full_plural_name.dump},
-                            #{full_klass_name.dump})
-
-          class #{full_klass_name}Base < Base
-            attr_accessor :value
-            add_need_initialize_variable("value")
-            alias_method(:content, :value)
-            alias_method(:content=, :value=)
-
-            def have_required_values?
-              @value
-            end
-
-            def to_feed(feed, current)
-              if value and current.respond_to?(:#{full_name})
-                new_item = current.class::#{full_klass_name}.new(value)
-                current.#{full_plural_name} << new_item
-              end
-            end
-          end
-          #{klass_name}Base = #{full_klass_name}Base
-        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)
-          full_klass_name = "DublinCore#{klass_name}"
-          plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}"
-          klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          class #{plural_klass_name} < #{plural_klass_name}Base
-            class #{full_klass_name} < #{full_klass_name}Base
-            end
-            #{klass_name} = #{full_klass_name}
-          end
-EOC
-        end
-      end
-    end
-
-    class ChannelBase
-      include DublinCoreModel
-    end
-    
-    class ImageBase; include DublinCoreModel; end
-    class ItemsBase
-      class ItemBase
-        include DublinCoreModel
-      end
-    end
-    class TextinputBase; include DublinCoreModel; end
-
-    makers.each do |maker|
-      maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        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
-      EOC
-    end
-  end
-end
diff --git a/lib/rss/maker/entry.rb b/lib/rss/maker/entry.rb
deleted file mode 100644
index edaa31ec06..0000000000
--- a/lib/rss/maker/entry.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require "rss/maker/atom"
-require "rss/maker/feed"
-
-module RSS
-  module Maker
-    module Atom
-      class Entry < RSSBase
-        def initialize(feed_version="1.0")
-          super
-          @feed_type = "atom"
-          @feed_subtype = "entry"
-        end
-
-        private
-        def make_feed
-          ::RSS::Atom::Entry.new(@version, @encoding, @standalone)
-        end
-
-        def setup_elements(entry)
-          setup_items(entry)
-        end
-
-        class Channel < ChannelBase
-          class SkipDays < SkipDaysBase
-            class Day < DayBase
-            end
-          end
-
-          class SkipHours < SkipHoursBase
-            class Hour < HourBase
-            end
-          end
-
-          class Cloud < CloudBase
-          end
-
-          Categories = Feed::Channel::Categories
-          Links = Feed::Channel::Links
-          Authors = Feed::Channel::Authors
-          Contributors = Feed::Channel::Contributors
-
-          class Generator < GeneratorBase
-            include AtomGenerator
-
-            def self.not_set_name
-              "maker.channel.generator"
-            end
-          end
-
-          Copyright = Feed::Channel::Copyright
-
-          class Description < DescriptionBase
-          end
-
-          Title = Feed::Channel::Title
-        end
-
-        class Image < ImageBase
-        end
-
-        class Items < ItemsBase
-          def to_feed(entry)
-            (normalize.first || Item.new(@maker)).to_feed(entry)
-          end
-
-          class Item < ItemBase
-            def to_feed(entry)
-              set_default_values do
-                setup_values(entry)
-                entry.dc_dates.clear
-                setup_other_elements(entry)
-                unless have_required_values?
-                  raise NotSetError.new("maker.item", not_set_required_variables)
-                end
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(id updated)
-            end
-
-            def variables
-              super + ["updated"]
-            end
-
-            def variable_is_set?
-              super or !authors.empty?
-            end
-
-            def not_set_required_variables
-              set_default_values do
-                vars = super
-                if authors.all? {|author| !author.have_required_values?}
-                  vars << "author"
-                end
-                vars << "title" unless title {|t| t.have_required_values?}
-                vars
-              end
-            end
-
-            def _set_default_values(&block)
-              keep = {
-                :authors => authors.to_a.dup,
-                :contributors => contributors.to_a.dup,
-                :categories => categories.to_a.dup,
-                :id => id,
-                :links => links.to_a.dup,
-                :rights => @rights,
-                :title => @title,
-                :updated => updated,
-              }
-              authors.replace(@maker.channel.authors) if keep[:authors].empty?
-              if keep[:contributors].empty?
-                contributors.replace(@maker.channel.contributors)
-              end
-              if keep[:categories].empty?
-                categories.replace(@maker.channel.categories)
-              end
-              self.id ||= link || @maker.channel.id
-              links.replace(@maker.channel.links) if keep[:links].empty?
-              unless keep[:rights].variable_is_set?
-                @maker.channel.rights {|r| @rights = r}
-              end
-              unless keep[:title].variable_is_set?
-                @maker.channel.title {|t| @title = t}
-              end
-              self.updated ||= @maker.channel.updated
-              super(&block)
-            ensure
-              authors.replace(keep[:authors])
-              contributors.replace(keep[:contributors])
-              categories.replace(keep[:categories])
-              links.replace(keep[:links])
-              self.id = keep[:id]
-              @rights = keep[:rights]
-              @title = keep[:title]
-              self.updated = keep[:prev_updated]
-            end
-
-            Guid = Feed::Items::Item::Guid
-            Enclosure = Feed::Items::Item::Enclosure
-            Source = Feed::Items::Item::Source
-            Categories = Feed::Items::Item::Categories
-            Authors = Feed::Items::Item::Authors
-            Contributors = Feed::Items::Item::Contributors
-            Links = Feed::Items::Item::Links
-            Rights = Feed::Items::Item::Rights
-            Description = Feed::Items::Item::Description
-            Title = Feed::Items::Item::Title
-            Content = Feed::Items::Item::Content
-          end
-        end
-
-        class Textinput < TextinputBase
-        end
-      end
-    end
-
-    add_maker("atom:entry", "1.0", Atom::Entry)
-    add_maker("atom1.0:entry", "1.0", Atom::Entry)
-  end
-end
diff --git a/lib/rss/maker/feed.rb b/lib/rss/maker/feed.rb
deleted file mode 100644
index 3a30ad4287..0000000000
--- a/lib/rss/maker/feed.rb
+++ /dev/null
@@ -1,429 +0,0 @@
-require "rss/maker/atom"
-
-module RSS
-  module Maker
-    module Atom
-      class Feed < RSSBase
-        def initialize(feed_version="1.0")
-          super
-          @feed_type = "atom"
-          @feed_subtype = "feed"
-        end
-
-        private
-        def make_feed
-          ::RSS::Atom::Feed.new(@version, @encoding, @standalone)
-        end
-
-        def setup_elements(feed)
-          setup_channel(feed)
-          setup_image(feed)
-          setup_items(feed)
-        end
-
-        class Channel < ChannelBase
-          def to_feed(feed)
-            set_default_values do
-              setup_values(feed)
-              feed.dc_dates.clear
-              setup_other_elements(feed)
-              if image_favicon.about
-                icon = feed.class::Icon.new
-                icon.content = image_favicon.about
-                feed.icon = icon
-              end
-              unless have_required_values?
-                raise NotSetError.new("maker.channel",
-                                      not_set_required_variables)
-              end
-            end
-          end
-
-          def have_required_values?
-            super and
-              (!authors.empty? or
-               @maker.items.any? {|item| !item.authors.empty?})
-          end
-
-          private
-          def required_variable_names
-            %w(id updated)
-          end
-
-          def variables
-            super + %w(id updated)
-          end
-
-          def variable_is_set?
-            super or !authors.empty?
-          end
-
-          def not_set_required_variables
-            vars = super
-            if authors.empty? and
-                @maker.items.all? {|item| item.author.to_s.empty?}
-              vars << "author"
-            end
-            vars << "title" unless title {|t| t.have_required_values?}
-            vars
-          end
-
-          def _set_default_values(&block)
-            keep = {
-              :id => id,
-              :updated => updated,
-            }
-            self.id ||= about
-            self.updated ||= dc_date
-            super(&block)
-          ensure
-            self.id = keep[:id]
-            self.updated = keep[:updated]
-          end
-
-          class SkipDays < SkipDaysBase
-            def to_feed(*args)
-            end
-
-            class Day < DayBase
-            end
-          end
-
-          class SkipHours < SkipHoursBase
-            def to_feed(*args)
-            end
-
-            class Hour < HourBase
-            end
-          end
-
-          class Cloud < CloudBase
-            def to_feed(*args)
-            end
-          end
-
-          class Categories < CategoriesBase
-            class Category < CategoryBase
-              include AtomCategory
-
-              def self.not_set_name
-                "maker.channel.category"
-              end
-            end
-          end
-
-          class Links < LinksBase
-            class Link < LinkBase
-              include AtomLink
-
-              def self.not_set_name
-                "maker.channel.link"
-              end
-            end
-          end
-
-          AtomPersons.def_atom_persons(self, "author", "maker.channel.author")
-          AtomPersons.def_atom_persons(self, "contributor",
-                                       "maker.channel.contributor")
-
-          class Generator < GeneratorBase
-            include AtomGenerator
-
-            def self.not_set_name
-              "maker.channel.generator"
-            end
-          end
-
-          AtomTextConstruct.def_atom_text_construct(self, "rights",
-                                                    "maker.channel.copyright",
-                                                    "Copyright")
-          AtomTextConstruct.def_atom_text_construct(self, "subtitle",
-                                                    "maker.channel.description",
-                                                    "Description")
-          AtomTextConstruct.def_atom_text_construct(self, "title",
-                                                    "maker.channel.title")
-        end
-
-        class Image < ImageBase
-          def to_feed(feed)
-            logo = feed.class::Logo.new
-            class << logo
-              alias_method(:url=, :content=)
-            end
-            set = setup_values(logo)
-            class << logo
-              remove_method(:url=)
-            end
-            if set
-              feed.logo = logo
-              set_parent(logo, feed)
-              setup_other_elements(feed, logo)
-            elsif variable_is_set?
-              raise NotSetError.new("maker.image", not_set_required_variables)
-            end
-          end
-
-          private
-          def required_variable_names
-            %w(url)
-          end
-        end
-
-        class Items < ItemsBase
-          def to_feed(feed)
-            normalize.each do |item|
-              item.to_feed(feed)
-            end
-            setup_other_elements(feed, feed.entries)
-          end
-
-          class Item < ItemBase
-            def to_feed(feed)
-              set_default_values do
-                entry = feed.class::Entry.new
-                set = setup_values(entry)
-                setup_other_elements(feed, entry)
-                if set
-                  feed.entries << entry
-                  set_parent(entry, feed)
-                elsif variable_is_set?
-                  raise NotSetError.new("maker.item", not_set_required_variables)
-                end
-              end
-            end
-
-            def have_required_values?
-              set_default_values do
-                super and title {|t| t.have_required_values?}
-              end
-            end
-
-            private
-            def required_variable_names
-              %w(id updated)
-            end
-
-            def variables
-              super + ["updated"]
-            end
-
-            def not_set_required_variables
-              vars = super
-              vars << "title" unless title {|t| t.have_required_values?}
-              vars
-            end
-
-            def _set_default_values(&block)
-              keep = {
-                :id => id,
-                :updated => updated,
-              }
-              self.id ||= link
-              self.updated ||= dc_date
-              super(&block)
-            ensure
-              self.id = keep[:id]
-              self.updated = keep[:updated]
-            end
-
-            class Guid < GuidBase
-              def to_feed(feed, current)
-              end
-            end
-
-            class Enclosure < EnclosureBase
-              def to_feed(feed, current)
-              end
-            end
-
-            class Source < SourceBase
-              def to_feed(feed, current)
-                source = current.class::Source.new
-                setup_values(source)
-                current.source = source
-                set_parent(source, current)
-                setup_other_elements(feed, source)
-                current.source = nil if source.to_s == "<source/>"
-              end
-
-              private
-              def required_variable_names
-                []
-              end
-
-              def variables
-                super + ["updated"]
-              end
-
-              AtomPersons.def_atom_persons(self, "author",
-                                           "maker.item.source.author")
-              AtomPersons.def_atom_persons(self, "contributor",
-                                           "maker.item.source.contributor")
-
-              class Categories < CategoriesBase
-                class Category < CategoryBase
-                  include AtomCategory
-
-                  def self.not_set_name
-                    "maker.item.source.category"
-                  end
-                end
-              end
-
-              class Generator < GeneratorBase
-                include AtomGenerator
-
-                def self.not_set_name
-                  "maker.item.source.generator"
-                end
-              end
-
-              class Icon < IconBase
-                def to_feed(feed, current)
-                  icon = current.class::Icon.new
-                  class << icon
-                    alias_method(:url=, :content=)
-                  end
-                  set = setup_values(icon)
-                  class << icon
-                    remove_method(:url=)
-                  end
-                  if set
-                    current.icon = icon
-                    set_parent(icon, current)
-                    setup_other_elements(feed, icon)
-                  elsif variable_is_set?
-                    raise NotSetError.new("maker.item.source.icon",
-                                          not_set_required_variables)
-                  end
-                end
-
-                private
-                def required_variable_names
-                  %w(url)
-                end
-              end
-
-              class Links < LinksBase
-                class Link < LinkBase
-                  include AtomLink
-
-                  def self.not_set_name
-                    "maker.item.source.link"
-                  end
-                end
-              end
-
-              class Logo < LogoBase
-                include AtomLogo
-
-                def self.not_set_name
-                  "maker.item.source.logo"
-                end
-              end
-
-              maker_name_base = "maker.item.source."
-              maker_name = "#{maker_name_base}rights"
-              AtomTextConstruct.def_atom_text_construct(self, "rights",
-                                                        maker_name)
-              maker_name = "#{maker_name_base}subtitle"
-              AtomTextConstruct.def_atom_text_construct(self, "subtitle",
-                                                        maker_name)
-              maker_name = "#{maker_name_base}title"
-              AtomTextConstruct.def_atom_text_construct(self, "title",
-                                                        maker_name)
-            end
-
-            class Categories < CategoriesBase
-              class Category < CategoryBase
-                include AtomCategory
-
-                def self.not_set_name
-                  "maker.item.category"
-                end
-              end
-            end
-
-            AtomPersons.def_atom_persons(self, "author", "maker.item.author")
-            AtomPersons.def_atom_persons(self, "contributor",
-                                         "maker.item.contributor")
-
-            class Links < LinksBase
-              class Link < LinkBase
-                include AtomLink
-
-                def self.not_set_name
-                  "maker.item.link"
-                end
-              end
-            end
-
-            AtomTextConstruct.def_atom_text_construct(self, "rights",
-                                                      "maker.item.rights")
-            AtomTextConstruct.def_atom_text_construct(self, "summary",
-                                                      "maker.item.description",
-                                                      "Description")
-            AtomTextConstruct.def_atom_text_construct(self, "title",
-                                                      "maker.item.title")
-
-            class Content < ContentBase
-              def to_feed(feed, current)
-                content = current.class::Content.new
-                if setup_values(content)
-                  content.src = nil if content.src and content.content
-                  current.content = content
-                  set_parent(content, current)
-                  setup_other_elements(feed, content)
-                elsif variable_is_set?
-                  raise NotSetError.new("maker.item.content",
-                                        not_set_required_variables)
-                end
-              end
-
-              alias_method(:xml, :xml_content)
-
-              private
-              def required_variable_names
-                if out_of_line?
-                  %w(type)
-                elsif xml_type?
-                  %w(xml_content)
-                else
-                  %w(content)
-                end
-              end
-
-              def variables
-                if out_of_line?
-                  super
-                elsif xml_type?
-                  super + %w(xml)
-                else
-                  super
-                end
-              end
-
-              def xml_type?
-                _type = type
-                return false if _type.nil?
-                _type == "xhtml" or
-                  /(?:\+xml|\/xml)$/i =~ _type or
-                  %w(text/xml-external-parsed-entity
-                     application/xml-external-parsed-entity
-                     application/xml-dtd).include?(_type.downcase)
-              end
-            end
-          end
-        end
-
-        class Textinput < TextinputBase
-        end
-      end
-    end
-
-    add_maker("atom", "1.0", Atom::Feed)
-    add_maker("atom:feed", "1.0", Atom::Feed)
-    add_maker("atom1.0", "1.0", Atom::Feed)
-    add_maker("atom1.0:feed", "1.0", Atom::Feed)
-  end
-end
diff --git a/lib/rss/maker/image.rb b/lib/rss/maker/image.rb
deleted file mode 100644
index b95cf4c714..0000000000
--- a/lib/rss/maker/image.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-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.def_classed_element(name)
-      end
-
-      def self.install_image_item(klass)
-	klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          class ImageItem < ImageItemBase
-            DublinCoreModel.install_dublin_core(self)
-          end
-EOC
-      end
-
-      class ImageItemBase < 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
-
-        def to_feed(feed, current)
-          if current.respond_to?(:image_item=) and have_required_values?
-            item = current.class::ImageItem.new
-            setup_values(item)
-            setup_other_elements(item)
-            current.image_item = item
-          end
-        end
-      end
-    end
-
-    module ImageFaviconModel
-      def self.append_features(klass)
-        super
-
-        name = "#{RSS::IMAGE_PREFIX}_favicon"
-        klass.def_classed_element(name)
-      end
-
-      def self.install_image_favicon(klass)
-	klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          class ImageFavicon < ImageFaviconBase
-            DublinCoreModel.install_dublin_core(self)
-          end
-        EOC
-      end
-
-      class ImageFaviconBase < 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
-
-        def to_feed(feed, current)
-          if current.respond_to?(:image_favicon=) and have_required_values?
-            favicon = current.class::ImageFavicon.new
-            setup_values(favicon)
-            setup_other_elements(favicon)
-            current.image_favicon = favicon
-          end
-        end
-      end
-    end
-
-    class ChannelBase; include Maker::ImageFaviconModel; end
-    
-    class ItemsBase
-      class ItemBase; include Maker::ImageItemModel; end
-    end
-
-    makers.each do |maker|
-      maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        class Channel
-          ImageFaviconModel.install_image_favicon(self)
-        end
-
-        class Items
-          class Item
-            ImageItemModel.install_image_item(self)
-          end
-        end
-      EOC
-    end
-  end
-end
diff --git a/lib/rss/maker/itunes.rb b/lib/rss/maker/itunes.rb
deleted file mode 100644
index 7c5049129d..0000000000
--- a/lib/rss/maker/itunes.rb
+++ /dev/null
@@ -1,242 +0,0 @@
-require 'rss/itunes'
-require 'rss/maker/2.0'
-
-module RSS
-  module Maker
-    module ITunesBaseModel
-      def def_class_accessor(klass, name, type, *args)
-        name = name.gsub(/-/, "_").gsub(/^itunes_/, '')
-        full_name = "#{RSS::ITUNES_PREFIX}_#{name}"
-        case type
-        when nil
-          klass.def_other_element(full_name)
-        when :yes_other
-          def_yes_other_accessor(klass, full_name)
-        when :yes_clean_other
-          def_yes_clean_other_accessor(klass, full_name)
-        when :csv
-          def_csv_accessor(klass, full_name)
-        when :element, :attribute
-          recommended_attribute_name, = *args
-          klass_name = "ITunes#{Utils.to_class_name(name)}"
-          klass.def_classed_element(full_name, klass_name,
-                                    recommended_attribute_name)
-        when :elements
-          plural_name, recommended_attribute_name = args
-          plural_name ||= "#{name}s"
-          full_plural_name = "#{RSS::ITUNES_PREFIX}_#{plural_name}"
-          klass_name = "ITunes#{Utils.to_class_name(name)}"
-          plural_klass_name = "ITunes#{Utils.to_class_name(plural_name)}"
-          def_elements_class_accessor(klass, name, full_name, full_plural_name,
-                                      klass_name, plural_klass_name,
-                                      recommended_attribute_name)
-        end
-      end
-
-      def def_yes_other_accessor(klass, full_name)
-        klass.def_other_element(full_name)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          def #{full_name}?
-            Utils::YesOther.parse(@#{full_name})
-          end
-        EOC
-      end
-
-      def def_yes_clean_other_accessor(klass, full_name)
-        klass.def_other_element(full_name)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          def #{full_name}?
-            Utils::YesCleanOther.parse(#{full_name})
-          end
-        EOC
-      end
-
-      def def_csv_accessor(klass, full_name)
-        klass.def_csv_element(full_name)
-      end
-
-      def def_elements_class_accessor(klass, name, full_name, full_plural_name,
-                                      klass_name, plural_klass_name,
-                                      recommended_attribute_name=nil)
-        if recommended_attribute_name
-          klass.def_classed_elements(full_name, recommended_attribute_name,
-                                     plural_klass_name, full_plural_name)
-        else
-          klass.def_classed_element(full_plural_name, plural_klass_name)
-        end
-        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          def new_#{full_name}(text=nil)
-            #{full_name} = @#{full_plural_name}.new_#{name}
-            #{full_name}.text = text
-            if block_given?
-              yield #{full_name}
-            else
-              #{full_name}
-            end
-          end
-        EOC
-      end
-    end
-
-    module ITunesChannelModel
-      extend ITunesBaseModel
-
-      class << self
-        def append_features(klass)
-          super
-
-          ::RSS::ITunesChannelModel::ELEMENT_INFOS.each do |name, type, *args|
-            def_class_accessor(klass, name, type, *args)
-          end
-        end
-      end
-
-      class ITunesCategoriesBase < Base
-        def_array_element("category", "itunes_categories",
-                          "ITunesCategory")
-        class ITunesCategoryBase < Base
-          attr_accessor :text
-          add_need_initialize_variable("text")
-          def_array_element("category", "itunes_categories",
-                            "ITunesCategory")
-
-          def have_required_values?
-            text
-          end
-
-          alias_method :to_feed_for_categories, :to_feed
-          def to_feed(feed, current)
-            if text and current.respond_to?(:itunes_category)
-              new_item = current.class::ITunesCategory.new(text)
-              to_feed_for_categories(feed, new_item)
-              current.itunes_categories << new_item
-            end
-          end
-        end
-      end
-
-      class ITunesImageBase < Base
-        add_need_initialize_variable("href")
-        attr_accessor("href")
-
-        def to_feed(feed, current)
-          if @href and current.respond_to?(:itunes_image)
-            current.itunes_image ||= current.class::ITunesImage.new
-            current.itunes_image.href = @href
-          end
-        end
-      end
-
-      class ITunesOwnerBase < Base
-        %w(itunes_name itunes_email).each do |name|
-          add_need_initialize_variable(name)
-          attr_accessor(name)
-        end
-
-        def to_feed(feed, current)
-          if current.respond_to?(:itunes_owner=)
-            _not_set_required_variables = not_set_required_variables
-            if (required_variable_names - _not_set_required_variables).empty?
-              return
-            end
-
-            unless have_required_values?
-              raise NotSetError.new("maker.channel.itunes_owner",
-                                    _not_set_required_variables)
-            end
-            current.itunes_owner ||= current.class::ITunesOwner.new
-            current.itunes_owner.itunes_name = @itunes_name
-            current.itunes_owner.itunes_email = @itunes_email
-          end
-        end
-
-        private
-        def required_variable_names
-          %w(itunes_name itunes_email)
-        end
-      end
-    end
-
-    module ITunesItemModel
-      extend ITunesBaseModel
-
-      class << self
-        def append_features(klass)
-          super
-
-          ::RSS::ITunesItemModel::ELEMENT_INFOS.each do |name, type, *args|
-            def_class_accessor(klass, name, type, *args)
-          end
-        end
-      end
-
-      class ITunesDurationBase < Base
-        attr_reader :content
-        add_need_initialize_variable("content")
-
-        %w(hour minute second).each do |name|
-          attr_reader(name)
-          add_need_initialize_variable(name, '0')
-        end
-
-        def content=(content)
-          if content.nil?
-            @hour, @minute, @second, @content = nil
-          else
-            @hour, @minute, @second =
-              ::RSS::ITunesItemModel::ITunesDuration.parse(content)
-            @content = content
-          end
-        end
-
-        def hour=(hour)
-          @hour = Integer(hour)
-          update_content
-        end
-
-        def minute=(minute)
-          @minute = Integer(minute)
-          update_content
-        end
-
-        def second=(second)
-          @second = Integer(second)
-          update_content
-        end
-
-        def to_feed(feed, current)
-          if @content and current.respond_to?(:itunes_duration=)
-            current.itunes_duration ||= current.class::ITunesDuration.new
-            current.itunes_duration.content = @content
-          end
-        end
-
-        private
-        def update_content
-          components = [@hour, @minute, @second]
-          @content =
-            ::RSS::ITunesItemModel::ITunesDuration.construct(*components)
-        end
-      end
-    end
-
-    class ChannelBase
-      include Maker::ITunesChannelModel
-      class ITunesCategories < ITunesCategoriesBase
-        class ITunesCategory < ITunesCategoryBase
-          ITunesCategory = self
-        end
-      end
-
-      class ITunesImage < ITunesImageBase; end
-      class ITunesOwner < ITunesOwnerBase; end
-    end
-
-    class ItemsBase
-      class ItemBase
-        include Maker::ITunesItemModel
-        class ITunesDuration < ITunesDurationBase; end
-      end
-    end
-  end
-end
diff --git a/lib/rss/maker/slash.rb b/lib/rss/maker/slash.rb
deleted file mode 100644
index 27adef3832..0000000000
--- a/lib/rss/maker/slash.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'rss/slash'
-require 'rss/maker/1.0'
-
-module RSS
-  module Maker
-    module SlashModel
-      def self.append_features(klass)
-        super
-
-        ::RSS::SlashModel::ELEMENT_INFOS.each do |name, type|
-          full_name = "#{RSS::SLASH_PREFIX}_#{name}"
-          case type
-          when :csv_integer
-            klass.def_csv_element(full_name, :integer)
-          else
-            klass.def_other_element(full_name)
-          end
-        end
-
-        klass.module_eval do
-          alias_method(:slash_hit_parades, :slash_hit_parade)
-          alias_method(:slash_hit_parades=, :slash_hit_parade=)
-        end
-      end
-    end
-
-    class ItemsBase
-      class ItemBase
-        include SlashModel
-      end
-    end
-  end
-end
diff --git a/lib/rss/maker/syndication.rb b/lib/rss/maker/syndication.rb
deleted file mode 100644
index b81230457c..0000000000
--- a/lib/rss/maker/syndication.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-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 |name|
-          klass.def_other_element(name)
-        end
-      end
-    end
-
-    class ChannelBase; include SyndicationModel; end
-  end
-end
diff --git a/lib/rss/maker/taxonomy.rb b/lib/rss/maker/taxonomy.rb
deleted file mode 100644
index 211603840f..0000000000
--- a/lib/rss/maker/taxonomy.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-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.def_classed_element("#{RSS::TAXO_PREFIX}_topics",
-                                  "TaxonomyTopics")
-      end
-
-      def self.install_taxo_topics(klass)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          class TaxonomyTopics < TaxonomyTopicsBase
-            def to_feed(feed, 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 < Base
-        attr_reader :resources
-        def_array_element("resource")
-        remove_method :new_resource
-      end
-    end
-
-    module TaxonomyTopicModel
-      def self.append_features(klass)
-        super
-
-        class_name = "TaxonomyTopics"
-        klass.def_classed_elements("#{TAXO_PREFIX}_topic", "value", class_name)
-      end
-
-      def self.install_taxo_topic(klass)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          class TaxonomyTopics < TaxonomyTopicsBase
-            class TaxonomyTopic < TaxonomyTopicBase
-              DublinCoreModel.install_dublin_core(self)
-              TaxonomyTopicsModel.install_taxo_topics(self)
-
-              def to_feed(feed, current)
-                if current.respond_to?(:taxo_topics)
-                  topic = current.class::TaxonomyTopic.new(value)
-                  topic.taxo_link = value
-                  taxo_topics.to_feed(feed, topic) if taxo_topics
-                  current.taxo_topics << topic
-                  setup_other_elements(feed, topic)
-                end
-              end
-            end
-          end
-EOC
-      end
-
-      class TaxonomyTopicsBase < Base
-        def_array_element("topic", nil, "TaxonomyTopic")
-        alias_method(:new_taxo_topic, :new_topic) # For backward compatibility
-
-        class TaxonomyTopicBase < 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
-
-    makers.each do |maker|
-      maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        TaxonomyTopicModel.install_taxo_topic(self)
-
-        class Channel
-          TaxonomyTopicsModel.install_taxo_topics(self)
-        end
-
-        class Items
-          class Item
-            TaxonomyTopicsModel.install_taxo_topics(self)
-          end
-        end
-      EOC
-    end
-  end
-end
diff --git a/lib/rss/maker/trackback.rb b/lib/rss/maker/trackback.rb
deleted file mode 100644
index 278fe53ebe..0000000000
--- a/lib/rss/maker/trackback.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-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
-
-        klass.def_other_element("#{RSS::TRACKBACK_PREFIX}_ping")
-        klass.def_classed_elements("#{RSS::TRACKBACK_PREFIX}_about", "value",
-                                   "TrackBackAbouts")
-      end
-
-      class TrackBackAboutsBase < Base
-        def_array_element("about", nil, "TrackBackAbout")
-
-        class TrackBackAboutBase < 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
-
-          def to_feed(feed, current)
-            if current.respond_to?(:trackback_abouts) and have_required_values?
-              about = current.class::TrackBackAbout.new
-              setup_values(about)
-              setup_other_elements(about)
-              current.trackback_abouts << about
-            end
-          end
-        end
-      end
-    end
-
-    class ItemsBase
-      class ItemBase; include TrackBackModel; end
-    end
-
-    makers.each do |maker|
-      maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        class Items
-          class Item
-            class TrackBackAbouts < TrackBackAboutsBase
-              class TrackBackAbout < TrackBackAboutBase
-              end
-            end
-          end
-        end
-      EOC
-    end
-  end
-end
diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb
deleted file mode 100644
index 9e4919223c..0000000000
--- a/lib/rss/parser.rb
+++ /dev/null
@@ -1,541 +0,0 @@
-require "forwardable"
-require "open-uri"
-
-require "rss/rss"
-require "rss/xml"
-
-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.parse(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
-
-      @@accessor_bases = {}
-      @@registered_uris = {}
-      @@class_names = {}
-
-      # return the setter for the uri, tag_name pair, or nil.
-      def setter(uri, tag_name)
-        _getter = getter(uri, tag_name)
-        if _getter
-          "#{_getter}="
-        else
-          nil
-        end
-      end
-
-      def getter(uri, tag_name)
-        (@@accessor_bases[uri] || {})[tag_name]
-      end
-
-      # return the tag_names for setters associated with uri
-      def available_tags(uri)
-        (@@accessor_bases[uri] || {}).keys
-      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)
-        name = (@@class_names[uri] || {})[tag_name]
-        return name if name
-
-        tag_name = tag_name.gsub(/[_\-]([a-z]?)/) do
-          $1.upcase
-        end
-        tag_name[0, 1].upcase + tag_name[1..-1]
-      end
-
-      def install_get_text_element(uri, name, accessor_base)
-        install_accessor_base(uri, name, accessor_base)
-        def_get_text_element(uri, name, *get_file_and_line_from_caller(1))
-      end
-      
-      def raise_for_undefined_entity?
-        true
-      end
-    
-      private
-      # set the accessor for the uri, tag_name pair
-      def install_accessor_base(uri, tag_name, accessor_base)
-        @@accessor_bases[uri] ||= {}
-        @@accessor_bases[uri][tag_name] = accessor_base.chomp("=")
-      end
-
-      def def_get_text_element(uri, element_name, file, line)
-        register_uri(uri, element_name)
-        method_name = "start_#{element_name}"
-        unless private_method_defined?(method_name)
-          define_method(method_name) do |name, prefix, attrs, ns|
-            uri = _ns(ns, prefix)
-            if self.class.uri_registered?(uri, element_name)
-              start_get_text_element(name, prefix, ns, uri)
-            else
-              start_else_element(name, prefix, attrs, ns)
-            end
-          end
-          private(method_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 = [{"xml" => :xml}]
-      @tag_stack = [[]]
-      @text_stack = ['']
-      @proc_stack = []
-      @last_element = nil
-      @version = @encoding = @standalone = nil
-      @xml_stylesheets = []
-      @xml_child_mode = false
-      @xml_element = nil
-      @last_xml_element = nil
-    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 @xml_child_mode
-        previous = @last_xml_element
-        element_attrs = attributes.dup
-        unless previous
-          ns.each do |ns_prefix, value|
-            next if ns_prefix == "xml"
-            key = ns_prefix.empty? ? "xmlns" : "xmlns:#{ns_prefix}"
-            element_attrs[key] ||= value
-          end
-        end
-        next_element = XML::Element.new(local,
-                                        prefix.empty? ? nil : prefix,
-                                        _ns(ns, prefix),
-                                        element_attrs)
-        previous << next_element if previous
-        @last_xml_element = next_element
-        pr = Proc.new do |text, tags|
-          if previous
-            @last_xml_element = previous
-          else
-            @xml_element = @last_xml_element
-            @last_xml_element = nil
-          end
-        end
-        @proc_stack.push(pr)
-      else
-        if @rss.nil? and respond_to?("initial_start_#{local}", true)
-          __send__("initial_start_#{local}", local, prefix, attrs, ns.dup)
-        elsif respond_to?("start_#{local}", true)
-          __send__("start_#{local}", local, prefix, attrs, ns.dup)
-        else
-          start_else_element(local, prefix, attrs, ns.dup)
-        end
-      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)
-      if @xml_child_mode
-        @last_xml_element << data if @last_xml_element
-      else
-        @text_stack.last << data
-      end
-    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 class_name and
-          (current_class.const_defined?(class_name) or
-           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)
-      unless _ns(ns, prefix) == require_uri
-        if @do_validate
-          raise NSError.new(tag_name, prefix, require_uri)
-        else
-          # Force bind required URI with prefix
-          @ns_stack.last[prefix] = require_uri
-        end
-      end
-    end
-
-    def start_get_text_element(tag_name, prefix, ns, required_uri)
-      pr = Proc.new do |text, tags|
-        setter = self.class.setter(required_uri, tag_name)
-        if @last_element.respond_to?(setter)
-          if @do_validate
-            getter = self.class.getter(required_uri, tag_name)
-            if @last_element.__send__(getter)
-              raise TooMuchTagError.new(tag_name, @last_element.tag_name)
-            end
-          end
-          @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
-      @proc_stack.push(pr)
-    end
-
-    def start_have_something_element(tag_name, prefix, attrs, ns, klass)
-      check_ns(tag_name, prefix, ns, klass.required_uri)
-      attributes = collect_attributes(tag_name, prefix, attrs, ns, klass)
-      @proc_stack.push(setup_next_element(tag_name, klass, attributes))
-    end
-
-    def collect_attributes(tag_name, prefix, attrs, ns, klass)
-      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
-      attributes
-    end
-
-    def setup_next_element(tag_name, klass, attributes)
-      previous = @last_element
-      next_element = klass.new(@do_validate, attributes)
-      previous.set_next_element(tag_name, next_element)
-      @last_element = next_element
-      @last_element.parent = previous if klass.need_parent?
-      @xml_child_mode = @last_element.have_xml_content?
-
-      Proc.new do |text, tags|
-        p(@last_element.class) if DEBUG
-        if @xml_child_mode
-          @last_element.content = @xml_element.to_s
-          xml_setter = @last_element.class.xml_setter
-          @last_element.__send__(xml_setter, @xml_element)
-          @xml_element = nil
-          @xml_child_mode = false
-        else
-          if klass.have_content?
-            if @last_element.need_base64_encode?
-              text = Base64.decode64(text.lstrip)
-            end
-            @last_element.content = text
-          end
-        end
-        if @do_validate
-          @last_element.validate_for_stream(tags, @ignore_unknown_element)
-        end
-        @last_element = previous
-      end
-    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/lib/rss/rexmlparser.rb b/lib/rss/rexmlparser.rb
deleted file mode 100644
index 4dabf59199..0000000000
--- a/lib/rss/rexmlparser.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-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/lib/rss/rss.rb b/lib/rss/rss.rb
deleted file mode 100644
index 5aa4a2cedd..0000000000
--- a/lib/rss/rss.rb
+++ /dev/null
@@ -1,1312 +0,0 @@
-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]
-          usec = 0
-          usec = $7.to_f * 1000000 if $7
-          zone = $8
-          if zone
-            off = zone_offset(zone, datetime[0])
-            datetime = apply_offset(*(datetime + [off]))
-            datetime << usec
-            time = Time.utc(*datetime)
-            time.localtime unless zone_utc?(zone)
-            time
-          else
-            datetime << usec
-            Time.local(*datetime)
-          end
-        else
-          raise ArgumentError.new("invalid date: #{date.inspect}")
-        end
-      end
-    end
-  end
-
-  unless method_defined?(:w3cdtf)
-    def w3cdtf
-      if usec.zero?
-        fraction_digits = 0
-      else
-        fraction_digits = Math.log10(usec.to_s.sub(/0*$/, '').to_i).floor + 1
-      end
-      xmlschema(fraction_digits)
-    end
-  end
-end
-
-require "English"
-require "rss/utils"
-require "rss/converter"
-require "rss/xml-stylesheet"
-
-module RSS
-
-  VERSION = "0.2.4"
-
-  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
-
-  class UnsupportedMakerVersionError < Error
-    attr_reader :version
-    def initialize(version)
-      @version = version
-      super("Maker doesn't support version: #{@version}")
-    end
-  end
-
-  module BaseModel
-    include Utils
-
-    def install_have_child_element(tag_name, uri, occurs, name=nil, type=nil)
-      name ||= tag_name
-      add_need_initialize_variable(name)
-      install_model(tag_name, uri, occurs, name)
-
-      writer_type, reader_type = type
-      def_corresponded_attr_writer name, writer_type
-      def_corresponded_attr_reader name, reader_type
-      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, true)
-
-      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 unless self::ELEMENTS.include?(name)
-      add_need_initialize_variable(name)
-      install_model(tag_name, uri, occurs, name)
-
-      def_corresponded_attr_writer(name, type, disp_name)
-      def_corresponded_attr_reader(name, type || :convert)
-      install_element(name) do |n, elem_name|
-        <<-EOC
-        if respond_to?(:#{n}_content)
-          content = #{n}_content
-        else
-          content = @#{n}
-        end
-        if content
-          rv = "\#{indent}<#{elem_name}>"
-          value = html_escape(content)
-          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 inherit_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}_without_inherit
-          convert(@#{attr})
-        end
-
-        def #{attr}
-          if @#{attr}
-            #{attr}_without_inherit
-          elsif @parent
-            @parent.#{attr}
-          else
-            nil
-          end
-        end
-EOC
-      end
-    end
-
-    def uri_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}_without_base
-          convert(@#{attr})
-        end
-
-        def #{attr}
-          value = #{attr}_without_base
-          return nil if value.nil?
-          if /\\A[a-z][a-z0-9+.\\-]*:/i =~ value
-            value
-          else
-            "\#{base}\#{value}"
-          end
-        end
-EOC
-      end
-    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}
-          convert(@#{attr})
-        end
-EOC
-      end
-    end
-
-    def yes_clean_other_attr_reader(*attrs)
-      attrs.each do |attr|
-        attr = attr.id2name if attr.kind_of?(Integer)
-        module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          attr_reader(:#{attr})
-          def #{attr}?
-            YesCleanOther.parse(@#{attr})
-          end
-        EOC
-      end
-    end
-
-    def yes_other_attr_reader(*attrs)
-      attrs.each do |attr|
-        attr = attr.id2name if attr.kind_of?(Integer)
-        module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          attr_reader(:#{attr})
-          def #{attr}?
-            Utils::YesOther.parse(@#{attr})
-          end
-        EOC
-      end
-    end
-
-    def csv_attr_reader(*attrs)
-      separator = nil
-      if attrs.last.is_a?(Hash)
-        options = attrs.pop
-        separator = options[:separator]
-      end
-      separator ||= ", "
-      attrs.each do |attr|
-        attr = attr.id2name if attr.kind_of?(Integer)
-        module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          attr_reader(:#{attr})
-          def #{attr}_content
-            if @#{attr}.nil?
-              @#{attr}
-            else
-              @#{attr}.join(#{separator.dump})
-            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?
-          @#{name} = new_value
-        elsif new_value.kind_of?(Time)
-          @#{name} = new_value.dup
-        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
-                unless Date._parse(new_value, false).empty?
-                  @#{name} = Time.parse(new_value)
-                end
-              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 text_type_writer(name, disp_name=name)
-      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
-      def #{name}=(new_value)
-        if @do_validate and
-            !["text", "html", "xhtml", nil].include?(new_value)
-          raise NotAvailableValueError.new('#{disp_name}', new_value)
-        end
-        @#{name} = new_value
-      end
-EOC
-    end
-
-    def content_writer(name, disp_name=name)
-      klass_name = "self.class::#{Utils.to_class_name(name)}"
-      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
-      def #{name}=(new_value)
-        if new_value.is_a?(#{klass_name})
-          @#{name} = new_value
-        else
-          @#{name} = #{klass_name}.new
-          @#{name}.content = new_value
-        end
-      end
-EOC
-    end
-
-    def yes_clean_other_writer(name, disp_name=name)
-      module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        def #{name}=(value)
-          value = (value ? "yes" : "no") if [true, false].include?(value)
-          @#{name} = value
-        end
-      EOC
-    end
-
-    def yes_other_writer(name, disp_name=name)
-      module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        def #{name}=(new_value)
-          if [true, false].include?(new_value)
-            new_value = new_value ? "yes" : "no"
-          end
-          @#{name} = new_value
-        end
-      EOC
-    end
-
-    def csv_writer(name, disp_name=name)
-      module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        def #{name}=(new_value)
-          @#{name} = Utils::CSV.parse(new_value)
-        end
-      EOC
-    end
-
-    def csv_integer_writer(name, disp_name=name)
-      module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        def #{name}=(new_value)
-          @#{name} = Utils::CSV.parse(new_value) {|v| Integer(v)}
-        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)
-        receiver = self.class.name
-        warn("Warning:\#{caller.first.sub(/:in `.*'\z/, '')}: " \
-             "Don't use `\#{receiver}\##{accessor_name} = XXX'/" \
-             "`\#{receiver}\#set_#{accessor_name}(XXX)'. " \
-             "Those APIs are not sense of Ruby. " \
-             "Use `\#{receiver}\##{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
-
-  module SetupMaker
-    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
-
-    private
-    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)
-        next if value.nil?
-        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
-  end
-
-  class Element
-    extend BaseModel
-    include Utils
-    extend Utils::InheritedReader
-    include SetupMaker
-
-    INDENT = "  "
-    
-    MUST_CALL_VALIDATORS = {}
-    MODELS = []
-    GET_ATTRIBUTES = []
-    HAVE_CHILDREN_ELEMENTS = []
-    TO_ELEMENT_METHODS = []
-    NEED_INITIALIZE_VARIABLES = []
-    PLURAL_FORMS = {}
-
-    class << self
-      def must_call_validators
-        inherited_hash_reader("MUST_CALL_VALIDATORS")
-      end
-      def models
-        inherited_array_reader("MODELS")
-      end
-      def get_attributes
-        inherited_array_reader("GET_ATTRIBUTES")
-      end
-      def have_children_elements
-        inherited_array_reader("HAVE_CHILDREN_ELEMENTS")
-      end
-      def to_element_methods
-        inherited_array_reader("TO_ELEMENT_METHODS")
-      end
-      def need_initialize_variables
-        inherited_array_reader("NEED_INITIALIZE_VARIABLES")
-      end
-      def plural_forms
-        inherited_hash_reader("PLURAL_FORMS")
-      end
-
-      def inherited_base
-        ::RSS::Element
-      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", {})
-
-        tag_name = klass.name.split(/::/).last
-        tag_name[0, 1] = tag_name[0, 1].downcase
-        klass.instance_variable_set("@tag_name", tag_name)
-        klass.instance_variable_set("@have_content", false)
-      end
-
-      def install_must_call_validator(prefix, uri)
-        self::MUST_CALL_VALIDATORS[uri] = prefix
-      end
-
-      def install_model(tag, uri, occurs=nil, getter=nil, plural=false)
-        getter ||= tag
-        if m = self::MODELS.find {|t, u, o, g, p| t == tag and u == uri}
-          m[2] = occurs
-        else
-          self::MODELS << [tag, uri, occurs, getter, plural]
-        end
-      end
-
-      def install_get_attribute(name, uri, required=true,
-                                type=nil, disp_name=nil,
-                                element_name=nil)
-        disp_name ||= name
-        element_name ||= name
-        writer_type, reader_type = type
-        def_corresponded_attr_writer name, writer_type, disp_name
-        def_corresponded_attr_reader name, reader_type
-        if type == :boolean and /^is/ =~ name
-          alias_method "#{$POSTMATCH}?", name
-        end
-        self::GET_ATTRIBUTES << [name, uri, required, element_name]
-        add_need_initialize_variable(disp_name)
-      end
-
-      def def_corresponded_attr_writer(name, type=nil, disp_name=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
-        when :text_type
-          text_type_writer name, disp_name
-        when :content
-          content_writer name, disp_name
-        when :yes_clean_other
-          yes_clean_other_writer name, disp_name
-        when :yes_other
-          yes_other_writer name, disp_name
-        when :csv
-          csv_writer name
-        when :csv_integer
-          csv_integer_writer name
-        else
-          attr_writer name
-        end
-      end
-
-      def def_corresponded_attr_reader(name, type=nil)
-        case type
-        when :inherit
-          inherit_convert_attr_reader name
-        when :uri
-          uri_convert_attr_reader name
-        when :yes_clean_other
-          yes_clean_other_attr_reader name
-        when :yes_other
-          yes_other_attr_reader name
-        when :csv
-          csv_attr_reader name
-        when :csv_integer
-          csv_attr_reader name, :separator => ","
-        else
-          convert_attr_reader name
-        end
-      end
-
-      def content_setup(type=nil, disp_name=nil)
-        writer_type, reader_type = type
-        def_corresponded_attr_writer :content, writer_type, disp_name
-        def_corresponded_attr_reader :content, reader_type
-        @have_content = true
-      end
-
-      def have_content?
-        @have_content
-      end
-
-      def add_have_children_element(variable_name, plural_name)
-        self::HAVE_CHILDREN_ELEMENTS << [variable_name, plural_name]
-      end
-
-      def add_to_element_method(method_name)
-        self::TO_ELEMENT_METHODS << method_name
-      end
-
-      def add_need_initialize_variable(variable_name)
-        self::NEED_INITIALIZE_VARIABLES << variable_name
-      end
-
-      def add_plural_form(singular, plural)
-        self::PLURAL_FORMS[singular] = plural
-      end
-
-      def required_prefix
-        nil
-      end
-
-      def required_uri
-        ""
-      end
-
-      def need_parent?
-        false
-      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 :parent, :do_validate
-
-    def initialize(do_validate=true, attrs=nil)
-      @parent = nil
-      @converter = nil
-      if attrs.nil? and (do_validate.is_a?(Hash) or do_validate.is_a?(Array))
-        do_validate, attrs = true, do_validate
-      end
-      @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 valid?(ignore_unknown_element=true)
-      validate(ignore_unknown_element)
-      true
-    rescue RSS::Error
-      false
-    end
-
-    def validate(ignore_unknown_element=true)
-      do_validate = @do_validate
-      @do_validate = true
-      validate_attribute
-      __validate(ignore_unknown_element)
-    ensure
-      @do_validate = do_validate
-    end
-    
-    def validate_for_stream(tags, ignore_unknown_element=true)
-      validate_attribute
-      __validate(ignore_unknown_element, tags, false)
-    end
-
-    def to_s(need_convert=true, indent='')
-      if self.class.have_content?
-        return "" if !empty_content? and !content_is_set?
-        rv = tag(indent) do |next_indent|
-          if empty_content?
-            ""
-          else
-            xmled_content
-          end
-        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
-
-    def have_xml_content?
-      false
-    end
-
-    def need_base64_encode?
-      false
-    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.gsub(/-/, '_')}"
-      if self.class.plural_forms.has_key?(key)
-        ary = __send__("#{self.class.plural_forms[key]}")
-        ary << next_element
-      else
-        __send__("#{key}=", next_element)
-      end
-    end
-
-    protected
-    def have_required_elements?
-      self.class::MODELS.all? do |tag, uri, occurs, getter|
-        if occurs.nil? or occurs == "+"
-          child = __send__(getter)
-          if child.is_a?(Array)
-            children = child
-            children.any? {|c| c.have_required_elements?}
-          else
-            !child.to_s.empty?
-          end
-        else
-          true
-        end
-      end
-    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_variable_set("@#{variable_name}", nil)
-        end
-      end
-      initialize_have_children_elements
-      @content = normalized_attrs["content"] if self.class.have_content?
-    end
-
-    def initialize_have_children_elements
-      self.class.have_children_elements.each do |variable_name, plural_name|
-        instance_variable_set("@#{variable_name}", [])
-      end
-    end
-
-    def tag(indent, additional_attrs={}, &block)
-      next_indent = indent + INDENT
-
-      attrs = collect_attrs
-      return "" if attrs.nil?
-
-      return "" unless have_required_elements?
-
-      attrs.update(additional_attrs)
-      start_tag = make_start_tag(indent, next_indent, attrs.dup)
-
-      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?
-          return "" if attrs.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 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, plural|
-        value = __send__(getter)
-        next if value.nil?
-        if plural and 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 !prefix.empty? and 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|
-        value = instance_variable_get("@#{alias_name || a_name}")
-        if required and value.nil?
-          raise MissingAttributeError.new(tag_name, a_name)
-        end
-        __send__("#{alias_name || a_name}=", value)
-      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
-
-      _tags = tags.dup if tags
-      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
-
-    def empty_content?
-      false
-    end
-
-    def content_is_set?
-      if have_xml_content?
-        __send__(self.class.xml_getter)
-      else
-        content
-      end
-    end
-
-    def xmled_content
-      if have_xml_content?
-        __send__(self.class.xml_getter).to_s
-      else
-        _content = content
-        _content = Base64.encode64(_content) if need_base64_encode?
-        h(_content)
-      end
-    end
-  end
-
-  module RootElementMixin
-
-    include XMLStyleSheetMixin
-    
-    attr_reader :output_encoding
-    attr_reader :feed_type, :feed_subtype, :feed_version
-    attr_accessor :version, :encoding, :standalone
-    def initialize(feed_version, version=nil, encoding=nil, standalone=nil)
-      super()
-      @feed_type = nil
-      @feed_subtype = nil
-      @feed_version = feed_version
-      @version = version || '1.0'
-      @encoding = encoding
-      @standalone = standalone
-      @output_encoding = nil
-    end
-
-    def feed_info
-      [@feed_type, @feed_version, @feed_subtype]
-    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
-
-      super
-    end
-
-    def to_feed(type, &block)
-      Maker.make(type) do |maker|
-        setup_maker(maker)
-        block.call(maker) if block
-      end
-    end
-
-    def to_rss(type, &block)
-      to_feed("rss#{type}", &block)
-    end
-
-    def to_atom(type, &block)
-      to_feed("atom:#{type}", &block)
-    end
-
-    def to_xml(type=nil, &block)
-      if type.nil? or same_feed_type?(type)
-        to_s
-      else
-        to_feed(type, &block).to_s
-      end
-    end
-
-    private
-    def same_feed_type?(type)
-      if /^(atom|rss)?(\d+\.\d+)?(?::(.+))?$/i =~ type
-        feed_type = ($1 || @feed_type).downcase
-        feed_version = $2 || @feed_version
-        feed_subtype = $3 || @feed_subtype
-        [feed_type, feed_version, feed_subtype] == feed_info
-      else
-        false
-      end
-    end
-
-    def tag(indent, attrs={}, &block)
-      rv = super(indent, ns_declarations.merge(attrs), &block)
-      return rv if rv.empty?
-      "#{xmldecl}#{xml_stylesheet_pi}#{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 maker_target(target)
-      target
-    end
-  end
-end
diff --git a/lib/rss/slash.rb b/lib/rss/slash.rb
deleted file mode 100644
index f102413b46..0000000000
--- a/lib/rss/slash.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'rss/1.0'
-
-module RSS
-  SLASH_PREFIX = 'slash'
-  SLASH_URI = "http://purl.org/rss/1.0/modules/slash/"
-
-  RDF.install_ns(SLASH_PREFIX, SLASH_URI)
-
-  module SlashModel
-    extend BaseModel
-
-    ELEMENT_INFOS = \
-    [
-     ["section"],
-     ["department"],
-     ["comments", :positive_integer],
-     ["hit_parade", :csv_integer],
-    ]
-
-    class << self
-      def append_features(klass)
-        super
-
-        return if klass.instance_of?(Module)
-        klass.install_must_call_validator(SLASH_PREFIX, SLASH_URI)
-        ELEMENT_INFOS.each do |name, type, *additional_infos|
-          full_name = "#{SLASH_PREFIX}_#{name}"
-          klass.install_text_element(full_name, SLASH_URI, "?",
-                                     full_name, type, name)
-        end
-
-        klass.module_eval do
-          alias_method(:slash_hit_parades, :slash_hit_parade)
-          undef_method(:slash_hit_parade)
-          alias_method(:slash_hit_parade, :slash_hit_parade_content)
-        end
-      end
-    end
-  end
-
-  class RDF
-    class Item; include SlashModel; end
-  end
-
-  SlashModel::ELEMENT_INFOS.each do |name, type|
-    accessor_base = "#{SLASH_PREFIX}_#{name}"
-    BaseListener.install_get_text_element(SLASH_URI, name, accessor_base)
-  end
-end
diff --git a/lib/rss/syndication.rb b/lib/rss/syndication.rb
deleted file mode 100644
index 3eb15429f6..0000000000
--- a/lib/rss/syndication.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-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',
-                               "#{SY_PREFIX}:#{name}")
-        end
-      end
-
-      klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-        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
-      EOC
-    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/lib/rss/taxonomy.rb b/lib/rss/taxonomy.rb
deleted file mode 100644
index 276f63b05d..0000000000
--- a/lib/rss/taxonomy.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-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/lib/rss/trackback.rb b/lib/rss/trackback.rb
deleted file mode 100644
index ee2491f332..0000000000
--- a/lib/rss/trackback.rb
+++ /dev/null
@@ -1,288 +0,0 @@
-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/lib/rss/utils.rb b/lib/rss/utils.rb
deleted file mode 100644
index 0e4001e1f3..0000000000
--- a/lib/rss/utils.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-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(':')
-      line = line.to_i
-      line += 1 if i.zero?
-      [file, line]
-    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
-
-    module YesCleanOther
-      module_function
-      def parse(value)
-        if [true, false, nil].include?(value)
-          value
-        else
-          case value.to_s
-          when /\Ayes\z/i
-            true
-          when /\Aclean\z/i
-            false
-          else
-            nil
-          end
-        end
-      end
-    end
-
-    module YesOther
-      module_function
-      def parse(value)
-        if [true, false].include?(value)
-          value
-        else
-          /\Ayes\z/i.match(value.to_s) ? true : false
-        end
-      end
-    end
-
-    module CSV
-      module_function
-      def parse(value, &block)
-        if value.is_a?(String)
-          value = value.strip.split(/\s*,\s*/)
-          value = value.collect(&block) if block_given?
-          value
-        else
-          value
-        end
-      end
-    end
-
-    module InheritedReader
-      def inherited_reader(constant_name)
-        base_class = inherited_base
-        result = base_class.const_get(constant_name)
-        found_base_class = false
-        ancestors.reverse_each do |klass|
-          if found_base_class
-            if klass.const_defined?(constant_name)
-              result = yield(result, klass.const_get(constant_name))
-            end
-          else
-            found_base_class = klass == base_class
-          end
-        end
-        result
-      end
-
-      def inherited_array_reader(constant_name)
-        inherited_reader(constant_name) do |result, current|
-          current + result
-        end
-      end
-
-      def inherited_hash_reader(constant_name)
-        inherited_reader(constant_name) do |result, current|
-          result.merge(current)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/rss/xml-stylesheet.rb b/lib/rss/xml-stylesheet.rb
deleted file mode 100644
index 559d6bcd56..0000000000
--- a/lib/rss/xml-stylesheet.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-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)
-      if attrs.size == 1 and
-          (attrs.first.is_a?(Hash) or attrs.first.is_a?(Array))
-        attrs = attrs.first
-      end
-      @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/lib/rss/xml.rb b/lib/rss/xml.rb
deleted file mode 100644
index 1ae878b772..0000000000
--- a/lib/rss/xml.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require "rss/utils"
-
-module RSS
-  module XML
-    class Element
-      include Enumerable
-
-      attr_reader :name, :prefix, :uri, :attributes, :children
-      def initialize(name, prefix=nil, uri=nil, attributes={}, children=[])
-        @name = name
-        @prefix = prefix
-        @uri = uri
-        @attributes = attributes
-        if children.is_a?(String) or !children.respond_to?(:each)
-          @children = [children]
-        else
-          @children = children
-        end
-      end
-
-      def [](name)
-        @attributes[name]
-      end
-
-      def []=(name, value)
-        @attributes[name] = value
-      end
-
-      def <<(child)
-        @children << child
-      end
-
-      def each(&block)
-        @children.each(&block)
-      end
-
-      def ==(other)
-        other.kind_of?(self.class) and
-          @name == other.name and
-          @uri == other.uri and
-          @attributes == other.attributes and
-          @children == other.children
-      end
-
-      def to_s
-        rv = "<#{full_name}"
-        attributes.each do |key, value|
-          rv << " #{Utils.html_escape(key)}=\"#{Utils.html_escape(value)}\""
-        end
-        if children.empty?
-          rv << "/>"
-        else
-          rv << ">"
-          children.each do |child|
-            rv << child.to_s
-          end
-          rv << "</#{full_name}>"
-        end
-        rv
-      end
-
-      def full_name
-        if @prefix
-          "#{@prefix}:#{@name}"
-        else
-          @name
-        end
-      end
-    end
-  end
-end
diff --git a/lib/rss/xmlparser.rb b/lib/rss/xmlparser.rb
deleted file mode 100644
index 3dfe7d461a..0000000000
--- a/lib/rss/xmlparser.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-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/lib/rss/xmlscanner.rb b/lib/rss/xmlscanner.rb
deleted file mode 100644
index 61b9fa6bf4..0000000000
--- a/lib/rss/xmlscanner.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-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/lib/scanf.rb b/lib/scanf.rb
index 2972bf9d60..d518df8fb4 100644
--- a/lib/scanf.rb
+++ b/lib/scanf.rb
@@ -1,5 +1,6 @@
 # scanf for Ruby
 #
+# $Release Version: 1.1.2 $
 # $Revision$
 # $Id$
 # $Author$
@@ -330,6 +331,7 @@ module Scanf
 
     def initialize(str)
       @spec_string = str
+
       h = '[A-Fa-f0-9]'
 
       @re_string, @handler = 
@@ -521,7 +523,7 @@ module Scanf
     end
 
     def to_s
-      @specs.join('')
+      @spec_string
     end
 
     def prune(n=matched_count)
@@ -586,12 +588,11 @@ class IO
 #   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
+    start_position = pos
     matched_so_far = 0
     source_buffer = ""
     result_buffer = []
@@ -600,13 +601,12 @@ class IO
     fstr = Scanf::FormatString.new(str)
 
     loop do
-      if eof || (tty? &&! fstr.match(source_buffer))
+      if eof
         final_result.concat(result_buffer)
         break
       end
 
       source_buffer << gets
-
       current_match = fstr.match(source_buffer)
 
       spec = fstr.last_spec_tried
@@ -616,7 +616,6 @@ class IO
           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?
@@ -633,9 +632,10 @@ class IO
       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
 
@@ -647,20 +647,15 @@ class IO
     until eof ||! c || /\S/.match(c.chr)
       c = getc
     end
-    ungetc(c) if (c && /\S/.match(c.chr))
+    ungetc(c) if c
   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
+      final.push(yield(current)) unless current.empty?
+    end until current.empty? || eof
     return final
   end
 end
@@ -696,7 +691,7 @@ end
 
 module Kernel
   private
-  def scanf(fs,&b)
-    STDIN.scanf(fs,&b)
+  def scanf(fs)
+    STDIN.scanf(fs)
   end
 end
diff --git a/lib/securerandom.rb b/lib/securerandom.rb
deleted file mode 100644
index 3fd63e535f..0000000000
--- a/lib/securerandom.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-# = Secure random number generator interface.
-#
-# This library is an interface for secure random number generator which is
-# suitable for generating session key in HTTP cookies, etc.
-#
-# It supports following secure random number generators.
-#
-# * openssl
-# * /dev/urandom
-#
-# == Example
-#
-# # random hexadecimal string.
-# p SecureRandom.hex(10) #=> "52750b30ffbc7de3b362"
-# p SecureRandom.hex(10) #=> "92b15d6c8dc4beb5f559"
-# p SecureRandom.hex(11) #=> "6aca1b5c58e4863e6b81b8"
-# p SecureRandom.hex(12) #=> "94b2fff3e7fd9b9c391a2306"
-# p SecureRandom.hex(13) #=> "39b290146bea6ce975c37cfc23"
-# ...
-#
-# # random base64 string.
-# p SecureRandom.base64(10) #=> "EcmTPZwWRAozdA=="
-# p SecureRandom.base64(10) #=> "9b0nsevdwNuM/w=="
-# p SecureRandom.base64(10) #=> "KO1nIU+p9DKxGg=="
-# p SecureRandom.base64(11) #=> "l7XEiFja+8EKEtY="
-# p SecureRandom.base64(12) #=> "7kJSM/MzBJI+75j8"
-# p SecureRandom.base64(13) #=> "vKLJ0tXBHqQOuIcSIg=="
-# ...
-#
-# # random binary string.
-# p SecureRandom.random_bytes(10) #=> "\016\t{\370g\310pbr\301"
-# p SecureRandom.random_bytes(10) #=> "\323U\030TO\234\357\020\a\337"
-# ...
-
-begin
-  require 'openssl'
-rescue LoadError
-end
-
-module SecureRandom
-  # SecureRandom.random_bytes generates a random binary string.
-  #
-  # The argument n specifies the length of the result string.
-  #
-  # If n is not specified, 16 is assumed.
-  # It may be larger in future.
-  #
-  # If secure random number generator is not available,
-  # NotImplementedError is raised.
-  def self.random_bytes(n=nil)
-    n ||= 16
-    if defined? OpenSSL::Random
-      return OpenSSL::Random.random_bytes(n)
-    end
-    if !defined?(@has_urandom) || @has_urandom
-      @has_urandom = false
-      flags = File::RDONLY
-      flags |= File::NONBLOCK if defined? File::NONBLOCK
-      flags |= File::NOCTTY if defined? File::NOCTTY
-      flags |= File::NOFOLLOW if defined? File::NOFOLLOW
-      begin
-        File.open("/dev/urandom", flags) {|f|
-          unless f.stat.chardev?
-            raise Errno::ENOENT
-          end
-          @has_urandom = true
-          ret = f.readpartial(n)
-          if ret.length != n
-            raise NotImplementedError, "Unexpected partial read from random device"
-          end
-          return ret
-        }
-      rescue Errno::ENOENT
-        raise NotImplementedError, "No random device"
-      end
-    end
-    raise NotImplementedError, "No random device"
-  end
-
-  # SecureRandom.hex generates a random hex string.
-  #
-  # The argument n specifies the length of the random length.
-  # The length of the result string is twice of n.
-  #
-  # If n is not specified, 16 is assumed.
-  # It may be larger in future.
-  #
-  # If secure random number generator is not available,
-  # NotImplementedError is raised.
-  def self.hex(n=nil)
-    random_bytes(n).unpack("H*")[0]
-  end
-
-  # SecureRandom.base64 generates a random base64 string.
-  #
-  # The argument n specifies the length of the random length.
-  # The length of the result string is about 4/3 of n.
-  #
-  # If n is not specified, 16 is assumed.
-  # It may be larger in future.
-  #
-  # If secure random number generator is not available,
-  # NotImplementedError is raised.
-  def self.base64(n=nil)
-    [random_bytes(n)].pack("m*").delete("\n")
-  end
-
-  # SecureRandom.random_number generates a random number.
-  #
-  # If an positive integer is given as n,
-  # SecureRandom.random_number returns an integer:
-  # 0 <= SecureRandom.random_number(n) < n.
-  #
-  # If 0 is given or an argument is not given,
-  # SecureRandom.random_number returns an float:
-  # 0.0 <= SecureRandom.random_number() < 1.0.
-  def self.random_number(n=0)
-    if 0 < n
-      hex = n.to_s(16)
-      hex = '0' + hex if (hex.length & 1) == 1
-      bin = [hex].pack("H*")
-      mask = bin[0]
-      mask |= mask >> 1
-      mask |= mask >> 2
-      mask |= mask >> 4
-      begin
-        rnd = SecureRandom.random_bytes(bin.length)
-        rnd[0] = (rnd[0] & mask).chr
-      end until rnd < bin
-      rnd.unpack("H*")[0].hex
-    else
-      # assumption: Float::MANT_DIG <= 64
-      i64 = SecureRandom.random_bytes(8).unpack("Q")[0]
-      Math.ldexp(i64 >> (64-Float::MANT_DIG), -Float::MANT_DIG)
-    end
-  end
-end
diff --git a/lib/set.rb b/lib/set.rb
index 164aa429d9..a19a4f3b55 100644
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -2,7 +2,7 @@
 #--
 # set.rb - defines the Set class
 #++
-# Copyright (c) 2002-2008 Akinori MUSHA <knu@iDaemons.org>
+# Copyright (c) 2002 Akinori MUSHA <knu@iDaemons.org>
 #
 # Documentation by Akinori MUSHA and Gavin Sinclair. 
 #
@@ -48,10 +48,6 @@
 #   s1.subset? s2                         # -> false
 #   s2.subset? s1                         # -> true
 #
-# == Contact
-#
-#   - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
-#
 class Set
   include Enumerable
 
@@ -77,9 +73,13 @@ class Set
     end
   end
 
-  # Copy internal hash.
-  def initialize_copy(orig)
-    @hash = orig.instance_eval{@hash}.dup
+  # Duplicates the set.
+  def dup
+    myhash = @hash
+    self.class.new.instance_eval {
+      @hash.replace(myhash)
+      self
+    }
   end
 
   # Returns the number of elements.
@@ -188,10 +188,8 @@ class Set
   end
 
   # Calls the given block once for each element in the set, passing
-  # the element as parameter.  Returns an enumerator if no block is
-  # given.
+  # the element as parameter.
   def each
-    block_given? or return enum_for(__method__)
     @hash.each_key { |o| yield(o) }
     self
   end
@@ -234,7 +232,7 @@ class Set
   # Deletes every element of the set for which block evaluates to
   # true, and returns self.
   def delete_if
-    to_a.each { |o| @hash.delete(o) if yield(o) }
+    @hash.delete_if { |o,| yield(o) }
     self
   end
 
@@ -257,7 +255,7 @@ class Set
   # Merges the elements of the given enumerable object to the set and
   # returns self.
   def merge(enum)
-    if enum.is_a?(Set)
+    if enum.class == self.class
       @hash.update(enum.instance_eval { @hash })
     else
       enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
@@ -292,23 +290,23 @@ class Set
   end
   alias difference -	##
 
-  # Returns a new set containing elements common to the set and the
+  # Returns a new array 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) }
+    enum.each { |o| include?(o) and n.add(o) }
     n
   end
   alias intersection &	##
 
-  # Returns a new set containing elements exclusive between the set
+  # Returns a new array 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 = dup
+    enum.each { |o| if n.include?(o) then n.delete(o) else n.add(o) end }
     n
   end
 
@@ -319,8 +317,7 @@ class Set
 
     set.is_a?(Set) && size == set.size or return false
 
-    hash = @hash.dup
-    set.all? { |o| hash.include?(o) }
+    set.all? { |o| include?(o) }
   end
 
   def hash	# :nodoc:
@@ -328,8 +325,7 @@ class Set
   end
 
   def eql?(o)	# :nodoc:
-    return false unless o.is_a?(Set)
-    @hash.eql?(o.instance_eval{@hash})
+    @hash.hash == o.hash
   end
 
   # Classifies the set by the return value of the given block and
@@ -422,7 +418,14 @@ class Set
   def pretty_print(pp)	# :nodoc:
     pp.text sprintf('#<%s: {', self.class.name)
     pp.nest(1) {
-      pp.seplist(self) { |o|
+      first = true
+      each { |o|
+	if first
+	  first = false
+	else
+	  pp.text ","
+	  pp.breakable
+	end
 	pp.pp o
       }
     }
@@ -446,11 +449,6 @@ class SortedSet < Set
     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'
 
@@ -492,7 +490,7 @@ class SortedSet < Set
 
 	  def delete_if
 	    n = @hash.size
-	    super
+	    @hash.delete_if { |o,| yield(o) }
 	    @keys = nil if @hash.size != n
 	    self
 	  end
@@ -503,9 +501,7 @@ class SortedSet < Set
 	  end
 
 	  def each
-	    block_given? or return enum_for(__method__)
 	    to_a.each { |o| yield(o) }
-	    self
 	  end
 
 	  def to_a
@@ -527,7 +523,6 @@ 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
@@ -599,9 +594,7 @@ end
 #     else
 #       instance_eval %{
 # 	def add(o)
-#         if @proc.call(o)
-# 	    @hash[o] = true 
-#         end
+# 	  @hash[o] = true if @proc.call(o)
 # 	  self
 # 	end
 # 	alias << add
@@ -686,13 +679,6 @@ class TC_Set < Test::Unit::TestCase
     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
@@ -769,7 +755,7 @@ class TC_Set < Test::Unit::TestCase
     assert_same(orig_set1, set1)
     assert_equal(set3, set1)
 
-    # test3; multiple occurrences of a set in an set
+    # test3; multiple occurences of a set in an set
     set1 = Set[1, 2]
     set2 = Set[set1, Set[set1, 4], 3]
 
@@ -788,7 +774,7 @@ class TC_Set < Test::Unit::TestCase
       set1.flatten!
     }
 
-    # test5; miscellaneous
+    # test5; miscellaneus
     empty = Set[]
     set =  Set[Set[empty, "a"],Set[empty, "b"]]
 
@@ -922,11 +908,9 @@ class TC_Set < Test::Unit::TestCase
     ary = [1,3,5,7,10,20]
     set = Set.new(ary)
 
-    ret = set.each { |o| }
-    assert_same(set, ret)
-
-    e = set.each
-    assert_instance_of(Enumerable::Enumerator, e)
+    assert_raises(LocalJumpError) {
+      set.each
+    }
 
     assert_nothing_raised {
       set.each { |o|
@@ -1059,13 +1043,6 @@ class TC_Set < Test::Unit::TestCase
     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]
@@ -1078,12 +1055,10 @@ class TC_Set < Test::Unit::TestCase
     set2 = Set["a", "b", set1]
     set1 = set1.add(set1.clone)
 
-#    assert_equal(set1, set2)
-#    assert_equal(set2, set1)
+    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
@@ -1171,33 +1146,11 @@ class TC_SortedSet < Test::Unit::TestCase
     assert_equal([-10,-8,-6,-4,-2], s.to_a)
 
     prev = nil
-    ret = s.each { |o| assert(prev < o) if prev; prev = o }
+    s.each { |o| assert(prev < o) if prev; prev = o }
     assert_not_nil(prev)
-    assert_same(s, ret)
 
     s = SortedSet.new([2,1,3]) { |o| o * -2 }
     assert_equal([-6,-4,-2], s.to_a)
-
-    s = SortedSet.new(['one', 'two', 'three', 'four'])
-    a = []
-    ret = s.delete_if { |o| a << o; o.start_with?('t') }
-    assert_same(s, ret)
-    assert_equal(['four', 'one'], s.to_a)
-    assert_equal(['four', 'one', 'three', 'two'], a)
-
-    s = SortedSet.new(['one', 'two', 'three', 'four'])
-    a = []
-    ret = s.reject! { |o| a << o; o.start_with?('t') }
-    assert_same(s, ret)
-    assert_equal(['four', 'one'], s.to_a)
-    assert_equal(['four', 'one', 'three', 'two'], a)
-
-    s = SortedSet.new(['one', 'two', 'three', 'four'])
-    a = []
-    ret = s.reject! { |o| a << o; false }
-    assert_same(nil, ret)
-    assert_equal(['four', 'one', 'three', 'two'], s.to_a)
-    assert_equal(['four', 'one', 'three', 'two'], a)
   end
 end
 
diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
index ecf6c7d5eb..ce5102a9c4 100644
--- a/lib/shell/command-processor.rb
+++ b/lib/shell/command-processor.rb
@@ -21,7 +21,6 @@ require "shell/builtin-command"
 
 class Shell
   class CommandProcessor
-#    include Error
 
     #
     # initialize of Shell and related classes.
@@ -146,7 +145,7 @@ class Shell
     #	  file2:   String(optional)
     #	  return: Boolean
     #	same as:
-    #	  test()	   (when command is char or length 1 string or symbol)
+    #	  test()	   (when command is char or length 1 string or sumbol)
     #	  FileTest.command (others)
     #	example:
     #	  sh[?e, "foo"]
@@ -214,20 +213,13 @@ class Shell
     # CommandProcessor#system(command, *opts)
     #	  command: String
     #	  opts:	   String
-    #	  return:  SystemCommand
+    #	  retuen:  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
 
@@ -285,7 +277,7 @@ class Shell
       when IO
 	AppendIO.new(@shell, to, filter)
       else
-	Shell.Fail Error::CantApplyMethod, "append", to.class
+	Shell.Fail CantApplyMethod, "append", to.class
       end
     end
 
@@ -335,10 +327,10 @@ class Shell
 	if exists?(path)
 	  return path
 	else
-	  Shell.Fail Error::CommandNotFound, command
+	  Shell.Fail CommandNotFound, command
 	end
       when false
-	Shell.Fail Error::CommandNotFound, command
+	Shell.Fail CommandNotFound, command
       end
 
       for p in @shell.system_path
@@ -349,7 +341,7 @@ class Shell
 	end
       end
       @system_commands[command] = false
-      Shell.Fail Error::CommandNotFound, command
+      Shell.Fail CommandNotFound, command
     end
 
     #
diff --git a/lib/shell/filter.rb b/lib/shell/filter.rb
index 27c5534695..4cf793a3b3 100644
--- a/lib/shell/filter.rb
+++ b/lib/shell/filter.rb
@@ -18,6 +18,7 @@ class Shell
   #
   class Filter
     include Enumerable
+    include Error
 
     def initialize(sh)
       @shell = sh	  # parent shell
@@ -46,7 +47,7 @@ class Shell
 	self.input = src
 	self
       else
-	Shell.Fail Error::CantApplyMethod, "<", to.class
+	Filter.Fail CantApplyMethod, "<", to.class
       end
     end
 
@@ -62,7 +63,7 @@ class Shell
       when IO
 	each(){|l| to << l}
       else
-	Shell.Fail Error::CantApplyMethod, ">", to.class
+	Filter.Fail CantApplyMethod, ">", to.class
       end
       self
     end
@@ -71,7 +72,7 @@ class Shell
       begin
 	Shell.cd(@shell.pwd).append(to, self)
       rescue CantApplyMethod
-	Shell.Fail Error::CantApplyMethod, ">>", to.class
+	Shell.Fail CantApplyMethod, ">>", to.class
       end
     end
 
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
index 8929805506..f74abfd686 100644
--- a/lib/shell/process-controller.rb
+++ b/lib/shell/process-controller.rb
@@ -246,11 +246,9 @@ class Shell
 	    redo
 	  end
 	  Thread.exclusive do
-	    @job_monitor.synchronize do 
-	      terminate_job(command)
-	      @job_condition.signal
-	      command.notify "job(%id) finish.", @shell.debug?
-	    end
+	    terminate_job(command)
+	    @job_condition.signal
+	    command.notify "job(%id) finish.", @shell.debug?
 	  end
 	end
       }
diff --git a/lib/shell/system-command.rb b/lib/shell/system-command.rb
index f87ba890ea..6071c1c841 100644
--- a/lib/shell/system-command.rb
+++ b/lib/shell/system-command.rb
@@ -16,7 +16,7 @@ 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"
+	Shell.Fail TypeError, t.class, "String"
       end
       super(sh)
       @command = command
diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index a4ec552a7e..99c0bf8437 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -1,35 +1,31 @@
 #
-# shellwords.rb: Manipulates strings a la UNIX Bourne shell
+# shellwords.rb: Split text into an array of tokens a la UNIX shell
 #
 
 #
-# This module manipulates strings according to the word parsing rules
-# of the UNIX Bourne shell.
+# This module is originally a port of shellwords.pl, but modified to
+# conform to POSIX / SUSv3 (IEEE Std 1003.1-2001).
 #
-# The shellwords() function was originally a port of shellwords.pl,
-# but modified to conform to POSIX / SUSv3 (IEEE Std 1003.1-2001).
+# Examples:
 #
-# Authors:
-#   - Wakou Aoyama
-#   - Akinori MUSHA <knu@iDaemons.org>
+#   require 'shellwords'
+#   words = Shellwords.shellwords(line)
 #
-# Contact:
-#   - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
+# or
+#
+#   require 'shellwords'
+#   include Shellwords
+#   words = shellwords(line)
 #
 module Shellwords
+
   #
-  # Splits a string into an array of tokens in the same way the UNIX
-  # Bourne shell does.
-  #
-  #   argv = Shellwords.split('here are "two words"')
-  #   argv #=> ["here", "are", "two words"]
-  #
-  # +String#shellsplit+ is a shorthand for this function.
+  # Split text into an array of tokens in the same way the UNIX Bourne
+  # shell does.
   #
-  #   argv = 'here are "two words"'.shellsplit
-  #   argv #=> ["here", "are", "two words"]
+  # See the +Shellwords+ module documentation for an example.
   #
-  def shellsplit(line)
+  def shellwords(line)
     line = String.new(line) rescue
       raise(ArgumentError, "Argument must be a string")
     line.lstrip!
@@ -45,8 +41,8 @@ module Shellwords
 	  snippet = $1
 	elsif line =~ /\A'/ then
 	  raise ArgumentError, "Unmatched single quote: #{line}"
-	elsif line.sub!(/\A\\(.)?/, '') then
-	  snippet = $1 || '\\'
+	elsif line.sub!(/\A\\(.)/, '') then
+	  snippet = $1
 	elsif line.sub!(/\A([^\s\\'"]+)/, '') then
 	  snippet = $1
 	else
@@ -60,113 +56,5 @@ module Shellwords
     words
   end
 
-  alias shellwords shellsplit
-
-  module_function :shellsplit, :shellwords
-
-  class << self
-    alias split shellsplit
-  end
-
-  #
-  # Escapes a string so that it can be safely used in a Bourne shell
-  # command line.
-  #
-  # Note that a resulted string should be used unquoted and is not
-  # intended for use in double quotes nor in single quotes.
-  #
-  #   open("| grep #{Shellwords.escape(pattern)} file") { |pipe|
-  #     # ...
-  #   }
-  #
-  # +String#shellescape+ is a shorthand for this function.
-  #
-  #   open("| grep #{pattern.shellescape} file") { |pipe|
-  #     # ...
-  #   }
-  #
-  def shellescape(str)
-    # An empty argument will be skipped, so return empty quotes.
-    return "''" if str.empty?
-
-    str = str.dup
-
-    # Process as a single byte sequence because not all shell
-    # implementations are multibyte aware.
-    str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
-
-    # A LF cannot be escaped with a backslash because a backslash + LF
-    # combo is regarded as line continuation and simply ignored.
-    str.gsub!(/\n/, "'\n'")
-
-    return str
-  end
-
-  module_function :shellescape
-
-  class << self
-    alias escape shellescape
-  end
-
-  #
-  # Builds a command line string from an argument list +array+ joining
-  # all elements escaped for Bourne shell and separated by a space.
-  #
-  #   open('|' + Shellwords.join(['grep', pattern, *files])) { |pipe|
-  #     # ...
-  #   }
-  #
-  # +Array#shelljoin+ is a shorthand for this function.
-  #
-  #   open('|' + ['grep', pattern, *files].shelljoin) { |pipe|
-  #     # ...
-  #   }
-  #
-  def shelljoin(array)
-    array.map { |arg| shellescape(arg) }.join(' ')
-  end
-
-  module_function :shelljoin
-
-  class << self
-    alias join shelljoin
-  end
-end
-
-class String
-  #
-  # call-seq:
-  #   str.shellsplit => array
-  #
-  # Splits +str+ into an array of tokens in the same way the UNIX
-  # Bourne shell does.  See +Shellwords::shellsplit+ for details.
-  #
-  def shellsplit
-    Shellwords.split(self)
-  end
-
-  #
-  # call-seq:
-  #   str.shellescape => string
-  #
-  # Escapes +str+ so that it can be safely used in a Bourne shell
-  # command line.  See +Shellwords::shellescape+ for details.
-  #
-  def shellescape
-    Shellwords.escape(self)
-  end
-end
-
-class Array
-  #
-  # call-seq:
-  #   array.shelljoin => string
-  #
-  # Builds a command line string from an argument list +array+ joining
-  # all elements escaped for Bourne shell and separated by a space.
-  # See +Shellwords::shelljoin+ for details.
-  #
-  def shelljoin
-    Shellwords.join(self)
-  end
+  module_function :shellwords
 end
diff --git a/lib/singleton.rb b/lib/singleton.rb
index 592d33c063..2954bfa153 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -13,14 +13,14 @@
 #    a == b   # => true
 #    a.new    #  NoMethodError - new is private ...
 #
-# *  ``The instance'' is created at instantiation time, in other
+# *  ``The instance'' is created at instanciation time, in other
 #    words the first call of Klass.instance(), thus
 #
-#      class OtherKlass
+#    class OtherKlass
 #        include Singleton
 #        # ...
-#      end
-#      ObjectSpace.each_object(OtherKlass){} # => 0.
+#    end
+#    ObjectSpace.each_object(OtherKlass){} # => 0.
 #
 # *  This behavior is preserved under inheritance and cloning.
 #
@@ -30,7 +30,7 @@
 # *  Klass.new and Klass.allocate - as private
 #
 # Providing (or modifying) the class methods
-# *  Klass.inherited(sub_klass) and Klass.clone()  -
+# *  Klass.inherited(sub_klass) and Klass.clone()  - 
 #    to ensure that the Singleton pattern is properly
 #    inherited and cloned.
 #
@@ -44,11 +44,11 @@
 #
 # *  Klass._load(str)  -  calling Klass.instance()
 #
-# *  Klass._instantiate?()  -  returning ``the instance'' or
+# *  Klass._instanciate?()  -  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".
+#    of the first, or more generally, current "instanciation thread".
 #
 #
 # The instance method of Singleton are
@@ -70,9 +70,10 @@ module Singleton
   def dup
     raise TypeError, "can't dup instance of singleton #{self.class}"
   end
-
+  
+  private 
   #  default marshalling strategy
-  def _dump(depth=-1)
+  def _dump(depth=-1) 
     ''
   end
 end
@@ -102,8 +103,8 @@ class << Singleton
           @__instance__ = nil #  failed instance creation
         end
       end
-    elsif  _instantiate?()
-      Thread.critical = false
+    elsif  _instanciate?()
+      Thread.critical = false    
     else
       @__instance__  = false
       Thread.critical = false
@@ -122,28 +123,28 @@ class << Singleton
     end
     @__instance__
   end
-
-  module SingletonClassMethods
+  
+  module SingletonClassMethods  
     # properly clone the Singleton pattern - did you know
-    # that duping doesn't copy class methods?
+    # that duping doesn't copy class methods?  
     def clone
       Singleton.__init__(super)
     end
-
-    def _load(str)
-      instance
-    end
-
+    
     private
-
-    #  ensure that the Singleton pattern is properly inherited
+    
+    #  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?()
+    def _instanciate?()
       while false.equal?(@__instance__)
         Thread.critical = false
         sleep(0.08)   # timeout
@@ -152,7 +153,7 @@ class << Singleton
       @__instance__
     end
   end
-
+  
   def __init__(klass)
     klass.instance_eval { @__instance__ = nil }
     class << klass
@@ -160,11 +161,11 @@ class << Singleton
     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)
@@ -172,7 +173,7 @@ class << Singleton
     end
     super
   end
-
+  
   def included(klass)
     super
     klass.private_class_method  :new, :allocate
@@ -180,21 +181,21 @@ class << Singleton
     Singleton.__init__(klass)
   end
 end
-
+ 
 
 
 if __FILE__ == $0
 
 def num_of_instances(klass)
     "#{ObjectSpace.each_object(klass){}} #{klass} instance(s)"
-end
+end 
 
 # The basic and most important example.
 
 class SomeSingletonClass
   include Singleton
 end
-puts "There are #{num_of_instances(SomeSingletonClass)}"
+puts "There are #{num_of_instances(SomeSingletonClass)}" 
 
 a = SomeSingletonClass.instance
 b = SomeSingletonClass.instance # a and b are same object
@@ -208,7 +209,7 @@ end
 
 
 
-puts "\nThreaded example with exception and customized #_instantiate?() hook"; p
+puts "\nThreaded example with exception and customized #_instanciate?() hook"; p
 Thread.abort_on_exception = false
 
 class Ups < SomeSingletonClass
@@ -217,23 +218,23 @@ class Ups < SomeSingletonClass
     puts "initialize called by thread ##{Thread.current[:i]}"
   end
 end
-
+  
 class << Ups
-  def _instantiate?
+  def _instanciate?
     @enter.push Thread.current[:i]
     while false.equal?(@__instance__)
       Thread.critical = false
-      sleep 0.08
+      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
@@ -245,12 +246,12 @@ class << Ups
       end
     end
   end
-
-  def instantiate_all
+  
+  def instanciate_all
     @enter = []
     @leave = []
-    1.upto(9) {|i|
-      Thread.new {
+    1.upto(9) {|i|  
+      Thread.new { 
         begin
           Thread.current[:i] = i
           __sleep
@@ -269,7 +270,7 @@ class << Ups
 end
 
 
-Ups.instantiate_all
+Ups.instanciate_all
 # results in message like
 # Before there were 0 Ups instance(s)
 # boom - thread #6 failed to create instance
@@ -292,7 +293,7 @@ def Yup.new
     end
   end
 end
-Yup.instantiate_all
+Yup.instanciate_all
 
 
 puts "\n\n","Customized marshalling"
@@ -340,7 +341,7 @@ end
 class Down < Middle; end
 
 puts  "and basic \"Down test\" is #{Down.instance == Down.instance}\n
-Various exceptions"
+Various exceptions"  
 
 begin
   module AModule
diff --git a/lib/soap/attachment.rb b/lib/soap/attachment.rb
deleted file mode 100644
index 1a59b14018..0000000000
--- a/lib/soap/attachment.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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/lib/soap/baseData.rb b/lib/soap/baseData.rb
index 0e8b00d450..91f5a0433f 100644
--- a/lib/soap/baseData.rb
+++ b/lib/soap/baseData.rb
@@ -1,5 +1,5 @@
 # soap/baseData.rb: SOAP4R - Base type library
-# Copyright (C) 2000, 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -30,10 +30,20 @@ end
 
 
 ###
-## for SOAP type(base and compound)
+## Marker of SOAP/DM types.
 #
-module SOAPType
+module SOAPType; end
+
+
+###
+## Mix-in module for SOAP base type instances.
+#
+module SOAPBasetype
+  include SOAPType
+  include SOAP
+
   attr_accessor :encodingstyle
+
   attr_accessor :elename
   attr_accessor :id
   attr_reader :precedents
@@ -41,61 +51,55 @@ module SOAPType
   attr_accessor :parent
   attr_accessor :position
   attr_reader :extraattr
-  attr_accessor :definedtype
 
-  def initialize(*arg)
-    super
+public
+
+  def initialize(*vars)
+    super(*vars)
     @encodingstyle = nil
-    @elename = XSD::QName::EMPTY
+    @elename = XSD::QName.new
     @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
+## Mix-in module for SOAP compound type instances.
 #
-module SOAPBasetype
+module SOAPCompoundtype
   include SOAPType
   include SOAP
 
-  def initialize(*arg)
-    super
-  end
-end
+  attr_accessor :encodingstyle
 
+  attr_accessor :elename
+  attr_accessor :id
+  attr_reader :precedents
+  attr_accessor :root
+  attr_accessor :parent
+  attr_accessor :position
+  attr_reader :extraattr
 
-###
-## for SOAP compound type
-#
-module SOAPCompoundtype
-  include SOAPType
-  include SOAP
+  attr_accessor :definedtype
 
-  def initialize(*arg)
-    super
+public
+
+  def initialize(type)
+    super()
+    @type = type
+    @encodingstyle = nil
+    @elename = XSD::QName.new
+    @id = nil
+    @precedents = []
+    @root = false
+    @parent = nil
+    @position = nil
+    @definedtype = nil
+    @extraattr = {}
   end
 end
 
@@ -110,14 +114,20 @@ class SOAPReference < XSD::NSDBase
 public
 
   attr_accessor :refid
+  attr_accessor :elename
 
   # Override the definition in SOAPBasetype.
-  def initialize(obj = nil)
+  def initialize(refid = nil)
     super()
-    @type = XSD::QName::EMPTY
-    @refid = nil
+    @type = XSD::QName.new
+    @encodingstyle = nil
+    @elename = XSD::QName.new
+    @id = nil
+    @precedents = []
+    @root = false
+    @parent = nil
+    @refid = refid
     @obj = nil
-    __setobj__(obj) if obj
   end
 
   def __getobj__
@@ -126,7 +136,7 @@ public
 
   def __setobj__(obj)
     @obj = obj
-    @refid = @obj.id || SOAPReference.create_refid(@obj)
+    @refid = SOAPReference.create_refid(@obj)
     @obj.id = @refid unless @obj.id
     @obj.precedents << self
     # Copies NSDBase information
@@ -149,54 +159,17 @@ public
     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
+  def self.decode(elename, refid)
     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
+  def self.create_refid(obj)
+    'id' << obj.__id__.to_s
   end
 end
 
-
 class SOAPNil < XSD::XSDNil
   include SOAPBasetype
   extend SOAPModuleUtils
@@ -327,16 +300,6 @@ class SOAPInteger < XSD::XSDInteger
   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
@@ -352,41 +315,6 @@ class SOAPShort < XSD::XSDShort
   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.
@@ -398,8 +326,7 @@ class SOAPStruct < XSD::NSDBase
 public
 
   def initialize(type = nil)
-    super()
-    @type = type || XSD::QName::EMPTY
+    super(type || XSD::QName.new)
     @array = []
     @data = []
   end
@@ -407,7 +334,7 @@ public
   def to_s()
     str = ''
     self.each do |key, data|
-      str << "#{key}: #{data}\n"
+      str << "#{ key }: #{ data }\n"
     end
     str
   end
@@ -435,7 +362,6 @@ public
 
   def []=(idx, data)
     if @array.include?(idx)
-      data.parent = self if data.respond_to?(:parent=)
       @data[@array.index(idx)] = data
     else
       add(idx, data)
@@ -450,30 +376,9 @@ public
     @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
+    for i in 0..(@array.length - 1)
+      yield(@array[i], @data[i])
     end
   end
 
@@ -496,55 +401,39 @@ private
     @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.
+# SOAPElement is not typed so it does not derive 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_reader :precedents
 
   attr_accessor :qualified
+  attr_accessor :elename
 
   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 = {}
+    @precedents = []
 
-    @qualified = nil
+    @qualified = false
+    @elename = elename
 
     @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)
@@ -561,7 +450,6 @@ class SOAPElement
 
   def []=(idx, data)
     if @array.include?(idx)
-      data.parent = self if data.respond_to?(:parent=)
       @data[@array.index(idx)] = data
     else
       add(data)
@@ -581,107 +469,65 @@ class SOAPElement
       @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
+	hash[k] = v.to_obj
       end
       hash
     end
   end
 
   def each
-    idx = 0
-    while idx < @array.length
-      yield(@array[idx], @data[idx])
-      idx += 1
+    for i in 0..(@array.length - 1)
+      yield(@array[i], @data[i])
     end
   end
 
   def self.decode(elename)
-    o = SOAPElement.new(elename)
+    o = SOAPElement.new
+    o.elename = elename
     o
   end
 
-  def self.from_obj(obj, namespace = nil)
+  def self.from_obj(hash_or_string)
     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
+    if hash_or_string.is_a?(Hash)
+      hash_or_string.each do |k, v|
+	child = self.from_obj(v)
+	child.elename = XSD::QName.new(nil, k)
+	o.add(child)
       end
     else
-      o.text = obj.to_s
+      o.text = hash_or_string
     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
+  def add_accessor(name)
+    methodname = name
+    if self.respond_to?(methodname)
+      methodname = safe_accessor_name(methodname)
     end
-  else
-    def add_accessor(name)
-      methodname = safe_accessor_name(name)
+    begin
       instance_eval <<-EOS
-        def #{methodname}
-          @data[@array.index(#{name.dump})]
+        def #{ methodname }()
+	  @data[@array.index('#{ name }')]
         end
 
-        def #{methodname}=(value)
-          @data[@array.index(#{name.dump})] = value
+        def #{ methodname }=(value)
+	  @data[@array.index('#{ name }')] = value
         end
       EOS
+    rescue SyntaxError
+      methodname = safe_accessor_name(methodname)
+      retry
     end
   end
 
@@ -704,8 +550,7 @@ public
   attr_reader :arytype
 
   def initialize(type = nil, rank = 1, arytype = nil)
-    super()
-    @type = type || ValueArrayName
+    super(type || XSD::QName.new)
     @rank = rank
     @data = Array.new
     @sparse = false
@@ -727,7 +572,7 @@ public
 
   def [](*idxary)
     if idxary.size != @rank
-      raise ArgumentError.new("given #{idxary.size} params does not match rank: #{@rank}")
+      raise ArgumentError.new("Given #{ idxary.size } params does not match rank: #{ @rank }")
     end
 
     retrieve(idxary)
@@ -737,33 +582,33 @@ public
     value = idxary.slice!(-1)
 
     if idxary.size != @rank
-      raise ArgumentError.new("given #{idxary.size} params(#{idxary})" +
-        " does not match rank: #{@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
+    for i in 0..(idxary.size - 1)
+      if idxary[i] + 1 > @size[i]
+	@size[i] = idxary[i] + 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
+      value.elename = value.elename.dup_name('item')
+      
       # Sync type
       unless @type.name
 	@type = XSD::QName.new(value.type.namespace,
 	  SOAPArray.create_arytype(value.type.name, @rank))
       end
-      value.type ||= @type
+
+      unless value.type
+	value.type = @type
+      end
     end
 
     @offset = idxary
-    value.parent = self if value.respond_to?(:parent=)
     offsetnext
   end
 
@@ -789,7 +634,7 @@ public
 	deep_map(ele, &block)
       else
 	new_obj = block.call(ele)
-	new_obj.elename = ITEM_NAME
+	new_obj.elename = new_obj.elename.dup_name('item')
 	new_obj
       end
     end
@@ -817,15 +662,13 @@ public
   def soap2array(ary)
     traverse_data(@data) do |v, *position|
       iteary = ary
-      rank = 1
-      while rank < position.size
+      for rank in 1..(position.size - 1)
 	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)
@@ -841,26 +684,21 @@ public
 
 private
 
-  ITEM_NAME = XSD::QName.new(nil, 'item')
-
   def retrieve(idxary)
     data = @data
-    rank = 1
-    while rank <= idxary.size
+    for rank in 1..(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)
+    for idx in 0..(ranksize(rank) - 1)
       if rank < @rank
 	traverse_data(data[idx], rank + 1) do |*v|
 	  v[1, 0] = idx
@@ -869,7 +707,6 @@ private
       else
 	yield(data[idx], idx)
       end
-      idx += 1
     end
   end
 
@@ -924,7 +761,7 @@ public
 private
 
   def self.create_arytype(typename, rank)
-    "#{typename}[" << ',' * (rank - 1) << ']'
+    "#{ typename }[" << ',' * (rank - 1) << ']'
   end
 
   TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$')
diff --git a/lib/soap/element.rb b/lib/soap/element.rb
index cc58b5d341..ae600a08e2 100644
--- a/lib/soap/element.rb
+++ b/lib/soap/element.rb
@@ -1,5 +1,5 @@
 # SOAP4R - SOAP elements library
-# Copyright (C) 2000, 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -71,10 +71,6 @@ public
       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 = {})
@@ -83,10 +79,10 @@ public
     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
+    yield(self.faultcode, false)
+    yield(self.faultstring, false)
+    yield(self.faultactor, false)
+    yield(self.detail, false) if self.detail
     generator.encode_tag_end(name, true)
   end
 end
@@ -95,19 +91,13 @@ end
 class SOAPBody < SOAPStruct
   include SOAPEnvelopeElement
 
+public
+
   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
+    add(data.elename.name, data) if data
     @is_fault = is_fault
   end
 
@@ -115,10 +105,10 @@ class SOAPBody < SOAPStruct
     name = ns.name(@elename)
     generator.encode_tag(name, attrs)
     if @is_fault
-      yield(@data)
+      yield(@data, true)
     else
       @data.each do |data|
-	yield(data)
+	yield(data, true)
       end
     end
     generator.encode_tag_end(name, true)
@@ -137,7 +127,7 @@ class SOAPBody < SOAPStruct
       end
     end
 
-    raise Parser::FormatDecodeError.new('no root element')
+    raise SOAPParser::FormatDecodeError.new('No root element.')
   end
 end
 
@@ -148,39 +138,38 @@ class SOAPHeaderItem < XSD::NSDBase
 
 public
 
-  attr_accessor :element
+  attr_accessor :content
   attr_accessor :mustunderstand
   attr_accessor :encodingstyle
 
-  def initialize(element, mustunderstand = true, encodingstyle = nil)
-    super()
-    @type = nil
-    @element = element
+  def initialize(content, mustunderstand = true, encodingstyle = nil)
+    super(nil)
+    @content = content
     @mustunderstand = mustunderstand
-    @encodingstyle = encodingstyle
-    element.parent = self if element
+    @encodingstyle = encodingstyle || LiteralNamespace
   end
 
   def encode(generator, ns, attrs = {})
     attrs.each do |key, value|
-      @element.extraattr[key] = value
+      @content.attr[key] = value
     end
-    @element.extraattr[ns.name(AttrMustUnderstandName)] =
+    @content.attr[ns.name(EnvelopeNamespace, AttrMustUnderstand)] =
       (@mustunderstand ? '1' : '0')
     if @encodingstyle
-      @element.extraattr[ns.name(AttrEncodingStyleName)] = @encodingstyle
+      @content.attr[ns.name(EnvelopeNamespace, AttrEncodingStyle)] =
+      	@encodingstyle
     end
-    @element.encodingstyle = @encodingstyle if !@element.encodingstyle
-    yield(@element)
+    @content.encodingstyle = @encodingstyle if !@content.encodingstyle
+    yield(@content, true)
   end
 end
 
 
-class SOAPHeader < SOAPStruct
+class SOAPHeader < SOAPArray
   include SOAPEnvelopeElement
 
-  def initialize
-    super(nil)
+  def initialize()
+    super(nil, 1)	# rank == 1
     @elename = EleHeaderName
     @encodingstyle = nil
   end
@@ -189,22 +178,14 @@ class SOAPHeader < SOAPStruct
     name = ns.name(@elename)
     generator.encode_tag(name, attrs)
     @data.each do |data|
-      yield(data)
+      yield(data, true)
     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
 
 
@@ -212,46 +193,28 @@ class SOAPEnvelope < XSD::NSDBase
   include SOAPEnvelopeElement
   include SOAPCompoundtype
 
-  attr_reader :header
-  attr_reader :body
-  attr_reader :external_content
+  attr_accessor :header
+  attr_accessor :body
 
   def initialize(header = nil, body = nil)
-    super()
-    @type = nil
+    super(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)
+    SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace,
+      SOAPNamespaceTag)
     name = ns.name(@elename)
     generator.encode_tag(name, attrs)
 
-    yield(@header) if @header and @header.length > 0
-    yield(@body)
+    yield(@header, true) if @header and @header.length > 0
+    yield(@body, true)
 
     generator.encode_tag_end(name, true)
   end
-
-  def to_ary
-    [header, body]
-  end
 end
 
 
diff --git a/lib/soap/encodingstyle/aspDotNetHandler.rb b/lib/soap/encodingstyle/aspDotNetHandler.rb
index fd7e0fa217..e976433a7b 100644
--- a/lib/soap/encodingstyle/aspDotNetHandler.rb
+++ b/lib/soap/encodingstyle/aspDotNetHandler.rb
@@ -1,5 +1,5 @@
 # SOAP4R - ASP.NET EncodingStyle handler library
-# Copyright (C) 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -27,45 +27,51 @@ class ASPDotNetHandler < Handler
   ###
   ## encode interface.
   #
-  def encode_data(generator, ns, data, parent)
+  def encode_data(generator, ns, qualified, 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)
+    name = if qualified and data.elename.namespace
+        SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
+        ns.name(data.elename)
+      else
+        data.elename.name
+      end
+
     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)
+      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)
+	if !value.elename.namespace
+          value.elename.namespace = data.elename.namespace 
+        end
+        yield(value, true)
       end
     when SOAPArray
       generator.encode_tag(name, attrs)
       data.traverse do |child, *rank|
 	data.position = nil
-        generator.encode_child(ns, child, data)
+        yield(child, true)
       end
     else
-      raise EncodingStyleError.new(
-        "unknown object:#{data} in this encodingStyle")
+      raise EncodingStyleError.new("Unknown object:#{ data } in this encodingSt
+yle.")
     end
   end
 
-  def encode_data_end(generator, ns, data, parent)
-    name = generator.encode_name_end(ns, data)
+  def encode_data_end(generator, ns, qualified, data, parent)
+    name = if qualified and data.elename.namespace
+        ns.name(data.elename)
+      else
+        data.elename.name
+      end
     cr = data.is_a?(SOAPCompoundtype)
     generator.encode_tag_end(name, cr)
   end
@@ -113,6 +119,7 @@ class ASPDotNetHandler < Handler
   end
 
   def decode_tag(ns, elename, attrs, parent)
+    # ToDo: check if @textbuf is empty...
     @textbuf = ''
     o = SOAPUnknown.new(self, elename)
     o.parent = parent
@@ -183,11 +190,11 @@ class ASPDotNetHandler < Handler
       end
 
     when SOAPBasetype
-      raise EncodingStyleError.new("SOAP base type must not have a child")
+      raise EncodingStyleError.new("SOAP base type must not have a child.")
 
     else
       # SOAPUnknown does not have parent.
-      # raise EncodingStyleError.new("illegal parent: #{parent}")
+      # raise EncodingStyleError.new("Illegal parent: #{ parent }.")
     end
   end
 
diff --git a/lib/soap/encodingstyle/handler.rb b/lib/soap/encodingstyle/handler.rb
index c015417435..8ea23ef146 100644
--- a/lib/soap/encodingstyle/handler.rb
+++ b/lib/soap/encodingstyle/handler.rb
@@ -44,8 +44,8 @@ class Handler
 
   attr_reader :charset
   attr_accessor :generate_explicit_type
-  def decode_typemap=(definedtypes)
-    @decode_typemap = definedtypes
+  def decode_typemap=(complextypes)
+    @decode_typemap = complextypes
   end
 
   def initialize(charset)
@@ -58,12 +58,12 @@ class Handler
   ## encode interface.
   #
   # Returns a XML instance as a string.
-  def encode_data(generator, ns, data, parent)
-    raise NotImplementError
+  def encode_data(generator, ns, qualified, data, parent)
+    raise NotImplementError.new('Method encode_data must be defined in derived class.')
   end
 
-  def encode_data_end(generator, ns, data, parent)
-    raise NotImplementError
+  def encode_data_end(generator, ns, qualified, data, parent)
+    raise NotImplementError.new('Method encode_data must be defined in derived class.')
   end
 
   def encode_prologue
diff --git a/lib/soap/encodingstyle/literalHandler.rb b/lib/soap/encodingstyle/literalHandler.rb
index 59c7205366..995e1a5361 100644
--- a/lib/soap/encodingstyle/literalHandler.rb
+++ b/lib/soap/encodingstyle/literalHandler.rb
@@ -1,5 +1,5 @@
 # SOAP4R - XML Literal EncodingStyle handler library
-# Copyright (C) 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -26,67 +26,57 @@ class LiteralHandler < Handler
   ###
   ## encode interface.
   #
-  def encode_data(generator, ns, data, parent)
+  def encode_data(generator, ns, qualified, 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
+    name = if qualified and data.elename.namespace
+        SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
+        ns.name(data.elename)
+      else
+        data.elename.name
       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)
+      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)
+	value.elename.namespace = data.elename.namespace if !value.elename.namespace
+        yield(value, true)
       end
     when SOAPArray
       generator.encode_tag(name, attrs)
       data.traverse do |child, *rank|
 	data.position = nil
-        generator.encode_child(ns, child, data)
+        yield(child, true)
       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_tag(name, attrs.update(data.extraattr))
       generator.encode_rawstring(data.text) if data.text
       data.each do |key, value|
-        generator.encode_child(ns, value, data)
+	value.elename.namespace = data.elename.namespace if !value.elename.namespace
+	#yield(value, data.qualified)
+	yield(value, qualified)
       end
     else
-      raise EncodingStyleError.new(
-        "unknown object:#{data} in this encodingStyle")
+      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)
+  def encode_data_end(generator, ns, qualified, data, parent)
+    name = if qualified and data.elename.namespace
+        ns.name(data.elename)
+      else
+        data.elename.name
+      end
+    generator.encode_tag_end(name)
   end
 
 
@@ -102,17 +92,15 @@ class LiteralHandler < Handler
   end
 
   class SOAPUnknown < SOAPTemporalObject
-    def initialize(handler, elename, extraattr)
+    def initialize(handler, elename)
       super()
       @handler = handler
       @elename = elename
-      @extraattr = extraattr
     end
 
-    def as_element
-      o = SOAPElement.decode(@elename)
+    def as_struct
+      o = SOAPStruct.decode(@elename, XSD::AnyTypeName)
       o.parent = @parent
-      o.extraattr.update(@extraattr)
       @handler.decode_parent(@parent, o)
       o
     end
@@ -120,7 +108,6 @@ class LiteralHandler < Handler
     def as_string
       o = SOAPString.decode(@elename)
       o.parent = @parent
-      o.extraattr.update(@extraattr)
       @handler.decode_parent(@parent, o)
       o
     end
@@ -128,15 +115,15 @@ class LiteralHandler < Handler
     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)
+    # ToDo: check if @textbuf is empty...
     @textbuf = ''
-    o = SOAPUnknown.new(self, elename, decode_attrs(ns, attrs))
+    o = SOAPUnknown.new(self, elename)
     o.parent = parent
     o
   end
@@ -145,7 +132,7 @@ class LiteralHandler < Handler
     o = node.node
     if o.is_a?(SOAPUnknown)
       newnode = if /\A\s*\z/ =~ @textbuf
-	  o.as_element
+	  o.as_struct
 	else
 	  o.as_string
 	end
@@ -162,15 +149,6 @@ class LiteralHandler < Handler
     @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
 
@@ -178,19 +156,16 @@ class LiteralHandler < Handler
   end
 
   def decode_parent(parent, node)
-    return unless parent.node
     case parent.node
     when SOAPUnknown
-      newparent = parent.node.as_element
+      newparent = parent.node.as_struct
       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
+      parent.node.add(node.name, node)
+
     when SOAPArray
       if node.position
 	parent.node[*(decode_arypos(node.position))] = node
@@ -198,9 +173,13 @@ class LiteralHandler < Handler
       else
 	parent.node.add(node)
       end
-      node.parent = parent.node
+
+    when SOAPBasetype
+      raise EncodingStyleError.new("SOAP base type must not have a child.")
+
     else
-      raise EncodingStyleError.new("illegal parent: #{parent.node}")
+      # SOAPUnknown does not have parent.
+      # raise EncodingStyleError.new("Illegal parent: #{ parent }.")
     end
   end
 
diff --git a/lib/soap/encodingstyle/soapHandler.rb b/lib/soap/encodingstyle/soapHandler.rb
index a522392625..9aa732535e 100644
--- a/lib/soap/encodingstyle/soapHandler.rb
+++ b/lib/soap/encodingstyle/soapHandler.rb
@@ -1,5 +1,5 @@
 # SOAP4R - SOAP EncodingStyle handler library
-# Copyright (C) 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -29,49 +29,57 @@ class SOAPHandler < Handler
   ###
   ## encode interface.
   #
-  def encode_data(generator, ns, data, parent)
+  def encode_data(generator, ns, qualified, data, parent)
     attrs = encode_attrs(generator, ns, data, parent)
+
     if parent && parent.is_a?(SOAPArray) && parent.position
-      attrs[ns.name(AttrPositionName)] = "[#{parent.position.join(',')}]"
+      attrs[ns.name(AttrPositionName)] = '[' << parent.position.join(',') << ']'
     end
-    name = generator.encode_name(ns, data, attrs)
+
+    name = nil
+    if qualified and data.elename.namespace
+      SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
+      name = ns.name(data.elename)
+    else
+      name = data.elename.name
+    end
+
     case data
     when SOAPReference
-      attrs['href'] = data.refidstr
-      generator.encode_tag(name, attrs)
-    when SOAPExternalReference
-      data.referred
-      attrs['href'] = data.refidstr
+      attrs['href'] = '#' << data.refid
       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)
+      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)
+	yield(value, false)
       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)
+	yield(child, false)
       end
     else
       raise EncodingStyleError.new(
-	"unknown object:#{data} in this encodingStyle")
+	"Unknown object:#{ data } in this encodingStyle.")
     end
   end
 
-  def encode_data_end(generator, ns, data, parent)
-    name = generator.encode_name_end(ns, data)
+  def encode_data_end(generator, ns, qualified, data, parent)
+    name = if qualified and data.elename.namespace
+        ns.name(data.elename)
+      else
+        data.elename.name
+      end
     cr = data.is_a?(SOAPCompoundtype)
     generator.encode_tag_end(name, cr)
   end
@@ -143,6 +151,7 @@ class SOAPHandler < Handler
   end
 
   def decode_tag(ns, elename, attrs, parent)
+    # ToDo: check if @textbuf is empty...
     @textbuf = ''
     is_nil, type, arytype, root, offset, position, href, id, extraattr =
       decode_attrs(ns, attrs)
@@ -193,12 +202,16 @@ class SOAPHandler < Handler
       node.replace_node(newnode)
       o = node.node
     end
+    if o.is_a?(SOAPCompoundtype)
+      o.definedtype = nil
+    end
+
     decode_textbuf(o)
-    # unlink definedtype
-    o.definedtype = nil
+    @textbuf = ''
   end
 
   def decode_text(ns, text)
+    # @textbuf is set at decode_tag_end.
     @textbuf << text
   end
 
@@ -213,7 +226,6 @@ class SOAPHandler < Handler
   end
 
   def decode_parent(parent, node)
-    return unless parent.node
     case parent.node
     when SOAPUnknown
       newparent = parent.node.as_struct
@@ -223,9 +235,11 @@ class SOAPHandler < Handler
       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
@@ -234,8 +248,12 @@ class SOAPHandler < Handler
 	parent.node.add(node)
       end
       node.parent = parent.node
+
+    when SOAPBasetype
+      raise EncodingStyleError.new("SOAP base type must not have a child.")
+
     else
-      raise EncodingStyleError.new("illegal parent: #{parent.node}")
+      raise EncodingStyleError.new("Illegal parent: #{ parent.node }.")
     end
   end
 
@@ -251,12 +269,12 @@ private
 
   def create_arytype(ns, data)
     XSD::QName.new(data.arytype.namespace,
-      content_typename(data.arytype.name) + "[#{data.size.join(',')}]")
+      content_typename(data.arytype.name) << '[' << data.size.join(',') << ']')
   end
 
   def encode_attrs(generator, ns, data, parent)
+    return {} if data.is_a?(SOAPReference)
     attrs = {}
-    return attrs if data.is_a?(SOAPReference)
 
     if !parent || parent.encodingstyle != EncodingNamespace
       if @generate_explicit_type
@@ -302,9 +320,10 @@ private
 
   def encode_attr_value(generator, ns, qname, value)
     if value.is_a?(SOAPType)
-      ref = SOAPReference.new(value)
+      refid = SOAPReference.create_refid(value)
+      value.id = refid
       generator.add_reftarget(qname.name, value)
-      ref.refidstr
+      '#' + refid
     else
       value.to_s
     end
@@ -330,7 +349,8 @@ private
 	typename = ns.parse(typestr)
 	typedef = @decode_typemap[typename]
 	if typedef
-          return decode_definedtype(elename, typename, typedef, arytypestr)
+	  return decode_defined_compoundtype(elename, typename, typedef,
+	    arytypestr)
 	end
       end
       return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
@@ -352,44 +372,23 @@ private
 
     definedtype_name = parenttype.child_type(elename)
     if definedtype_name and (klass = TypeMap[definedtype_name])
-      return decode_basetype(klass, elename)
+      return klass.decode(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)
+    typedef = definedtype_name ? @decode_typemap[definedtype_name] :
+      parenttype.child_defined_complextype(elename)
+    decode_defined_compoundtype(elename, definedtype_name, typedef, arytypestr)
   end
 
-  def decode_definedtype(elename, typename, typedef, arytypestr)
+  def decode_defined_compoundtype(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)
+      raise EncodingStyleError.new("Unknown type '#{ typename }'.")
     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
+    when :TYPE_STRUCT
       o = SOAPStruct.decode(elename, typename)
       o.definedtype = typedef
       return o
@@ -406,15 +405,8 @@ private
       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
+    return nil
   end
 
   def decode_tag_by_type(ns, elename, typestr, parent, arytypestr, extraattr)
@@ -439,7 +431,7 @@ private
     end
 
     if (klass = TypeMap[type])
-      node = decode_basetype(klass, elename)
+      node = klass.decode(elename)
       node.extraattr.update(extraattr)
       return node
     end
@@ -454,12 +446,10 @@ private
       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)
+	node.set(XSD::Charset.encoding_from_xml(@textbuf, @charset))
+      else
+	node.set(@textbuf)
       end
-      node.set(@textbuf)
     when SOAPNil
       # Nothing to do.
     when SOAPBasetype
@@ -467,7 +457,6 @@ private
     else
       # Nothing to do...
     end
-    @textbuf = ''
   end
 
   NilLiteralMap = {
@@ -498,7 +487,7 @@ private
         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')")
+            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
@@ -512,7 +501,7 @@ private
         when AttrRoot
           root = RootLiteralMap[value] or
             raise EncodingStyleError.new(
-	      "illegal root attribute value: #{value}")
+	      "Illegal root attribute value: #{ value }.")
           next
         when AttrOffset
           offset = value
@@ -529,7 +518,6 @@ private
         id = value
         next
       end
-      qname = ns.parse_local(key)
       extraattr[qname] = decode_attr_value(ns, qname, value)
     end
 
@@ -538,7 +526,7 @@ private
 
   def decode_attr_value(ns, qname, value)
     if /\A#/ =~ value
-      o = SOAPReference.decode(nil, value)
+      o = SOAPReference.new(value)
       @refpool << o
       o
     else
@@ -556,18 +544,16 @@ private
     while !@refpool.empty? && count > 0
       @refpool = @refpool.find_all { |ref|
 	o = @idpool.find { |item|
-	  item.id == ref.refid
+	  '#' + item.id == ref.refid
 	}
+	unless o
+	  raise EncodingStyleError.new("Unresolved reference: #{ ref.refid }.")
+	end
 	if o.is_a?(SOAPReference)
-	  true	# link of link.
-	elsif o
+	  true
+	else
 	  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
diff --git a/lib/soap/generator.rb b/lib/soap/generator.rb
index f179555e1d..dd868fb9db 100644
--- a/lib/soap/generator.rb
+++ b/lib/soap/generator.rb
@@ -1,5 +1,5 @@
 # SOAP4R - SOAP XML Instance Generator library.
-# Copyright (C) 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -28,19 +28,14 @@ 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
+    @charset = opt[:charset] || XSD::Charset.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
 
@@ -55,7 +50,7 @@ public
 
     ns = XSD::NS.new
     @buf << xmldecl
-    encode_data(ns, obj, nil)
+    encode_data(ns, true, obj, nil)
 
     @handlers.each do |uri, handler|
       handler.encode_epilogue
@@ -65,33 +60,43 @@ public
     @buf
   end
 
-  def encode_data(ns, obj, parent)
+  def encode_data(ns, qualified, obj, parent)
     if obj.is_a?(SOAPEnvelopeElement)
-      encode_element(ns, obj, parent)
+      encode_element(ns, qualified, 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)
+      ref = SOAPReference.new
+      ref.elename.name = obj.elename.name
+      ref.__setobj__(obj)
       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)
+
+    handler.encode_data(self, ns, qualified, obj, parent) do |child, child_q|
+      indent_backup, @indent = @indent, @indent + '  '
+      encode_data(ns.clone_ns, child_q, child, obj)
+      @indent = indent_backup
+    end
+    handler.encode_data_end(self, ns, qualified, obj, parent)
   end
 
   def add_reftarget(name, node)
@@ -101,19 +106,13 @@ public
     @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)
+  def encode_element(ns, qualified, 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)
+      obj.encode(self, ns, attrs) do |child, child_q|
+	indent_backup, @indent = @indent, @indent + '  '
+        encode_data(ns.clone_ns, child_q, child, obj)
 	@indent = indent_backup
       end
       @reftarget = nil
@@ -126,35 +125,14 @@ public
           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)
+      obj.encode(self, ns, attrs) do |child, child_q|
+	indent_backup, @indent = @indent, @indent + '  '
+        encode_data(ns.clone_ns, child_q, 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 }>"
@@ -165,7 +143,7 @@ public
       @buf << "\n#{ @indent }<#{ elename } " <<
         attrs.collect { |key, value|
           %Q[#{ key }="#{ value }"]
-        }.join("\n#{ @indent }#{ @indentstr * 2 }") <<
+        }.join("\n#{ @indent }    ") <<
 	'>'
     end
   end
@@ -192,48 +170,13 @@ public
   }
   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
+    @buf << str.gsub(EncodeCharRegexp) { |c| EncodeMap[c] }
   end
 
   def self.assign_ns(attrs, ns, namespace, tag = nil)
-    if namespace.nil?
-      raise FormatEncodeError.new("empty namespace")
-    end
-    unless ns.assigned?(namespace)
+    if namespace and !ns.assigned?(namespace)
       tag = ns.assign(namespace, tag)
-      if tag == ''
-        attr = 'xmlns'
-      else
-        attr = "xmlns:#{tag}"
-      end
-      attrs[attr] = namespace
+      attrs['xmlns:' << tag] = namespace
     end
   end
 
diff --git a/lib/soap/header/handler.rb b/lib/soap/header/handler.rb
deleted file mode 100644
index 7da2836e24..0000000000
--- a/lib/soap/header/handler.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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/lib/soap/header/handlerset.rb b/lib/soap/header/handlerset.rb
deleted file mode 100644
index a8eee03023..0000000000
--- a/lib/soap/header/handlerset.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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/lib/soap/header/simplehandler.rb b/lib/soap/header/simplehandler.rb
deleted file mode 100644
index 7b206f77db..0000000000
--- a/lib/soap/header/simplehandler.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/lib/soap/httpconfigloader.rb b/lib/soap/httpconfigloader.rb
deleted file mode 100644
index cd7bca8a65..0000000000
--- a/lib/soap/httpconfigloader.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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/lib/soap/mapping/factory.rb b/lib/soap/mapping/factory.rb
index 978b303b3d..f181773687 100644
--- a/lib/soap/mapping/factory.rb
+++ b/lib/soap/mapping/factory.rb
@@ -27,6 +27,39 @@ class Factory
     # return convert_succeeded_or_not, obj
   end
 
+  if Object.respond_to?(:allocate)
+    # ruby/1.7 or later.
+    def create_empty_object(klass)
+      klass.allocate
+    end
+  else
+    MARSHAL_TAG = {
+      String => ['"', 1],
+      Regexp => ['/', 2],
+      Array => ['[', 1],
+      Hash => ['{', 1]
+    }
+    def 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
+
   def setiv2obj(obj, node, map)
     return if node.nil?
     if obj.is_a?(Array)
@@ -37,28 +70,31 @@ class Factory
   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
+    obj.instance_variables.each do |var|
+      name = var.sub(/^@/, '')
+      node.add(Mapping.name2elename(name),
+        Mapping._obj2soap(obj.instance_eval(var), map))
     end
   end
 
+  # It breaks Thread.current[:SOAPMarshalDataKey].
+  def mark_marshalled_obj(obj, soap_obj)
+    Thread.current[:SOAPMarshalDataKey][obj.__id__] = soap_obj
+  end
+
+  # It breaks Thread.current[:SOAPMarshalDataKey].
+  def mark_unmarshalled_obj(node, obj)
+    Thread.current[:SOAPMarshalDataKey][node.id] = obj
+  end
+
+  def name2typename(name)
+    capitalize(name)
+  end
+
+  def capitalize(target)
+    target.gsub(/^([a-z])/) { $1.tr!('[a-z]', '[A-Z]') }
+  end
+
 private
 
   def setiv2ary(obj, node, map)
@@ -72,7 +108,7 @@ private
     node.each do |name, value|
       vars[Mapping.elename2name(name)] = Mapping._soap2obj(value, map)
     end
-    Mapping.set_attributes(obj, vars)
+    Mapping.set_instance_vars(obj, vars)
   end
 end
 
@@ -87,11 +123,10 @@ class StringFactory_ < Factory
       return nil
     end
     begin
-      unless XSD::Charset.is_ces(obj, Thread.current[:SOAPExternalCES])
-        return nil
+      unless XSD::Charset.is_ces(obj, $KCODE)
+	return nil
       end
-      encoded = XSD::Charset.encoding_conv(obj,
-        Thread.current[:SOAPExternalCES], XSD::Charset.encoding)
+      encoded = XSD::Charset.encoding_conv(obj, $KCODE, XSD::Charset.encoding)
       soap_obj = soap_class.new(encoded)
     rescue XSD::ValueSpaceError
       return nil
@@ -101,9 +136,8 @@ class StringFactory_ < Factory
   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 = create_empty_object(obj_class)
+    decoded = XSD::Charset.encoding_conv(node.data, XSD::Charset.encoding, $KCODE)
     obj.replace(decoded)
     mark_unmarshalled_obj(node, obj)
     return true, obj
@@ -162,14 +196,20 @@ class DateTimeFactory_ < Factory
   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
+    obj = nil
+    if obj_class == Time
+      obj = node.to_time
+      if obj.nil?
+        # Is out of range as a Time
+        return false
+      end
+    elsif obj_class == Date
+      obj = node.data
     else
       return false
     end
+    mark_unmarshalled_obj(node, obj)
+    return true, obj
   end
 end
 
@@ -188,20 +228,6 @@ class Base64Factory_ < Factory
   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()
@@ -220,16 +246,16 @@ class ArrayFactory_ < Factory
     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))
+    param = SOAPArray.new(ValueArrayName, 1, arytype)
+    mark_marshalled_obj(obj, param)
+    obj.each do |var|
+      param.add(Mapping._obj2soap(var, map))
     end
-    soap_obj
+    param
   end
 
   def soap2obj(obj_class, node, info, map)
-    obj = Mapping.create_empty_object(obj_class)
+    obj = create_empty_object(obj_class)
     mark_unmarshalled_obj(node, obj)
     node.soap2array(obj) do |elem|
       elem ? Mapping._soap2obj(elem, map) : nil
@@ -249,12 +275,12 @@ class TypedArrayFactory_ < Factory
       return nil
     end
     arytype = info[:type] || info[0]
-    soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
-    mark_marshalled_obj(obj, soap_obj)
+    param = SOAPArray.new(ValueArrayName, 1, arytype)
+    mark_marshalled_obj(obj, param)
     obj.each do |var|
-      soap_obj.add(Mapping._obj2soap(var, map))
+      param.add(Mapping._obj2soap(var, map))
     end
-    soap_obj
+    param
   end
 
   def soap2obj(obj_class, node, info, map)
@@ -265,7 +291,7 @@ class TypedArrayFactory_ < Factory
     unless node.arytype == arytype
       return false
     end
-    obj = Mapping.create_empty_object(obj_class)
+    obj = create_empty_object(obj_class)
     mark_unmarshalled_obj(node, obj)
     node.soap2array(obj) do |elem|
       elem ? Mapping._soap2obj(elem, map) : nil
@@ -277,14 +303,14 @@ 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)
+    param = soap_class.new(type)
+    mark_marshalled_obj(obj, param)
     if obj.class <= SOAP::Marshallable
-      setiv2soap(soap_obj, obj, map)
+      setiv2soap(param, obj, map)
     else
-      setiv2soap(soap_obj, obj, map)
+      setiv2soap(param, obj, map)
     end
-    soap_obj
+    param
   end
 
   def soap2obj(obj_class, node, info, map)
@@ -292,7 +318,7 @@ class TypedStructFactory_ < Factory
     unless node.type == type
       return false
     end
-    obj = Mapping.create_empty_object(obj_class)
+    obj = create_empty_object(obj_class)
     mark_unmarshalled_obj(node, obj)
     setiv2obj(obj, node, map)
     return true, obj
@@ -314,16 +340,16 @@ class HashFactory_ < Factory
 	(obj.respond_to?(:default_proc) and obj.default_proc)
       return nil
     end
-    soap_obj = SOAPStruct.new(MapQName)
-    mark_marshalled_obj(obj, soap_obj)
+    param = SOAPStruct.new(MapQName)
+    mark_marshalled_obj(obj, param)
     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)
+      param.add("item", elem)
     end
-    soap_obj
+    param
   end
 
   def soap2obj(obj_class, node, info, map)
@@ -333,7 +359,7 @@ class HashFactory_ < Factory
     if node.class == SOAPStruct and node.key?('default')
       return false
     end
-    obj = Mapping.create_empty_object(obj_class)
+    obj = create_empty_object(obj_class)
     mark_unmarshalled_obj(node, obj)
     if node.class == SOAPStruct
       node.each do |key, value|
diff --git a/lib/soap/mapping/mapping.rb b/lib/soap/mapping/mapping.rb
index 65d6bb4d5b..4b68b811fc 100644
--- a/lib/soap/mapping/mapping.rb
+++ b/lib/soap/mapping/mapping.rb
@@ -1,14 +1,11 @@
 # SOAP4R - Ruby type mapping utility.
-# Copyright (C) 2000, 2001, 2003-2005  NAKAMURA Hiroshi <nahi@ruby-lang.org>.
+# 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/codegen/gensupport'
-
-
 module SOAP
 
 
@@ -20,95 +17,75 @@ module Mapping
   ApacheSOAPTypeNamespace = 'http://xml.apache.org/xml-soap'
 
 
-  # TraverseSupport breaks following thread variables.
-  #   Thread.current[:SOAPMarshalDataKey]
+  # TraverseSupport breaks 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)
+  def self.obj2soap(obj, registry = nil, type = nil)
     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
+    Thread.current[:SOAPMarshalDataKey] = {}
+    soap_obj = _obj2soap(obj, registry, type)
+    Thread.current[:SOAPMarshalDataKey] = nil
     soap_obj
   end
 
-  def self.soap2obj(node, registry = nil, klass = nil, opt = EMPTY_OPT)
+  def self.soap2obj(node, registry = nil)
     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
+    Thread.current[:SOAPMarshalDataKey] = {}
+    obj = _soap2obj(node, registry)
+    Thread.current[:SOAPMarshalDataKey] = nil
     obj
   end
 
-  def self.ary2soap(ary, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil, opt = EMPTY_OPT)
+  def self.ary2soap(ary, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil)
     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
+    Thread.current[:SOAPMarshalDataKey] = {}
+    ary.each do |ele|
+      soap_ary.add(_obj2soap(ele, registry, type))
     end
+    Thread.current[:SOAPMarshalDataKey] = nil
     soap_ary
   end
 
-  def self.ary2md(ary, rank, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil, opt = EMPTY_OPT)
+  def self.ary2md(ary, rank, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil)
     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
+    Thread.current[:SOAPMarshalDataKey] = {}
+    add_md_ary(md_ary, ary, [], registry)
+    Thread.current[:SOAPMarshalDataKey] = nil
     md_ary
   end
 
-  def self.fault2exception(fault, registry = nil)
+  def self.fault2exception(e, registry = nil)
     registry ||= Mapping::DefaultRegistry
-    detail = if fault.detail
-        soap2obj(fault.detail, registry) || ""
+    detail = if e.detail
+        soap2obj(e.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])
+	remote_backtrace = detail.to_e.backtrace
+        raise detail.to_e
+      rescue Exception => e2
+	e2.set_backtrace(remote_backtrace + e2.backtrace)
         raise
       end
     else
-      fault.detail = detail
-      fault.set_backtrace(
+      e.detail = detail
+      e.set_backtrace(
         if detail.is_a?(Array)
 	  detail
         else
@@ -120,62 +97,36 @@ module Mapping
   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)
+    if referent = Thread.current[:SOAPMarshalDataKey][obj.__id__]
+      soap_obj = SOAPReference.new
+      soap_obj.__setobj__(referent)
+      soap_obj
     else
-      raise MappingError.new("no mapping registry given")
+      registry.obj2soap(obj.class, obj, type)
     end
   end
 
-  def self._soap2obj(node, registry, klass = nil)
-    if node.nil?
-      return nil
-    elsif node.is_a?(SOAPReference)
+  def self._soap2obj(node, registry)
+    if 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]
+      if referent = Thread.current[:SOAPMarshalDataKey][target.id]
         return referent
       else
-        return _soap2obj(target, registry, klass)
+        return _soap2obj(target, registry)
       end
     end
-    return registry.soap2obj(node, klass)
+    return registry.soap2obj(node.class, node)
   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
+  def self.set_instance_vars(obj, values)
+    values.each do |name, value|
+      setter = name + "="
+      if obj.respond_to?(setter)
+	obj.__send__(setter, value)
+      else
+	obj.instance_eval("@#{ name } = value")
       end
-      name = klass.name
-      ::Marshal.load(sprintf("\004\006o:%c%s\000", name.length + 5, name))
     end
   end
 
@@ -197,47 +148,32 @@ module Mapping
     }
   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
+  def self.class_from_name(name)
+    if /^[A-Z]/ !~ name
       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
+    klass = ::Object
+    name.split('::').each do |klass_str|
+      if klass.const_defined?(klass_str)
+        klass = klass.const_get(klass_str)
+      else
+        return nil
+      end
     end
+    klass
   end
 
   def self.class2qname(klass)
-    name = schema_type_definition(klass)
-    namespace = schema_ns_definition(klass)
+    name = if klass.class_variables.include?("@@schema_type")
+        klass.class_eval("@@schema_type")
+      else
+        nil
+      end
+    namespace = if klass.class_variables.include?("@@schema_ns")
+        klass.class_eval("@@schema_ns")
+      else
+        nil
+      end
     XSD::QName.new(namespace, name)
   end
 
@@ -251,11 +187,11 @@ module Mapping
   def self.obj2element(obj)
     name = namespace = nil
     ivars = obj.instance_variables
-    if ivars.include?('@schema_type')
-      name = obj.instance_variable_get('@schema_type')
+    if ivars.include?("@schema_type")
+      name = obj.instance_eval("@schema_type")
     end
-    if ivars.include?('@schema_ns')
-      namespace = obj.instance_variable_get('@schema_ns')
+    if ivars.include?("@schema_ns")
+      namespace = obj.instance_eval("@schema_ns")
     end
     if !name or !namespace
       class2qname(obj.class)
@@ -264,107 +200,8 @@ module Mapping
     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)
diff --git a/lib/soap/mapping/registry.rb b/lib/soap/mapping/registry.rb
index 823e80666d..46a04e368f 100644
--- a/lib/soap/mapping/registry.rb
+++ b/lib/soap/mapping/registry.rb
@@ -44,14 +44,14 @@ class SOAPException; include Marshallable
     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)
+    klass = Mapping.class_from_name(
+      Mapping.elename2name(@excn_type_name.to_s))
+    if klass.nil?
+      raise RuntimeError.new(@cause.message)
+    end
+    unless klass <= ::Exception
+      raise NameError.new
     end
     obj = klass.new(@cause.message)
     obj.extend(::SOAP::Mapping::MappedException)
@@ -62,110 +62,52 @@ 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 set_property(name, value)
+    var_name = name
+    begin
+      instance_eval <<-EOS
+        def #{ var_name }
+          @#{ var_name }
+        end
 
-  def __xmlattr
-    @__xmlattr
-  end
+        def #{ var_name }=(value)
+          @#{ var_name } = value
+        end
+      EOS
+      self.send(var_name + '=', value)
+    rescue SyntaxError
+      var_name = safe_name(var_name)
+      retry
+    end
 
-  def __xmlele
-    @__xmlele
+    var_name
   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
+  def members
+    instance_variables.collect { |str| str[1..-1] }
   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]
+  def [](name)
+    if self.respond_to?(name)
+      self.send(name)
+    else
+      self.send(safe_name(name))
     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
+  def []=(name, value)
+    if self.respond_to?(name)
+      self.send(name + '=', value)
+    else
+      self.send(safe_name(name) + '=', value)
     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
+  def safe_name(name)
+    require 'md5'
+    "var_" << MD5.new(name).hexdigest
   end
 end
 
@@ -176,45 +118,30 @@ class MappingError < Error; end
 class Registry
   class Map
     def initialize(registry)
-      @obj2soap = {}
-      @soap2obj = {}
+      @map = []
       @registry = registry
     end
 
-    def obj2soap(obj)
-      klass = obj.class
-      if map = @obj2soap[klass]
-        map.each do |soap_class, factory, info|
+    def obj2soap(klass, obj, type_qname = nil)
+      @map.each do |obj_class, soap_class, factory, info|
+        if klass == obj_class or
+            (info[:derived_class] and klass <= obj_class)
           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
+    def soap2obj(klass, node)
+      @map.each do |obj_class, soap_class, factory, info|
+        if klass == soap_class or
+            (info[:derived_class] and klass <= soap_class)
           conv, obj = factory.soap2obj(obj_class, node, info, @registry)
           return true, obj if conv
         end
       end
-      return false, nil
+      return false
     end
 
     # Give priority to former entry.
@@ -228,23 +155,29 @@ class Registry
     # 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])
+      @map.unshift([obj_class, soap_class, factory, info])
     end
 
     def clear
-      @obj2soap.clear
-      @soap2obj.clear
+      @map.clear
     end
 
     def find_mapped_soap_class(target_obj_class)
-      map = @obj2soap[target_obj_class]
-      map.empty? ? nil : map[0][1]
+      @map.each do |obj_class, soap_class, factory, info|
+        if obj_class == target_obj_class
+          return soap_class
+        end
+      end
+      nil
     end
 
     def find_mapped_obj_class(target_soap_class)
-      map = @soap2obj[target_soap_class]
-      map.empty? ? nil : map[0][0]
+      @map.each do |obj_class, soap_class, factory, info|
+        if soap_class == target_soap_class
+          return obj_class
+        end
+      end
+      nil
     end
   end
 
@@ -253,7 +186,6 @@ class Registry
   DateTimeFactory = DateTimeFactory_.new
   ArrayFactory = ArrayFactory_.new
   Base64Factory = Base64Factory_.new
-  URIFactory = URIFactory_.new
   TypedArrayFactory = TypedArrayFactory_.new
   TypedStructFactory = TypedStructFactory_.new
 
@@ -265,6 +197,7 @@ class Registry
     [::FalseClass,   ::SOAP::SOAPBoolean,    BasetypeFactory],
     [::String,       ::SOAP::SOAPString,     StringFactory],
     [::DateTime,     ::SOAP::SOAPDateTime,   DateTimeFactory],
+    [::Date,         ::SOAP::SOAPDateTime,   DateTimeFactory],
     [::Date,         ::SOAP::SOAPDate,       DateTimeFactory],
     [::Time,         ::SOAP::SOAPDateTime,   DateTimeFactory],
     [::Time,         ::SOAP::SOAPTime,       DateTimeFactory],
@@ -280,25 +213,7 @@ class Registry
       {: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,
+    [::URI::Generic, ::SOAP::SOAPAnyURI,     BasetypeFactory,
       {:derived_class => true}],
     [::String,       ::SOAP::SOAPBase64,     Base64Factory],
     [::String,       ::SOAP::SOAPHexBinary,  Base64Factory],
@@ -328,6 +243,7 @@ class Registry
     [::FalseClass,   ::SOAP::SOAPBoolean,    BasetypeFactory],
     [::String,       ::SOAP::SOAPString,     StringFactory],
     [::DateTime,     ::SOAP::SOAPDateTime,   DateTimeFactory],
+    [::Date,         ::SOAP::SOAPDateTime,   DateTimeFactory],
     [::Date,         ::SOAP::SOAPDate,       DateTimeFactory],
     [::Time,         ::SOAP::SOAPDateTime,   DateTimeFactory],
     [::Time,         ::SOAP::SOAPTime,       DateTimeFactory],
@@ -343,25 +259,7 @@ class Registry
       {: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,
+    [::URI::Generic, ::SOAP::SOAPAnyURI,     BasetypeFactory,
       {:derived_class => true}],
     [::String,       ::SOAP::SOAPBase64,     Base64Factory],
     [::String,       ::SOAP::SOAPHexBinary,  Base64Factory],
@@ -385,10 +283,6 @@ class Registry
       {: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)
@@ -399,6 +293,7 @@ class Registry
       @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(
@@ -413,19 +308,19 @@ class Registry
   def add(obj_class, soap_class, factory, info = nil)
     @map.add(obj_class, soap_class, factory, info)
   end
-  alias set add
+  alias :set :add
 
-  # general Registry ignores type_qname
-  def obj2soap(obj, type_qname = nil)
-    soap = _obj2soap(obj)
+  # This mapping registry ignores type hint.
+  def obj2soap(klass, obj, type_qname = nil)
+    soap = _obj2soap(klass, obj, type_qname)
     if @allow_original_mapping
       addextend2soap(soap, obj)
     end
     soap
   end
 
-  def soap2obj(node, klass = nil)
-    obj = _soap2obj(node, klass)
+  def soap2obj(klass, node)
+    obj = _soap2obj(klass, node)
     if @allow_original_mapping
       addextend2obj(obj, node.extraattr[RubyExtendName])
       addiv2obj(obj, node.extraattr[RubyIVarName])
@@ -433,6 +328,18 @@ class Registry
     obj
   end
 
+  def default_factory=(factory)
+    @default_factory = factory
+  end
+
+  def excn_handler_obj2soap=(handler)
+    @excn_handler_obj2soap = handler
+  end
+
+  def excn_handler_soap2obj=(handler)
+    @excn_handler_soap2obj = handler
+  end
+
   def find_mapped_soap_class(obj_class)
     @map.find_mapped_soap_class(obj_class)
   end
@@ -443,7 +350,7 @@ class Registry
 
 private
 
-  def _obj2soap(obj)
+  def _obj2soap(klass, obj, type_qname)
     ret = nil
     if obj.is_a?(SOAPStruct) or obj.is_a?(SOAPArray)
       obj.replace do |ele|
@@ -454,31 +361,32 @@ private
       return obj
     end
     begin 
-      ret = @map.obj2soap(obj) ||
-        @default_factory.obj2soap(nil, obj, nil, self)
-      return ret if ret
+      ret = @map.obj2soap(klass, obj, type_qname) ||
+        @default_factory.obj2soap(klass, obj, nil, self)
     rescue MappingError
     end
+    return ret if ret
     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.")
+    return ret if ret
+    raise MappingError.new("Cannot map #{ klass.name } to SOAP/OM.")
   end
 
   # Might return nil as a mapping result.
-  def _soap2obj(node, klass = nil)
+  def _soap2obj(klass, node)
     if node.extraattr.key?(RubyTypeName)
-      conv, obj = @rubytype_factory.soap2obj(nil, node, nil, self)
+      conv, obj = @rubytype_factory.soap2obj(klass, node, nil, self)
       return obj if conv
     else
-      conv, obj = @map.soap2obj(node, klass)
+      conv, obj = @map.soap2obj(klass, node)
       return obj if conv
-      conv, obj = @default_factory.soap2obj(nil, node, nil, self)
+      conv, obj = @default_factory.soap2obj(klass, node, nil, self)
       return obj if conv
     end
+
     if @excn_handler_soap2obj
       begin
         return @excn_handler_soap2obj.call(node) { |yield_node|
@@ -496,14 +404,14 @@ private
     attr.__getobj__.each do |name, value|
       vars[name] = Mapping._soap2obj(value, self)
     end
-    Mapping.set_attributes(obj, vars)
+    Mapping.set_instance_vars(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))
+	obj.extend(Mapping.class_from_name(mstr))
       end
     end
   else
@@ -511,8 +419,8 @@ private
     def addextend2obj(obj, attr)
       return unless attr
       attr.split(/ /).reverse_each do |mstr|
-	m = Mapping.module_from_name(mstr)
-	obj.extend(m)
+	m = Mapping.class_from_name(mstr)
+	obj.extend(m) if m.class == Module
       end
     end
   end
diff --git a/lib/soap/mapping/rubytypeFactory.rb b/lib/soap/mapping/rubytypeFactory.rb
index 61c21d8b20..0b4af8b8e4 100644
--- a/lib/soap/mapping/rubytypeFactory.rb
+++ b/lib/soap/mapping/rubytypeFactory.rb
@@ -1,5 +1,5 @@
 # SOAP4R - Ruby type mapping factory.
-# Copyright (C) 2000-2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -38,7 +38,7 @@ class RubytypeFactory < Factory
   def obj2soap(soap_class, obj, info, map)
     param = nil
     case obj
-    when ::String
+    when String
       unless @allow_original_mapping
         return nil
       end
@@ -47,7 +47,7 @@ class RubytypeFactory < Factory
         param.extraattr[RubyTypeName] = obj.class.name
       end
       addiv2soapattr(param, obj, map)
-    when ::Time
+    when Time
       unless @allow_original_mapping
         return nil
       end
@@ -56,7 +56,7 @@ class RubytypeFactory < Factory
         param.extraattr[RubyTypeName] = obj.class.name
       end
       addiv2soapattr(param, obj, map)
-    when ::Array
+    when Array
       unless @allow_original_mapping
         return nil
       end
@@ -65,19 +65,19 @@ class RubytypeFactory < Factory
         param.extraattr[RubyTypeName] = obj.class.name
       end
       addiv2soapattr(param, obj, map)
-    when ::NilClass
+    when NilClass
       unless @allow_original_mapping
         return nil
       end
       param = @basetype_factory.obj2soap(SOAPNil, obj, info, map)
       addiv2soapattr(param, obj, map)
-    when ::FalseClass, ::TrueClass
+    when FalseClass, TrueClass
       unless @allow_original_mapping
         return nil
       end
       param = @basetype_factory.obj2soap(SOAPBoolean, obj, info, map)
       addiv2soapattr(param, obj, map)
-    when ::Integer
+    when Integer
       unless @allow_original_mapping
         return nil
       end
@@ -85,7 +85,7 @@ class RubytypeFactory < Factory
       param ||= @basetype_factory.obj2soap(SOAPInteger, obj, info, map)
       param ||= @basetype_factory.obj2soap(SOAPDecimal, obj, info, map)
       addiv2soapattr(param, obj, map)
-    when ::Float
+    when Float
       unless @allow_original_mapping
         return nil
       end
@@ -94,7 +94,7 @@ class RubytypeFactory < Factory
         param.extraattr[RubyTypeName] = obj.class.name
       end
       addiv2soapattr(param, obj, map)
-    when ::Hash
+    when Hash
       unless @allow_original_mapping
         return nil
       end
@@ -114,7 +114,7 @@ class RubytypeFactory < Factory
       end
       param.add('default', Mapping._obj2soap(obj.default, map))
       addiv2soapattr(param, obj, map)
-    when ::Regexp
+    when Regexp
       unless @allow_original_mapping
         return nil
       end
@@ -150,7 +150,7 @@ class RubytypeFactory < Factory
       end
       param.add('options', SOAPInt.new(options))
       addiv2soapattr(param, obj, map)
-    when ::Range
+    when Range
       unless @allow_original_mapping
         return nil
       end
@@ -163,29 +163,29 @@ class RubytypeFactory < Factory
       param.add('end', Mapping._obj2soap(obj.end, map))
       param.add('exclude_end', SOAP::SOAPBoolean.new(obj.exclude_end?))
       addiv2soapattr(param, obj, map)
-    when ::Class
+    when Class
       unless @allow_original_mapping
         return nil
       end
-      if obj.to_s[0] == ?#
-        raise TypeError.new("can't dump anonymous class #{obj}")
+      if obj.name.empty?
+        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
+    when Module
       unless @allow_original_mapping
         return nil
       end
-      if obj.to_s[0] == ?#
-        raise TypeError.new("can't dump anonymous module #{obj}")
+      if obj.name.empty?
+        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
+    when Symbol
       unless @allow_original_mapping
         return nil
       end
@@ -193,42 +193,28 @@ class RubytypeFactory < Factory
       mark_marshalled_obj(obj, param)
       param.add('id', SOAPString.new(obj.id2name))
       addiv2soapattr(param, obj, map)
-    when ::Struct
+    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)
+        return nil
+      end
+      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
-    when ::IO, ::Binding, ::Continuation, ::Data, ::Dir, ::File::Stat,
-        ::MatchData, Method, ::Proc, ::Thread, ::ThreadGroup
-        # from 1.8: Process::Status, UnboundMethod
+      param.add('member', ele_member)
+      addiv2soapattr(param, obj, map)
+    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
+      addiv2soapattr(param, obj, map)
+    when Exception
       typestr = Mapping.name2elename(obj.class.to_s)
       param = SOAPStruct.new(XSD::QName.new(RubyTypeNamespace, typestr))
       mark_marshalled_obj(obj, param)
@@ -263,12 +249,12 @@ private
 
   def unknownobj2soap(soap_class, obj, info, map)
     if obj.class.name.empty?
-      raise TypeError.new("can't dump anonymous class #{obj}")
+      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}")
+      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)
@@ -323,7 +309,7 @@ private
     case node.type
     when TYPE_HASH
       klass = rubytype ? Mapping.class_from_name(rubytype) : Hash
-      obj = Mapping.create_empty_object(klass)
+      obj = create_empty_object(klass)
       mark_unmarshalled_obj(node, obj)
       node.each do |key, value|
         next unless key == 'item'
@@ -335,14 +321,14 @@ private
       end
     when TYPE_REGEXP
       klass = rubytype ? Mapping.class_from_name(rubytype) : Regexp
-      obj = Mapping.create_empty_object(klass)
+      obj = 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)
+      obj = create_empty_object(klass)
       mark_unmarshalled_obj(node, obj)
       first = Mapping._soap2obj(node['begin'], map)
       last = Mapping._soap2obj(node['end'], map)
@@ -358,12 +344,15 @@ private
       typestr = Mapping.elename2name(node['type'].data)
       klass = Mapping.class_from_name(typestr)
       if klass.nil?
+        klass = Mapping.class_from_name(name2typename(typestr))
+      end
+      if klass.nil?
         return false
       end
       unless klass <= ::Struct
         return false
       end
-      obj = Mapping.create_empty_object(klass)
+      obj = create_empty_object(klass)
       mark_unmarshalled_obj(node, obj)
       node['member'].each do |name, value|
         obj[Mapping.elename2name(name)] = Mapping._soap2obj(value, map)
@@ -383,11 +372,7 @@ private
       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)
+        obj.set_property(name, Mapping._soap2obj(value, map))
       end
       return true, obj
     else
@@ -396,12 +381,7 @@ private
   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
+    if node.is_a?(SOAPStruct)
       obj = unknownstruct2obj(node, info, map)
       return true, obj if obj
       if !@allow_untyped_struct
@@ -420,8 +400,8 @@ private
     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
+    if klass.nil?
+      klass = Mapping.class_from_name(name2typename(typestr))
     end
     if klass.nil?
       return nil
@@ -431,13 +411,7 @@ private
     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
+    obj = create_empty_object(klass)
     mark_unmarshalled_obj(node, obj)
     setiv2obj(obj, node, map)
     obj
@@ -446,7 +420,7 @@ private
   def exception2obj(klass, node, map)
     message = Mapping._soap2obj(node['message'], map)
     backtrace = Mapping._soap2obj(node['backtrace'], map)
-    obj = Mapping.create_empty_object(klass)
+    obj = create_empty_object(klass)
     obj = obj.exception(message)
     mark_unmarshalled_obj(node, obj)
     obj.set_backtrace(backtrace)
@@ -456,7 +430,7 @@ private
   # 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)
+    obj = create_empty_object(klass)
     mark_unmarshalled_obj(node, obj)
     obj
   end
@@ -464,7 +438,7 @@ private
   # 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)
+    obj = create_empty_object(klass)
     mark_unmarshalled_obj(node, obj)
     obj
   end
diff --git a/lib/soap/mapping/typeMap.rb b/lib/soap/mapping/typeMap.rb
index 34db19a5b6..93f24b4bd8 100644
--- a/lib/soap/mapping/typeMap.rb
+++ b/lib/soap/mapping/typeMap.rb
@@ -30,18 +30,9 @@ TypeMap = {
   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,
 }
diff --git a/lib/soap/mapping/wsdlRegistry.rb b/lib/soap/mapping/wsdlRegistry.rb
new file mode 100644
index 0000000000..66d16c6f90
--- /dev/null
+++ b/lib/soap/mapping/wsdlRegistry.rb
@@ -0,0 +1,135 @@
+# SOAP4R - WSDL 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'
+
+
+module SOAP
+module Mapping
+
+
+class WSDLRegistry
+  include TraverseSupport
+
+  attr_reader :complextypes
+
+  def initialize(complextypes, config = {})
+    @complextypes = complextypes
+    @config = config
+    @excn_handler_obj2soap = nil
+    # For mapping AnyType element.
+    @rubytype_factory = RubytypeFactory.new(
+      :allow_untyped_struct => true,
+      :allow_original_mapping => true
+    )
+  end
+
+  def obj2soap(klass, obj, type_qname)
+    soap_obj = nil
+    if obj.nil?
+      soap_obj = SOAPNil.new
+    elsif obj.is_a?(XSD::NSDBase)
+      soap_obj = soap2soap(obj, type_qname)
+    elsif (type = @complextypes[type_qname])
+      case type.compoundtype
+      when :TYPE_STRUCT
+        soap_obj = struct2soap(obj, type_qname, type)
+      when :TYPE_ARRAY
+        soap_obj = array2soap(obj, type_qname, type)
+      end
+    elsif (type = TypeMap[type_qname])
+      soap_obj = base2soap(obj, type)
+    elsif type_qname == XSD::AnyTypeName
+      soap_obj = @rubytype_factory.obj2soap(nil, obj, nil, nil)
+    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)
+      }
+    end
+    return soap_obj if soap_obj
+
+    raise MappingError.new("Cannot map #{ klass.name } to SOAP/OM.")
+  end
+
+  def soap2obj(klass, node)
+    raise RuntimeError.new("#{ self } is for obj2soap only.")
+  end
+
+  def excn_handler_obj2soap=(handler)
+    @excn_handler_obj2soap = handler
+  end
+
+private
+
+  def soap2soap(obj, type_qname)
+    if obj.is_a?(SOAPBasetype)
+      obj
+    elsif obj.is_a?(SOAPStruct) && (type = @complextypes[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 = @complextypes[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 base2soap(obj, type)
+    soap_obj = nil
+    if type <= XSD::XSDString
+      soap_obj = type.new(XSD::Charset.is_ces(obj, $KCODE) ?
+        XSD::Charset.encoding_conv(obj, $KCODE, XSD::Charset.encoding) : obj)
+      mark_marshalled_obj(obj, soap_obj)
+    else
+      soap_obj = type.new(obj)
+    end
+    soap_obj
+  end
+
+  def struct2soap(obj, type_qname, type)
+    soap_obj = SOAPStruct.new(type_qname)
+    mark_marshalled_obj(obj, soap_obj)
+    elements2soap(obj, soap_obj, type.content.elements)
+    soap_obj
+  end
+
+  def array2soap(obj, type_qname, type)
+    contenttype = type.child_type
+    soap_obj = SOAPArray.new(ValueArrayName, 1, contenttype)
+    mark_marshalled_obj(obj, soap_obj)
+    obj.each do |item|
+      soap_obj.add(Mapping._obj2soap(item, self, contenttype))
+    end
+    soap_obj
+  end
+
+  def elements2soap(obj, soap_obj, elements)
+    elements.each do |element|
+      name = element.name.name
+      child_obj = obj.instance_eval("@#{ name }")
+      soap_obj.add(name, Mapping._obj2soap(child_obj, self, element.type))
+    end
+  end
+end
+
+
+end
+end
diff --git a/lib/soap/mapping/wsdlencodedregistry.rb b/lib/soap/mapping/wsdlencodedregistry.rb
deleted file mode 100644
index 4efb60188f..0000000000
--- a/lib/soap/mapping/wsdlencodedregistry.rb
+++ /dev/null
@@ -1,280 +0,0 @@
-# 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/lib/soap/mapping/wsdlliteralregistry.rb b/lib/soap/mapping/wsdlliteralregistry.rb
deleted file mode 100644
index 7bb8e12203..0000000000
--- a/lib/soap/mapping/wsdlliteralregistry.rb
+++ /dev/null
@@ -1,418 +0,0 @@
-# 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/lib/soap/marshal.rb b/lib/soap/marshal.rb
index 1c3d5b01db..910ab24527 100644
--- a/lib/soap/marshal.rb
+++ b/lib/soap/marshal.rb
@@ -14,9 +14,8 @@ module SOAP
 
 
 module Marshal
-  # Trying xsd:dateTime data to be recovered as aTime.
-  MarshalMappingRegistry = Mapping::Registry.new(
-    :allow_original_mapping => true)
+  # Trying xsd:dateTime data to be recovered as aTime.  aDateTime if it fails.
+  MarshalMappingRegistry = Mapping::Registry.new(:allow_original_mapping => true)
   MarshalMappingRegistry.add(
     Time,
     ::SOAP::SOAPDateTime,
@@ -38,16 +37,15 @@ module Marshal
       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)
+      SOAP::Processor.marshal(nil, body, {}, io)
     end
 
     def unmarshal(stream, mapping_registry = MarshalMappingRegistry)
-      env = SOAP::Processor.unmarshal(stream)
-      if env.nil?
+      header, body = SOAP::Processor.unmarshal(stream)
+      if body.nil?
 	raise ArgumentError.new("Illegal SOAP marshal format.")
       end
-      Mapping.soap2obj(env.body.root_node, mapping_registry)
+      Mapping.soap2obj(body.root_node, mapping_registry)
     end
   end
 end
diff --git a/lib/soap/mimemessage.rb b/lib/soap/mimemessage.rb
deleted file mode 100644
index acb4322e11..0000000000
--- a/lib/soap/mimemessage.rb
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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/lib/soap/netHttpClient.rb b/lib/soap/netHttpClient.rb
index 10d68e2a4c..4505de815e 100644
--- a/lib/soap/netHttpClient.rb
+++ b/lib/soap/netHttpClient.rb
@@ -26,53 +26,35 @@ class NetHttpClient
   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")
+    @no_proxy = nil
   end
   
-  def proxy=(proxy)
-    if proxy.nil?
+  def proxy=(proxy_str)
+    if proxy_str.nil?
       @proxy = nil
     else
-      if proxy.is_a?(URI)
-        @proxy = proxy
-      else
-        @proxy = URI.parse(proxy)
-      end
+      @proxy = URI.parse(proxy_str)
       if @proxy.scheme == nil or @proxy.scheme.downcase != 'http' or
 	  @proxy.host == nil or @proxy.port == nil
-	raise ArgumentError.new("unsupported proxy `#{proxy}'")
+	raise ArgumentError.new("unsupported proxy `#{proxy_str}'")
       end
+      @proxy
     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
+    # ignored.
   end
 
   def reset(url)
@@ -84,21 +66,17 @@ class NetHttpClient
   end
 
   def post(url, req_body, header = {})
-    unless url.is_a?(URI)
-      url = URI.parse(url)
-    end
+    url = URI.parse(url)
     extra = header.dup
     extra['User-Agent'] = @agent if @agent
     res = start(url) { |http|
-      http.post(url.request_uri, req_body, extra)
-    }
+	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
+    url = URI.parse(url)
     extra = header.dup
     extra['User-Agent'] = @agent if @agent
     res = start(url) { |http|
@@ -113,7 +91,7 @@ private
     http = create_connection(url)
     response = nil
     http.start { |worker|
-      response = yield(worker)
+      response, = yield(worker)
       worker.finish
     }
     @debug_dev << response.body if @debug_dev
@@ -130,8 +108,6 @@ private
     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
diff --git a/lib/soap/parser.rb b/lib/soap/parser.rb
index 412fd4855a..1395be55ec 100644
--- a/lib/soap/parser.rb
+++ b/lib/soap/parser.rb
@@ -60,18 +60,15 @@ private
 
 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
@@ -119,13 +116,7 @@ public
     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
+    encodingstyle ||= parent_encodingstyle || @default_encodingstyle
 
     node = decode_tag(ns, name, attrs, parent, encodingstyle)
 
@@ -136,7 +127,10 @@ public
     lastframe = @parsestack.last
     if lastframe
       # Need not to be cloned because character does not have attr.
-      decode_text(lastframe.ns, text, lastframe.encodingstyle)
+      ns = lastframe.ns
+      parent = lastframe.node
+      encodingstyle = lastframe.encodingstyle
+      decode_text(ns, text, encodingstyle)
     else
       # Ignore Text outside of SOAP Envelope.
       p text if $DEBUG
@@ -156,7 +150,7 @@ private
 
   def find_encodingstyle(ns, attrs)
     attrs.each do |key, value|
-      if (ns.compare(@envelopenamespace, AttrEncodingStyle, key))
+      if (ns.compare(EnvelopeNamespace, AttrEncodingStyle, key))
 	return value
       end
     end
@@ -167,7 +161,7 @@ private
     ele = ns.parse(name)
 
     # Envelope based parsing.
-    if ((ele.namespace == @envelopenamespace) ||
+    if ((ele.namespace == EnvelopeNamespace) ||
 	(@allow_unqualified_element && ele.namespace.nil?))
       o = decode_soap_envelope(ns, ele, attrs, parent)
       return o if o
@@ -207,11 +201,6 @@ private
     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.")
@@ -231,6 +220,7 @@ private
       o = SOAPFault.new
       parent.node.fault = o
     end
+    o.parent = parent if o
     o
   end
 
diff --git a/lib/soap/processor.rb b/lib/soap/processor.rb
index 3c6dbedf2f..9cf00e8340 100644
--- a/lib/soap/processor.rb
+++ b/lib/soap/processor.rb
@@ -25,18 +25,20 @@ module Processor
   class << self
   public
 
-    def marshal(env, opt = {}, io = nil)
+    def marshal(header, body, opt = {}, io = nil)
+      env = SOAPEnvelope.new(header, body)
       generator = create_generator(opt)
-      marshalled_str = generator.generate(env, io)
-      unless env.external_content.empty?
-	opt[:external_content] = env.external_content
-      end
-      marshalled_str
+      generator.generate(env, io)
     end
 
     def unmarshal(stream, opt = {})
       parser = create_parser(opt)
-      parser.parse(stream)
+      env = parser.parse(stream)
+      if env
+	return env.header, env.body
+      else
+	return nil, nil
+      end
     end
 
     def default_parser_option=(rhs)
diff --git a/lib/soap/property.rb b/lib/soap/property.rb
index 882dcc6e28..079c294a77 100644
--- a/lib/soap/property.rb
+++ b/lib/soap/property.rb
@@ -32,28 +32,24 @@ module SOAP
 #     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.open(filename)
+    File.open(filename) { |f| load(f) }
+  end
+
+  # find property from $:.
   def self.loadproperty(propname)
-    new.loadproperty(propname)
+    $:.each do |path|
+      if File.file?(file = File.join(path, propname))
+	return open(file)
+      end
+    end
+    nil
   end
 
   def initialize
@@ -80,7 +76,8 @@ class Property
       when LINE_REGEXP
 	key, value = $1.strip, $2.strip
 	key = "#{key_prefix}.#{key}" unless key_prefix.empty?
-	key, value = loadstr(key), loadstr(value)
+	key = eval("\"#{key}\"")
+	value = eval("\"#{value}\"")
 	self[key] = value
       else
 	raise TypeError.new(
@@ -90,17 +87,6 @@ class Property
     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))
@@ -109,10 +95,10 @@ class Property
   # 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 = assign(name_to_a(name), value)
+    normalized_name = normalize_name(name)
     hooks.each do |hook|
-      hook.call(name_pair, value)
+      hook.call(normalized_name, value)
     end
     value
   end
@@ -123,15 +109,13 @@ class Property
     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
+  # name: a Symbol, String or an Array.  nil means hook to the root
   # 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)
+  def add_hook(name = nil, &hook)
+    if name.nil?
+      assign_self_hook(&hook)
     else
-      assign_hook(name_to_a(name), cascade, &hook)
+      assign_hook(name_to_a(name), &hook)
     end
   end
 
@@ -191,7 +175,7 @@ protected
   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")
+      raise TypeError.new("cannot split any key from locked property")
     end
     @store[key]
   end
@@ -200,26 +184,22 @@ protected
     check_lock(key)
     if @locked
       if propkey?(value)
-	raise FrozenError.new("cannot add any key to locked property")
+	raise TypeError.new("cannot add any key to locked property")
       elsif propkey?(@store[key])
-	raise FrozenError.new("cannot override any key in locked property")
+	raise TypeError.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
+  def local_hook(key)
+    @self_hook + (@hook[key] || NO_HOOK)
   end
 
-  def local_assign_hook(key, cascade, &hook)
+  def local_assign_hook(key, &hook)
     check_lock(key)
     @store[key] ||= nil
-    (@hook[key] ||= []) << [hook, cascade]
+    (@hook[key] ||= []) << hook
   end
 
 private
@@ -237,23 +217,23 @@ private
     hook = NO_HOOK
     ary[0..-2].each do |name|
       key = to_key(name)
-      hook += ref.local_hook(key, false)
+      hook += ref.local_hook(key)
       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)
+    hook + ref.local_hook(last_key)
   end
 
-  def assign_hook(ary, cascade, &hook)
+  def assign_hook(ary, &hook)
     ary[0..-2].inject(self) { |ref, name|
       ref.deref_key(to_key(name))
-    }.local_assign_hook(to_key(ary.last), cascade, &hook)
+    }.local_assign_hook(to_key(ary.last), &hook)
   end
 
-  def assign_self_hook(cascade, &hook)
+  def assign_self_hook(&hook)
     check_lock(nil)
-    @self_hook << [hook, cascade]
+    @self_hook << hook
   end
 
   def each_key
@@ -266,7 +246,7 @@ private
 
   def check_lock(key)
     if @locked and (key.nil? or !@store.key?(key))
-      raise FrozenError.new("cannot add any key to locked property")
+      raise TypeError.new("cannot add any key to locked property")
     end
   end
 
@@ -287,6 +267,10 @@ private
     end
   end
 
+  def normalize_name(name)
+    name_to_a(name).collect { |key| to_key(key) }.join('.')
+  end
+
   def to_key(name)
     name.to_s.downcase
   end
@@ -302,17 +286,6 @@ private
   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
 
 
diff --git a/lib/soap/rpc/cgistub.rb b/lib/soap/rpc/cgistub.rb
index 487f05a9bf..2377f343b5 100644
--- a/lib/soap/rpc/cgistub.rb
+++ b/lib/soap/rpc/cgistub.rb
@@ -1,5 +1,5 @@
-# SOAP4R - CGI/mod_ruby stub library
-# Copyright (C) 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# SOAP4R - CGI stub 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;
@@ -10,7 +10,7 @@ require 'soap/streamHandler'
 require 'webrick/httpresponse'
 require 'webrick/httpstatus'
 require 'logger'
-require 'soap/rpc/soaplet'
+require 'soap/rpc/router'
 
 
 module SOAP
@@ -26,51 +26,59 @@ module RPC
 #
 class CGIStub < Logger::Application
   include SOAP
-  include WEBrick
 
-  class SOAPRequest
-    attr_reader :body
-
-    def [](var); end
+  # There is a client which does not accept the media-type which is defined in
+  # SOAP spec.
+  attr_accessor :mediatype
 
-    def meta_vars; end
-  end
+  class CGIError < Error; end
 
-  class SOAPStdinRequest < SOAPRequest
-    attr_reader :body
-
-    def initialize(stream)
-      size = ENV['CONTENT_LENGTH'].to_i || 0
-      @body = stream.read(size)
+  class SOAPRequest
+    ALLOWED_LENGTH = 1024 * 1024
+
+    def initialize(stream = $stdin)
+      @method = ENV['REQUEST_METHOD']
+      @size = ENV['CONTENT_LENGTH'].to_i || 0
+      @contenttype = ENV['CONTENT_TYPE']
+      @charset = nil
+      @soapaction = ENV['HTTP_SOAPAction']
+      @source = stream
+      @body = nil
     end
 
-    def [](var)
-      ENV[var.gsub(/-/, '_').upcase]
+    def init
+      validate
+      @charset = StreamHandler.parse_media_type(@contenttype)
+      @body = @source.read(@size)
+      self
     end
 
-    def meta_vars
-      {
-        'HTTP_SOAPACTION' => ENV['HTTP_SOAPAction']
-      }
+    def dump
+      @body.dup
     end
-  end
 
-  class SOAPFCGIRequest < SOAPRequest
-    attr_reader :body
+    def soapaction
+      @soapaction
+    end
 
-    def initialize(request)
-      @request = request
-      @body = @request.in.read
+    def charset
+      @charset
     end
 
-    def [](var)
-      @request.env[var.gsub(/-/, '_').upcase]
+    def to_s
+      "method: #{ @method }, size: #{ @size }"
     end
 
-    def meta_vars
-      {
-        'HTTP_SOAPACTION' => @request.env['HTTP_SOAPAction']
-      }
+  private
+
+    def validate # raise CGIError
+      if @method != 'POST'
+	raise CGIError.new("Method '#{ @method }' not allowed.")
+      end
+
+      if @size > ALLOWED_LENGTH
+        raise CGIError.new("Content-length too long.")
+      end
     end
   end
 
@@ -79,14 +87,27 @@ class CGIStub < Logger::Application
     set_log(STDERR)
     self.level = ERROR
     @default_namespace = default_namespace
+    @router = SOAP::RPC::Router.new(appname)
+    @remote_user = ENV['REMOTE_USER'] || 'anonymous'
     @remote_host = ENV['REMOTE_HOST'] || ENV['REMOTE_ADDR'] || 'unknown'
-    @router = ::SOAP::RPC::Router.new(self.class.name)
-    @soaplet = ::SOAP::RPC::SOAPlet.new(@router)
+    @request = nil
+    @response = nil
+    @mediatype = MediaType
     on_init
   end
   
+  def add_servant(obj, namespace = @default_namespace, soapaction = nil)
+    RPC.defined_methods(obj).each do |name|
+      qname = XSD::QName.new(namespace, name)
+      param_size = obj.method(name).arity.abs
+      params = (1..param_size).collect { |i| "p#{ i }" }
+      param_def = SOAP::RPC::SOAPMethod.create_param_def(params)
+      @router.add_method(obj, qname, soapaction, name, param_def)
+    end
+  end
+
   def on_init
-    # do extra initialization in a derived class if needed.
+    # Override this method in derived class to call 'add_method' to add methods.
   end
 
   def mapping_registry
@@ -97,108 +118,85 @@ class CGIStub < Logger::Application
     @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
+  def add_method(receiver, name, *param)
+    add_method_with_namespace_as(@default_namespace, receiver,
+      name, name, *param)
   end
 
-  # servant entry interface
-
-  def add_rpc_servant(obj, namespace = @default_namespace)
-    @router.add_rpc_servant(obj, namespace)
+  def add_method_as(receiver, name, name_as, *param)
+    add_method_with_namespace_as(@default_namespace, receiver,
+      name, name_as, *param)
   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)
+  def add_method_with_namespace(namespace, receiver, name, *param)
+    add_method_with_namespace_as(namespace, receiver, 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)
+  def add_method_with_namespace_as(namespace, receiver, name, name_as, *param)
+    param_def = if param.size == 1 and param[0].is_a?(Array)
+        param[0]
+      else
+        SOAP::RPC::SOAPMethod.create_param_def(param)
+      end
     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)
+    @router.add_method(receiver, qname, nil, name, param_def)
   end
 
-  def add_document_operation(receiver, soapaction, name, param_def, opt = {})
-    @router.add_document_operation(receiver, soapaction, name, param_def, opt)
+  def route(request_string, charset)
+    @router.route(request_string, charset)
   end
 
-  def set_fcgi_request(request)
-    @fcgi = request
+  def create_fault_response(e)
+    @router.create_fault_response(e)
   end
 
 private
-
-  HTTPVersion = WEBrick::HTTPVersion.new('1.0')       # dummy; ignored
-
+  
   def run
-    res = WEBrick::HTTPResponse.new({:HTTPVersion => HTTPVersion})
+    prologue
+
+    httpversion = WEBrick::HTTPVersion.new('1.0')
+    @response = WEBrick::HTTPResponse.new({:HTTPVersion => httpversion})
     begin
-      @log.info { "received a request from '#{ @remote_host }'" }
-      if @fcgi
-        req = SOAPFCGIRequest.new(@fcgi)
+      log(INFO) { "Received a request from '#{ @remote_user }@#{ @remote_host }'." }
+      # SOAP request parsing.
+      @request = SOAPRequest.new.init
+      @response['Status'] = 200
+      req_charset = @request.charset
+      req_string = @request.dump
+      log(DEBUG) { "XML Request: #{req_string}" }
+      res_string, is_fault = route(req_string, req_charset)
+      log(DEBUG) { "XML Response: #{res_string}" }
+
+      @response['Cache-Control'] = 'private'
+      if req_charset
+	@response['content-type'] = "#{@mediatype}; charset=\"#{req_charset}\""
       else
-        req = SOAPStdinRequest.new($stdin)
+	@response['content-type'] = @mediatype
       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
+      if is_fault
+	@response['Status'] = 500
       end
+      @response.body = res_string
+    rescue Exception
+      res_string = create_fault_response($!)
+      @response['Cache-Control'] = 'private'
+      @response['content-type'] = @mediatype
+      @response['Status'] = 500
+    ensure
+      buf = ''
+      @response.send_response(buf)
+      buf.sub!(/^[^\r]+\r\n/, '')       # Trim status line.
+      log(DEBUG) { "SOAP CGI Response:\n#{ buf }" }
+      print buf
+      epilogue
     end
+
     0
   end
+
+  def prologue; end
+  def epilogue; end
 end
 
 
diff --git a/lib/soap/rpc/driver.rb b/lib/soap/rpc/driver.rb
index 0fb4e82488..dd433ca33f 100644
--- a/lib/soap/rpc/driver.rb
+++ b/lib/soap/rpc/driver.rb
@@ -1,5 +1,5 @@
 # SOAP4R - SOAP RPC driver
-# Copyright (C) 2000, 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -8,13 +8,11 @@
 
 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
@@ -22,229 +20,238 @@ module RPC
 
 
 class Driver
+  class EmptyResponseError < Error; end
+
   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
+    def __attr_proxy(symbol, assignable = false)
+      name = symbol.to_s
+      module_eval <<-EOD
+    	def #{name}
+  	  @servant.#{name}
+   	end
+      EOD
+      if assignable
+	module_eval <<-EOD
+  	  def #{name}=(rhs)
+  	    @servant.#{name} = rhs
+  	  end
+	EOD
       end
     end
   end
 
+  __attr_proxy :options
   __attr_proxy :endpoint_url, true
   __attr_proxy :mapping_registry, true
+  __attr_proxy :soapaction, 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"]
+    @servant.options["protocol.http.proxy"]
   end
 
   def httpproxy=(httpproxy)
-    options["protocol.http.proxy"] = httpproxy
+    @servant.options["protocol.http.proxy"] = httpproxy
   end
 
   def wiredump_dev
-    options["protocol.http.wiredump_dev"]
+    @servant.options["protocol.http.wiredump_dev"]
   end
 
   def wiredump_dev=(wiredump_dev)
-    options["protocol.http.wiredump_dev"] = wiredump_dev
+    @servant.options["protocol.http.wiredump_dev"] = wiredump_dev
   end
 
   def mandatorycharset
-    options["protocol.mandatorycharset"]
+    @servant.options["protocol.mandatorycharset"]
   end
 
   def mandatorycharset=(mandatorycharset)
-    options["protocol.mandatorycharset"] = mandatorycharset
+    @servant.options["protocol.mandatorycharset"] = mandatorycharset
   end
 
   def wiredump_file_base
-    options["protocol.wiredump_file_base"]
+    @servant.options["protocol.wiredump_file_base"]
   end
 
   def wiredump_file_base=(wiredump_file_base)
-    options["protocol.wiredump_file_base"] = wiredump_file_base
+    @servant.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)
+  def initialize(endpoint_url, namespace, soapaction = nil)
+    @servant = Servant__.new(self, endpoint_url, namespace)
+    @servant.soapaction = soapaction
+    @proxy = @servant.proxy
   end
 
-  def loadproperty(propertyname)
-    unless options.loadproperty(propertyname)
-      raise LoadError.new("No such property to load -- #{propertyname}")
-    end
+  def inspect
+    "#<#{self.class}:#{@servant.streamhandler.inspect}>"
   end
 
-  def add_rpc_method(name, *params)
-    add_rpc_method_with_soapaction_as(name, name, @soapaction, *params)
+  def add_method(name, *params)
+    add_method_with_soapaction_as(name, name, @servant.soapaction, *params)
   end
 
-  def add_rpc_method_as(name, name_as, *params)
-    add_rpc_method_with_soapaction_as(name, name_as, @soapaction, *params)
+  def add_method_as(name, name_as, *params)
+    add_method_with_soapaction_as(name, name_as, @servant.soapaction, *params)
   end
 
-  def add_rpc_method_with_soapaction(name, soapaction, *params)
-    add_rpc_method_with_soapaction_as(name, name, soapaction, *params)
+  def add_method_with_soapaction(name, soapaction, *params)
+    add_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)
+  def add_method_with_soapaction_as(name, name_as, soapaction, *params)
+    param_def = if params.size == 1 and params[0].is_a?(Array)
+        params[0]
+      else
+        SOAPMethod.create_param_def(params)
+      end
+    @servant.add_method(name_as, soapaction, 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 reset_stream
+    @servant.streamhandler.reset
+  end
 
-  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)
+  def invoke(headers, body)
+    @servant.invoke(headers, body)
   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)
+  def call(name, *params)
+    @servant.call(name, *params)
   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)
+private
+
+  def add_rpc_method_interface(name, param_def)
+    @servant.add_rpc_method_interface(name, param_def)
   end
 
-  def invoke(headers, body)
-    if headers and !headers.is_a?(SOAPHeader)
-      headers = create_header(headers)
+  class Servant__
+    attr_reader :options
+    attr_reader :streamhandler
+    attr_reader :proxy
+
+    def initialize(host, endpoint_url, namespace)
+      @host = host
+      @namespace = namespace
+      @mapping_registry = nil
+      @soapaction = nil
+      @wiredump_file_base = nil
+      @options = setup_options
+      @streamhandler = HTTPPostStreamHandler.new(endpoint_url,
+	@options["protocol.http"] ||= ::SOAP::Property.new)
+      @proxy = Proxy.new(@streamhandler, @soapaction)
+      @proxy.allow_unqualified_element = true
     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
+
+    def endpoint_url
+      @streamhandler.endpoint_url
     end
-  end
 
-  def call(name, *params)
-    set_wiredump_file_base(name)
-    @proxy.call(name, *params)
-  end
+    def endpoint_url=(endpoint_url)
+      @streamhandler.endpoint_url = endpoint_url
+      @streamhandler.reset
+    end
 
-private
+    def mapping_registry
+      @mapping_registry
+    end
 
-  def set_wiredump_file_base(name)
-    if @wiredump_file_base
-      @proxy.set_wiredump_file_base("#{@wiredump_file_base}_#{name}")
+    def mapping_registry=(mapping_registry)
+      @mapping_registry = mapping_registry
     end
-  end
 
-  def create_header(headers)
-    header = SOAPHeader.new()
-    headers.each do |content, mustunderstand, encodingstyle|
-      header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
+    def soapaction
+      @soapaction
     end
-    header
-  end
 
-  def setup_options
-    if opt = Property.loadproperty(::SOAP::PropertyName)
-      opt = opt["client"]
+    def soapaction=(soapaction)
+      @soapaction = soapaction
     end
-    opt ||= Property.new
-    opt.add_hook("protocol.mandatorycharset") do |key, value|
-      @proxy.mandatorycharset = value
+
+    def default_encodingstyle
+      @proxy.default_encodingstyle
     end
-    opt.add_hook("protocol.wiredump_file_base") do |key, value|
-      @wiredump_file_base = value
+
+    def default_encodingstyle=(encodingstyle)
+      @proxy.default_encodingstyle = encodingstyle
     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 invoke(headers, body)
+      set_wiredump_file_base(body.elename.name)
+      @proxy.invoke(headers, body)
+    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
+    def call(name, *params)
+      set_wiredump_file_base(name)
+      # Convert parameters: params array => SOAPArray => members array
+      params = Mapping.obj2soap(params, @mapping_registry).to_a
+      header, body = @proxy.call(nil, name, *params)
+      raise EmptyResponseError.new("Empty response.") unless body
+      begin
+	@proxy.check_fault(body)
+      rescue SOAP::FaultError => e
+	Mapping.fault2exception(e)
+      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)
+      ret = body.response ?
+	Mapping.soap2obj(body.response, @mapping_registry) : nil
+      if body.outparams
+	outparams = body.outparams.collect { |outparam|
+	  Mapping.soap2obj(outparam)
+	}
+	return [ret].concat(outparams)
+      else
+	return ret
       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
+    end
+
+    def add_method(name_as, soapaction, name, param_def)
+      qname = XSD::QName.new(@namespace, name_as)
+      @proxy.add_method(qname, soapaction, name, param_def)
+      add_rpc_method_interface(name, param_def)
+    end
+
+    def add_rpc_method_interface(name, param_def)
+      param_names = []
+      i = 0
+      @proxy.method[name].each_param_name(RPC::SOAPMethod::IN,
+  	  RPC::SOAPMethod::INOUT) do |param_name|
+   	i += 1
+    	param_names << "arg#{ i }"
+      end
+      callparam = (param_names.collect { |pname| ", " + pname }).join
+      @host.instance_eval <<-EOS
+     	def #{ name }(#{ param_names.join(", ") })
+      	  @servant.call(#{ name.dump }#{ callparam })
+       	end
       EOS
-      self.method(name)
+    end
+
+  private
+
+    def set_wiredump_file_base(name)
+      if @wiredump_file_base
+      	@streamhandler.wiredump_file_base = @wiredump_file_base + "_#{ name }"
+      end
+    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.encoding_label
+      opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
+      opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
+      opt
     end
   end
 end
diff --git a/lib/soap/rpc/element.rb b/lib/soap/rpc/element.rb
index c224b03d0d..395823ab00 100644
--- a/lib/soap/rpc/element.rb
+++ b/lib/soap/rpc/element.rb
@@ -1,5 +1,5 @@
 # SOAP4R - RPC element definition.
-# Copyright (C) 2000, 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -20,25 +20,21 @@ class SOAPBody < SOAPStruct
   end
 
   def response
-    root = root_node
     if !@is_fault
-      if root.nil?
+      if void?
         nil
-      elsif root.is_a?(SOAPBasetype)
-        root
       else
         # Initial element is [retval].
-        root[0]
+        root_node[0]
       end
     else
-      root
+      root_node
     end
   end
 
   def outparams
-    root = root_node
-    if !@is_fault and !root.nil? and !root.is_a?(SOAPBasetype)
-      op = root[1..-1]
+    if !@is_fault and !void?
+      op = root_node[1..-1]
       op = nil if op && op.empty?
       op
     else
@@ -46,6 +42,10 @@ class SOAPBody < SOAPStruct
     end
   end
 
+  def void?
+    root_node.nil? # || root_node.is_a?(SOAPNil)
+  end
+
   def fault
     if @is_fault
       self['fault']
@@ -77,8 +77,6 @@ class SOAPMethod < SOAPStruct
   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)
@@ -95,7 +93,6 @@ class SOAPMethod < SOAPStruct
     @inparam = {}
     @outparam = {}
     @retval_name = nil
-    @retval_class_name = nil
 
     init_param(@param_def) if @param_def
   end
@@ -104,19 +101,18 @@ class SOAPMethod < SOAPStruct
     @outparam_names.size > 0
   end
 
-  def input_params
-    collect_params(IN, INOUT)
-  end
-
-  def output_params
-    collect_params(OUT, INOUT)
+  def each_param_name(*type)
+    @signature.each do |io_type, name, param_type|
+      if type.include?(io_type)
+        yield(name)
+      end
+    end
   end
 
   def set_param(params)
     params.each do |param, data|
       @inparam[param] = data
       data.elename.name = param
-      data.parent = self
     end
   end
 
@@ -127,30 +123,7 @@ class SOAPMethod < SOAPStruct
     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)
+  def SOAPMethod.create_param_def(param_names)
     param_def = []
     param_names.each do |param_name|
       param_def.push([IN, param_name, nil])
@@ -159,29 +132,8 @@ class SOAPMethod < SOAPStruct
     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
@@ -195,20 +147,12 @@ private
         @signature.push([INOUT, name, param_type])
         @inoutparam_names.push(name)
       when RETVAL
-        if @retval_name
-          raise MethodDefinitionError.new('duplicated 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}")
+        raise MethodDefinitionError.new("Unknown type: #{ io_type }")
       end
     end
   end
@@ -223,7 +167,7 @@ class SOAPMethodRequest < SOAPMethod
     param_value = []
     i = 0
     params.each do |param|
-      param_name = "p#{i}"
+      param_name = "p#{ i }"
       i += 1
       param_def << [IN, param_name, nil]
       param_value << [param_name, param]
@@ -241,9 +185,9 @@ class SOAPMethodRequest < SOAPMethod
   end
 
   def each
-    input_params.each do |name|
+    each_param_name(IN, INOUT) do |name|
       unless @inparam[name]
-        raise ParameterError.new("parameter: #{name} was not given")
+        raise ParameterError.new("Parameter: #{ name } was not given.")
       end
       yield(name, @inparam[name])
     end
@@ -255,10 +199,10 @@ class SOAPMethodRequest < SOAPMethod
     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)
+  def create_method_response
+    SOAPMethodResponse.new(
+      XSD::QName.new(@elename.namespace, @elename.name + 'Response'),
+      @param_def)
   end
 
 private
@@ -266,7 +210,7 @@ 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")
+      raise MethodDefinitionError.new("Element name '#{qname.name}' not allowed")
     end
   end
 end
@@ -282,8 +226,6 @@ class SOAPMethodResponse < SOAPMethod
   def retval=(retval)
     @retval = retval
     @retval.elename = @retval.elename.dup_name(@retval_name || 'return')
-    retval.parent = self
-    retval
   end
 
   def each
@@ -291,11 +233,11 @@ class SOAPMethodResponse < SOAPMethod
       yield(@retval_name, @retval)
     end
 
-    output_params.each do |name|
-      unless @outparam[name]
-        raise ParameterError.new("parameter: #{name} was not given")
+    each_param_name(OUT, INOUT) do |param_name|
+      unless @outparam[param_name]
+        raise ParameterError.new("Parameter: #{ param_name } was not given.")
       end
-      yield(name, @outparam[name])
+      yield(param_name, @outparam[param_name])
     end
   end
 end
diff --git a/lib/soap/rpc/httpserver.rb b/lib/soap/rpc/httpserver.rb
deleted file mode 100644
index 6d2a72ebe3..0000000000
--- a/lib/soap/rpc/httpserver.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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/lib/soap/rpc/proxy.rb b/lib/soap/rpc/proxy.rb
index 7dfda62006..5825a27138 100644
--- a/lib/soap/rpc/proxy.rb
+++ b/lib/soap/rpc/proxy.rb
@@ -1,5 +1,5 @@
 # SOAP4R - RPC Proxy library.
-# Copyright (C) 2000, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 2000, 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;
@@ -12,7 +12,6 @@ require 'soap/mapping'
 require 'soap/rpc/rpc'
 require 'soap/rpc/element'
 require 'soap/streamHandler'
-require 'soap/mimemessage'
 
 
 module SOAP
@@ -28,151 +27,85 @@ public
   attr_accessor :mandatorycharset
   attr_accessor :allow_unqualified_element
   attr_accessor :default_encodingstyle
-  attr_accessor :generate_explicit_type
-  attr_reader :headerhandler
-  attr_reader :streamhandler
+  attr_reader :method
 
-  attr_accessor :mapping_registry
-  attr_accessor :literal_mapping_registry
-
-  attr_reader :operation
-
-  def initialize(endpoint_url, soapaction, options)
-    @endpoint_url = endpoint_url
+  def initialize(streamhandler, soapaction = nil)
+    @streamhandler = streamhandler
     @soapaction = soapaction
-    @options = options
-    @streamhandler = HTTPStreamHandler.new(
-      @options["protocol.http"] ||= ::SOAP::Property.new)
-    @operation = {}
+    @method = {}
     @mandatorycharset = nil
-    @allow_unqualified_element = true
+    @allow_unqualified_element = false
     @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
+  class Request
+    include RPC
 
-  def endpoint_url=(endpoint_url)
-    @endpoint_url = endpoint_url
-    reset_stream
-  end
+  public
 
-  def reset_stream
-    @streamhandler.reset(@endpoint_url)
-  end
+    attr_reader :method
+    attr_reader :namespace
+    attr_reader :name
 
-  def set_wiredump_file_base(wiredump_file_base)
-    @streamhandler.wiredump_file_base = wiredump_file_base
-  end
+    def initialize(model, values)
+      @method = model.dup
+      @namespace = @method.elename.namespace
+      @name = @method.elename.name
 
-  def test_loopback_response
-    @streamhandler.test_loopback_response
+      params = {}
+    
+      if ((values.size == 1) and (values[0].is_a?(Hash)))
+        params = values[0]
+      else
+        i = 0
+        @method.each_param_name(SOAPMethod::IN, SOAPMethod::INOUT) do |name|
+          params[name] = values[i] || SOAPNil.new
+          i += 1
+        end
+      end
+      @method.set_param(params)
+    end
   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)
+  def add_method(qname, soapaction, name, param_def)
+    @method[name] = SOAPMethodRequest.new(qname, param_def, soapaction)
   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
+  def create_request(name, *values)
+    if (@method.key?(name))
+      method = @method[name]
+      method.encodingstyle = @default_encodingstyle if @default_encodingstyle
+    else
+      raise SOAP::RPC::MethodDefinitionError.new(
+	"Method: #{ name } not defined.")
     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)
+    Request.new(method, values)
   end
 
-  def call(name, *params)
-    unless op_info = @operation[name]
-      raise MethodDefinitionError, "method: #{name} not defined"
+  def invoke(req_header, req_body, soapaction = nil)
+    if req_header and !req_header.is_a?(SOAPHeader)
+      req_header = create_header(req_header)
     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)
+    if !req_body.is_a?(SOAPBody)
+      req_body = SOAPBody.new(req_body)
     end
-    op_info.response_obj(env.body, @mapping_registry,
-      @literal_mapping_registry, mapping_opt)
+    opt = create_options
+    send_string = Processor.marshal(req_header, req_body, opt)
+    data = @streamhandler.send(send_string, soapaction)
+    if data.receive_string.empty?
+      return nil, nil
+    end
+    opt = create_options
+    opt[:charset] = @mandatorycharset ||
+      StreamHandler.parse_media_type(data.receive_contenttype)
+    res_header, res_body = Processor.unmarshal(data.receive_string, opt)
+    return res_header, res_body
   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)
+  def call(headers, name, *values)
+    req = create_request(name, *values)
+    return invoke(headers, req.method, req.method.soapaction || @soapaction)
   end
 
   def check_fault(body)
@@ -183,65 +116,6 @@ public
 
 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|
@@ -250,245 +124,13 @@ private
     header
   end
 
-  def create_encoding_opt(hash = nil)
+  def create_options
     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
+    if @allow_unqualified_element
+      opt[:allow_unqualified_element] = true
     end
+    opt
   end
 end
 
diff --git a/lib/soap/rpc/router.rb b/lib/soap/rpc/router.rb
index 71c6eb625b..527ec05768 100644
--- a/lib/soap/rpc/router.rb
+++ b/lib/soap/rpc/router.rb
@@ -1,5 +1,5 @@
 # SOAP4R - RPC Routing library
-# Copyright (C) 2001, 2002, 2004, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 2001, 2002  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;
@@ -9,12 +9,8 @@
 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
@@ -25,296 +21,94 @@ class Router
   include SOAP
 
   attr_reader :actor
+  attr_accessor :allow_unqualified_element
+  attr_accessor :default_encodingstyle
   attr_accessor :mapping_registry
-  attr_accessor :literal_mapping_registry
-  attr_accessor :generate_explicit_type
-  attr_accessor :external_ces
 
   def initialize(actor)
     @actor = actor
+    @receiver = {}
+    @method_name = {}
+    @method = {}
+    @allow_unqualified_element = false
+    @default_encodingstyle = nil
     @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)
+  def add_method(receiver, qname, soapaction, name, param_def)
+    fqname = fqname(qname)
+    @receiver[fqname] = receiver
+    @method_name[fqname] = name
+    @method[fqname] = RPC::SOAPMethodRequest.new(qname, param_def, soapaction)
   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)
+  def add_header_handler
+    raise NotImplementedError.new
   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
+  # Routing...
+  def route(soap_string, charset = nil)
+    opt = options
+    opt[:charset] = charset
+    is_fault = false
     begin
-      soap_response =
-        op.call(env.body, @mapping_registry, @literal_mapping_registry,
-          create_mapping_opt)
-      default_encodingstyle = op.response_default_encodingstyle
+      header, body = Processor.unmarshal(soap_string, opt)
+      # So far, header is omitted...
+      soap_request = body.request
+      unless soap_request.is_a?(SOAPStruct)
+	raise RPCRoutingError.new("Not an RPC style.")
+      end
+      soap_response = dispatch(soap_request)
     rescue Exception
       soap_response = fault($!)
-      default_encodingstyle = nil
+      is_fault = true
     end
-    conn_data.is_fault = true if soap_response.is_a?(SOAPFault)
-    header = call_headers(headerhandler)
+
+    header = SOAPHeader.new
     body = SOAPBody.new(soap_response)
-    env = SOAPEnvelope.new(header, body)
-    marshal(conn_data, env, default_encodingstyle)
+    response_string = Processor.marshal(header, body, opt)
+
+    return response_string, is_fault
   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
+  def create_fault_response(e, charset = nil)
+    header = SOAPHeader.new
+    soap_response = fault(e)
+    body = SOAPBody.new(soap_response)
+    opt = options
+    opt[:charset] = charset
+    Processor.marshal(header, body, opt)
   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")
+  # Create new response.
+  def create_response(qname, result)
+    name = fqname(qname)
+    if (@method.key?(name))
+      method = @method[name]
     else
-      raise RPCRoutingError.new("operation: #{qname} not supported")
+      raise RPCRoutingError.new("Method: #{ name } not defined.")
     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)
+    soap_response = method.create_method_response
+    if soap_response.have_outparam?
+      unless result.is_a?(Array)
+	raise RPCRoutingError.new("Out parameter was not returned.")
       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
+      outparams = {}
+      i = 1
+      soap_response.each_param_name('out', 'inout') do |outparam|
+	outparams[outparam] = Mapping.obj2soap(result[i], @mapping_registry)
+	i += 1
       end
-      opt[:charset] =
-	StreamHandler.parse_media_type(mime.root.headers['content-type'].str)
-      env = Processor.unmarshal(mime.root.content, opt)
+      soap_response.set_outparam(outparams)
+      soap_response.retval = Mapping.obj2soap(result[0], @mapping_registry)
     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)
+      soap_response.retval = Mapping.obj2soap(result, @mapping_registry)
     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
+    soap_response
   end
 
   # Create fault response.
@@ -327,265 +121,42 @@ private
       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
+  # Dispatch to defined method.
+  def dispatch(soap_method)
+    request_struct = Mapping.soap2obj(soap_method, @mapping_registry)
+    values = soap_method.collect { |key, value| request_struct[key] }
+    method = lookup(soap_method.elename, values)
+    unless method
+      raise RPCRoutingError.new(
+	"Method: #{ soap_method.elename } not supported.")
     end
 
-    def check_use(use)
-      unless [:encoded, :literal].include?(use)
-        raise ArgumentError.new("unknown use: #{use}")
-      end
-    end
+    result = method.call(*values)
+    create_response(soap_method.elename, result)
   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
+  # Method lookup
+  def lookup(qname, values)
+    name = fqname(qname)
+    # It may be necessary to check all part of method signature...
+    if @method.member?(name)
+      @receiver[name].method(@method_name[name].intern)
+    else
+      nil
     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 fqname(qname)
+    "#{ qname.namespace }:#{ qname.name }"
+  end
 
-    def receiver
-      @receiver_factory.create
+  def options
+    opt = {}
+    opt[:default_encodingstyle] = @default_encodingstyle
+    if @allow_unqualified_element
+      opt[:allow_unqualified_element] = true
     end
+    opt
   end
 end
 
diff --git a/lib/soap/rpc/rpc.rb b/lib/soap/rpc/rpc.rb
index a48b525dbb..5f77b4d2e9 100644
--- a/lib/soap/rpc/rpc.rb
+++ b/lib/soap/rpc/rpc.rb
@@ -16,7 +16,7 @@ module RPC
     if obj.is_a?(Module)
       obj.methods - Module.methods
     else
-      obj.methods - Object.instance_methods(true)
+      obj.methods - Kernel.instance_methods(true)
     end
   end
 end
diff --git a/lib/soap/rpc/soaplet.rb b/lib/soap/rpc/soaplet.rb
index 7cccdd3e31..4b25c68161 100644
--- a/lib/soap/rpc/soaplet.rb
+++ b/lib/soap/rpc/soaplet.rb
@@ -1,5 +1,5 @@
 # SOAP4R - SOAP handler servlet for WEBrick
-# Copyright (C) 2001-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 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;
@@ -10,29 +10,6 @@ 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
@@ -40,27 +17,35 @@ module RPC
 
 class SOAPlet < WEBrick::HTTPServlet::AbstractServlet
 public
-  attr_reader :options
+  attr_reader :app_scope_router
 
-  def initialize(router = nil)
-    @router = router || ::SOAP::RPC::Router.new(self.class.name)
-    @options = {}
-    @config = {}
+  def initialize
+    @router_map = {}
+    @app_scope_router = ::SOAP::RPC::Router.new(self.class.name)
   end
 
-  # for backward compatibility
-  def app_scope_router
-    @router
+  # Add servant klass whose object has request scope.  A servant object is
+  # instanciated for each request.
+  #
+  # Bare in mind that servant klasses are distinguished by HTTP SOAPAction
+  # header in request.  Client which calls request-scoped servant must have a
+  # SOAPAction header which is a namespace of the servant klass.
+  # I mean, use Driver#add_method_with_soapaction instead of Driver#add_method
+  # at client side.
+  #
+  def add_rpc_request_servant(klass, namespace, mapping_registry = nil)
+    router = RequestRouter.new(klass, namespace, mapping_registry)
+    add_router(namespace, router)
   end
 
-  # for backward compatibility
-  def add_servant(obj, namespace)
-    @router.add_rpc_servant(obj, namespace)
+  # Add servant object which has application scope.
+  def add_rpc_servant(obj, namespace)
+    router = @app_scope_router
+    SOAPlet.add_servant_to_router(router, obj, namespace)
+    add_router(namespace, router)
   end
+  alias add_servant add_rpc_servant
 
-  def allow_content_encoding_gzip=(allow)
-    @options[:allow_content_encoding_gzip] = allow
-  end
 
   ###
   ## Servlet interfaces for WEBrick.
@@ -76,84 +61,93 @@ public
 
   def do_GET(req, res)
     res.header['Allow'] = 'POST'
-    raise WEBrick::HTTPStatus::MethodNotAllowed, "GET request not allowed"
+    raise WEBrick::HTTPStatus::MethodNotAllowed, "GET request not allowed."
   end
 
   def do_POST(req, res)
-    logger.debug { "SOAP request: " + req.body } if logger
+    namespace = parse_soapaction(req.meta_vars['HTTP_SOAPACTION'])
+    router = lookup_router(namespace)
+
+    is_fault = false
+
+    charset = ::SOAP::StreamHandler.parse_media_type(req['content-type'])
     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)
+      response_stream, is_fault = router.route(req.body, charset)
     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"
+      response_stream = router.create_fault_response(e)
+      is_fault = true
     end
-    if res.body.is_a?(IO)
+
+    res.body = response_stream
+    res['content-type'] = "text/xml; charset=\"#{charset}\""
+    if response_stream.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
+
+    if is_fault
+      res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR
     end
   end
 
 private
 
-  def logger
-    @config[:Logger]
+  class RequestRouter < ::SOAP::RPC::Router
+    def initialize(klass, namespace, mapping_registry = nil)
+      super(namespace)
+      if mapping_registry
+	self.mapping_registry = mapping_registry
+      end
+      @klass = klass
+      @namespace = namespace
+    end
+
+    def route(soap_string)
+      obj = @klass.new
+      namespace = self.actor
+      router = ::SOAP::RPC::Router.new(@namespace)
+      SOAPlet.add_servant_to_router(router, obj, namespace)
+      router.route(soap_string)
+    end
   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'])
+  def add_router(namespace, router)
+    @router_map[namespace] = router
   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
+  def parse_soapaction(soapaction)
+    if /^"(.*)"$/ =~ soapaction
+      soapaction = $1
     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
+    if soapaction.empty?
+      return nil
     end
+    soapaction
   end
 
-  def parse_soapaction(soapaction)
-    if !soapaction.nil? and !soapaction.empty?
-      if /^"(.+)"$/ =~ soapaction
-        return $1
-      end
+  def lookup_router(namespace)
+    if namespace
+      @router_map[namespace] || @app_scope_router
+    else
+      @app_scope_router
     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
+  class << self
+  public
+    def add_servant_to_router(router, obj, namespace)
+      ::SOAP::RPC.defined_methods(obj).each do |name|
+	add_servant_method_to_router(router, obj, namespace, name)
+      end
     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')
+    def add_servant_method_to_router(router, obj, namespace, name)
+      qname = XSD::QName.new(namespace, name)
+      soapaction = nil
+      method = obj.method(name)
+      param_def = ::SOAP::RPC::SOAPMethod.create_param_def(
+        (1..method.arity.abs).collect { |i| "p#{ i }" })
+      router.add_method(obj, qname, soapaction, name, param_def)
+    end
   end
 end
 
diff --git a/lib/soap/rpc/standaloneServer.rb b/lib/soap/rpc/standaloneServer.rb
index 080343ba33..42a566e088 100644
--- a/lib/soap/rpc/standaloneServer.rb
+++ b/lib/soap/rpc/standaloneServer.rb
@@ -6,35 +6,111 @@
 # either the dual license version in 2003, or any later version.
 
 
-require 'soap/rpc/httpserver'
+require 'logger'
+require 'soap/rpc/soaplet'
+require 'soap/streamHandler'
+
+# require 'webrick'
+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'
 
 
 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
+class StandaloneServer < Logger::Application
+  attr_reader :server
+
+  def initialize(app_name, namespace, host = "0.0.0.0", port = 8080)
+    super(app_name)
+    self.level = Logger::Severity::INFO
+    @namespace = namespace
     @host = host
     @port = port
-    super(create_config)
+    @server = nil
+    @soaplet = ::SOAP::RPC::SOAPlet.new
+    on_init
+  end
+
+  def on_init
+    # define extra methods in derived class.
+  end
+
+  def status
+    if @server
+      @server.status
+    else
+      nil
+    end
+  end
+
+  def shutdown
+    @server.shutdown
+  end
+  
+  def add_rpc_request_servant(klass, namespace = @namespace, mapping_registry = nil)
+    @soaplet.add_rpc_request_servant(klass, namespace, mapping_registry)
   end
 
+  def add_rpc_servant(obj, namespace = @namespace)
+    @soaplet.add_rpc_servant(obj, namespace)
+  end
   alias add_servant add_rpc_servant
-  alias add_headerhandler add_rpc_headerhandler
+
+  def mapping_registry
+    @soaplet.app_scope_router.mapping_registry
+  end
+
+  def mapping_registry=(mapping_registry)
+    @soaplet.app_scope_router.mapping_registry = mapping_registry
+  end
+
+  def add_method(obj, name, *param)
+    add_method_as(obj, name, name, *param)
+  end
+
+  def add_method_as(obj, name, name_as, *param)
+    qname = XSD::QName.new(@namespace, name_as)
+    soapaction = nil
+    method = obj.method(name)
+    param_def = if param.size == 1 and param[0].is_a?(Array)
+        param[0]
+      elsif param.empty?
+	::SOAP::RPC::SOAPMethod.create_param_def(
+	  (1..method.arity.abs).collect { |i| "p#{ i }" })
+      else
+        SOAP::RPC::SOAPMethod.create_param_def(param)
+      end
+    @soaplet.app_scope_router.add_method(obj, qname, soapaction, name, param_def)
+  end
 
 private
 
-  def create_config
-    {
+  def run
+    @server = WEBrick::HTTPServer.new(
       :BindAddress => @host,
-      :Port => @port,
+      :Logger => @log,
       :AccessLog => [],
-      :SOAPDefaultNamespace => @default_namespace,
-      :SOAPHTTPServerApplicationName => @appname,
-    }
+      :Port => @port
+    )
+    @server.mount('/', @soaplet)
+    @server.start
   end
 end
 
diff --git a/lib/soap/soap.rb b/lib/soap/soap.rb
index 12e09eccfe..d00d89b05b 100644
--- a/lib/soap/soap.rb
+++ b/lib/soap/soap.rb
@@ -1,5 +1,5 @@
 # soap/soap.rb: SOAP4R - Base definitions.
-# Copyright (C) 2000-2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -13,7 +13,7 @@ require 'xsd/charset'
 module SOAP
 
 
-VERSION = Version = '1.5.5'
+Version = '1.5.2'
 PropertyName = 'soap/property'
 
 EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
@@ -40,21 +40,20 @@ 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
+EleEnvelopeName = XSD::QName.new(EnvelopeNamespace, EleEnvelope)
+EleHeaderName = XSD::QName.new(EnvelopeNamespace, EleHeader)
+EleBodyName = XSD::QName.new(EnvelopeNamespace, EleBody)
+EleFaultName = XSD::QName.new(EnvelopeNamespace, EleFault)
+EleFaultStringName = XSD::QName.new(nil, EleFaultString)
+EleFaultActorName = XSD::QName.new(nil, EleFaultActor)
+EleFaultCodeName = XSD::QName.new(nil, EleFaultCode)
+EleFaultDetailName = XSD::QName.new(nil, EleFaultDetail)
+AttrEncodingStyleName = XSD::QName.new(EnvelopeNamespace, AttrEncodingStyle)
+AttrRootName = XSD::QName.new(EncodingNamespace, AttrRoot)
+AttrArrayTypeName = XSD::QName.new(EncodingNamespace, AttrArrayType)
+AttrOffsetName = XSD::QName.new(EncodingNamespace, AttrOffset)
+AttrPositionName = XSD::QName.new(EncodingNamespace, AttrPosition)
+ValueArrayName = XSD::QName.new(EncodingNamespace, ValueArray)
 
 Base64Literal = 'base64'
 
@@ -75,10 +74,6 @@ 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
@@ -103,7 +98,6 @@ class FaultError < Error
   end
 end
 
-
 module Env
   def self.getenv(name)
     ENV[name.downcase] || ENV[name.upcase]
@@ -116,25 +110,3 @@ 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/lib/soap/streamHandler.rb b/lib/soap/streamHandler.rb
index 672396ecce..d6b9c3bdca 100644
--- a/lib/soap/streamHandler.rb
+++ b/lib/soap/streamHandler.rb
@@ -7,19 +7,25 @@
 
 
 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
+require 'soap/property'
 
 
 module SOAP
 
 
 class StreamHandler
+  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
+      STDERR.puts "Loading http-access2 failed.  Net/http is used." if $DEBUG
+      require 'soap/netHttpClient'
+      SOAP::NetHttpClient
+    end
+
   RUBY_VERSION_STRING = "ruby #{ RUBY_VERSION } (#{ RUBY_RELEASE_DATE }) [#{ RUBY_PLATFORM }]"
 
   class ConnectionData
@@ -27,22 +33,33 @@ class StreamHandler
     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
+    def initialize
+      @send_string = nil
       @send_contenttype = nil
       @receive_string = nil
       @receive_contenttype = nil
-      @is_fault = false
-      @soapaction = nil
+      @bag = {}
     end
+
+    def [](idx)
+      @bag[idx]
+    end
+
+    def []=(idx, value)
+      @bag[idx] = value
+    end
+  end
+
+  attr_accessor :endpoint_url
+
+  def initialize(endpoint_url)
+    @endpoint_url = endpoint_url
   end
 
   def self.parse_media_type(str)
     if /^#{ MediaType }(?:\s*;\s*charset=([^"]+|"[^"]+"))?$/i !~ str
-      return nil
+      raise StreamError.new("Illegal media type.");
     end
     charset = $1
     charset.gsub!(/"/, '') if charset
@@ -55,74 +72,64 @@ class StreamHandler
 end
 
 
-class HTTPStreamHandler < StreamHandler
+class HTTPPostStreamHandler < 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]
+  NofRetry = 10       	# [times]
 
-  def initialize(options)
-    super()
+  def initialize(endpoint_url, options)
+    super(endpoint_url)
     @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}>"
+    "#<#{self.class}:#{endpoint_url}>"
   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)
+  def send(soap_string, soapaction = nil, charset = @charset)
+    send_post(soap_string, soapaction, 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
+  def reset
+    @client.reset(@endpoint_url)
   end
 
 private
 
   def set_options
-    HTTPConfigLoader.set_options(@client, @options)
-    @charset = @options["charset"] || XSD::Charset.xml_encoding_label
+    @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
+    set_cookie_store_file(@options["cookie_store_file"])
+    @options.add_hook("cookie_store_file") do |key, value|
+      set_cookie_store_file(value)
+    end
+    set_ssl_config(@options["ssl_config"])
+    @options.add_hook("ssl_config") do |key, value|
+      set_ssl_config(@options["ssl_config"])
+    end
+    @charset = @options["charset"] || XSD::Charset.charset_label($KCODE)
     @options.add_hook("charset") do |key, value|
       @charset = value
     end
@@ -131,66 +138,65 @@ private
       @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)
+    basic_auth = @options["basic_auth"] ||= ::SOAP::Property.new
+    set_basic_auth(basic_auth)
+    basic_auth.add_hook do |key, value|
+      set_basic_auth(basic_auth)
     end
-    ssl_config = @options["ssl_config"]
-    basic_auth = @options["basic_auth"]
     @options.lock(true)
-    ssl_config.unlock
     basic_auth.unlock
   end
 
+  def set_basic_auth(basic_auth)
+    basic_auth.values.each do |url, userid, passwd|
+      @client.set_basic_auth(url, userid, passwd)
+    end
+  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
+    return unless value
+    raise NotImplementedError.new
+  end
+
+  def set_ssl_config(value)
+    return unless value
+    raise NotImplementedError.new
   end
 
-  def send_post(endpoint_url, conn_data, charset)
-    conn_data.send_contenttype ||= StreamHandler.create_media_type(charset)
+  def send_post(soap_string, soapaction, charset)
+    data = ConnectionData.new
+    data.send_string = soap_string
+    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 << soap_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
+    extra['Content-Type'] = data.send_contenttype
+    extra['SOAPAction'] = "\"#{ soapaction }\""
+
     @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
+      res = @client.post(@endpoint_url, soap_string, extra)
     rescue
-      @client.reset(endpoint_url)
+      @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 }")
@@ -199,30 +205,14 @@ private
     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
+    data.receive_string = receive_string
+    data.receive_contenttype = res.contenttype
 
-  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
+    return data
   end
+
+  CRLF = "\r\n"
 end
 
 
diff --git a/lib/soap/wsdlDriver.rb b/lib/soap/wsdlDriver.rb
index eba9608df5..0961751474 100644
--- a/lib/soap/wsdlDriver.rb
+++ b/lib/soap/wsdlDriver.rb
@@ -1,5 +1,5 @@
 # SOAP4R - SOAP WSDL driver
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -9,11 +9,15 @@
 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'
+require 'soap/element'
+require 'soap/baseData'
+require 'soap/streamHandler'
+require 'soap/mapping'
+require 'soap/mapping/wsdlRegistry'
+require 'soap/rpc/rpc'
+require 'soap/rpc/element'
+require 'soap/processor'
+require 'logger'
 
 
 module SOAP
@@ -24,184 +28,75 @@ class WSDLDriverFactory
 
   attr_reader :wsdl
 
-  def initialize(wsdl)
+  def initialize(wsdl, logdev = nil)
+    @logdev = logdev
     @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
+    service = if servicename
+	@wsdl.service(XSD::QName.new(@wsdl.targetnamespace, servicename))
+      else
+	@wsdl.services[0]
+      end
     if service.nil?
-      raise FactoryError.new("service #{servicename} not found in WSDL")
+      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")
+    port = if portname
+	service.ports[XSD::QName.new(@wsdl.targetnamespace, portname)]
+      else
+	service.ports[0]
       end
+    if port.nil?
+      raise FactoryError.new("Port #{ portname } not found in WSDL.")
     end
     if port.soap_address.nil?
-      raise FactoryError.new("soap:address element not found in WSDL")
+      raise FactoryError.new("soap:address element not found in WSDL.")
     end
-    port
+    WSDLDriver.new(@wsdl, port, @logdev)
   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
+  # Backward compatibility.
+  alias createDriver create_driver
 
+private
+  
   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
+    def __attr_proxy(symbol, assignable = false)
+      name = symbol.to_s
+      module_eval <<-EOD
+       	def #{name}
+	  @servant.#{name}
+	end
+      EOD
+      if assignable
+   	module_eval <<-EOD
+	  def #{name}=(rhs)
+	    @servant.#{name} = rhs
+	  end
+	EOD
       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
+  __attr_proxy :generate_explicit_type, true
 
   def httpproxy
     @servant.options["protocol.http.proxy"]
@@ -244,110 +139,101 @@ class WSDLDriver
   end
 
   def reset_stream
-    @servant.reset_stream
+    @servant.streamhandler.reset
   end
 
   # Backward compatibility.
   alias generateEncodeType= generate_explicit_type=
 
   class Servant__
+    include Logger::Severity
     include SOAP
 
     attr_reader :options
+    attr_reader :streamhandler
     attr_reader :port
 
-    attr_accessor :soapaction
+    attr_accessor :mapping_registry
+    attr_accessor :wsdl_mapping_registry
     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
+      @default_encodingstyle = EncodingNamespace
+      @allow_unqualified_element = true
+      @generate_explicit_type = false
       @wiredump_file_base = nil
       @mandatorycharset = nil
+
       @wsdl_elements = @wsdl.collect_elements
-      @wsdl_types = @wsdl.collect_complextypes + @wsdl.collect_simpletypes
+      @wsdl_types = @wsdl.collect_complextypes
       @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)
+      @wsdl_mapping_registry = Mapping::WSDLRegistry.new(@rpc_decode_typemap)
+      @doc_mapper = Mapper.new(@wsdl_elements, @wsdl_types)
       endpoint_url = @port.soap_address.location
+      @streamhandler = HTTPPostStreamHandler.new(endpoint_url,
+	@options["protocol.http"] ||= Property.new)
       # Convert a map which key is QName, to a Hash which key is String.
-      @operation = {}
+      @operations = {}
       @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
+	@operations[op_name.name] = 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
+      @streamhandler.endpoint_url
     end
 
     def endpoint_url=(endpoint_url)
-      @proxy.endpoint_url = endpoint_url
+      @streamhandler.endpoint_url = endpoint_url
+      @streamhandler.reset
     end
 
-    def headerhandler
-      @proxy.headerhandler
-    end
-
-    def streamhandler
-      @proxy.streamhandler
-    end
+    def rpc_send(method_name, *params)
+      log(INFO) { "call: calling method '#{ method_name }'." }
+      log(DEBUG) { "call: parameters '#{ params.inspect }'." }
 
-    def test_loopback_response
-      @proxy.test_loopback_response
-    end
-
-    def reset_stream
-      @proxy.reset_stream
-    end
+      op_info = @operations[method_name]
+      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.optype_name)
+      method.elename = op_info.op_name
+      method.type = XSD::QName.new	# Request should not be typed.
+      req_header = nil
+      req_body = SOAPBody.new(method)
 
-    def rpc_call(name, *values)
-      set_wiredump_file_base(name)
-      unless op_info = @operation[name]
-        raise RuntimeError, "method: #{name} not defined"
+      if @wiredump_file_base
+	@streamhandler.wiredump_file_base =
+	  @wiredump_file_base + '_' << method_name
       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
+	opt = create_options
+	opt[:decode_typemap] = @rpc_decode_typemap
+	res_header, res_body = invoke(req_header, req_body, op_info, opt)
+	if res_body.fault
+	  raise SOAP::FaultError.new(res_body.fault)
+	end
+      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|
+
+      ret = res_body.response ?
+	Mapping.soap2obj(res_body.response, @mapping_registry) : nil
+
+      if res_body.outparams
+	outparams = res_body.outparams.collect { |outparam|
   	  Mapping.soap2obj(outparam)
    	}
     	return [ret].concat(outparams)
@@ -359,92 +245,44 @@ class WSDLDriver
     # 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
+      log(INFO) { "document_send: sending document '#{ name }'." }
+      op_info = @operations[name]
+      req_header = header_from_obj(header_obj, op_info)
       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)
+      opt = create_options
+      res_header, res_body = invoke(req_header, req_body, op_info, opt)
+      if res_body.fault
+	raise SOAP::FaultError.new(res_body.fault)
       end
-      res_body_obj = env.body.response ?
-	Mapping.soap2obj(env.body.response, @mapping_registry) : nil
-      return env.header, res_body_obj
+      res_body_obj = res_body.response ?
+	Mapping.soap2obj(res_body.response, @mapping_registry) : nil
+      return res_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
+      for idx in 0 ... params.length
+	o.instance_eval("@#{ names[idx] } = params[idx]")
       end
       o
     end
 
+    def invoke(req_header, req_body, op_info, opt)
+      send_string = Processor.marshal(req_header, req_body, opt)
+      log(DEBUG) { "invoke: sending string #{ send_string }" }
+      data = @streamhandler.send(send_string, op_info.soapaction)
+      log(DEBUG) { "invoke: received string #{ data.receive_string }" }
+      if data.receive_string.empty?
+	return nil, nil
+      end
+      opt[:charset] = @mandatorycharset ||
+	StreamHandler.parse_media_type(data.receive_contenttype)
+      res_header, res_body = Processor.unmarshal(data.receive_string, opt)
+      return res_header, res_body
+    end
+
     def header_from_obj(obj, op_info)
       if obj.is_a?(SOAPHeader)
 	obj
@@ -452,7 +290,7 @@ class WSDLDriver
 	if obj.nil?
 	  nil
 	else
-	  raise RuntimeError.new("no header definition in schema: #{obj}")
+	  raise RuntimeError.new("No header definition in schema.")
 	end
       elsif op_info.headerparts.size == 1
        	part = op_info.headerparts[0]
@@ -462,9 +300,9 @@ class WSDLDriver
       else
 	header = SOAPHeader.new()
 	op_info.headerparts.each do |part|
-	  child = Mapping.get_attribute(obj, part.name)
+	  child = obj[part.elename.name]
 	  ele = headeritem_from_obj(child, part.element || part.eletype)
-	  header.add(part.name, ele)
+	  header.add(ele)
 	end
 	header
       end
@@ -476,7 +314,7 @@ class WSDLDriver
       elsif obj.is_a?(SOAPHeaderItem)
 	obj
       else
-        Mapping.obj2soap(obj, @doc_mapper, name)
+	@doc_mapper.obj2ele(obj, name)
       end
     end
 
@@ -487,7 +325,7 @@ class WSDLDriver
 	if obj.nil?
 	  nil
 	else
-	  raise RuntimeError.new("no body found in schema")
+	  raise RuntimeError.new("No body found in schema.")
 	end
       elsif op_info.bodyparts.size == 1
        	part = op_info.bodyparts[0]
@@ -496,7 +334,7 @@ class WSDLDriver
       else
 	body = SOAPBody.new
 	op_info.bodyparts.each do |part|
-	  child = Mapping.get_attribute(obj, part.name)
+	  child = obj[part.elename.name]
 	  ele = bodyitem_from_obj(child, part.element || part.type)
 	  body.add(ele.elename.name, ele)
 	end
@@ -510,46 +348,51 @@ class WSDLDriver
       elsif obj.is_a?(SOAPElement)
 	obj
       else
-        Mapping.obj2soap(obj, @doc_mapper, name)
+	@doc_mapper.obj2ele(obj, 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)
+	add_document_method_interface(op_info.op_name.name)
       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)
+	parts_names = op_info.bodyparts.collect { |part| part.name }
+	add_rpc_method_interface(op_info.op_name.name, parts_names)
       else
-	raise RuntimeError.new("unknown style: #{op_info.style}")
+	raise RuntimeError.new("Unknown style: #{op_info.style}")
       end
     end
 
+    def add_document_method_interface(name)
+      @host.instance_eval <<-EOS
+	def #{ name }(headers, body)
+	  @servant.document_send(#{ name.dump }, headers, body)
+	end
+      EOS
+    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)
+      i = 0
+      param_names = parts_names.collect { |orgname| i += 1; "arg#{ i }" }
+      callparam = (param_names.collect { |pname| ", " + pname }).join
+      @host.instance_eval <<-EOS
+	def #{ name }(#{ param_names.join(", ") })
+	  @servant.rpc_send(#{ name.dump }#{ callparam })
+	end
+      EOS
     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)
+    def create_options
+      opt = {}
+      opt[:default_encodingstyle] = @default_encodingstyle
+      opt[:allow_unqualified_element] = @allow_unqualified_element
+      opt[:generate_explicit_type] = @generate_explicit_type
+      opt
+    end
+
+    def log(sev)
+      @logdev.add(sev, nil, self.class) { yield } if @logdev
     end
 
     def setup_options
@@ -563,13 +406,93 @@ class WSDLDriver
       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.charset"] ||= XSD::Charset.encoding_label
       opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
       opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
       opt
     end
+
+    class Mapper
+      def initialize(elements, types)
+	@elements = elements
+	@types = types
+      end
+
+      def obj2ele(obj, name)
+	if ele = @elements[name]
+	  _obj2ele(obj, ele)
+	elsif type = @types[name]
+	  obj2type(obj, type)
+	else
+	  raise RuntimeError.new("Cannot find name #{name} in schema.")
+	end
+      end
+
+      def ele2obj(ele, *arg)
+	raise NotImplementedError.new
+      end
+
+    private
+
+      def _obj2ele(obj, ele)
+	o = nil
+	if ele.type
+	  if type = @types[ele.type]
+	    o = obj2type(obj, type)
+	  elsif type = TypeMap[ele.type]
+	    o = base2soap(obj, type)
+	  else
+	    raise RuntimeError.new("Cannot find type #{ele.type}.")
+	  end
+	  o.elename = ele.name
+	elsif ele.local_complextype
+	  o = SOAPElement.new(ele.name)
+	  ele.local_complextype.each_element do |child_name, child_ele|
+	    o.add(_obj2ele(find_attribute(obj, child_name.name), child_ele))
+	  end
+	else
+	  raise RuntimeError.new("Illegal schema?")
+	end
+	o
+      end
+
+      def obj2type(obj, type)
+	o = SOAPElement.new(type.name)
+	type.each_element do |child_name, child_ele|
+	  o.add(_obj2ele(find_attribute(obj, child_name.name), child_ele))
+	end
+	o
+      end
+
+      def _ele2obj(ele)
+	raise NotImplementedError.new
+      end
+
+      def base2soap(obj, type)
+	soap_obj = nil
+	if type <= XSD::XSDString
+	  soap_obj = type.new(XSD::Charset.is_ces(obj, $KCODE) ?
+	    XSD::Charset.encoding_conv(obj, $KCODE, XSD::Charset.encoding) : obj)
+	else
+	  soap_obj = type.new(obj)
+	end
+	soap_obj
+      end
+
+      def find_attribute(obj, attr_name)
+	if obj.respond_to?(attr_name)
+	  obj.__send__(attr_name)
+	elsif obj.is_a?(Hash)
+	  obj[attr_name] || obj[attr_name.intern]
+	else
+	  obj.instance_eval("@#{ attr_name }")
+	end
+      end
+    end
   end
 end
 
 
 end
+
+
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index c984cd3393..f5dc801b21 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -9,19 +9,13 @@ require 'tmpdir'
 
 # A class for managing temporary files.  This library is written to be
 # thread safe.
-class Tempfile < DelegateClass(File)
+class Tempfile < SimpleDelegator
   MAX_TRY = 10
   @@cleanlist = []
 
-  # Creates a temporary file of mode 0600 in the temporary directory,
-  # opens it with mode "w+", and returns a Tempfile object which
-  # represents the created temporary file.  A Tempfile object can be
-  # treated just like a normal File object.
-  #
-  # The basename parameter is used to determine the name of a
-  # temporary file.  If an Array is given, the first element is used
-  # as prefix string and the second as suffix string, respectively.
-  # Otherwise it is treated as prefix string.
+  # 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'.
@@ -39,7 +33,7 @@ class Tempfile < DelegateClass(File)
       Thread.critical = true
 
       begin
-	tmpname = File.join(tmpdir, make_tmpname(basename, n))
+	tmpname = sprintf('%s/%s%d.%d', tmpdir, basename, $$, n)
 	lock = tmpname + '.lock'
 	n += 1
       end while @@cleanlist.include?(tmpname) or
@@ -72,19 +66,6 @@ class Tempfile < DelegateClass(File)
     Dir.rmdir(lock)
   end
 
-  def make_tmpname(basename, n)
-    case basename
-    when Array
-      prefix, suffix = *basename
-    else
-      prefix, suffix = basename, ''
-    end
- 
-    t = Time.now.strftime("%Y%m%d")
-    path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}-#{n}#{suffix}"
-  end
-  private :make_tmpname
-
   # Opens or reopens the file with mode "r+".
   def open
     @tmpfile.close if @tmpfile
@@ -95,8 +76,7 @@ class Tempfile < DelegateClass(File)
 
   def _close	# :nodoc:
     @tmpfile.close if @tmpfile
-    @tmpfile = nil
-    @data[1] = nil if @data
+    @data[1] = @tmpfile = nil
   end    
   protected :_close
 
@@ -118,7 +98,6 @@ class Tempfile < DelegateClass(File)
     _close
     @clean_proc.call
     ObjectSpace.undefine_finalizer(self)
-    @data = @tmpname = nil
   end
 
   # Unlinks the file.  On UNIX-like systems, it is often a good idea
@@ -127,14 +106,8 @@ class Tempfile < DelegateClass(File)
   # 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
+    File.unlink(@tmpname) if File.exist?(@tmpname)
+    @@cleanlist.delete(@tmpname) if @@cleanlist
   end
   alias delete unlink
 
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index b71f644566..7d2c464500 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -1,280 +1,275 @@
+# = 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).
+
+
+
+
 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 Test
   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
+at_exit{exit(Test::Unit::AutoRunner.run($0)) unless($! || Test::Unit.run?)}
diff --git a/lib/test/unit/assertionfailederror.rb b/lib/test/unit/assertionfailederror.rb
index a21e4b5870..0854203675 100644
--- a/lib/test/unit/assertionfailederror.rb
+++ b/lib/test/unit/assertionfailederror.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index aa97799de8..001bb428d0 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -1,3 +1,5 @@
+# :nodoc:
+#
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
 # License:: Ruby license.
@@ -5,42 +7,24 @@
 require 'test/unit/assertionfailederror'
 require 'test/unit/util/backtracefilter'
 
-module Test
-  module Unit
+module Test # :nodoc:
+  module Unit # :nodoc:
 
-    ##
-    # 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.
+    # Contains all of the standard Test::Unit assertions. Mixed in
+    # to Test::Unit::TestCase. To mix it in and use its
+    # functionality, you simply need to rescue
+    # Test::Unit::AssertionFailedError, and you can additionally
+    # override add_assertion to be 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
-
+    # * The message to each assertion, if given, will be
+    #   propagated with the failure.
+    # * It's easy to add your own assertions based on assert_block().
     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
-
+      # The assertion upon which all other assertions are
+      # based. Passes if the block yields true.
       public
       def assert_block(message="assert_block failed.") # :yields: 
         _wrap_assertion do
@@ -50,12 +34,7 @@ module Test
         end
       end
 
-      ##
-      # Asserts that +boolean+ is not false or nil.
-      #
-      # Example:
-      #   assert [1, 2].include?(5)
-
+      # Passes if boolean is true.
       public
       def assert(boolean, message=nil)
         _wrap_assertion do
@@ -64,16 +43,10 @@ module Test
         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
-
+      # 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.
       public
       def assert_equal(expected, actual, message=nil)
         full_message = build_message(message, <<EOT, expected, actual)
@@ -84,7 +57,7 @@ EOT
       end
 
       private
-      def _check_exception_class(args) # :nodoc:
+      def _check_exception_class(args)
         args.partition do |klass|
           next if klass.instance_of?(Module)
           assert(Exception >= klass, "Should expect a class of exception, #{klass}")
@@ -93,19 +66,12 @@ EOT
       end
 
       private
-      def _expected_exception?(actual_exception, exceptions, modules) # :nodoc:
+      def _expected_exception?(actual_exception, exceptions, modules)
         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
-
+      # Passes if block raises one of the given exceptions.
       public
       def assert_raise(*args)
         _wrap_assertion do
@@ -132,22 +98,13 @@ EOT
         end
       end
 
-      ##
-      # Alias of assert_raise.
-      #
-      # Will be deprecated in 1.9, and removed in 2.0.
-
+      # 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'
-
+      # Passes if object.class == klass.
       public
       def assert_instance_of(klass, object, message="")
         _wrap_assertion do
@@ -161,23 +118,13 @@ EOT
         end
       end
 
-      ##
-      # Passes if +object+ is nil.
-      #
-      # Example:
-      #   assert_nil [1, 2].uniq!
-
+      # Passes if object.nil?.
       public
       def assert_nil(object, message="")
         assert_equal(nil, object, message)
       end
 
-      ##
-      # Passes if +object+ .kind_of? +klass+
-      #
-      # Example:
-      #   assert_kind_of Object, 'foo'
-
+      # Passes if object.kind_of?(klass).
       public
       def assert_kind_of(klass, object, message="")
         _wrap_assertion do
@@ -187,12 +134,7 @@ EOT
         end
       end
 
-      ##
-      # Passes if +object+ .respond_to? +method+
-      #
-      # Example:
-      #   assert_respond_to 'bugbear', :slice
-
+      # Passes if object.respond_to?(method) is true.
       public
       def assert_respond_to(object, method, message="")
         _wrap_assertion do
@@ -210,12 +152,7 @@ EOT
         end
       end
 
-      ##
-      # Passes if +string+ =~ +pattern+.
-      #
-      # Example:
-      #   assert_match(/\d+/, 'five, 6, seven')
-
+      # Passes if string =~ pattern.
       public
       def assert_match(pattern, string, message="")
         _wrap_assertion do
@@ -230,14 +167,8 @@ EOT
         end
       end
 
-      ##
-      # Passes if +actual+ .equal? +expected+ (i.e. they are the same
-      # instance).
-      #
-      # Example:
-      #   o = Object.new
-      #   assert_same o, o
-
+      # Passes if actual.equal?(expected) (i.e. they are the
+      # same instance).
       public
       def assert_same(expected, actual, message="")
         full_message = build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__)
@@ -249,14 +180,9 @@ 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
-
+      # Compares the two objects based on the passed
+      # operator. Passes if object1.__send__(operator, object2)
+      # is true.
       public
       def assert_operator(object1, operator, object2, message="")
         _wrap_assertion do
@@ -271,14 +197,7 @@ EOT
         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
@@ -302,23 +221,13 @@ EOT
         end
       end
 
-      ##
-      # Flunk always fails.
-      #
-      # Example:
-      #   flunk 'Not done testing yet.'
-
+      # Always fails.
       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
-
+      # Passes if !actual.equal?(expected).
       public
       def assert_not_same(expected, actual, message="")
         full_message = build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__)
@@ -330,36 +239,21 @@ EOT
         assert_block(full_message) { !actual.equal?(expected) }
       end
 
-      ##
-      # Passes if +expected+ != +actual+
-      #
-      # Example:
-      #   assert_not_equal 'some string', 5
-
+      # Passes if expected != actual.
       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')
-
+      # Passes if !object.nil?.
       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')
-
+      # Passes if string !~ regularExpression.
       public
       def assert_no_match(regexp, string, message="")
         _wrap_assertion do
@@ -372,14 +266,7 @@ EOT
       UncaughtThrow = {NameError => /^uncaught throw \`(.+)\'$/,
                        ThreadError => /^uncaught throw \`(.+)\' in thread /} #`
 
-      ##
-      # Passes if the block throws +expected_symbol+
-      #
-      # Example:
-      #   assert_throws :done do
-      #     throw :done
-      #   end
-
+      # Passes if block throws symbol.
       public
       def assert_throws(expected_symbol, message="", &proc)
         _wrap_assertion do
@@ -403,14 +290,7 @@ EOT
         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
@@ -428,13 +308,8 @@ EOT
         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
-
+      # Passes if expected_float and actual_float are equal
+      # within delta tolerance.
       public
       def assert_in_delta(expected_float, actual_float, delta, message="")
         _wrap_assertion do
@@ -451,17 +326,7 @@ EOT
         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]
-
+      # Passes if the method sent returns a true value.
       public
       def assert_send(send_array, message="")
         _wrap_assertion do
@@ -475,18 +340,14 @@ EOT
         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)
+      def build_message(head, template=nil, *arguments) # :nodoc:
         template &&= template.chomp
         return AssertionMessage.new(head, template, arguments)
       end
 
       private
-      def _wrap_assertion
+      def _wrap_assertion # :nodoc:
         @_assertion_wrapped ||= false
         unless (@_assertion_wrapped)
           @_assertion_wrapped = true
@@ -501,26 +362,20 @@ EOT
         end
       end
       
-      ##
-      # Called whenever an assertion is made.  Define this in classes that
-      # include Test::Unit::Assertions to record assertion counts.
-
+      # Called whenever an assertion is made.
       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.
-
+      # Select whether or not to use the prettyprinter. If this
+      # option is set to false before any assertions are made, the
+      # prettyprinter will not be required at all.
       public
       def self.use_pp=(value)
         AssertionMessage.use_pp = value
       end
       
-      # :stopdoc:
-
-      class AssertionMessage
+      class AssertionMessage # :nodoc: all
         @use_pp = true
         class << self
           attr_accessor :use_pp
@@ -614,9 +469,6 @@ EOM
           message_parts.join("\n")
         end
       end
-
-      # :startdoc:
-
     end
   end
 end
diff --git a/lib/test/unit/autorunner.rb b/lib/test/unit/autorunner.rb
index 86c9b12940..4eee7f654b 100644
--- a/lib/test/unit/autorunner.rb
+++ b/lib/test/unit/autorunner.rb
@@ -1,23 +1,17 @@
-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)
+      def self.run(current_file=nil, default_dir=nil, argv=ARGV, &block)
+        if(!current_file || current_file == $0)
+          r = new(!current_file, &block)
+          if !r.process_args(argv) && default_dir
+            r.to_run << default_dir
+          end
+          r.run
         end
-        true
       end
 
       RUNNERS = {
@@ -61,16 +55,13 @@ module Test
           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.pattern = r.pattern if(r.pattern)
           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_accessor :output_level, :filters, :to_run, :pattern
       attr_writer :runner, :collector
 
       def initialize(standalone)
@@ -81,13 +72,12 @@ module Test
         @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}
+          @to_run.concat options.parse!(args)
         rescue OptionParser::ParseError => e
           puts e
           puts options
@@ -112,30 +102,15 @@ module Test
           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,
+            o.on('-p', '--pattern=PATTERN', String,
                  "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
+              @pattern = Regexp.new(e.sub(%r{\A/(.*)/\Z}m, '\\1'))
             end
           end
 
@@ -163,11 +138,6 @@ module Test
             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|
@@ -212,7 +182,6 @@ module Test
       def run
         @suite = @collector[self]
         result = @runner[self] or return false
-        Dir.chdir(@workdir) if @workdir
         result.run(@suite, @output_level).passed?
       end
     end
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index 97c8d28481..43fd1be718 100644
--- a/lib/test/unit/collector/dir.rb
+++ b/lib/test/unit/collector/dir.rb
@@ -7,8 +7,7 @@ module Test
       class Dir
         include Collector
 
-        attr_reader :pattern, :exclude
-        attr_accessor :base
+        attr_writer :pattern
 
         def initialize(dir=::Dir, file=::File, object_space=::ObjectSpace, req=nil)
           super()
@@ -16,13 +15,10 @@ module Test
           @file = file
           @object_space = object_space
           @req = req
-          @pattern = [/\btest_.*\.rb\Z/m]
-          @exclude = []
+          @pattern = /\Atest_.*\.rb\Z/m
         end
 
         def collect(*from)
-          basedir = @base
-          $:.push(basedir) if basedir
           if(from.empty?)
             recursive_collect('.', find_test_cases)
           elsif(from.size == 1)
@@ -37,8 +33,6 @@ module Test
             sort(suites).each{|s| suite << s}
             suite
           end
-        ensure
-          $:.delete_at($:.rindex(basedir)) if basedir
         end
 
         def find_test_cases(ignore=[])
@@ -52,24 +46,15 @@ module Test
 
         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|
+          if(@file.directory?(name))
+            @dir.entries(name).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
+              e_name = @file.join(name, e)
+              if(@file.directory?(e_name))
                 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
+                (next unless(@pattern =~ e)) if(@pattern)
                 collect_file(e_name, sub_suites, already_gathered)
               end
             end
@@ -82,25 +67,19 @@ module Test
         end
 
         def collect_file(name, suites, already_gathered)
-          dir = @file.dirname(@file.expand_path(name, @base))
-          $:.unshift(dir)
+          loadpath = $:.dup
+          dir = File.dirname(File.expand_path(name))
+          $:.unshift(dir) unless $:.first == dir
           if(@req)
             @req.require(name)
           else
             require(name)
           end
           find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
+        rescue LoadError, SystemExit
         ensure
-          $:.delete_at($:.rindex(dir)) if(dir)
+          $:.replace(loadpath)
         end
-
-	def realdir(path)
-	  if @base
-	    @file.join(@base, path)
-	  else
-	    path
-	  end
-	end
       end
     end
   end
diff --git a/lib/test/unit/error.rb b/lib/test/unit/error.rb
index 43a813f7d1..90ac04cf3b 100644
--- a/lib/test/unit/error.rb
+++ b/lib/test/unit/error.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
diff --git a/lib/test/unit/failure.rb b/lib/test/unit/failure.rb
index 832c99857c..42cc9d4b8c 100644
--- a/lib/test/unit/failure.rb
+++ b/lib/test/unit/failure.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
diff --git a/lib/test/unit/testcase.rb b/lib/test/unit/testcase.rb
index f53b460c5d..8b22dd4640 100644
--- a/lib/test/unit/testcase.rb
+++ b/lib/test/unit/testcase.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
@@ -28,18 +28,10 @@ module Test
       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))
+        unless(respond_to?(test_method_name) && method(test_method_name).arity == 0)
           throw :invalid_test
         end
         @method_name = test_method_name
@@ -61,7 +53,7 @@ module Test
         end
         if (suite.empty?)
           catch(:invalid_test) do
-            suite << new("default_test")
+            suite << new(:default_test)
           end
         end
         return suite
@@ -78,16 +70,14 @@ module Test
           __send__(@method_name)
         rescue AssertionFailedError => e
           add_failure(e.message, e.backtrace)
-        rescue Exception
-          raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
+        rescue StandardError, ScriptError
           add_error($!)
         ensure
           begin
             teardown
           rescue AssertionFailedError => e
             add_failure(e.message, e.backtrace)
-          rescue Exception
-            raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
+          rescue StandardError, ScriptError
             add_error($!)
           end
         end
@@ -117,22 +107,22 @@ module Test
       end
       private :passed?
 
-      def size
+      def size # :nodoc:
         1
       end
 
-      def add_assertion
+      def add_assertion # :nodoc:
         @_result.add_assertion
       end
       private :add_assertion
 
-      def add_failure(message, all_locations=caller())
+      def add_failure(message, all_locations=caller()) # :nodoc:
         @test_passed = false
         @_result.add_failure(Failure.new(name, filter_backtrace(all_locations), message))
       end
       private :add_failure
 
-      def add_error(exception)
+      def add_error(exception) # :nodoc:
         @test_passed = false
         @_result.add_error(Error.new(name, exception))
       end
@@ -144,7 +134,7 @@ module Test
         "#{@method_name}(#{self.class.name})"
       end
 
-      # Overridden to return #name.
+      # Overriden to return #name.
       def to_s
         name
       end
diff --git a/lib/test/unit/testresult.rb b/lib/test/unit/testresult.rb
index e3a472ef7f..b1bfbf72e4 100644
--- a/lib/test/unit/testresult.rb
+++ b/lib/test/unit/testresult.rb
@@ -1,4 +1,5 @@
-#--
+# :nodoc:
+#
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
 # License:: Ruby license.
diff --git a/lib/test/unit/testsuite.rb b/lib/test/unit/testsuite.rb
index 6fea976c50..b3a704ec63 100644
--- a/lib/test/unit/testsuite.rb
+++ b/lib/test/unit/testsuite.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
@@ -59,7 +59,7 @@ module Test
         tests.empty?
       end
 
-      # Overridden to return the name given the suite at
+      # Overriden to return the name given the suite at
       # creation.
       def to_s
         @name
diff --git a/lib/test/unit/ui/console/testrunner.rb b/lib/test/unit/ui/console/testrunner.rb
index 6b600e319a..761777195b 100644
--- a/lib/test/unit/ui/console/testrunner.rb
+++ b/lib/test/unit/ui/console/testrunner.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
@@ -10,11 +10,16 @@ require 'test/unit/ui/testrunnerutilities'
 module Test
   module Unit
     module UI
-      module Console
+      module Console # :nodoc:
 
         # Runs a Test::Unit::TestSuite on the console.
         class TestRunner
           extend TestRunnerUtilities
+          
+          # Creates a new TestRunner and runs the suite.
+          def self.run(suite, output_level=NORMAL)
+            return new(suite, output_level).start
+          end
 
           # Creates a new TestRunner for running the passed
           # suite. If quiet_mode is true, the output while
@@ -42,7 +47,7 @@ module Test
           end
 
           private
-          def setup_mediator
+          def setup_mediator # :nodoc:
             @mediator = create_mediator(@suite)
             suite_name = @suite.to_s
             if ( @suite.kind_of?(Module) )
@@ -51,11 +56,11 @@ module Test
             output("Loaded suite #{suite_name}")
           end
           
-          def create_mediator(suite)
+          def create_mediator(suite) # :nodoc:
             return TestRunnerMediator.new(suite)
           end
           
-          def attach_to_mediator
+          def attach_to_mediator # :nodoc:
             @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
             @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
             @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
@@ -63,11 +68,11 @@ module Test
             @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
           end
           
-          def start_mediator
+          def start_mediator # :nodoc:
             return @mediator.run_suite
           end
           
-          def add_fault(fault)
+          def add_fault(fault) # :nodoc:
             @faults << fault
             output_single(fault.single_character_display, PROGRESS_ONLY)
             @already_outputted = true
diff --git a/lib/test/unit/ui/fox/testrunner.rb b/lib/test/unit/ui/fox/testrunner.rb
index a23a450567..d89e8c2c87 100644
--- a/lib/test/unit/ui/fox/testrunner.rb
+++ b/lib/test/unit/ui/fox/testrunner.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
@@ -13,7 +13,7 @@ include Fox
 module Test
   module Unit
     module UI
-      module Fox
+      module Fox # :nodoc:
 
         # Runs a Test::Unit::TestSuite in a Fox UI. Obviously,
         # this one requires you to have Fox
@@ -26,6 +26,11 @@ module Test
           
           RED_STYLE = FXRGBA(0xFF,0,0,0xFF) #0xFF000000
           GREEN_STYLE = FXRGBA(0,0xFF,0,0xFF) #0x00FF0000
+  
+          # Creates a new TestRunner and runs the suite.
+          def self.run(suite)
+            new(suite).start
+          end
 
           # Creates a new TestRunner for running the passed
           # suite.
@@ -49,7 +54,7 @@ module Test
             @result
           end
 
-          def setup_mediator
+          def setup_mediator # :nodoc:
             @mediator = TestRunnerMediator.new(@suite)
             suite_name = @suite.to_s
             if ( @suite.kind_of?(Module) )
@@ -58,7 +63,7 @@ module Test
             @suite_name_entry.text = suite_name
           end
           
-          def attach_to_mediator
+          def attach_to_mediator # :nodoc:
             @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
             @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
             @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
@@ -67,7 +72,7 @@ module Test
             @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
           end
   
-          def start_ui
+          def start_ui # :nodoc:
             @application.create
             @window.show(PLACEMENT_SCREEN)
             @application.addTimeout(1) do
@@ -76,11 +81,11 @@ module Test
             @application.run
           end
           
-          def stop
+          def stop # :nodoc:
             @application.exit(0)
           end
           
-          def reset_ui(count)
+          def reset_ui(count) # :nodoc:
             @test_progress_bar.barColor = GREEN_STYLE
             @test_progress_bar.total = count
             @test_progress_bar.progress = 0
@@ -94,7 +99,7 @@ module Test
             @fault_list.clearItems
           end
           
-          def add_fault(fault)
+          def add_fault(fault) # :nodoc:
             if ( ! @red )
               @test_progress_bar.barColor = RED_STYLE
               @red = true
@@ -103,19 +108,19 @@ module Test
             @fault_list.appendItem(item)
           end
           
-          def show_fault(fault)
+          def show_fault(fault) # :nodoc:
             raw_show_fault(fault.long_display)
           end
           
-          def raw_show_fault(string)
+          def raw_show_fault(string) # :nodoc:
             @detail_text.setText(string)
           end
           
-          def clear_fault
+          def clear_fault # :nodoc:
             raw_show_fault("")
           end
           
-          def result_changed(result)
+          def result_changed(result) # :nodoc:
             @test_progress_bar.progress = result.run_count
   
             @test_count_label.text = result.run_count.to_s
@@ -128,7 +133,7 @@ module Test
              @application.flush
           end
           
-          def started(result)
+          def started(result) # :nodoc:
             @result = result
             output_status("Started...")
           end
@@ -146,7 +151,7 @@ module Test
             @status_entry.repaint
           end
   
-          def setup_ui
+          def setup_ui # :nodoc:
             @application = create_application
             create_tooltip(@application)
 
@@ -180,7 +185,7 @@ module Test
             @detail_text = create_text(detail_panel)
           end
           
-          def create_application
+          def create_application # :nodoc:
             app = FXApp.new("TestRunner", "Test::Unit")
             app.init([])
             app
@@ -194,25 +199,25 @@ module Test
             FXTooltip.new(app)
           end
   
-          def create_main_panel(parent)
+          def create_main_panel(parent) # :nodoc:
             panel = FXVerticalFrame.new(parent, LAYOUT_FILL_X | LAYOUT_FILL_Y)
             panel.vSpacing = 10
             panel
           end
   
-          def create_suite_panel(parent)
+          def create_suite_panel(parent) # :nodoc:
             FXHorizontalFrame.new(parent, LAYOUT_SIDE_LEFT | LAYOUT_FILL_X)
           end
           
-          def create_button(parent, text, action)
+          def create_button(parent, text, action) # :nodoc:
             FXButton.new(parent, text).connect(SEL_COMMAND, &action)
           end
           
-          def create_progress_bar(parent)
+          def create_progress_bar(parent) # :nodoc:
             FXProgressBar.new(parent, nil, 0, PROGRESSBAR_NORMAL | LAYOUT_FILL_X)
           end
           
-          def create_info_panel(parent)
+          def create_info_panel(parent) # :nodoc:
             FXMatrix.new(parent, 1, MATRIX_BY_ROWS | LAYOUT_FILL_X)
           end
           
@@ -220,11 +225,11 @@ module Test
             FXLabel.new(parent, text, nil, JUSTIFY_CENTER_X | LAYOUT_FILL_COLUMN)
           end
           
-          def create_list_panel(parent)
+          def create_list_panel(parent) # :nodoc:
             FXHorizontalFrame.new(parent, LAYOUT_FILL_X | FRAME_SUNKEN | FRAME_THICK)
           end
           
-          def create_fault_list(parent)
+          def create_fault_list(parent) # :nodoc:
             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?
@@ -236,22 +241,22 @@ module Test
             list
           end
           
-          def create_detail_panel(parent)
+          def create_detail_panel(parent) # :nodoc:
             FXHorizontalFrame.new(parent, LAYOUT_FILL_X | LAYOUT_FILL_Y | FRAME_SUNKEN | FRAME_THICK)
           end
           
-          def create_text(parent)
+          def create_text(parent) # :nodoc:
             FXText.new(parent, nil, 0, TEXT_READONLY | LAYOUT_FILL_X | LAYOUT_FILL_Y)
           end
           
-          def create_entry(parent)
+          def create_entry(parent) # :nodoc:
             entry = FXTextField.new(parent, 30, nil, 0, TEXTFIELD_NORMAL | LAYOUT_SIDE_BOTTOM | LAYOUT_FILL_X)
             entry.disable
             entry
           end
         end
   
-        class FaultListItem < FXListItem
+        class FaultListItem < FXListItem # :nodoc: all
           attr_reader(:fault)
           def initialize(fault)
             super(fault.short_display)
diff --git a/lib/test/unit/ui/gtk/testrunner.rb b/lib/test/unit/ui/gtk/testrunner.rb
index 994328dc9b..85b873f5ff 100644
--- a/lib/test/unit/ui/gtk/testrunner.rb
+++ b/lib/test/unit/ui/gtk/testrunner.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
@@ -11,7 +11,7 @@ require 'test/unit/ui/testrunnerutilities'
 module Test
   module Unit
     module UI
-      module GTK
+      module GTK # :nodoc:
 
         # Runs a Test::Unit::TestSuite in a Gtk UI. Obviously,
         # this one requires you to have Gtk
@@ -20,6 +20,11 @@ module Test
         class TestRunner
           extend TestRunnerUtilities
 
+          # Creates a new TestRunner and runs the suite.
+          def self.run(suite)
+            new(suite).start
+          end
+
           # Creates a new TestRunner for running the passed
           # suite.
           def initialize(suite, output_level = NORMAL)
@@ -49,7 +54,7 @@ module Test
           end
 
           private
-          def setup_mediator
+          def setup_mediator # :nodoc:
             @mediator = TestRunnerMediator.new(@suite)
             suite_name = @suite.to_s
             if ( @suite.kind_of?(Module) )
@@ -58,7 +63,7 @@ module Test
             suite_name_entry.set_text(suite_name)
           end
           
-          def attach_to_mediator
+          def attach_to_mediator # :nodoc:
             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))
@@ -73,7 +78,7 @@ module Test
             @runner.raise(@restart_signal)
           end
           
-          def start_ui
+          def start_ui # :nodoc:
             @viewer.run
             running = false
             begin
@@ -93,11 +98,11 @@ module Test
             end
           end
           
-          def stop(*)
+          def stop(*) # :nodoc:
             Gtk.main_quit
           end
           
-          def reset_ui(count)
+          def reset_ui(count) # :nodoc:
             test_progress_bar.set_style(green_style)
             test_progress_bar.configure(0, 0, count)
             @red = false
@@ -110,7 +115,7 @@ module Test
             fault_list.remove_items(fault_list.children)
           end
           
-          def add_fault(fault)
+          def add_fault(fault) # :nodoc:
             if ( ! @red )
               test_progress_bar.set_style(red_style)
               @red = true
@@ -120,27 +125,27 @@ module Test
             fault_list.append_items([item])
           end
           
-          def show_fault(fault)
+          def show_fault(fault) # :nodoc:
             raw_show_fault(fault.long_display)
           end
           
-          def raw_show_fault(string)
+          def raw_show_fault(string) # :nodoc:
             fault_detail_label.set_text(string)
             outer_detail_sub_panel.queue_resize
           end
           
-          def clear_fault
+          def clear_fault # :nodoc:
             raw_show_fault("")
           end
           
-          def result_changed(result)
+          def result_changed(result) # :nodoc:
             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)
+          def started(result) # :nodoc:
             @result = result
             output_status("Started...")
           end
@@ -157,11 +162,11 @@ module Test
             output_status("Finished in #{elapsed_time} seconds")
           end
           
-          def output_status(string)
+          def output_status(string) # :nodoc:
             status_entry.set_text(string)
           end
   
-          def setup_ui
+          def setup_ui # :nodoc:
             main_window.signal_connect("destroy", nil, &method(:stop))
             main_window.show_all
             fault_list.signal_connect("select-child", nil) {
@@ -174,7 +179,7 @@ module Test
             @red = false
           end
           
-          def main_window
+          def main_window # :nodoc:
             lazy_initialize(:main_window) {
               @main_window = Gtk::Window.new(Gtk::WINDOW_TOPLEVEL)
               @main_window.set_title("Test::Unit TestRunner")
@@ -185,7 +190,7 @@ module Test
             }
           end
           
-          def main_panel
+          def main_panel # :nodoc:
             lazy_initialize(:main_panel) {
               @main_panel = Gtk::VBox.new(false, 0)
               @main_panel.pack_start(suite_panel, false, false, 0)
@@ -197,7 +202,7 @@ module Test
             }
           end
           
-          def suite_panel
+          def suite_panel # :nodoc:
             lazy_initialize(:suite_panel) {
               @suite_panel = Gtk::HBox.new(false, 10)
               @suite_panel.border_width(10)
@@ -207,20 +212,20 @@ module Test
             }
           end
           
-          def suite_name_entry
+          def suite_name_entry # :nodoc:
             lazy_initialize(:suite_name_entry) {
               @suite_name_entry = Gtk::Entry.new
               @suite_name_entry.set_editable(false)
             }
           end
           
-          def run_button
+          def run_button # :nodoc:
             lazy_initialize(:run_button) {
               @run_button = Gtk::Button.new("Run")
             }
           end
           
-          def progress_panel
+          def progress_panel # :nodoc:
             lazy_initialize(:progress_panel) {
               @progress_panel = Gtk::HBox.new(false, 10)
               @progress_panel.border_width(10)
@@ -228,7 +233,7 @@ module Test
             }
           end
           
-          def test_progress_bar
+          def test_progress_bar # :nodoc:
             lazy_initialize(:test_progress_bar) {
               @test_progress_bar = EnhancedProgressBar.new
               @test_progress_bar.set_usize(@test_progress_bar.allocation.width,
@@ -237,21 +242,21 @@ module Test
             }
           end
           
-          def green_style
+          def green_style # :nodoc:
             lazy_initialize(:green_style) {
               @green_style = Gtk::Style.new
               @green_style.set_bg(Gtk::STATE_PRELIGHT, 0x0000, 0xFFFF, 0x0000)
             }
           end
           
-          def red_style
+          def red_style # :nodoc:
             lazy_initialize(:red_style) {
               @red_style = Gtk::Style.new
               @red_style.set_bg(Gtk::STATE_PRELIGHT, 0xFFFF, 0x0000, 0x0000)
             }
           end
           
-          def info_panel
+          def info_panel # :nodoc:
             lazy_initialize(:info_panel) {
               @info_panel = Gtk::HBox.new(false, 0)
               @info_panel.border_width(10)
@@ -266,35 +271,35 @@ module Test
             }
           end
           
-          def run_count_label
+          def run_count_label # :nodoc:
             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
+          def assertion_count_label # :nodoc:
             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
+          def failure_count_label # :nodoc:
             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
+          def error_count_label # :nodoc:
             lazy_initialize(:error_count_label) {
               @error_count_label = Gtk::Label.new("0")
               @error_count_label.set_justify(Gtk::JUSTIFY_LEFT)
             }
           end
           
-          def list_panel
+          def list_panel # :nodoc:
             lazy_initialize(:list_panel) {
               @list_panel = Gtk::HBox.new
               @list_panel.border_width(10)
@@ -302,7 +307,7 @@ module Test
             }
           end
           
-          def list_scrolled_window
+          def list_scrolled_window # :nodoc:
             lazy_initialize(:list_scrolled_window) {
               @list_scrolled_window = Gtk::ScrolledWindow.new
               @list_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
@@ -311,13 +316,13 @@ module Test
             }
           end
           
-          def fault_list
+          def fault_list # :nodoc:
             lazy_initialize(:fault_list) {
               @fault_list = Gtk::List.new
             }
           end
           
-          def detail_panel
+          def detail_panel # :nodoc:
             lazy_initialize(:detail_panel) {
               @detail_panel = Gtk::HBox.new
               @detail_panel.border_width(10)
@@ -325,7 +330,7 @@ module Test
             }
           end
           
-          def detail_scrolled_window
+          def detail_scrolled_window # :nodoc:
             lazy_initialize(:detail_scrolled_window) {
               @detail_scrolled_window = Gtk::ScrolledWindow.new
               @detail_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
@@ -334,21 +339,21 @@ module Test
             }
           end
           
-          def outer_detail_sub_panel
+          def outer_detail_sub_panel # :nodoc:
             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
+          def inner_detail_sub_panel # :nodoc:
             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
+          def fault_detail_label # :nodoc:
             lazy_initialize(:fault_detail_label) {
               @fault_detail_label = EnhancedLabel.new("")
               style = Gtk::Style.new
@@ -362,7 +367,7 @@ module Test
             }
           end
           
-          def status_panel
+          def status_panel # :nodoc:
             lazy_initialize(:status_panel) {
               @status_panel = Gtk::HBox.new
               @status_panel.border_width(10)
@@ -370,14 +375,14 @@ module Test
             }
           end
           
-          def status_entry
+          def status_entry # :nodoc:
             lazy_initialize(:status_entry) {
               @status_entry = Gtk::Entry.new
               @status_entry.set_editable(false)
             }
           end
   
-          def lazy_initialize(symbol)
+          def lazy_initialize(symbol) # :nodoc:
             if (!instance_eval("defined?(@#{symbol.to_s})"))
               yield
             end
@@ -385,7 +390,7 @@ module Test
           end
         end
   
-        class EnhancedProgressBar < Gtk::ProgressBar
+        class EnhancedProgressBar < Gtk::ProgressBar # :nodoc: all
           def set_style(style)
             super
             hide
@@ -393,13 +398,13 @@ module Test
           end
         end
   
-        class EnhancedLabel < Gtk::Label
+        class EnhancedLabel < Gtk::Label # :nodoc: all
           def set_text(text)
             super(text.gsub(/\n\t/, "\n" + (" " * 4)))
           end
         end
   
-        class FaultListItem < Gtk::ListItem
+        class FaultListItem < Gtk::ListItem # :nodoc: all
           attr_reader(:fault)
           def initialize(fault)
             super(fault.short_display)
diff --git a/lib/test/unit/ui/gtk2/testrunner.rb b/lib/test/unit/ui/gtk2/testrunner.rb
index b05549c0e8..3ee6ce87bd 100644
--- a/lib/test/unit/ui/gtk2/testrunner.rb
+++ b/lib/test/unit/ui/gtk2/testrunner.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Kenta MURATA.
 # Copyright:: Copyright (c) 2000-2002 Kenta MURATA. All rights reserved.
@@ -11,17 +11,17 @@ require "test/unit/ui/testrunnerutilities"
 module Test
   module Unit
     module UI
-      module GTK2
+      module GTK2 # :nodoc: all
 
         Gtk.init
 
-        class EnhancedLabel < Gtk::Label
+        class EnhancedLabel < Gtk::Label # :nodoc: all
           def set_text(text)
             super(text.gsub(/\n\t/, "\n    "))
           end
         end
 
-        class FaultList < Gtk::TreeView
+        class FaultList < Gtk::TreeView # :nodoc: all
           def initialize
             @faults = []
             @model = Gtk::ListStore.new(String, String)
@@ -56,7 +56,7 @@ module Test
         class TestRunner
           extend TestRunnerUtilities
 
-          def lazy_initialize(symbol)
+          def lazy_initialize(symbol) # :nodoc:
             if !instance_eval("defined?(@#{symbol})") then
               yield
             end
@@ -64,7 +64,7 @@ module Test
           end
           private :lazy_initialize
 
-          def status_entry
+          def status_entry # :nodoc:
             lazy_initialize(:status_entry) do
               @status_entry = Gtk::Entry.new
               @status_entry.editable = false
@@ -72,7 +72,7 @@ module Test
           end
           private :status_entry
 
-          def status_panel
+          def status_panel # :nodoc:
             lazy_initialize(:status_panel) do
               @status_panel = Gtk::HBox.new
               @status_panel.border_width = 10
@@ -81,7 +81,7 @@ module Test
           end
           private :status_panel
 
-          def fault_detail_label
+          def fault_detail_label # :nodoc:
             lazy_initialize(:fault_detail_label) do
               @fault_detail_label = EnhancedLabel.new("")
 #              style = Gtk::Style.new
@@ -95,7 +95,7 @@ module Test
           end
           private :fault_detail_label
 
-          def inner_detail_sub_panel
+          def inner_detail_sub_panel # :nodoc:
             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)
@@ -103,7 +103,7 @@ module Test
           end
           private :inner_detail_sub_panel
 
-          def outer_detail_sub_panel
+          def outer_detail_sub_panel # :nodoc:
             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)
@@ -111,7 +111,7 @@ module Test
           end
           private :outer_detail_sub_panel
 
-          def detail_scrolled_window
+          def detail_scrolled_window # :nodoc:
             lazy_initialize(:detail_scrolled_window) do
               @detail_scrolled_window = Gtk::ScrolledWindow.new
               @detail_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
@@ -122,7 +122,7 @@ module Test
           end
           private :detail_scrolled_window
 
-          def detail_panel
+          def detail_panel # :nodoc:
             lazy_initialize(:detail_panel) do
               @detail_panel = Gtk::HBox.new
               @detail_panel.border_width = 10
@@ -131,14 +131,14 @@ module Test
           end
           private :detail_panel
 
-          def fault_list
+          def fault_list # :nodoc:
             lazy_initialize(:fault_list) do
               @fault_list = FaultList.new
             end
           end
           private :fault_list
 
-          def list_scrolled_window
+          def list_scrolled_window # :nodoc:
             lazy_initialize(:list_scrolled_window) do
               @list_scrolled_window = Gtk::ScrolledWindow.new
               @list_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
@@ -149,7 +149,7 @@ module Test
           end
           private :list_scrolled_window
 
-          def list_panel
+          def list_panel # :nodoc:
             lazy_initialize(:list_panel) do
               @list_panel = Gtk::HBox.new
               @list_panel.border_width = 10
@@ -158,7 +158,7 @@ module Test
           end
           private :list_panel
 
-          def error_count_label
+          def error_count_label # :nodoc:
             lazy_initialize(:error_count_label) do
               @error_count_label = Gtk::Label.new("0")
               @error_count_label.justify = Gtk::JUSTIFY_LEFT
@@ -166,7 +166,7 @@ module Test
           end
           private :error_count_label
 
-          def failure_count_label
+          def failure_count_label # :nodoc:
             lazy_initialize(:failure_count_label) do
               @failure_count_label = Gtk::Label.new("0")
               @failure_count_label.justify = Gtk::JUSTIFY_LEFT
@@ -174,7 +174,7 @@ module Test
           end
           private :failure_count_label
 
-          def assertion_count_label
+          def assertion_count_label # :nodoc:
             lazy_initialize(:assertion_count_label) do
               @assertion_count_label = Gtk::Label.new("0")
               @assertion_count_label.justify = Gtk::JUSTIFY_LEFT
@@ -182,7 +182,7 @@ module Test
           end
           private :assertion_count_label
 
-          def run_count_label
+          def run_count_label # :nodoc:
             lazy_initialize(:run_count_label) do
               @run_count_label = Gtk::Label.new("0")
               @run_count_label.justify = Gtk::JUSTIFY_LEFT
@@ -190,7 +190,7 @@ module Test
           end
           private :run_count_label
           
-          def info_panel
+          def info_panel # :nodoc:
             lazy_initialize(:info_panel) do
               @info_panel = Gtk::HBox.new(false, 0)
               @info_panel.border_width = 10
@@ -206,7 +206,7 @@ module Test
           end # def info_panel
           private :info_panel
 
-          def green_style
+          def green_style # :nodoc:
             lazy_initialize(:green_style) do
               @green_style = Gtk::Style.new
               @green_style.set_bg(Gtk::STATE_PRELIGHT, 0x0000, 0xFFFF, 0x0000)
@@ -214,7 +214,7 @@ module Test
           end # def green_style
           private :green_style
           
-          def red_style
+          def red_style # :nodoc:
             lazy_initialize(:red_style) do
               @red_style = Gtk::Style.new
               @red_style.set_bg(Gtk::STATE_PRELIGHT, 0xFFFF, 0x0000, 0x0000)
@@ -222,7 +222,7 @@ module Test
           end # def red_style
           private :red_style
           
-          def test_progress_bar
+          def test_progress_bar # :nodoc:
             lazy_initialize(:test_progress_bar) {
               @test_progress_bar = Gtk::ProgressBar.new
               @test_progress_bar.fraction = 0.0
@@ -234,7 +234,7 @@ module Test
           end # def test_progress_bar
           private :test_progress_bar
           
-          def progress_panel
+          def progress_panel # :nodoc:
             lazy_initialize(:progress_panel) do
               @progress_panel = Gtk::HBox.new(false, 10)
               @progress_panel.border_width = 10
@@ -242,13 +242,13 @@ module Test
             end
           end # def progress_panel
 
-          def run_button
+          def run_button # :nodoc:
             lazy_initialize(:run_button) do
               @run_button = Gtk::Button.new("Run")
             end
           end # def run_button
 
-          def suite_name_entry
+          def suite_name_entry # :nodoc:
             lazy_initialize(:suite_name_entry) do
               @suite_name_entry = Gtk::Entry.new
               @suite_name_entry.editable = false
@@ -256,7 +256,7 @@ module Test
           end # def suite_name_entry
           private :suite_name_entry
 
-          def suite_panel
+          def suite_panel # :nodoc:
             lazy_initialize(:suite_panel) do
               @suite_panel = Gtk::HBox.new(false, 10)
               @suite_panel.border_width = 10
@@ -267,7 +267,7 @@ module Test
           end # def suite_panel
           private :suite_panel
 
-          def main_panel
+          def main_panel # :nodoc:
             lazy_initialize(:main_panel) do
               @main_panel = Gtk::VBox.new(false, 0)
               @main_panel.pack_start(suite_panel, false, false, 0)
@@ -280,7 +280,7 @@ module Test
           end # def main_panel
           private :main_panel
 
-          def main_window
+          def main_window # :nodoc:
             lazy_initialize(:main_window) do
               @main_window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
               @main_window.set_title("Test::Unit TestRunner")
@@ -291,7 +291,7 @@ module Test
           end # def main_window
           private :main_window
 
-          def setup_ui
+          def setup_ui # :nodoc:
             main_window.signal_connect("destroy", nil) { stop }
             main_window.show_all
             fault_list.selection.signal_connect("changed", nil) do
@@ -305,33 +305,33 @@ module Test
           end # def setup_ui
           private :setup_ui
 
-          def output_status(string)
+          def output_status(string) # :nodoc:
             status_entry.set_text(string)
           end # def output_status(string)
           private :output_status
 
-          def finished(elapsed_time)
+          def finished(elapsed_time) # :nodoc:
             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)
+          def test_started(test_name) # :nodoc:
             output_status("Running #{test_name}...")
           end # def test_started(test_name)
           private :test_started
 
-          def started(result)
+          def started(result) # :nodoc:
             @result = result
             output_status("Started...")
           end # def started(result)
           private :started
 
-          def test_finished(result)
+          def test_finished(result) # :nodoc:
             test_progress_bar.fraction += 1.0 / @count
           end # def test_finished(result)
 
-          def result_changed(result)
+          def result_changed(result) # :nodoc:
             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
@@ -339,23 +339,23 @@ module Test
           end # def result_changed(result)
           private :result_changed
 
-          def clear_fault
+          def clear_fault # :nodoc:
             raw_show_fault("")
           end # def clear_fault
           private :clear_fault
 
-          def raw_show_fault(string)
+          def raw_show_fault(string) # :nodoc:
             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)
+          def show_fault(fault) # :nodoc:
             raw_show_fault(fault.long_display)
           end # def show_fault(fault)
           private :show_fault
 
-          def add_fault(fault)
+          def add_fault(fault) # :nodoc:
             if not @red then
               test_progress_bar.style = red_style
               @red = true
@@ -364,7 +364,7 @@ module Test
           end # def add_fault(fault)
           private :add_fault
 
-          def reset_ui(count)
+          def reset_ui(count) # :nodoc:
             test_progress_bar.style = green_style
             test_progress_bar.fraction = 0.0
             @count = count + 1
@@ -379,7 +379,7 @@ module Test
           end # def reset_ui(count)
           private :reset_ui
 
-          def stop
+          def stop # :nodoc:
             Gtk.main_quit
           end # def stop
           private :stop
@@ -389,7 +389,7 @@ module Test
           end
           private :run_test
 
-          def start_ui
+          def start_ui # :nodoc
             @viewer.run
             running = false
             begin
@@ -457,6 +457,10 @@ module Test
             @viewer.join rescue nil # wait deadlock to handshake
           end # def initialize(suite)
 
+          def self.run(suite)
+            new(suite).start
+          end # def self.run(suite)
+
         end # class TestRunner
 
       end # module GTK2
diff --git a/lib/test/unit/ui/testrunnermediator.rb b/lib/test/unit/ui/testrunnermediator.rb
index d34510d1c6..4fad47a853 100644
--- a/lib/test/unit/ui/testrunnermediator.rb
+++ b/lib/test/unit/ui/testrunnermediator.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
@@ -10,7 +10,7 @@ require 'test/unit/testresult'
 
 module Test
   module Unit
-    module UI
+    module UI # :nodoc:
 
       # Provides an interface to write any given UI against,
       # hopefully making it easy to write new UIs.
diff --git a/lib/test/unit/ui/testrunnerutilities.rb b/lib/test/unit/ui/testrunnerutilities.rb
index 70b885bd6c..4c3148b8be 100644
--- a/lib/test/unit/ui/testrunnerutilities.rb
+++ b/lib/test/unit/ui/testrunnerutilities.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
@@ -24,11 +24,6 @@ module Test
 
       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.
diff --git a/lib/test/unit/ui/tk/testrunner.rb b/lib/test/unit/ui/tk/testrunner.rb
index 4d05f2fb22..2bd51deebb 100644
--- a/lib/test/unit/ui/tk/testrunner.rb
+++ b/lib/test/unit/ui/tk/testrunner.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Original Author:: Nathaniel Talbott.
 # Author:: Kazuhiro NISHIYAMA.
@@ -13,7 +13,7 @@ require 'test/unit/ui/testrunnerutilities'
 module Test
   module Unit
     module UI
-      module Tk
+      module Tk # :nodoc:
 
         # Runs a Test::Unit::TestSuite in a Tk UI. Obviously,
         # this one requires you to have Tk
@@ -21,6 +21,11 @@ module Test
         class TestRunner
           extend TestRunnerUtilities
 
+          # Creates a new TestRunner and runs the suite.
+          def self.run(suite)
+            new(suite).start
+          end
+
           # Creates a new TestRunner for running the passed
           # suite.
           def initialize(suite, output_level = NORMAL)
@@ -52,7 +57,7 @@ module Test
           end
 
           private
-          def setup_mediator
+          def setup_mediator # :nodoc:
             @mediator = TestRunnerMediator.new(@suite)
             suite_name = @suite.to_s
             if ( @suite.kind_of?(Module) )
@@ -61,7 +66,7 @@ module Test
             @suite_name_entry.value = suite_name
           end
 
-          def attach_to_mediator
+          def attach_to_mediator # :nodoc:
             @run_button.command(method(:run_test))
             @fault_list.bind('ButtonPress-1', proc{|y|
               fault = @fault_detail_list[@fault_list.nearest(y)]
@@ -81,7 +86,7 @@ module Test
             @runner.raise(@restart_signal)
           end
 
-          def start_ui
+          def start_ui # :nodoc:
             @viewer.run
             running = false
             begin
@@ -101,11 +106,11 @@ module Test
             end
           end
 
-          def stop
+          def stop # :nodoc:
             ::Tk.exit
           end
 
-          def reset_ui(count)
+          def reset_ui(count) # :nodoc:
             @test_total_count = count.to_f
             @test_progress_bar.configure('background'=>'green')
             @test_progress_bar.place('relwidth'=>(count.zero? ? 0 : 0/count))
@@ -121,7 +126,7 @@ module Test
             clear_fault
           end
 
-          def add_fault(fault)
+          def add_fault(fault) # :nodoc:
             if ( ! @red )
               @test_progress_bar.configure('background'=>'red')
               @red = true
@@ -130,19 +135,19 @@ module Test
             @fault_list.insert('end', fault.short_display)
           end
 
-          def show_fault(fault)
+          def show_fault(fault) # :nodoc:
             raw_show_fault(fault.long_display)
           end
 
-          def raw_show_fault(string)
+          def raw_show_fault(string) # :nodoc:
             @detail_text.value = string
           end
 
-          def clear_fault
+          def clear_fault # :nodoc:
             raw_show_fault("")
           end
 
-          def result_changed(result)
+          def result_changed(result) # :nodoc:
             @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
@@ -150,7 +155,7 @@ module Test
             @error_count_label.value = result.error_count
           end
 
-          def started(result)
+          def started(result) # :nodoc:
             @result = result
             output_status("Started...")
           end
@@ -163,11 +168,11 @@ module Test
             output_status("Finished in #{elapsed_time} seconds")
           end
 
-          def output_status(string)
+          def output_status(string) # :nodoc:
             @status_entry.value = string
           end
 
-          def setup_ui
+          def setup_ui # :nodoc:
             @status_entry = TkVariable.new
             l = TkLabel.new(nil, 'textvariable'=>@status_entry, 'relief'=>'sunken')
             l.pack('side'=>'bottom', 'fill'=>'x')
@@ -243,7 +248,7 @@ module Test
 	    end
           end
 
-          def create_count_label(parent, label)
+          def create_count_label(parent, label) # :nodoc:
             TkLabel.new(parent, 'text'=>label).pack('side'=>'left', 'expand'=>true)
             v = TkVariable.new(0)
             TkLabel.new(parent, 'textvariable'=>v).pack('side'=>'left', 'expand'=>true)
diff --git a/lib/test/unit/util/observable.rb b/lib/test/unit/util/observable.rb
index 3567d34271..f5066d3425 100644
--- a/lib/test/unit/util/observable.rb
+++ b/lib/test/unit/util/observable.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
@@ -8,7 +8,7 @@ require 'test/unit/util/procwrapper'
 
 module Test
   module Unit
-    module Util
+    module Util # :nodoc:
 
       # This is a utility class that allows anything mixing
       # it in to notify a set of listeners about interesting
@@ -80,7 +80,7 @@ module Test
         end
 
         private
-        def channels
+        def channels # :nodoc:
           @channels ||= {}
           return @channels
         end
diff --git a/lib/test/unit/util/procwrapper.rb b/lib/test/unit/util/procwrapper.rb
index ad7252186d..fea66d7671 100644
--- a/lib/test/unit/util/procwrapper.rb
+++ b/lib/test/unit/util/procwrapper.rb
@@ -1,4 +1,4 @@
-#--
+# :nodoc:
 #
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
@@ -25,11 +25,11 @@ module Test
           @hash = a_proc.inspect.sub(/^(#<#{a_proc.class}:)/){''}.sub(/(>)$/){''}.hex
         end
 
-        def hash
+        def hash # :nodoc:
           return @hash
         end
 
-        def ==(other)
+        def ==(other) # :nodoc:
           case(other)
             when ProcWrapper
               return @a_proc == other.to_proc
@@ -39,7 +39,7 @@ module Test
         end
         alias :eql? :==
 
-        def to_proc
+        def to_proc # :nodoc:
           return @a_proc
         end
       end
diff --git a/lib/thread.rb b/lib/thread.rb
index 7df6a140f5..3baa951522 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -1,8 +1,4 @@
 #
-# 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>
@@ -16,10 +12,18 @@ unless defined? Thread
   fail "Thread not available for this ruby interpreter"
 end
 
+unless defined? ThreadError
+  class ThreadError<StandardError
+  end
+end
+
+if $DEBUG
+  Thread.abort_on_exception = true
+end
+
 class Thread
   #
-  # Wraps a block in Thread.critical, restoring the original value upon exit
-  # from the critical section.
+  # FIXME: not documented in Pickaxe or Nutshell.
   #
   def Thread.exclusive
     _old = Thread.critical
@@ -33,7 +37,7 @@ class Thread
 end
 
 #
-# Mutex implements a simple semaphore that can be used to coordinate access to
+# +Mutex+ implements a simple semaphore that can be used to coordinate access to
 # shared data from multiple concurrent threads.
 #
 # Example:
@@ -54,9 +58,6 @@ end
 #   }
 #
 class Mutex
-  #
-  # Creates a new Mutex
-  #
   def initialize
     @waiting = []
     @locked = false;
@@ -122,7 +123,7 @@ class Mutex
 
   #
   # Obtains a lock, runs the block, and releases the lock when the block
-  # completes.  See the example under Mutex.
+  # completes.  See the example under +Mutex+.
   #
   def synchronize
     lock
@@ -134,8 +135,7 @@ class Mutex
   end
 
   #
-  # If the mutex is locked, unlocks the mutex, wakes one waiting thread, and
-  # yields in a critical section.
+  # FIXME: not documented in Pickaxe/Nutshell.
   #
   def exclusive_unlock
     return unless @locked
@@ -154,9 +154,9 @@ class Mutex
 end
 
 # 
-# ConditionVariable objects augment class Mutex. Using condition variables,
+# +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.
+# resource becomes available (see the discussion on page 117).
 #
 # Example:
 #
@@ -181,9 +181,6 @@ end
 #   }
 #
 class ConditionVariable
-  #
-  # Creates a new ConditionVariable
-  #
   def initialize
     @waiters = []
   end
@@ -192,14 +189,11 @@ class ConditionVariable
   # 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
+    mutex.exclusive_unlock do
+      @waiters.push(Thread.current)
+      Thread.stop
     end
+    mutex.lock
   end
   
   #
@@ -233,31 +227,10 @@ class ConditionVariable
 end
 
 #
-# This class provides a way to synchronize communication between threads.
+# This class provides a way to communicate data 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
+# TODO: an example (code or English) would really help here.  How do you set up
+# a queue between two threads?
 #
 class Queue
   #
@@ -290,15 +263,7 @@ class Queue
     rescue ThreadError
     end
   end
-
-  #
-  # Alias of push
-  #
   alias << push
-
-  #
-  # Alias of push
-  #
   alias enq push
 
   #
@@ -316,15 +281,7 @@ class Queue
   ensure
     Thread.critical = false
   end
-
-  #
-  # Alias of pop
-  #
   alias shift pop
-
-  #
-  # Alias of pop
-  #
   alias deq pop
 
   #
@@ -351,7 +308,9 @@ class Queue
   #
   # Alias of length.
   #
-  alias size length
+  def size
+    length
+  end
 
   #
   # Returns the number of threads waiting on the queue.
@@ -362,11 +321,9 @@ class Queue
 end
 
 #
-# This class represents queues of specified size capacity.  The push operation
+# 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+.
@@ -410,10 +367,6 @@ class SizedQueue<Queue
     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
@@ -423,20 +376,9 @@ class SizedQueue<Queue
     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
@@ -456,24 +398,20 @@ class SizedQueue<Queue
     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:
+#  - SizedQueue #push and #pop deserve some documentation, as they are different
+#    from the Queue implementations.
+#  - Some methods are not documented in Pickaxe/Nutshell, and are therefore not
+#    documented here.  See FIXME notes.
+#  - Reference to Pickaxe page numbers should be replaced with either a section
+#    name or a summary.
+#  - How do you document aliases?
 #  - How do you make RDoc inherit documentation from superclass?
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 95d294a85d..4512209604 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -117,11 +117,8 @@ class ThreadsWait
     @threads.concat threads
     for th in threads
       Thread.start(th) do |t|
-	begin
-	  t.join
-	ensure
-	  @wait_queue.push t
-	end
+	t.join
+	@wait_queue.push t
       end
     end
   end
@@ -161,7 +158,7 @@ ThWait = ThreadsWait
 
 
 # Documentation comments:
-#  - Source of documentation is evenly split between Nutshell, existing
+#  - Source of doumentation 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
diff --git a/lib/time.rb b/lib/time.rb
index a37a067390..9d2ac558d9 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -7,13 +7,13 @@
 #   * 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)
+#   * various formats handled by ParseDate (string to time only)
 # 
 # == Design Issues
 # 
 # === Specialized interface
 # 
-# This library provides methods dedicated to special purposes:
+# This library provides methods dedicated to special puposes:
 # * RFC 2822, RFC 2616 and XML Schema.
 # * They makes usual life easier.
 # 
@@ -60,13 +60,13 @@ class Time
       '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.
+      # See RFC 1123 and RFC 2822 for the error of 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=self.now.year)
+    def zone_offset(zone, year=Time.now.year)
       off = nil
       zone = zone.upcase
       if /\A([+-])(\d\d):?(\d\d)\z/ =~ zone
@@ -75,119 +75,16 @@ class Time
         off = zone.to_i * 3600
       elsif ZoneOffset.include?(zone)
         off = ZoneOffset[zone] * 3600
-      elsif ((t = self.local(year, 1, 1)).zone.upcase == zone rescue false)
+      elsif ((t = Time.local(year, 1, 1)).zone.upcase == zone rescue false)
         off = t.utc_offset
-      elsif ((t = self.local(year, 7, 1)).zone.upcase == zone rescue false)
+      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 = self.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.
+    # Parses +date+ using ParseDate.parsedate and converts it to a Time object.
     #
     # If a block is given, the year described in +date+ is converted by the
     # block.  For example:
@@ -225,7 +122,7 @@ class Time
     # 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
+    # ArgumentError is raised if ParseDate 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:
@@ -236,11 +133,38 @@ class Time
     #
     # A failure for Time.parse should be checked, though.
     #
-    def parse(date, now=self.now)
-      d = Date._parse(date, false)
-      year = d[:year]
+    def parse(date, now=Time.now)
+      year, mon, day, hour, min, sec, zone, _ = ParseDate.parsedate(date)
       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)
+
+      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
+        end until true
+      end
+
+      year ||= 1970
+      mon ||= 1
+      day ||= 1
+      hour ||= 0
+      min ||= 0
+      sec ||= 0
+
+      off = nil
+      off = zone_offset(zone, year) if zone
+
+      if off
+        t = Time.utc(year, mon, day, hour, min, sec) - off
+        t.localtime if off != 0
+        t
+      else
+        Time.local(year, mon, day, hour, min, sec)
+      end
     end
 
     MonthValue = {
@@ -287,11 +211,10 @@ class Time
                  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
+        t = Time.utc(year, mon, day, hour, min, sec)
+        offset = zone_offset(zone)
+	t = (t - offset).localtime if offset != 0 || zone == '+0000'
+	t
       else
         raise ArgumentError.new("not RFC 2822 compliant date: #{date.inspect}")
       end
@@ -316,14 +239,14 @@ class Time
           (\d{2}):(\d{2}):(\d{2})\x20
           GMT
           \s*\z/ix =~ date
-        self.rfc2822(date)
+        Time.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)
+        Time.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
@@ -331,7 +254,7 @@ class Time
              (\d\d):(\d\d):(\d\d)\x20
              (\d{4})
              \s*\z/ix =~ date
-        self.utc($6.to_i, MonthValue[$1.upcase], $2.to_i,
+        Time.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}")
@@ -356,22 +279,13 @@ class Time
           (\.\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[1..-1] + '000000')[0,6].to_i if $7
-        if $8
-          zone = $8
-          year, mon, day, hour, min, sec =
-            apply_offset(year, mon, day, hour, min, sec, zone_offset(zone))
-          self.utc(year, mon, day, hour, min, sec, usec)
-        else
-          self.local(year, mon, day, hour, min, sec, usec)
-        end
+	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
@@ -439,7 +353,7 @@ class Time
   # 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.
+  # Its default value os 0.
   #
   def xmlschema(fraction_digits=0)
     sprintf('%d-%02d-%02dT%02d:%02d:%02d',
@@ -478,32 +392,26 @@ if __FILE__ == $0
                    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(1969, 2, 13, 23, 32, 54) + 3 * 3600 + 30 * 60,
+                   Time.rfc2822("Thu, 13 Feb 1969 23:32:54 -0330"))
       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(1969, 2, 13, 23, 32, 0) + 3 * 3600 + 30 * 60,
+                   Time.rfc2822(" Thu,
+      13
+        Feb
+          1969
+      23:32
+               -0330 (Newfoundland Time)"))
       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) {
+      assert_raises(ArgumentError) {
         # inner comment is not supported.
         Time.rfc2822("Fri, 21 Nov 1997 09(comment):   55  :  06 -0600")
       }
@@ -551,15 +459,9 @@ if __FILE__ == $0
       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
+      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
 
     # http://www.w3.org/TR/xmlschema-2/
@@ -597,7 +499,7 @@ if __FILE__ == $0
       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"))
+		   Time.xmlschema("2001-04-17T19:23:17.3Z"))
     end
 
     def test_encode_xmlschema
@@ -613,16 +515,8 @@ if __FILE__ == $0
       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
-
-      assert_equal(249, Time.xmlschema("2008-06-05T23:49:23.000249+09:00").usec)
+      t = Time.utc(1960, 12, 31, 23, 0, 0, 123456)
+      assert_equal("1960-12-31T23:00:00.123456Z", t.xmlschema(6))
     end
 
     def test_completion
@@ -640,160 +534,66 @@ if __FILE__ == $0
 
     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") }
+      assert_raises(ArgumentError) { Time.httpdate("1 Dec 2001 10:23:57 GMT") }
+      assert_raises(ArgumentError) { Time.httpdate("Sat, 1 Dec 2001 10:25:42 GMT") }
+      assert_raises(ArgumentError) { Time.httpdate("Sat,  1-Dec-2001 10:53:55 GMT") }
+      assert_raises(ArgumentError) { Time.httpdate("Saturday, 01-Dec-2001 10:15:34 GMT") }
+      assert_raises(ArgumentError) { Time.httpdate("Saturday, 01-Dec-101 11:10:07 GMT") }
+      assert_raises(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)
+      assert_raises(ArgumentError) { Time.rfc2822("01-5-20") }
+      assert_raises(ArgumentError) { Time.rfc2822("7/21/00") }
+      assert_raises(ArgumentError) { Time.rfc2822("2001-8-28") }
+      assert_raises(ArgumentError) { Time.rfc2822("00-5-6 1:13:06") }
+      assert_raises(ArgumentError) { Time.rfc2822("2001-9-27 9:36:49") }
+      assert_raises(ArgumentError) { Time.rfc2822("2000-12-13 11:01:11") }
+      assert_raises(ArgumentError) { Time.rfc2822("2001/10/17 04:29:55") }
+      assert_raises(ArgumentError) { Time.rfc2822("9/4/2001 9:23:19 PM") }
+      assert_raises(ArgumentError) { Time.rfc2822("01 Nov 2001 09:04:31") }
+      assert_raises(ArgumentError) { Time.rfc2822("13 Feb 2001 16:4 GMT") }
+      assert_raises(ArgumentError) { Time.rfc2822("01 Oct 00 5:41:19 PM") }
+      assert_raises(ArgumentError) { Time.rfc2822("2 Jul 00 00:51:37 JST") }
+      assert_raises(ArgumentError) { Time.rfc2822("01 11 2001 06:55:57 -0500") }
+      assert_raises(ArgumentError) { Time.rfc2822("18 \343\366\356\341\370 2000") }
+      assert_raises(ArgumentError) { Time.rfc2822("Fri, Oct 2001  18:53:32") }
+      assert_raises(ArgumentError) { Time.rfc2822("Fri, 2 Nov 2001 03:47:54") }
+      assert_raises(ArgumentError) { Time.rfc2822("Fri, 27 Jul 2001 11.14.14 +0200") }
+      assert_raises(ArgumentError) { Time.rfc2822("Thu, 2 Nov 2000 04:13:53 -600") }
+      assert_raises(ArgumentError) { Time.rfc2822("Wed, 5 Apr 2000 22:57:09 JST") }
+      assert_raises(ArgumentError) { Time.rfc2822("Mon, 11 Sep 2000 19:47:33 00000") }
+      assert_raises(ArgumentError) { Time.rfc2822("Fri, 28 Apr 2000 20:40:47 +-900") }
+      assert_raises(ArgumentError) { Time.rfc2822("Fri, 19 Jan 2001 8:15:36 AM -0500") }
+      assert_raises(ArgumentError) { Time.rfc2822("Thursday, Sep 27 2001 7:42:35 AM EST") }
+      assert_raises(ArgumentError) { Time.rfc2822("3/11/2001 1:31:57 PM Pacific Daylight Time") }
+      assert_raises(ArgumentError) { Time.rfc2822("Mi, 28 Mrz 2001 11:51:36") }
+      assert_raises(ArgumentError) { Time.rfc2822("P, 30 sept 2001 23:03:14") }
+      assert_raises(ArgumentError) { Time.rfc2822("fr, 11 aug 2000 18:39:22") }
+      assert_raises(ArgumentError) { Time.rfc2822("Fr, 21 Sep 2001 17:44:03 -1000") }
+      assert_raises(ArgumentError) { Time.rfc2822("Mo, 18 Jun 2001 19:21:40 -1000") }
+      assert_raises(ArgumentError) { Time.rfc2822("l\366, 12 aug 2000 18:53:20") }
+      assert_raises(ArgumentError) { Time.rfc2822("l\366, 26 maj 2001 00:15:58") }
+      assert_raises(ArgumentError) { Time.rfc2822("Dom, 30 Sep 2001 17:36:30") }
+      assert_raises(ArgumentError) { Time.rfc2822("%&, 31 %2/ 2000 15:44:47 -0500") }
+      assert_raises(ArgumentError) { Time.rfc2822("dom, 26 ago 2001 03:57:07 -0300") }
+      assert_raises(ArgumentError) { Time.rfc2822("ter, 04 set 2001 16:27:58 -0300") }
+      assert_raises(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
+      assert_raises(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
+      assert_raises(ArgumentError) { Time.rfc2822("ele, 11 h: 2000 12:42:15 -0500") }
+      assert_raises(ArgumentError) { Time.rfc2822("Tue, 14 Aug 2001 3:55:3 +0200") }
+      assert_raises(ArgumentError) { Time.rfc2822("Fri, 25 Aug 2000 9:3:48 +0800") }
+      assert_raises(ArgumentError) { Time.rfc2822("Fri, 1 Dec 2000 0:57:50 EST") }
+      assert_raises(ArgumentError) { Time.rfc2822("Mon, 7 May 2001 9:39:51 +0200") }
+      assert_raises(ArgumentError) { Time.rfc2822("Wed, 1 Aug 2001 16:9:15 +0200") }
+      assert_raises(ArgumentError) { Time.rfc2822("Wed, 23 Aug 2000 9:17:36 +0800") }
+      assert_raises(ArgumentError) { Time.rfc2822("Fri, 11 Aug 2000 10:4:42 +0800") }
+      assert_raises(ArgumentError) { Time.rfc2822("Sat, 15 Sep 2001 13:22:2 +0300") }
+      assert_raises(ArgumentError) { Time.rfc2822("Wed,16 \276\305\324\302 2001 20:06:25 +0800") }
+      assert_raises(ArgumentError) { Time.rfc2822("Wed,7 \312\256\322\273\324\302 2001 23:47:22 +0800") }
+      assert_raises(ArgumentError) { Time.rfc2822("=?iso-8859-1?Q?(=C5=DA),?= 10   2 2001 23:32:26 +0900 (JST)") }
+      assert_raises(ArgumentError) { Time.rfc2822("\307\341\314\343\332\311, 30 \344\346\335\343\310\321 2001 10:01:06") }
+      assert_raises(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
   end
+
 end
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 5a99c28092..5c6a72652a 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -1,58 +1,40 @@
-#--
-# = timeout.rb
 #
-# execution timeout
+# timeout.rb -- execution timeout
 #
-# = Copyright
+# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+# Copyright (C) 2000  Information-technology Promotion Agency, Japan
 #
-# Copyright:: (C) 2000  Network Applied Communication Laboratory, Inc.
-# Copyright:: (C) 2000  Information-technology Promotion Agency, Japan
+#= SYNOPSIS
 #
-#++
+#   require 'timeout'
+#   status = timeout(5) {
+#     # something may take time
+#   }
 #
-# = Description
+#= 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.
+# timeout executes the block.  If the block execution terminates successfully
+# before timeout, it returns true.  If not, it terminates the execution and
+# raise TimeoutError exception.
 #
-# Previous versions of timeout didn't use a module for namespace. This version
-# provides both Timeout.timeout, and a backwards-compatible #timeout.
+#== Parameters
 #
-# = Synopsis
+#  : timout
 #
-#   require 'timeout'
-#   status = Timeout::timeout(5) {
-#     # Something that should be interrupted if it takes too much time...
-#   }
+#    The time in seconds to wait for block teminatation.   
+#
+#  : [exception]
 #
+#    The exception classs to be raised on timeout.
+#
+#=end
 
 module Timeout
-
-  ##
-  # Raised by Timeout#timeout when the block times out.
-
-  class Error < Interrupt
+  class Error<Interrupt
   end
-  class ExitException < ::Exception # :nodoc:
-  end
-
-  THIS_FILE = /\A#{Regexp.quote(__FILE__)}:/o
-  CALLER_OFFSET = ((c = caller[0]) && THIS_FILE =~ c) ? 1 : 0
 
-  ##
-  # 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, klass = nil)
+  def timeout(sec, exception=Error)
     return yield if sec == nil or sec.zero?
-    raise ThreadError, "timeout within critical session" if Thread.critical
-    exception = klass || Class.new(ExitException)
     begin
       x = Thread.current
       y = Thread.start {
@@ -61,43 +43,18 @@ module Timeout
       }
       yield sec
       #    return true
-    rescue exception => e
-      rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o
-      (bt = e.backtrace).reject! {|m| rej =~ m}
-      level = -caller(CALLER_OFFSET).size
-      while THIS_FILE =~ bt[level]
-        bt.delete_at(level)
-        level += 1
-      end
-      raise if klass            # if exception class is specified, it
-                                # would be expected outside.
-      raise Error, e.message, e.backtrace
     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 = nil, &block) # :nodoc:
+# compatible
+def timeout(n, e=Timeout::Error, &block)
   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:
+TimeoutError = Timeout::Error
 
 if __FILE__ == $0
   p timeout(5) {
@@ -119,4 +76,3 @@ if __FILE__ == $0
     }
   }
 end
-
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index 2e82aa528e..bee99c41cb 100644
--- a/lib/tmpdir.rb
+++ b/lib/tmpdir.rb
@@ -4,38 +4,26 @@
 # $Id$
 #
 
-require 'fileutils'
-
 class Dir
 
   @@systmpdir = '/tmp'
 
   begin
     require 'Win32API'
-    CSIDL_LOCAL_APPDATA = 0x001c
     max_pathlen = 260
     windir = ' '*(max_pathlen+1)
     begin
-      getdir = Win32API.new('shell32', 'SHGetFolderPath', 'LLLLP', 'L')
-      raise RuntimeError if getdir.call(0, CSIDL_LOCAL_APPDATA, 0, 0, windir) != 0
-      windir = File.expand_path(windir.rstrip)
+      getdir = Win32API.new('kernel32', 'GetSystemWindowsDirectory', 'PL', 'L')
     rescue RuntimeError
-      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])
+      getdir = Win32API.new('kernel32', 'GetWindowsDirectory', 'PL', 'L')
     end
-    temp = File.join(windir.untaint, 'temp')
+    getdir.call(windir, windir.size)
+    windir = File.expand_path(windir.rstrip.untaint)
+    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
@@ -48,90 +36,7 @@ class Dir
 	  break
 	end
       end
-      File.expand_path(tmp)
-    end
-  end
-
-  # Dir.mktmpdir creates a temporary directory.
-  #
-  # The directory is created with 0700 permission.
-  #
-  # The prefix and suffix of the name of the directory is specified by
-  # the optional first argument, <i>prefix_suffix</i>.
-  # - If it is not specified or nil, "d" is used as the prefix and no suffix is used.
-  # - If it is a string, it is used as the prefix and no suffix is used.
-  # - If it is an array, first element is used as the prefix and second element is used as a suffix.
-  #
-  #  Dir.mktmpdir {|dir| dir is ".../d..." }
-  #  Dir.mktmpdir("foo") {|dir| dir is ".../foo..." }
-  #  Dir.mktmpdir(["foo", "bar"]) {|dir| dir is ".../foo...bar" }
-  #
-  # The directory is created under Dir.tmpdir or
-  # the optional second argument <i>tmpdir</i> if non-nil value is given.
-  #
-  #  Dir.mktmpdir {|dir| dir is "#{Dir.tmpdir}/d..." }
-  #  Dir.mktmpdir(nil, "/var/tmp") {|dir| dir is "/var/tmp/d..." }
-  #
-  # If a block is given,
-  # it is yielded with the path of the directory.
-  # The directory and its contents are removed
-  # using FileUtils.remove_entry_secure before Dir.mktmpdir returns.
-  # The value of the block is returned.
-  #
-  #  Dir.mktmpdir {|dir|
-  #    # use the directory...
-  #    open("#{dir}/foo", "w") { ... }
-  #  }
-  #
-  # If a block is not given,
-  # The path of the directory is returned.
-  # In this case, Dir.mktmpdir doesn't remove the directory.
-  #
-  #  dir = Dir.mktmpdir
-  #  begin
-  #    # use the directory...
-  #    open("#{dir}/foo", "w") { ... }
-  #  ensure
-  #    # remove the directory.
-  #    FileUtils.remove_entry_secure dir
-  #  end
-  #
-  def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
-    case prefix_suffix
-    when nil
-      prefix = "d"
-      suffix = ""
-    when String
-      prefix = prefix_suffix
-      suffix = ""
-    when Array
-      prefix = prefix_suffix[0]
-      suffix = prefix_suffix[1]
-    else
-      raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
-    end
-    tmpdir ||= Dir.tmpdir
-    t = Time.now.strftime("%Y%m%d")
-    n = nil
-    begin
-      path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-      path << "-#{n}" if n
-      path << suffix
-      Dir.mkdir(path, 0700)
-    rescue Errno::EEXIST
-      n ||= 0
-      n += 1
-      retry
-    end
-
-    if block_given?
-      begin
-        yield path
-      ensure
-        FileUtils.remove_entry_secure path
-      end
-    else
-      path
     end
+    File.expand_path(tmp)
   end
 end
diff --git a/lib/tracer.rb b/lib/tracer.rb
index 71aa49c306..3ccf1b5017 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -24,6 +24,8 @@ class Tracer
     attr :stdout, true
   end
   
+  MY_FILE_NAME = caller(0)[0].scan(/^(.*):[0-9]+$/)[0][0]
+  
   EVENT_SYMBOL = {
     "line" => "-",
     "call" => ">",
@@ -95,7 +97,6 @@ class Tracer
 	SCRIPT_LINES__[file] = list = []
       end
     end
-
     if l = list[line - 1]
       l
     else
@@ -112,7 +113,7 @@ class Tracer
   end
   
   def trace_func(event, file, line, id, binding, klass, *)
-    return if file == __FILE__
+    return if file == MY_FILE_NAME
     
     for p in @filters
       return unless p.call event, file, line, id, binding, klass
@@ -155,13 +156,15 @@ end
 
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 
-if $0 == __FILE__
-  # direct call
+if caller(0).size == 1
+  if $0 == Tracer::MY_FILE_NAME
+    # direct call
     
-  $0 = ARGV[0]
-  ARGV.shift
-  Tracer.on
-  require $0
-elsif caller(0).size == 1
-  Tracer.on
+    $0 = ARGV[0]
+    ARGV.shift
+    Tracer.on
+    require $0
+  else
+    Tracer.on
+  end
 end
diff --git a/lib/tsort.rb b/lib/tsort.rb
index a014e7f6c2..5efd6480d3 100644
--- a/lib/tsort.rb
+++ b/lib/tsort.rb
@@ -8,11 +8,10 @@
 # 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 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.
@@ -31,82 +30,82 @@
 # 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]]
+#  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')
+#  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
 #
@@ -245,7 +244,7 @@ end
 if __FILE__ == $0
   require 'test/unit'
 
-  class TSortHash < Hash # :nodoc:
+  class Hash # :nodoc:
     include TSort
     alias tsort_each_node each_key
     def tsort_each_child(node, &block)
@@ -253,7 +252,7 @@ if __FILE__ == $0
     end
   end
 
-  class TSortArray < Array # :nodoc:
+  class Array # :nodoc:
     include TSort
     alias tsort_each_node each_index
     def tsort_each_child(node, &block)
@@ -263,24 +262,24 @@ if __FILE__ == $0
 
   class TSortTest < Test::Unit::TestCase # :nodoc:
     def test_dag
-      h = TSortHash[{1=>[2, 3], 2=>[3], 3=>[]}]
+      h = {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=>[]}]
+      h = {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 }
+      assert_raises(TSort::Cyclic) { h.tsort }
     end
 
     def test_array
-      a = TSortArray[[1], [0], [0], [2]]
+      a = [[1], [0], [0], [2]]
       assert_equal([[0, 1], [2], [3]],
         a.strongly_connected_components.map {|nodes| nodes.sort})
 
-      a = TSortArray[[], [0]]
+      a = [[], [0]]
       assert_equal([[0], [1]],
         a.strongly_connected_components.map {|nodes| nodes.sort})
     end
diff --git a/lib/un.rb b/lib/un.rb
index 9bf6c13146..c665f659b1 100644
--- a/lib/un.rb
+++ b/lib/un.rb
@@ -21,19 +21,20 @@
 #   ruby -run -e touch -- [OPTION] FILE
 #   ruby -run -e help [COMMAND]
 
-require "fileutils"
-require "optparse"
+require 'fileutils'
+require 'getopts'
 
 module FileUtils
-#  @fileutils_label = ""
+#  @fileutils_label = ''
   @fileutils_output = $stdout
 end
 
 def setup(options = "")
+  options += "v"
   ARGV.map! do |x|
     case x
     when /^-/
-      x.delete "^-#{options}v"
+      x.delete "^-#{options}"
     when /[*?\[{]/
       Dir[x]
     else
@@ -41,18 +42,13 @@ def setup(options = "")
     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
+  ARGV.delete_if{|x| x == '-'}
+  getopts(options)
+  options = {}
+  options[:verbose] = true if $OPT["v"]
+  options[:force] = true if $OPT["f"]
+  options[:preserve] = true if $OPT["p"]
+  yield ARGV, options, $OPT
 end
 
 ##
@@ -66,10 +62,9 @@ end
 #
 
 def cp
-  setup("pr") do |argv, options|
+  setup("pr") do |argv, options, opt|
     cmd = "cp"
-    cmd += "_r" if options.delete :r
-    options[:preserve] = true if options.delete :p
+    cmd += "_r" if opt["r"]
     dest = argv.pop
     argv = argv[0] if argv.size == 1
     FileUtils.send cmd, argv, dest, options
@@ -87,10 +82,9 @@ end
 #
 
 def ln
-  setup("sf") do |argv, options|
+  setup("sf") do |argv, options, opt|
     cmd = "ln"
-    cmd += "_s" if options.delete :s
-    options[:force] = true if options.delete :f
+    cmd += "_s" if opt["s"]
     dest = argv.pop
     argv = argv[0] if argv.size == 1
     FileUtils.send cmd, argv, dest, options
@@ -124,10 +118,9 @@ end
 #
 
 def rm
-  setup("fr") do |argv, options|
+  setup("fr") do |argv, options, opt|
     cmd = "rm"
-    cmd += "_r" if options.delete :r
-    options[:force] = true if options.delete :f
+    cmd += "_r" if opt["r"]
     FileUtils.send cmd, argv, options
   end
 end
@@ -142,9 +135,9 @@ end
 #
 
 def mkdir
-  setup("p") do |argv, options|
+  setup("p") do |argv, options, opt|
     cmd = "mkdir"
-    cmd += "_p" if options.delete :p
+    cmd += "_p" if options.delete :preserve
     FileUtils.send cmd, argv, options
   end
 end
@@ -175,9 +168,8 @@ end
 #
 
 def install
-  setup("pm:") do |argv, options|
-    options[:mode] = (mode = options.delete :m) ? mode.oct : 0755
-    options[:preserve] = true if options.delete :p
+  setup("pm:") do |argv, options, opt|
+    options[:mode] = opt["m"] ? opt["m"].oct : 0755
     dest = argv.pop
     argv = argv[0] if argv.size == 1
     FileUtils.install argv, dest, options
diff --git a/lib/uri.rb b/lib/uri.rb
index f7110f18fd..fe1fdbe571 100644
--- a/lib/uri.rb
+++ b/lib/uri.rb
@@ -1,29 +1,41 @@
 #
-# URI support for Ruby
+# $Id$
 #
-# 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
+# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+# You can redistribute it and/or modify it under the same term as Ruby.
 #
 
+=begin
+
+  Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+  You can redistribute it and/or modify it under the same term as Ruby.
+
+= URI - URI support for Ruby
+
+=end
+
 module URI
-  # :stopdoc:
   VERSION_CODE = '000911'.freeze
   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
-  # :startdoc:
-
 end
 
+=begin
+
+== Components
+
+  * ((<URI>)) Module
+  * ((<URI::Generic>)) Class
+  * ((<URI::FTP>)) Class
+  * ((<URI::HTTP>)) Class
+  * ((<URI::HTTPS>)) Class
+  * ((<URI::LDAP>)) Class
+  * ((<URI::MailTo>)) Class
+
+=end
 require 'uri/common'
 require 'uri/generic'
 require 'uri/ftp'
 require 'uri/http'
 require 'uri/https'
 require 'uri/ldap'
-require 'uri/ldaps'
 require 'uri/mailto'
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index af6aaf26fb..fbb3558a32 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -1,19 +1,19 @@
-# = 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.
+# $Id$
 #
+# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+# You can redistribute it and/or modify it under the same term as Ruby.
+#
+
+=begin
+
+== URI
+
+=end
 
 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)
@@ -88,9 +88,9 @@ module URI
       # host          = hostname | IPv4address | IPv6reference (RFC 2732)
       HOST = "(?:#{HOSTNAME}|#{IPV4ADDR}|#{IPV6REF})"
       # port          = *digit
-      PORT = '\d*'
+      PORT = "\d*"
       # hostport      = host [ ":" port ]
-      HOSTPORT = "#{HOST}(?::#{PORT})?"
+      HOSTPORT = "#{HOST}(?:#{PORT})?"
 
       # userinfo      = *( unreserved | escaped |
       #                    ";" | ":" | "&" | "=" | "+" | "$" | "," )
@@ -110,7 +110,7 @@ module URI
       SERVER = "(?:#{USERINFO}@)?#{HOSTPORT}"
       # reg_name      = 1*( unreserved | escaped | "$" | "," |
       #                     ";" | ":" | "@" | "&" | "=" | "+" )
-      REG_NAME = "(?:[#{UNRESERVED}$,;:@&=+]|#{ESCAPED})+"
+      REG_NAME = "(?:[#{UNRESERVED}$,;+@&=+]|#{ESCAPED})+"
       # authority     = server | reg_name
       AUTHORITY = "(?:#{SERVER}|#{REG_NAME})"
 
@@ -143,23 +143,23 @@ module URI
 
       # 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)
+	(#{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 = "
         (?:
@@ -179,16 +179,13 @@ module URI
         (?:\\?(#{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
+			 Regexp::EXTENDED, 'N').freeze
     REL_URI = Regexp.new('^' + PATTERN::X_REL_URI + '$', #'
-                         Regexp::EXTENDED, 'N').freeze
+			 Regexp::EXTENDED, 'N').freeze
 
     # for URI::extract
     URI_REF     = Regexp.new(PATTERN::URI_REF, false, 'N').freeze
@@ -198,7 +195,7 @@ module URI
     # for URI::escape/unescape
     ESCAPED = Regexp.new(PATTERN::ESCAPED, false, 'N').freeze
     UNSAFE  = Regexp.new("[^#{PATTERN::UNRESERVED}#{PATTERN::RESERVED}]",
-                         false, 'N').freeze
+			 false, 'N').freeze
 
     # for Generic#initialize
     SCHEME   = Regexp.new("^#{PATTERN::SCHEME}$", false, 'N').freeze #"
@@ -211,33 +208,32 @@ module URI
     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:
+  module Util
     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
+	  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
+	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(', ')})"
+	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
 
@@ -249,76 +245,24 @@ module URI
   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')
+	# 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
+	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
+	$&[1,2].hex.chr
       end
     end
     alias decode unescape
@@ -328,55 +272,20 @@ module URI
   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]
-  #
+  class InvalidURIError < Error; end # it is not URI.
+  class InvalidComponentError < Error; end # it is not component of URI.
+  class BadURIError < Error; end # the URI is valid but it is bad for the position.
+
+=begin
+
+=== Methods
+
+--- URI::split(uri)
+
+=end
+
   def self.split(uri)
     case uri
     when ''
@@ -384,7 +293,7 @@ module URI
 
     when ABS_URI
       scheme, opaque, userinfo, host, port, 
-        registry, path, query, fragment = $~[1..-1]
+	registry, path, query, fragment = $~[1..-1]
 
       # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
 
@@ -399,12 +308,12 @@ module URI
       # server        = [ [ userinfo "@" ] hostport ]
 
       if !scheme
-        raise InvalidURIError, 
-          "bad URI(absolute but no scheme): #{uri}"
+	raise InvalidURIError, 
+	  "bad URI(absolute but no scheme): #{uri}"
       end
       if !opaque && (!path && (!host && !registry))
-        raise InvalidURIError,
-          "bad URI(absolute but no path): #{uri}" 
+	raise InvalidURIError,
+	  "bad URI(absolute but no path): #{uri}" 
       end
 
     when REL_URI
@@ -412,13 +321,13 @@ module URI
       opaque = nil
 
       userinfo, host, port, registry, 
-        rel_segment, abs_path, query, fragment = $~[1..-1]
+	rel_segment, abs_path, query, fragment = $~[1..-1]
       if rel_segment && abs_path
-        path = rel_segment + abs_path
+	path = rel_segment + abs_path
       elsif rel_segment
-        path = rel_segment
+	path = rel_segment
       elsif abs_path
-        path = abs_path
+	path = abs_path
       end
 
       # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
@@ -439,83 +348,41 @@ module URI
     path = '' if !path && !opaque # (see RFC2396 Section 5.2)
     ret = [
       scheme, 
-      userinfo, host, port,         # X
-      registry,                        # X
-      path,                         # Y
-      opaque,                        # Y
+      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" 
-  # 
+=begin
+
+--- URI::parse(uri_str)
+
+=end
   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)
+				   registry, path, opaque, query, 
+				   fragment)
     else
       Generic.new(scheme, userinfo, host, port, 
-                  registry, path, opaque, query, 
-                  fragment)
+		  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>
-  #
+=begin
+
+--- URI::join(str[, str, ...])
+
+=end
   def self.join(*str)
     u = self.parse(str[0])
     str[1 .. -1].each do |x|
@@ -524,30 +391,11 @@ module URI
     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"]
-  #
+=begin
+
+--- URI::extract(str[, schemes])
+
+=end
   def self.extract(str, schemes = nil, &block)
     if block_given?
       str.scan(regexp(schemes)) { yield $& }
@@ -559,37 +407,30 @@ module URI
     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
-  #
+=begin
+
+--- URI::regexp([match_schemes])
+
+    Returns a Regexp object which matches to URI-like strings.
+    If MATCH_SCHEMES given, resulting regexp matches to URIs
+    whose scheme is one of the MATCH_SCHEMES.
+
+    The Regexp object returned by this method includes arbitrary
+    number of capture group (parentheses).  Never rely on its
+    number.
+
+      # 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
+
+=end
   def self.regexp(schemes = nil)
     unless schemes
       ABS_URI_REF
@@ -598,14 +439,4 @@ module URI
     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
+end # URI
diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb
index 1a18e9cae7..8183fbcd51 100644
--- a/lib/uri/ftp.rb
+++ b/lib/uri/ftp.rb
@@ -1,18 +1,25 @@
 #
-# = uri/ftp.rb
+# $Id$
 #
-# Author:: Akira Yamada <akira@ruby-lang.org>
-# License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
+# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+# You can redistribute it and/or modify it under the same term as Ruby.
 #
 
 require 'uri/generic'
 
 module URI
 
-  #
-  # FTP URI syntax is defined by RFC1738 section 3.2.
-  #
+=begin
+
+== URI::FTP
+
+=== Super Class
+
+((<URI::Generic>))
+
+=end
+
+  # RFC1738 section 3.2.
   class FTP < Generic
     DEFAULT_PORT = 21
 
@@ -21,120 +28,82 @@ module URI
       :userinfo, :host, :port,
       :path, :typecode
     ].freeze
-    #
-    # Typecode is "a", "i" or "d". 
-    #
-    # * "a" indicates a text file (the FTP command was ASCII)
-    # * "i" indicates a binary file (FTP command IMAGE)
-    # * "d" indicates the contents of a directory should be displayed
-    #
+
     TYPECODE = ['a', 'i', 'd'].freeze
     TYPECODE_PREFIX = ';type='.freeze
 
+=begin
+
+=== Class Methods
+
+--- URI::FTP::build
+    Create 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".
+
+--- URI::FTP::new
+    Create a new URI::FTP object from ``generic'' components with no
+    check.
+
+=end
+
     def self.new2(user, password, host, port, path, 
-                  typecode = nil, arg_check = true)
+		  typecode = nil, arg_check = true)
       typecode = nil if typecode.size == 0
       if typecode && !TYPECODE.include?(typecode)
-        raise ArgumentError,
-          "bad typecode is specified: #{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)
+	       [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, with syntax checking.  
-    #
-    # The components accepted are +userinfo+, +host+, +port+, +path+ and 
-    # +typecode+.
-    #
-    # 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, typecode]
-    #
-    # If the path supplied is absolute, it will be escaped in order to
-    # make it absolute in the URI. Examples:
-    #
-    #     require 'uri'
-    #
-    #     uri = URI::FTP.build(['user:password', 'ftp.example.com', nil, 
-    #       '/path/file.> zip', 'i'])
-    #     puts uri.to_s  ->  ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=a
-    #
-    #     uri2 = URI::FTP.build({:host => 'ftp.example.com', 
-    #       :path => 'ruby/src'})
-    #     puts uri2.to_s  ->  ftp://ftp.example.com/ruby/src
-    #
     def self.build(args)
-
-      # Fix the incoming path to be generic URL syntax
-      # FTP path  ->  URL path
-      # foo/bar       /foo/bar
-      # /foo/bar      /%2Ffoo/bar
-      #
-      if args.kind_of?(Array)
-        args[3] = '/' + args[3].sub(/^\//, '%2F')
-      else
-        args[:path] = '/' + args[:path].sub(/^\//, '%2F')
-      end
-
       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]
+	if tmp[:typecode].size == 1
+	  tmp[:typecode] = TYPECODE_PREFIX + tmp[:typecode] 
+	end
+	tmp[:path] << tmp[:typecode]
       end
 
       return super(tmp)
     end
 
-    #
-    # == Description
-    #
-    # Creates a new URI::FTP object from generic URL components with no
-    # syntax checking.
-    #
-    # Unlike build(), this method does not escape the path component as
-    # required by RFC1738; instead it is treated as per RFC2396.
-    #
-    # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+, 
-    # +opaque+, +query+ and +fragment+, in that order.
-    #
     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
+	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
 
+    #
+    # methods for typecode
+    #
+
     def check_typecode(v)
       if TYPECODE.include?(v)
-        return true
+	return true
       else
-        raise InvalidComponentError,
-          "bad typecode(expected #{TYPECODE.join(', ')}): #{v}"
+	raise InvalidComponentError,
+	  "bad typecode(expected #{TYPECODE.join(', ')}): #{v}"
       end
     end
     private :check_typecode
@@ -150,49 +119,32 @@ module URI
       typecode
     end
 
-    def merge(oth) # :nodoc:
+=begin
+=end
+    def merge(oth)
       tmp = super(oth)
       if self != tmp
-        tmp.set_typecode(oth.typecode)
+	tmp.set_typecode(oth.typecode)
       end
 
       return tmp
     end
 
-    # Returns the path from an FTP URI.
-    #
-    # RFC 1738 specifically states that the path for an FTP URI does not
-    # include the / which separates the URI path from the URI host. Example:
-    #
-    #     ftp://ftp.example.com/pub/ruby 
-    #
-    # The above URI indicates that the client should connect to 
-    # ftp.example.com then cd pub/ruby from the initial login directory.
-    #
-    # If you want to cd to an absolute directory, you must include an
-    # escaped / (%2F) in the path. Example:
-    #
-    #     ftp://ftp.example.com/%2Fpub/ruby
-    #
-    # This method will then return "/pub/ruby"
-    #
-    def path
-      return @path.sub(/^\//,'').sub(/^%2F/i,'/')
-    end
-
+=begin
+=end
     def to_s
       save_path = nil
       if @typecode
-        save_path = @path
-        @path = @path + TYPECODE_PREFIX + @typecode
+	save_path = @path
+	@path = @path + TYPECODE_PREFIX + @typecode
       end
       str = super
       if @typecode
-        @path = save_path
+	@path = save_path
       end
 
       return str
     end
-  end
+  end # FTP
   @@schemes['FTP'] = FTP
-end
+end # URI
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index d907e0b4b2..c1d0d63cae 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1,28 +1,37 @@
 #
-# = uri/generic.rb
+# $Id$
 #
-# Author:: Akira Yamada <akira@ruby-lang.org>
-# License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
+# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+# You can redistribute it and/or modify it under the same term as Ruby.
 #
 
 require 'uri/common'
 
 module URI
-  
-  #
-  # Base class for all URI classes.
-  # Implements generic URI syntax as per RFC 2396.
-  #
+
+=begin
+
+== URI::Generic
+
+=== Super Class
+
+Object
+
+=end
+
   class Generic
     include URI
     include REGEXP
 
+=begin
+
+=== Class Methods
+
+--- URI::Generic::default_port
+
+=end
     DEFAULT_PORT = nil
 
-    #
-    # Returns default port
-    #
     def self.default_port
       self::DEFAULT_PORT
     end
@@ -31,6 +40,9 @@ module URI
       self.class.default_port
     end
 
+=begin
+--- URI::Generic::component
+=end
     COMPONENT = [
       :scheme, 
       :userinfo, :host, :port, :registry, 
@@ -39,126 +51,90 @@ module URI
       :fragment
     ].freeze
 
-    #
-    # Components of the URI in the order.
-    #
     def self.component
       self::COMPONENT
     end
 
+=begin
+--- URI::Generic::use_registry
+=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.
-    #
-    #
+=begin
+
+--- URI::Generic::build2
+    At first, try to create a new URI::Generic object using
+    URI::Generic::build. But, if you get a exception
+    URI::InvalidComponentError, then re-try to create an object with
+    escaped components.
+
+--- URI::Generic::build
+    Create a new URI::Generic object from components of URI::Generic
+    with check.  It is scheme, userinfo, host, port, registry, path,
+    opaque, query and fragment. It provided by an Array of a Hash.
+
+--- URI::Generic::new
+    Create new URI::Generic object from ``generic'' components with no
+    check.
+
+=end
     def self.build2(args)
       begin
-        return self.build(args)
+	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
+	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
+	  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
+	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(', ')})"
+	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)
+		   userinfo, host, port, registry, 
+		   path, opaque, 
+		   query, 
+		   fragment,
+		   arg_check = false)
       @scheme = nil
       @user = nil
       @password = nil
@@ -171,29 +147,28 @@ module URI
       @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
+	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)
+	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?)"
+	raise InvalidURIError, "the scheme #{@scheme} does not accept registry part: #{@registry} (or bad hostname?)"
       end
       
       @scheme.freeze if @scheme
@@ -212,23 +187,48 @@ module URI
     # replace self by other URI object
     def replace!(oth)
       if self.class != oth.class
-        raise ArgumentError, "expected #{self.class} object"
+	raise ArgumentError, "expected #{self.class} object"
       end
 
       component.each do |c|
-        self.__send__("#{c}=", oth.__send__(c))
+	self.__send__("#{c}=", oth.__send__(c))
       end
     end
     private :replace!
 
+=begin
+
+=== Instance Methods
+
+=end
+
+=begin
+
+--- URI::Generic#component
+
+=end
     def component
       self.class.component
     end
 
+    # set_XXX method sets value to @XXX instance variable with no check, 
+    # so be careful if you use these methods. or, you use these method 
+    # with check_XXX method, or you use XXX= methods.
+
+=begin
+
+--- URI::Generic#scheme
+
+--- URI::Generic#scheme=(v)
+
+=end
+    #
+    # methods for scheme
+    #
     def check_scheme(v)
       if v && SCHEME !~ v
-        raise InvalidComponentError,
-          "bad component(expected scheme component): #{v}"
+	raise InvalidComponentError,
+	  "bad component(expected scheme component): #{v}"
       end
 
       return true
@@ -246,9 +246,27 @@ module URI
       v
     end
 
+=begin
+
+--- URI::Generic#userinfo
+
+--- URI::Generic#userinfo=(v)
+
+--- URI::Generic#user
+
+--- URI::Generic#user=(v)
+
+--- URI::Generic#password
+
+--- URI::Generic#password=(v)
+
+=end
+    #
+    # methods for userinfo
+    #
     def check_userinfo(user, password = nil)
       if !password
-        user, password = split_userinfo(user)
+	user, password = split_userinfo(user)
       end
       check_user(user)
       check_password(password, user)
@@ -259,15 +277,15 @@ module URI
 
     def check_user(v)
       if @registry || @opaque
-        raise InvalidURIError, 
-          "can not set user with registry or 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}"
+	raise InvalidComponentError,
+	  "bad component(expected userinfo component or user component): #{v}"
       end
 
       return true
@@ -276,52 +294,49 @@ module URI
 
     def check_password(v, user = @user)
       if @registry || @opaque
-        raise InvalidURIError, 
-          "can not set password with registry or 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"
+	raise InvalidURIError,
+	  "password component depends user component"
       end
 
       if USERINFO !~ v
-        raise InvalidComponentError,
-          "bad component(expected user component): #{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
+	return nil
       end
       check_userinfo(*userinfo)
       set_userinfo(*userinfo)
-      # returns userinfo
+      userinfo
     end
 
     def user=(user)
       check_user(user)
       set_user(user)
-      # returns user
+      user
     end
-    
+
     def password=(password)
       check_password(password)
       set_password(password)
-      # returns password
+      password
     end
 
     def set_userinfo(user, password = nil)
       unless password 
-        user, password = split_userinfo(user)
+	user, password = split_userinfo(user)
       end
       @user     = user
       @password = password if password
@@ -337,14 +352,21 @@ module URI
     protected :set_user
 
     def set_password(v)
-      @password = v
-      # returns v
+      set_userinfo(@user, v)
+      v
     end
     protected :set_password
 
     def split_userinfo(ui)
       return nil, nil unless ui
-      user, password = ui.split(/:/, 2)
+      tmp = ui.index(':')
+      if tmp
+	user     = ui[0..tmp - 1]
+	password = ui[tmp + 1..-1]
+      else
+	user     = ui
+	password = nil
+      end
 
       return user, password
     end
@@ -356,12 +378,10 @@ module URI
     private :escape_userpass
 
     def userinfo
-      if @user.nil?
-        nil
-      elsif @password.nil?
-        @user
+      if !@password
+	@user
       else
-        @user + ':' + @password
+	@user + ':' + @password
       end
     end
 
@@ -373,15 +393,26 @@ module URI
       @password
     end
 
+=begin
+
+--- URI::Generic#host
+
+--- URI::Generic#host=(v)
+
+=end
+    #
+    # methods for host
+    #
+
     def check_host(v)
       return v unless v
 
       if @registry || @opaque
-        raise InvalidURIError, 
-          "can not set host with registry or opaque"
+	raise InvalidURIError, 
+	  "can not set host with registry or opaque"
       elsif HOST !~ v
-        raise InvalidComponentError,
-          "bad component(expected host component): #{v}"
+	raise InvalidComponentError,
+	  "bad component(expected host component): #{v}"
       end
 
       return true
@@ -399,15 +430,26 @@ module URI
       v
     end
 
+=begin
+
+--- URI::Generic#port
+
+--- URI::Generic#port=(v)
+
+=end
+    #
+    # methods for port
+    #
+
     def check_port(v)
       return v unless v
 
       if @registry || @opaque
-        raise InvalidURIError, 
-          "can not set port with registry or 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}"
+	raise InvalidComponentError,
+	  "bad component(expected port component): #{v}"
       end
 
       return true
@@ -416,11 +458,11 @@ module URI
 
     def set_port(v)
       unless !v || v.kind_of?(Fixnum)
-        if v.empty?
-          v = nil
-        else
-          v = v.to_i
-        end
+	if v.empty?
+	  v = nil
+	else
+	  v = v.to_i
+	end
       end
       @port = v
     end
@@ -432,6 +474,17 @@ module URI
       port
     end
 
+=begin
+
+--- URI::Generic#registry
+
+--- URI::Generic#registry=(v)
+
+=end
+    #
+    # methods for registry
+    #
+
     def check_registry(v)
       return v unless v
 
@@ -439,11 +492,11 @@ module URI
       # 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"
+	raise InvalidURIError, 
+	  "can not set registry with host, port, or userinfo"
       elsif v && REGISTRY !~ v
-        raise InvalidComponentError,
-          "bad component(expected registry component): #{v}"
+	raise InvalidComponentError,
+	  "bad component(expected registry component): #{v}"
       end
 
       return true
@@ -461,25 +514,36 @@ module URI
       v
     end
 
+=begin
+
+--- URI::Generic#path
+
+--- URI::Generic#path=(v)
+
+=end
+    #
+    # methods for path
+    #
+
     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"
+	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
+	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
+	if v && v != '' && ABS_PATH !~ v && REL_PATH !~ v
+	  raise InvalidComponentError, 
+	    "bad component(expected relative path component): #{v}"
+	end
       end
 
       return true
@@ -497,6 +561,17 @@ module URI
       v
     end
 
+=begin
+
+--- URI::Generic#query
+
+--- URI::Generic#query=(v)
+
+=end
+    #
+    # methods for query
+    #
+
     def check_query(v)
       return v unless v
 
@@ -504,14 +579,14 @@ module URI
       # absoluteURI   = scheme ":" ( hier_part | opaque_part )
       # hier_part     = ( net_path | abs_path ) [ "?" query ]
       if @opaque
-        raise InvalidURIError, 
-          "query conflicts with opaque"
+	raise InvalidURIError, 
+	  "query conflicts with opaque"
       end
 
       if v && v != '' && QUERY !~ v
-          raise InvalidComponentError, 
-            "bad component(expected query component): #{v}"
-        end
+	  raise InvalidComponentError, 
+	    "bad component(expected query component): #{v}"
+	end
 
       return true
     end
@@ -528,6 +603,17 @@ module URI
       v
     end
 
+=begin
+
+--- URI::Generic#opaque
+
+--- URI::Generic#opaque=(v)
+
+=end
+    #
+    # methods for opaque
+    #
+
     def check_opaque(v)
       return v unless v
 
@@ -535,11 +621,11 @@ module URI
       # 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"
+	raise InvalidURIError, 
+	  "can not set opaque with host, port, userinfo or path"
       elsif v && OPAQUE !~ v
-        raise InvalidComponentError,
-          "bad component(expected opaque component): #{v}"
+	raise InvalidComponentError,
+	  "bad component(expected opaque component): #{v}"
       end
 
       return true
@@ -557,12 +643,23 @@ module URI
       v
     end
 
+=begin
+
+--- URI::Generic#fragment
+
+--- URI::Generic#fragment=(v)
+
+=end
+    #
+    # methods for fragment
+    #
+
     def check_fragment(v)
       return v unless v
 
       if v && v != '' && FRAGMENT !~ v
-        raise InvalidComponentError, 
-          "bad component(expected fragment component): #{v}"
+	raise InvalidComponentError, 
+	  "bad component(expected fragment component): #{v}"
       end
 
       return true
@@ -580,168 +677,136 @@ module URI
       v
     end
 
-    #
-    # Checks if URI has a path
-    #
+=begin
+
+--- URI::Generic#hierarchical?
+
+=end
     def hierarchical?
       if @path
-        true
+	true
       else
-        false
+	false
       end
     end
 
-    #
-    # Checks if URI is an absolute one
-    #
+=begin
+
+--- URI::Generic#absolute?
+
+=end
     def absolute?
       if @scheme
-        true
+	true
       else
-        false
+	false
       end
     end
     alias absolute absolute?
 
-    #
-    # Checks if URI is relative
-    #
+=begin
+
+--- URI::Generic#relative?
+
+=end
     def relative?
       !absolute?
     end
 
+=begin
+
+--- URI::Generic#merge(rel)
+--- URI::Generic#merge!(rel)
+--- URI::Generic#+(rel)
+
+=end
     def split_path(path)
       path.split(%r{/+}, -1)
     end
     private :split_path
 
     def merge_path(base, rel)
-
       # RFC2396, Section 5.2, 5)
-      # 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 rel[0] == ?/ #/
+	# RFC2396, Section 5.2, 5)
+	return rel
 
-      if (first = rel_path.first) and first.empty?
-        base_path.clear
-        rel_path.shift
-      end
+      else
+	# RFC2396, Section 5.2, 6)
+	base_path = split_path(base)
+	rel_path  = split_path(rel)
 
-      # 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
+	if base_path.empty?
+	  base_path = [''] # XXX
+	end
 
-      add_trailer_slash = !tmp.empty?
-      if base_path.empty?
-        base_path = [''] # keep '/' for root directory
-      elsif add_trailer_slash
-        base_path.pop
-      end
-      while x = tmp.shift
-        if x == '..'
-          # RFC2396, Section 4
-          # a .. or . in an absolute path has no special meaning
-          base_path.pop if base_path.size > 1
-        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
+	# RFC2396, Section 5.2, 6), a)
+	base_path.pop unless base_path.size == 1
+
+	# RFC2396, Section 5.2, 6), c)
+ 	# RFC2396, Section 5.2, 6), d)
+	rel_path.push('') if 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('/')
+	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
+	nil
       else
-        replace!(t)
-        self
+	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>
-    #
+    # abs(self) + rel(oth) => abs(new)
     def merge(oth)
-      begin
-        base, rel = merge0(oth)
-      rescue
-        raise $!.class, $!.message
-      end
-
+      base, rel = merge0(oth)
       if base == rel
-        return base
+	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
+      if rel.path.empty? && !authority && !rel.query
+	base.set_fragment(rel.fragment) if rel.fragment
+	return base
       end
 
       base.set_query(nil)
@@ -749,10 +814,10 @@ module URI
 
       # RFC2396, Section 5.2, 4)
       if !authority
-        base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path
+	base.set_path(merge_path(base.path, rel.path))
       else
-        # RFC2396, Section 5.2, 4)
-        base.set_path(rel.path) if rel.path
+	# RFC2396, Section 5.2, 4)
+	base.set_path(rel.path)
       end
 
       # RFC2396, Section 5.2, 7)
@@ -772,32 +837,46 @@ module URI
       case oth
       when Generic
       when String
-        oth = URI.parse(oth)
+	oth = URI.parse(oth)
       else
-        raise ArgumentError,
-          "bad argument(expected URI object or URI string)"
+	raise ArgumentError,
+	  "bad argument(expected URI object or URI string)"
       end
 
       if self.relative? && oth.relative?
-        raise BadURIError, 
-          "both URI are 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
+	#raise BadURIError, 
+	#  "both URI are absolute"
+	# hmm... should return oth for usability?
+	return oth, oth
+      end
+
+      if !self.hierarchical?
+	raise BadURIError, 
+	  "not hierarchical URI: #{self}"
+      elsif !oth.hierarchical?
+	raise BadURIError, 
+	  "not hierarchical URI: #{oth}"
       end
 
       if self.absolute?
-        return self.dup, oth
+	return self.dup, oth
       else
-        return oth, oth
+	return oth, oth
       end
     end
     private :merge0
 
+=begin
+
+--- URI::Generic#route_from(src)
+--- URI::Generic#-(src)
+
+=end
     def route_from_path(src, dst)
       # RFC2396, Section 4.2
       return '' if src == dst
@@ -808,31 +887,31 @@ module URI
       # hmm... dst has abnormal absolute path, 
       # like "/./", "/../", "/x/../", ...
       if dst_path.include?('..') ||
-          dst_path.include?('.')
-        return dst.dup
+	  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?
+	break if dst_path.empty?
 
-        src_path.shift
-        dst_path.shift
+	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
+	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
@@ -843,220 +922,182 @@ module URI
       case oth
       when Generic
       when String
-        oth = URI.parse(oth)
+	oth = URI.parse(oth)
       else
-        raise ArgumentError,
-          "bad argument(expected URI object or URI string)"
+	raise ArgumentError,
+	  "bad argument(expected URI object or URI string)"
       end
 
       if self.relative?
-        raise BadURIError, 
-          "relative URI: #{self}"
+	raise BadURIError, 
+	  "relative URI: #{self}"
       end
       if oth.relative?
-        raise BadURIError, 
-          "relative URI: #{oth}"
+	raise BadURIError, 
+	  "relative URI: #{oth}"
+      end
+
+      if !self.hierarchical? || !oth.hierarchical?
+	return self, self.dup
       end
 
       if self.scheme != oth.scheme
-        return self, self.dup
+	return oth, oth.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)
+			     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
+	  rel.host.to_s.downcase != oth.host.to_s.downcase ||
+	  rel.port != oth.port
+	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
+      if rel.path == oth.path
+	rel.set_path('')
+	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>
-    #
+
+    # calculate relative path from oth to self
     def route_from(oth)
       # you can modify `rel', but can not `oth'.
-      begin
-        oth, rel = route_from0(oth)
-      rescue
-        raise $!.class, $!.message
-      end
+      oth, rel = route_from0(oth)
       if oth == rel
-        return rel
+	return rel
       end
 
       rel.set_path(route_from_path(oth.path, self.path))
       if rel.path == './' && self.query
-        # "./?foo" -> "?foo"
-        rel.set_path('')
+	# "./?foo" -> "?foo"
+	rel.set_path('')
       end
 
       return rel
     end
-
+    # abs1 - abs2 => relative_path_to_abs1_from_abs2
+    # (see http://www.nikonet.or.jp/spring/what_v/what_v_4.htm :-)
     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>
-    #    
+=begin
+
+--- URI::Generic#route_to(dst)
+
+=end
+    # calculate relative path to oth from self
     def route_to(oth)
       case oth
       when Generic
       when String
-        oth = URI.parse(oth)
+	oth = URI.parse(oth)
       else
-        raise ArgumentError,
-          "bad argument(expected URI object or URI string)"
+	raise ArgumentError,
+	  "bad argument(expected URI object or URI string)"
       end
 
       oth.route_from(self)
     end
 
-    #
-    # Returns normalized URI
-    # 
+=begin
+
+--- URI::Generic#normalize
+--- URI::Generic#normalize!
+
+=end
     def normalize
       uri = dup
       uri.normalize!
       uri
     end
 
-    #
-    # Destructive version of #normalize
-    #
     def normalize!
       if path && path == ''
-        set_path('/')
+	set_path('/')
       end
       if host && host != host.downcase
-        set_host(self.host.downcase)
-      end        
+	set_host(self.host.downcase)
+      end	
     end
 
+=begin
+
+--- URI::Generic#to_s
+
+=end
     def path_query
       str = @path
       if @query
-        str += '?' + @query
+	str += '?' + @query
       end
       str
     end
     private :path_query
 
-    #
-    # Constructs String from URI
-    # 
     def to_s
       str = ''
       if @scheme
-        str << @scheme
-        str << ':'
+	str << @scheme
+	str << ':'
       end
 
       if @opaque
-        str << @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
+	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
+	str << '#'
+	str << @fragment
       end
 
       str
     end
 
-    #
-    # Compares to URI's
-    #
+=begin
+
+--- URI::Generic#==(oth)
+
+=end
     def ==(oth)
       if self.class == oth.class
-        self.normalize.component_ary == oth.normalize.component_ary
+	self.normalize.component_ary == oth.normalize.component_ary
       else
-        false
+	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)
@@ -1070,53 +1111,42 @@ module URI
 =end
     def component_ary
       component.collect do |x|
-        self.send(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"]
-    #
+=begin
+--- URI::Generic#select(*components)
+=end
     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
+	if component.include?(c)
+	  self.send(c)
+	else
+	  raise ArgumentError, 
+	    "expected of components of #{self.class} (#{self.class.component.join(', ')})"
+	end
       end
     end
 
-    @@to_s = Kernel.instance_method(:to_s)
+=begin
+=end
     def inspect
-      @@to_s.bind(self).call.sub!(/>\z/) {" URL:#{self}>"}
+      sprintf("#<%s:0x%x URL:%s>", self.class.to_s, self.object_id, self.to_s)
     end
 
+=begin
+=end
     def coerce(oth)
       case oth
       when String
-        oth = URI.parse(oth)
+	oth = URI.parse(oth)
       else
-        super
+	super
       end
 
       return oth, self
     end
-  end
-end
+  end # Generic
+end # URI
diff --git a/lib/uri/http.rb b/lib/uri/http.rb
index 87eb8893f2..3e5b209d49 100644
--- a/lib/uri/http.rb
+++ b/lib/uri/http.rb
@@ -1,23 +1,25 @@
 #
-# = uri/http.rb
+# $Id$
 #
-# Author:: Akira Yamada <akira@ruby-lang.org>
-# License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
+# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+# You can redistribute it and/or modify it under the same term as Ruby.
 #
 
 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>.
-  #
+=begin
+
+== URI::HTTP
+
+=== Super Class
+
+((<URI::Generic>))
+
+=end
+
+  # RFC1738 section 3.3.
   class HTTP < Generic
     DEFAULT_PORT = 80
 
@@ -29,72 +31,46 @@ module URI
       :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.
-    #
+=begin
+
+=== Class Methods
+
+--- URI::HTTP::build
+    Create a new URI::HTTP object from components of URI::HTTP with
+    check.  It is scheme, userinfo, host, port, path, query and
+    fragment. It provided by an Array of a Hash.
+
+--- URI::HTTP::new
+    Create a new URI::HTTP object from ``generic'' components with no
+    check.
+
+=end
+
     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.
-    #
+=begin
+
+=== Instance Methods
+
+--- URI::HTTP#request_uri
+
+=end
     def request_uri
       r = path_query
       if r[0] != ?/
-        r = '/' + r
+	r = '/' + r
       end
 
       r
     end
-  end
+  end # HTTP
 
   @@schemes['HTTP'] = HTTP
-end
+end # URI
diff --git a/lib/uri/https.rb b/lib/uri/https.rb
index 9761636304..691198fafa 100644
--- a/lib/uri/https.rb
+++ b/lib/uri/https.rb
@@ -1,20 +1,26 @@
 #
-# = uri/https.rb
+# $Id$
 #
-# Author:: Akira Yamada <akira@ruby-lang.org>
-# License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
+# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+# You can redistribute it and/or modify it under the same term as Ruby.
 #
 
 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.
+=begin
+
+== URI::HTTPS
+
+=== Super Class
+
+((<URI::HTTP>))
+
+=end
+
   class HTTPS < HTTP
     DEFAULT_PORT = 443
   end
   @@schemes['HTTPS'] = HTTPS
-end
+end # URI
diff --git a/lib/uri/ldap.rb b/lib/uri/ldap.rb
index 163d2cda24..ae85bb2164 100644
--- a/lib/uri/ldap.rb
+++ b/lib/uri/ldap.rb
@@ -1,23 +1,29 @@
 #
-# = 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$
+# $Id$
 #
 
 require 'uri/generic'
 
 module URI
 
-  #
+=begin
+
+== URI::LDAP
+
+URI::LDAP is copyrighted free software by Takaaki Tateishi and akira yamada.
+
+  Copyright (c) 2001 Takaaki Tateishi <ttate@jaist.ac.jp> and 
+  akira yamada <akira@ruby-lang.org>.
+  You can redistribute it and/or modify it under the same term as Ruby.
+
+=== Super Class
+
+((<URI::Generic>))
+
+=end
+
   # LDAP URI SCHEMA (described in RFC2255)
   # ldap://<host>/<dn>[?<attrs>[?<scope>[?<filter>[?<extensions>]]]]
-  #
   class LDAP < Generic
 
     DEFAULT_PORT = 389
@@ -38,17 +44,27 @@ module URI
       SCOPE_BASE = 'base',
     ].freeze
 
+=begin
+
+=== Class Methods
+
+--- URI::LDAP::build
+
+--- URI::LDAP::new
+
+=end
+
     def self.build(args)
       tmp = Util::make_components_hash(self, args)
 
       if tmp[:dn]
-        tmp[:path] = 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])
+	next if !tmp[x] && query.size == 0
+	query.unshift(tmp[x])
       end
 
       tmp[:query] = query.join('?')
@@ -60,7 +76,7 @@ module URI
       super(*arg)
 
       if @fragment
-        raise InvalidURIError, 'bad LDAP URL'
+	raise InvalidURIError, 'bad LDAP URL'
       end
 
       parse_dn
@@ -79,12 +95,12 @@ module URI
       @extensions = nil
 
       if @query
-        attrs, scope, filter, extensions = @query.split('?')
+	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
+	@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
@@ -94,13 +110,23 @@ module URI
 
       query = []
       [@extensions, @filter, @scope, @attributes].each do |x|
-        next if !x && query.size == 0
-        query.unshift(x)
+	next if !x && query.size == 0
+	query.unshift(x)
       end
       @query = query.join('?')
     end
     private :build_path_query
 
+=begin
+
+=== Instance Methods
+
+--- URI::LDAP#dn
+
+--- URI::LDAP#dn=(v)
+
+=end
+
     def dn
       @dn
     end
@@ -117,6 +143,14 @@ module URI
       val
     end
 
+=begin
+
+--- URI::LDAP#attributes
+
+--- URI::LDAP#attributes=(v)
+
+=end
+
     def attributes
       @attributes
     end
@@ -133,6 +167,14 @@ module URI
       val
     end
 
+=begin
+
+--- URI::LDAP#scope
+
+--- URI::LDAP#scope=(v)
+
+=end
+
     def scope
       @scope
     end
@@ -149,6 +191,14 @@ module URI
       val
     end
 
+=begin
+
+--- URI::LDAP#filter
+
+--- URI::LDAP#filter=(v)
+
+=end
+
     def filter
       @filter
     end
@@ -165,6 +215,14 @@ module URI
       val
     end
 
+=begin
+
+--- URI::LDAP#extensions
+
+--- URI::LDAP#extensions=(v)
+
+=end
+
     def extensions
       @extensions
     end
@@ -180,10 +238,10 @@ module URI
       set_extensions(val)
       val
     end
+  end
 
-    def hierarchical?
-      false
-    end
+  def hierarchical?
+    false
   end
 
   @@schemes['LDAP'] = LDAP
diff --git a/lib/uri/ldaps.rb b/lib/uri/ldaps.rb
deleted file mode 100644
index 6da333150f..0000000000
--- a/lib/uri/ldaps.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'uri/ldap'
-
-module URI
-
-  # The default port for LDAPS URIs is 636, and the scheme is 'ldaps:' rather
-  # than 'ldap:'. Other than that, LDAPS URIs are identical to LDAP URIs;
-  # see URI::LDAP.
-  class LDAPS < LDAP
-    DEFAULT_PORT = 636
-  end
-  @@schemes['LDAPS'] = LDAPS
-end
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
index 44f04f2dd5..f01673fd63 100644
--- a/lib/uri/mailto.rb
+++ b/lib/uri/mailto.rb
@@ -1,26 +1,35 @@
 #
-# = uri/mailto.rb
+# $Id$
 #
-# Author:: Akira Yamada <akira@ruby-lang.org>
-# License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
+# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+# You can redistribute it and/or modify it under the same term as Ruby.
 #
 
 require 'uri/generic'
 
 module URI
 
-  #
+=begin
+
+== URI::MailTo
+
+=== Super Class
+
+((<URI::Generic>))
+
+=end
+
   # RFC2368, The mailto URL scheme
-  #
   class MailTo < Generic
     include REGEXP
 
     DEFAULT_PORT = nil
 
-    COMPONENT = [ :scheme, :to, :headers ].freeze
+    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.
@@ -43,91 +52,68 @@ module URI
     # to         =  #mailbox
     # mailtoURL  =  "mailto:" [ to ] [ headers ]
     MAILBOX_PATTERN = "(?:#{PATTERN::ESCAPED}|[^(),%?=&])".freeze
-    MAILTO_REGEXP = Regexp.new(" # :nodoc:
+    MAILTO_REGEXP = Regexp.new("
       \\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
-    #
+=begin
+
+=== Class Methods
+
+--- URI::MailTo::build
+    Create a new URI::MailTo object from components of URI::MailTo
+    with check.  It is to and headers. It provided by an Array of a
+    Hash. You can provide headers as an String like
+    "subject=subscribe&cc=addr" or an Array like [["subject",
+    "subscribe"], ["cc", "addr"]]
+
+--- URI::MailTo::new
+    Create a new URI::MailTo object from ``generic'' components with
+    no check. Because, this method is usually called from URI::parse
+    and the method checks validity of each components.
+
+=end
+
     def self.build(args)
       tmp = Util::make_components_hash(self, args)
 
       if tmp[:to]
-        tmp[:opaque] = tmp[:to]
+	tmp[:opaque] = tmp[:to]
       else
-        tmp[:opaque] = ''
+	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
+	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)
 
@@ -135,33 +121,43 @@ module URI
       @headers = []
 
       if MAILTO_REGEXP =~ @opaque
-         if arg[-1]
-          self.to = $1
-          self.headers = $2
-        else
-          set_to($1)
-          set_headers($2)
-        end
+ 	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}"
+	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
 
+=begin
+
+=== Instance Methods
+
+--- URI::MailTo#to
+
+--- URI::MailTo#to=(v)
+
+=end
+
+    #
+    # methods for to
+    #
+
     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}"
+	raise InvalidComponentError,
+	  "bad component(expected opaque component): #{v}"
       end
 
       return true
@@ -179,14 +175,26 @@ module URI
       v
     end
 
+=begin
+
+--- URI::MailTo#headers
+
+--- URI::MailTo#headers=(v)
+
+=end
+
+    #
+    # methods for headers
+    #
+
     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}"
+	  /\A(#{HEADER_PATTERN}(?:\&#{HEADER_PATTERN})*)\z/o !~ v
+	raise InvalidComponentError,
+	  "bad component(expected opaque component): #{v}"
       end
 
       return true
@@ -196,9 +204,9 @@ module URI
     def set_headers(v)
       @headers = []
       if v
-        v.scan(HEADER_REGEXP) do |x|
-          @headers << x.split(/=/o, 2)
-        end
+	v.scan(HEADER_REGEXP) do |x|
+	  @headers << x.split(/=/o, 2)
+	end
       end
     end
     protected :set_headers
@@ -211,47 +219,37 @@ module URI
 
     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
+	if @to 
+	  @to
+	else
+	  ''
+	end + 
+	if @headers.size > 0
+	  '?' + @headers.collect{|x| x.join('=')}.join('&')
+	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"
-    #
+
+=begin
+
+--- URI::MailTo#to_mailtext
+
+=end
     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
+	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}
@@ -260,7 +258,7 @@ module URI
 "
     end
     alias to_rfc822text to_mailtext
-  end
+  end # MailTo
 
   @@schemes['MAILTO'] = MailTo
-end
+end # URI
diff --git a/lib/weakref.rb b/lib/weakref.rb
index 591819c948..49b907ba17 100644
--- a/lib/weakref.rb
+++ b/lib/weakref.rb
@@ -1,13 +1,6 @@
-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.
+# Weak Reference class that does not bother GCing.
 #
 # Usage:
-#
 #   foo = Object.new
 #   foo = Object.new
 #   p foo.to_s			# original's class
@@ -15,9 +8,11 @@ require "delegate"
 #   p foo.to_s			# should be same class
 #   ObjectSpace.garbage_collect
 #   p foo.to_s			# should raise exception (recycled)
+
+require "delegate"
+
 class WeakRef<Delegator
 
-  # RefError is raised if an object cannot be referenced by a WeakRef.
   class RefError<StandardError
   end
 
@@ -45,15 +40,22 @@ class WeakRef<Delegator
     end
   }
 
-  # Create a new WeakRef from +orig+.
   def initialize(orig)
     super
-    __setobj__(orig)
+    @__id = orig.__id__
+    ObjectSpace.define_finalizer orig, @@final
+    ObjectSpace.define_finalizer self, @@final
+    __old_status = Thread.critical
+    begin
+      Thread.critical = true
+      @@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
 
-  # 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)
@@ -65,25 +67,6 @@ class WeakRef<Delegator
     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
diff --git a/lib/webrick/accesslog.rb b/lib/webrick/accesslog.rb
index f97769545e..25dcbc1be8 100644
--- a/lib/webrick/accesslog.rb
+++ b/lib/webrick/accesslog.rb
@@ -32,7 +32,6 @@ module WEBrick
       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
@@ -47,17 +46,15 @@ module WEBrick
     end
 
     def format(format_string, params)
-      format_string.gsub(/\%(?:\{(.*?)\})?>?([a-zA-Z%])/){
+      format_string.gsub(/\%(?:\{(.*?)\})?>?([a-zA-Z])/){
          param, spec = $1, $2
          case spec[0]
-         when ?e, ?i, ?n, ?o
+         when ?e, ?i, ?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
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index ff5f7a6102..31a65c1118 100644
--- a/lib/webrick/cgi.rb
+++ b/lib/webrick/cgi.rb
@@ -16,8 +16,6 @@ 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")
@@ -28,7 +26,7 @@ module WEBrick
         httpv = $1
       end
       @config = WEBrick::Config::HTTP.dup.update(
-        :ServerSoftware => ENV["SERVER_SOFTWARE"] || "null",
+        :ServerSoftware => ENV["SERVER_SOFTWARE"],
         :HTTPVersion    => HTTPVersion.new(httpv || "1.0"),
         :RunOnCGI       => true,   # to detect if it runs on CGI.
         :NPH            => false   # set true to run as NPH script.
@@ -36,25 +34,17 @@ module WEBrick
       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
+          @header["status"] ||= @status
           super
         end
         def res.status_line
@@ -64,10 +54,12 @@ module WEBrick
 
       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"]
+        req.script_name = (env["SCRIPT_NAME"] || "").dup
+        if env["PATH_INFO"].nil? || env["PATH_INFO"].empty?
+          req.path_info = nil
+        else
+          req.path_info = env["PATH_INFO"].dup
+        end
         res.request_method = req.request_method
         res.request_uri = req.request_uri
         res.request_http_version = req.http_version
@@ -129,7 +121,6 @@ module WEBrick
         @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"]
@@ -149,20 +140,19 @@ module WEBrick
       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
+        meth = @env["REQUEST_METHOD"]
+        url = @env["SCRIPT_NAME"].dup
+        if path_info = @env["PATH_INFO"]
+          url << path_info
+        end
+        if query_string = @env["QUERY_STRING"]
+          unless query_string.empty?
+            url << "?" << query_string
           end
         end
         # we cannot get real HTTP version of client ;)
         httpv = @config[:HTTPVersion]
-        return "#{meth} #{url} HTTP/#{httpv}"
+        "#{meth} #{url} HTTP/#{httpv}"
       end
   
       def setup_header
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index 5897b977d8..31c0053363 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -45,15 +45,14 @@ module WEBrick
       :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
+      :RequestHandler => nil,
       :ProxyAuthProc  => nil,
       :ProxyContentHandler => nil,
       :ProxyVia       => true,
       :ProxyTimeout   => true,
+
+      # upstream proxy server
       :ProxyURI       => nil,
 
       :CGIInterpreter => nil,
@@ -65,14 +64,13 @@ module WEBrick
     )
 
     FileHandler = {
-      :NondisclosureName => [".ht*", "*~"],
+      :NondisclosureName => ".ht*",
       :FancyIndexing     => false,
       :HandlerTable      => {},
       :HandlerCallback   => nil,
       :DirectoryCallback => nil,
       :FileCallback      => nil,
-      :UserDir           => nil,  # e.g. "public_html"
-      :AcceptableLanguages => []  # ["en", "ja", ... ]
+      :UserDir           => "public_html",
     }
 
     BasicAuth = {
diff --git a/lib/webrick/cookie.rb b/lib/webrick/cookie.rb
index 814e6645a3..4785b2bb33 100644
--- a/lib/webrick/cookie.rb
+++ b/lib/webrick/cookie.rb
@@ -76,35 +76,5 @@ module WEBrick
       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/lib/webrick/httpauth.rb b/lib/webrick/httpauth.rb
index 147c04021c..3f0b83339d 100644
--- a/lib/webrick/httpauth.rb
+++ b/lib/webrick/httpauth.rb
@@ -8,6 +8,7 @@
 #
 # $IPR: httpauth.rb,v 1.14 2003/07/22 19:20:42 gotoyuzo Exp $
 
+require 'base64'
 require 'webrick/httpauth/basicauth'
 require 'webrick/httpauth/digestauth'
 require 'webrick/httpauth/htpasswd'
@@ -22,7 +23,7 @@ module WEBrick
       user = pass = nil
       if /^Basic\s+(.*)/o =~ req[req_field]
         userpass = $1
-        user, pass = userpass.unpack("m*")[0].split(":", 2)
+        user, pass = decode64(userpass).split(":", 2)
       end
       if block.call(user, pass)
         req.user = user
diff --git a/lib/webrick/httpauth/basicauth.rb b/lib/webrick/httpauth/basicauth.rb
index e835361dc2..926a6b8289 100644
--- a/lib/webrick/httpauth/basicauth.rb
+++ b/lib/webrick/httpauth/basicauth.rb
@@ -10,6 +10,7 @@
 require 'webrick/config'
 require 'webrick/httpstatus'
 require 'webrick/httpauth/authenticator'
+require 'base64'
 
 module WEBrick
   module HTTPAuth
@@ -34,7 +35,7 @@ module WEBrick
         unless basic_credentials = check_scheme(req)
           challenge(req, res)
         end
-        userid, password = basic_credentials.unpack("m*")[0].split(":", 2) 
+        userid, password = decode64(basic_credentials).split(":", 2) 
         password ||= ""
         if userid.empty?
           error("user id was not given.")
diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb
index 318e0bf17f..2b0660ed29 100644
--- a/lib/webrick/httpauth/digestauth.rb
+++ b/lib/webrick/httpauth/digestauth.rb
@@ -16,6 +16,7 @@ require 'webrick/httpstatus'
 require 'webrick/httpauth/authenticator'
 require 'digest/md5'
 require 'digest/sha1'
+require 'base64'
 
 module WEBrick
   module HTTPAuth
@@ -174,11 +175,11 @@ module WEBrick
 
         if auth_req['qop'] == "auth" || auth_req['qop'] == nil
           ha2 = hexdigest(req.request_method, auth_req['uri'])
-          ha2_res = hexdigest("", auth_req['uri'])
+          ha2_res = digest("", 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))
+          ha2_res = digest("", auth_req['uri'], hexdigest(req.body))
         end
 
         if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
@@ -253,7 +254,7 @@ module WEBrick
       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 = encode64(now + ":" + pk).chop # it has 60 length of chars.
         nonce
       end
 
@@ -261,7 +262,7 @@ module WEBrick
         username = auth_req['username']
         nonce = auth_req['nonce']
 
-        pub_time, pk = nonce.unpack("m*")[0].split(":", 2)
+        pub_time, pk = decode64(nonce).split(":", 2)
         if (!pub_time || !pk)
           error("%s: empty nonce is given", username)
           return false
@@ -330,6 +331,10 @@ module WEBrick
       def hexdigest(*args)
         @h.hexdigest(args.join(":"))
       end
+
+      def digest(*args)
+        @h.digest(args.join(":"))
+      end
     end
 
     class ProxyDigestAuth < DigestAuth
diff --git a/lib/webrick/httpauth/htpasswd.rb b/lib/webrick/httpauth/htpasswd.rb
index 40f9297b05..a4a80647d8 100644
--- a/lib/webrick/httpauth/htpasswd.rb
+++ b/lib/webrick/httpauth/htpasswd.rb
@@ -32,15 +32,7 @@ module WEBrick
           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
+              user, pass = line.split(":")
               @passwd[user] = pass
             end
           }
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
index 9295259085..c3bbbc54be 100644
--- a/lib/webrick/httpproxy.rb
+++ b/lib/webrick/httpproxy.rb
@@ -15,14 +15,6 @@ 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
@@ -47,7 +39,7 @@ module WEBrick
       req.header.delete("proxy-authorization")
     end
 
-    # Some header fields should not be transferred.
+    # 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 )
@@ -118,8 +110,7 @@ module WEBrick
         proxy_host = proxy.host
         proxy_port = proxy.port
         if proxy.userinfo
-          credentials = "Basic " + [proxy.userinfo].pack("m*")
-          credentials.chomp!
+          credentials = "Basic " + encode64(proxy.userinfo)
           header['proxy-authorization'] = credentials
         end
       end
@@ -179,8 +170,7 @@ module WEBrick
       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!
+          credentials = "Basic " + encode64(proxy.userinfo)
         end
         host, port = proxy.host, proxy.port
       end
@@ -216,15 +206,8 @@ module WEBrick
         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
diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb
index 1d32293a27..8943a037ff 100644
--- a/lib/webrick/httprequest.rb
+++ b/lib/webrick/httprequest.rb
@@ -27,13 +27,11 @@ module WEBrick
     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
+    attr_reader :request_uri, :host, :port, :path, :query_string
+    attr_accessor :script_name, :path_info
 
     # 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
@@ -58,10 +56,6 @@ module WEBrick
       @raw_header = Array.new
       @header = nil
       @cookies = []
-      @accept = []
-      @accept_charset = []
-      @accept_encoding = []
-      @accept_language = []
       @body = ""
 
       @addr = @peeraddr = nil
@@ -89,10 +83,6 @@ module WEBrick
         @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 == "*"
@@ -134,14 +124,6 @@ module WEBrick
       @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]
@@ -192,7 +174,7 @@ module WEBrick
       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_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]
@@ -256,8 +238,7 @@ module WEBrick
       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]
+        host, port = self['host'].split(":", 2)
       elsif @addr.size > 0
         host, port = @addr[2], @addr[1]
       else
@@ -307,12 +288,7 @@ module WEBrick
     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
+        data = read_data(socket, chunk_size) # read chunk-data
         if data.nil? || data.size != chunk_size
           raise BadRequest, "bad chunk data size."
         end
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
index 62156b1abd..a0e7155ce6 100644
--- a/lib/webrick/httpresponse.rb
+++ b/lib/webrick/httpresponse.rb
@@ -63,24 +63,6 @@ module WEBrick
       @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
@@ -132,7 +114,7 @@ module WEBrick
         end
       end
 
-      # Determine the message length (RFC2616 -- 4.4 Message Length)
+      # Determin the message length (RFC2616 -- 4.4 Message Length)
       if @status == 304 || @status == 204 || HTTPStatus::info?(@status)
         @header.delete('content-length')
         @body = ""
@@ -254,27 +236,24 @@ module WEBrick
     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
+      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
-      ensure
-        @body.close
+        _write_data(socket, "0#{CRLF}#{CRLF}")
+      else
+        size = @header['content-length'].to_i
+        _send_file(socket, @body, 0, size.to_i)
+        @sent_size = size
       end
+      @body.close
     end
 
     def send_body_string(socket)
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index 9edb0018f8..11227cf517 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -36,37 +36,25 @@ module WEBrick
           [ $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)
+          if handler = @config[:RequestHandler]
+            handler.call(req, res)
           end
-          server.service(req, res)
+          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
@@ -77,7 +65,7 @@ module WEBrick
           if req.request_line
             req.fixup()
             res.send_response(sock)
-            server.access_log(@config, req, res)
+            access_log(@config, req, res)
           end
         end
         break if @http_version < "1.1"
@@ -120,7 +108,7 @@ module WEBrick
     end
 
     def unmount(dir)
-      @logger.debug(sprintf("unmount %s.", dir))
+      @logger.debug(sprintf("unmount %s.", inspect, dir))
       @mount_tab.delete(dir)
     end
     alias umount unmount
@@ -133,26 +121,6 @@ module WEBrick
       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|
diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb
index 5375c4622d..03861e8fc7 100644
--- a/lib/webrick/httpservlet/abstract.rb
+++ b/lib/webrick/httpservlet/abstract.rb
@@ -58,7 +58,7 @@ module WEBrick
 
       def redirect_to_directory_uri(req, res)
         if req.path[-1] != ?/
-          location = WEBrick::HTTPUtils.escape_path(req.path + "/")
+          location = req.path + "/"
           if req.query_string && req.query_string.size > 0
             location << "?" << req.query_string
           end
diff --git a/lib/webrick/httpservlet/cgi_runner.rb b/lib/webrick/httpservlet/cgi_runner.rb
index 006abd458e..1069a68d58 100644
--- a/lib/webrick/httpservlet/cgi_runner.rb
+++ b/lib/webrick/httpservlet/cgi_runner.rb
@@ -39,9 +39,7 @@ dir = File::dirname(ENV["SCRIPT_FILENAME"])
 Dir::chdir dir
 
 if interpreter = ARGV[0]
-  argv = ARGV.dup
-  argv << ENV["SCRIPT_FILENAME"]
-  exec(*argv)
+  exec(interpreter, ENV["SCRIPT_FILENAME"])
   # NOTREACHED
 end
 exec ENV["SCRIPT_FILENAME"]
diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb
index d5895e5285..aa92bb4a2c 100644
--- a/lib/webrick/httpservlet/cgihandler.rb
+++ b/lib/webrick/httpservlet/cgihandler.rb
@@ -41,9 +41,6 @@ module WEBrick
           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)
@@ -58,8 +55,8 @@ module WEBrick
           end
         ensure
           cgi_in.close
-          status = $?.exitstatus
-          sleep 0.1 if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
+          status = $? >> 8
+          sleep 0.1 if /mswin/ =~ RUBY_PLATFORM
           data = cgi_out.read
           cgi_out.close(true)
           if errmsg = cgi_err.read
@@ -77,7 +74,7 @@ module WEBrick
         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?
+          "The server encontered a script error." if body.nil?
 
         begin
           header = HTTPUtils::parse_header(raw_header)
@@ -85,16 +82,6 @@ module WEBrick
             res.status = $1.to_i
             header.delete('status')
           end
-          if header.has_key?('location')
-            # RFC 3875 6.2.3, 6.2.4
-            res.status = 302 unless (300...400) === res.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
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb
index b9d5e65b65..40b7a57610 100644
--- a/lib/webrick/httpservlet/erbhandler.rb
+++ b/lib/webrick/httpservlet/erbhandler.rb
@@ -29,8 +29,7 @@ module WEBrick
         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])
+          res['content-type'] = "text/html"
         rescue StandardError => ex
           raise
         rescue Exception => ex
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index 24f59d7142..9e1a439b14 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -51,7 +51,7 @@ module WEBrick
               return true
             end
           rescue
-            if HTTPUtils::split_header_value(ir).member?(res['etag'])
+            if HTTPUtils::split_header_valie(ir).member?(res['etag'])
               return true
             end
           end
@@ -72,15 +72,13 @@ module WEBrick
       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']}\""
+          raise BadRequest, "Unrecognized range-spec: \"#{range}\""
         end
         open(filename, "rb"){|io|
           if ranges.size > 1
-            time = Time.now
             boundary = "#{time.sec}_#{time.usec}_#{Process::pid}"
             body = ''
-            ranges.each{|range|
+            ranges.each{|r|
               first, last = prepare_range(range, filesize)
               next if first < 0
               io.pos = first
@@ -94,8 +92,6 @@ module WEBrick
             }
             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
@@ -126,7 +122,7 @@ module WEBrick
     end
 
     class FileHandler < AbstractServlet
-      HandlerTable = Hash.new
+      HandlerTable = Hash.new(DefaultFileHandler)
 
       def self.add_handler(suffix, handler)
         HandlerTable[suffix] = handler
@@ -139,7 +135,7 @@ module WEBrick
       def initialize(server, root, options={}, default=Config::FileHandler)
         @config = server.config
         @logger = @config[:Logger]
-        @root = File.expand_path(root)
+        @root = root
         if options == true || options == false
           options = { :FancyIndexing => options }
         end
@@ -163,7 +159,6 @@ module WEBrick
             end
           end
         end
-        prevent_directory_traversal(req, res)
         super(req, res)
       end
 
@@ -199,38 +194,11 @@ module WEBrick
 
       private
 
-      def trailing_pathsep?(path)
-        # check for trailing path separator:
-        #   File.dirname("/aaaa/bbbb/")      #=> "/aaaa")
-        #   File.dirname("/aaaa/bbbb/x")     #=> "/aaaa/bbbb")
-        #   File.dirname("/aaaa/bbbb")       #=> "/aaaa")
-        #   File.dirname("/aaaa/bbbbx")      #=> "/aaaa")
-        return File.dirname(path) != File.dirname(path+"x")
-      end
-
-      def prevent_directory_traversal(req, res)
-        # Preventing directory traversal on Windows platforms;
-        # Backslashes (0x5c) in path_info are not interpreted as special
-        # character in URI notation. So the value of path_info should be
-        # normalize before accessing to the filesystem.
-
-        if trailing_pathsep?(req.path_info)
-          # File.expand_path removes the trailing path separator.
-          # Adding a character is a workaround to save it.
-          #  File.expand_path("/aaa/")        #=> "/aaa"
-          #  File.expand_path("/aaa/" + "x")  #=> "/aaa/x"
-          expanded = File.expand_path(req.path_info + "x")
-          expanded.chop!  # remove trailing "x"
-        else
-          expanded = File.expand_path(req.path_info)
-        end
-        req.path_info = expanded
-      end
-
       def exec_handler(req, res)
         raise HTTPStatus::NotFound, "`#{req.path}' not found" unless @root
         if set_filename(req, res)
-          handler = get_handler(req, res)
+          suffix = (/\.(\w+)$/ =~ res.filename) && $1
+          handler = @options[:HandlerTable][suffix] || HandlerTable[suffix]
           call_callback(:HandlerCallback, req, res)
           h = handler.get_instance(@config, res.filename)
           h.service(req, res)
@@ -240,119 +208,47 @@ module WEBrick
         return false
       end
 
-      def get_handler(req, res)
-        suffix1 = (/\.(\w+)\z/ =~ res.filename) && $1.downcase
-        if /\.(\w+)\.([\w\-]+)\z/ =~ res.filename
-          if @options[:AcceptableLanguages].include?($2.downcase)
-            suffix2 = $1.downcase
-          end
-        end
-        handler_table = @options[:HandlerTable]
-        return handler_table[suffix1] || handler_table[suffix2] ||
-               HandlerTable[suffix1] || HandlerTable[suffix2] ||
-               DefaultFileHandler
-      end
-
       def set_filename(req, res)
+        handler = nil
         res.filename = @root.dup
         path_info = req.path_info.scan(%r|/[^/]*|)
 
-        path_info.unshift("")  # dummy for checking @root dir
-        while base = path_info.first
-          break if base == "/"
-          break unless File.directory?(File.expand_path(res.filename + base))
-          shift_path_info(req, res, path_info)
-          call_callback(:DirectoryCallback, req, res)
-        end
+        while name = path_info.shift
+          if name == "/"
+            indices = @config[:DirectoryIndex]
+            index = indices.find{|i| FileTest::file?("#{res.filename}/#{i}") }
+            name = "/#{index}" if index
+          end
+          res.filename << name
+          req.script_name << name
+          req.path_info = path_info.join
+
+          if File::fnmatch("/#{@options[:NondisclosureName]}", name)
+            @logger.log(Log::WARN,
+               "the request refers nondisclosure name `#{name}'.")
+            raise HTTPStatus::Forbidden, "`#{req.path}' not found."
+          end
+          st = (File::stat(res.filename) rescue nil)
+          raise HTTPStatus::NotFound, "`#{req.path}' not found." unless st
+          raise HTTPStatus::Forbidden,
+            "no access permission to `#{req.path}'." unless st.readable?
 
-        if base = path_info.first
-          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)
+          if st.directory?
+            call_callback(:DirectoryCallback, req, res)
+          else
             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)
-        if nondisclosure_name?(name) || windows_ambiguous_name?(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 = File.expand_path(res.filename + base)
-        check_filename(req, res, File.basename(res.filename))
-      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 windows_ambiguous_name?(name)
-        return true if /[. ]+\z/ =~ name
-        return true if /::\$DATA\z/ =~ name
-        return false
-      end
-
-      def nondisclosure_name?(name)
-        @options[:NondisclosureName].each{|pattern|
-          if File.fnmatch(pattern, name, File::FNM_CASEFOLD)
-            return true
-          end
-        }
-        return false
-      end
-
       def set_dir_list(req, res)
         redirect_to_directory_uri(req, res)
         unless @options[:FancyIndexing]
@@ -361,9 +257,8 @@ module WEBrick
         local_path = res.filename
         list = Dir::entries(local_path).collect{|name|
           next if name == "." || name == ".."
-          next if nondisclosure_name?(name)
-          next if windows_ambiguous_name?(name)
-          st = (File::stat(File.join(local_path, name)) rescue nil)
+          next if File::fnmatch(@options[:NondisclosureName], name)
+          st = (File::stat(local_path + name) rescue nil)
           if st.nil?
             [ name, nil, -1 ]
           elsif st.directory?
@@ -403,7 +298,7 @@ module WEBrick
         res.body << "<A HREF=\"?S=#{d1}\">Size</A>\n"
         res.body << "<HR>\n"
        
-        list.unshift [ "..", File::mtime(local_path+"/.."), -1 ]
+        list.unshift [ "..", File::mtime(local_path+".."), -1 ]
         list.each{ |name, time, size|
           if name == ".."
             dname = "Parent Directory"
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index c57af2c860..78780c4976 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -115,9 +115,10 @@ module WEBrick
     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"
+      if suffix = (/\.(\w+)$/ =~ filename && $1)
+        mtype = mime_tab[suffix.downcase]
+      end
+      mtype || "application/octet-stream"
     end
     module_function :mime_type
 
@@ -128,7 +129,7 @@ module WEBrick
       field = nil
       raw.each{|line|
         case line
-        when /^([A-Za-z0-9!\#$%&'*+\-.^_`|~]+):\s*(.*?)\s*\z/om
+        when /^([A-Za-z0-9_\-]+):\s*(.*?)\s*\z/om
           field, value = $1, $2
           field.downcase!
           header[field] = [] unless header.has_key?(field)
@@ -166,7 +167,7 @@ module WEBrick
           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
+          when /^(\d+)/       then -($1.to_i) .. -1
           else return nil
           end
         }
@@ -174,24 +175,6 @@ module WEBrick
     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)
@@ -294,7 +277,6 @@ module WEBrick
       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)
@@ -353,18 +335,15 @@ module WEBrick
     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
+    module_function :_make_regex, :_escape, :_unescape
 
-    UNESCAPED = _make_regex(control+space+delims+unwise+nonascii)
+    UNESCAPED = _make_regex(control+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)
@@ -384,16 +363,12 @@ module WEBrick
       _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
+
+    module_function :escape, :unescape, :escape_form, :unescape_form,
+                    :escape8bit
+
   end
 end
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 16dbd46f98..93e3b2ccf5 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -31,9 +31,9 @@ module WEBrick
       exit!(0) if fork
       Dir::chdir("/")
       File::umask(0)
-      STDIN.reopen("/dev/null")
-      STDOUT.reopen("/dev/null", "w")
-      STDERR.reopen("/dev/null", "w")
+      [ STDIN, STDOUT, STDERR ].each{|io|
+        io.reopen("/dev/null", "r+")
+      }
       yield if block_given?
     end
   end
@@ -61,9 +61,6 @@ module WEBrick
           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
 
@@ -91,15 +88,17 @@ module WEBrick
             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
+                sock = svr.accept
+                sock.sync = true
+                Utils::set_close_on_exec(sock)
+                th = start_thread(sock, &block)
+                th[:WEBrickThread] = true
+                thgroup.add(th)
               }
             end
+          rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPROTO => ex
+            # TCP connection was established but RST segment was sent
+            # from peer before calling TCPServer#accept.
           rescue Errno::EBADF, IOError => ex
             # if the listening socket was closed in GenericServer#shutdown,
             # IO::select raise it.
@@ -141,34 +140,12 @@ module WEBrick
 
     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
+          addr = sock.peeraddr
+          @logger.debug "accept: #{addr[3]}:#{addr[1]}"
           call_callback(:AcceptCallback, sock)
           block ? block.call(sock) : run(sock)
         rescue Errno::ENOTCONN
@@ -179,7 +156,6 @@ module WEBrick
         rescue Exception => ex
           @logger.error ex
         ensure
-          @tokens.push(nil)
           Thread.current[:WEBrickSocket] = nil
           if addr
             @logger.debug "close: #{addr[3]}:#{addr[1]}"
@@ -188,6 +164,7 @@ module WEBrick
           end
           sock.close
         end
+        @tokens.push(nil)
       }
     end
 
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
index 03bfdf4aa0..4562ba4948 100644
--- a/lib/webrick/ssl.rb
+++ b/lib/webrick/ssl.rb
@@ -14,7 +14,7 @@ module WEBrick
     osslv = ::OpenSSL::OPENSSL_VERSION.split[1]
     SSL = {
       :ServerSoftware       => "#{svrsoft} OpenSSL/#{osslv}",
-      :SSLEnable            => false,
+      :SSLEnable            => true,
       :SSLCertificate       => nil,
       :SSLPrivateKey        => nil,
       :SSLClientCA          => nil,
diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb
index cf9da6f2ce..41b54271c7 100644
--- a/lib/webrick/utils.rb
+++ b/lib/webrick/utils.rb
@@ -18,14 +18,6 @@ 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)
@@ -57,9 +49,6 @@ module WEBrick
     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
@@ -69,9 +58,8 @@ module WEBrick
       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
+          logger.debug("TCPServer.new(#{ai[3]}, #{ai[1]})") if logger
+          sock = TCPServer.new(ai[3], ai[1])
           Utils::set_close_on_exec(sock)
           sockets << sock
         rescue => ex
diff --git a/lib/wsdl/binding.rb b/lib/wsdl/binding.rb
index 58a21d820d..e8c9d5be9d 100644
--- a/lib/wsdl/binding.rb
+++ b/lib/wsdl/binding.rb
@@ -52,7 +52,7 @@ class Binding < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value.source)
+      @name = XSD::QName.new(targetnamespace, value)
     when TypeAttrName
       @type = value
     else
diff --git a/lib/wsdl/data.rb b/lib/wsdl/data.rb
index 45eaad8526..8a14dd14d7 100644
--- a/lib/wsdl/data.rb
+++ b/lib/wsdl/data.rb
@@ -6,7 +6,6 @@
 # either the dual license version in 2003, or any later version.
 
 
-require 'xsd/qname'
 require 'wsdl/documentation'
 require 'wsdl/definitions'
 require 'wsdl/types'
diff --git a/lib/wsdl/definitions.rb b/lib/wsdl/definitions.rb
index 5235037cfe..561a335744 100644
--- a/lib/wsdl/definitions.rb
+++ b/lib/wsdl/definitions.rb
@@ -18,16 +18,19 @@ class Definitions < Info
   attr_reader :targetnamespace
   attr_reader :imports
 
-  attr_accessor :location
-  attr_reader :importedschema
+  # Overrides Info#root
+  def root
+    @root
+  end
+
+  def root=(root)
+    @root = root
+  end
 
   def initialize
     super
     @name = nil
     @targetnamespace = nil
-    @location = nil
-    @importedschema = {}
-
     @types = nil
     @imports = []
     @messages = XSD::NamedElements.new
@@ -40,7 +43,8 @@ class Definitions < Info
   end
 
   def inspect
-    sprintf("#<%s:0x%x %s>", self.class.name, __id__, @name || '(unnamed)')
+    name = @name || '(unnamed)'
+    "#<#{self.class}:#{name}>"
   end
 
   def targetnamespace=(targetnamespace)
@@ -50,24 +54,11 @@ class Definitions < Info
     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)
+	result.concat(schema.elements)
       end
     end
     @imports.each do |import|
@@ -80,7 +71,7 @@ class Definitions < Info
     result = @anontypes.dup
     if @types
       @types.schemas.each do |schema|
-	result.concat(schema.collect_complextypes)
+	result.concat(schema.complextypes)
       end
     end
     @imports.each do |import|
@@ -89,20 +80,6 @@ class Definitions < Info
     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
@@ -226,9 +203,9 @@ class Definitions < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value.source)
+      @name = XSD::QName.new(@targetnamespace, value)
     when TargetNamespaceAttrName
-      self.targetnamespace = value.source
+      self.targetnamespace = value
     else
       nil
     end
diff --git a/lib/wsdl/import.rb b/lib/wsdl/import.rb
index faf60871a5..ab244f6ca6 100644
--- a/lib/wsdl/import.rb
+++ b/lib/wsdl/import.rb
@@ -39,29 +39,19 @@ class Import < Info
   def parse_attr(attr, value)
     case attr
     when NamespaceAttrName
-      @namespace = value.source
+      @namespace = value
       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
+      @location = value
+      @content = import(@location)
+      if @content.is_a?(Definitions)
+	@content.root = root
+	if @namespace
+	  @content.targetnamespace = @namespace
+	end
       end
       @location
     else
@@ -72,7 +62,7 @@ class Import < Info
 private
 
   def import(location)
-    Importer.import(location, root)
+    Importer.import(location)
   end
 end
 
diff --git a/lib/wsdl/importer.rb b/lib/wsdl/importer.rb
index 481bd81b25..fac02b51a0 100644
--- a/lib/wsdl/importer.rb
+++ b/lib/wsdl/importer.rb
@@ -1,37 +1,72 @@
 # WSDL4R - WSDL importer library.
-# Copyright (C) 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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/xmlSchema/importer'
+require 'wsdl/info'
 require 'wsdl/parser'
+require 'soap/soap'
+require 'soap/property'
 
 
 module WSDL
 
 
-class Importer < WSDL::XMLSchema::Importer
-  def self.import(location, originalroot = nil)
-    new.import(location, originalroot)
+class Importer
+  def self.import(location)
+    new.import(location)
   end
 
-private
+  def initialize
+    @web_client = nil
+  end
 
-  def parse(content, location, originalroot)
-    opt = {
-      :location => location,
-      :originalroot => originalroot
-    }
+  def import(location)
+    content = nil
+    if FileTest.exist?(location)
+      content = File.open(location).read
+    else
+      client = web_client.new(nil, "WSDL4R")
+      if opt = ::SOAP::Property.loadproperty(::SOAP::PropertyName)
+	client.proxy = opt["client.protocol.http.proxy"]
+	client.no_proxy = opt["client.protocol.http.no_proxy"]
+      end
+      client.proxy ||= ::SOAP::Env::HTTP_PROXY
+      client.no_proxy ||= ::SOAP::Env::NO_PROXY
+      content = client.get_content(location)
+    end
+    opt = {}
     begin
       WSDL::Parser.new(opt).parse(content)
-    rescue WSDL::Parser::ParseError
-      super(content, location, originalroot)
+    rescue WSDL::Parser::ParseError => orgexcn
+      begin
+	require 'wsdl/xmlSchema/parser'
+	WSDL::XMLSchema::Parser.new(opt).parse(content)
+      rescue
+	raise orgexcn
+      end
     end
   end
 
+private
+
+  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
+	STDERR.puts "Loading http-access2 failed.  Net/http is used." if $DEBUG
+	require 'soap/netHttpClient'
+	::SOAP::NetHttpClient
+      end
+    @web_client
+  end
 end
 
 
diff --git a/lib/wsdl/info.rb b/lib/wsdl/info.rb
index ffd90390a4..657ff5863a 100644
--- a/lib/wsdl/info.rb
+++ b/lib/wsdl/info.rb
@@ -10,22 +10,16 @@ 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
+  def root
+    @parent.root
   end
 
   def parse_element(element); end	# abstract
diff --git a/lib/wsdl/message.rb b/lib/wsdl/message.rb
index cecc602da3..a346708cf4 100644
--- a/lib/wsdl/message.rb
+++ b/lib/wsdl/message.rb
@@ -43,7 +43,7 @@ class Message < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = XSD::QName.new(parent.targetnamespace, value.source)
+      @name = XSD::QName.new(parent.targetnamespace, value)
     else
       nil
     end
diff --git a/lib/wsdl/operation.rb b/lib/wsdl/operation.rb
index fb7f4a80f4..be28446d34 100644
--- a/lib/wsdl/operation.rb
+++ b/lib/wsdl/operation.rb
@@ -46,23 +46,21 @@ class Operation < Info
   end
 
   def input_info
-    typename = input.find_message.name
-    NameInfo.new(@name, typename, inputparts)
+    op_name = @name
+    optype_name = XSD::QName.new(targetnamespace, input.name ? input.name.name : @name.name)
+    NameInfo.new(op_name, optype_name, inputparts)
   end
 
   def output_info
-    typename = output.find_message.name
-    NameInfo.new(@name, typename, outputparts)
+    op_name = @name
+    optype_name = XSD::QName.new(targetnamespace, output.name ? output.name.name : @name.name)
+    NameInfo.new(op_name, optype_name, 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
@@ -97,11 +95,11 @@ class Operation < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value.source)
+      @name = XSD::QName.new(targetnamespace, value)
     when TypeAttrName
       @type = value
     when ParameterOrderAttrName
-      @parameter_order = value.source.split(/\s+/)
+      @parameter_order = value.split(/\s+/)
     else
       nil
     end
@@ -120,8 +118,9 @@ private
     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.
+    if parts.length != result.length
+      raise RuntimeError.new("Incomplete prarmeterOrder list.")
+    end
     result
   end
 end
diff --git a/lib/wsdl/operationBinding.rb b/lib/wsdl/operationBinding.rb
index c2b8cd6591..4c04a884ea 100644
--- a/lib/wsdl/operationBinding.rb
+++ b/lib/wsdl/operationBinding.rb
@@ -37,35 +37,7 @@ class OperationBinding < Info
   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
+    porttype.operations[@name]
   end
 
   def parse_element(element)
@@ -97,7 +69,7 @@ class OperationBinding < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value.source)
+      @name = XSD::QName.new(targetnamespace, value)
     else
       nil
     end
diff --git a/lib/wsdl/param.rb b/lib/wsdl/param.rb
index b6836b7def..06dd3beb7e 100644
--- a/lib/wsdl/param.rb
+++ b/lib/wsdl/param.rb
@@ -33,15 +33,7 @@ class Param < Info
   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
+    root.message(@message)
   end
 
   def parse_element(element)
@@ -69,12 +61,9 @@ class Param < Info
   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)
+      @name = XSD::QName.new(targetnamespace, value)
     else
       nil
     end
diff --git a/lib/wsdl/parser.rb b/lib/wsdl/parser.rb
index f96e96ee2a..7e7a4d8bce 100644
--- a/lib/wsdl/parser.rb
+++ b/lib/wsdl/parser.rb
@@ -1,5 +1,5 @@
 # WSDL4R - WSDL XML Instance parser library.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -53,9 +53,6 @@ public
     @parser = XSD::XMLParser.create_parser(self, opt)
     @parsestack = nil
     @lastnode = nil
-    @ignored = {}
-    @location = opt[:location]
-    @originalroot = opt[:originalroot]
   end
 
   def parse(string_or_readable)
@@ -99,7 +96,7 @@ public
   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}'")
+      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
@@ -109,42 +106,41 @@ private
 
   def decode_tag(ns, name, attrs, parent)
     o = nil
-    elename = ns.parse(name)
+    element = ns.parse(name)
     if !parent
-      if elename == DefinitionsName
-	o = Definitions.parse_element(elename)
-        o.location = @location
+      if element == DefinitionsName
+	o = Definitions.parse_element(element)
       else
-	raise UnknownElementError.new("unknown element: #{elename}")
+	raise UnknownElementError.new("Unknown element #{ element }.")
       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
+      o = parent.parse_element(element)
       unless o
-        unless @ignored.key?(elename)
-          warn("ignored element: #{elename}")
-          @ignored[elename] = elename
-        end
+	STDERR.puts("Unknown element #{ element }.")
 	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?
+      o.parent = parent
     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
+      attr = unless /:/ =~ key
+	  XSD::QName.new(nil, key)
+	else
+	  ns.parse(key)
+	end
+      value_ele = if /:/ !~ value
+	  value
+	elsif /^http:\/\// =~ value	# ToDo: ugly.
+	  value
+	else
+	  begin
+	    ns.parse(value)
+	  rescue
+	    value
+	  end
+	end
+      unless o.parse_attr(attr, value_ele)
+	STDERR.puts("Unknown attr #{ attr }.")
+	# raise UnknownAttributeError.new("Unknown attr #{ attr }.")
       end
     end
     o
diff --git a/lib/wsdl/part.rb b/lib/wsdl/part.rb
index 5dafd4ee73..30f71f15d9 100644
--- a/lib/wsdl/part.rb
+++ b/lib/wsdl/part.rb
@@ -37,7 +37,7 @@ class Part < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = value.source
+      @name = value
     when ElementAttrName
       @element = value
     when TypeAttrName
diff --git a/lib/wsdl/port.rb b/lib/wsdl/port.rb
index 883cc3232d..e6553f1287 100644
--- a/lib/wsdl/port.rb
+++ b/lib/wsdl/port.rb
@@ -33,7 +33,7 @@ class Port < Info
   end
 
   def find_binding
-    root.binding(@binding) or raise RuntimeError.new("#{@binding} not found")
+    root.binding(@binding)
   end
 
   def inputoperation_map
@@ -71,7 +71,7 @@ class Port < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value.source)
+      @name = XSD::QName.new(targetnamespace, value)
     when BindingAttrName
       @binding = value
     else
diff --git a/lib/wsdl/portType.rb b/lib/wsdl/portType.rb
index 03e37690a8..e3cf9b51ec 100644
--- a/lib/wsdl/portType.rb
+++ b/lib/wsdl/portType.rb
@@ -28,8 +28,7 @@ class PortType < Info
   end
 
   def find_binding
-    root.bindings.find { |item| item.type == @name } or
-      raise RuntimeError.new("#{@name} not found")
+    root.bindings.find { |item| item.type == @name }
   end
 
   def locations
@@ -62,7 +61,7 @@ class PortType < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value.source)
+      @name = XSD::QName.new(targetnamespace, value)
     else
       nil
     end
diff --git a/lib/wsdl/service.rb b/lib/wsdl/service.rb
index 652b127331..0e0843a098 100644
--- a/lib/wsdl/service.rb
+++ b/lib/wsdl/service.rb
@@ -50,7 +50,7 @@ class Service < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value.source)
+      @name = XSD::QName.new(targetnamespace, value)
     else
       nil
     end
diff --git a/lib/wsdl/soap/address.rb b/lib/wsdl/soap/address.rb
index 0b2b59caf0..e4558e4ff8 100644
--- a/lib/wsdl/soap/address.rb
+++ b/lib/wsdl/soap/address.rb
@@ -28,7 +28,7 @@ class Address < Info
   def parse_attr(attr, value)
     case attr
     when LocationAttrName
-      @location = value.source
+      @location = value
     else
       nil
     end
diff --git a/lib/wsdl/soap/binding.rb b/lib/wsdl/soap/binding.rb
index 7e15a99701..1cfe9b9cc4 100644
--- a/lib/wsdl/soap/binding.rb
+++ b/lib/wsdl/soap/binding.rb
@@ -30,14 +30,13 @@ class Binding < Info
   def parse_attr(attr, value)
     case attr
     when StyleAttrName
-      if ["document", "rpc"].include?(value.source)
-	@style = value.source.intern
+      if ["document", "rpc"].include?(value)
+	@style = value.intern
       else
-	raise Parser::AttributeConstraintError.new(
-          "Unexpected value #{ value }.")
+	raise AttributeConstraintError.new("Unexpected value #{ value }.")
       end
     when TransportAttrName
-      @transport = value.source
+      @transport = value
     else
       nil
     end
diff --git a/lib/wsdl/soap/body.rb b/lib/wsdl/soap/body.rb
index 824f8121a2..47de6b1e1a 100644
--- a/lib/wsdl/soap/body.rb
+++ b/lib/wsdl/soap/body.rb
@@ -34,17 +34,13 @@ class Body < Info
   def parse_attr(attr, value)
     case attr
     when PartsAttrName
-      @parts = value.source
+      @parts = value
     when UseAttrName
-      if ['literal', 'encoded'].include?(value.source)
-        @use = value.source.intern
-      else
-        raise RuntimeError.new("unknown use of soap:body: #{value.source}")
-      end
+      @use = value
     when EncodingStyleAttrName
-      @encodingstyle = value.source
+      @encodingstyle = value
     when NamespaceAttrName
-      @namespace = value.source
+      @namespace = value
     else
       nil
     end
diff --git a/lib/wsdl/soap/cgiStubCreator.rb b/lib/wsdl/soap/cgiStubCreator.rb
deleted file mode 100644
index 2c4dff2f62..0000000000
--- a/lib/wsdl/soap/cgiStubCreator.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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/lib/wsdl/soap/classDefCreator.rb b/lib/wsdl/soap/classDefCreator.rb
deleted file mode 100644
index aeb67c0613..0000000000
--- a/lib/wsdl/soap/classDefCreator.rb
+++ /dev/null
@@ -1,314 +0,0 @@
-# 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/lib/wsdl/soap/classDefCreatorSupport.rb b/lib/wsdl/soap/classDefCreatorSupport.rb
deleted file mode 100644
index 8f335653c8..0000000000
--- a/lib/wsdl/soap/classDefCreatorSupport.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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/lib/wsdl/soap/clientSkeltonCreator.rb b/lib/wsdl/soap/clientSkeltonCreator.rb
deleted file mode 100644
index 916f0d4dc0..0000000000
--- a/lib/wsdl/soap/clientSkeltonCreator.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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/lib/wsdl/soap/complexType.rb b/lib/wsdl/soap/complexType.rb
index b2e13d0564..34fc18f1a4 100644
--- a/lib/wsdl/soap/complexType.rb
+++ b/lib/wsdl/soap/complexType.rb
@@ -7,7 +7,6 @@
 
 
 require 'wsdl/xmlSchema/complexType'
-require 'soap/mapping'
 
 
 module WSDL
@@ -21,28 +20,15 @@ class ComplexType < Info
 
   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
+      if content.elements.size == 1 and content.elements[0].maxoccurs != 1
+	:TYPE_ARRAY
       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
+    elsif complexcontent and complexcontent.base == ::SOAP::ValueArrayName
+      :TYPE_ARRAY
+    else
+      raise NotImplementedError.new("Unknown kind of complexType.")
     end
   end
 
@@ -53,28 +39,18 @@ class ComplexType < Info
         ele.type
       elsif ele = find_element_by_name(name.name)
 	ele.type
+      else
+        nil
       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
+    when :TYPE_STRUCT
       unless ele = find_element(name)
        	if name.namespace.nil?
   	  ele = find_element_by_name(name.name)
@@ -105,45 +81,15 @@ class ComplexType < Info
 	  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
+    elsif content.elements.size == 1 and content.elements[0].maxoccurs != 1
+      return content.elements[0].type
     else
-      nil
+      raise RuntimeError.new("Assert: Unknown array definition.")
     end
+    nil
   end
 
-  def check_array_content(content)
-    content and content.elements.size == 1 and
-      content.elements[0].maxoccurs != '1'
-  end
+private
 
   def content_arytype
     if arytype = find_arytype
diff --git a/lib/wsdl/soap/data.rb b/lib/wsdl/soap/data.rb
index 48512d3751..23aaff83b5 100644
--- a/lib/wsdl/soap/data.rb
+++ b/lib/wsdl/soap/data.rb
@@ -11,7 +11,6 @@ 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'
diff --git a/lib/wsdl/soap/definitions.rb b/lib/wsdl/soap/definitions.rb
index b014d5af6b..7a62242204 100644
--- a/lib/wsdl/soap/definitions.rb
+++ b/lib/wsdl/soap/definitions.rb
@@ -1,5 +1,5 @@
 # WSDL4R - WSDL additional definitions for SOAP.
-# Copyright (C) 2002-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -75,49 +75,21 @@ class Definitions < Info
     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)
+	  type = XMLSchema::ComplexType.new(operation_input_name(operation))
 	  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)
+	  type = XMLSchema::ComplexType.new(operation_output_name(operation))
 	  message = messages[operation.output.message]
 	  type.sequence_elements = elements_from_message(message)
 	  types << type
@@ -127,20 +99,23 @@ private
     types
   end
 
+  def operation_input_name(operation)
+    operation.input.name || operation.name
+  end
+
+  def operation_output_name(operation)
+    operation.output.name ||
+      XSD::QName.new(operation.name.namespace, operation.name.name + "Response")
+  end
+
   def op_bind_rpc?(op_bind)
-    op_bind.soapoperation_style == :rpc
+    op_bind.soapoperation and op_bind.soapoperation.operation_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
+      qname = XSD::QName.new(nil, part.name)
+      XMLSchema::Element.new(qname, part.type)
     }
   end
 end
diff --git a/lib/wsdl/soap/driverCreator.rb b/lib/wsdl/soap/driverCreator.rb
deleted file mode 100644
index eba7c158a2..0000000000
--- a/lib/wsdl/soap/driverCreator.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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/lib/wsdl/soap/element.rb b/lib/wsdl/soap/element.rb
deleted file mode 100644
index 0fa6017c5b..0000000000
--- a/lib/wsdl/soap/element.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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/lib/wsdl/soap/fault.rb b/lib/wsdl/soap/fault.rb
index 2862b659ab..abd3cbe3dd 100644
--- a/lib/wsdl/soap/fault.rb
+++ b/lib/wsdl/soap/fault.rb
@@ -27,10 +27,6 @@ class Fault < Info
     @namespace = nil
   end
 
-  def targetnamespace
-    parent.targetnamespace
-  end
-
   def parse_element(element)
     nil
   end
@@ -38,13 +34,13 @@ class Fault < Info
   def parse_attr(attr, value)
     case attr
     when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value.source)
+      @name = value
     when UseAttrName
-      @use = value.source
+      @use = value
     when EncodingStyleAttrName
-      @encodingstyle = value.source
+      @encodingstyle = value
     when NamespaceAttrName
-      @namespace = value.source
+      @namespace = value
     else
       nil
     end
diff --git a/lib/wsdl/soap/header.rb b/lib/wsdl/soap/header.rb
index 8d7c4e9d70..f1dd69eafb 100644
--- a/lib/wsdl/soap/header.rb
+++ b/lib/wsdl/soap/header.rb
@@ -32,12 +32,8 @@ class Header < Info
     @headerfault = nil
   end
 
-  def targetnamespace
-    parent.targetnamespace
-  end
-
   def find_message
-    root.message(@message) or raise RuntimeError.new("#{@message} not found")
+    root.message(@message)
   end
 
   def find_part
@@ -46,7 +42,7 @@ class Header < Info
 	return part
       end
     end
-    raise RuntimeError.new("#{@part} not found")
+    nil
   end
 
   def parse_element(element)
@@ -63,18 +59,15 @@ class Header < Info
   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
+      @part = value
     when UseAttrName
-      @use = value.source
+      @use = value
     when EncodingStyleAttrName
-      @encodingstyle = value.source
+      @encodingstyle = value
     when NamespaceAttrName
-      @namespace = value.source
+      @namespace = value
     else
       nil
     end
diff --git a/lib/wsdl/soap/headerfault.rb b/lib/wsdl/soap/headerfault.rb
index d6b14f2646..a6e86661c2 100644
--- a/lib/wsdl/soap/headerfault.rb
+++ b/lib/wsdl/soap/headerfault.rb
@@ -38,13 +38,13 @@ class HeaderFault < Info
     when MessageAttrName
       @message = value
     when PartAttrName
-      @part = value.source
+      @part = value
     when UseAttrName
-      @use = value.source
+      @use = value
     when EncodingStyleAttrName
-      @encodingstyle = value.source
+      @encodingstyle = value
     when NamespaceAttrName
-      @namespace = value.source
+      @namespace = value
     else
       nil
     end
diff --git a/lib/wsdl/soap/mappingRegistryCreator.rb b/lib/wsdl/soap/mappingRegistryCreator.rb
deleted file mode 100644
index 8669339ce4..0000000000
--- a/lib/wsdl/soap/mappingRegistryCreator.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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/lib/wsdl/soap/methodDefCreator.rb b/lib/wsdl/soap/methodDefCreator.rb
deleted file mode 100644
index f3ffadbe69..0000000000
--- a/lib/wsdl/soap/methodDefCreator.rb
+++ /dev/null
@@ -1,228 +0,0 @@
-# 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/lib/wsdl/soap/operation.rb b/lib/wsdl/soap/operation.rb
index 502d34a07d..e50356cf35 100644
--- a/lib/wsdl/soap/operation.rb
+++ b/lib/wsdl/soap/operation.rb
@@ -50,14 +50,13 @@ class Operation < Info
   def parse_attr(attr, value)
     case attr
     when StyleAttrName
-      if ["document", "rpc"].include?(value.source)
-	@style = value.source.intern
+      if ["document", "rpc"].include?(value)
+	@style = value.intern
       else
-	raise Parser::AttributeConstraintError.new(
-          "Unexpected value #{ value }.")
+	raise AttributeConstraintError.new("Unexpected value #{ value }.")
       end
     when SOAPActionAttrName
-      @soapaction = value.source
+      @soapaction = value
     else
       nil
     end
@@ -101,19 +100,18 @@ private
 	"EncodingStyle '#{ soapbody.encodingstyle }' not supported.")
     end
     if soapbody.namespace
-      op_name = XSD::QName.new(soapbody.namespace, op_name.name)
+      op_name = op_name.dup
+      op_name.namespace = soapbody.namespace
     end
     if soapbody.parts
-      target = soapbody.parts.split(/\s+/)
-      bodyparts = name_info.parts.find_all { |part|
-	target.include?(part.name)
-      }
+      raise NotImplementedError.new("soap:body parts")
     else
       bodyparts = name_info.parts
     end
 
     faultpart = nil
-    OperationInfo.new(operation_style, op_name, optype_name, headerparts, bodyparts, faultpart, parent.soapaction)
+    soapaction = parent.soapoperation.soapaction
+    OperationInfo.new(operation_style, op_name, optype_name, headerparts, bodyparts, faultpart, soapaction)
   end
 end
 
diff --git a/lib/wsdl/soap/servantSkeltonCreator.rb b/lib/wsdl/soap/servantSkeltonCreator.rb
deleted file mode 100644
index 88294ffed8..0000000000
--- a/lib/wsdl/soap/servantSkeltonCreator.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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/lib/wsdl/soap/standaloneServerStubCreator.rb b/lib/wsdl/soap/standaloneServerStubCreator.rb
deleted file mode 100644
index 0b751b5153..0000000000
--- a/lib/wsdl/soap/standaloneServerStubCreator.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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/lib/wsdl/soap/wsdl2ruby.rb b/lib/wsdl/soap/wsdl2ruby.rb
deleted file mode 100644
index 16b05fb032..0000000000
--- a/lib/wsdl/soap/wsdl2ruby.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-# 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/lib/wsdl/xmlSchema/all.rb b/lib/wsdl/xmlSchema/all.rb
index bb9566feac..53f7ae82e4 100644
--- a/lib/wsdl/xmlSchema/all.rb
+++ b/lib/wsdl/xmlSchema/all.rb
@@ -20,8 +20,8 @@ class All < Info
 
   def initialize
     super()
-    @minoccurs = '1'
-    @maxoccurs = '1'
+    @minoccurs = 1
+    @maxoccurs = 1
     @elements = []
   end
 
@@ -29,10 +29,6 @@ class All < Info
     parent.targetnamespace
   end
 
-  def elementformdefault
-    parent.elementformdefault
-  end
-
   def <<(element)
     @elements << element
   end
@@ -55,9 +51,9 @@ class All < Info
   def parse_attr(attr, value)
     case attr
     when MaxOccursAttrName
-      @maxoccurs = value.source
+      @maxoccurs = value
     when MinOccursAttrName
-      @minoccurs = value.source
+      @minoccurs = value
     else
       nil
     end
diff --git a/lib/wsdl/xmlSchema/annotation.rb b/lib/wsdl/xmlSchema/annotation.rb
deleted file mode 100644
index 633bd196f1..0000000000
--- a/lib/wsdl/xmlSchema/annotation.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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/lib/wsdl/xmlSchema/any.rb b/lib/wsdl/xmlSchema/any.rb
index 72d25e8dde..3fc3706182 100644
--- a/lib/wsdl/xmlSchema/any.rb
+++ b/lib/wsdl/xmlSchema/any.rb
@@ -21,8 +21,8 @@ class Any < Info
 
   def initialize
     super()
-    @maxoccurs = '1'
-    @minoccurs = '1'
+    @maxoccurs = 1
+    @minoccurs = 1
     @namespace = '##any'
     @process_contents = 'strict'
   end
@@ -38,13 +38,13 @@ class Any < Info
   def parse_attr(attr, value)
     case attr
     when MaxOccursAttrName
-      @maxoccurs = value.source
+      @maxoccurs = value
     when MinOccursAttrName
-      @minoccurs = value.source
+      @minoccurs = value
     when NamespaceAttrName
-      @namespace = value.source
+      @namespace = value
     when ProcessContentsAttrName
-      @process_contents = value.source
+      @process_contents = value
     else
       nil
     end
diff --git a/lib/wsdl/xmlSchema/attribute.rb b/lib/wsdl/xmlSchema/attribute.rb
index f9048661a2..e5046dd991 100644
--- a/lib/wsdl/xmlSchema/attribute.rb
+++ b/lib/wsdl/xmlSchema/attribute.rb
@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema attribute definition for WSDL.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -14,74 +14,31 @@ 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 :use
+  attr_accessor :form
+  attr_accessor :name
+  attr_accessor :type
+  attr_accessor :default
+  attr_accessor :fixed
+
   attr_accessor :arytype
 
   def initialize
     super
+    @ref = nil
     @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
+    @arytype = nil
   end
 
   def parse_element(element)
-    case element
-    when SimpleTypeName
-      @local_simpletype = SimpleType.new
-      @local_simpletype
-    end
+    nil
   end
 
   def parse_attr(attr, value)
@@ -89,37 +46,27 @@ class Attribute < Info
     when RefAttrName
       @ref = value
     when UseAttrName
-      @use = value.source
+      @use = value
     when FormAttrName
-      @form = value.source
+      @form = value
     when NameAttrName
-      if directelement?
-        @name = XSD::QName.new(targetnamespace, value.source)
-      else
-        @name = XSD::QName.new(nil, value.source)
-      end
+      @name = value
     when TypeAttrName
       @type = value
     when DefaultAttrName
-      @default = value.source
+      @default = value
     when FixedAttrName
-      @fixed = value.source
+      @fixed = value
     when ArrayTypeAttrName
-      @arytype = if value.namespace.nil?
-          XSD::QName.new(XSD::Namespace, value.source)
-        else
-          value
-        end
+      @arytype = if value.is_a?(XSD::QName)
+	  value
+	else
+	  XSD::QName.new(XSD::Namespace, value)
+	end
     else
       nil
     end
   end
-
-private
-
-  def directelement?
-    parent.is_a?(Schema)
-  end
 end
 
 
diff --git a/lib/wsdl/xmlSchema/choice.rb b/lib/wsdl/xmlSchema/choice.rb
index f6d27fa38c..4cf481ec9e 100644
--- a/lib/wsdl/xmlSchema/choice.rb
+++ b/lib/wsdl/xmlSchema/choice.rb
@@ -20,8 +20,8 @@ class Choice < Info
 
   def initialize
     super()
-    @minoccurs = '1'
-    @maxoccurs = '1'
+    @minoccurs = 1
+    @maxoccurs = 1
     @elements = []
   end
 
@@ -29,10 +29,6 @@ class Choice < Info
     parent.targetnamespace
   end
 
-  def elementformdefault
-    parent.elementformdefault
-  end
-
   def <<(element)
     @elements << element
   end
@@ -55,9 +51,9 @@ class Choice < Info
   def parse_attr(attr, value)
     case attr
     when MaxOccursAttrName
-      @maxoccurs = value.source
+      @maxoccurs = value
     when MinOccursAttrName
-      @minoccurs = value.source
+      @minoccurs = value
     else
       nil
     end
diff --git a/lib/wsdl/xmlSchema/complexContent.rb b/lib/wsdl/xmlSchema/complexContent.rb
index f7fb6c16b4..22f6851864 100644
--- a/lib/wsdl/xmlSchema/complexContent.rb
+++ b/lib/wsdl/xmlSchema/complexContent.rb
@@ -26,19 +26,6 @@ class ComplexContent < Info
     @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)
diff --git a/lib/wsdl/xmlSchema/complexType.rb b/lib/wsdl/xmlSchema/complexType.rb
index dc9ec954fc..e889482d09 100644
--- a/lib/wsdl/xmlSchema/complexType.rb
+++ b/lib/wsdl/xmlSchema/complexType.rb
@@ -8,7 +8,6 @@
 
 require 'wsdl/info'
 require 'wsdl/xmlSchema/content'
-require 'wsdl/xmlSchema/element'
 require 'xsd/namedelements'
 
 
@@ -19,8 +18,7 @@ module XMLSchema
 class ComplexType < Info
   attr_accessor :name
   attr_accessor :complexcontent
-  attr_accessor :simplecontent
-  attr_reader :content
+  attr_accessor :content
   attr_accessor :final
   attr_accessor :mixed
   attr_reader :attributes
@@ -29,7 +27,6 @@ class ComplexType < Info
     super()
     @name = name
     @complexcontent = nil
-    @simplecontent = nil
     @content = nil
     @final = nil
     @mixed = false
@@ -37,49 +34,30 @@ class ComplexType < Info
   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
+    if @content
+      @content.elements.each do |element|
+	yield(element.name, element)
       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
+    if @content
+      @content.elements.each do |element|
+	return element if name == element.name
       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
+    if @content
+      @content.elements.each do |element|
+	return element if name == element.name.name
       end
     end
     nil
@@ -103,14 +81,16 @@ class ComplexType < Info
     case element
     when AllName
       @content = All.new
+      @content
     when SequenceName
       @content = Sequence.new
+      @content
     when ChoiceName
       @content = Choice.new
+      @content
     when ComplexContentName
       @complexcontent = ComplexContent.new
-    when SimpleContentName
-      @simplecontent = SimpleContent.new
+      @complexcontent
     when AttributeName
       o = Attribute.new
       @attributes << o
@@ -123,11 +103,11 @@ class ComplexType < Info
   def parse_attr(attr, value)
     case attr
     when FinalAttrName
-      @final = value.source
+      @final = value
     when MixedAttrName
-      @mixed = (value.source == 'true')
+      @mixed = (value == 'true')
     when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value.source)
+      @name = XSD::QName.new(targetnamespace, value)
     else
       nil
     end
diff --git a/lib/wsdl/xmlSchema/content.rb b/lib/wsdl/xmlSchema/content.rb
index 2f1dfb4b6c..3aa875e3e7 100644
--- a/lib/wsdl/xmlSchema/content.rb
+++ b/lib/wsdl/xmlSchema/content.rb
@@ -67,9 +67,9 @@ class Content < Info
   def parse_attr(attr, value)
     case attr
     when FinalAttrName
-      @final = value.source
+      @final = value
     when MixedAttrName
-      @mixed = (value.source == 'true')
+      @mixed = (value == 'true')
     else
       nil
     end
diff --git a/lib/wsdl/xmlSchema/data.rb b/lib/wsdl/xmlSchema/data.rb
index 23ab1adf0b..2fa8ad6a91 100644
--- a/lib/wsdl/xmlSchema/data.rb
+++ b/lib/wsdl/xmlSchema/data.rb
@@ -1,22 +1,15 @@
 # WSDL4R - XMLSchema data definitions.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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/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'
@@ -24,32 +17,24 @@ 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')
 
@@ -67,13 +52,11 @@ 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
diff --git a/lib/wsdl/xmlSchema/element.rb b/lib/wsdl/xmlSchema/element.rb
index fffb6485d0..90e8c0d5d1 100644
--- a/lib/wsdl/xmlSchema/element.rb
+++ b/lib/wsdl/xmlSchema/element.rb
@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema element definition for WSDL.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -14,84 +14,31 @@ 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)
+  attr_accessor :name	# required
+  attr_accessor :type
+  attr_accessor :local_complextype
+  attr_accessor :constraint
+  attr_accessor :maxoccurs
+  attr_accessor :minoccurs
+  attr_accessor :nillable
+
+  def initialize(name = nil, type = XSD::AnyTypeName)
     super()
     @name = name
-    @form = nil
     @type = type
-    @local_simpletype = @local_complextype = nil
+    @local_complextype = nil
     @constraint = nil
-    @maxoccurs = '1'
-    @minoccurs = '1'
+    @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
@@ -107,46 +54,49 @@ class Element < Info
   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
+      #@name = XSD::QName.new(nil, value)
+      @name = XSD::QName.new(targetnamespace, value)
     when TypeAttrName
-      @type = value
-    when RefAttrName
-      @ref = value
+      @type = if value.is_a?(XSD::QName)
+	  value
+	else
+	  XSD::QName.new(XSD::Namespace, value)
+	end
     when MaxOccursAttrName
-      if parent.is_a?(All)
-	if value.source != '1'
+      case parent
+      when All
+	if value != '1'
 	  raise Parser::AttrConstraintError.new(
-            "cannot parse #{value} for #{attr}")
+	    "Cannot parse #{ value } for #{ attr }.")
 	end
+	@maxoccurs = value
+      when Sequence
+	@maxoccurs = value
+      else
+	raise NotImplementedError.new
       end
-      @maxoccurs = value.source
+      @maxoccurs
     when MinOccursAttrName
-      if parent.is_a?(All)
-	unless ['0', '1'].include?(value.source)
+      case parent
+      when All
+	if ['0', '1'].include?(value)
+	  @minoccurs = value
+	else
 	  raise Parser::AttrConstraintError.new(
-            "cannot parse #{value} for #{attr}")
+	    "Cannot parse #{ value } for #{ attr }.")
 	end
+      when Sequence
+	@minoccurs = value
+      else
+	raise NotImplementedError.new
       end
-      @minoccurs = value.source
+      @minoccurs
     when NillableAttrName
-      @nillable = (value.source == 'true')
+      @nillable = (value == 'true')
     else
       nil
     end
   end
-
-private
-
-  def directelement?
-    parent.is_a?(Schema)
-  end
 end
 
 
diff --git a/lib/wsdl/xmlSchema/enumeration.rb b/lib/wsdl/xmlSchema/enumeration.rb
deleted file mode 100644
index 5a16476032..0000000000
--- a/lib/wsdl/xmlSchema/enumeration.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/lib/wsdl/xmlSchema/import.rb b/lib/wsdl/xmlSchema/import.rb
index d3487af934..2ef3b72ab2 100644
--- a/lib/wsdl/xmlSchema/import.rb
+++ b/lib/wsdl/xmlSchema/import.rb
@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema import definition.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -7,7 +7,6 @@
 
 
 require 'wsdl/info'
-require 'wsdl/xmlSchema/importer'
 
 
 module WSDL
@@ -17,13 +16,11 @@ 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)
@@ -33,31 +30,13 @@ class Import < Info
   def parse_attr(attr, value)
     case attr
     when NamespaceAttrName
-      @namespace = value.source
+      @namespace = value
     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
+      @schemalocation = value
     else
       nil
     end
   end
-
-private
-
-  def import(location)
-    Importer.import(location, root)
-  end
 end
 
 
diff --git a/lib/wsdl/xmlSchema/importer.rb b/lib/wsdl/xmlSchema/importer.rb
deleted file mode 100644
index f57bfd972a..0000000000
--- a/lib/wsdl/xmlSchema/importer.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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/lib/wsdl/xmlSchema/include.rb b/lib/wsdl/xmlSchema/include.rb
deleted file mode 100644
index af1ef942bb..0000000000
--- a/lib/wsdl/xmlSchema/include.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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/lib/wsdl/xmlSchema/length.rb b/lib/wsdl/xmlSchema/length.rb
deleted file mode 100644
index 7f61602da9..0000000000
--- a/lib/wsdl/xmlSchema/length.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/lib/wsdl/xmlSchema/parser.rb b/lib/wsdl/xmlSchema/parser.rb
index 057d9d9b70..688af27c8c 100644
--- a/lib/wsdl/xmlSchema/parser.rb
+++ b/lib/wsdl/xmlSchema/parser.rb
@@ -1,5 +1,5 @@
 # WSDL4R - WSDL XML Instance parser library.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -22,7 +22,7 @@ class Parser
   include XSD
 
   class ParseError < Error; end
-  class FormatDecodeError < ParseError; end
+  class FormatDecodeError < Error; end
   class UnknownElementError < FormatDecodeError; end
   class UnknownAttributeError < FormatDecodeError; end
   class UnexpectedElementError < FormatDecodeError; end
@@ -51,9 +51,6 @@ public
     @parser = XSD::XMLParser.create_parser(self, opt)
     @parsestack = nil
     @lastnode = nil
-    @ignored = {}
-    @location = opt[:location]
-    @originalroot = opt[:originalroot]
   end
 
   def parse(string_or_readable)
@@ -97,7 +94,7 @@ public
   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}'")
+      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
@@ -107,46 +104,44 @@ private
 
   def decode_tag(ns, name, attrs, parent)
     o = nil
-    elename = ns.parse(name)
+    element = ns.parse(name)
     if !parent
-      if elename == SchemaName
-	o = Schema.parse_element(elename)
-        o.location = @location
+      if element == SchemaName
+	o = Schema.parse_element(element)
       else
-	raise UnknownElementError.new("unknown element: #{elename}")
+	raise UnknownElementError.new("Unknown element #{ element }.")
       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
+      o = parent.parse_element(element)
       unless o
-        unless @ignored.key?(elename)
-          warn("ignored element: #{elename} of #{parent.class}")
-          @ignored[elename] = elename
-        end
-	o = Documentation.new	# which accepts any element.
+	raise UnknownElementError.new("Unknown element #{ 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?
+      o.parent = parent
     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
+      attr = unless /:/ =~ key
+	  XSD::QName.new(nil, key)
+	else
+	  ns.parse(key)
+	end
+      value_ele = if /:/ !~ value
+	  value
+	elsif /^http:\/\// =~ value	# ToDo: ugly.
+	  value
+	else
+	  begin
+	    ns.parse(value)
+	  rescue
+	    value
+	  end
+	end
+      if attr == 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
+	unless o.parse_attr(attr, value_ele)
+	  STDERR.puts("Unknown attr #{ attr }.")
+	  # raise UnknownAttributeError.new("Unknown attr #{ attr }.")
+   	end
       end
     end
     o
diff --git a/lib/wsdl/xmlSchema/pattern.rb b/lib/wsdl/xmlSchema/pattern.rb
deleted file mode 100644
index f826be4578..0000000000
--- a/lib/wsdl/xmlSchema/pattern.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/lib/wsdl/xmlSchema/schema.rb b/lib/wsdl/xmlSchema/schema.rb
index ec97d07aa5..1d7759605e 100644
--- a/lib/wsdl/xmlSchema/schema.rb
+++ b/lib/wsdl/xmlSchema/schema.rb
@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema schema definition for WSDL.
-# Copyright (C) 2002, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -17,36 +17,20 @@ 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
+    @elementformdefault = nil
   end
 
   def parse_element(element)
@@ -55,25 +39,16 @@ class Schema < Info
       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
@@ -83,49 +58,25 @@ class Schema < Info
   def parse_attr(attr, value)
     case attr
     when TargetNamespaceAttrName
-      @targetnamespace = value.source
+      @targetnamespace = value
     when AttributeFormDefaultAttrName
-      @attributeformdefault = value.source
+      @attributeformdefault = value
     when ElementFormDefaultAttrName
-      @elementformdefault = value.source
+      @elementformdefault = value
     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
 
diff --git a/lib/wsdl/xmlSchema/sequence.rb b/lib/wsdl/xmlSchema/sequence.rb
index 823fa3b7f9..3810832ab2 100644
--- a/lib/wsdl/xmlSchema/sequence.rb
+++ b/lib/wsdl/xmlSchema/sequence.rb
@@ -20,8 +20,8 @@ class Sequence < Info
 
   def initialize
     super()
-    @minoccurs = '1'
-    @maxoccurs = '1'
+    @minoccurs = 1
+    @maxoccurs = 1
     @elements = []
   end
 
@@ -29,10 +29,6 @@ class Sequence < Info
     parent.targetnamespace
   end
 
-  def elementformdefault
-    parent.elementformdefault
-  end
-
   def <<(element)
     @elements << element
   end
@@ -55,9 +51,9 @@ class Sequence < Info
   def parse_attr(attr, value)
     case attr
     when MaxOccursAttrName
-      @maxoccurs = value.source
+      @maxoccurs = value
     when MinOccursAttrName
-      @minoccurs = value.source
+      @minoccurs = value
     else
       nil
     end
diff --git a/lib/wsdl/xmlSchema/simpleContent.rb b/lib/wsdl/xmlSchema/simpleContent.rb
deleted file mode 100644
index e1f35c88b8..0000000000
--- a/lib/wsdl/xmlSchema/simpleContent.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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/lib/wsdl/xmlSchema/simpleExtension.rb b/lib/wsdl/xmlSchema/simpleExtension.rb
deleted file mode 100644
index 3c53a7328c..0000000000
--- a/lib/wsdl/xmlSchema/simpleExtension.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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/lib/wsdl/xmlSchema/simpleRestriction.rb b/lib/wsdl/xmlSchema/simpleRestriction.rb
deleted file mode 100644
index e8bf3ebfa5..0000000000
--- a/lib/wsdl/xmlSchema/simpleRestriction.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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/lib/wsdl/xmlSchema/simpleType.rb b/lib/wsdl/xmlSchema/simpleType.rb
deleted file mode 100644
index e808c318c4..0000000000
--- a/lib/wsdl/xmlSchema/simpleType.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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/lib/wsdl/xmlSchema/xsd2ruby.rb b/lib/wsdl/xmlSchema/xsd2ruby.rb
deleted file mode 100644
index afe5fc5ada..0000000000
--- a/lib/wsdl/xmlSchema/xsd2ruby.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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/lib/xmlrpc/.document b/lib/xmlrpc/.document
deleted file mode 100644
index e475c53ed0..0000000000
--- a/lib/xmlrpc/.document
+++ /dev/null
@@ -1 +0,0 @@
-README.rdoc
diff --git a/lib/xmlrpc/README.txt b/lib/xmlrpc/README.txt
deleted file mode 100644
index ade842d8b1..0000000000
--- a/lib/xmlrpc/README.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-= 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/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb
index 7cf2ed87ac..18cf4b0cf3 100644
--- a/lib/xmlrpc/client.rb
+++ b/lib/xmlrpc/client.rb
@@ -69,7 +69,6 @@ call on the remote-side and of course the parameters for the remote procedure.
     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
@@ -81,7 +80,6 @@ call on the remote-side and of course the parameters for the remote procedure.
     Defaults to 30. 
 
 --- XMLRPC::Client.new3( hash={} )
---- XMLRPC::Client.new_from_hash( hash={} )
     Parameter ((|hash|)) has following case-insensitive keys:
     * host
     * path
@@ -137,8 +135,6 @@ call on the remote-side and of course the parameters for the remote procedure.
     (({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.
@@ -335,9 +331,7 @@ module XMLRPC
     end
 
 
-    class << self
-
-    def new2(uri, proxy=nil, timeout=nil)
+    def self.new2(uri, proxy=nil, timeout=nil)
       if match = /^([^:]+):\/\/(([^@]+)@)?([^\/]+)(\/.*)?$/.match(uri)
         proto = match[1]
         user, passwd = (match[3] || "").split(":")
@@ -356,10 +350,9 @@ module XMLRPC
 
       self.new(host, path, port, proxy_host, proxy_port, user, passwd, (proto == "https"), timeout)
     end
+ 
 
-    alias new_from_uri new2
-
-    def new3(hash={})
+    def self.new3(hash={})
 
       # convert all keys into lowercase strings
       h = {}
@@ -369,10 +362,6 @@ module XMLRPC
                h['use_ssl'], h['timeout'])
     end
 
-    alias new_from_hash new3
-
-    end
-
 
     # Attribute Accessors -------------------------------------------------------------------
 
@@ -468,19 +457,19 @@ module XMLRPC
 
     # Proxy generating methods ------------------------------------------
     
-    def proxy(prefix=nil, *args)
+    def proxy(prefix, *args)
       Proxy.new(self, prefix, args, :call)
     end
 
-    def proxy2(prefix=nil, *args)
+    def proxy2(prefix, *args)
       Proxy.new(self, prefix, args, :call2)
     end
 
-    def proxy_async(prefix=nil, *args)
+    def proxy_async(prefix, *args)
       Proxy.new(self, prefix, args, :call_async)
     end
 
-    def proxy2_async(prefix=nil, *args)
+    def proxy2_async(prefix, *args)
       Proxy.new(self, prefix, args, :call2_async)
     end
 
@@ -500,7 +489,7 @@ module XMLRPC
     def do_rpc(request, async=false)
       header = {  
        "User-Agent"     =>  USER_AGENT,
-       "Content-Type"   => "text/xml; charset=utf-8",
+       "Content-Type"   => "text/xml",
        "Content-Length" => request.size.to_s, 
        "Connection"     => (async ? "close" : "keep-alive")
       }
@@ -530,9 +519,6 @@ module XMLRPC
         }
       else
         # reuse the HTTP object for each call => connection alive is possible
-        # we must start connection explicitely first time so that http.request
-        # does not assume that we don't want keepalive
-        @http.start if not @http.started?
         
         # post request
         resp = @http.post2(@path, request, header) 
@@ -552,26 +538,21 @@ module XMLRPC
       ct = parse_content_type(resp["Content-Type"]).first
       if ct != "text/xml"
         if ct == "text/html"
-          raise "Wrong content-type (received '#{ct}' but expected 'text/xml'): \n#{data}"
+          raise "Wrong content-type: \n#{data}"
         else
-          raise "Wrong content-type (received '#{ct}' but expected 'text/xml')"
+          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?
+      elsif expected.to_i != data.size and resp["Transfer-Encoding"].nil?
         raise "Wrong size. Was #{data.size}, should be #{expected}"
       end
 
-      set_cookies = resp.get_fields("Set-Cookie")
-      if set_cookies and !set_cookies.empty?
-        @cookie = set_cookies.collect do |set_cookie|
-          cookie = WEBrick::Cookie.parse_set_cookie(set_cookie)
-          WEBrick::Cookie.new(cookie.name, cookie.value).to_s
-        end.join("; ")
-      end
+      c = resp["Set-Cookie"]
+      @cookie = c if c
 
       return data
     end
@@ -605,7 +586,7 @@ module XMLRPC
 
       def initialize(server, prefix, args=[], meth=:call, delim=".")
 	@server = server
-	@prefix = prefix ? prefix + delim : ""
+	@prefix = prefix + delim
 	@args   = args 
         @meth   = meth
       end
diff --git a/lib/xmlrpc/create.rb b/lib/xmlrpc/create.rb
index b5c94254a4..072e72ab46 100644
--- a/lib/xmlrpc/create.rb
+++ b/lib/xmlrpc/create.rb
@@ -86,18 +86,6 @@ module XMLRPC
 
     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
@@ -241,7 +229,12 @@ module XMLRPC
 	    @writer.ele("data", *a)
 	  )
 
-	when Time, Date, ::DateTime
+	when Date
+	  t = param
+	  @writer.tag("dateTime.iso8601", 
+	    format("%.4d%02d%02dT00:00:00", t.year, t.month, t.day))
+
+	when Time
 	  @writer.tag("dateTime.iso8601", param.strftime("%Y%m%dT%H:%M:%S"))  
 
 	when XMLRPC::DateTime
@@ -255,10 +248,7 @@ module XMLRPC
           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)
-
+            param.__get_instance_variables.each {|name, val| 
               if val.nil?
                 ret[name] = val if Config::ENABLE_NIL_CREATE
               else
diff --git a/lib/xmlrpc/datetime.rb b/lib/xmlrpc/datetime.rb
index 298263fe8a..e3bc6943f0 100644
--- a/lib/xmlrpc/datetime.rb
+++ b/lib/xmlrpc/datetime.rb
@@ -126,10 +126,6 @@ class DateTime
     [@year, @month, @day, @hour, @min, @sec]
   end
 
-  def ==(o)
-    Array(self) == Array(o)
-  end
-
 end
 
 
diff --git a/lib/xmlrpc/parser.rb b/lib/xmlrpc/parser.rb
index 6d10fde9d9..357618261e 100644
--- a/lib/xmlrpc/parser.rb
+++ b/lib/xmlrpc/parser.rb
@@ -51,11 +51,9 @@ end # module NQXML
 
 module XMLRPC
 
-  class FaultException < StandardError
+  class FaultException < Exception
     attr_reader :faultCode, :faultString
 
-    alias message faultString
-
     def initialize(faultCode, faultString)
       @faultCode   = faultCode
       @faultString = faultString
@@ -86,32 +84,18 @@ module XMLRPC
     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) + 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))?$/
+      if str =~ /^(-?\d\d\d\d)(\d\d)(\d\d)T(\d\d):(\d\d):(\d\d)$/ then
+        # TODO: Time.gm ??? .local ??? 
         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) + ofs
-          a = [ utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec ]
-        end
+	  
         XMLRPC::DateTime.new(*a)
+        #if a[0] >= 1970 then
+        #  Time.gm(*a)
+        #else
+        #  Date.new(*a[0,3])
+        #end
       else
-        raise "wrong dateTime.iso8601 format " + str
+        raise "wrong dateTime.iso8601 format"
       end
     end
 
@@ -128,13 +112,31 @@ module XMLRPC
         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]*)$/
+          Thread.critical = true
+          # let initialize take 0 parameters
+          mod.module_eval %{
+            begin
+              alias __initialize initialize
+            rescue NameError
+            end
+            def initialize; end
+          }
+
+          obj = mod.new
+
+          # restore old initialize
+          mod.module_eval %{
+            undef initialize
+            begin
+              alias initialize __initialize
+            rescue NameError
+            end
           }
+          Thread.critical = false
+
+          hash.delete "___class___"
+          hash.each {|k,v| obj.__set_instance_variable(k, v) } 
           obj
         rescue
           hash
@@ -465,7 +467,7 @@ module XMLRPC
         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
+          raise "To many return values. Only one allowed!" if parser.params.size > 1
           [true, parser.params[0]]
         end
       end
@@ -580,9 +582,12 @@ module XMLRPC
     class XMLStreamParser < AbstractStreamParser
       def initialize
         require "xmlparser"
-        @parser_class = Class.new(::XMLParser) {
-          include StreamParserMixin
+        eval %{
+          class XMLRPCParser < ::XMLParser
+            include StreamParserMixin
+          end
         }
+        @parser_class = XMLRPCParser
       end
     end # class XMLStreamParser
     # ---------------------------------------------------------------------------
@@ -796,16 +801,6 @@ module XMLRPC
                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
 
 
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
index ca8d3b0a5b..0fabd3861e 100644
--- a/lib/xmlrpc/server.rb
+++ b/lib/xmlrpc/server.rb
@@ -1,6 +1,6 @@
 =begin
 = xmlrpc/server.rb
-Copyright (C) 2001, 2002, 2003, 2005 by Michael Neumann (mneumann@ntecs.de)
+Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
 
 Released under the same term of license as Ruby.
 
@@ -145,6 +145,7 @@ the same class.
 require "xmlrpc/parser"
 require "xmlrpc/create"
 require "xmlrpc/config"
+require "xmlrpc/httpserver"
 require "xmlrpc/utils"         # ParserWriterChooseMixin
 
 
@@ -322,11 +323,11 @@ class BasicServer
   def dispatch(methodname, *args)
     for name, obj in @handler
       if obj.kind_of? Proc
-        next unless methodname == name
+	next unless methodname == name
       else
-        next unless methodname =~ /^#{name}(.+)$/
+	next unless methodname =~ /^#{name}(.+)$/
         next unless obj.respond_to? $1
-        obj = obj.method($1)
+	obj = obj.method($1)
       end
 
       if check_arity(obj, args.size)
@@ -447,7 +448,7 @@ class CGIServer < BasicServer
       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(400, "Bad Request")        unless ENV['CONTENT_TYPE'] == "text/xml"
       http_error(411, "Length Required")    unless length > 0 
 
       # TODO: do we need a call to binmode?
@@ -456,7 +457,7 @@ class CGIServer < BasicServer
 
       http_error(400, "Bad Request")        if data.nil? or data.size != length
 
-      http_write(process(data), "Content-type" => "text/xml; charset=utf-8")
+      http_write(process(data), "Content-type" => "text/xml")
     }
   end
 
@@ -531,7 +532,7 @@ class ModRubyServer < BasicServer
 
       http_error(400, "Bad Request")        if data.nil? or data.size != length
 
-      http_write(process(data), 200, "Content-type" => "text/xml; charset=utf-8")
+      http_write(process(data), 200, "Content-type" => "text/xml")
     }
   end
 
@@ -572,6 +573,9 @@ class ModRubyServer < BasicServer
 
 end
 
+
+
+
 =begin
 = XMLRPC::Server
 == Synopsis
@@ -603,7 +607,7 @@ Implements a standalone XML-RPC server. The method (({serve}))) is left if a SIG
 program.
 
 == Superclass
-((<XMLRPC::WEBrickServlet>))
+((<XMLRPC::BasicServer>))
 
 == Class Methods
 --- XMLRPC::Server.new( port=8080, host="127.0.0.1", maxConnections=4, stdlog=$stdout, audit=true, debug=true, *a )
@@ -611,10 +615,12 @@ program.
     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!
+    The parameters ((|maxConnections|)), ((|stdlog|)), ((|audit|)) and ((|debug|)) are passed to the HTTP server and
+    specify it's behaviour more precise.
 
     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.
@@ -622,38 +628,114 @@ program.
 
 --- XMLRPC::Server#shutdown
     Stops and shuts the server down.
+
+--- XMLRPC::Server#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::Server#get_valid_ip
+    Return the via method ((<set_valid_ip|XMLRPC::Server#set_valid_ip>)) specified
+    valid IP addresses.
     
 =end
 
-class WEBrickServlet < BasicServer; end # forward declaration
-
-class Server < WEBrickServlet
+class Server < BasicServer
 
   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)
+    @server = ::HttpServer.new(self, port, host, maxConnections, stdlog, audit, debug)
+    @valid_ip = nil
   end
   
   def serve
     if RUBY_PLATFORM =~ /mingw|mswin32/
-      signals = [1]
+      signal = 1
     else
-      signals = %w[INT TERM HUP]
+      signal = "HUP"
     end
-    signals.each { |signal| trap(signal) { @server.shutdown } }
+    trap(signal) { @server.shutdown }
 
-    @server.start
+    @server.start.join
   end
   
   def shutdown
     @server.shutdown
   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
+
+  # methods that get called by HttpServer ------------------------------------------
+
+  def request_handler(request, response)
+    $stderr.puts "in request_handler" if $DEBUG
+
+    if request.method != "POST"
+      # Method not allowed
+      response.status = 405
+      return
+    end
+
+    if parse_content_type(request.header['Content-type']).first != "text/xml" 
+      # Bad request
+      response.status = 400
+      return
+    end 
+
+    length = request.content_length || 0
+    
+    unless length > 0
+      # Length required
+      response.status = 411
+      return
+    end
+
+    data = request.data.read(length)
+
+    if data.nil? or data.size != length
+      # Bad request
+      response.status = 400
+      return
+    end
+
+    resp = process(data)
+    raise if resp.nil? or resp.size <= 0  # => Internal Server Error
+
+    response.status = 200
+    response.header['Content-Length'] = resp.size
+    response.header['Content-Type']   = "text/xml"
+    response.body = resp 
+    
+   end
+
+   ##
+   # Is called before request_handler and should return true if
+   # the client is allowed to connect to the server.
+   # `io' is a Socket object.
+   def ip_auth_handler(io)
+     if @valid_ip
+       client_ip = io.peeraddr[3]
+       @valid_ip.each { |ip|
+         return true if client_ip =~ ip
+       }
+       false
+     else
+       true
+     end
+   end
+  
 end
 
+
 =begin
 = XMLRPC::WEBrickServlet
 == Synopsis
@@ -680,20 +762,9 @@ end
     end
 
     httpserver = WEBrick::HTTPServer.new(:Port => 8080)    
-    httpserver.mount("/RPC2", s)
+    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.
 
@@ -706,7 +777,6 @@ class WEBrickServlet < BasicServer
   def initialize(*a)
     super
     require "webrick/httpstatus"
-    @valid_ip = nil
   end
 
   # deprecated from WEBrick/1.2.2. 
@@ -720,51 +790,34 @@ class WEBrickServlet < BasicServer
     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,
+      raise HTTPStatus::MethodNotAllowed,
             "unsupported method `#{request.request_method}'."
     end
 
     if parse_content_type(request['Content-type']).first != "text/xml" 
-      raise WEBrick::HTTPStatus::BadRequest
+      raise HTTPStatus::BadRequest
     end 
 
     length = (request['Content-length'] || 0).to_i
 
-    raise WEBrick::HTTPStatus::LengthRequired unless length > 0
+    raise HTTPStatus::LengthRequired unless length > 0
 
     data = request.body
 
     if data.nil? or data.size != length
-      raise WEBrick::HTTPStatus::BadRequest
+      raise HTTPStatus::BadRequest
     end
 
     resp = process(data)
     if resp.nil? or resp.size <= 0  
-      raise WEBrick::HTTPStatus::InternalServerError
+      raise HTTPStatus::InternalServerError
     end
 
     response.status = 200
     response['Content-Length'] = resp.size
-    response['Content-Type']   = "text/xml; charset=utf-8"
+    response['Content-Type']   = "text/xml"
     response.body = resp 
   end
 end
diff --git a/lib/xmlrpc/utils.rb b/lib/xmlrpc/utils.rb
index f0966fee40..14dd08b21d 100644
--- a/lib/xmlrpc/utils.rb
+++ b/lib/xmlrpc/utils.rb
@@ -17,6 +17,13 @@ module XMLRPC
   # key/value pair "___class___" => ClassName
   # 
   module Marshallable
+    def __get_instance_variables
+      instance_variables.collect {|var| [var[1..-1], eval(var)] }
+    end
+
+    def __set_instance_variable(key, value)
+      eval("@#$1 = value") if key =~ /^([\w_][\w_0-9]*)$/
+    end
   end
 
 
@@ -131,7 +138,7 @@ module XMLRPC
 
     def get_methods(obj, delim=".")
       prefix = @prefix + delim
-      obj.class.public_instance_methods(false).collect { |name|
+      obj.class.public_instance_methods.collect { |name|
         [prefix + name, obj.method(name).to_proc, nil, nil] 
       }
     end
@@ -157,7 +164,7 @@ module XMLRPC
   module ParseContentType
     def parse_content_type(str)
       a, *b = str.split(";")
-      return a.strip.downcase, *b
+      return a.strip, *b
     end
   end
 
diff --git a/lib/xsd/charset.rb b/lib/xsd/charset.rb
index 15d5500fce..362f13edfc 100644
--- a/lib/xsd/charset.rb
+++ b/lib/xsd/charset.rb
@@ -1,5 +1,5 @@
 # XSD4R - Charset handling library.
-# Copyright (C) 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -10,7 +10,7 @@ module XSD
 
 
 module Charset
-  @internal_encoding = $KCODE
+  @encoding = $KCODE
 
   class XSDError < StandardError; end
   class CharsetError < XSDError; end
@@ -24,40 +24,27 @@ public
   #
   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) }
+      @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) }
+	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'
+	@encoding = 'UTF8'
 	EncodingConvertMap[['UTF8', 'EUC' ]] = Uconv.method(:u8toeuc)
 	EncodingConvertMap[['UTF8', 'SJIS']] = Uconv.method(:u8tosjis)
 	EncodingConvertMap[['EUC' , 'UTF8']] = Uconv.method(:euctou8)
@@ -73,8 +60,6 @@ public
     'EUC' => 'euc-jp',
     'SJIS' => 'shift_jis',
     'UTF8' => 'utf-8',
-    'X_ISO_8859_1' => 'iso-8859-1',
-    'X_UNKNOWN' => nil,
   }
 
 
@@ -82,24 +67,24 @@ public
   ## handlers
   #
   def Charset.encoding
-    @internal_encoding
+    @encoding
   end
 
   def Charset.encoding=(encoding)
-    warn("xsd charset is set to #{encoding}") if $DEBUG
-    @internal_encoding = encoding
+    STDERR.puts("xsd charset is set to #{encoding}") if $DEBUG
+    @encoding = encoding
   end
 
-  def Charset.xml_encoding_label
-    charset_label(@internal_encoding)
+  def Charset.encoding_label
+    charset_label(@encoding)
   end
 
   def Charset.encoding_to_xml(str, charset)
-    encoding_conv(str, @internal_encoding, charset_str(charset))
+    encoding_conv(str, @encoding, charset_str(charset))
   end
 
   def Charset.encoding_from_xml(str, charset)
-    encoding_conv(str, charset_str(charset), @internal_encoding)
+    encoding_conv(str, charset_str(charset), @encoding)
   end
 
   def Charset.encoding_conv(str, enc_from, enc_to)
@@ -109,7 +94,7 @@ public
       converter.call(str)
     else
       raise CharsetConversionError.new(
-	"Converter not found: #{enc_from} -> #{enc_to}")
+	"Converter not found: #{ enc_from } -> #{ enc_to }")
     end
   end
 
@@ -118,27 +103,23 @@ public
   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
+    CharsetMap.index(label.downcase)
   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")
+  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")
+  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")
+  character_sjis = "(?:#{ onebyte_sjis }|#{ twobytes_sjis })"
+  SJISRegexp = Regexp.new("\\A#{ character_sjis }*\\z", nil, "NONE")
 
   # 0xxxxxxx
   # 110yyyyy 10xxxxxx
@@ -147,9 +128,8 @@ public
   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")
+  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
@@ -178,7 +158,7 @@ public
     when 'SJIS'
       is_sjis(str)
     else
-      raise UnknownCharsetError.new("Unknown charset: #{code}")
+      raise UnknownCharsetError.new("Unknown charset: #{ code }")
     end
   end
 end
diff --git a/lib/xsd/codegen.rb b/lib/xsd/codegen.rb
deleted file mode 100644
index d820ebf1f2..0000000000
--- a/lib/xsd/codegen.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/lib/xsd/codegen/classdef.rb b/lib/xsd/codegen/classdef.rb
deleted file mode 100644
index 9eb1ce6607..0000000000
--- a/lib/xsd/codegen/classdef.rb
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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/lib/xsd/codegen/commentdef.rb b/lib/xsd/codegen/commentdef.rb
deleted file mode 100644
index c9493a1363..0000000000
--- a/lib/xsd/codegen/commentdef.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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/lib/xsd/codegen/gensupport.rb b/lib/xsd/codegen/gensupport.rb
deleted file mode 100644
index 1e85d3668f..0000000000
--- a/lib/xsd/codegen/gensupport.rb
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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/lib/xsd/codegen/methoddef.rb b/lib/xsd/codegen/methoddef.rb
deleted file mode 100644
index 15892fc5bf..0000000000
--- a/lib/xsd/codegen/methoddef.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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/lib/xsd/codegen/moduledef.rb b/lib/xsd/codegen/moduledef.rb
deleted file mode 100644
index 744af2ff97..0000000000
--- a/lib/xsd/codegen/moduledef.rb
+++ /dev/null
@@ -1,191 +0,0 @@
-# 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/lib/xsd/datatypes.rb b/lib/xsd/datatypes.rb
index bbe6c8578f..f318e612b1 100644
--- a/lib/xsd/datatypes.rb
+++ b/lib/xsd/datatypes.rb
@@ -46,30 +46,10 @@ 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)
@@ -98,10 +78,7 @@ class NSDBase
   end
 
   def initialize
-  end
-
-  def init(type)
-    @type = type
+    @type = nil
   end
 end
 
@@ -119,13 +96,11 @@ class XSDAnySimpleType < NSDBase
   attr_accessor :is_nil
 
   def initialize(value = nil)
-    init(Type, value)
-  end
-
-  # true or raise
-  def check_lexical_format(value)
-    screen_data(value)
-    true
+    super()
+    @type = Type
+    @data = nil
+    @is_nil = true
+    set(value) if value
   end
 
   # set accepts a string which follows lexical space (ex. String: "+123"), or
@@ -134,10 +109,9 @@ class XSDAnySimpleType < NSDBase
     if value.nil?
       @is_nil = true
       @data = nil
-      _set(nil)
     else
       @is_nil = false
-      _set(screen_data(value))
+      _set(value)
     end
   end
 
@@ -152,16 +126,6 @@ class XSDAnySimpleType < NSDBase
 
 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
@@ -176,7 +140,15 @@ class XSDNil < XSDAnySimpleType
   Value = 'true'
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value)
+  end
+
+private
+
+  def _set(value)
+    @data = value
   end
 end
 
@@ -188,16 +160,18 @@ class XSDString < XSDAnySimpleType
   Type = QName.new(Namespace, StringLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data(value)
+  def _set(value)
     unless XSD::Charset.is_ces(value, XSD::Charset.encoding)
       raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
     end
-    value
+    @data = value
   end
 end
 
@@ -205,23 +179,25 @@ class XSDBoolean < XSDAnySimpleType
   Type = QName.new(Namespace, BooleanLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value)
   end
 
 private
 
-  def screen_data(value)
+  def _set(value)
     if value.is_a?(String)
       str = value.strip
       if str == 'true' || str == '1'
-	true
+	@data = true
       elsif str == 'false' || str == '0'
-	false
+	@data = false
       else
 	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
       end
     else
-      value ? true : false
+      @data = value ? true : false
     end
   end
 end
@@ -230,7 +206,12 @@ class XSDDecimal < XSDAnySimpleType
   Type = QName.new(Namespace, DecimalLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    @sign = ''
+    @number = ''
+    @point = 0
+    set(value) if value
   end
 
   def nonzero?
@@ -239,43 +220,38 @@ class XSDDecimal < XSDAnySimpleType
 
 private
 
-  def screen_data(d)
+  def _set(d)
     if d.is_a?(String)
       # Integer("00012") => 10 in Ruby.
       d.sub!(/^([+\-]?)0*(?=\d)/, "\\1")
     end
-    screen_data_str(d)
+    set_str(d)
   end
 
-  def screen_data_str(str)
+  def set_str(str)
     /^([+\-]?)(\d*)(?:\.(\d*)?)?$/ =~ str.to_s.strip
     unless Regexp.last_match
       raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
     end
-    sign = $1 || '+'
+
+    @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
+    @point = - frac_part.size
+    @number = int_part + frac_part
+
     # normalize
-    if sign == '+'
-      sign = ''
-    elsif sign == '-'
-      if number == '0'
-	sign = ''
+    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
@@ -292,11 +268,8 @@ end
 
 module FloatConstants
   NaN = 0.0/0.0
-  POSITIVE_INF = +1.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
@@ -304,23 +277,27 @@ class XSDFloat < XSDAnySimpleType
   Type = QName.new(Namespace, FloatLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data(value)
+  def _set(value)
     # "NaN".to_f => 0 in some environment.  libc?
     if value.is_a?(Float)
-      return narrow32bit(value)
+      @data = narrow32bit(value)
+      return
     end
+
     str = value.to_s.strip
     if str == 'NaN'
-      NaN
+      @data = NaN
     elsif str == 'INF'
-      POSITIVE_INF
+      @data = POSITIVE_INF
     elsif str == '-INF'
-      NEGATIVE_INF
+      @data = NEGATIVE_INF
     else
       if /^[+\-\.\deE]+$/ !~ str
 	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
@@ -328,7 +305,7 @@ private
       # Float("-1.4E") might fail on some system.
       str << '0' if /e$/i =~ str
       begin
-  	return narrow32bit(Float(str))
+  	@data = narrow32bit(Float(str))
       rescue ArgumentError
   	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
       end
@@ -343,7 +320,7 @@ private
     elsif @data.infinite? == -1
       '-INF'
     else
-      sign = XSDFloat.positive?(@data) ? '+' : '-'
+      sign = (1 / @data > 0.0) ? '+' : '-'
       sign + sprintf("%.10g", @data.abs).sub(/[eE]([+-])?0+/) { 'e' + $1 }
     end
   end
@@ -352,16 +329,11 @@ private
   def narrow32bit(f)
     if f.nan? || f.infinite?
       f
-    elsif f.abs < MIN_POSITIVE_SINGLE
-      XSDFloat.positive?(f) ? POSITIVE_ZERO : NEGATIVE_ZERO
     else
-      f
+      packed = [f].pack("f")
+      (/\A\0*\z/ =~ packed)? 0.0 : f
     end
   end
-
-  def self.positive?(value)
-    (1 / value) > 0.0
-  end
 end
 
 # Ruby's Float is double-precision 64-bit floating point value.
@@ -370,31 +342,35 @@ class XSDDouble < XSDAnySimpleType
   Type = QName.new(Namespace, DoubleLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data(value)
+  def _set(value)
     # "NaN".to_f => 0 in some environment.  libc?
     if value.is_a?(Float)
-      return value
+      @data = value
+      return
     end
+
     str = value.to_s.strip
     if str == 'NaN'
-      NaN
+      @data = NaN
     elsif str == 'INF'
-      POSITIVE_INF
+      @data = POSITIVE_INF
     elsif str == '-INF'
-      NEGATIVE_INF
+      @data = NEGATIVE_INF
     else
       begin
-	return Float(str)
+	@data = Float(str)
       rescue ArgumentError
 	# '1.4e' cannot be parsed on some architecture.
 	if /e\z/i =~ str
 	  begin
-	    return Float(str + '0')
+	    @data = Float(str + '0')
 	  rescue ArgumentError
 	    raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
 	  end
@@ -431,36 +407,38 @@ class XSDDuration < XSDAnySimpleType
   attr_accessor :sec
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    @sign = nil
+    @year = nil
+    @month = nil
+    @day = nil
+    @hour = nil
+    @min = nil
+    @sec = nil
+    set(value) if value
   end
 
 private
 
-  def screen_data(value)
+  def _set(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
+
+    @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
     @data = _to_s
     @data.freeze
   end
@@ -495,18 +473,6 @@ 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
@@ -523,14 +489,6 @@ module XSDDateTimeImpl
     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
@@ -558,24 +516,18 @@ module XSDDateTimeImpl
     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
+  def _set(t)
+    set_datetime_init(t)
+    if (t.is_a?(Date))
+      @data = t
+    elsif (t.is_a?(Time))
+      sec, min, hour, mday, month, year = t.to_a[0..5]
+      diffday = 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)
+      @data = DateTime.civil(year, month, mday, hour, min, sec, of)
+      @data += diffday
     else
-      screen_data_str(t)
+      set_str(t)
     end
   end
 
@@ -589,12 +541,19 @@ class XSDDateTime < XSDAnySimpleType
   Type = QName.new(Namespace, DateTimeLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    @secfrac = nil
+    set(value) if value
   end
 
 private
 
-  def screen_data_str(t)
+  def set_datetime_init(t)
+    @secfrac = nil
+  end
+
+  def set_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 }'.")
@@ -602,6 +561,7 @@ private
     if $1 == '0000'
       raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
     end
+
     year = $1.to_i
     if year < 0
       year += 1
@@ -613,22 +573,22 @@ private
     sec = $6.to_i
     secfrac = $7
     zonestr = $8
-    data = DateTime.civil(year, mon, mday, hour, min, sec, tz2of(zonestr))
+
+    @data = DateTime.civil(year, mon, mday, hour, min, sec, tz2of(zonestr))
+    @secfrac = secfrac
+
     if secfrac
       diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / SecInDay
-      data += diffday
+      # jd = @data.jd
+      # day_fraction = @data.day_fraction + diffday
+      # @data = DateTime.new0(DateTime.jd_to_rjd(jd, day_fraction,
+      #   @data.offset), @data.offset)
+      #
+      # Thanks to Funaba-san, above code can be simply written as below.
+      @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
@@ -639,8 +599,7 @@ private
       if @secfrac
   	s << ".#{ @secfrac }"
       else
-	s << sprintf("%.16f",
-          (@data.sec_fraction * SecInDay).to_f).sub(/^0/, '').sub(/0*$/, '')
+	s << sprintf("%.16f", (@data.sec_fraction * SecInDay).to_f).sub(/^0/, '').sub(/0*$/, '')
       end
     end
     add_tz(s)
@@ -652,35 +611,37 @@ class XSDTime < XSDAnySimpleType
   Type = QName.new(Namespace, TimeLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    @secfrac = nil
+    set(value) if value
   end
 
 private
 
-  def screen_data_str(t)
+  def set_datetime_init(t)
+    @secfrac = nil
+  end
+
+  def set_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))
+
+    @data = DateTime.civil(1, 1, 1, hour, min, sec, tz2of(zonestr))
+    @secfrac = secfrac
+
     if secfrac
       diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / SecInDay
-      data += diffday
+      @data += diffday
     end
-    [data, secfrac]
-  end
-
-  def _set(data)
-    if data.nil?
-      @data = @secfrac = nil
-      return
-    end
-    @data, @secfrac = data
   end
 
   def _to_s
@@ -689,8 +650,7 @@ private
       if @secfrac
   	s << ".#{ @secfrac }"
       else
-	s << sprintf("%.16f",
-          (@data.sec_fraction * SecInDay).to_f).sub(/^0/, '').sub(/0*$/, '')
+	s << sprintf("%.16f", (@data.sec_fraction * SecInDay).to_f).sub(/^0/, '').sub(/0*$/, '')
       end
     end
     add_tz(s)
@@ -702,16 +662,22 @@ class XSDDate < XSDAnySimpleType
   Type = QName.new(Namespace, DateLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data_str(t)
+  def set_datetime_init(t)
+  end
+
+  def set_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
@@ -719,7 +685,8 @@ private
     mon = $2.to_i
     mday = $3.to_i
     zonestr = $4
-    DateTime.civil(year, mon, mday, 0, 0, 0, tz2of(zonestr))
+
+    @data = DateTime.civil(year, mon, mday, 0, 0, 0, tz2of(zonestr))
   end
 
   def _to_s
@@ -734,23 +701,30 @@ class XSDGYearMonth < XSDAnySimpleType
   Type = QName.new(Namespace, GYearMonthLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data_str(t)
+  def set_datetime_init(t)
+  end
+
+  def set_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))
+
+    @data = DateTime.civil(year, mon, 1, 0, 0, 0, tz2of(zonestr))
   end
 
   def _to_s
@@ -765,22 +739,29 @@ class XSDGYear < XSDAnySimpleType
   Type = QName.new(Namespace, GYearLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data_str(t)
+  def set_datetime_init(t)
+  end
+
+  def set_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))
+
+    @data = DateTime.civil(year, 1, 1, 0, 0, 0, tz2of(zonestr))
   end
 
   def _to_s
@@ -795,20 +776,27 @@ class XSDGMonthDay < XSDAnySimpleType
   Type = QName.new(Namespace, GMonthDayLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data_str(t)
+  def set_datetime_init(t)
+  end
+
+  def set_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))
+
+    @data = DateTime.civil(1, mon, mday, 0, 0, 0, tz2of(zonestr))
   end
 
   def _to_s
@@ -822,19 +810,26 @@ class XSDGDay < XSDAnySimpleType
   Type = QName.new(Namespace, GDayLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data_str(t)
+  def set_datetime_init(t)
+  end
+
+  def set_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))
+
+    @data = DateTime.civil(1, 1, mday, 0, 0, 0, tz2of(zonestr))
   end
 
   def _to_s
@@ -848,19 +843,26 @@ class XSDGMonth < XSDAnySimpleType
   Type = QName.new(Namespace, GMonthLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data_str(t)
+  def set_datetime_init(t)
+  end
+
+  def set_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))
+
+    @data = DateTime.civil(1, mon, 1, 0, 0, 0, tz2of(zonestr))
   end
 
   def _to_s
@@ -874,7 +876,9 @@ class XSDHexBinary < XSDAnySimpleType
 
   # String in Ruby could be a binary.
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
   def set_encoded(value)
@@ -891,8 +895,9 @@ class XSDHexBinary < XSDAnySimpleType
 
 private
 
-  def screen_data(value)
-    value.unpack("H*")[0].tr('a-f', 'A-F')
+  def _set(value)
+    @data = value.unpack("H*")[0]
+    @data.tr!('a-f', 'A-F')
   end
 end
 
@@ -901,7 +906,9 @@ class XSDBase64Binary < XSDAnySimpleType
 
   # String in Ruby could be a binary.
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
   def set_encoded(value)
@@ -918,8 +925,8 @@ class XSDBase64Binary < XSDAnySimpleType
 
 private
 
-  def screen_data(value)
-    [value].pack("m").strip
+  def _set(value)
+    @data = [value].pack("m").strip
   end
 end
 
@@ -927,14 +934,16 @@ class XSDAnyURI < XSDAnySimpleType
   Type = QName.new(Namespace, AnyURILiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data(value)
+  def _set(value)
     begin
-      URI.parse(value.to_s.strip)
+      @data = URI.parse(value.to_s.strip)
     rescue URI::InvalidURIError
       raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
     end
@@ -945,27 +954,21 @@ class XSDQName < XSDAnySimpleType
   Type = QName.new(Namespace, QNameLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data(value)
+  def _set(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
+    @prefix = $1
+    @localpart = $2
     @data = _to_s
     @data.freeze
   end
@@ -987,12 +990,14 @@ class XSDNormalizedString < XSDString
   Type = QName.new(Namespace, NormalizedStringLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data(value)
+  def _set(value)
     if /[\t\r\n]/ =~ value
       raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
     end
@@ -1004,102 +1009,52 @@ class XSDInteger < XSDDecimal
   Type = QName.new(Namespace, IntegerLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def screen_data_str(str)
+  def set_str(str)
     begin
-      data = Integer(str)
+      @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)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def maxinclusive
-    +9223372036854775807
+  def set_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
   end
 
-  def mininclusive
-    -9223372036854775808
+  MaxInclusive = +9223372036854775807
+  MinInclusive = -9223372036854775808
+  def validate(v)
+    ((MinInclusive <= v) && (v <= MaxInclusive))
   end
 end
 
@@ -1107,17 +1062,28 @@ class XSDInt < XSDLong
   Type = QName.new(Namespace, IntLiteral)
 
   def initialize(value = nil)
-    init(Type, value)
+    super()
+    @type = Type
+    set(value) if value
   end
 
 private
 
-  def maxinclusive
-    +2147483647
+  def set_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
   end
 
-  def mininclusive
-    -2147483648
+  MaxInclusive = +2147483647
+  MinInclusive = -2147483648
+  def validate(v)
+    ((MinInclusive <= v) && (v <= MaxInclusive))
   end
 end
 
@@ -1125,143 +1091,28 @@ 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)
+    super()
+    @type = Type
+    set(value) if 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
+  def set_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
   end
 
-  def mininclusive
-    1
+  MaxInclusive = +32767
+  MinInclusive = -32768
+  def validate(v)
+    ((MinInclusive <= v) && (v <= MaxInclusive))
   end
 end
 
diff --git a/lib/xsd/iconvcharset.rb b/lib/xsd/iconvcharset.rb
index 7e629d569b..cac66515e2 100644
--- a/lib/xsd/iconvcharset.rb
+++ b/lib/xsd/iconvcharset.rb
@@ -22,7 +22,7 @@ class IconvCharset
       out << e.success
       ch, str = e.failed.split(//, 2)
       out << '?'
-      warn("Failed to convert #{ch}")
+      STDERR.puts("Failed to convert #{ch}")
       retry
     end
     return out
diff --git a/lib/xsd/mapping.rb b/lib/xsd/mapping.rb
deleted file mode 100644
index 06d30d4cbf..0000000000
--- a/lib/xsd/mapping.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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/lib/xsd/namedelements.rb b/lib/xsd/namedelements.rb
index a13396bb71..b6f909c1dc 100644
--- a/lib/xsd/namedelements.rb
+++ b/lib/xsd/namedelements.rb
@@ -1,5 +1,5 @@
 # XSD4R - WSDL named element collection.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -23,16 +23,6 @@ class NamedElements
     o
   end
 
-  def freeze
-    super
-    @elements.freeze
-    self
-  end
-
-  def empty?
-    size == 0
-  end
-
   def size
     @elements.size
   end
@@ -49,10 +39,6 @@ class NamedElements
     @elements.find { |item| item.name.name == name }
   end
 
-  def keys
-    collect { |element| element.name }
-  end
-
   def each
     @elements.each do |element|
       yield(element)
@@ -79,8 +65,6 @@ class NamedElements
     self
   end
 
-  Empty = NamedElements.new.freeze
-
 protected
 
   def elements=(rhs)
diff --git a/lib/xsd/ns.rb b/lib/xsd/ns.rb
index 53eeae7130..224db6c058 100644
--- a/lib/xsd/ns.rb
+++ b/lib/xsd/ns.rb
@@ -1,5 +1,5 @@
 # XSD4R - XML Schema Namespace library
-# Copyright (C) 2000-2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -20,7 +20,7 @@ class NS
 
     def assign(ns)
       @count += 1
-      "n#{@count}"
+      "n#{ @count }"
     end
   end
 
@@ -54,7 +54,7 @@ public
   end
 
   def assigned?(ns)
-    @default_namespace == ns or @ns2tag.key?(ns)
+    @ns2tag.key?(ns)
   end
 
   def assigned_tag?(tag)
@@ -72,9 +72,9 @@ public
     if (name.namespace == @default_namespace)
       name.name
     elsif @ns2tag.key?(name.namespace)
-      "#{@ns2tag[name.namespace]}:#{name.name}"
+      @ns2tag[name.namespace] + ':' << name.name
     else
-      raise FormatError.new("namespace: #{name.namespace} not defined yet")
+      raise FormatError.new('Namespace: ' << name.namespace << ' not defined yet.')
     end
   end
 
@@ -83,7 +83,7 @@ public
       return true if (name == rhs)
     end
     @tag2ns.each do |assigned_tag, assigned_ns|
-      if assigned_ns == ns && "#{assigned_tag}:#{name}" == rhs
+      if assigned_ns == ns && "#{ assigned_tag }:#{ name }" == rhs
 	return true
       end
     end
@@ -93,32 +93,22 @@ public
   # $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)
+  def parse(elem)
+    ns = nil
+    name = nil
     ParseRegexp =~ elem
     if $2
       ns = @tag2ns[$1]
       name = $2
       if !ns
-	raise FormatError.new("unknown namespace qualifier: #{$1}")
+	raise FormatError.new('Unknown namespace qualifier: ' << $1)
       end
     elsif $1
-      ns = nil
+      ns = @default_namespace
       name = $1
-    else
-      raise FormatError.new("illegal element format: #{elem}")
+    end
+    if !name
+      raise FormatError.new("Illegal element format: #{ elem }")
     end
     XSD::QName.new(ns, name)
   end
diff --git a/lib/xsd/qname.rb b/lib/xsd/qname.rb
index bb9763a69a..9dce1340f8 100644
--- a/lib/xsd/qname.rb
+++ b/lib/xsd/qname.rb
@@ -1,5 +1,5 @@
 # XSD4R - XML QName definition.
-# Copyright (C) 2002, 2003, 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -12,25 +12,20 @@ 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})"
+    self.class.new(@namespace, name)
   end
 
   def match(rhs)
+    unless self.class === rhs
+      return false
+    end
     if rhs.namespace and (rhs.namespace != @namespace)
       return false
     end
@@ -41,7 +36,7 @@ class QName
   end
 
   def ==(rhs)
-    !rhs.nil? and @namespace == rhs.namespace and @name == rhs.name
+    (self.class === rhs && @namespace == rhs.namespace && @name == rhs.name)
   end
 
   def ===(rhs)
@@ -60,18 +55,11 @@ class QName
     "{#{ 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
 
 
diff --git a/lib/xsd/xmlparser.rb b/lib/xsd/xmlparser.rb
index e79e36c58c..1f87ae2e4d 100644
--- a/lib/xsd/xmlparser.rb
+++ b/lib/xsd/xmlparser.rb
@@ -45,8 +45,8 @@ end
 # Try to load XML processor.
 loaded = false
 [
-  'xsd/xmlparser/xmlparser',
   'xsd/xmlparser/xmlscanner',
+  'xsd/xmlparser/xmlparser',
   'xsd/xmlparser/rexmlparser',
 ].each do |lib|
   begin
diff --git a/lib/xsd/xmlparser/xmlscanner.rb b/lib/xsd/xmlparser/xmlscanner.rb
index c80dc23910..c2ad51be52 100644
--- a/lib/xsd/xmlparser/xmlscanner.rb
+++ b/lib/xsd/xmlparser/xmlscanner.rb
@@ -1,5 +1,5 @@
 # XSD4R - XMLScan XML parser library.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -21,12 +21,12 @@ class XMLScanner < XSD::XMLParser::Parser
     @attrs = {}
     @curattr = nil
     @scanner = XMLScan::XMLScanner.new(self)
-    @scanner.kcode = XSD::Charset.charset_str(charset) if charset
+    @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
+    @scanner.kcode = ::XSD::Charset.charset_str(charset) if charset
     self.xmldecl_encoding = charset
   end
 
diff --git a/lib/yaml.rb b/lib/yaml.rb
index a8da42a321..e89171f205 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -1,345 +1,132 @@
 # -*- 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
+#   YAML.rb
 #
-# 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
+#   Loads the parser/loader and emitter/writer.
 #
-# 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
+module YAML
 
-    # 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
+    begin
+        require 'yaml/syck'
+        @@parser = YAML::Syck::Parser
+        @@loader = YAML::Syck::DefaultLoader
+        @@emitter = YAML::Syck::Emitter
+    rescue LoadError
+        require 'yaml/parser'
+        @@parser = YAML::Parser
+        @@loader = YAML::DefaultLoader
+        require 'yaml/emitter'
+        @@emitter = YAML::Emitter
+    end
+    require 'yaml/loader'
+    require 'yaml/stream'
 
 	#
-	# 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.
+	# Load a single document from the current stream
 	#
-    #   YAML.dump( :locked )
-    #      #=> "--- :locked"
-    #
 	def YAML.dump( obj, io = nil )
-        obj.to_yaml( io || io2 = StringIO.new )
-        io || ( io2.rewind; io2.read )
+        io ||= ""
+        io << obj.to_yaml
+        io
 	end
 
 	#
-	# Load a document from the current _io_ stream.
+	# Load a single document from the current 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 )
+		yp = @@parser.new.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
+	# Parse a single document from the current 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 )
+		yp = @@parser.new( :Model => :Generic ).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
+	# Load all documents from the current stream
 	#
-	def YAML.each_document( io, &block )
-		yp = parser.load_documents( io, &block )
+	def YAML.each_document( io, &doc_proc )
+		yp = @@parser.new.load_documents( io, &doc_proc )
     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
+	# Identical to each_document
 	#
 	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
+	# Parse all documents from the current stream
 	#
 	def YAML.each_node( io, &doc_proc )
-		yp = generic_parser.load_documents( io, &doc_proc )
+		yp = @@parser.new( :Model => :Generic ).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
+	# Parse all documents from the current stream
 	#
 	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.
+	# Load all documents from the current stream
 	#
 	def YAML.load_stream( io )
+		yp = @@parser.new
 		d = nil
-		parser.load_documents( io ) do |doc|
-			d = YAML::Stream.new if not d
+		yp.load_documents( io ) { |doc|
+			d = YAML::Stream.new( yp.options ) 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.
+	# Add a transfer method to a domain
 	#
-	def YAML.add_domain_type( domain, type_tag, &transfer_proc )
-        resolver.add_type( "tag:#{ domain }:#{ type_tag }", transfer_proc )
+	def YAML.add_domain_type( domain, type_re, &transfer_proc )
+        @@loader.add_domain_type( domain, type_re, &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 )
+	def YAML.add_builtin_type( type_re, &transfer_proc )
+	    @@loader.add_builtin_type( type_re, &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 )
+	def YAML.add_ruby_type( type, &transfer_proc )
+        @@loader.add_ruby_type( type, &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 )
+	    @@loader.add_private_type( 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 )
+        @@loader.detect_implicit( val )
     end
 
     #
     # Apply a transfer method to a Ruby object
     #
     def YAML.transfer( type_id, obj )
-        resolver.transfer( YAML.tagurize( type_id ), obj )
+        @@loader.transfer( type_id, obj )
     end
 
 	#
@@ -362,12 +149,20 @@ module YAML
     #
     # Allocate blank object
     #
-    def YAML.object_maker( obj_class, val )
+    def YAML.object_maker( obj_class, val, is_attr = false )
         if Hash === val
-            o = obj_class.allocate
-            val.each_pair { |k,v|
-                o.instance_variable_set("@#{k}", v)
-            }
+            name = obj_class.name
+            ostr = sprintf( "%c%co:%c%s\000", Marshal::MAJOR_VERSION, Marshal::MINOR_VERSION,
+                            name.length + 5, name )
+            if is_attr
+                ostr[ -1, 1 ] = Marshal.dump( val ).sub( /^[^{]+\{/, '' )
+            end
+            o = ::Marshal.load( ostr )
+            unless is_attr
+                val.each_pair { |k,v|
+                    o.instance_variable_set("@#{k}", v)
+                }
+            end
             o
         else
             raise YAML::Error, "Invalid object explicitly tagged !ruby/Object: " + val.inspect
@@ -378,17 +173,24 @@ module YAML
 	# 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
-        oid =
-            case oid when Fixnum, NilClass; oid
-            else oid = "#{oid.object_id}-#{oid.hash}"
-            end
-        out.emit( oid, &e )
+		old_opt = nil
+		if opts[:Emitter].is_a? @@emitter
+			out = opts.delete( :Emitter )
+			old_opt = out.options.dup
+			out.options.update( opts )
+		else
+			out = @@emitter.new( opts )
+		end
+        aidx = out.start_object( oid )
+        if aidx
+            out.simple( "*#{ aidx }" )
+        else
+            e.call( out )
+        end
+		if old_opt.is_a? Hash
+			out.options = old_opt
+		end 
+		out.end_object
 	end
 	
 end
@@ -396,45 +198,25 @@ end
 require 'yaml/rubytypes'
 require 'yaml/types'
 
+#
+# 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.
+#
 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 )
+    def y( x )
+        puts x.to_yaml
     end
-    private :y
 end
 
 
diff --git a/lib/yaml/baseemitter.rb b/lib/yaml/baseemitter.rb
index a1992f498b..007ee7be5e 100644
--- a/lib/yaml/baseemitter.rb
+++ b/lib/yaml/baseemitter.rb
@@ -33,46 +33,31 @@ module YAML
 		#
 		# Emit plain, normal flowing text
 		#
-		def node_text( value, block = nil )
+		def node_text( value, block = '>' )
             @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
+			if options(:UseBlock)
+				block = '|'
+			elsif not options(:UseFold) and valx =~ /\n[ \t]/ and not valx =~ /#{YAML::ESCAPE_CHAR}/
+				block = '|'
+			end 
+			str = block.dup
+			if valx =~ /\n\Z\n/
+				str << "+"
+			elsif valx =~ /\Z\n/
+			else
+				str << "-"
+			end
+			if valx =~ /#{YAML::ESCAPE_CHAR}/
+				valx = YAML::escape( valx )
+			end
+			if valx =~ /\A[ \t#]/
+				str << options(:Indent).to_s
+			end
+			if block == '>'
+				valx = fold( valx ) 
+			end
+			self << str + indent_text( valx ) + "\n"
 		end
 
 		#
@@ -100,25 +85,18 @@ module YAML
 		#
 		# Write a text block with the current indent
 		#
-		def indent_text( text, mod, first_line = true )
+		def indent_text( text )
 			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" )
+            spacing = " " * ( level * options(:Indent) )
+			return "\n" + text.gsub( /^([^\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
+		def indent
+            #p [ self.id, @level, :INDENT ]
+			return " " * ( level * options(:Indent) )
 		end
 
 		#
@@ -132,9 +110,25 @@ module YAML
 		# Folding paragraphs within a column
 		#
 		def fold( value )
-            value.gsub( /(^[ \t]+.*$)|(\S.{0,#{options(:BestWidth) - 1}})(?:[ \t]+|(\n+(?=[ \t]|\Z))|$)/ ) do
-                $1 || $2 + ( $3 || "\n" )
-            end
+			value.gsub!( /\A\n+/, '' )
+			folded = $&.to_s
+			width = (0..options(:BestWidth))
+			while not value.empty?
+				last = value.index( /(\n+)/ )
+				chop_s = false
+				if width.include?( last )
+					last += $1.length - 1
+				elsif width.include?( value.length )
+					last = value.length
+				else
+					last = value.rindex( /[ \t]/, options(:BestWidth) )
+					chop_s = true
+				end
+				folded += value.slice!( 0, width.include?( last ) ? last + 1 : options(:BestWidth) )
+				folded.chop! if chop_s
+				folded += "\n" unless value.empty?
+			end
+			folded
 		end
 
         #
diff --git a/lib/yaml/basenode.rb b/lib/yaml/basenode.rb
index 5439903f42..e88a76f3d2 100644
--- a/lib/yaml/basenode.rb
+++ b/lib/yaml/basenode.rb
@@ -25,7 +25,7 @@ module YAML
                 matches.each { |m|
                     result.push m.last
                 }
-                YAML.transfer( 'seq', result )
+                self.class.new( 'seq', result )
             end
         end
 
@@ -67,8 +67,8 @@ module YAML
         end
 
         def at( seg )
-            if Hash === @value
-                self[seg]
+            if Hash === @value and @value.has_key?( seg )
+                @value[seg][1]
             elsif Array === @value and seg =~ /\A\d+\Z/ and @value[seg.to_i]
                 @value[seg.to_i]
             end
@@ -99,8 +99,8 @@ module YAML
                     @value.collect { |v|
                         idx += 1
                         if Hash === @value
-                            match_init = [v[0].transform, v[1]]
-                            match_deep = v[1].match_segment( ypath, depth )
+                            match_init = [v[0], v[1][1]]
+                            match_deep = v[1][1].match_segment( ypath, depth )
                         else
                             match_init = [idx, v]
                             match_deep = v.match_segment( ypath, depth )
@@ -127,7 +127,7 @@ module YAML
                         @value.collect { |h|
                             idx += 1
                             if Hash === @value
-                                [h[0].transform, h[1]]
+                                [h[0], h[1][1]]
                             else
                                 [idx, h]
                             end
@@ -148,7 +148,7 @@ module YAML
             if pred
                 case pred
                 when /^\.=/
-                    pred = $'   # '
+                    pred = $'
                     match_nodes.reject! { |n|
                         n.last.value != pred
                     }
@@ -182,12 +182,12 @@ module YAML
         # We want the node to act like as Hash
         # if it is.
         #
-        def []( *key )
+        def []( *k )
             if Hash === @value
-                v = @value.detect { |k,| k.transform == key.first }
+                v = @value.[]( *k )
                 v[1] if v
             elsif Array === @value
-                @value.[]( *key )
+                @value.[]( *k )
             end
         end
 
diff --git a/lib/yaml/emitter.rb b/lib/yaml/emitter.rb
new file mode 100644
index 0000000000..a6be4a6733
--- /dev/null
+++ b/lib/yaml/emitter.rb
@@ -0,0 +1,107 @@
+#
+# Output classes and methods
+#
+
+require 'yaml/baseemitter'
+require 'yaml/encoding'
+
+module YAML
+
+	#
+	# Emit a set of values
+	#
+    
+	class Emitter
+
+        include BaseEmitter
+
+		attr_accessor :options
+
+		def initialize( opts )
+			opts = {} if opts.class != Hash
+			@options = YAML::DEFAULTS.dup.update( opts )
+            @headless = 0
+            @seq_map = false
+            @anchors = {}
+            @anchor_extras = {}
+            @active_anchors = []
+            @level = -1
+            self.clear
+		end
+
+		def clear
+			@buffer = []
+		end
+
+        def level
+            @level
+        end
+
+		#
+		# Version string
+		#
+		def version_s
+			" %YAML:#{@options[:Version]}" if @options[:UseVersion]
+		end
+
+		#
+		# Header
+		#
+		def header
+            if @headless.nonzero?
+                ""
+            else
+                "---#{version_s} "
+            end
+		end
+
+		#
+		# Concatenate to the buffer
+		#
+		def <<( str )
+            #p [ self.id, @level, str ]
+			@buffer.last << str
+		end
+
+        #
+        # Monitor objects and allow references
+        #
+        def start_object( oid )
+		    @level += 1
+            @buffer.push( "" )
+            #p [ self.id, @level, :OPEN ]
+            idx = nil
+            if oid
+                if @anchors.has_key?( oid )
+                    idx = @active_anchors.index( oid )
+                    unless idx
+                        idx = @active_anchors.length
+                        af_str = "&#{@options[:AnchorFormat]} " % [ idx + 1 ]
+                        af_str += @anchor_extras[ @anchors[ oid ] ].to_s
+                        @buffer[ @anchors[ oid ] ][0,0] = af_str
+					    @headless = 0 if @anchors[ oid ].zero?
+                    end
+                    idx += 1
+                    @active_anchors.push( oid )
+                else
+                    @anchors[ oid ] = @buffer.length - 1
+                end
+            end
+            return idx
+        end
+
+		#
+		# Output method
+		#
+		def end_object
+		    @level -= 1
+            @buffer.push( "" )
+            #p [ self.id, @level, :END ]
+			if @level < 0
+				header + @buffer.to_s[@headless..-1].to_s
+			end
+		end
+	end
+
+end
+
diff --git a/lib/yaml/encoding.rb b/lib/yaml/encoding.rb
index 57dc553606..e361163ac6 100644
--- a/lib/yaml/encoding.rb
+++ b/lib/yaml/encoding.rb
@@ -7,19 +7,15 @@ module YAML
 	#
 	# Escape the string, condensing common escapes
 	#
-	def YAML.escape( value, skip = "" )
-		value.gsub( /\\/, "\\\\\\" ).
-              gsub( /"/, "\\\"" ).
-              gsub( /([\x00-\x1f])/ ) do
-                 skip[$&] || ESCAPES[ $&.unpack("C")[0] ]
-             end
+	def YAML.escape( value )
+		value.gsub( /\\/, "\\\\\\" ).gsub( /"/, "\\\"" ).gsub( /([\x00-\x1f])/ ) { |x| ESCAPES[ x.unpack("C")[0] ] }
 	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}))/ ) {
+		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
diff --git a/lib/yaml/error.rb b/lib/yaml/error.rb
index 15865a9aa9..a9df22749b 100644
--- a/lib/yaml/error.rb
+++ b/lib/yaml/error.rb
@@ -29,6 +29,5 @@ module YAML
     
 	class Error < StandardError; end
 	class ParseError < Error; end
-    class TypeError < StandardError; end
 
 end
diff --git a/lib/yaml/rubytypes.rb b/lib/yaml/rubytypes.rb
index 35b719196e..0e5d5b17d6 100644
--- a/lib/yaml/rubytypes.rb
+++ b/lib/yaml/rubytypes.rb
@@ -1,316 +1,422 @@
 # -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
 require 'date'
+#
+# Type conversions
+#
 
 class Class
 	def to_yaml( opts = {} )
-		raise TypeError, "can't dump anonymous class %s" % self.class
+		raise ArgumentError, "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 is_complex_yaml?
+        true
+    end
+    def to_yaml_type
+        "!ruby/object:#{self.class}"
+    end
+    def to_yaml_properties
+        instance_variables.sort
+    end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( self, opts ) do |out|
-            out.map( taguri, to_yaml_style ) do |map|
-				to_yaml_properties.each do |m|
+		YAML::quick_emit( self.object_id, opts ) { |out|
+            out.map( self.to_yaml_type ) { |map|
+				to_yaml_properties.each { |m|
                     map.add( m[1..-1], instance_variable_get( m ) )
-                end
-            end
-        end
+                }
+            }
+		}
 	end
 end
 
+YAML.add_ruby_type( /^object/ ) { |type, val|
+    type, obj_class = YAML.read_type_class( type, Object )
+    YAML.object_maker( obj_class, val )
+}
+
+#
+# Maps: Hash#to_yaml
+#
 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
+    def is_complex_yaml?
+        true
+    end
+    def to_yaml_type
+        if self.class == Hash or self.class == YAML::SpecialHash
+            "!map"
         else
-            raise YAML::TypeError, "Invalid map explicitly tagged #{ tag }: " + val.inspect
+            "!ruby/hash:#{self.class}"
         end
     end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( self, opts ) do |out|
-            out.map( taguri, to_yaml_style ) do |map|
-                each do |k, v|
-                    map.add( k, v )
-                end
+		opts[:DocType] = self.class if Hash === opts
+		YAML::quick_emit( self.object_id, opts ) { |out|
+            hash_type = to_yaml_type
+            if not out.options(:ExplicitTypes) and hash_type == "!map"
+                hash_type = ""
             end
-        end
+            out.map( hash_type ) { |map|
+				#
+				# Sort the hash
+				#
+                if out.options(:SortKeys)
+				    map.concat( self.sort )
+                else
+                    map.concat( self.to_a )
+                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
+hash_proc = Proc.new { |type, val|
+	if Array === val
+ 		val = Hash.[]( *val )		# Convert the map to a sequence
+	elsif Hash === val
+	    type, obj_class = YAML.read_type_class( type, Hash )
+        if obj_class != Hash
+            o = obj_class.new
+            o.update( val )
+            val = o
+        end
+    else
+ 		raise YAML::Error, "Invalid map explicitly tagged !map: " + val.inspect
+	end
+	val
+}
+YAML.add_ruby_type( /^hash/, &hash_proc ) 
 
-            #
-            # 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
+module YAML
 
-            #
-            # 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)
+    #
+    # Ruby-specific collection: !ruby/flexhash
+    #
+    class FlexHash < Array
+        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
-            st
+            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 ) { |out|
+                out.seq( "!ruby/flexhash" ) { |seq|
+                    self.each { |v|
+                        if v[1]
+                            seq.add( Hash.[]( *v ) )
+                        else
+                            seq.add( v[0] )
+                        end
+                    }
+                }
+            }
+        end
+    end
+
+    YAML.add_ruby_type( 'flexhash' ) { |type, val|
+        if Array === val
+            p = FlexHash.new
+            val.each { |v|
+                if Hash === v
+                    p.concat( v.to_a )		# Convert the map to a sequence
+                else
+                    p << [ v, nil ]
+                end
+            }
+            p
         else
-            raise YAML::TypeError, "Invalid Ruby Struct: " + val.inspect
+            raise YAML::Error, "Invalid !ruby/flexhash: " + val.inspect
         end
+    }
+end
+
+#
+# Structs: export as a !map
+#
+class Struct
+    def is_complex_yaml?
+        true
     end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( self, opts ) do |out|
+		YAML::quick_emit( self.object_id, opts ) { |out|
 			#
 			# Basic struct is passed as a YAML map
 			#
-            out.map( taguri, to_yaml_style ) do |map|
-				self.members.each do |m|
+			struct_name = self.class.name.gsub( "Struct::", "" )
+            out.map( "!ruby/struct:#{struct_name}" ) { |map|
+				self.members.each { |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
 
+YAML.add_ruby_type( /^struct/ ) { |type, val|
+	if Hash === val
+        struct_type = nil
+
+		#
+		# Use existing Struct if it exists
+		#
+		begin
+			struct_name, struct_type = YAML.read_type_class( type, Struct )
+		rescue NameError
+		end
+		if not struct_type
+            struct_def = [ type.split( ':', 4 ).last ]
+			struct_type = Struct.new( *struct_def.concat( val.keys.collect { |k| k.intern } ) ) 
+		end
+
+		#
+		# Set the Struct properties
+		#
+		st = struct_type.new
+		st.members.each { |m|
+			st.send( "#{m}=", val[m] )
+		}
+		st
+	else
+		raise YAML::Error, "Invalid Ruby Struct: " + val.inspect
+	end
+}
+
+#
+# Sequences: Array#to_yaml
+#
 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 is_complex_yaml?
+        true
+    end
+    def to_yaml_type
+        if self.class == Array 
+            "!seq"
+        else
+            "!ruby/array:#{self.class}"
+        end
+    end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( self, opts ) do |out|
-            out.seq( taguri, to_yaml_style ) do |seq|
-                each do |x|
-                    seq.add( x )
-                end
+		opts[:DocType] = self.class if Hash === opts
+		YAML::quick_emit( self.object_id, opts ) { |out|
+            array_type = to_yaml_type 
+            if not out.options(:ExplicitTypes) and array_type == "!seq"
+                array_type = ""
             end
-        end
+			
+            out.seq( array_type ) { |seq|
+                seq.concat( self )
+            }
+		}
 	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)
+array_proc = Proc.new { |type, val|
+    if Array === val
+        type, obj_class = YAML.read_type_class( type, Array )
+        if obj_class != Array
+            o = obj_class.new
+            o.concat( val )
+            val = o
         end
-        o
+        val
+    else
+        val.to_a
+    end
+}
+YAML.add_ruby_type( /^array/, &array_proc ) 
+
+#
+# Exception#to_yaml
+#
+class Exception
+    def is_complex_yaml?
+        true
+    end
+    def to_yaml_type
+        "!ruby/exception:#{self.class}"
     end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( self, opts ) do |out|
-            out.map( taguri, to_yaml_style ) do |map|
-                map.add( 'message', message )
-				to_yaml_properties.each do |m|
+		YAML::quick_emit( self.object_id, opts ) { |out|
+            out.map( self.to_yaml_type ) { |map|
+                map.add( 'message', self.message )
+				to_yaml_properties.each { |m|
                     map.add( m[1..-1], instance_variable_get( m ) )
-                end
-            end
-        end
+                }
+            }
+		}
 	end
 end
 
+YAML.add_ruby_type( /^exception/ ) { |type, val|
+    type, obj_class = YAML.read_type_class( type, Exception )
+    o = YAML.object_maker( obj_class, { 'mesg' => val.delete( 'message' ) }, true )
+    val.each_pair { |k,v|
+		o.instance_variable_set("@#{k}", v)
+	}
+	o
+}
+
+
+#
+# String#to_yaml
+#
 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.+/
+        ( self =~ /\n.+/ ? true : false )
     end
     def is_binary_data?
-        ( self.count( "^ -~", "^\r\n" ).fdiv(self.size) > 0.3 || self.index( "\x00" ) ) 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
+        ( self.count( "^ -~", "^\r\n" ) / self.size > 0.3 || self.count( "\x00" ) > 0 )
     end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( is_complex_yaml? ? self : 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
+        complex = false
+        if self.is_complex_yaml?
+            complex = true
+        elsif opts[:BestWidth].to_i > 0
+            if self.length > opts[:BestWidth] and opts[:UseFold]
+                complex = true
             end
         end
+		YAML::quick_emit( complex ? self.object_id : nil, opts ) { |out|
+            if complex
+                if self.is_binary_data?
+                    out.binary_base64( self )
+                elsif self =~ /^ |#{YAML::ESCAPE_CHAR}| $/
+                    complex = false
+                else
+                    out.node_text( self )
+                end
+            end
+            if not complex
+                ostr = 	if out.options(:KeepValue)
+                            self
+                        elsif empty?
+                            "''"
+                        elsif self =~ /^[^#{YAML::WORD_CHAR}]| \#|#{YAML::ESCAPE_CHAR}|[#{YAML::SPACE_INDICATORS}]( |$)| $|\n|\'/
+                            "\"#{YAML.escape( self )}\"" 
+                        elsif YAML.detect_implicit( self ) != 'str'
+                            "\"#{YAML.escape( self )}\"" 
+                        else
+                            self
+                        end
+                out.simple( ostr )
+            end
+		}
 	end
 end
 
+#
+# Symbol#to_yaml
+#
 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
+    def is_complex_yaml?
+        false
     end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( "tag:yaml.org,2002:str", self.inspect, :plain )
-        end
+		YAML::quick_emit( nil, opts ) { |out|
+			out << "!ruby/sym "
+			self.id2name.to_yaml( :Emitter => out )
+		}
 	end
 end
 
+symbol_proc = Proc.new { |type, val|
+	if String === val
+		val.intern
+	else
+		raise YAML::Error, "Invalid Symbol: " + val.inspect
+	end
+}
+YAML.add_ruby_type( 'symbol', &symbol_proc ) 
+YAML.add_ruby_type( 'sym', &symbol_proc ) 
+
+#
+# Range#to_yaml
+#
 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
+    def is_complex_yaml?
+        false
     end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( self, 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
+		YAML::quick_emit( nil, opts ) { |out|
+			out << "!ruby/range " 
+			self.inspect.to_yaml( :Emitter => out )
+		}
 	end
 end
 
+YAML.add_ruby_type( 'range' ) { |type, val|
+	if String === val and val =~ /^(.*[^.])(\.{2,3})([^.].*)$/
+        r1, rdots, r2 = $1, $2, $3
+		Range.new( YAML.try_implicit( r1 ), YAML.try_implicit( r2 ), rdots.length == 3 )
+	elsif Hash === val
+		Range.new( val['begin'], val['end'], val['exclude_end?'] )
+	else
+		raise YAML::Error, "Invalid Range: " + val.inspect
+	end
+}
+
+#
+# Make an RegExp
+#
 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
+    def is_complex_yaml?
+        false
     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
+		YAML::quick_emit( nil, opts ) { |out|
+			out << "!ruby/regexp "
+			self.inspect.to_yaml( :Emitter => out )
+		}
 	end
 end
 
+regexp_proc = Proc.new { |type, val|
+	if String === val and val =~ /^\/(.*)\/([mix]*)$/
+		val = { 'REGEXP' => $1, 'MODIFIERS' => $2 }
+	end
+	if Hash === val
+		mods = nil
+		unless val['MODIFIERS'].to_s.empty?
+			mods = 0x00
+			if val['MODIFIERS'].include?( 'x' )
+				mods |= Regexp::EXTENDED
+			elsif val['MODIFIERS'].include?( 'i' )
+				mods |= Regexp::IGNORECASE
+			elsif val['MODIFIERS'].include?( 'm' )
+				mods |= Regexp::POSIXLINE
+			end
+		end
+		Regexp::compile( val['REGEXP'], mods )
+	else
+		raise YAML::Error, "Invalid Regular expression: " + val.inspect
+	end
+}
+YAML.add_domain_type( "perl.yaml.org,2002", /^regexp/, &regexp_proc )
+YAML.add_ruby_type( 'regexp', &regexp_proc )
+
+#
+# Emit a Time object as an ISO 8601 timestamp
+#
 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
+    def is_complex_yaml?
+        false
     end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( self, opts ) do |out|
+		YAML::quick_emit( nil, opts ) { |out|
             tz = "Z"
             # from the tidy Tobias Peters <t-peters@gmx.de> Thanks!
             unless self.utc?
@@ -327,82 +433,74 @@ class Time
                 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
+            ( self.strftime( "%Y-%m-%d %H:%M:%S." ) +
+                "%06d %s" % [usec, tz] ).
+                to_yaml( :Emitter => out, :KeepValue => true )
+		}
 	end
 end
 
+#
+# Emit a Date object as a simple implicit
+#
 class Date
-    yaml_as "tag:yaml.org,2002:timestamp#ymd"
-	def to_yaml( opts = {} )
-		YAML::quick_emit( self, 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 is_complex_yaml?
+        false
+    end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( "tag:yaml.org,2002:int", self.to_s, :plain )
-        end
+		opts[:KeepValue] = true
+		self.to_s.to_yaml( opts )
 	end
 end
 
-class Float
-    yaml_as "tag:yaml.org,2002:float"
+#
+# Send Integer, Booleans, NilClass to String
+#
+class Numeric
+    def is_complex_yaml?
+        false
+    end
 	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
+		str = self.to_s
+		if str == "Infinity"
+			str = ".Inf"
+		elsif str == "-Infinity"
+			str = "-.Inf"
+		elsif str == "NaN"
+			str = ".NaN"
+		end
+		opts[:KeepValue] = true
+		str.to_yaml( opts )
 	end
 end
 
 class TrueClass
-    yaml_as "tag:yaml.org,2002:bool#yes"
+    def is_complex_yaml?
+        false
+    end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( taguri, "true", :plain )
-        end
+		opts[:KeepValue] = true
+		"true".to_yaml( opts )
 	end
 end
 
 class FalseClass
-    yaml_as "tag:yaml.org,2002:bool#no"
+    def is_complex_yaml?
+        false
+    end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( taguri, "false", :plain )
-        end
+		opts[:KeepValue] = true
+		"false".to_yaml( opts )
 	end
 end
 
 class NilClass 
-    yaml_as "tag:yaml.org,2002:null"
+    def is_complex_yaml?
+        false
+    end
 	def to_yaml( opts = {} )
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( taguri, "", :plain )
-        end
+		opts[:KeepValue] = true
+		"".to_yaml( opts )
 	end
 end
 
diff --git a/lib/yaml/store.rb b/lib/yaml/store.rb
index e3a8e9fcdd..2e74b27221 100644
--- a/lib/yaml/store.rb
+++ b/lib/yaml/store.rb
@@ -4,40 +4,72 @@
 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
+module YAML
 
-  def dump(table)
-    @table.to_yaml(@opt)
-  end
+	class Store < PStore
+		#
+		# Constructor
+		# 
+		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 load(content)
-    table = YAML::load(content)
-    if table == false
-      {}
-    else
-      table
-    end
-  end
+		#
+		# Override Pstore#transaction
+		#
+		def transaction
+			raise YAML::Error, "nested transaction" if @transaction
+			raise YAML::Error, "no filename for transaction" unless @filename
+			begin
+				@transaction = true
+				value = nil
+				backup = @filename+"~"
+				if File::exist?(@filename)
+					file = File::open(@filename, "rb+")
+					orig = true
+				else
+					@table = {}
+					file = File::open(@filename, "wb+")
+					file.write( @table.to_yaml( @opt ) )
+				end
+				file.flock(File::LOCK_EX)
+				if orig
+					File::copy @filename, backup
+					@table = YAML::load( file )
+				end
+				begin
+					catch(:pstore_abort_transaction) do
+						value = yield(self)
+					end
+				rescue Exception
+					@abort = true
+					raise
+				ensure
+					unless @abort
+						begin
+							file.rewind
+							file.write( @table.to_yaml( @opt ) )
+							file.truncate(file.pos)
+						rescue
+							File::rename backup, @filename if File::exist?(backup)
+							raise
+						end
+					end
+					@abort = false
+				end
+			ensure
+				@table = nil
+				@transaction = false
+				file.close if file
+			end
+			value
+		end
+	end
 
-  def marshal_dump_supports_canonical_option?
-    false
-  end
-
-  EMPTY_MARSHAL_DATA = {}.to_yaml
-  EMPTY_MARSHAL_CHECKSUM = Digest::MD5.digest(EMPTY_MARSHAL_DATA)
-  def empty_marshal_data
-    EMPTY_MARSHAL_DATA
-  end
-  def empty_marshal_checksum
-    EMPTY_MARSHAL_CHECKSUM
-  end
 end
diff --git a/lib/yaml/stream.rb b/lib/yaml/stream.rb
index 060fbc4200..943c51526b 100644
--- a/lib/yaml/stream.rb
+++ b/lib/yaml/stream.rb
@@ -24,15 +24,19 @@ module YAML
 			@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 )
+		def emit
+            opts = @options.dup
+			opts[:UseHeader] = true if @documents.length > 1
+			ct = 0
+            out = YAML::Syck::Emitter.new( opts )
             @documents.each { |v|
-                v.to_yaml( out )
+                if ct > 0
+                    out << "\n--- " 
+                end
+                v.to_yaml( :Emitter => out )
+                ct += 1
             }
-            io || ( io2.rewind; io2.read )
+            out.end_object
 		end
 
 	end
diff --git a/lib/yaml/syck.rb b/lib/yaml/syck.rb
index faf57e8036..267067feb5 100644
--- a/lib/yaml/syck.rb
+++ b/lib/yaml/syck.rb
@@ -4,6 +4,7 @@
 #
 require 'syck'
 require 'yaml/basenode'
+require 'yaml/baseemitter'
 
 module YAML
     module Syck
@@ -15,5 +16,12 @@ module YAML
             include YAML::BaseNode
         end
 
+        #
+        # Mixin BaseEmitter functionality
+        #
+        class Emitter
+            include YAML::BaseEmitter
+        end
+
     end
 end
diff --git a/lib/yaml/tag.rb b/lib/yaml/tag.rb
deleted file mode 100644
index 0fb6bef9a0..0000000000
--- a/lib/yaml/tag.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- 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/lib/yaml/types.rb b/lib/yaml/types.rb
index 3871c628fe..f7772cb3a0 100644
--- a/lib/yaml/types.rb
+++ b/lib/yaml/types.rb
@@ -1,107 +1,80 @@
-# -*- 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
-        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 private type
+	#
+	class PrivateType
+		attr_accessor :type_id, :value
+		def initialize( type, val )
+			@type_id = type; @value = val
+		end
+		def to_yaml( opts = {} )
+			YAML::quick_emit( self.object_id, opts ) { |out|
+				out << " !!#{@type_id}"
+				value.to_yaml( :Emitter => out )
+			}
+		end
+	end
 
     #
     # Default domain type
     #
     class DomainType
-        def self.tag_subclasses?; false; end
-        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( self, 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
+		attr_accessor :domain, :type_id, :value
+		def initialize( domain, type, val )
+			@domain = domain; @type_id = type; @value = val
+		end
+        def to_yaml_type
+            dom = @domain.dup
+            if dom =~ /\.yaml\.org,2002$/
+                dom = $`
             end
-        end
-    end
+            "#{dom}/#{@type_id}"
+        end
+		def to_yaml( opts = {} )
+			YAML::quick_emit( self.object_id, opts ) { |out|
+				out << " !#{to_yaml_type} "
+				value.to_yaml( :Emitter => out )
+			}
+		end
+	end
 
-    #
-    # YAML Hash class to support comments and defaults
-    #
-    class SpecialHash < ::Hash 
-        attr_accessor :default
+	#
+	# YAML Hash class to support comments and defaults
+	#
+	class SpecialHash < Object::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_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
+	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
+    class Omap < Array
         def self.[]( *vals )
             o = Omap.new
-            0.step( vals.length - 1, 2 ) do |i|
+            0.step( vals.length - 1, 2 ) { |i|
                 o[vals[i]] = vals[i+1]
-            end
+            }
             o
         end
         def []( k )
@@ -123,35 +96,36 @@ module YAML
             true
         end
         def to_yaml( opts = {} )
-            YAML::quick_emit( self, opts ) do |out|
-                out.seq( taguri, to_yaml_style ) do |seq|
-                    self.each do |v|
+            YAML::quick_emit( self.object_id, opts ) { |out|
+                out.seq( "!omap" ) { |seq|
+                    self.each { |v|
                         seq.add( Hash[ *v ] )
-                    end
-                end
-            end
+                    }
+                }
+            }
         end
     end
 
+    YAML.add_builtin_type( "omap" ) { |type, val|
+        if Array === val
+            p = Omap.new
+            val.each { |v|
+                if Hash === v
+                    p.concat( v.to_a )		# Convert the map to a sequence
+                else
+                    raise YAML::Error, "Invalid !omap entry: " + val.inspect
+                end
+            }
+        else
+            raise YAML::Error, "Invalid !omap: " + val.inspect
+        end
+        p
+    }
+
     #
     # 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
+    class Pairs < Array
         def self.[]( *vals )
             p = Pairs.new
             0.step( vals.length - 1, 2 ) { |i|
@@ -173,20 +147,50 @@ module YAML
             true
         end
         def to_yaml( opts = {} )
-            YAML::quick_emit( self, opts ) do |out|
-                out.seq( taguri, to_yaml_style ) do |seq|
-                    self.each do |v|
+            YAML::quick_emit( self.object_id, opts ) { |out|
+                out.seq( "!pairs" ) { |seq|
+                    self.each { |v|
                         seq.add( Hash[ *v ] )
-                    end
-                end
-            end
+                    }
+                }
+            }
         end
     end
 
+    YAML.add_builtin_type( "pairs" ) { |type, val|
+        if Array === val
+            p = Pairs.new
+            val.each { |v|
+                if Hash === v
+                    p.concat( v.to_a )		# Convert the map to a sequence
+                else
+                    raise YAML::Error, "Invalid !pairs entry: " + val.inspect
+                end
+            }
+        else
+            raise YAML::Error, "Invalid !pairs: " + val.inspect
+        end
+        p
+    }
+
     #
     # Builtin collection: !set
     #
-    class Set < ::Hash
-        yaml_as "tag:yaml.org,2002:set"
+    class Set < Hash
+        def to_yaml_type
+            "!set"
+        end
     end
+
+    YAML.add_builtin_type( 'set' ) { |type, val|
+        if Array === val
+            val = Set[ *val ]
+        elsif Hash === val
+            Set[ val ]
+        else
+            raise YAML::Error, "Invalid map explicitly tagged !map: " + val.inspect
+        end
+        val
+    }
+
 end
diff --git a/main.c b/main.c
index bee9a4b15b..aa264e8507 100644
--- a/main.c
+++ b/main.c
@@ -12,6 +12,10 @@
 
 #include "ruby.h"
 
+#ifdef DJGPP
+unsigned int _stklen = 0x180000;
+#endif
+
 #ifdef __human68k__
 int _stacksize = 262144;
 #endif
@@ -41,11 +45,8 @@ main(argc, argv, envp)
     argc = ccommand(&argv);
 #endif
 
-    {
-        RUBY_INIT_STACK
-        ruby_init();
-        ruby_options(argc, argv);
-        ruby_run();
-    }
+    ruby_init();
+    ruby_options(argc, argv);
+    ruby_run();
     return 0;
 }
diff --git a/marshal.c b/marshal.c
index f643450abd..1a30ee07b5 100644
--- a/marshal.c
+++ b/marshal.c
@@ -81,19 +81,9 @@ shortlen(len, ds)
 #define TYPE_LINK	'@'
 
 static ID s_dump, s_load, s_mdump, s_mload;
-static ID s_dump_data, s_load_data, s_alloc, s_call;
+static ID s_dump_data, s_load_data, s_alloc;
 static ID s_getc, s_read, s_write, s_binmode;
 
-static void
-reentrant_check(obj, sym)
-    VALUE obj;
-    ID sym;
-{
-    if (obj && RBASIC(obj)->klass) {
-        rb_raise(rb_eRuntimeError, "%s reentered", rb_id2name(sym));
-    }
-}
-
 struct dump_arg {
     VALUE obj;
     VALUE str, dest;
@@ -108,29 +98,11 @@ struct dump_call_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)
-    const char *s;
+    char *s;
     int n;
     struct dump_arg *arg;
 {
@@ -153,7 +125,7 @@ w_byte(c, arg)
 
 static void
 w_bytes(s, n, arg)
-    const char *s;
+    char *s;
     int n;
     struct dump_arg *arg;
 {
@@ -338,7 +310,7 @@ w_symbol(id, arg)
     ID id;
     struct dump_arg *arg;
 {
-    const char *sym = rb_id2name(id);
+    char *sym = rb_id2name(id);
     st_data_t num;
 
     if (st_lookup(arg->symbols, id, &num)) {
@@ -354,7 +326,7 @@ w_symbol(id, arg)
 
 static void
 w_unique(s, arg)
-    const char *s;
+    char *s;
     struct dump_arg *arg;
 {
     if (s[0] == '#') {
@@ -381,10 +353,10 @@ w_extended(klass, arg, check)
     struct dump_arg *arg;
     int check;
 {
-    const char *path;
+    char *path;
 
-    if (check && FL_TEST(klass, FL_SINGLETON)) {
-	if (RCLASS(klass)->m_tbl->num_entries ||
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	if (check && 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");
 	}
@@ -410,7 +382,7 @@ w_class(type, obj, arg, check)
     VALUE klass = CLASS_OF(obj);
     w_extended(klass, arg, check);
     w_byte(type, arg);
-    path = RSTRING(class2path(rb_class_real(klass)))->ptr;
+    path = rb_class2name(klass);
     w_unique(path, arg);
 }
 
@@ -425,7 +397,7 @@ w_uclass(obj, base_klass, arg)
     klass = rb_class_real(klass);
     if (klass != base_klass) {
 	w_byte(TYPE_UCLASS, arg);
-	w_unique(RSTRING(class2path(klass))->ptr, arg);
+	w_unique(rb_class2name(klass), arg);
     }
 }
 
@@ -447,7 +419,7 @@ w_ivar(tbl, arg)
 {
     if (tbl) {
 	w_long(tbl->num_entries, arg->arg);
-	st_foreach_safe(tbl, w_obj_each, (st_data_t)arg);
+	st_foreach(tbl, w_obj_each, (st_data_t)arg);
     }
     else {
 	w_long(0, arg->arg);
@@ -478,7 +450,7 @@ w_object(obj, arg, limit)
 	return;
     }
 
-    if ((ivtbl = rb_generic_ivar_table(obj)) != 0) {
+    if (ivtbl = rb_generic_ivar_table(obj)) {
 	w_byte(TYPE_IVAR, arg);
     }
     if (obj == Qnil) {
@@ -512,10 +484,9 @@ w_object(obj, arg, limit)
 
 	st_add_direct(arg->data, obj, arg->data->num_entries);
 	if (rb_respond_to(obj, s_mdump)) {
-	    volatile VALUE v;
+	    VALUE v;
 
 	    v = rb_funcall(obj, s_mdump, 0, 0);
-	    reentrant_check(arg->str, s_mdump);
 	    w_class(TYPE_USRMARSHAL, obj, arg, Qfalse);
 	    w_object(v, arg, limit);
 	    if (ivtbl) w_ivar(0, &c_arg);
@@ -525,7 +496,6 @@ w_object(obj, arg, limit)
 	    VALUE v;
 
 	    v = rb_funcall(obj, s_dump, 1, INT2NUM(limit));
-	    reentrant_check(arg->str, s_dump);
 	    if (TYPE(v) != T_STRING) {
 		rb_raise(rb_eTypeError, "_dump() must return string");
 	    }
@@ -547,7 +517,11 @@ w_object(obj, arg, limit)
 	    }
 	    w_byte(TYPE_CLASS, arg);
 	    {
-		VALUE path = class2path(obj);
+		VALUE path = rb_class_path(obj);
+		if (RSTRING(path)->ptr[0] == '#') {
+		    rb_raise(rb_eTypeError, "can't dump anonymous class %s",
+			     RSTRING(path)->ptr);
+		}
 		w_bytes(RSTRING(path)->ptr, RSTRING(path)->len, arg);
 	    }
 	    break;
@@ -555,7 +529,11 @@ w_object(obj, arg, limit)
 	  case T_MODULE:
 	    w_byte(TYPE_MODULE, arg);
 	    {
-		VALUE path = class2path(obj);
+		VALUE path = rb_class_path(obj);
+		if (RSTRING(path)->ptr[0] == '#') {
+		    rb_raise(rb_eTypeError, "can't dump anonymous module %s",
+			     RSTRING(path)->ptr);
+		}
 		w_bytes(RSTRING(path)->ptr, RSTRING(path)->len, arg);
 	    }
 	    break;
@@ -627,13 +605,13 @@ w_object(obj, arg, limit)
 	    }
 	    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");
+		rb_raise(rb_eTypeError, "cannot 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);
+	    st_foreach(RHASH(obj)->tbl, hash_each, (st_data_t)&c_arg);
 	    if (!NIL_P(RHASH(obj)->ifnone)) {
 		w_object(RHASH(obj)->ifnone, arg, limit);
 	    }
@@ -647,7 +625,10 @@ w_object(obj, arg, limit)
 		long i;
 
 		w_long(len, arg);
-		mem = rb_struct_members(obj);
+		mem = rb_struct_iv_get(rb_obj_class(obj), "__member__");
+		if (mem == Qnil) {
+		    rb_raise(rb_eTypeError, "uninitialized struct");
+		}
 		for (i=0; i<len; i++) {
 		    w_symbol(SYM2ID(RARRAY(mem)->ptr[i]), arg);
 		    w_object(RSTRUCT(obj)->ptr[i], arg, limit);
@@ -664,14 +645,13 @@ w_object(obj, arg, limit)
 	    {
 		VALUE v;
 
+		w_class(TYPE_DATA, obj, arg, Qtrue);
 		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);
-		reentrant_check(arg->str, s_dump_data);
-		w_class(TYPE_DATA, obj, arg, Qtrue);
 		w_object(v, arg, limit);
 	    }
 	    break;
@@ -703,42 +683,14 @@ static VALUE
 dump_ensure(arg)
     struct dump_arg *arg;
 {
-    if (RBASIC(arg->str)->klass) return 0; /* ignore reentrant */
     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;
@@ -762,21 +714,20 @@ marshal_dump(argc, argv)
 	else port = a1;
     }
     arg.dest = 0;
-    arg.str = rb_str_buf_new(0);
-    RBASIC(arg.str)->klass = 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);
-	    reentrant_check(arg.str, s_dump_data);
 	}
     }
     else {
-	port = arg.str;
+	port = rb_str_buf_new(0);
+	arg.str = port;
     }
 
     arg.symbols = st_init_numtable();
@@ -790,14 +741,12 @@ marshal_dump(argc, argv)
     w_byte(MARSHAL_MINOR, &arg);
 
     rb_ensure(dump, (VALUE)&c_arg, dump_ensure, (VALUE)&arg);
-    RBASIC(arg.str)->klass = rb_cString;
 
     return port;
 }
 
 struct load_arg {
-    VALUE src;
-    long offset;
+    char *ptr, *end;
     st_table *symbols;
     VALUE data;
     VALUE proc;
@@ -812,21 +761,18 @@ r_byte(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;
+    if (!arg->end) {
+	VALUE src = (VALUE)arg->ptr;
 	VALUE v = rb_funcall2(src, s_getc, 0, 0);
-	reentrant_check(arg->data, s_getc);
 	if (NIL_P(v)) rb_eof_error();
 	c = (unsigned char)FIX2INT(v);
     }
+    else if (arg->ptr < arg->end) {
+	c = *(unsigned char*)arg->ptr++;
+    }
+    else {
+	rb_raise(rb_eArgError, "marshal data too short");
+    }
     return c;
 }
 
@@ -889,27 +835,23 @@ r_bytes0(len, 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 >= len) {
-	    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;
+    if (!arg->end) {
+	VALUE src = (VALUE)arg->ptr;
 	VALUE n = LONG2NUM(len);
 	str = rb_funcall2(src, s_read, 1, &n);
-	reentrant_check(arg->data, s_read);
 	if (NIL_P(str)) goto too_short;
 	StringValue(str);
 	if (RSTRING(str)->len != len) goto too_short;
 	if (OBJ_TAINTED(str)) arg->taint = Qtrue;
     }
+    else {
+	if (arg->ptr + len > arg->end) {
+	  too_short:
+	    rb_raise(rb_eArgError, "marshal data too short");
+	}
+	str = rb_str_new(arg->ptr, len);
+	arg->ptr += len;
+    }
     return str;
 }
 
@@ -948,7 +890,7 @@ r_symbol(arg)
     return r_symreal(arg);
 }
 
-static const char*
+static char*
 r_unique(arg)
     struct load_arg *arg;
 {
@@ -991,7 +933,7 @@ r_ivar(obj, arg)
 
 static VALUE
 path2class(path)
-    const char *path;
+    char *path;
 {
     VALUE v = rb_path2class(path);
 
@@ -1003,7 +945,7 @@ path2class(path)
 
 static VALUE
 path2module(path)
-    const char *path;
+    char *path;
 {
     VALUE v = rb_path2class(path);
 
@@ -1069,7 +1011,7 @@ r_object0(arg, proc, ivp, extmod)
 	      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))) {
+	    if (TYPE(v) == T_MODULE || !RTEST(rb_funcall(c, '<', 1, RBASIC(v)->klass))) {
 		VALUE tmp = rb_obj_alloc(c);
 
 		if (TYPE(v) != TYPE(tmp)) goto format_error;
@@ -1126,7 +1068,7 @@ r_object0(arg, proc, ivp, extmod)
 	{
 	    long len;
 	    BDIGIT *digits;
-	    volatile VALUE data;
+	    VALUE data;
 
 	    NEWOBJ(big, struct RBignum);
 	    OBJSETUP(big, rb_cBignum, T_BIGNUM);
@@ -1217,7 +1159,10 @@ r_object0(arg, proc, ivp, extmod)
 	    ID slot;
 
 	    klass = path2class(r_unique(arg));
-	    mem = rb_struct_s_members(klass);
+	    mem = rb_struct_iv_get(klass, "__member__");
+	    if (mem == Qnil) {
+		rb_raise(rb_eTypeError, "uninitialized struct");
+	    }
 	    len = r_long(arg);
 
 	    values = rb_ary_new2(len);
@@ -1255,7 +1200,6 @@ r_object0(arg, proc, ivp, extmod)
 		*ivp = Qfalse;
 	    }
 	    v = rb_funcall(klass, s_load, 1, data);
-	    reentrant_check(arg->data, s_load);
 	    r_entry(v, arg);
 	}
         break;
@@ -1279,7 +1223,6 @@ r_object0(arg, proc, ivp, extmod)
 	    r_entry(v, arg);
 	    data = r_object(arg);
 	    rb_funcall(v, s_mload, 1, data);
-	    reentrant_check(arg->data, s_mload);
 	}
         break;
 
@@ -1306,7 +1249,6 @@ r_object0(arg, proc, ivp, extmod)
 		   warn = Qfalse;
 	       }
 	       v = rb_funcall(klass, s_alloc, 0);
-	       reentrant_check(arg->data, s_alloc);
            }
 	   else {
 	       v = rb_obj_alloc(klass);
@@ -1321,7 +1263,6 @@ r_object0(arg, proc, ivp, extmod)
                         rb_class2name(klass));
            }
            rb_funcall(v, s_load_data, 1, r_object0(arg, 0, 0, extmod));
-	   reentrant_check(arg->data, s_load_data);
        }
        break;
 
@@ -1364,8 +1305,7 @@ r_object0(arg, proc, ivp, extmod)
 	break;
     }
     if (proc) {
-	rb_funcall(proc, s_call, 1, v);
-	reentrant_check(arg->data, s_call);
+	rb_funcall(proc, rb_intern("call"), 1, v);
     }
     return v;
 }
@@ -1388,22 +1328,10 @@ static VALUE
 load_ensure(arg)
     struct load_arg *arg;
 {
-    if (RBASIC(arg->data)->klass) return 0; /* ignore reentrant */
     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;
@@ -1415,23 +1343,23 @@ marshal_load(argc, argv)
     struct load_arg arg;
 
     rb_scan_args(argc, argv, "11", &port, &proc);
-    v = rb_check_string_type(port);
-    if (!NIL_P(v)) {
+    if (rb_respond_to(port, rb_intern("to_str"))) {
 	arg.taint = OBJ_TAINTED(port); /* original taintedness */
-	port = v;
+	StringValue(port);	       /* possible conversion */
+	arg.ptr = RSTRING(port)->ptr;
+	arg.end = arg.ptr + RSTRING(port)->len;
     }
     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;
+	arg.ptr = (char *)port;
+	arg.end = 0;
     }
     else {
 	rb_raise(rb_eTypeError, "instance of IO needed");
     }
-    arg.src = port;
-    arg.offset = 0;
-    arg.data = 0;
 
     major = r_byte(&arg);
     minor = r_byte(&arg);
@@ -1448,48 +1376,13 @@ marshal_load(argc, argv)
 
     arg.symbols = st_init_numtable();
     arg.data   = rb_hash_new();
-    RBASIC(arg.data)->klass = 0;
     if (NIL_P(proc)) arg.proc = 0;
     else             arg.proc = proc;
     v = rb_ensure(load, (VALUE)&arg, load_ensure, (VALUE)&arg);
-    RBASIC(arg.data)->klass = rb_cHash;
 
     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()
 {
@@ -1502,7 +1395,6 @@ Init_marshal()
     s_dump_data = rb_intern("_dump_data");
     s_load_data = rb_intern("_load_data");
     s_alloc = rb_intern("_alloc");
-    s_call = rb_intern("call");
     s_getc = rb_intern("getc");
     s_read = rb_intern("read");
     s_write = rb_intern("write");
diff --git a/math.c b/math.c
index bf9b598156..5268598750 100644
--- a/math.c
+++ b/math.c
@@ -22,37 +22,6 @@ VALUE rb_mMath;
     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 defined(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;
@@ -61,15 +30,6 @@ math_atan2(obj, 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;
@@ -78,14 +38,6 @@ math_cos(obj, 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;
@@ -95,14 +47,6 @@ math_sin(obj, 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;
@@ -112,13 +56,6 @@ math_tan(obj, 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;
@@ -128,17 +65,12 @@ math_acos(obj, x)
     Need_Float(x);
     errno = 0;
     d = acos(RFLOAT(x)->value);
-    domain_check(d, "acos");
+    if (errno) {
+	rb_sys_fail("acos");
+    }
     return rb_float_new(d);
 }
 
-/*
- *  call-seq:
- *     Math.asin(x)    => float
- *  
- *  Computes the arc sine of <i>x</i>. Returns -{PI/2} .. {PI/2}.
- */
-
 static VALUE
 math_asin(obj, x)
     VALUE obj, x;
@@ -148,17 +80,12 @@ math_asin(obj, x)
     Need_Float(x);
     errno = 0;
     d = asin(RFLOAT(x)->value);
-    domain_check(d, "asin");
+    if (errno) {
+	rb_sys_fail("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;
@@ -176,13 +103,6 @@ cosh(x)
 }
 #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;
@@ -201,14 +121,6 @@ sinh(x)
 }
 #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;
@@ -226,14 +138,6 @@ tanh(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;
@@ -242,13 +146,6 @@ math_tanh(obj, 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;
@@ -258,17 +155,12 @@ math_acosh(obj, x)
     Need_Float(x);
     errno = 0;
     d = acosh(RFLOAT(x)->value);
-    domain_check(d, "acosh");
+    if (errno) {
+	rb_sys_fail("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;
@@ -277,13 +169,6 @@ math_asinh(obj, 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;
@@ -293,17 +178,12 @@ math_atanh(obj, x)
     Need_Float(x);
     errno = 0;
     d = atanh(RFLOAT(x)->value);
-    domain_check(d, "atanh");
+    if (errno) {
+	rb_sys_fail("atanh");
+    }
     return rb_float_new(d);
 }
 
-/*
- *  call-seq:
- *     Math.exp(x)    => float
- *  
- *  Returns e**x.
- */
-
 static VALUE
 math_exp(obj, x)
     VALUE obj, x;
@@ -321,13 +201,6 @@ math_exp(obj, 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;
@@ -337,17 +210,12 @@ math_log(obj, x)
     Need_Float(x);
     errno = 0;
     d = log(RFLOAT(x)->value);
-    domain_check(d, "log");
+    if (errno) {
+	rb_sys_fail("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;
@@ -357,17 +225,12 @@ math_log10(obj, x)
     Need_Float(x);
     errno = 0;
     d = log10(RFLOAT(x)->value);
-    domain_check(d, "log10");
+    if (errno) {
+	rb_sys_fail("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;
@@ -377,22 +240,12 @@ math_sqrt(obj, x)
     Need_Float(x);
     errno = 0;
     d = sqrt(RFLOAT(x)->value);
-    domain_check(d, "sqrt");
+    if (errno) {
+	rb_sys_fail("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;
@@ -406,16 +259,6 @@ math_frexp(obj, x)
     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;
@@ -424,16 +267,6 @@ math_ldexp(obj, x, n)
     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;
@@ -442,13 +275,6 @@ math_hypot(obj, 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;
@@ -457,13 +283,6 @@ math_erf(obj, 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;
@@ -472,14 +291,6 @@ math_erfc(obj, 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()
 {
diff --git a/misc/README b/misc/README
index 12646ac819..adc119d02e 100644
--- a/misc/README
+++ b/misc/README
@@ -1,8 +1,5 @@
-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
-
-Check out http://rubyforge.org/projects/ruby-debug/ also.
+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
diff --git a/misc/inf-ruby.el b/misc/inf-ruby.el
index 0a7eb76bda..0dda55dfda 100644
--- a/misc/inf-ruby.el
+++ b/misc/inf-ruby.el
@@ -21,7 +21,7 @@
 ;;;    (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.
+;;; (2) set to road inf-ruby and set inf-ruby key definition in ruby-mode.
 ;;;
 ;;;    (autoload 'run-ruby "inf-ruby"
 ;;;      "Run an inferior Ruby process")
@@ -35,28 +35,16 @@
 ;;; 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.
diff --git a/misc/ruby-electric.el b/misc/ruby-electric.el
deleted file mode 100644
index c361089938..0000000000
--- a/misc/ruby-electric.el
+++ /dev/null
@@ -1,200 +0,0 @@
-;; -*-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/misc/ruby-mode.el b/misc/ruby-mode.el
index 90204d0812..631f78f78a 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -18,7 +18,7 @@
   )
 
 (defconst ruby-non-block-do-re
-  "\\(while\\|until\\|for\\|rescue\\)\\>[^_]"
+  "\\(while\\|until\\|for\\|rescue\\)\\>"
   )
 
 (defconst ruby-indent-beg-re
@@ -45,7 +45,7 @@
   (concat ruby-modifier-beg-re "\\|" ruby-block-op-re)
   )
 
-(defconst ruby-block-end-re "\\<end\\>")
+(defconst ruby-block-end-re "end")
 
 (defconst ruby-here-doc-beg-re
   "<<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)")
@@ -61,13 +61,13 @@
 (defconst ruby-delimiter
   (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
 	  ruby-block-beg-re
-	  "\\)\\>\\|" ruby-block-end-re
-	  "\\|^=begin\\|" ruby-here-doc-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 "\\|}\\|\\]\\)")
+  (concat "^[ \t]*\\(\\(" ruby-block-mid-re "\\)\\>\\|\\("
+	    ruby-block-end-re "\\)\\>\\|}\\|\\]\\)")
   )
 
 (defconst ruby-operator-chars "-,.+*/%&|^~=<>:")
@@ -152,7 +152,7 @@
 Also ignores spaces after parenthesis when 'space."
   :group 'ruby)
 
-(defcustom ruby-deep-indent-paren '(?\( ?\[ ?\] t)
+(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)
@@ -222,7 +222,7 @@ Also ignores spaces after parenthesis when 'space."
   (make-variable-buffer-local 'comment-column)
   (setq comment-column ruby-comment-column)
   (make-variable-buffer-local 'comment-start-skip)
-  (setq comment-start-skip "#+ *")
+  (setq comment-start-skip "\\(^\\|\\s-\\);?#+ *")
   (setq indent-tabs-mode ruby-indent-tabs-mode)
   (make-local-variable 'parse-sexp-ignore-comments)
   (setq parse-sexp-ignore-comments t)
@@ -255,12 +255,7 @@ The variable ruby-indent-level controls the amount of indentation.
   (make-local-variable 'add-log-current-defun-function)
   (setq add-log-current-defun-function 'ruby-add-log-current-method)
 
-  (set (make-local-variable 'font-lock-defaults) '((ruby-font-lock-keywords) nil nil))
-  (set (make-local-variable 'font-lock-keywords) ruby-font-lock-keywords)
-  (set (make-local-variable 'font-lock-syntax-table) ruby-font-lock-syntax-table)
-  (set (make-local-variable 'font-lock-syntactic-keywords) ruby-font-lock-syntactic-keywords)
-
-  (run-mode-hooks 'ruby-mode-hook))
+  (run-hooks 'ruby-mode-hook))
 
 (defun ruby-current-indentation ()
   (save-excursion
@@ -298,17 +293,15 @@ The variable ruby-indent-level controls the amount of indentation.
 	  (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)))))
+  (let ((c (char-before (or pnt (point)))))
     (cond ((or (eq c ??) (eq c ?$)))
-	  ((and (eq c ?:) (or (not b) (eq (char-syntax b) ? ))))
-	  ((eq c ?\\) (eq b ??)))))
+	  ((eq c ?\\)
+	   (eq (char-before (1- (or pnt (point)))) ??)))))
 
 (defun ruby-expr-beg (&optional option)
   (save-excursion
     (store-match-data nil)
-    (let ((space (skip-chars-backward " \t"))
-	  (start (point)))
+    (let ((space (skip-chars-backward " \t")))
       (cond
        ((bolp) t)
        ((progn
@@ -317,21 +310,22 @@ The variable ruby-indent-level controls the amount of indentation.
 	       (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 "[!?]")
+	    (and (or (not (eq option 'heredoc))
+		     (< space 0))
+		 (looking-at "[!?]")
 		 (or (not (eq option 'modifier))
 		     (bolp)
-		     (save-excursion (forward-char -1) (looking-at "\\Sw$"))))
+		     (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 "\\)\\>")))
+		  ((or (looking-at ruby-block-beg-re)
+		       (looking-at ruby-block-op-re)
+		       (looking-at ruby-block-mid-re))
 		   (goto-char (match-end 0))
-		   (not (looking-at "\\s_")))
+		   (looking-at "\\>"))
 		  ((eq option 'expr-qstr)
 		   (looking-at "[a-zA-Z][a-zA-z0-9_]* +%[^ \t]"))
 		  ((eq option 'expr-re)
@@ -388,8 +382,6 @@ The variable ruby-indent-level controls the amount of indentation.
 	 (t
 	  (setq in-string (point))
 	  (goto-char end))))
-       ((looking-at "/=") 
-	(goto-char pnt))
        ((looking-at "/")
 	(cond
 	 ((and (not (eobp)) (ruby-expr-beg 'expr-re))
@@ -404,7 +396,7 @@ The variable ruby-indent-level controls the amount of indentation.
 	 ((and (not (eobp))
 	       (ruby-expr-beg 'expr-qstr)
 	       (not (looking-at "%="))
-	       (looking-at "%[QqrxWw]?\\([^a-zA-Z0-9 \t\n]\\)"))
+	       (looking-at "%[QqrxWw]?\\(.\\)"))
 	  (goto-char (match-beginning 1))
 	  (setq expand (not (memq (char-before) '(?q ?w))))
 	  (setq w (match-string 1))
@@ -485,7 +477,7 @@ The variable ruby-indent-level controls the amount of indentation.
 	      (setq nest (cons (cons nil pnt) nest))
 	      (setq depth (1+ depth))))
 	(goto-char (match-end 0)))
-       ((looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
+       ((looking-at ruby-block-beg-re)
 	(and
 	 (save-match-data
 	   (or (not (looking-at "do\\>[^_]"))
@@ -511,12 +503,7 @@ The variable ruby-indent-level controls the amount of indentation.
 	 (setq nest (cons (cons nil pnt) nest))
 	 (setq depth (1+ depth)))
 	(goto-char pnt))
-       ((looking-at ":\\(['\"]\\)")
-	(goto-char (match-beginning 1))
-	(ruby-forward-string (buffer-substring (match-beginning 1) (match-end 1)) end))
-       ((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\)")
-	(goto-char (match-end 0)))
-       ((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?")
+       ((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*\\)?")
 	(goto-char (match-end 0)))
        ((or (looking-at "\\.\\.\\.?")
 	    (looking-at "\\.[0-9]+")
@@ -531,26 +518,13 @@ The variable ruby-indent-level controls the amount of indentation.
        ((looking-at "<<")
 	(cond
 	 ((and (ruby-expr-beg 'heredoc)
-	       (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)"))
+	       (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\sw+\\)"))
 	  (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))))
+	  (if (re-search-forward (concat "^" re "$") end 'move)
+	      (forward-line 1)
+	    (setq in-string (match-end 0))
+	    (goto-char end)))
 	 (t
 	  (goto-char pnt))))
        ((looking-at "^__END__$")
@@ -587,161 +561,181 @@ The variable ruby-indent-level controls the amount of indentation.
 (defun ruby-indent-size (pos nest)
   (+ pos (* (or nest 1) ruby-indent-level)))
 
+(defconst ruby-assign-re "\\s *\\(&&\\|||\\|<<\\|>>\\|[-+*/%&|^]\\)?=\\s *")
+
+(defun ruby-beginning-of-arg (start end)
+  (save-restriction
+    (narrow-to-region start (1+ end))
+    (goto-char start)
+    (let ((beg t) arg)
+      (while
+	  (progn
+	    (skip-chars-forward " \t\n")
+	    (and (not (eobp))
+		 (= (ruby-forward-sexp) 0)))
+	(skip-syntax-forward " ")
+	(cond ((looking-at ",")
+	       (forward-char)
+	       (setq arg start beg t))
+	      ((ruby-expr-beg) t)
+	      ((looking-at "=>\\s *")
+	       (goto-char (match-end 0))
+	       (setq arg nil beg nil))
+	      ((looking-at ruby-assign-re)
+	       (goto-char (match-end 0))
+	       (if beg (setq beg nil arg (point))))
+	      ((looking-at ruby-operator-re)
+	       (goto-char (match-end 0))
+	       (if beg (setq beg nil arg (match-end 0))))
+	      ((not (eq (char-syntax (char-after)) ?\())
+	       (setq start (point)))))
+      (goto-char (or arg start)))))
+
 (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))))))
+	    (case-fold-search nil)
+	    state bol eol begin
+	    (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 (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))))
-	  (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))
+	   (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)
-	  ;; 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))
+	  (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))))
+	   ;;operator terminated lines
+	   ((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-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)))
+	    (let (end (pos (point)))
+	      (beginning-of-line)
+	      (while (and (re-search-forward "#" pos t)
+			  (setq end (1- (point)))
+			  (ruby-special-char-p end))
+		(setq end nil))
+	      (goto-char (or end pos))
+	      (skip-chars-backward " \t")
+	      (and
+	       (setq state (ruby-parse-region parse-start (point)))
+	       (nth 0 state)
+	       (setq begin (cdr (nth 1 state)))
+	       (goto-char pos)))
+	    (or (bobp) (forward-char -1))
+	    (and
+	     (or (and (looking-at ruby-symbol-re)
+		      (skip-chars-backward ruby-symbol-chars)
+		      (looking-at 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))
+		      (let ((c (char-after (point))))
+			(and
+			 (or (not (eq ?, c))
+			     (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))))))))
+	     (setq indent
+		   (cond
+		    ((and
+		      (not (looking-at ruby-block-hanging-re))
+		      (eq (ruby-deep-indent-paren-p t) 'space)
+		      (not (bobp)))
+		     (ruby-beginning-of-arg (or begin parse-start) (point))
+		     (current-column))
+		    (t
+		     (+ indent ruby-indent-level))))))))
+	indent)))
 
 (defun ruby-electric-brace (arg)
   (interactive "P")
@@ -788,8 +782,7 @@ An end of a defun is found by moving forward from the beginning of one."
 (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 "\\)\\>"))))
+    (setq down (looking-at (if (< n 0) ruby-block-end-re ruby-block-beg-re)))
     (while (and (not done) (not (if (< n 0) (bobp) (eobp))))
       (forward-line n)
       (cond
@@ -809,9 +802,9 @@ An end of a defun is found by moving forward from the beginning of one."
 	 ((> start pos)
 	  (setq done t)))))
       (if done
-	  (save-excursion
+	  (progn
 	    (back-to-indentation)
-	    (if (looking-at (concat "\\<\\(" ruby-block-mid-re "\\)\\>"))
+	    (if (looking-at ruby-block-mid-re)
 		(setq done nil))))))
   (back-to-indentation))
 
@@ -839,9 +832,7 @@ An end of a defun is found by moving forward from the beginning of one."
 		     (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)) ?:)))
+		  ((looking-at ruby-block-beg-re)
 		   (ruby-end-of-block)
 		   (forward-word 1))
 		  ((looking-at "\\(\\$\\|@@?\\)?\\sw")
@@ -973,10 +964,7 @@ balanced expression is found."
 	  ;; get current method (or class/module)
 	  (if (re-search-backward
 	       (concat "^[ \t]*\\(def\\|class\\|module\\)[ \t]+"
-		       "\\(" 
-		       ;; \\. for class method
-			"\\(" ruby-symbol-re "\\|\\." "\\)" 
-			"+\\)")
+		       "\\(" ruby-symbol-re "+\\)")
 	       nil t)
 	      (progn
 		(setq mlist (list (match-string 2)))
@@ -1012,26 +1000,41 @@ balanced expression is found."
 	  ("\\(#\\)[{$@]" 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\\)"
+	  ("\\(^\\|[\[ \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\\\\]*\\)*\\(/\\)"
+	  ("\\(^\\|[=(,~?:;]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
 	   (4 (7 . ?/))
 	   (6 (7 . ?/)))
+	  ;; %Q!...!
+	  ("\\(^\\|[[ \t\n<+(,=]\\)%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\2\\)"
+	   (2 (7 . nil))
+	   (4 (7 . nil)))
 	  ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
 	  ("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
 
-  (if (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))))
+  (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)
@@ -1092,6 +1095,7 @@ balanced expression is found."
 	    t)
           nil)))
 
+
   (defvar ruby-font-lock-keywords
     (list
      ;; functions
@@ -1161,9 +1165,6 @@ balanced expression is found."
        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)
diff --git a/misc/ruby-style.el b/misc/ruby-style.el
deleted file mode 100644
index ef05ea004a..0000000000
--- a/misc/ruby-style.el
+++ /dev/null
@@ -1,66 +0,0 @@
-;;; -*- emacs-lisp -*-
-;;;
-;;; ruby-style.el -
-;;;
-;;; C/C++ mode style for Ruby.
-;;;
-;;;  $Author: nobu $
-;;;  created at: Thu Apr 26 13:54:01 JST 2007
-;;;
-
-(defconst ruby-style-revision "$Revision: 15588 $"
-  "Ruby style revision string.")
-
-(defconst ruby-style-version
-  (progn
-   (string-match "[0-9.]+" ruby-style-revision)
-   (substring ruby-style-revision (match-beginning 0) (match-end 0)))
-  "Ruby style version number.")
-
-(defun ruby-style-case-indent (x)
-  (save-excursion
-    (unless (progn (backward-up-list) (back-to-indentation)
-		   (> (point) (cdr x)))
-      (goto-char (cdr x))
-      (if (looking-at "\\<case\\|default\\>") '*))))
-
-(defun ruby-style-label-indent (x)
-  (save-excursion
-    (unless (progn (backward-up-list) (back-to-indentation)
-		   (>= (point) (cdr x)))
-      (goto-char (cdr x))
-      (condition-case ()
-	  (progn
-	    (backward-up-list)
-	    (backward-sexp 2)
-	    (if (looking-at "\\<switch\\>") '/))
-	(error)))))
-
-(require 'cc-styles)
-(c-add-style
- "ruby"
- '("bsd"
-   (c-basic-offset . 4)
-   (tab-width . 8)
-   (indent-tabs-mode . t)
-   (c-offsets-alist
-    (case-label . *)
-    (label . (ruby-style-label-indent *))
-    (statement-case-intro . *)
-    (statement-case-open . *)
-    (statement-block-intro . (ruby-style-case-indent +))
-    (access-label /)
-    )))
-
-(defun ruby-style-c-mode ()
-  (interactive)
-  (if (or (string-match "/ruby\\>" (buffer-file-name))
-          (save-excursion
-            (goto-char (point-min))
-            (let ((head (progn (forward-line 100) (point)))
-                  (case-fold-search nil))
-              (goto-char (point-min))
-              (re-search-forward "Copyright (C) .* Yukihiro Matsumoto" head t))))
-      (setq c-file-style "ruby")))
-
-(provide 'ruby-style)
diff --git a/missing.h b/missing.h
index 6eda516527..ac499bd7d7 100644
--- a/missing.h
+++ b/missing.h
@@ -21,9 +21,6 @@ struct timeval {
     time_t tv_usec;	/* microseconds */
 };
 #endif
-#if defined(HAVE_SYS_TYPES_H)
-#  include <sys/types.h>
-#endif
 
 #ifndef HAVE_ACOSH
 extern double acosh _((double));
@@ -32,17 +29,13 @@ extern double atanh _((double));
 #endif
 
 #ifndef HAVE_CRYPT
-extern char *crypt _((const char *, const char *));
+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
@@ -88,6 +81,10 @@ extern int memcmp _((char *, char *, int));
 extern void *memmove _((void *, void *, int));
 #endif
 
+#ifndef HAVE_MKDIR
+extern int mkdir _((char *, int));
+#endif
+
 /*
 #ifndef HAVE_MODF
 extern double modf _((double, double *));
diff --git a/missing/crypt.c b/missing/crypt.c
index 32736bccfb..9f9b562c36 100644
--- a/missing/crypt.c
+++ b/missing/crypt.c
@@ -1,992 +1,276 @@
-/*
- * 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
-
-int des_setkey(), des_cipher();
-
-/* compile with "-DSTATIC=int" when profiling */
-#ifndef STATIC
-#define	STATIC	static
-#endif
-STATIC void init_des(), init_perm(), permute();
-#ifdef DEBUG
-STATIC void 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 void
-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 ==================== */
+/*      From Andy Tanenbaum's book "Computer Networks",
+        rewritten in C
+*/
 
-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,
+struct block {
+        unsigned char b_data[64];
 };
 
-/* 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,
+struct ordering {
+        unsigned char o_data[64];
 };
 
-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,
+static struct block key;
 
-	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 struct ordering InitialTr = {
+        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,
 };
 
-static unsigned char Rotates[] = {	/* PC1 rotation schedule */
-	1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1,
+static struct ordering FinalTr = {
+        40, 8,48,16,56,24,64,32,39, 7,47,15,55,23,63,31,
+        38, 6,46,14,54,22,62,30,37, 5,45,13,53,21,61,29,
+        36, 4,44,12,52,20,60,28,35, 3,43,11,51,19,59,27,
+        34, 2,42,10,50,18,58,26,33, 1,41, 9,49,17,57,25,
 };
 
-/* 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 struct ordering swap = {
+        33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,
+        49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,
+         1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,
+        17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,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 struct ordering KeyTr1 = {
+        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 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 struct ordering KeyTr2 = {
+        14,17,11,24, 1, 5, 3,28,15, 6,21,10,
+        23,19,12, 4,26, 8,16, 7,27,20,13, 2,
+        41,52,31,37,47,55,30,40,51,45,33,48,
+        44,49,39,56,34,53,46,42,50,36,29,32,
 };
 
-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 struct ordering etr = {
+        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 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 struct ordering ptr = {
+        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 s_boxes[8][64] = {
+{       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,
+},
+
+{       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,
+},
+
+{       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,
+},
+
+{        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,
+},
+
+{        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,
+},
+
+{       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,
+},
+
+{        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,
+},
+
+{       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 C_block	constdatablock;			/* encryption constant */
-static char	cryptresult[1+4+4+11+1];	/* encrypted result */
+static int rots[] = {
+        1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1,
+};
 
-/*
- * 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;
+static void transpose(struct block *data, struct ordering *t, int n)
 {
-	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);
-}
+        struct block x;
 
+        x = *data;
 
-/*
- * 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.
- */
-int
-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);
+        while (n-- > 0) {
+                data->b_data[n] = x.b_data[t->o_data[n] - 1];
+        }
 }
 
-/*
- * 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.
- */
-int
-des_cipher(in, out, salt, num_iter)
-	const char *in;
-	char *out;
-	long salt;
-	int num_iter;
+static void rotate(struct block *key)
 {
-	/* 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);
+        register unsigned char *p = key->b_data;
+        register unsigned char *ep = &(key->b_data[55]);
+        int data0 = key->b_data[0], data28 = key->b_data[28];
+
+        while (p++ < ep) *(p-1) = *p;
+        key->b_data[27] = (char) data0;
+        key->b_data[55] = (char) data28;
 }
 
+static struct ordering *EP = &etr;
 
-/*
- * 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 void
-init_des()
+static void f(int i, struct block *key, struct block *a, struct block *x)
 {
-	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);
-		}
-	}
+        struct block e, ikey, y;
+        int k;
+        register unsigned char *p, *q, *r;
+
+        e = *a;
+        transpose(&e, EP, 48);
+        for (k = rots[i]; k; k--) rotate(key);
+        ikey = *key;
+        transpose(&ikey, &KeyTr2, 48);
+        p = &(y.b_data[48]);
+        q = &(e.b_data[48]);
+        r = &(ikey.b_data[48]);
+        while (p > y.b_data) {
+                *--p = *--q ^ *--r;
+        }
+        q = x->b_data;
+        for (k = 0; k < 8; k++) {
+                register int xb, r;
+
+                r = *p++ << 5;
+                r += *p++ << 3;
+                r += *p++ << 2;
+                r += *p++ << 1;
+                r += *p++;
+                r += *p++ << 4;
+
+                xb = s_boxes[k][r];
+
+                *q++ = (char) (xb >> 3) & 1;
+                *q++ = (char) (xb>>2) & 1;
+                *q++ = (char) (xb>>1) & 1;
+                *q++ = (char) (xb & 1);
+        }
+        transpose(x, &ptr, 32);
 }
 
-/*
- * 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 void
-init_perm(perm, p, chars_in, chars_out)
-	C_block perm[64/CHUNKBITS][1<<CHUNKBITS];
-	unsigned char p[64];
-	int chars_in, chars_out;
+void definekey(char *k)
 {
-	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)
- */
-int
-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));
+        key = *((struct block *) k);
+        transpose(&key, &KeyTr1, 56);
 }
 
-/*
- * "encrypt" routine (for backwards compatibility)
- */
-int
-encrypt(block, flag)
-	register char *block;
-	int flag;
+void encrypt(char *blck, int edflag)
 {
-	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);
+        register struct block *p = (struct block *) blck;
+        register int i;
+
+        transpose(p, &InitialTr, 64);
+        for (i = 15; i>= 0; i--) {
+                int j = edflag ? i : 15 - i;
+                register int k;
+                struct block b, x;
+
+                b = *p;
+                for (k = 31; k >= 0; k--) {
+                        p->b_data[k] = b.b_data[k + 32];
+                }
+                f(j, &key, p, &x);
+                for (k = 31; k >= 0; k--) {
+                        p->b_data[k+32] = b.b_data[k] ^ x.b_data[k];
+                }
+        }
+        transpose(p, &swap, 64);
+        transpose(p, &FinalTr, 64);
 }
 
-#ifdef DEBUG
-STATIC void
-prtab(s, t, num_rows)
-	char *s;
-	unsigned char *t;
-	int num_rows;
+char *crypt(char *pw, char *salt)
 {
-	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");
+
+        char pwb[66];
+        static char result[16];
+        register char *p = pwb;
+        struct ordering new_etr;
+        register int i;
+
+        while (*pw && p < &pwb[64]) {
+                register int j = 7;
+
+                while (j--) {
+                        *p++ = (*pw >> j) & 01;
+                }
+                pw++;
+                *p++ = 0;
+        }
+        while (p < &pwb[64]) *p++ = 0;
+
+        definekey(p = pwb);
+
+        while (p < &pwb[66]) *p++ = 0;
+
+        new_etr = etr;
+        EP = &new_etr;
+        for (i = 0; i < 2; i++) {
+                register char c = *salt++;
+                register int j;
+
+                result[i] = c;
+                if ( c > 'Z') c -= 6 + 7 + '.'; /* c was a lower case letter */
+                else if ( c > '9') c -= 7 + '.';/* c was upper case letter */
+                else c -= '.';                  /* c was digit, '.' or '/'. */
+                                                /* now, 0 <= c <= 63 */
+                for (j = 0; j < 6; j++) {
+                        if ((c >> j) & 01) {
+                                int t = 6*i + j;
+                                int temp = new_etr.o_data[t];
+                                new_etr.o_data[t] = new_etr.o_data[t+24];
+                                new_etr.o_data[t+24] = (char) temp;
+                        }
+                }
+        }
+
+        if (result[1] == 0) result[1] = result[0];
+
+        for (i = 0; i < 25; i++) encrypt(pwb,0);
+        EP = &etr;
+
+        p = pwb;
+        pw = result+2;
+        while (p < &pwb[66]) {
+                register int c = 0;
+                register int j = 6;
+
+                while (j--) {
+                        c <<= 1;
+                        c |= *p++;
+                }
+                c += '.';               /* becomes >= '.' */
+                if (c > '9') c += 7;    /* not in [./0-9], becomes upper */
+                if (c > 'Z') c += 6;    /* not in [A-Z], becomes lower */
+                *pw++ = (char) c;
+        }
+        *pw = 0;
+        return result;
 }
-#endif
diff --git a/missing/erf.c b/missing/erf.c
index d9e7469024..e30a90051e 100644
--- a/missing/erf.c
+++ b/missing/erf.c
@@ -1,5 +1,4 @@
-/* erf.c  - public domain implementation of error function erf(3m)
-
+/* erf.c
 reference - Haruhiko Okumura: C-gengo niyoru saishin algorithm jiten
             (New Algorithm handbook in C language) (Gijyutsu hyouron
             sha, Tokyo, 1991) p.227 [in Japanese]                 */
diff --git a/missing/flock.c b/missing/flock.c
index 5f6b41c357..ed619f0e91 100644
--- a/missing/flock.c
+++ b/missing/flock.c
@@ -1,7 +1,6 @@
 #include "config.h"
 
-#if defined _WIN32
-#elif defined HAVE_FCNTL && defined HAVE_FCNTL_H
+#if 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.
@@ -123,7 +122,7 @@ flock(fd, operation)
         return -1;
     }
 }
-#else
+#elif !defined _WIN32
 int
 flock(fd, operation)
     int fd;
diff --git a/missing/isinf.c b/missing/isinf.c
index c9e49c6795..8829b72935 100644
--- a/missing/isinf.c
+++ b/missing/isinf.c
@@ -23,24 +23,16 @@ isinf(n)
 
 #if defined(HAVE_FINITE) && defined(HAVE_ISNAN)
 
-#include <math.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
 
-/* 
- * isinf may be provided only as a macro.
- * ex. HP-UX, Solaris 10
- * http://www.gnu.org/software/automake/manual/autoconf/Function-Portability.html
- */
-#ifndef isinf
 int
 isinf(n)
     double n;
 {
     return (!finite(n) && !isnan(n));
 }
-#endif
 
 #else
 
diff --git a/missing/mkdir.c b/missing/mkdir.c
new file mode 100644
index 0000000000..ed1476db9a
--- /dev/null
+++ b/missing/mkdir.c
@@ -0,0 +1,104 @@
+/*
+ * Written by Robert Rother, Mariah Corporation, August 1985.
+ *
+ * If you want it, it's yours.  All I ask in return is that if you
+ * figure out how to do this in a Bourne Shell script you send me
+ * a copy.
+ *					sdcsvax!rmr or rmr@uscd
+ *
+ * Severely hacked over by John Gilmore to make a 4.2BSD compatible
+ * subroutine.	11Mar86; hoptoad!gnu
+ *
+ * Modified by rmtodd@uokmax 6-28-87 -- when making an already existing dir,
+ * subroutine didn't return EEXIST.  It does now.
+ */
+
+#include <sys/stat.h>
+#include <errno.h>
+/*
+ * Make a directory.
+ */
+int
+mkdir (dpath, dmode)
+     char *dpath;
+     int dmode;
+{
+  int cpid, status;
+  struct stat statbuf;
+
+  if (stat (dpath, &statbuf) == 0)
+    {
+      errno = EEXIST;		/* Stat worked, so it already exists */
+      return -1;
+    }
+
+  /* If stat fails for a reason other than non-existence, return error */
+  if (errno != ENOENT)
+    return -1;
+
+  switch (cpid = fork ())
+    {
+
+    case -1:			/* Error in fork() */
+      return (-1);		/* Errno is set already */
+
+    case 0:			/* Child process */
+      /*
+		 * Cheap hack to set mode of new directory.  Since this
+		 * child process is going away anyway, we zap its umask.
+		 * FIXME, this won't suffice to set SUID, SGID, etc. on this
+		 * directory.  Does anybody care?
+		 */
+      status = umask (0);	/* Get current umask */
+      status = umask (status | (0777 & ~dmode));	/* Set for mkdir */
+      execl ("/bin/mkdir", "mkdir", dpath, (char *) 0);
+      _exit (-1);		/* Can't exec /bin/mkdir */
+
+    default:			/* Parent process */
+      while (cpid != wait (&status));	/* Wait for kid to finish */
+    }
+
+  if (WIFSIGNALED (status) || WEXITSTATUS (status) != 0)
+    {
+      errno = EIO;		/* We don't know why, but */
+      return -1;		/* /bin/mkdir failed */
+    }
+
+  return 0;
+}
+
+int
+rmdir (dpath)
+     char *dpath;
+{
+  int cpid, status;
+  struct stat statbuf;
+
+  if (stat (dpath, &statbuf) != 0)
+    {
+      /* Stat just set errno.  We don't have to */
+      return -1;
+    }
+
+  switch (cpid = fork ())
+    {
+
+    case -1:			/* Error in fork() */
+      return (-1);		/* Errno is set already */
+
+    case 0:			/* Child process */
+      execl ("/bin/rmdir", "rmdir", dpath, (char *) 0);
+      _exit (-1);		/* Can't exec /bin/mkdir */
+
+    default:			/* Parent process */
+      while (cpid != wait (&status));	/* Wait for kid to finish */
+    }
+
+  if (WIFSIGNALED (status) || WEXITSTATUS (status) != 0)
+    {
+      errno = EIO;		/* We don't know why, but */
+      return -1;		/* /bin/rmdir failed */
+    }
+
+  return 0;
+}
diff --git a/missing/os2.c b/missing/os2.c
index fe7238aad1..57798ab54c 100644
--- a/missing/os2.c
+++ b/missing/os2.c
@@ -1,4 +1,4 @@
-/* os/2 compatibility functions -- follows Ruby's license */
+/* os/2 compatibility functions -- follows Ruby's lisence */
 
 #include "ruby.h"
 #include <stdio.h>
diff --git a/missing/strchr.c b/missing/strchr.c
index 886d70ede6..82f3cc96b0 100644
--- a/missing/strchr.c
+++ b/missing/strchr.c
@@ -19,10 +19,8 @@ strrchr(s, c)
     char *s;
     int c;
 {
-    char *save;
+    char *save = 0;
 
-    if (c == 0) return s + strlen(s);
-    save = 0;
     while (*s) {
 	if (*s == c)
 	    save = s;
diff --git a/missing/strftime.c b/missing/strftime.c
index caa5eb8719..5522226ec1 100644
--- a/missing/strftime.c
+++ b/missing/strftime.c
@@ -115,22 +115,17 @@ extern char *strchr();
 
 #define range(low, item, hi)	max(low, min(item, hi))
 
-#ifdef __CYGWIN__
-#define DLL_IMPORT __declspec(dllimport)
-#endif
-#ifdef __WIN32__
-#define DLL_IMPORT __declspec(dllimport)
-#endif
 #if !defined(OS2) && !defined(MSDOS) && defined(HAVE_TZNAME)
-extern DLL_IMPORT char *tzname[2];
-#ifdef HAVE_DAYLIGHT
-extern DLL_IMPORT int daylight;
-#endif
-#ifdef HAVE_VAR_TIMEZONE
-extern DLL_IMPORT TYPEOF_VAR_TIMEZONE timezone;
+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
-#ifdef HAVE_VAR_ALTZONE
-extern DLL_IMPORT TYPEOF_VAR_ALTZONE altzone;
 #endif
 #endif
 
@@ -194,8 +189,16 @@ strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr)
 #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 */
 
@@ -419,18 +422,21 @@ strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr)
 			 */
 			off = timeptr->tm_gmtoff / 60;
 #else /* !HAVE_TM_ZONE */
-#ifdef HAVE_GETTIMEOFDAY
+#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
-#if HAVE_VAR_TIMEZONE
-#if HAVE_VAR_ALTZONE
 			off = -(daylight ? timezone : altzone) / 60;
-#else
-			off = -timezone / 60;
-#endif
-#endif
 #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) {
@@ -439,7 +445,7 @@ strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr)
 			} else {
 				tbuf[0] = '+';
 			}
-			sprintf(tbuf+1, "%02u%02u", (unsigned)off/60, (unsigned)off%60);
+			sprintf(tbuf+1, "%02d%02d", off/60, off%60);
 			break;
 #endif /* MAILHEADER_EXT */
 
@@ -454,15 +460,13 @@ strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr)
 #ifdef HAVE_TM_NAME
 			strcpy(tbuf, timeptr->tm_name);
 #else
-#ifdef HAVE_TIMEZONE
 			gettimeofday(& tv, & zone);
-#ifdef TIMEZONE_VOID
+#ifdef __CYGWIN__
 			strcpy(tbuf, timezone());
 #else
 			strcpy(tbuf, timezone(zone.tz_minuteswest,
 						timeptr->tm_isdst > 0));
-#endif /* TIMEZONE_VOID */
-#endif /* HAVE_TIMEZONE */
+#endif
 #endif /* HAVE_TM_NAME */
 #endif /* HAVE_TM_ZONE */
 #endif /* HAVE_TZNAME */
@@ -641,7 +645,7 @@ iso8601wknum(const struct tm *timeptr)
 	 * main body of the standard. Thus it requires week 53.
 	 */
 
-	int weeknum, jan1day;
+	int weeknum, jan1day, diff;
 
 	/* get week number, Monday as first day of the week */
 	weeknum = weeknumber(timeptr, 1);
diff --git a/missing/vsnprintf.c b/missing/vsnprintf.c
index dd4f75cfd8..266290a139 100644
--- a/missing/vsnprintf.c
+++ b/missing/vsnprintf.c
@@ -13,7 +13,11 @@
  * 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
+ * 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
+ *	California, Berkeley and its contributors.
+ * 4. 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.
  *
@@ -95,7 +99,7 @@
 # endif
 #endif
 
-#if defined(__hpux) && !defined(__GNUC__) && !defined(__STDC__)
+#if defined(__hpux) && !defined(__GNUC__)
 #define const
 #endif
 
@@ -496,7 +500,7 @@ BSD_vfprintf(fp, fmt0, ap)
 
 	/*
 	 * Choose PADSIZE to trade efficiency vs. size.  If larger printf
-	 * fields occur frequently, increase PADSIZE and make the initializers
+	 * fields occur frequently, increase PADSIZE and make the initialisers
 	 * below longer.
 	 */
 #define	PADSIZE	16		/* pad chunk size */
@@ -781,19 +785,14 @@ fp_begin:		_double = va_arg(ap, double);
 			 * 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 *);
+			base = 16;
+			xdigs = "0123456789abcdef";
 #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':
diff --git a/missing/x68.c b/missing/x68.c
index 8d00d50041..08bce8778c 100644
--- a/missing/x68.c
+++ b/missing/x68.c
@@ -1,4 +1,4 @@
-/* x68 compatibility functions -- follows Ruby's license */
+/* x68 compatibility functions -- follows Ruby's lisence */
 
 #include "config.h"
 
@@ -25,7 +25,7 @@ link(const char *src, const char *dst)
 #include <sys/time.h>
 
 struct timezone {
-    int tz_minuteswest;
+    int tz_minueswest;
     int tz_dsttime;
 };
 
diff --git a/mkconfig.rb b/mkconfig.rb
index 255bfa7436..b0abee35ad 100755..100644
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -1,26 +1,22 @@
 #!./miniruby -s
 
 # avoid warnings with -d.
+$srcdir ||= nil
 $install_name ||= nil
 $so_name ||= nil
 
-srcdir = File.dirname(__FILE__)
-$:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING)
-$:.unshift(".")
-
-require "fileutils"
+require File.dirname($0)+"/lib/ftools"
 mkconfig = File.basename($0)
 
 rbconfig_rb = ARGV[0] || 'rbconfig.rb'
-unless File.directory?(dir = File.dirname(rbconfig_rb))
-  FileUtils.makedirs(dir, :verbose => true)
-end
+srcdir = $srcdir || '.'
+File.makedirs(File.dirname(rbconfig_rb), true)
 
 version = RUBY_VERSION
-def (config = "").write(arg)
-  concat(arg.to_s)
-end
-$stdout = config
+rbconfig_rb_tmp = rbconfig_rb + '.tmp'
+config = open(rbconfig_rb_tmp, "w")
+$orgout = $stdout.dup
+$stdout.reopen(config)
 
 fast = {'prefix'=>TRUE, 'ruby_install_name'=>TRUE, 'INSTALL'=>TRUE, 'EXEEXT'=>TRUE}
 print %[
@@ -35,75 +31,50 @@ module Config
 
 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*(\\)?$/
+  if /^s[%,]@program_transform_name@[%,]s,(.*)/ =~ line
+    next if $install_name
+    ptn = $1.sub(/\$\$/, '$').split(/,/)	#'
+    v_fast << "  CONFIG[\"ruby_install_name\"] = \"" + "ruby".sub(/#{ptn[0]}/,ptn[1]) + "\"\n"
+  elsif /^s[%,]@(\w+)@[%,](.*)[%,]/ =~ line
     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_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
-    next if /^\$\(ac_\w+\)$/ =~ val
-    next if /^\$\{ac_\w+\}$/ =~ val
-    next if /^\$ac_\w+$/ =~ val
+    val = $2 || ""
+    next if /^(INSTALL|DEFS|configure_input|srcdir|top_srcdir)$/ =~ name
     next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name
     next if $so_name and /^RUBY_SO_NAME$/ =~  name
-    next if /^(?:X|(?:MINI|RUN)RUBY$)/ =~ 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
+    v = "  CONFIG[\"" + name + "\"] = " +
+      val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump + "\n"
     if fast[name]
       v_fast << v
     else
       v_others << v
     end
     has_version = true if name == "MAJOR"
+  elsif /^(?:ac_given_)?srcdir=(.*)/ =~ line
+    srcdir = $1.strip
+  elsif /^ac_given_INSTALL=(.*)/ =~ line
+    v_fast << "  CONFIG[\"INSTALL\"] = " + $1 + "\n"
   end
 #  break if /^CEOF/
 end
 
+srcdir = File.expand_path(srcdir)
+v_fast.unshift("  CONFIG[\"srcdir\"] = \"" + srcdir + "\"\n")
+
+v_fast.collect! do |x|
+  if /"prefix"/ === x
+    x.sub(/= (.*)/, '= (TOPDIR || DESTDIR + \1)')
+  else
+    x
+  end
+end
+
 drive = File::PATH_SEPARATOR == ';'
 
-prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM
-print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
+prefix = Regexp.quote('/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM)
+print "  TOPDIR = File.dirname(__FILE__).sub!(%r'#{prefix}\\Z', '')\n"
 print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
 print "  CONFIG = {}\n"
 print "  CONFIG[\"DESTDIR\"] = DESTDIR\n"
@@ -114,10 +85,6 @@ unless has_version
     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 : /= \"(?!\$[\(\{])/
@@ -137,30 +104,24 @@ if $so_name
   v_fast << "  CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n"
 end
 
-print(*v_fast)
-print(*v_others)
+print v_fast, 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["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
-  CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)"
-  CONFIG["topdir"] = File.dirname(__FILE__)
+  CONFIG["compile_dir"] = "#{Dir.pwd}"
   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
+      elsif key = config[v]
 	config[v] = false
-	Config::expand(key, config)
+        Config::expand(key, config)
 	config[v] = key
-	key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n) {sub} if pat
-	key
       else
 	var
       end
@@ -171,25 +132,11 @@ print <<EOS
     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
+$stdout.flush
+$stdout.reopen($orgout)
+config.close
+File.rename(rbconfig_rb_tmp, rbconfig_rb)
 
 # vi:set sw=2:
diff --git a/node.h b/node.h
index 10ab4855c7..c06336e17f 100644
--- a/node.h
+++ b/node.h
@@ -115,7 +115,9 @@ enum node_type {
     NODE_DEFINED,
     NODE_NEWLINE,
     NODE_POSTEXE,
+#ifdef C_ALLOCA
     NODE_ALLOCA,
+#endif
     NODE_DMETHOD,
     NODE_BMETHOD,
     NODE_MEMO,
@@ -151,9 +153,6 @@ typedef struct RNode {
     } 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))
@@ -202,7 +201,7 @@ extern NODE *ruby_top_cref;
 #define nd_lit   u1.value
 
 #define nd_frml  u1.node
-#define nd_rest  u2.node
+#define nd_rest  u2.argc
 #define nd_opt   u1.node
 
 #define nd_recv  u1.node
@@ -212,6 +211,9 @@ extern NODE *ruby_top_cref;
 #define nd_noex  u1.id
 #define nd_defn  u3.node
 
+#define nd_old   u1.id
+#define nd_new   u2.id
+
 #define nd_cfnc  u1.cfunc
 #define nd_argc  u2.argc
 
@@ -282,7 +284,7 @@ extern NODE *ruby_top_cref;
 #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_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)
@@ -293,7 +295,7 @@ extern NODE *ruby_top_cref;
 #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_DSTR(s) NEW_NODE(NODE_DSTR,s,0,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)
@@ -311,8 +313,8 @@ extern NODE *ruby_top_cref;
 #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_ALIAS(n,o) NEW_NODE(NODE_ALIAS,o,n,0)
+#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,o,n,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)
@@ -338,8 +340,8 @@ extern NODE *ruby_top_cref;
 #define NOEX_PUBLIC    0
 #define NOEX_NOSUPER   1
 #define NOEX_PRIVATE   2
-#define NOEX_PROTECTED 4
-#define NOEX_MASK      6
+#define NOEX_PROTECTED 4 
+#define NOEX_MASK      6 
 
 #define NOEX_UNDEF     NOEX_NOSUPER
 
@@ -357,130 +359,6 @@ 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));
-NODE *rb_copy_node_scope _((NODE *, NODE *));
-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 RUBY_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;
-
-enum {
-    RAISED_EXCEPTION     = 0x1000,
-    RAISED_STACKOVERFLOW = 0x2000,
-    RAISED_NOMEMORY      = 0x4000,
-    RAISED_MASK          = 0xf000
-};
-int rb_thread_set_raised(rb_thread_t th);
-int rb_thread_reset_raised(rb_thread_t th);
-#define rb_thread_raised_set(th, f)   ((th)->flags |= (f))
-#define rb_thread_raised_reset(th, f) ((th)->flags &= ~(f))
-#define rb_thread_raised_p(th, f)     (((th)->flags & (f)) != 0)
-#define rb_thread_raised_clear(th)    ((th)->flags = 0)
-
 #if defined(__cplusplus)
 }  /* extern "C" { */
 #endif
diff --git a/numeric.c b/numeric.c
index b7b60982a7..3ee1aef466 100644
--- a/numeric.c
+++ b/numeric.c
@@ -12,7 +12,6 @@
 
 #include "ruby.h"
 #include "env.h"
-#include <ctype.h>
 #include <math.h>
 #include <stdio.h>
 
@@ -63,25 +62,6 @@
 #define DBL_EPSILON 2.2204460492503131e-16
 #endif
 
-#ifndef HAVE_ROUND
-double
-round(x)
-    double x;
-{
-    double f;
-
-    if (x > 0.0) {
-	f = floor(x);
-	x = f + (x - f >= 0.5);
-    }
-    else if (x < 0.0) {
-	f = ceil(x);
-	x = f - (f - x >= 0.5);
-    }
-    return x;
-}
-#endif
-
 static ID id_coerce, id_to_i, id_eq;
 
 VALUE rb_cNumeric;
@@ -98,32 +78,13 @@ 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);
-    x = rb_Float(x);
-    y = rb_Float(y);
-    return rb_assoc_new(y, x);
+    return rb_assoc_new(rb_Float(y), rb_Float(x));
 }
 
 static VALUE
@@ -182,7 +143,7 @@ VALUE
 rb_num_coerce_cmp(x, y)
     VALUE x, y;
 {
-    if (do_coerce(&x, &y, Qfalse))
+    if (do_coerce(&x, &y, Qfalse)) 
 	return rb_funcall(x, ruby_frame->orig_func, 1, y);
     return Qnil;
 }
@@ -201,11 +162,6 @@ rb_num_coerce_relop(x, y)
     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;
@@ -215,11 +171,10 @@ num_sadded(x, name)
     rb_raise(rb_eTypeError,
 	     "can't define singleton method \"%s\" for %s",
 	     rb_id2name(rb_to_id(name)),
-	     rb_obj_classname(x));
+	     rb_obj_classname(x)); 
     return Qnil;		/* not reached */
 }
 
-/* :nodoc: */
 static VALUE
 num_init_copy(x, y)
     VALUE x, y;
@@ -229,13 +184,6 @@ num_init_copy(x, y)
     return Qnil;		/* not reached */
 }
 
-/*
- *  call-seq:
- *     +num    => num
- *
- *  Unary Plus---Returns the receiver's value.
- */
-
 static VALUE
 num_uplus(num)
     VALUE num;
@@ -243,13 +191,6 @@ num_uplus(num)
     return num;
 }
 
-/*
- *  call-seq:
- *     -num    => numeric
- *
- *  Unary Minus---Returns the receiver's value, negated.
- */
-
 static VALUE
 num_uminus(num)
     VALUE num;
@@ -262,14 +203,6 @@ num_uminus(num)
     return rb_funcall(zero, '-', 1, num);
 }
 
-/*
- *  call-seq:
- *     num.quo(numeric)    =>   result
- *     num.fdiv(numeric)   =>   result
- *
- *  Equivalent to <code>Numeric#/</code>, but overridden in subclasses.
- */
-
 static VALUE
 num_quo(x, y)
     VALUE x, y;
@@ -277,67 +210,13 @@ num_quo(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));
+    return rb_Integer(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;
@@ -345,14 +224,6 @@ num_divmod(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;
@@ -360,18 +231,6 @@ num_modulo(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;
@@ -388,14 +247,6 @@ num_remainder(x, 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;
@@ -403,17 +254,6 @@ num_int_p(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;
@@ -424,14 +264,6 @@ num_abs(num)
     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;
@@ -442,19 +274,6 @@ num_zero_p(num)
     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;
@@ -465,14 +284,6 @@ num_nonzero_p(num)
     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;
@@ -482,7 +293,7 @@ num_to_int(num)
 
 
 /********************************************************************
- *
+ * 
  * Document-class: Float
  *
  *  <code>Float</code> objects represent real numbers using the native
@@ -503,7 +314,7 @@ rb_float_new(d)
 /*
  *  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
@@ -515,28 +326,37 @@ flo_to_s(flt)
     VALUE flt;
 {
     char buf[32];
+    char *fmt = "%.15g";
     double value = RFLOAT(flt)->value;
-    char *p, *e;
+    double avalue, d1, d2;
 
     if (isinf(value))
 	return rb_str_new2(value < 0 ? "-Infinity" : "Infinity");
     else if(isnan(value))
 	return rb_str_new2("NaN");
+    
+    avalue = fabs(value);
+    if (avalue == 0.0) {
+	fmt = "%.1f";
+    }
+    else if (avalue < 1.0e-3) {
+	d1 = avalue;
+	while (d1 < 1.0) d1 *= 10.0;
+	d1 = modf(d1, &d2);
+	if (d1 == 0) fmt = "%.1e";
+    }    
+    else if (avalue >= 1.0e15) {
+	d1 = avalue;
+	while (d1 > 10.0) d1 /= 10.0;
+	d1 = modf(d1, &d2);
+	if (d1 == 0) fmt = "%.1e";
+	else fmt = "%.16e";
+    }    
+    else if ((d1 = modf(value, &d2)) == 0) {
+	fmt = "%.1f";
+    }
+    sprintf(buf, fmt, value);
 
-    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);
 }
 
@@ -617,7 +437,7 @@ flo_minus(x, y)
  * call-seq:
  *   float * other   => float
  *
- * Returns a new float which is the product of <code>float</code>
+ * Returns a new float with is the product of <code>float</code>
  * and <code>other</code>.
  */
 
@@ -684,10 +504,7 @@ flodivmod(x, y, divp, modp)
 	mod = x - z * y;
     }
 #endif
-    if (isinf(x) && !isinf(y) && !isnan(y))
-	div = x;
-    else
-	div = (x - mod) / y;
+    div = (x - mod) / y;
     if (y*mod < 0) {
 	mod += y;
 	div -= 1.0;
@@ -701,9 +518,9 @@ flodivmod(x, y, divp, modp)
  *  call-seq:
  *     flt % other         => float
  *     flt.modulo(other)   => float
- *
- *  Return the modulo after division of <code>flt</code> by <code>other</code>.
- *
+ *  
+ *  Return the modulo after dividion of <code>flt</code> by <code>other</code>.
+ *     
  *     6543.21.modulo(137)      #=> 104.21
  *     6543.21.modulo(137.24)   #=> 92.9299999999996
  */
@@ -734,7 +551,7 @@ flo_mod(x, y)
 /*
  *  call-seq:
  *     flt.divmod(numeric)    => array
- *
+ *  
  *  See <code>Numeric#divmod</code>.
  */
 
@@ -742,8 +559,7 @@ static VALUE
 flo_divmod(x, y)
     VALUE x, y;
 {
-    double fy, div, mod, val;
-    volatile VALUE a, b;
+    double fy, div, mod;
 
     switch (TYPE(y)) {
       case T_FIXNUM:
@@ -759,15 +575,7 @@ flo_divmod(x, y)
 	return rb_num_coerce_bin(x, y);
     }
     flodivmod(RFLOAT(x)->value, fy, &div, &mod);
-    if (FIXABLE(div)) {
-        val = round(div);
-	a = LONG2FIX(val);
-    }
-    else {
-	a = rb_dbl2big(div);
-    }
-    b = rb_float_new(mod);
-    return rb_assoc_new(a, b);
+    return rb_assoc_new(rb_float_new(div), rb_float_new(mod));
 }
 
 /*
@@ -777,7 +585,7 @@ flo_divmod(x, y)
  *
  * Raises <code>float</code> the <code>other</code> power.
  */
-
+ 
 static VALUE
 flo_pow(x, y)
     VALUE x, y;
@@ -794,18 +602,6 @@ flo_pow(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;
@@ -815,14 +611,6 @@ num_eql(x, y)
     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;
@@ -842,20 +630,20 @@ num_equal(x, y)
 /*
  *  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;
+    double a, b;
 
     switch (TYPE(y)) {
       case T_FIXNUM:
@@ -866,13 +654,12 @@ flo_eq(x, 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;
+    if (isnan(a) || isnan(b)) return Qfalse;
     return (a == b)?Qtrue:Qfalse;
 }
 
@@ -895,7 +682,7 @@ flo_hash(num)
     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];
+	hash += c[i] * 971;
     }
     if (hash < 0) hash = -hash;
     return INT2FIX(hash);
@@ -915,7 +702,7 @@ rb_dbl_cmp(a, b)
 /*
  *  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>.
@@ -972,13 +759,12 @@ flo_gt(x, y)
 
       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;
+    if (isnan(a) || isnan(b)) return Qfalse;
     return (a > b)?Qtrue:Qfalse;
 }
 
@@ -986,7 +772,7 @@ flo_gt(x, y)
  * call-seq:
  *   flt >= other    =>  true or false
  *
- * <code>true</code> if <code>flt</code> is greater than
+ * <code>true</code> if <code>flt</code> is greater than 
  * or equal to <code>other</code>.
  */
 
@@ -1008,13 +794,12 @@ flo_ge(x, y)
 
       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;
+    if (isnan(a) || isnan(b)) return Qfalse;
     return (a >= b)?Qtrue:Qfalse;
 }
 
@@ -1043,13 +828,12 @@ flo_lt(x, y)
 
       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;
+    if (isnan(a) || isnan(b)) return Qfalse;
     return (a < b)?Qtrue:Qfalse;
 }
 
@@ -1079,24 +863,23 @@ flo_le(x, y)
 
       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;
+    if (isnan(a) || isnan(b)) 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
  */
 
@@ -1131,12 +914,12 @@ flo_to_f(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
@@ -1150,9 +933,9 @@ flo_abs(flt)
 /*
  *  call-seq:
  *     flt.zero? -> true or false
- *
+ *  
  *  Returns <code>true</code> if <i>flt</i> is 0.0.
- *
+ *     
  */
 
 static VALUE
@@ -1168,10 +951,10 @@ flo_zero_p(num)
 /*
  *  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
@@ -1181,7 +964,7 @@ flo_zero_p(num)
 static VALUE
 flo_is_nan_p(num)
      VALUE num;
-{
+{     
     double value = RFLOAT(num)->value;
 
     return isnan(value) ? Qtrue : Qfalse;
@@ -1190,10 +973,10 @@ flo_is_nan_p(num)
 /*
  *  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
@@ -1202,7 +985,7 @@ flo_is_nan_p(num)
 static VALUE
 flo_is_infinite_p(num)
      VALUE num;
-{
+{     
     double value = RFLOAT(num)->value;
 
     if (isinf(value)) {
@@ -1215,17 +998,17 @@ flo_is_infinite_p(num)
 /*
  *  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
@@ -1242,9 +1025,9 @@ flo_is_finite_p(num)
 /*
  *  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
@@ -1268,10 +1051,10 @@ flo_floor(num)
 /*
  *  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
@@ -1295,18 +1078,18 @@ flo_ceil(num)
 /*
  *  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
+ *       return floor(self+0.5) if self > 0.0
+ *       return ceil(self-0.5)  if self < 0.0
+ *       return 0.0
  *     end
- *
+ *     
  *     1.5.round      #=> 2
  *     (-1.5).round   #=> -2
- *
+ *     
  */
 
 static VALUE
@@ -1316,7 +1099,8 @@ flo_round(num)
     double f = RFLOAT(num)->value;
     long val;
 
-    f = round(f);
+    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);
@@ -1330,7 +1114,7 @@ flo_round(num)
  *     flt.to_i       => integer
  *     flt.to_int     => integer
  *     flt.truncate   => integer
- *
+ *  
  *  Returns <i>flt</i> truncated to an <code>Integer</code>.
  */
 
@@ -1351,19 +1135,6 @@ flo_truncate(num)
     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;
@@ -1371,22 +1142,6 @@ num_floor(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;
@@ -1394,15 +1149,6 @@ num_ceil(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;
@@ -1410,15 +1156,6 @@ num_round(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;
@@ -1426,34 +1163,6 @@ num_truncate(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;
@@ -1462,8 +1171,6 @@ num_step(argc, argv, from)
 {
     VALUE to, step;
 
-    RETURN_ENUMERATOR(from, argc, argv);
-
     if (argc == 1) {
 	to = argv[0];
 	step = INT2FIX(1);
@@ -1477,7 +1184,7 @@ num_step(argc, argv, from)
 	    rb_raise(rb_eArgError, "wrong number of arguments");
 	}
 	if (rb_equal(step, INT2FIX(0))) {
-	    rb_raise(rb_eArgError, "step can't be 0");
+	    rb_raise(rb_eArgError, "step cannot be 0");
 	}
     }
 
@@ -1539,7 +1246,6 @@ long
 rb_num2long(val)
     VALUE val;
 {
-  again:
     if (NIL_P(val)) {
 	rb_raise(rb_eTypeError, "no implicit conversion from nil to integer");
     }
@@ -1557,16 +1263,19 @@ rb_num2long(val)
 	    char *s;
 
 	    sprintf(buf, "%-.10g", RFLOAT(val)->value);
-	    if ((s = strchr(buf, ' ')) != 0) *s = '\0';
+	    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);
 
+      case T_SYMBOL:
+	rb_warning("treating Symbol as an integer");
+	/* fall through */
       default:
 	val = rb_to_int(val);
-	goto again;
+	return NUM2LONG(val);
     }
 }
 
@@ -1708,7 +1417,7 @@ rb_num2ll(val)
 	    char *s;
 
 	    sprintf(buf, "%-.10g", RFLOAT(val)->value);
-	    if ((s = strchr(buf, ' ')) != 0) *s = '\0';
+	    if (s = strchr(buf, ' ')) *s = '\0';
 	    rb_raise(rb_eRangeError, "float %s out of range of long long", buf);
 	}
 
@@ -1742,29 +1451,6 @@ rb_num2ull(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;
@@ -1772,13 +1458,6 @@ int_to_i(num)
     return num;
 }
 
-/*
- *  call-seq:
- *     int.integer? -> true
- *
- *  Always returns <code>true</code>.
- */
-
 static VALUE
 int_int_p(num)
     VALUE num;
@@ -1786,50 +1465,6 @@ int_int_p(num)
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     int.odd? -> true or false
- *
- *  Returns <code>true</code> if <i>int</i> is an odd number.
- */
-
-static VALUE
-int_odd_p(VALUE num)
-{
-    if (rb_funcall(num, '%', 1, INT2FIX(2)) != INT2FIX(0)) {
-        return Qtrue;
-    }
-    return Qfalse;
-}
-
-/*
- *  call-seq:
- *     int.even? -> true or false
- *
- *  Returns <code>true</code> if <i>int</i> is an even number.
- */
-
-static VALUE
-int_even_p(VALUE num)
-{
-    if (rb_funcall(num, '%', 1, INT2FIX(2)) == INT2FIX(0)) {
-        return Qtrue;
-    }
-    return Qfalse;
-}
-
-
-/*
- *  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;
@@ -1841,38 +1476,6 @@ int_succ(num)
     return rb_funcall(num, '+', 1, INT2FIX(1));
 }
 
-/*
- *  call-seq:
- *     int.pred    => integer
- *
- *  Returns the <code>Integer</code> equal to <i>int</i> - 1.
- *
- *     1.pred      #=> 0
- *     (-1).pred   #=> -2
- */
-
-static VALUE
-int_pred(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;
@@ -1886,35 +1489,15 @@ int_chr(num)
     return rb_str_new(&c, 1);
 }
 
-/*
- *  call-seq:
- *     int.ord    => int
- *
- *  Returns the int itself.
- *
- *     ?a.ord    #=> 97
- *
- *  This method is intended for compatibility to
- *  character constant in Ruby 1.9.
- *  For example, ?a.ord returns 97 both in 1.8 and 1.9.
- */
-
-static VALUE
-int_ord(num)
-    VALUE num;
-{
-    return num;
-}
-
 /********************************************************************
- *
+ * 
  * 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
@@ -2034,10 +1617,10 @@ rb_fix2str(x, base)
 /*
  *  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"
@@ -2059,6 +1642,10 @@ fix_to_s(argc, argv, x)
     if (argc == 0) base = 10;
     else base = NUM2INT(b);
 
+    if (base == 2) {
+	/* rb_fix2str() does not handle binary */
+	return rb_big2str(rb_int2big(FIX2INT(x)), 2);
+    }
     return rb_fix2str(x, base);
 }
 
@@ -2067,7 +1654,7 @@ fix_to_s(argc, argv, x)
  *   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
+ * the class of <code>numeric</code> and on the magnitude of the 
  * result.
  */
 
@@ -2082,8 +1669,11 @@ fix_plus(x, y)
 	a = FIX2LONG(x);
 	b = FIX2LONG(y);
 	c = a + b;
-	r = LONG2NUM(c);
+	r = LONG2FIX(c);
 
+	if (FIX2LONG(r) != c) {
+	    r = rb_big_plus(rb_int2big(a), rb_int2big(b));
+	}
 	return r;
     }
     if (TYPE(y) == T_FLOAT) {
@@ -2097,7 +1687,7 @@ fix_plus(x, y)
  *   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
+ * the class of <code>numeric</code> and on the magnitude of the 
  * result.
  */
 
@@ -2112,8 +1702,11 @@ fix_minus(x, y)
 	a = FIX2LONG(x);
 	b = FIX2LONG(y);
 	c = a - b;
-	r = LONG2NUM(c);
+	r = LONG2FIX(c);
 
+	if (FIX2LONG(r) != c) {
+	    r = rb_big_minus(rb_int2big(a), rb_int2big(b));
+	}
 	return r;
     }
     if (TYPE(y) == T_FLOAT) {
@@ -2127,7 +1720,7 @@ fix_minus(x, y)
  *   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
+ * the class of <code>numeric</code> and on the magnitude of the 
  * result.
  */
 
@@ -2136,10 +1729,6 @@ 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;
 
@@ -2193,14 +1782,13 @@ fixdivmod(x, y, divp, modp)
 /*
  *  call-seq:
  *     fix.quo(numeric)    => float
- *     fix.fdiv(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
@@ -2219,7 +1807,7 @@ fix_quo(x, y)
  *   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
+ * the class of <code>numeric</code> and on the magnitude of the 
  * result.
  */
 
@@ -2261,7 +1849,7 @@ fix_mod(x, y)
 /*
  *  call-seq:
  *     fix.divmod(numeric)    => array
- *
+ *  
  *  See <code>Numeric#divmod</code>.
  */
 static VALUE
@@ -2278,45 +1866,6 @@ fix_divmod(x, y)
     return rb_num_coerce_bin(x, y);
 }
 
-static VALUE
-int_pow(x, y)
-    long x;
-    unsigned long y;
-{
-    int neg = x < 0;
-    long z = 1;
-
-    if (neg) x = -x;
-    if (y & 1)
-	z = x;
-    else
-	neg = 0;
-    y &= ~1;
-    do {
-	while (y % 2 == 0) {
-	    long x2 = x * x;
-	    if (x2/x != x || !POSFIXABLE(x2)) {
-		VALUE v;
-	      bignum:
-		v = rb_big_pow(rb_int2big(x), LONG2NUM(y));
-		if (z != 1) v = rb_big_mul(rb_int2big(neg ? -z : z), v);
-		return v;
-	    }
-	    x = x2;
-	    y >>= 1;
-	}
-	{
-	    long xz = x * z;
-	    if (!POSFIXABLE(xz) || xz / x != z) {
-		goto bignum;
-	    }
-	    z = xz;
-	}
-    } while (--y);
-    if (neg) z = -z;
-    return LONG2NUM(z);
-}
-
 /*
  *  call-seq:
  *    fix ** other         => Numeric
@@ -2333,50 +1882,19 @@ static VALUE
 fix_pow(x, y)
     VALUE x, y;
 {
-    static const double zero = 0.0;
-    long a = FIX2LONG(x);
-
     if (FIXNUM_P(y)) {
-	long b = FIX2LONG(y);
+	long a, b;
 
+	b = FIX2LONG(y);
 	if (b == 0) return INT2FIX(1);
 	if (b == 1) return x;
-	if (a == 0) {
-	    if (b > 0) return INT2FIX(0);
-	    return rb_float_new(1.0 / zero);
-	}
-	if (a == 1) return INT2FIX(1);
-	if (a == -1) {
-	    if (b % 2 == 0)
-		return INT2FIX(1);
-	    else 
-		return INT2FIX(-1);
-	}
+	a = FIX2LONG(x);
 	if (b > 0) {
-	    return int_pow(a, b);
+	    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 (RFLOAT(y)->value == 0.0) return rb_float_new(1.0);
-	if (a == 0) {
-	    return rb_float_new(RFLOAT(y)->value < 0 ? (1.0 / zero) : 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);
-    }
+    return rb_num_coerce_bin(x, y);
 }
 
 /*
@@ -2394,15 +1912,18 @@ 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);
+    if (FIXNUM_P(y)) {
+	return (FIX2LONG(x) == FIX2LONG(y))?Qtrue:Qfalse;
+    }
+    else {
+	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>.
@@ -2412,10 +1933,10 @@ 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(0);
 	if (a > b) return INT2FIX(1);
 	return INT2FIX(-1);
     }
@@ -2533,16 +2054,6 @@ fix_rev(num)
     return LONG2NUM(val);
 }
 
-static VALUE
-fix_coerce(x)
-    VALUE x;
-{
-    while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) {
-	x = rb_to_int(x);
-    }
-    return x;
-}
-
 /*
  * call-seq:
  *   fix & other     => integer
@@ -2556,10 +2067,10 @@ fix_and(x, y)
 {
     long val;
 
-    if (!FIXNUM_P(y = fix_coerce(y))) {
+    if (TYPE(y) == T_BIGNUM) {
 	return rb_big_and(y, x);
     }
-    val = FIX2LONG(x) & FIX2LONG(y);
+    val = FIX2LONG(x) & NUM2LONG(y);
     return LONG2NUM(val);
 }
 
@@ -2576,10 +2087,10 @@ fix_or(x, y)
 {
     long val;
 
-    if (!FIXNUM_P(y = fix_coerce(y))) {
+    if (TYPE(y) == T_BIGNUM) {
 	return rb_big_or(y, x);
     }
-    val = FIX2LONG(x) | FIX2LONG(y);
+    val = FIX2LONG(x) | NUM2LONG(y);
     return LONG2NUM(val);
 }
 
@@ -2596,15 +2107,14 @@ fix_xor(x, y)
 {
     long val;
 
-    if (!FIXNUM_P(y = fix_coerce(y))) {
+    if (TYPE(y) == T_BIGNUM) {
 	return rb_big_xor(y, x);
     }
-    val = FIX2LONG(x) ^ FIX2LONG(y);
+    val = FIX2LONG(x) ^ NUM2LONG(y);
     return LONG2NUM(val);
 }
 
-static VALUE fix_lshift _((long, unsigned long));
-static VALUE fix_rshift _((long, unsigned long));
+static VALUE fix_rshift _((VALUE, VALUE));
 
 /*
  * call-seq:
@@ -2614,28 +2124,18 @@ static VALUE fix_rshift _((long, unsigned long));
  */
 
 static VALUE
-rb_fix_lshift(x, y)
+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);
+    width = NUM2LONG(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;
-{
+	return fix_rshift(x, LONG2FIX(-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));
+	return rb_big_lshift(rb_int2big(val), y);
     }
     val = val << width;
     return LONG2NUM(val);
@@ -2645,28 +2145,20 @@ fix_lshift(val, width)
  * call-seq:
  *   fix >> count     => integer
  *
- * Shifts _fix_ right _count_ positions (left if _count_ is negative).
+ * Shifts _fix_ left _count_ positions (right if _count_ is negative).
  */
 
 static VALUE
-rb_fix_rshift(x, y)
+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;
+    i = NUM2LONG(y);
     if (i < 0)
-	return fix_lshift(val, (unsigned long)-i);
-    return fix_rshift(val, i);
-}
-
-static VALUE
-fix_rshift(long val, unsigned long i)
-{
+	return fix_lshift(x, LONG2FIX(-i));
+    if (i == 0) return x;
+    val = FIX2LONG(x);
     if (i >= sizeof(long)*CHAR_BIT-1) {
 	if (val < 0) return INT2FIX(-1);
 	return INT2FIX(0);
@@ -2678,16 +2170,16 @@ fix_rshift(long val, unsigned long i)
 /*
  *  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
  */
 
@@ -2698,7 +2190,7 @@ fix_aref(fix, idx)
     long val = FIX2LONG(fix);
     long i;
 
-    if (!FIXNUM_P(idx = fix_coerce(idx))) {
+    if (TYPE(idx) == T_BIGNUM) {
 	idx = rb_big_norm(idx);
 	if (!FIXNUM_P(idx)) {
 	    if (!RBIGNUM(idx)->sign || val >= 0)
@@ -2706,7 +2198,7 @@ fix_aref(fix, idx)
 	    return INT2FIX(1);
 	}
     }
-    i = FIX2LONG(idx);
+    i = NUM2LONG(idx);
 
     if (i < 0) return INT2FIX(0);
     if (sizeof(VALUE)*CHAR_BIT-1 < i) {
@@ -2721,9 +2213,9 @@ fix_aref(fix, idx)
 /*
  *  call-seq:
  *     fix.to_f -> float
- *
+ *  
  *  Converts <i>fix</i> to a <code>Float</code>.
- *
+ *     
  */
 
 static VALUE
@@ -2740,12 +2232,12 @@ fix_to_f(num)
 /*
  *  call-seq:
  *     fix.abs -> aFixnum
- *
+ *  
  *  Returns the absolute value of <i>fix</i>.
- *
+ *     
  *     -12345.abs   #=> 12345
  *     12345.abs    #=> 12345
- *
+ *     
  */
 
 static VALUE
@@ -2762,13 +2254,13 @@ fix_abs(fix)
 /*
  *  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"
@@ -2778,7 +2270,7 @@ static VALUE
 fix_id2name(fix)
     VALUE fix;
 {
-    const char *name = rb_id2name(FIX2UINT(fix));
+    char *name = rb_id2name(FIX2UINT(fix));
     if (name) return rb_str_new2(name);
     return Qnil;
 }
@@ -2787,10 +2279,10 @@ fix_id2name(fix)
 /*
  *  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
@@ -2812,10 +2304,10 @@ fix_to_sym(fix)
 /*
  *  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
@@ -2828,26 +2320,10 @@ fix_size(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;
 {
-    RETURN_ENUMERATOR(from, 1, &to);
-
     if (FIXNUM_P(from) && FIXNUM_P(to)) {
 	long i, end;
 
@@ -2868,27 +2344,10 @@ int_upto(from, 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;
 {
-    RETURN_ENUMERATOR(from, 1, &to);
-
     if (FIXNUM_P(from) && FIXNUM_P(to)) {
 	long i, end;
 
@@ -2909,28 +2368,10 @@ int_downto(from, 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;
 {
-    RETURN_ENUMERATOR(num, 0, 0);
-
     if (FIXNUM_P(num)) {
 	long i, end;
 
@@ -2954,9 +2395,9 @@ int_dotimes(num)
 /*
  *  call-seq:
  *     fix.zero?    => true or false
- *
+ *  
  *  Returns <code>true</code> if <i>fix</i> is zero.
- *
+ *     
  */
 
 static VALUE
@@ -2969,38 +2410,6 @@ fix_zero_p(num)
     return Qfalse;
 }
 
-/*
- *  call-seq:
- *     fix.odd? -> true or false
- *
- *  Returns <code>true</code> if <i>fix</i> is an odd number.
- */
-
-static VALUE
-fix_odd_p(VALUE num)
-{
-    if (num & 2) {
-        return Qtrue;
-    }
-    return Qfalse;
-}
-
-/*
- *  call-seq:
- *     fix.even? -> true or false
- *
- *  Returns <code>true</code> if <i>fix</i> is an even number.
- */
-
-static VALUE
-fix_even_p(VALUE num)
-{
-    if (num & 2) {
-        return Qfalse;
-    }
-    return Qtrue;
-}
-
 void
 Init_Numeric()
 {
@@ -3010,9 +2419,6 @@ Init_Numeric()
 #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");
@@ -3032,7 +2438,6 @@ Init_Numeric()
     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, "fdiv", 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);
@@ -3055,17 +2460,13 @@ Init_Numeric()
     rb_undef_method(CLASS_OF(rb_cInteger), "new");
 
     rb_define_method(rb_cInteger, "integer?", int_int_p, 0);
-    rb_define_method(rb_cInteger, "odd?", int_odd_p, 0);
-    rb_define_method(rb_cInteger, "even?", int_even_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, "pred", int_pred, 0);
     rb_define_method(rb_cInteger, "chr", int_chr, 0);
-    rb_define_method(rb_cInteger, "ord", int_ord, 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);
@@ -3093,7 +2494,6 @@ Init_Numeric()
     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, "fdiv", fix_quo, 1);
     rb_define_method(rb_cFixnum, "**", fix_pow, 1);
 
     rb_define_method(rb_cFixnum, "abs", fix_abs, 0);
@@ -3111,14 +2511,12 @@ Init_Numeric()
     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, "<<", fix_lshift, 1);
+    rb_define_method(rb_cFixnum, ">>", 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_define_method(rb_cFixnum, "odd?", fix_odd_p, 0);
-    rb_define_method(rb_cFixnum, "even?", fix_even_p, 0);
 
     rb_cFloat  = rb_define_class("Float", rb_cNumeric);
 
diff --git a/object.c b/object.c
index 75153b843a..174d8ccfc0 100644
--- a/object.c
+++ b/object.c
@@ -33,15 +33,6 @@ 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;
@@ -61,35 +52,6 @@ rb_eql(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;
@@ -98,18 +60,21 @@ rb_obj_equal(obj1, obj2)
     return Qfalse;
 }
 
-/*
- *  call-seq:
- *     obj.id    => fixnum
- *  
- *  Soon-to-be deprecated version of <code>Object#object_id</code>.
- */
+VALUE
+rb_obj_id(obj)
+    VALUE obj;
+{
+    if (SPECIAL_CONST_P(obj)) {
+	return LONG2NUM((long)obj);
+    }
+    return (VALUE)((long)obj|FIXNUM_FLAG);
+}
 
 VALUE
 rb_obj_id_obsolete(obj)
     VALUE obj;
 {
-    rb_warn("Object#id will be deprecated; use Object#object_id");
+    rb_warning("Object#id will be deprecated; use Object#object_id");
     return rb_obj_id(obj);
 }
 
@@ -123,13 +88,6 @@ rb_class_real(cl)
     return cl;
 }
 
-/*
- *  call-seq:
- *     obj.type   => class
- *  
- *  Deprecated synonym for <code>Object#class</code>.
- */
-
 VALUE
 rb_obj_type(obj)
     VALUE obj;
@@ -138,21 +96,6 @@ rb_obj_type(obj)
     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;
@@ -188,30 +131,6 @@ init_copy(dest, obj)
     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;
@@ -223,31 +142,13 @@ rb_obj_clone(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);
+    RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT)) & ~FL_FREEZE;
     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;
@@ -263,7 +164,6 @@ rb_obj_dup(obj)
     return dup;
 }
 
-/* :nodoc: */
 VALUE
 rb_obj_init_copy(obj, orig)
     VALUE obj, orig;
@@ -276,21 +176,6 @@ rb_obj_init_copy(obj, orig)
     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;
@@ -299,28 +184,15 @@ rb_any_to_a(obj)
     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;
 {
-    const char *cname = rb_obj_classname(obj);
-    size_t len;
+    char *cname = rb_obj_classname(obj);
     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);
+    str = rb_str_new(0, strlen(cname)+6+16+1); /* 6:tags 16:addr 1:nul */
+    sprintf(RSTRING(str)->ptr, "#<%s:0x%lx>", cname, obj);
     RSTRING(str)->len = strlen(RSTRING(str)->ptr);
     if (OBJ_TAINTED(obj)) OBJ_TAINT(str);
 
@@ -341,7 +213,7 @@ inspect_i(id, value, str)
     VALUE str;
 {
     VALUE str2;
-    const char *ivname;
+    char *ivname;
 
     /* need not to show internal data */
     if (CLASS_OF(value) == 0) return ST_CONTINUE;
@@ -367,7 +239,7 @@ static VALUE
 inspect_obj(obj, str)
     VALUE obj, str;
 {
-    st_foreach_safe(ROBJECT(obj)->iv_tbl, inspect_i, str);
+    st_foreach(ROBJECT(obj)->iv_tbl, inspect_i, str);
     rb_str_cat2(str, ">");
     RSTRING(str)->ptr[0] = '#';
     OBJ_INFECT(str, obj);
@@ -375,19 +247,6 @@ inspect_obj(obj, str)
     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;
@@ -396,34 +255,23 @@ rb_obj_inspect(obj)
 	&& ROBJECT(obj)->iv_tbl
 	&& ROBJECT(obj)->iv_tbl->num_entries > 0) {
 	VALUE str;
-	size_t len;
-	const char *c = rb_obj_classname(obj);
+	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);
+	    str = rb_str_new(0, strlen(c)+10+16+1); /* 10:tags 16:addr 1:nul */
+	    sprintf(RSTRING(str)->ptr, "#<%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);
+	str = rb_str_new(0, strlen(c)+6+16+1); /* 6:tags 16:addr 1:nul */
+	sprintf(RSTRING(str)->ptr, "-<%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;
@@ -441,33 +289,6 @@ rb_obj_is_instance_of(obj, c)
     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;
@@ -492,182 +313,12 @@ rb_obj_is_kind_of(obj, c)
     return Qfalse;
 }
 
-
-/*
- *  call-seq:
- *     obj.tap{|x|...}    => obj
- *  
- *  Yields <code>x</code> to the block, and then returns <code>x</code>.
- *  The primary purpose of this method is to "tap into" a method chain,
- *  in order to perform operations on intermediate results within the chain.
- *
- *	(1..10).tap {
- *	  |x| puts "original: #{x.inspect}"
- *	}.to_a.tap {
- *	  |x| puts "array: #{x.inspect}"
- *	}.select {|x| x%2==0}.tap {
- *	  |x| puts "evens: #{x.inspect}"
- *	}.map {|x| x*x}.tap {
- *	  |x| puts "squares: #{x.inspect}"
- *	}
- *
- */
-
-VALUE
-rb_obj_tap(obj)
-    VALUE obj;
-{
-    rb_yield(obj);
-    return obj;
-}
-
-
-/*
- * 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;
@@ -677,15 +328,6 @@ rb_obj_tainted(obj)
     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;
@@ -700,14 +342,6 @@ rb_obj_taint(obj)
     return obj;
 }
 
-
-/*
- *  call-seq:
- *     obj.untaint    => obj
- *  
- *  Removes the taint from <i>obj</i>.
- */
-
 VALUE
 rb_obj_untaint(obj)
     VALUE obj;
@@ -729,26 +363,6 @@ rb_obj_infect(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;
@@ -762,17 +376,6 @@ rb_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;
@@ -781,23 +384,6 @@ rb_obj_frozen_p(obj)
     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;
@@ -805,15 +391,6 @@ nil_to_i(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;
@@ -821,15 +398,6 @@ nil_to_f(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;
@@ -837,15 +405,6 @@ nil_to_s(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;
@@ -853,13 +412,6 @@ nil_to_a(obj)
     return rb_ary_new2(0);
 }
 
-/*
- *  call-seq:
- *    nil.inspect  => "nil"
- *
- *  Always returns the string "nil".
- */
-
 static VALUE
 nil_inspect(obj)
     VALUE obj;
@@ -867,6 +419,28 @@ nil_inspect(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;
@@ -874,24 +448,6 @@ main_to_s(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;
@@ -899,15 +455,6 @@ true_to_s(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;
@@ -915,22 +462,6 @@ true_and(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;
@@ -938,16 +469,6 @@ true_or(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;
@@ -983,7 +504,6 @@ false_to_s(obj)
 /*
  *  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
@@ -1001,7 +521,6 @@ false_and(obj, obj2)
 /*
  *  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.
@@ -1019,7 +538,6 @@ false_or(obj, obj2)
 /*
  *  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
@@ -1034,13 +552,6 @@ false_xor(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;
@@ -1048,15 +559,6 @@ rb_true(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;
@@ -1064,67 +566,6 @@ rb_false(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;
@@ -1134,58 +575,25 @@ sym_to_i(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;
-    const char *name;
+    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)) {
+    if (rb_is_junk_id(id)) {
 	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;
@@ -1193,16 +601,6 @@ sym_to_s(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;
@@ -1210,75 +608,6 @@ sym_to_sym(sym)
     return sym;
 }
 
-
-static VALUE
-sym_call(args, mid)
-    VALUE args, mid;
-{
-    VALUE obj;
-
-    if (RARRAY(args)->len < 1) {
-	rb_raise(rb_eArgError, "no receiver given");
-    }
-    obj = rb_ary_shift(args);
-    return rb_apply(obj, (ID)mid, args);
-}
-
-VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE));
-
-/*
- * call-seq:
- *   sym.to_proc
- *
- * Returns a _Proc_ object which respond to the given method by _sym_.
- *
- *   (1..3).collect(&:to_s)  #=> ["1", "2", "3"]
- */
-
-static VALUE
-sym_to_proc(VALUE sym)
-{
-    return rb_proc_new(sym_call, (VALUE)SYM2ID(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;
@@ -1301,34 +630,9 @@ rb_mod_to_s(klass)
 
 	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);
+    return rb_str_dup(rb_class_path(klass));
 }
 
-/*
- *  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;
@@ -1336,20 +640,8 @@ rb_mod_eqq(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)
+static VALUE
+rb_mod_le(mod, arg)
     VALUE mod, arg;
 {
     VALUE start = mod;
@@ -1363,11 +655,6 @@ rb_class_inherited_p(mod, arg)
 	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;
@@ -1382,38 +669,14 @@ rb_class_inherited_p(mod, arg)
     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);
+    return rb_mod_le(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;
@@ -1426,20 +689,9 @@ rb_mod_ge(mod, arg)
 	rb_raise(rb_eTypeError, "compared with non class/module");
     }
 
-    return rb_class_inherited_p(arg, mod);
+    return rb_mod_le(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;
@@ -1448,17 +700,6 @@ rb_mod_gt(mod, arg)
     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;
@@ -1474,7 +715,7 @@ rb_mod_cmp(mod, arg)
 	return Qnil;
     }
 
-    cmp = rb_class_inherited_p(mod, arg);
+    cmp = rb_mod_le(mod, arg);
     if (NIL_P(cmp)) return Qnil;
     if (cmp) {
 	return INT2FIX(-1);
@@ -1501,29 +742,6 @@ rb_class_s_alloc(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;
@@ -1573,21 +791,8 @@ rb_class_initialize(argc, argv, klass)
  *  call-seq:
  *     class.allocate()   =>   obj
  *  
- *  Allocates space for a new object of <i>class</i>'s class and does not
- *  call initialize on the new instance. The returned object must be an
- *  instance of <i>class</i>.
- *  
- *      klass = Class.new do
- *        def initialize(*args)
- *          @initialized = true
- *        end
- *      
- *        def initialized?
- *          @initialized || false
- *        end
- *      end
- *      
- *      klass.allocate.initialized? #=> false
+ *  Allocates space for a new object of <i>class</i>'s class. The
+ *  returned object must be an instance of <i>class</i>.
  *     
  */
 
@@ -1667,9 +872,6 @@ rb_class_superclass(klass)
     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;
     }
@@ -1683,9 +885,10 @@ static ID
 str_to_id(str)
     VALUE str;
 {
-    VALUE sym = rb_str_intern(str);
-
-    return SYM2ID(sym);
+    if (!RSTRING(str)->ptr || RSTRING(str)->len == 0) {
+	rb_raise(rb_eArgError, "empty symbol string");
+    }
+    return rb_intern(RSTRING(str)->ptr);
 }
 
 ID
@@ -1718,32 +921,6 @@ rb_to_id(name)
     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;
@@ -1757,15 +934,6 @@ rb_mod_attr(argc, argv, klass)
     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;
@@ -1780,14 +948,6 @@ rb_mod_attr_reader(argc, argv, klass)
     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;
@@ -1802,19 +962,6 @@ rb_mod_attr_writer(argc, argv, klass)
     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;
@@ -1829,15 +976,6 @@ rb_mod_attr_accessor(argc, argv, klass)
     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;
@@ -1850,18 +988,6 @@ rb_mod_const_get(mod, name)
     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;
@@ -1875,16 +1001,6 @@ rb_mod_const_set(mod, name, 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;
@@ -1897,25 +1013,6 @@ rb_mod_const_defined(mod, name)
     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;
@@ -1941,15 +1038,6 @@ rb_obj_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;
@@ -1965,15 +1053,6 @@ rb_obj_protected_methods(argc, argv, 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;
@@ -1989,15 +1068,6 @@ rb_obj_private_methods(argc, argv, 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;
@@ -2013,26 +1083,6 @@ rb_obj_public_methods(argc, argv, 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;
@@ -2045,26 +1095,6 @@ rb_obj_ivar_get(obj, iv)
     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;
@@ -2077,125 +1107,6 @@ rb_obj_ivar_set(obj, iv, val)
     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;
@@ -2207,7 +1118,7 @@ convert_type(val, tname, method, raise)
     m = rb_intern(method);
     if (!rb_respond_to(val, m)) {
 	if (raise) {
-	    rb_raise(rb_eTypeError, "can't convert %s into %s",
+	    rb_raise(rb_eTypeError, "cannot convert %s into %s",
 		     NIL_P(val) ? "nil" :
 		     val == Qtrue ? "true" :
 		     val == Qfalse ? "false" :
@@ -2261,7 +1172,7 @@ rb_check_convert_type(val, type, tname, method)
 static VALUE
 rb_to_integer(val, method)
     VALUE val;
-    const char *method;
+    char *method;
 {
     VALUE v = convert_type(val, "Integer", method, Qtrue);
     if (!rb_obj_is_kind_of(v, rb_cInteger)) {
@@ -2272,19 +1183,6 @@ rb_to_integer(val, method)
 }
 
 VALUE
-rb_check_to_integer(VALUE val, const char *method)
-{
-    VALUE v;
-
-    if (FIXNUM_P(val)) return val;
-    v = convert_type(val, "Integer", method, Qfalse);
-    if (!rb_obj_is_kind_of(v, rb_cInteger)) {
-	return Qnil;
-    }
-    return v;
-}
-
-VALUE
 rb_to_int(val)
     VALUE val;
 {
@@ -2295,8 +1193,6 @@ VALUE
 rb_Integer(val)
     VALUE val;
 {
-    VALUE tmp;
-
     switch (TYPE(val)) {
       case T_FLOAT:
 	if (RFLOAT(val)->value <= (double)FIXNUM_MAX
@@ -2315,30 +1211,12 @@ rb_Integer(val)
       default:
 	break;
     }
-    tmp = convert_type(val, "Integer", "to_int", Qfalse);
-    if (NIL_P(tmp)) {
-	return rb_to_integer(val, "to_i");
+    if (rb_respond_to(val, rb_intern("to_int"))) {
+	return rb_to_integer(val, "to_int");
     }
-    return tmp;
+    return rb_to_integer(val, "to_i");
 }
 
-/*
- *  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;
@@ -2354,9 +1232,6 @@ rb_cstr_to_dbl(p, 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;
@@ -2366,11 +1241,9 @@ rb_cstr_to_dbl(p, badcheck)
     else {
 	while (ISSPACE(*p) || *p == '_') p++;
     }
-    errno = 0;
     d = strtod(p, &end);
     if (errno == ERANGE) {
-	OutOfRange();
-	rb_warn("Float %.*s%s out of range", w, p, ellipsis);
+	rb_warn("Float %*s out of range", end-p, p);
 	errno = 0;
     }
     if (p == end) {
@@ -2404,20 +1277,18 @@ rb_cstr_to_dbl(p, badcheck)
 	p = buf;
 	d = strtod(p, &end);
 	if (errno == ERANGE) {
-	    OutOfRange();
-	    rb_warn("Float %.*s%s out of range", w, p, ellipsis);
+	    rb_warn("Float %*s out of range", end-p, p);
 	    errno = 0;
 	}
 	if (badcheck) {
-	    if (!end || p == end) goto bad;
+	    if (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);
+	rb_raise(rb_eArgError, "Float %s out of range", q);
     }
     return d;
 }
@@ -2466,7 +1337,7 @@ rb_Float(val)
 	return rb_float_new(rb_str_to_dbl(val, Qtrue));
 
       case T_NIL:
-	rb_raise(rb_eTypeError, "can't convert nil into Float");
+	rb_raise(rb_eTypeError, "cannot convert nil into Float");
 	break;
 
       default:
@@ -2480,18 +1351,6 @@ rb_Float(val)
     }
 }
 
-/*
- *  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;
@@ -2542,19 +1401,6 @@ rb_String(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;
@@ -2568,10 +1414,18 @@ rb_Array(val)
     VALUE val;
 {
     VALUE tmp = rb_check_array_type(val);
+    ID to_a;
 
     if (NIL_P(tmp)) {
-	tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_a");
-	if (NIL_P(tmp)) {
+	to_a = rb_intern("to_a");
+	if (rb_respond_to(val, to_a)) {
+	    val = rb_funcall(val, to_a, 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);
 	}
     }
@@ -2579,18 +1433,6 @@ rb_Array(val)
 }
 #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;
@@ -2648,45 +1490,30 @@ VALUE ruby_top_self;
  *     
  *     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'.
+ * Classes, modules, and objects are interrelated. In the diagram
+ * that follows, the arrows represent inheritance, and the
+ * parentheses meta-classes. All metaclasses are instances 
+ * of the class `Class'.
+ *
+ *                           +------------------+
+ *                           |                  |
+ *             Object---->(Object)              |
+ *              ^  ^        ^  ^                |
+ *              |  |        |  |                |
+ *              |  |  +-----+  +---------+      |
+ *              |  |  |                  |      |
+ *              |  +-----------+         |      |
+ *              |     |        |         |      |
+ *       +------+     |     Module--->(Module)  |
+ *       |            |        ^         ^      |
+ *  OtherClass-->(OtherClass)  |         |      |
+ *                             |         |      |
+ *                           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
@@ -2718,11 +1545,14 @@ Init_Object()
     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, "=~", rb_false, 1);
 
     rb_define_method(rb_mKernel, "eql?", rb_obj_equal, 1);
 
+    rb_define_method(rb_mKernel, "hash", rb_obj_id, 0);
     rb_define_method(rb_mKernel, "id", rb_obj_id_obsolete, 0);
+    rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0);
+    rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
     rb_define_method(rb_mKernel, "type", rb_obj_type, 0);
     rb_define_method(rb_mKernel, "class", rb_obj_class, 0);
 
@@ -2740,31 +1570,26 @@ Init_Object()
     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, "singleton_methods", rb_obj_singleton_methods, -1);
+    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_variables", rb_obj_instance_variables, 0);
     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_obj_remove_instance_variable, 1);
 
     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_method(rb_mKernel, "tap", rb_obj_tap, 0);
 
     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("sprintf", rb_f_sprintf, -1);
+    rb_define_global_function("format", rb_f_sprintf, -1);
 
     rb_define_global_function("Integer", rb_f_integer, 1);
     rb_define_global_function("Float", rb_f_float, 1);
@@ -2788,35 +1613,30 @@ Init_Object()
     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_define_singleton_method(rb_cSymbol, "all_symbols", rb_sym_all_symbols, 0);
     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, "to_int", sym_to_i, 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, "to_proc", sym_to_proc, 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_le, 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, "initialize_copy", rb_mod_init_copy, 1);
     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_method(rb_cModule, "included_modules", rb_mod_included_modules, 0);
+    rb_define_method(rb_cModule, "include?", rb_mod_include_p, 1);
+    rb_define_method(rb_cModule, "name", rb_mod_name, 0);
+    rb_define_method(rb_cModule, "ancestors", rb_mod_ancestors, 0);
 
     rb_define_private_method(rb_cModule, "attr", rb_mod_attr, -1);
     rb_define_private_method(rb_cModule, "attr_reader", rb_mod_attr_reader, -1);
@@ -2825,35 +1645,24 @@ Init_Object()
 
     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, "instance_methods", rb_class_instance_methods, -1);
+    rb_define_method(rb_cModule, "public_instance_methods", rb_class_public_instance_methods, -1);
+    rb_define_method(rb_cModule, "protected_instance_methods", rb_class_protected_instance_methods, -1);
+    rb_define_method(rb_cModule, "private_instance_methods", rb_class_private_instance_methods, -1);
+
+    rb_define_method(rb_cModule, "constants", rb_mod_constants, 0);
     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_private_method(rb_cModule, "remove_const", rb_mod_remove_const, 1);
+    rb_define_method(rb_cModule, "const_missing", rb_mod_const_missing, 1);
+    rb_define_method(rb_cModule, "class_variables", rb_mod_class_variables, 0);
+    rb_define_private_method(rb_cModule, "remove_class_variable", rb_mod_remove_cvar, 1);
 
     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, "initialize_copy", rb_class_init_copy, 1);
     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");
@@ -2862,8 +1671,8 @@ Init_Object()
     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_global_variable(&ruby_top_self);
     rb_define_singleton_method(ruby_top_self, "to_s", main_to_s, 0);
 
     rb_cTrueClass = rb_define_class("TrueClass", rb_cObject);
diff --git a/pack.c b/pack.c
index b22a8348b2..e4a301c2e3 100644
--- a/pack.c
+++ b/pack.c
@@ -22,18 +22,20 @@
 #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_I32(x) (natint?NUM2LONG(x):(NUM2I32(x)))
+# define NATINT_U32(x) (natint?NUM2ULONG(x):(NUM2U32(x)))
 # define NATINT_LEN(type,len) (natint?sizeof(type):(len))
 # ifdef WORDS_BIGENDIAN
-#   define OFF16(p) OFF16B(p)
-#   define OFF32(p) OFF32B(p)
+#   define OFF16(p) ((char*)(p) + (natint?0:(sizeof(short) - SIZE16)))
+#   define OFF32(p) ((char*)(p) + (natint?0:(sizeof(long) - SIZE32)))
 # 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_I32(x) NUM2I32(x)
+# define NATINT_U32(x) NUM2U32(x)
 # define NATINT_LEN(type,len) sizeof(type)
 # define NATINT_HTOVS(x) htovs(x)
 # define NATINT_HTOVL(x) htovl(x)
@@ -45,10 +47,6 @@
 # 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				\
@@ -60,10 +58,10 @@ TOKEN_PASTE(swap,x)(z)			\
     unsigned char *s, *t;		\
     int i;				\
 					\
-    zp = xmalloc(sizeof(xtype));	\
+    zp = malloc(sizeof(xtype));		\
     *zp = z;				\
     s = (unsigned char*)zp;		\
-    t = xmalloc(sizeof(xtype));		\
+    t = malloc(sizeof(xtype));		\
     for (i=0; i<sizeof(xtype); i++) {	\
 	t[sizeof(xtype)-i-1] = s[i];	\
     }					\
@@ -175,7 +173,7 @@ define_swapx(d, double)
 #endif	/* #if SIZEOF_LONG == 8 */
 #else	/* SIZEOF_DOUBLE != 8 */
 define_swapx(d, double)
-#endif	/* #if SIZEOF_DOUBLE == 8 */
+#endif	/* #if SIZEOF_DPOUBLE == 8 */
 
 #undef define_swapx
 
@@ -248,16 +246,16 @@ endian()
 #define hton32(x) (x)
 # endif
 #else /* LITTLE ENDIAN */
-#ifdef ntohs
+#ifndef 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)
+#endif
 #define ntohf(x) swapf(x)
 #define ntohd(x) swapd(x)
 #define htonf(x) swapf(x)
@@ -331,32 +329,63 @@ endian()
 #define VTOHD(x,y)	vtohd(x)
 #endif
 
-unsigned long rb_big2ulong_pack _((VALUE x));
+#if SIZEOF_LONG == SIZE32
+typedef long I32;
+typedef unsigned long U32;
+#define NUM2I32(x) NUM2LONG(x)
+#define NUM2U32(x) NUM2ULONG(x)
+#else
+typedef int I32;
+typedef unsigned int U32;
+# if SIZEOF_INT == SIZE32
+#  define NUM2I32(x) NUM2INT(x)
+#  define NUM2U32(x) NUM2UINT(x)
+# else
 
-static unsigned long
+#define I32_MAX 2147483647
+#define I32_MIN (-I32_MAX-1)
+
+static I32
 num2i32(x)
     VALUE x;
 {
-    x = rb_to_int(x); /* is nil OK? (should not) */
+    long num = NUM2LONG(x);
 
-    if (FIXNUM_P(x)) return FIX2LONG(x);
-    if (TYPE(x) == T_BIGNUM) {
-	return rb_big2ulong_pack(x);
+    if (num < I32_MIN || I32_MAX < num) {
+	rb_raise(rb_eRangeError, "integer %ld too big to convert to `I32'", num);
     }
-    rb_raise(rb_eTypeError, "can't convert %s to `integer'", rb_obj_classname(x));
-    return 0;			/* not reached */
+    return (I32)num;
 }
+    
+#define U32_MAX 4294967295
 
-#if SIZEOF_LONG == SIZE32
-# define EXTEND32(x) 
+static U32
+num2u32(x)
+    VALUE x;
+{
+    unsigned long num = NUM2ULONG(x);
+
+    if (U32_MAX < num) {
+	rb_raise(rb_eRangeError, "integer %ld too big to convert to `U32'", num);
+    }
+    return (U32)num;
+}
+
+#  define NUM2I32(x) num2i32(x)
+#  define NUM2U32(x) num2u32(x)
+# endif
+#endif
+
+#if SIZEOF_LONG == SIZE32 || SIZEOF_INT == SIZE32
+# define EXTEND32(x) ((I32)(x))
 #else
 /* invariant in modulo 1<<31 */
-# define EXTEND32(x) do { if (!natint) {(x) = (((1L<<31)-1-(x))^~(~0L<<31));}} while(0)
+# define EXTEND32(x) (I32)(((1<<31)-1-(x))^~(~0<<31))
 #endif
 #if SIZEOF_SHORT == SIZE16
-# define EXTEND16(x) 
+# define EXTEND16(x) (short)(x)
 #else
-# define EXTEND16(x) do { if (!natint) {(x) = (short)(((1<<15)-1-(x))^~(~0<<15));}} while(0)
+# define EXTEND16(x) (short)(((1<<15)-1-(x))^~(~0<<15))
 #endif
 
 #ifdef HAVE_LONG_LONG
@@ -364,9 +393,9 @@ num2i32(x)
 #else
 # define QUAD_SIZE 8
 #endif
-static const char toofew[] = "too few arguments";
+static char *toofew = "too few arguments";
 
-static void encodes _((VALUE,const char*,long,int));
+static void encodes _((VALUE,char*,long,int));
 static void qpencode _((VALUE,VALUE,long));
 
 static int uv_to_utf8 _((char*,unsigned long));
@@ -395,7 +424,7 @@ static unsigned long utf8_to_uv _((char*,long*));
  *     a.pack("a3a3a3")   #=> "a\000\000b\000\000c\000\000"
  *     n.pack("ccc")      #=> "ABC"
  *     
- *  Directives for +pack+.
+ * Directives for +pack+.
  *
  *   Directive    Meaning
  *   ---------------------------------------------------------------
@@ -434,20 +463,20 @@ static unsigned long utf8_to_uv _((char*,long*));
  *       w     |  BER-compressed integer\fnm
  *       X     |  Back up a byte
  *       x     |  Null byte
- *       Z     |  Same as ``a'', except that null is added with *
+ *       Z     |  Same as ``A''
  */
 
 static VALUE
 pack_pack(ary, fmt)
     VALUE ary, fmt;
 {
-    static const char nul10[] = "\0\0\0\0\0\0\0\0\0\0";
-    static const char spc10[] = "          ";
+    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;
-    const char *ptr;
+    char *ptr;
 #ifdef NATINT_PACK
     int natint;		/* native integer */
 #endif
@@ -460,14 +489,10 @@ pack_pack(ary, fmt)
     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)
+#define THISFROM RARRAY(ary)->ptr[idx]
+#define NEXTFROM (items-- > 0 ? RARRAY(ary)->ptr[idx++] : (rb_raise(rb_eArgError, toofew),0))
 
     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;
@@ -481,7 +506,7 @@ pack_pack(ary, fmt)
 	    continue;
 	}
         if (*p == '_' || *p == '!') {
-	    const char *natstr = "sSiIlL";
+	    char *natstr = "sSiIlL";
 
 	    if (strchr(natstr, type)) {
 #ifdef NATINT_PACK
@@ -495,7 +520,7 @@ pack_pack(ary, fmt)
 	}
 	if (*p == '*') {	/* set data length */
 	    len = strchr("@Xxu", type) ? 0 : items;
-	    p++;
+            p++;
 	}
 	else if (ISDIGIT(*p)) {
 	    len = strtoul(p, (char**)&p, 10);
@@ -527,11 +552,8 @@ pack_pack(ary, fmt)
 	      case 'a':		/* arbitrary binary string (null padded)  */
 	      case 'A':		/* ASCII string (space padded) */
 	      case 'Z':		/* null terminated ASCII string  */
-		if (plen >= len) {
+		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;
@@ -674,7 +696,10 @@ pack_pack(ary, fmt)
 		char c;
 
 		from = NEXTFROM;
-		c = num2i32(from);
+		if (NIL_P(from)) c = 0;
+		else {
+		    c = NUM2INT(from);
+		}
 		rb_str_buf_cat(res, &c, sizeof(char));
 	    }
 	    break;
@@ -685,7 +710,10 @@ pack_pack(ary, fmt)
 		short s;
 
 		from = NEXTFROM;
-		s = num2i32(from);
+		if (NIL_P(from)) s = 0;
+		else {
+		    s = NUM2INT(from);
+		}
 		rb_str_buf_cat(res, OFF16(&s), NATINT_LEN(short,2));
 	    }
 	    break;
@@ -696,7 +724,10 @@ pack_pack(ary, fmt)
 		long i;
 
 		from = NEXTFROM;
-		i = num2i32(from);
+		if (NIL_P(from)) i = 0;
+		else {
+		    i = NATINT_I32(from);
+		}
 		rb_str_buf_cat(res, OFF32(&i), NATINT_LEN(int,4));
 	    }
 	    break;
@@ -707,7 +738,10 @@ pack_pack(ary, fmt)
 		long l;
 
 		from = NEXTFROM;
-		l = num2i32(from);
+		if (NIL_P(from)) l = 0;
+		else {
+		    l = NATINT_U32(from);
+		}
 		rb_str_buf_cat(res, OFF32(&l), NATINT_LEN(long,4));
 	    }
 	    break;
@@ -718,6 +752,7 @@ pack_pack(ary, fmt)
 		char tmp[QUAD_SIZE];
 
 		from = NEXTFROM;
+		if (NIL_P(from)) from = INT2FIX(0);
 		rb_quad_pack(tmp, from);
 		rb_str_buf_cat(res, (char*)&tmp, QUAD_SIZE);
 	    }
@@ -728,7 +763,10 @@ pack_pack(ary, fmt)
 		unsigned short s;
 
 		from = NEXTFROM;
-		s = num2i32(from);
+		if (NIL_P(from)) s = 0;
+		else {
+		    s = NUM2INT(from);
+		}
 		s = NATINT_HTONS(s);
 		rb_str_buf_cat(res, OFF16(&s), NATINT_LEN(short,2));
 	    }
@@ -739,7 +777,10 @@ pack_pack(ary, fmt)
 		unsigned long l;
 
 		from = NEXTFROM;
-		l = num2i32(from);
+		if (NIL_P(from)) l = 0;
+		else {
+		    l = NATINT_U32(from);
+		}
 		l = NATINT_HTONL(l);
 		rb_str_buf_cat(res, OFF32(&l), NATINT_LEN(long,4));
 	    }
@@ -750,7 +791,10 @@ pack_pack(ary, fmt)
 		unsigned short s;
 
 		from = NEXTFROM;
-		s = num2i32(from);
+		if (NIL_P(from)) s = 0;
+		else {
+		    s = NUM2INT(from);
+		}
 		s = NATINT_HTOVS(s);
 		rb_str_buf_cat(res, OFF16(&s), NATINT_LEN(short,2));
 	    }
@@ -761,7 +805,10 @@ pack_pack(ary, fmt)
 		unsigned long l;
 
 		from = NEXTFROM;
-		l = num2i32(from);
+		if (NIL_P(from)) l = 0;
+		else {
+		    l = NATINT_U32(from);
+		}
 		l = NATINT_HTOVL(l);
 		rb_str_buf_cat(res, OFF32(&l), NATINT_LEN(long,4));
 	    }
@@ -873,10 +920,9 @@ pack_pack(ary, fmt)
 		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");
+		if (NIL_P(from)) l = 0;
+		else {
+		    l = NUM2UINT(from);
 		}
 		le = uv_to_utf8(buf, l);
 		rb_str_buf_cat(res, (char*)buf, le);
@@ -939,7 +985,6 @@ pack_pack(ary, fmt)
 		    associates = rb_ary_new();
 		}
 		rb_ary_push(associates, from);
-		rb_obj_taint(from);
 		rb_str_buf_cat(res, (char*)&t, sizeof(char*));
 	    }
 	    break;
@@ -961,10 +1006,11 @@ pack_pack(ary, fmt)
 		    }
 		}
 
-		{
+		if (NIL_P(from)) ul = 0;
+		else {
 		    long l = NUM2LONG(from);
 		    if (l < 0) {
-			rb_raise(rb_eArgError, "can't compress negative numbers");
+			rb_raise(rb_eArgError, "cannot compress negative numbers");
 		    }
 		    ul = l;
 		}
@@ -1004,21 +1050,21 @@ pack_pack(ary, fmt)
     return res;
 }
 
-static const char uu_table[] =
+static char uu_table[] =
 "`!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_";
-static const char b64_table[] =
+static char b64_table[] =
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 static void
 encodes(str, s, len, type)
     VALUE str;
-    const char *s;
+    char *s;
     long len;
     int type;
 {
     char *buff = ALLOCA_N(char, len * 4 / 3 + 6);
     long i = 0;
-    const char *trans = type == 'u' ? uu_table : b64_table;
+    char *trans = type == 'u' ? uu_table : b64_table;
     int padding;
 
     if (type == 'u') {
@@ -1181,7 +1227,6 @@ infected_str_new(ptr, len, str)
  *     
  *     "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]
@@ -1293,7 +1338,6 @@ infected_str_new(ptr, len, str)
  *       x    | ---     | skip forward one character
  *     -------+---------+-----------------------------------------
  *       Z    | String  | with trailing nulls removed
- *            |         | upto first null with *
  *     -------+---------+-----------------------------------------
  *       @    | ---     | skip to the offset given by the 
  *            |         | length argument
@@ -1304,7 +1348,7 @@ static VALUE
 pack_unpack(str, fmt)
     VALUE str, fmt;
 {
-    static const char hexdigits[] = "0123456789abcdef0123456789ABCDEFx";
+    static char *hexdigits = "0123456789abcdef0123456789ABCDEFx";
     char *s, *send;
     char *p, *pend;
     VALUE ary;
@@ -1316,9 +1360,9 @@ pack_unpack(str, fmt)
 #endif
 
     StringValue(str);
-    StringValue(fmt);
     s = RSTRING(str)->ptr;
     send = s + RSTRING(str)->len;
+    StringValue(fmt);
     p = RSTRING(fmt)->ptr;
     pend = p + RSTRING(fmt)->len;
 
@@ -1338,7 +1382,7 @@ pack_unpack(str, fmt)
 	}
 	star = 0;
 	if (*p == '_' || *p == '!') {
-	    static const char natstr[] = "sSiIlL";
+	    char *natstr = "sSiIlL";
 
 	    if (strchr(natstr, type)) {
 #ifdef NATINT_PACK
@@ -1385,14 +1429,17 @@ pack_unpack(str, fmt)
 	    break;
 
 	  case 'Z':
+	    if (len > send - s) len = send - s;
 	    {
-		char *t = s;
+		long end = len;
+		char *t = s + len - 1;
 
-		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;
+		while (t >= s) {
+		    if (*t) break;
+		    t--; len--;
+		}
+		rb_ary_push(ary, infected_str_new(s, len, str));
+		s += end;
 	    }
 	    break;
 
@@ -1402,6 +1449,7 @@ pack_unpack(str, fmt)
 	    s += len;
 	    break;
 
+
 	  case 'b':
 	    {
 		VALUE bitstr;
@@ -1510,7 +1558,9 @@ pack_unpack(str, fmt)
 	    while (len-- > 0) {
 		short tmp = 0;
 		memcpy(OFF16(&tmp), s, NATINT_LEN(short,2));
-		EXTEND16(tmp);
+#if SIZEOF_SHORT != SIZE16
+		if (!natint) tmp = EXTEND16(tmp);
+#endif
 		s += NATINT_LEN(short,2);
 		rb_ary_push(ary, INT2FIX(tmp));
 	    }
@@ -1555,7 +1605,9 @@ pack_unpack(str, fmt)
 	    while (len-- > 0) {
 		long tmp = 0;
 		memcpy(OFF32(&tmp), s, NATINT_LEN(long,4));
-		EXTEND32(tmp);
+#if SIZEOF_LONG != SIZE32
+		if (!natint) tmp = EXTEND32(tmp);
+#endif
 		s += NATINT_LEN(long,4);
 		rb_ary_push(ary, LONG2NUM(tmp));
 	    }
@@ -1582,8 +1634,7 @@ pack_unpack(str, fmt)
 	    }
 	    PACK_ITEM_ADJUST();
 	    break;
-
-	  case 'Q':
+	case 'Q':
 	    PACK_LENGTH_ADJUST_SIZE(QUAD_SIZE);
 	    while (len-- > 0) {
 		char *tmp = (char*)s;
@@ -1596,7 +1647,7 @@ pack_unpack(str, fmt)
 	    PACK_LENGTH_ADJUST(unsigned short,2);
 	    while (len-- > 0) {
 		unsigned short tmp = 0;
-		memcpy(OFF16B(&tmp), s, NATINT_LEN(unsigned short,2));
+		memcpy(OFF16(&tmp), s, NATINT_LEN(unsigned short,2));
 		s += NATINT_LEN(unsigned short,2);
 		rb_ary_push(ary, UINT2NUM(ntohs(tmp)));
 	    }
@@ -1607,7 +1658,7 @@ pack_unpack(str, fmt)
 	    PACK_LENGTH_ADJUST(unsigned long,4);
 	    while (len-- > 0) {
 		unsigned long tmp = 0;
-		memcpy(OFF32B(&tmp), s, NATINT_LEN(unsigned long,4));
+		memcpy(OFF32(&tmp), s, NATINT_LEN(unsigned long,4));
 		s += NATINT_LEN(unsigned long,4);
 		rb_ary_push(ary, ULONG2NUM(ntohl(tmp)));
 	    }
@@ -1804,27 +1855,20 @@ pack_unpack(str, fmt)
 		    }
 		}
 		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++;
+		    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;
 		    *ptr++ = a << 2 | b >> 4;
 		    *ptr++ = b << 4 | c >> 2;
 		    *ptr++ = c << 6 | d;
+		    s += 4;
 		}
 		if (a != -1 && b != -1) {
-		    if (c == -1 && *s == '=')
+		    if (s + 2 < send && s[2] == '=')
 			*ptr++ = a << 2 | b >> 4;
-		    else if (c != -1 && *s == '=') {
+		    if (c != -1 && s + 3 < send && s[3] == '=') {
 			*ptr++ = a << 2 | b >> 4;
 			*ptr++ = b << 4 | c >> 2;
 		    }
@@ -1844,8 +1888,6 @@ pack_unpack(str, fmt)
 		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;
@@ -1884,8 +1926,8 @@ pack_unpack(str, fmt)
 
 	  case 'P':
 	    if (sizeof(char *) <= send - s) {
-		VALUE tmp = Qnil;
 		char *t;
+		VALUE tmp;
 
 		memcpy(&t, s, sizeof(char *));
 		s += sizeof(char *);
@@ -1900,12 +1942,8 @@ pack_unpack(str, fmt)
 		    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;
+			    if (len > RSTRING(*p)->len) {
+				len = RSTRING(*p)->len;
 			    }
 			    break;
 			}
@@ -1914,6 +1952,10 @@ pack_unpack(str, fmt)
 		    if (p == pend) {
 			rb_raise(rb_eArgError, "non associated pointer");
 		    }
+		    tmp = rb_tainted_str_new(t, len);
+		}
+		else {
+		    tmp = Qnil;
 		}
 		rb_ary_push(ary, tmp);
 	    }
@@ -1926,7 +1968,7 @@ pack_unpack(str, fmt)
 		if (send - s < sizeof(char *))
 		    break;
 		else {
-		    VALUE tmp = Qnil;
+		    VALUE tmp;
 		    char *t;
 
 		    memcpy(&t, s, sizeof(char *));
@@ -1942,7 +1984,6 @@ pack_unpack(str, fmt)
 			pend = p + RARRAY(a)->len;
 			while (p < pend) {
 			    if (TYPE(*p) == T_STRING && RSTRING(*p)->ptr == t) {
-				tmp = *p;
 				break;
 			    }
 			    p++;
@@ -1950,6 +1991,11 @@ pack_unpack(str, fmt)
 			if (p == pend) {
 			    rb_raise(rb_eArgError, "non associated pointer");
 			}
+			tmp = rb_str_new2(t);
+			OBJ_INFECT(tmp, str);
+		    }
+		    else {
+			tmp = Qnil;
 		    }
 		    rb_ary_push(ary, tmp);
 		}
@@ -1959,7 +2005,7 @@ pack_unpack(str, fmt)
 	  case 'w':
 	    {
 		unsigned long ul = 0;
-		unsigned long ulmask = 0xfeUL << ((sizeof(unsigned long) - 1) * 8);
+		unsigned long ulmask = 0xfeL << ((sizeof(unsigned long) - 1) * 8);
 
 		while (len > 0 && s < send) {
 		    ul <<= 7;
@@ -2041,10 +2087,10 @@ uv_to_utf8(buf, uv)
 	buf[5] = (uv&0x3f)|0x80;
 	return 6;
     }
-    rb_raise(rb_eRangeError, "pack(U): value out of range");
+    rb_raise(rb_eArgError, "pack(U): value out of range");
 }
 
-static const unsigned long utf8_limits[] = {
+static const long utf8_limits[] = {
     0x0,			/* 1 */
     0x80,			/* 2 */
     0x800,			/* 3 */
diff --git a/parse.y b/parse.y
index 08c0323724..75b0cba312 100644
--- a/parse.y
+++ b/parse.y
@@ -13,10 +13,6 @@
 %{
 
 #define YYDEBUG 1
-#define YYERROR_VERBOSE 1
-#ifndef YYSTACK_USE_ALLOCA
-#define YYSTACK_USE_ALLOCA 0
-#endif
 
 #include "ruby.h"
 #include "env.h"
@@ -27,19 +23,6 @@
 #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
@@ -83,11 +66,11 @@ 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_END,			/* newline significant, +/- is a operator. */
+    EXPR_ARG,			/* newline significant, +/- is a operator. */
+    EXPR_CMDARG,		/* newline significant, +/- is a operator. */
+    EXPR_ENDARG,		/* newline significant, +/- is a operator. */
+    EXPR_MID,			/* newline significant, +/- is a operator. */
     EXPR_FNAME,			/* ignore newline, no reserved words. */
     EXPR_DOT,			/* right after `.' or `::', no reserved words. */
     EXPR_CLASS,			/* immediate after `class', no here document. */
@@ -122,7 +105,6 @@ 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();
@@ -185,7 +167,7 @@ static void top_local_setup();
 
 #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 SIGN_EXTEND(x,n) (((1<<(n))-1-((x)&~(~0<<(n))))^~(~0<<(n)))
 #define nd_func u1.id
 #if SIZEOF_SHORT == 2
 #define nd_term(node) ((signed short)(node)->u2.id)
@@ -195,8 +177,6 @@ static void top_local_setup();
 #define nd_paren(node) (char)((node)->u2.id >> CHAR_BIT*2)
 #define nd_nest u3.id
 
-#define NEW_BLOCK_VAR(b, v) NEW_NODE(NODE_BLOCK_PASS, 0, b, v)
-
 /* 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. */
@@ -278,13 +258,12 @@ static void top_local_setup();
 %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> f_arglist f_args f_optarg f_opt f_block_arg opt_f_block_arg
 %type <node> assoc_list assocs assoc undef_list backref string_dvar
-%type <node> for_var block_var opt_block_var block_par
-%type <node> brace_block cmd_brace_block do_block lhs none fitem
+%type <node> block_var opt_block_var brace_block cmd_brace_block do_block lhs none
 %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 <id>   fitem variable sym symbol operation operation2 operation3
+%type <id>   cname fname op f_rest_arg
 %type <num>  f_norm_arg f_arg
 %token tUPLUS 		/* unary+ */
 %token tUMINUS 		/* unary- */
@@ -409,7 +388,7 @@ stmts		: none
 		    }
 		| error stmt
 		    {
-			$$ = remove_begin($2);
+			$$ = $2;
 		    }
 		;
 
@@ -439,7 +418,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| stmt kIF_MOD expr_value
 		    {
-			$$ = NEW_IF(cond($3), remove_begin($1), 0);
+			$$ = NEW_IF(cond($3), $1, 0);
 		        fixpos($$, $3);
 			if (cond_negative(&$$->nd_cond)) {
 		            $$->nd_else = $$->nd_body;
@@ -448,7 +427,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| stmt kUNLESS_MOD expr_value
 		    {
-			$$ = NEW_UNLESS(cond($3), remove_begin($1), 0);
+			$$ = NEW_UNLESS(cond($3), $1, 0);
 		        fixpos($$, $3);
 			if (cond_negative(&$$->nd_cond)) {
 		            $$->nd_body = $$->nd_else;
@@ -481,8 +460,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| stmt kRESCUE_MOD stmt
 		    {
-			NODE *resq = NEW_RESBODY(0, remove_begin($3), 0);
-			$$ = NEW_RESCUE(remove_begin($1), resq, 0);
+			$$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0);
 		    }
 		| klBEGIN
 		    {
@@ -508,6 +486,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| lhs '=' command_call
 		    {
+			value_expr($3);
 			$$ = node_assign($1, $3);
 		    }
 		| mlhs '=' command_call
@@ -546,8 +525,9 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
                         NODE *args;
 
 			value_expr($6);
-			if (!$3) $3 = NEW_ZARRAY();
-			args = arg_concat($6, $3);
+		        args = NEW_LIST($6);
+			$3 = list_append($3, NEW_NIL());
+			list_concat(args, $3);
 			if ($5 == tOROP) {
 			    $5 = 0;
 			}
@@ -918,17 +898,10 @@ fname		: tIDENTIFIER
 		    }
 		;
 
-fsym		: fname
+fitem		: fname
 		| symbol
 		;
 
-fitem		: fsym
-		    {
-			$$ = NEW_LIT(ID2SYM($1));
-		    }
-		| dsym
-		;
-
 undef_list	: fitem
 		    {
 			$$ = NEW_UNDEF($1);
@@ -973,7 +946,7 @@ reswords	: k__LINE__ | k__FILE__  | klBEGIN | klEND
 		| kFOR | kIN | kMODULE | kNEXT | kNIL | kNOT
 		| kOR | kREDO | kRESCUE | kRETRY | kRETURN | kSELF | kSUPER
 		| kTHEN | kTRUE | kUNDEF | kWHEN | kYIELD
-		| kIF | kUNLESS | kWHILE | kUNTIL
+		| kIF_MOD | kUNLESS_MOD | kWHILE_MOD | kUNTIL_MOD | kRESCUE_MOD
 		;
 
 arg		: lhs '=' arg
@@ -1014,8 +987,9 @@ arg		: lhs '=' arg
                         NODE *args;
 
 			value_expr($6);
-			if (!$3) $3 = NEW_ZARRAY();
-			args = arg_concat($6, $3);
+			args = NEW_LIST($6);
+			$3 = list_append($3, NEW_NIL());
+			list_concat(args, $3);
 			if ($5 == tOROP) {
 			    $5 = 0;
 			}
@@ -1080,27 +1054,13 @@ arg		: lhs '=' 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);
-			}
+			$$ = 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);
-			}
+			$$ = NEW_DOT3($1, $3);
 		    }
 		| arg '+' arg
 		    {
@@ -1249,6 +1209,7 @@ arg_value	: arg
 aref_args	: none
 		| command opt_nl
 		    {
+		        rb_warn("parenthesize argument(s) for future version");
 			$$ = NEW_LIST($1);
 		    }
 		| args trailer
@@ -1281,10 +1242,12 @@ paren_args	: '(' none ')'
 		    }
 		| '(' 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);
 		    }
 		;
@@ -1295,6 +1258,7 @@ opt_paren_args	: none
 
 call_args	: command
 		    {
+		        rb_warn("parenthesize argument(s) for future version");
 			$$ = NEW_LIST($1);
 		    }
 		| args opt_block_arg
@@ -1470,10 +1434,7 @@ primary		: literal
 		  bodystmt
 		  kEND
 		    {
-			if ($3 == NULL)
-			    $$ = NEW_NIL();
-			else
-			    $$ = NEW_BEGIN($3);
+			$$ = NEW_BEGIN($3);
 			nd_set_line($$, $<num>1);
 		    }
 		| tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} opt_nl ')'
@@ -1483,8 +1444,7 @@ primary		: literal
 		    }
 		| tLPAREN compstmt ')'
 		    {
-			if (!$2) $$ = NEW_NIL();
-			else $$ = $2;
+			$$ = $2;
 		    }
 		| primary_value tCOLON2 tCONSTANT
 		    {
@@ -1500,7 +1460,6 @@ primary		: literal
 			    $$ = NEW_FCALL(tAREF, $3);
 			else
 			    $$ = NEW_CALL($1, tAREF, $3);
-			fixpos($$, $1);
 		    }
 		| tLBRACK aref_args ']'
 		    {
@@ -1540,7 +1499,6 @@ primary		: literal
 		    {
 			$2->nd_iter = NEW_FCALL($1, 0);
 			$$ = $2;
-			fixpos($2->nd_iter, $2);
 		    }
 		| method_call
 		| method_call brace_block
@@ -1588,7 +1546,7 @@ primary		: literal
 			    nd_set_type($$, NODE_UNTIL);
 			}
 		    }
-		| kUNTIL {COND_PUSH(1);} expr_value do {COND_POP();}
+		| kUNTIL {COND_PUSH(1);} expr_value do {COND_POP();} 
 		  compstmt
 		  kEND
 		    {
@@ -1613,7 +1571,7 @@ primary		: literal
 		    {
 			$$ = $4;
 		    }
-		| kFOR for_var kIN {COND_PUSH(1);} expr_value do {COND_POP();}
+		| kFOR block_var kIN {COND_PUSH(1);} expr_value do {COND_POP();}
 		  compstmt
 		  kEND
 		    {
@@ -1685,7 +1643,6 @@ primary		: literal
 		  bodystmt
 		  kEND
 		    {
-			if (!$5) $5 = NEW_NIL();
 			$$ = NEW_DEFN($2, $4, $5, NOEX_PRIVATE);
 		        fixpos($$, $4);
 		        local_pop();
@@ -1760,91 +1717,22 @@ opt_else	: none
 		    }
 		;
 
-for_var 	: lhs
+block_var	: lhs
 		| mlhs
 		;
 
-block_par	: mlhs_item
-		    {
-			$$ = NEW_LIST($1);
-		    }
-		| block_par ',' mlhs_item
-		    {
-			$$ = list_append($1, $3);
-		    }
-		;
-
-block_var	: block_par
-		    {
-			if ($1->nd_alen == 1) {
-			    $$ = $1->nd_head;
-			    rb_gc_force_recycle((VALUE)$1);
-			}
-			else {
-			    $$ = NEW_MASGN($1, 0);
-			}
-		    }
-		| block_par ','
-		    {
-			$$ = NEW_MASGN($1, 0);
-		    }
-		| block_par ',' tAMPER lhs
-		    {
-			$$ = NEW_BLOCK_VAR($4, NEW_MASGN($1, 0));
-		    }
-		| block_par ',' tSTAR lhs ',' tAMPER lhs
-		    {
-			$$ = NEW_BLOCK_VAR($7, NEW_MASGN($1, $4));
-		    }
-		| block_par ',' tSTAR ',' tAMPER lhs
-		    {
-			$$ = NEW_BLOCK_VAR($6, NEW_MASGN($1, -1));
-		    }
-		| block_par ',' tSTAR lhs
-		    {
-			$$ = NEW_MASGN($1, $4);
-		    }
-		| block_par ',' tSTAR
-		    {
-			$$ = NEW_MASGN($1, -1);
-		    }
-		| tSTAR lhs ',' tAMPER lhs
-		    {
-			$$ = NEW_BLOCK_VAR($5, NEW_MASGN(0, $2));
-		    }
-		| tSTAR ',' tAMPER lhs
-		    {
-			$$ = NEW_BLOCK_VAR($4, NEW_MASGN(0, -1));
-		    }
-		| tSTAR lhs
-		    {
-			$$ = NEW_MASGN(0, $2);
-		    }
-		| tSTAR
-		    {
-			$$ = NEW_MASGN(0, -1);
-		    }
-		| tAMPER lhs
-		    {
-			$$ = NEW_BLOCK_VAR($2, (NODE*)1);
-		    }
-		;
-
 opt_block_var	: none
 		| '|' /* none */ '|'
 		    {
 			$$ = (NODE*)1;
-			command_start = Qtrue;
 		    }
 		| tOROP
 		    {
 			$$ = (NODE*)1;
-			command_start = Qtrue;
 		    }
 		| '|' block_var '|'
 		    {
 			$$ = $2;
-			command_start = Qtrue;
 		    }
 		;
 
@@ -2173,14 +2061,10 @@ string_content	: tSTRING_CONTENT
 			$<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);
@@ -2212,23 +2096,15 @@ 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) {
+				if (strlen(RSTRING($$->nd_lit)->ptr) == RSTRING($$->nd_lit)->len) {
 				    $$->nd_lit = ID2SYM(rb_intern(RSTRING($$->nd_lit)->ptr));
 				    nd_set_type($$, NODE_LIT);
 				    break;
@@ -2302,7 +2178,6 @@ f_arglist	: '(' f_args opt_nl ')'
 		    {
 			$$ = $2;
 			lex_state = EXPR_BEG;
-		        command_start = Qtrue;
 		    }
 		| f_args term
 		    {
@@ -2316,7 +2191,7 @@ f_args		: f_arg ',' f_optarg ',' f_rest_arg opt_f_block_arg
 		    }
 		| f_arg ',' f_optarg opt_f_block_arg
 		    {
-			$$ = block_append(NEW_ARGS($1, $3, 0), $4);
+			$$ = block_append(NEW_ARGS($1, $3, -1), $4);
 		    }
 		| f_arg ',' f_rest_arg opt_f_block_arg
 		    {
@@ -2324,7 +2199,7 @@ f_args		: f_arg ',' f_optarg ',' f_rest_arg opt_f_block_arg
 		    }
 		| f_arg opt_f_block_arg
 		    {
-			$$ = block_append(NEW_ARGS($1, 0, 0), $2);
+			$$ = block_append(NEW_ARGS($1, 0, -1), $2);
 		    }
 		| f_optarg ',' f_rest_arg opt_f_block_arg
 		    {
@@ -2332,7 +2207,7 @@ f_args		: f_arg ',' f_optarg ',' f_rest_arg opt_f_block_arg
 		    }
 		| f_optarg opt_f_block_arg
 		    {
-			$$ = block_append(NEW_ARGS(0, $1, 0), $2);
+			$$ = block_append(NEW_ARGS(0, $1, -1), $2);
 		    }
 		| f_rest_arg opt_f_block_arg
 		    {
@@ -2340,11 +2215,11 @@ f_args		: f_arg ',' f_optarg ',' f_rest_arg opt_f_block_arg
 		    }
 		| f_block_arg
 		    {
-			$$ = block_append(NEW_ARGS(0, 0, 0), $1);
+			$$ = block_append(NEW_ARGS(0, 0, -1), $1);
 		    }
 		| /* none */
 		    {
-			$$ = NEW_ARGS(0, 0, 0);
+			$$ = NEW_ARGS(0, 0, -1);
 		    }
 		;
 
@@ -2413,19 +2288,11 @@ f_rest_arg	: restarg_mark tIDENTIFIER
 			    yyerror("rest argument must be local variable");
 			else if (local_id($2))
 			    yyerror("duplicate rest argument name");
-			if (dyna_in_block()) {
-			    rb_dvar_push($2, Qnil);
-			}
-			$$ = assignable($2, 0);
+			$$ = local_cnt($2);
 		    }
 		| restarg_mark
 		    {
-			if (dyna_in_block()) {
-			    $$ = NEW_DASGN_CURR(internal_id(), 0);
-			}
-			else {
-			    $$ = NEW_NODE(NODE_LASGN,0,0,local_append(0));
-			}
+			$$ = -2;
 		    }
 		;
 
@@ -2452,8 +2319,13 @@ opt_f_block_arg	: ',' f_block_arg
 
 singleton	: var_ref
 		    {
-			$$ = $1;
-			value_expr($$);
+			if (nd_type($1) == NODE_SELF) {
+			    $$ = NEW_SELF();
+			}
+			else {
+			    $$ = $1;
+		            value_expr($$);
+			}
 		    }
 		| '(' {lex_state = EXPR_BEG;} expr opt_nl ')'
 		    {
@@ -2551,10 +2423,6 @@ terms		: term
 none		: /* none */ {$$ = 0;}
 		;
 %%
-#ifdef yystacksize
-#undef YYMALLOC
-#endif
-
 #include "regex.h"
 #include "util.h"
 
@@ -2587,9 +2455,7 @@ static int
 yyerror(msg)
     const char *msg;
 {
-    const int max_line_margin = 30;
-    const char *p, *pe;
-    char *buf;
+    char *p, *pe, *buf;
     int len, i;
 
     rb_compile_error("%s", msg);
@@ -2608,32 +2474,17 @@ yyerror(msg)
 
     len = pe - p;
     if (len > 4) {
-	char *p2;
-	const char *pre = "", *post = "";
-
-	if (len > max_line_margin * 2 + 10) {
-	    int re_mbc_startpos _((const char *, int, int, int));
-	    if ((len = lex_p - p) > max_line_margin) {
-		p = p + re_mbc_startpos(p, len, len - max_line_margin, 0);
-		pre = "...";
-	    }
-	    if ((len = pe - lex_p) > max_line_margin) {
-		pe = lex_p + re_mbc_startpos(lex_p, len, max_line_margin, 1);
-		post = "...";
-	    }
-	    len = pe - p;
-	}
 	buf = ALLOCA_N(char, len+2);
 	MEMCPY(buf, p, char, len);
 	buf[len] = '\0';
-	rb_compile_error_append("%s%s%s", pre, buf, post);
+	rb_compile_error_append("%s", buf);
 
 	i = lex_p - p;
-	p2 = buf; pe = buf + len;
+	p = buf; pe = p + len;
 
-	while (p2 < pe) {
-	    if (*p2 != '\t') *p2 = ' ';
-	    p2++;
+	while (p < pe) {
+	    if (*p != '\t') *p = ' ';
+	    p++;
 	}
 	buf[i] = '^';
 	buf[i+1] = '\0';
@@ -2644,14 +2495,12 @@ yyerror(msg)
 }
 
 static int heredoc_end;
+static int command_start = Qtrue;
 
 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)
@@ -2670,8 +2519,11 @@ yycompile(f, line)
 	hash = rb_const_get(rb_cObject, rb_intern("SCRIPT_LINES__"));
 	if (TYPE(hash) == T_HASH) {
 	    fname = rb_str_new2(f);
-	    ruby_debug_lines = rb_ary_new();
-	    rb_hash_aset(hash, fname, ruby_debug_lines);
+	    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);
@@ -2684,7 +2536,6 @@ yycompile(f, line)
 
     ruby__end__seen = 0;
     ruby_eval_tree = 0;
-    ruby_eval_tree_begin = 0;
     heredoc_end = 0;
     lex_strterm = 0;
     ruby_current_node = 0;
@@ -2695,7 +2546,7 @@ yycompile(f, line)
     ruby_in_compile = 0;
     cond_stack = 0;
     cmdarg_stack = 0;
-    command_start = 1;
+    command_start = 1;		  
     class_nest = 0;
     in_single = 0;
     in_def = 0;
@@ -2710,7 +2561,7 @@ yycompile(f, line)
 	rb_gc_force_recycle((VALUE)tmp);
     }
     if (n == 0) node = ruby_eval_tree;
-    if (ruby_nerrs) ruby_eval_tree_begin = 0;
+    else ruby_eval_tree_begin = 0;
     return node;
 }
 
@@ -2959,7 +2810,8 @@ read_escape()
 }
 
 static int
-tokadd_escape()
+tokadd_escape(term)
+    int term;
 {
     int c;
 
@@ -3024,7 +2876,7 @@ tokadd_escape()
 	tokadd('\\'); tokadd('c');
       escaped:
 	if ((c = nextc()) == '\\') {
-	    return tokadd_escape();
+	    return tokadd_escape(term);
 	}
 	else if (c == -1) goto eof;
 	tokadd(c);
@@ -3036,7 +2888,8 @@ tokadd_escape()
 	return -1;
 
       default:
-        tokadd('\\');
+	if (c != '\\' || c != term)
+	    tokadd('\\');
 	tokadd(c);
     }
     return 0;
@@ -3112,7 +2965,7 @@ static void
 dispose_string(str)
     VALUE str;
 {
-    xfree(RSTRING(str)->ptr);
+    free(RSTRING(str)->ptr);
     rb_gc_force_recycle(str);
 }
 
@@ -3156,7 +3009,7 @@ tokadd_string(func, term, paren, nest)
 	      default:
 		if (func & STR_FUNC_REGEXP) {
 		    pushback(c);
-		    if (tokadd_escape() < 0)
+		    if (tokadd_escape(term) < 0)
 			return -1;
 		    continue;
 		}
@@ -3440,7 +3293,6 @@ yylex()
     register int c;
     int space_seen = 0;
     int cmd_state;
-    enum lex_state last_state;
 
     if (lex_strterm) {
 	int token;
@@ -3593,7 +3445,7 @@ yylex()
 	if (c == '<' &&
 	    lex_state != EXPR_END &&
 	    lex_state != EXPR_DOT &&
-	    lex_state != EXPR_ENDARG &&
+	    lex_state != EXPR_ENDARG && 
 	    lex_state != EXPR_CLASS &&
 	    (!IS_ARG() || space_seen)) {
 	    int token = heredoc_identifier();
@@ -4231,7 +4083,6 @@ yylex()
 	COND_PUSH(0);
 	CMDARG_PUSH(0);
 	lex_state = EXPR_BEG;
-	if (c != tLBRACE) command_start = Qtrue;
 	return c;
 
       case '\\':
@@ -4282,13 +4133,13 @@ yylex()
 		return tSTRING_BEG;
 
 	      case 'W':
-		lex_strterm = NEW_STRTERM(str_dword, term, paren);
+		lex_strterm = NEW_STRTERM(str_dquote | STR_FUNC_QWORDS, term, paren);
 		do {c = nextc();} while (ISSPACE(c));
 		pushback(c);
 		return tWORDS_BEG;
 
 	      case 'w':
-		lex_strterm = NEW_STRTERM(str_sword, term, paren);
+		lex_strterm = NEW_STRTERM(str_squote | STR_FUNC_QWORDS, term, paren);
 		do {c = nextc();} while (ISSPACE(c));
 		pushback(c);
 		return tQWORDS_BEG;
@@ -4329,7 +4180,6 @@ yylex()
 	return '%';
 
       case '$':
-	last_state = lex_state;
 	lex_state = EXPR_END;
 	newtok();
 	c = nextc();
@@ -4372,13 +4222,7 @@ yylex()
 	    tokadd('$');
 	    tokadd(c);
 	    c = nextc();
-	    if (is_identchar(c)) {
-		tokadd(c);
-	    }
-	    else {
-		pushback(c);
-	    }
-	  gvar:
+	    tokadd(c);
 	    tokfix();
 	    yylval.id = rb_intern(tok());
 	    /* xxx shouldn't check if valid option variable */
@@ -4388,11 +4232,6 @@ yylex()
 	  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;
 
@@ -4405,7 +4244,6 @@ yylex()
 		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;
@@ -4435,7 +4273,6 @@ yylex()
 	    else {
 		rb_compile_error("`@@%c' is not allowed as a class variable name", c);
 	    }
-	    return 0;
 	}
 	if (!is_identchar(c)) {
 	    pushback(c);
@@ -4485,7 +4322,6 @@ yylex()
     {
 	int result = 0;
 
-	last_state = lex_state;
 	switch (tok()[0]) {
 	  case '$':
 	    lex_state = EXPR_END;
@@ -4524,7 +4360,7 @@ yylex()
 	    }
 
 	    if (lex_state != EXPR_DOT) {
-		const struct kwtable *kw;
+		struct kwtable *kw;
 
 		/* See if it is a reserved word.  */
 		kw = rb_reserved_word(tok(), toklen());
@@ -4533,10 +4369,8 @@ yylex()
 		    lex_state = kw->state;
 		    if (state == EXPR_FNAME) {
 			yylval.id = rb_intern(kw->name);
-			return kw->id[0];
 		    }
 		    if (kw->id[0] == kDO) {
-			command_start = Qtrue;
 			if (COND_P()) return kDO_COND;
 			if (CMDARG_P() && state != EXPR_CMDARG)
 			    return kDO_BLOCK;
@@ -4572,7 +4406,6 @@ yylex()
 	}
 	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;
 	}
@@ -4619,13 +4452,10 @@ newline_node(node)
 {
     NODE *nl = 0;
     if (node) {
-	int line;
 	if (nd_type(node) == NODE_NEWLINE) return node;
-	line = nd_line(node);
-	node = remove_begin(node);
-	nl = NEW_NEWLINE(node);
-	nd_set_line(nl, line);
-	nl->nd_nth = line;
+        nl = NEW_NEWLINE(node);
+        fixpos(nl, node);
+        nl->nd_nth = nd_line(node);
     }
     return nl;
 }
@@ -4648,7 +4478,7 @@ parser_warning(node, mesg)
 {
     int line = ruby_sourceline;
     ruby_sourceline = nd_line(node);
-    rb_warning("%s", mesg);
+    rb_warning(mesg);
     ruby_sourceline = line;
 }
 
@@ -4659,7 +4489,7 @@ parser_warn(node, mesg)
 {
     int line = ruby_sourceline;
     ruby_sourceline = nd_line(node);
-    rb_warn("%s", mesg);
+    rb_warn(mesg);
     ruby_sourceline = line;
 }
 
@@ -4682,7 +4512,7 @@ block_append(head, tail)
 	parser_warning(h, "unused literal ignored");
 	return tail;
       default:
-	h = end = NEW_BLOCK(head);
+	end = NEW_BLOCK(head);
 	end->nd_end = end;
 	fixpos(end, head);
 	head = end;
@@ -4718,7 +4548,7 @@ block_append(head, tail)
 	tail->nd_end = tail;
     }
     end->nd_next = tail;
-    h->nd_end = tail->nd_end;
+    head->nd_end = tail->nd_end;
     return head;
 }
 
@@ -4812,7 +4642,6 @@ literal_concat(head, tail)
       case NODE_EVSTR:
 	if (htype == NODE_STR) {
 	    nd_set_type(head, NODE_DSTR);
-	    head->nd_alen = 1;
 	}
 	list_append(head, tail);
 	break;
@@ -4954,8 +4783,6 @@ gettable(id)
     return 0;
 }
 
-static VALUE dyna_var_lookup _((ID id));
-
 static NODE*
 assignable(id, val)
     ID id;
@@ -4984,7 +4811,7 @@ assignable(id, val)
 	if (rb_dvar_curr(id)) {
 	    return NEW_DASGN_CURR(id, val);
 	}
-	else if (dyna_var_lookup(id)) {
+	else if (rb_dvar_defined(id)) {
 	    return NEW_DASGN(id, val);
 	}
 	else if (local_id(id) || !dyna_in_block()) {
@@ -5178,7 +5005,7 @@ static void
 void_expr0(node)
     NODE *node;
 {
-    const char *useless = 0;
+    char *useless = 0;
 
     if (!RTEST(ruby_verbose)) return;
 
@@ -5280,7 +5107,7 @@ void_stmts(node)
 
     for (;;) {
 	if (!node->nd_next) return;
-	void_expr0(node->nd_head);
+	void_expr(node->nd_head);
 	node = node->nd_next;
     }
 }
@@ -5425,10 +5252,11 @@ static NODE*
 cond0(node)
     NODE *node;
 {
-    if (node == 0) return 0;
+    enum node_type type = nd_type(node);
+
     assign_in_cond(node);
 
-    switch (nd_type(node)) {
+    switch (type) {
       case NODE_DSTR:
       case NODE_EVSTR:
       case NODE_STR:
@@ -5452,8 +5280,8 @@ cond0(node)
       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);
+	if (type == NODE_DOT2) nd_set_type(node,NODE_FLIP2);
+	else if (type == 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);
@@ -5706,11 +5534,11 @@ local_pop()
     struct local_vars *local = lvtbl->prev;
 
     if (lvtbl->tbl) {
-	if (!lvtbl->nofree) xfree(lvtbl->tbl);
+	if (!lvtbl->nofree) free(lvtbl->tbl);
 	else lvtbl->tbl[0] = lvtbl->cnt;
     }
     ruby_dyna_vars = lvtbl->dyna_vars;
-    xfree(lvtbl);
+    free(lvtbl);
     lvtbl = local;
 }
 
@@ -5818,34 +5646,15 @@ top_local_setup()
 		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);
+		free(ruby_scope->local_tbl);
 	    }
-            ruby_scope->local_vars[-1] = 0; /* no reference needed */
+	    ruby_scope->local_vars[-1] = 0;
 	    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()
 {
@@ -5880,9 +5689,7 @@ dyna_init(node, pre)
 
     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);
-	}
+	var = NEW_DASGN_CURR(post->id, var);
     }
     return block_append(var, node);
 }
@@ -5890,11 +5697,7 @@ dyna_init(node, pre)
 int
 ruby_parser_stack_on_heap()
 {
-#if defined(YYMALLOC)
-    (void)rb_parser_realloc;
-    (void)rb_parser_calloc;
-    (void)nodetype;
-    (void)nodeline;
+#if defined(YYBISON) && !defined(C_ALLOCA)
     return Qfalse;
 #else
     return Qtrue;
@@ -5904,12 +5707,6 @@ ruby_parser_stack_on_heap()
 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);
@@ -5949,7 +5746,7 @@ rb_parser_while_loop(chop, split)
 
 static struct {
     ID token;
-    const char *name;
+    char *name;
 } op_tbl[] = {
     {tDOT2,	".."},
     {tDOT3,	"..."},
@@ -6011,114 +5808,6 @@ 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;
@@ -6135,7 +5824,8 @@ rb_intern(name)
     switch (*name) {
       case '$':
 	id |= ID_GLOBAL;
-	if (is_special_global_name(++m)) goto new_id;
+	m++;
+	if (!is_identchar(*m)) m++;
 	break;
       case '@':
 	if (name[1] == '@') {
@@ -6148,7 +5838,7 @@ rb_intern(name)
 	m++;
 	break;
       default:
-	if (name[0] != '_' && ISASCII(name[0]) && !ISALNUM(name[0])) {
+	if (name[0] != '_' && !ISALPHA(name[0]) && !ismbchar(name[0])) {
 	    /* operators */
 	    int i;
 
@@ -6182,13 +5872,10 @@ rb_intern(name)
 	}
 	break;
     }
-    if (!ISDIGIT(*m)) {
-	while (m <= name + last && is_identchar(*m)) {
-	    m += mbclen(*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);
@@ -6197,15 +5884,14 @@ rb_intern(name)
     return id;
 }
 
-const char *
+char *
 rb_id2name(id)
     ID id;
 {
-    const char *name;
-    st_data_t data;
+    char *name;
 
     if (id < tLAST_TOKEN) {
-	int i;
+	int i = 0;
 
 	for (i=0; op_tbl[i].token; i++) {
 	    if (op_tbl[i].token == id)
@@ -6213,8 +5899,8 @@ rb_id2name(id)
 	}
     }
 
-    if (st_lookup(sym_rev_tbl, id, &data))
-	return (char *)data;
+    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;
@@ -6247,22 +5933,6 @@ symbols_i(key, value, ary)
     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()
 {
@@ -6370,71 +6040,3 @@ rb_lastline_set(val)
 	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) != 0) {
-	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/prec.c b/prec.c
index 7b215fba09..8f28648715 100644
--- a/prec.c
+++ b/prec.c
@@ -16,21 +16,6 @@ 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;
@@ -38,14 +23,6 @@ prec_prec(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;
@@ -55,14 +32,6 @@ prec_prec_i(x)
     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;
@@ -72,19 +41,6 @@ prec_prec_f(x)
     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;
@@ -94,15 +50,6 @@ prec_induced_from(module, x)
     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;
@@ -119,13 +66,6 @@ prec_included(module, include)
     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()
diff --git a/process.c b/process.c
index 0d16bb6e43..4311032367 100644
--- a/process.c
+++ b/process.c
@@ -42,7 +42,7 @@ struct timeval rb_time_interval _((VALUE));
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif
-#ifdef HAVE_SYS_RESOURCE_H
+#ifdef HAVE_GETPRIORITY
 # include <sys/resource.h>
 #endif
 #include "st.h"
@@ -91,16 +91,9 @@ static VALUE S_Tms;
 #define HAVE_44BSD_SETGID 1
 #endif
 
-#ifdef __NetBSD__
-#undef HAVE_SETRUID
-#undef HAVE_SETRGID
-#endif
-
-#ifdef BROKEN_SETREUID
-#define setreuid ruby_setreuid
-#endif
-#ifdef BROKEN_SETREGID
-#define setregid ruby_setregid
+#if defined(__MacOS_X__) || defined(__bsdi__)
+#define BROKEN_SETREUID 1
+#define BROKEN_SETREGID 1
 #endif
 
 #if defined(HAVE_44BSD_SETUID) || defined(__MacOS_X__)
@@ -112,48 +105,15 @@ static VALUE S_Tms;
 #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
@@ -161,37 +121,6 @@ get_ppid()
 #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;
 
@@ -204,20 +133,6 @@ last_status_set(status, pid)
     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;
@@ -225,14 +140,6 @@ pst_to_i(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;
@@ -240,18 +147,6 @@ pst_to_s(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;
@@ -259,14 +154,6 @@ pst_pid(st)
     return rb_iv_get(st, "pid");
 }
 
-
-/*
- *  call-seq:
- *     stat.inspect   => string
- *
- *  Override the inspection method.
- */
-
 static VALUE
 pst_inspect(st)
     VALUE st;
@@ -316,15 +203,6 @@ pst_inspect(st)
     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;
@@ -333,19 +211,6 @@ pst_equal(st1, st2)
     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;
@@ -355,19 +220,6 @@ pst_bitand(st1, 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;
@@ -377,16 +229,6 @@ pst_rshift(st1, 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;
@@ -399,15 +241,6 @@ pst_wifstopped(st)
 	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;
@@ -419,15 +252,6 @@ pst_wstopsig(st)
     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;
@@ -440,16 +264,6 @@ pst_wifsignaled(st)
 	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;
@@ -461,16 +275,6 @@ pst_wtermsig(st)
     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;
@@ -483,26 +287,6 @@ pst_wifexited(st)
 	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;
@@ -514,35 +298,6 @@ pst_wexitstatus(st)
     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;
@@ -664,65 +419,6 @@ waitall_each(pid, status, ary)
 }
 #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;
@@ -731,7 +427,6 @@ proc_wait(argc, argv)
     VALUE vpid, vflags;
     int pid, flags, status;
 
-    rb_secure(2);
     flags = 0;
     rb_scan_args(argc, argv, "02", &vpid, &vflags);
     if (argc == 0) {
@@ -751,24 +446,6 @@ proc_wait(argc, argv)
     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;
@@ -779,34 +456,12 @@ proc_wait2(argc, argv)
     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) {
@@ -818,7 +473,7 @@ proc_waitall()
 	if (pid == -1) {
 	    if (errno == ECHILD)
 		break;
-	    if (errno == EINTR) {
+            if (errno == EINTR) {
 		rb_thread_schedule();
 		continue;
 	    }
@@ -843,75 +498,29 @@ proc_waitall()
 }
 
 static VALUE
-detach_process_watcher(arg)
-    void *arg;
+detach_process_watcer(pid_p)
+    int *pid_p;
 {
-    int pid = (int)(VALUE)arg, status;
+    int cpid, status;
 
-    while (rb_waitpid(pid, &status, WNOHANG) == 0) {
+    for (;;) {
+	cpid = rb_waitpid(*pid_p, &status, WNOHANG);
+	if (cpid == -1) return Qnil;
 	rb_thread_sleep(1);
     }
-    return rb_last_status;
 }
 
 VALUE
 rb_detach_process(pid)
     int pid;
 {
-    return rb_thread_create(detach_process_watcher, (void*)(VALUE)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).
- *
- *  The waiting thread returns the exit status of the detached process
- *  when it terminates, so you can use <code>Thread#join</code> to
- *  know the result.  If specified _pid_ is not a valid child process
- *  ID, the thread returns +nil+ immediately.
- *
- *  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)
+    return rb_thread_create(detach_process_watcer, (void*)&pid);
+}
+
+static VALUE
+proc_detach(obj, pid)
+    VALUE pid;
 {
-    rb_secure(2);
     return rb_detach_process(NUM2INT(pid));
 }
 
@@ -991,7 +600,7 @@ proc_exec_v(argv, prog)
 #endif /* MSDOS or __human68k__ or __EMX__ */
     before_exec();
     execv(prog, argv);
-    preserving_errno(after_exec());
+    after_exec();
     return -1;
 }
 
@@ -1024,11 +633,9 @@ int
 rb_proc_exec(str)
     const char *str;
 {
-#ifndef _WIN32
     const char *s = str;
     char *ss, *t;
     char **argv, **a;
-#endif
 
     while (*str && ISSPACE(*str))
 	str++;
@@ -1062,7 +669,7 @@ rb_proc_exec(str)
 #else
 	    before_exec();
 	    execl("/bin/sh", "sh", "-c", str, (char *)NULL);
-	    preserving_errno(after_exec());
+	    after_exec();
 #endif
 #endif
 	    return -1;
@@ -1071,8 +678,8 @@ rb_proc_exec(str)
     a = argv = ALLOCA_N(char*, (s-str)/2+2);
     ss = ALLOCA_N(char, s-str+1);
     strcpy(ss, str);
-    if ((*a++ = strtok(ss, " \t")) != 0) {
-	while ((t = strtok(NULL, " \t")) != 0) {
+    if (*a++ = strtok(ss, " \t")) {
+	while (t = strtok(NULL, " \t")) {
 	    *a++ = t;
 	}
 	*a = NULL;
@@ -1091,9 +698,7 @@ proc_spawn_v(argv, prog)
     char **argv;
     char *prog;
 {
-#if defined(__human68k__)
     char *extension;
-#endif
     int status;
 
     if (!prog)
@@ -1149,13 +754,13 @@ proc_spawn_n(argc, argv, prog)
     args = ALLOCA_N(char*, argc + 1);
     for (i = 0; i < argc; i++) {
 	SafeStringValue(argv[i]);
-	args[i] = StringValueCStr(argv[i]);
+	args[i] = RSTRING(argv[i])->ptr;
     }
     if (prog)
 	SafeStringValue(prog);
     args[i] = (char*) 0;
     if (args[0])
-	return proc_spawn_v(args, prog ? StringValueCStr(prog) : 0);
+	return proc_spawn_v(args, prog ? RSTRING(prog)->ptr : 0);
     return -1;
 }
 
@@ -1170,7 +775,7 @@ proc_spawn(sv)
     int status;
 
     SafeStringValue(sv);
-    str = s = StringValueCStr(sv);
+    str = s = RSTRING(sv)->ptr;
     for (s = str; *s; s++) {
 	if (*s != ' ' && !ISALPHA(*s) && strchr("*?{}[]<>()~&|\\$;'`\"\n",*s)) {
 	    char *shell = dln_find_exe("sh", 0);
@@ -1193,78 +798,6 @@ proc_spawn(sv)
 #endif
 #endif
 
-struct rb_exec_arg {
-    int argc;
-    VALUE *argv;
-    VALUE prog;
-};
-
-static void
-proc_prepare_args(e, argc, argv, prog)
-    struct rb_exec_arg *e;
-    int argc;
-    VALUE *argv;
-    VALUE prog;
-{
-    int i;
-
-    MEMZERO(e, struct rb_exec_arg, 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);
-    e->prog = prog;
-    e->argc = argc;
-    e->argv = argv;
-}
-
-static VALUE
-proc_exec_args(earg)
-    VALUE earg;
-{
-    struct rb_exec_arg *e = (struct rb_exec_arg *)earg;
-    int argc = e->argc;
-    VALUE *argv = e->argv;
-    VALUE prog = e->prog;
-
-    if (argc == 1 && prog == 0) {
-	return (VALUE)rb_proc_exec(RSTRING(argv[0])->ptr);
-    }
-    else {
-	return (VALUE)proc_exec_n(argc, argv, prog);
-    }
-}
-
-/*
- *  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;
@@ -1272,10 +805,8 @@ rb_f_exec(argc, argv)
 {
     VALUE prog = 0;
     VALUE tmp;
-    struct rb_exec_arg earg;
 
     if (argc == 0) {
-	rb_last_status = Qnil;
 	rb_raise(rb_eArgError, "wrong number of arguments");
     }
 
@@ -1285,37 +816,22 @@ rb_f_exec(argc, argv)
 	    rb_raise(rb_eArgError, "wrong first argument");
 	}
 	prog = RARRAY(tmp)->ptr[0];
-	argv[0] = RARRAY(tmp)->ptr[1];
 	SafeStringValue(prog);
+	argv[0] = RARRAY(tmp)->ptr[1];
+    }
+    if (argc == 1 && prog == 0) {
+	VALUE cmd = argv[0];
+
+	SafeStringValue(cmd);
+	rb_proc_exec(RSTRING(cmd)->ptr);
+    }
+    else {
+	proc_exec_n(argc, argv, prog);
     }
-    proc_prepare_args(&earg, argc, argv, prog);
-    proc_exec_args((VALUE)&earg);
     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;
@@ -1324,12 +840,6 @@ rb_f_fork(obj)
     int pid;
 
     rb_secure(2);
-
-#ifndef __VMS
-    fflush(stdout);
-    fflush(stderr);
-#endif
-
     switch (pid = fork()) {
       case 0:
 #ifdef linux
@@ -1356,18 +866,6 @@ rb_f_fork(obj)
 #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;
@@ -1399,22 +897,12 @@ rb_f_exit_bang(argc, argv, obj)
     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)) = 0;
-#endif
-#ifdef SIGQUIT
-    RETSIGTYPE (*qfunc)_((int)) = 0;
-#endif
-    RETSIGTYPE (*ifunc)_((int)) = 0;
+    RETSIGTYPE (*hfunc)_((int)), (*qfunc)_((int)), (*ifunc)_((int));
     int status;
     int i, hooked = Qfalse;
 
@@ -1446,25 +934,6 @@ rb_syswait(pid)
     }
 }
 
-/*
- *  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;
@@ -1513,7 +982,7 @@ rb_f_system(argc, argv)
     if (argc == 1 && prog == 0) {
 #if defined(_WIN32)
 	SafeStringValue(argv[0]);
-	status = do_spawn(P_WAIT, StringValueCStr(argv[0]));
+	status = do_spawn(P_WAIT, RSTRING(argv[0])->ptr);
 #else
 	status = proc_spawn(argv[0]);
 #endif
@@ -1521,11 +990,10 @@ rb_f_system(argc, argv)
     else {
 	status = proc_spawn_n(argc, argv, prog);
     }
-#if !defined(_WIN32)
-    last_status_set(status == -1 ? 127 : status, 0);
+#if defined(_WIN32)
+    last_status_set(status, 0);
 #else
-    if (status == -1)
-	last_status_set(0x7f << 8, 0);
+    last_status_set(status == -1 ? 127 : status, 0);
 #endif
 #elif defined(__VMS)
     VALUE cmd;
@@ -1544,13 +1012,12 @@ rb_f_system(argc, argv)
     cmd = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
 
     SafeStringValue(cmd);
-    status = system(StringValueCStr(cmd));
+    status = system(RSTRING(cmd)->ptr);
     last_status_set((status & 0xff) << 8, 0);
 #else
     volatile VALUE prog = 0;
     int pid;
-    struct rb_exec_arg earg;
-    RETSIGTYPE (*chfunc)(int);
+    int i;
 
     fflush(stdout);
     fflush(stderr);
@@ -1566,28 +1033,37 @@ rb_f_system(argc, argv)
 	prog = RARRAY(argv[0])->ptr[0];
 	argv[0] = RARRAY(argv[0])->ptr[1];
     }
-    proc_prepare_args(&earg, argc, argv, prog);
 
-    chfunc = signal(SIGCHLD, SIG_DFL);
+    if (prog) {
+	SafeStringValue(prog);
+    }
+    for (i = 0; i < argc; i++) {
+	SafeStringValue(argv[i]);
+    }
   retry:
-    pid = fork();
-    if (pid == 0) {
-	/* child process */
-	rb_thread_atfork();
-	rb_protect(proc_exec_args, (VALUE)&earg, NULL);
+    switch (pid = fork()) {
+      case 0:
+	if (argc == 1 && prog == 0) {
+	    rb_proc_exec(RSTRING(argv[0])->ptr);
+	}
+	else {
+	    proc_exec_n(argc, argv, prog);
+	}
 	_exit(127);
-    }
-    if (pid < 0) {
+	break;			/* not reached */
+
+      case -1:
 	if (errno == EAGAIN) {
 	    rb_thread_sleep(1);
 	    goto retry;
 	}
-    }
-    else {
+	rb_sys_fail(0);
+	break;
+
+      default:
 	rb_syswait(pid);
     }
-    signal(SIGCHLD, chfunc);
-    if (pid < 0) rb_sys_fail(0);
+
     status = NUM2INT(rb_last_status);
 #endif
 
@@ -1595,23 +1071,6 @@ rb_f_system(argc, argv)
     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;
@@ -1635,30 +1094,11 @@ rb_f_sleep(argc, argv)
     return INT2FIX(end);
 }
 
-
-#if defined(SIGCLD) && !defined(SIGCHLD)
-# define SIGCHLD SIGCLD
-#endif
-
-/*
- *  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
- */
-
 static VALUE
 proc_getpgrp()
 {
-#if defined(HAVE_GETPGRP) && defined(GETPGRP_VOID)
     int pgrp;
-#endif
 
-    rb_secure(2);
 #if defined(HAVE_GETPGRP) && defined(GETPGRP_VOID)
     pgrp = getpgrp();
     if (pgrp < 0) rb_sys_fail(0);
@@ -1674,25 +1114,15 @@ proc_getpgrp()
 #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);
+  if (setpgid(0,0) < 0) rb_sys_fail(0);
 #elif defined(HAVE_SETPGRP) && defined(SETPGRP_VOID)
     if (setpgrp() < 0) rb_sys_fail(0);
 #else
@@ -1701,26 +1131,13 @@ proc_setpgrp()
     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;
+    int i = getpgid(NUM2INT(pid));
 
-    rb_secure(2);
-    i = getpgid(NUM2INT(pid));
     if (i < 0) rb_sys_fail(0);
     return INT2NUM(i);
 #else
@@ -1728,15 +1145,6 @@ proc_getpgid(obj, pid)
 #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;
@@ -1755,18 +1163,6 @@ proc_setpgid(obj, pid, pgrp)
 #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()
 {
@@ -1778,7 +1174,7 @@ proc_setsid()
     if (pid < 0) rb_sys_fail(0);
     return INT2FIX(pid);
 #elif defined(HAVE_SETPGRP) && defined(TIOCNOTTY)
-  rb_pid_t pid;
+  pid_t pid;
   int ret;
 
   rb_secure(2);
@@ -1803,24 +1199,6 @@ proc_setsid()
 #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;
@@ -1828,7 +1206,6 @@ proc_getpriority(obj, which, who)
 #ifdef HAVE_GETPRIORITY
     int prio, iwhich, iwho;
 
-    rb_secure(2);
     iwhich = NUM2INT(which);
     iwho   = NUM2INT(who);
 
@@ -1841,19 +1218,6 @@ proc_getpriority(obj, which, who)
 #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;
@@ -1874,122 +1238,13 @@ proc_setpriority(obj, which, who, prio)
 #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");
+	rb_raise(rb_eRuntimeError, "can't handle UID during evaluating the block given to the Process::UID.switch method");
     }
 }
 
@@ -1999,31 +1254,10 @@ 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");
+	rb_raise(rb_eRuntimeError, "can't handle GID during evaluating the block given to the 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;
@@ -2037,17 +1271,6 @@ p_sys_setuid(obj, id)
     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;
@@ -2061,16 +1284,6 @@ p_sys_setruid(obj, id)
     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;
@@ -2084,18 +1297,6 @@ p_sys_seteuid(obj, id)
     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;
@@ -2109,18 +1310,6 @@ p_sys_setreuid(obj, rid, eid)
     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;
@@ -2134,18 +1323,6 @@ p_sys_setresuid(obj, rid, eid, sid)
     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;
@@ -2154,15 +1331,6 @@ proc_getuid(obj)
     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;
@@ -2191,52 +1359,13 @@ proc_setuid(obj, id)
     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 int SAVED_USER_ID;
 
 static VALUE
 p_uid_change_privilege(obj, id)
     VALUE obj, id;
 {
+    extern int errno;
     int uid;
 
     check_uid_switch();
@@ -2299,13 +1428,13 @@ p_uid_change_privilege(obj, id)
 #endif
     } else { /* unprivileged user */
 #if defined(HAVE_SETRESUID)
-	if (setresuid((getuid() == uid)? -1: uid,
-		      (geteuid() == uid)? -1: uid,
+	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,
+	    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);
@@ -2372,17 +1501,6 @@ p_uid_change_privilege(obj, id)
     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;
@@ -2396,16 +1514,6 @@ p_sys_setgid(obj, id)
     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;
@@ -2419,17 +1527,6 @@ p_sys_setrgid(obj, id)
     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;
@@ -2443,18 +1540,6 @@ p_sys_setegid(obj, id)
     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;
@@ -2468,17 +1553,6 @@ p_sys_setregid(obj, rid, eid)
     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;
@@ -2492,25 +1566,11 @@ p_sys_setresgid(obj, rid, eid, sid)
     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 {
@@ -2522,18 +1582,6 @@ p_sys_issetugid(obj)
 #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;
@@ -2542,14 +1590,6 @@ proc_getgid(obj)
     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;
@@ -2562,7 +1602,7 @@ proc_setgid(obj, id)
 #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);
+    if (setrgid((GIDTYPE)gid) < 0) rb_sys_fail(0);
 #elif defined HAVE_SETGID
     {
 	if (getegid() == gid) {
@@ -2581,36 +1621,24 @@ proc_setgid(obj, id)
 
 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;
+    gid_t *groups;
     int i;
 
-    groups = ALLOCA_N(rb_gid_t, maxgroups);
+    groups = ALLOCA_N(gid_t, maxgroups);
 
     ngroups = getgroups(maxgroups, groups);
     if (ngroups == -1)
-	rb_sys_fail(0);
+        rb_sys_fail(0);
 
     ary = rb_ary_new();
     for (i = 0; i < ngroups; i++)
-	rb_ary_push(ary, INT2NUM(groups[i]));
+        rb_ary_push(ary, INT2NUM(groups[i]));
 
     return ary;
 #else
@@ -2619,26 +1647,12 @@ proc_getgroups(VALUE obj)
 #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;
+    gid_t *groups;
     int i;
     struct group *gr;
 
@@ -2646,15 +1660,15 @@ proc_setgroups(VALUE obj, VALUE ary)
 
     ngroups = RARRAY(ary)->len;
     if (ngroups > maxgroups)
-	rb_raise(rb_eArgError, "too many groups, %d max", maxgroups);
+        rb_raise(rb_eArgError, "too many groups, %d max", maxgroups);
 
-    groups = ALLOCA_N(rb_gid_t, ngroups);
+    groups = ALLOCA_N(gid_t, ngroups);
 
-    for (i = 0; i < ngroups && i < RARRAY(ary)->len; i++) {
-	VALUE g = RARRAY(ary)->ptr[i];
+    for (i = 0; i < ngroups; i++) {
+        VALUE g = RARRAY(ary)->ptr[i];
 
 	if (FIXNUM_P(g)) {
-	    groups[i] = FIX2INT(g);
+            groups[i] = FIX2INT(g);
 	}
 	else {
 	    VALUE tmp = rb_check_string_type(g);
@@ -2663,10 +1677,10 @@ proc_setgroups(VALUE obj, VALUE ary)
 		groups[i] = NUM2INT(g);
 	    }
 	    else {
-		gr = getgrnam(RSTRING(tmp)->ptr);
+		gr = getgrnam(RSTRING(g)->ptr);
 		if (gr == NULL)
-		    rb_raise(rb_eArgError,
-			     "can't find group for %s", RSTRING(tmp)->ptr);
+		    rb_raise(rb_eArgError, 
+			     "can't find group for %s", RSTRING(g)->ptr);
 		groups[i] = gr->gr_gid;
 	    }
 	}
@@ -2674,7 +1688,7 @@ proc_setgroups(VALUE obj, VALUE ary)
 
     i = setgroups(ngroups, groups);
     if (i == -1)
-	rb_sys_fail(0);
+        rb_sys_fail(0);
 
     return proc_getgroups(obj);
 #else
@@ -2683,30 +1697,12 @@ proc_setgroups(VALUE obj, VALUE ary)
 #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) {
+    if (initgroups(StringValuePtr(uname), (gid_t)NUM2INT(base_grp)) != 0) {
 	rb_sys_fail(0);
     }
     return proc_getgroups(obj);
@@ -2716,17 +1712,6 @@ proc_initgroups(obj, uname, base_grp)
 #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;
@@ -2734,17 +1719,9 @@ proc_getmaxgroups(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)
+proc_setmaxgroups(obj, val)
+    VALUE obj;
 {
     size_t  ngroups = FIX2INT(val);
 
@@ -2756,52 +1733,13 @@ proc_setmaxgroups(VALUE obj, VALUE val)
     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 int SAVED_GROUP_ID;
 
 static VALUE
 p_gid_change_privilege(obj, id)
     VALUE obj, id;
 {
+    extern int errno;
     int gid;
 
     check_gid_switch();
@@ -2865,13 +1803,13 @@ p_gid_change_privilege(obj, id)
 #endif
     } else { /* unprivileged user */
 #if defined(HAVE_SETRESGID)
-	if (setresgid((getgid() == gid)? -1: gid,
-		      (getegid() == gid)? -1: gid,
+	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,
+	    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);
@@ -2938,18 +1876,6 @@ p_gid_change_privilege(obj, id)
     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;
@@ -2958,15 +1884,6 @@ proc_geteuid(obj)
     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;
@@ -3027,21 +1944,6 @@ rb_seteuid_core(euid)
     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;
@@ -3049,19 +1951,6 @@ p_uid_grant_privilege(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;
@@ -3071,15 +1960,6 @@ proc_getegid(obj)
     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;
@@ -3141,21 +2021,6 @@ rb_setegid_core(egid)
     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;
@@ -3163,16 +2028,6 @@ p_gid_grant_privilege(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()
 {
@@ -3185,19 +2040,6 @@ p_uid_exchangeable()
 #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;
@@ -3221,16 +2063,6 @@ p_uid_exchange(obj)
     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()
 {
@@ -3243,19 +2075,6 @@ p_gid_exchangeable()
 #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;
@@ -3279,17 +2098,6 @@ p_gid_exchange(obj)
     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()
 {
@@ -3310,24 +2118,11 @@ p_uid_sw_ensure(id)
     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;
 {
+    extern int errno;
     int uid, euid;
 
     check_uid_switch();
@@ -3369,6 +2164,7 @@ static VALUE
 p_uid_switch(obj)
     VALUE obj;
 {
+    extern int errno;
     int uid, euid;
 
     check_uid_switch();
@@ -3390,18 +2186,6 @@ p_uid_switch(obj)
 #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()
 {
@@ -3421,24 +2205,11 @@ p_gid_sw_ensure(id)
     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;
 {
+    extern int errno;
     int gid, egid;
 
     check_gid_switch();
@@ -3479,6 +2250,7 @@ static VALUE
 p_gid_switch(obj)
     VALUE obj;
 {
+    extern int errno;
     int gid, egid;
 
     check_gid_switch();
@@ -3500,28 +2272,11 @@ p_gid_switch(obj)
 #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
@@ -3529,17 +2284,15 @@ rb_proc_times(obj)
 #   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));
+			 utime = rb_float_new((double)buf.tms_utime / HZ),
+			 stime = rb_float_new((double)buf.tms_stime / HZ),
+			 cutime = rb_float_new((double)buf.tms_cutime / HZ),
+			 sctime = rb_float_new((double)buf.tms_cstime / HZ));
 #else
     rb_notimplement();
 #endif
@@ -3550,12 +2303,6 @@ 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()
 {
@@ -3582,13 +2329,12 @@ Init_process()
 #endif
 #endif
 
-    rb_define_singleton_method(rb_mProcess, "exec", rb_f_exec, -1);
     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_singleton_method(rb_mProcess, "exit", rb_f_exit, -1);
+    rb_define_singleton_method(rb_mProcess, "abort", rb_f_abort, -1);
 
-    rb_define_module_function(rb_mProcess, "kill", rb_f_kill, -1); /* in signal.c */
+    rb_define_module_function(rb_mProcess, "kill", rb_f_kill, -1);
     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);
@@ -3615,7 +2361,6 @@ Init_process()
     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);
@@ -3637,56 +2382,6 @@ Init_process()
     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
-    {
-        VALUE inf = RLIM2NUM(RLIM_INFINITY), v;
-        rb_define_const(rb_mProcess, "RLIM_INFINITY", inf);
-#ifdef RLIM_SAVED_MAX
-        v = RLIM_INFINITY == RLIM_SAVED_MAX ? inf : RLIM2NUM(RLIM_SAVED_MAX);
-        rb_define_const(rb_mProcess, "RLIM_SAVED_MAX", v);
-#endif
-#ifdef RLIM_SAVED_CUR
-        v = RLIM_INFINITY == RLIM_SAVED_CUR ? inf : RLIM2NUM(RLIM_SAVED_CUR);
-        rb_define_const(rb_mProcess, "RLIM_SAVED_CUR", v);
-#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);
@@ -3717,18 +2412,26 @@ Init_process()
     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, "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_mProcUID, "eid=", "grant_privilege");
+    rb_define_alias(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, "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);
 
@@ -3748,10 +2451,15 @@ Init_process()
     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);
+    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/random.c b/random.c
index ad5558bca9..86c8198d41 100644
--- a/random.c
+++ b/random.c
@@ -12,7 +12,7 @@
 
 /* 
 This is based on trimmed version of MT19937.  To get the original version,
-contact <http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html>.
+contact <http://www.math.keio.ac.jp/~matumoto/emt.html>.
 
 The original copyright notice follows.
 
@@ -92,37 +92,6 @@ init_genrand(s)
     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()
 {
@@ -145,9 +114,9 @@ next_state()
     *p = p[M-N] ^ TWIST(p[0], state[0]);
 }
 
-/* generates a random number on [0,0xffffffff]-interval */
-unsigned long
-rb_genrand_int32(void)
+/* generates a random number on [0,1)-real-interval */
+static double
+genrand_real()
 {
     unsigned long y;
 
@@ -160,18 +129,10 @@ rb_genrand_int32(void)
     y ^= (y << 15) & 0xefc60000UL;
     y ^= (y >> 18);
 
-    return y;
+    return (double)y * (1.0/4294967296.0); 
+    /* divided by 2^32 */
 }
 
-/* generates a random number on [0,1) with 53-bit resolution*/
-double
-rb_genrand_real(void) 
-{ 
-    unsigned long a=rb_genrand_int32()>>5, b=rb_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
 
@@ -183,258 +144,55 @@ rb_genrand_real(void)
 #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;
+static int
+rand_init(seed)
+    unsigned long seed;
 {
-    volatile VALUE seed;
-    VALUE old;
-    long len;
-    unsigned long *buf;
+    static unsigned long saved_seed;
+    unsigned long old;
 
-    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;
+    init_genrand(seed);
     old = saved_seed;
     saved_seed = seed;
-    free(buf);
+
     return old;
 }
 
-static VALUE
+static unsigned long
 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);
+    return tv.tv_sec ^ tv.tv_usec ^ getpid() ^ n++;
 }
 
-/*
- *  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;
+    VALUE sd;
+    unsigned long seed, old;
 
     rb_secure(4);
-    if (rb_scan_args(argc, argv, "01", &seed) == 0) {
+    if (rb_scan_args(argc, argv, "01", &sd) == 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 |= rb_genrand_int32() << (i * 32);
-            val &= mask;
-            if (limit < val)
-                goto retry;
-        }
+    else {
+	seed = NUM2ULONG(sd);
     }
-    return val;
-}
+    old = rand_init(seed);
 
-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 = rb_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);
+    return ULONG2NUM(old);
 }
 
-/*
- *  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;
@@ -454,26 +212,18 @@ rb_f_rand(argc, argv, obj)
 	    max = (long)RFLOAT(vmax)->value;
 	    break;
 	}
-        if (RFLOAT(vmax)->value < 0)
-            vmax = rb_dbl2big(-RFLOAT(vmax)->value);
-        else
-            vmax = rb_dbl2big(RFLOAT(vmax)->value);
+	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(rb_genrand_real());
-                return LONG2NUM(limited_rand(FIX2LONG((VALUE)limit)));
-            }
-            return limited_big_rand(limit);
+	    long len = RBIGNUM(vmax)->len;
+	    double *buf = ALLOCA_N(double, len);
+
+	    while (len--) {
+		buf[len] = genrand_real();
+	    }
+	    return rb_big_rand(vmax, buf);
 	}
       case T_NIL:
 	max = 0;
@@ -481,17 +231,17 @@ rb_f_rand(argc, argv, obj)
       default:
 	vmax = rb_Integer(vmax);
 	if (TYPE(vmax) == T_BIGNUM) goto bignum;
-	/* fall through */
       case T_FIXNUM:
-	max = FIX2LONG(vmax);
+	max = NUM2LONG(vmax);
 	break;
     }
 
     if (max == 0) {
-	return rb_float_new(rb_genrand_real());
+	return rb_float_new(genrand_real());
     }
     if (max < 0) max = -max;
-    val = limited_rand(max-1);
+    val = max*genrand_real();
+
     return LONG2NUM(val);
 }
 
@@ -500,5 +250,4 @@ 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/range.c b/range.c
index 7526324da7..bd9286f096 100644
--- a/range.c
+++ b/range.c
@@ -29,7 +29,11 @@ static VALUE
 range_check(args)
     VALUE *args;
 {
-    return rb_funcall(args[0], id_cmp, 1, args[1]);
+    VALUE v;
+
+    v = rb_funcall(args[0], id_cmp, 1, args[1]);
+    if (NIL_P(v)) range_failed();
+    return Qnil;
 }
 
 static void
@@ -43,10 +47,7 @@ range_init(range, beg, end, exclude_end)
     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();
+	rb_rescue(range_check, (VALUE)args, range_failed, 0);
     }
 
     SET_EXCL(range, exclude_end);
@@ -154,13 +155,10 @@ 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;
+    if (rb_cmpint(r, a, b) <= 0) return Qtrue;
     return Qfalse;
 }
 
@@ -197,15 +195,6 @@ range_eql(range, obj)
     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;
@@ -229,15 +218,26 @@ str_step(args)
     return rb_str_upto(args[0], args[1], EXCL(args[2]));
 }
 
+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;
+}
+
 static void
 range_each_func(range, func, v, e, arg)
     VALUE range;
-    void (*func) _((VALUE, void*));
+    VALUE (*func) _((VALUE, void*));
     VALUE v, e;
     void *arg;
 {
-    int c;
-
     if (EXCL(range)) {
 	while (r_lt(v, e)) {
 	    (*func)(v, arg);
@@ -245,40 +245,19 @@ range_each_func(range, func, v, e, arg)
 	}
     }
     else {
-	while (RTEST(c = r_le(v, e))) {
+	while (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, arg)
-    VALUE i;
-    VALUE arg;
-{
-    VALUE *iter = (VALUE *)arg;
-
-    if (FIXNUM_P(iter[0])) {
-	iter[0] -= INT2FIX(1) & ~FIXNUM_FLAG;
-    }
-    else {
-	iter[0] = rb_funcall(iter[0], '-', 1, INT2FIX(1));
-    }
-    if (iter[0] == INT2FIX(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, <i>n</i> is added for each iteration.  Otherwise
+ *  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.
@@ -307,96 +286,74 @@ range_step(argc, argv, range)
     VALUE *argv;
     VALUE range;
 {
-    VALUE b, e, step, tmp;
-
-    RETURN_ENUMERATOR(range, argc, argv);
+    VALUE b, e, step;
+    long unit;
 
     b = rb_ivar_get(range, id_beg);
     e = rb_ivar_get(range, id_end);
-    if (argc == 0) {
+    if (rb_scan_args(argc, argv, "01", &step) == 0) {
 	step = INT2FIX(1);
     }
-    else {
-	rb_scan_args(argc, argv, "01", &step);
-	if (!rb_obj_is_kind_of(step, rb_cNumeric)) {
-	    step = rb_to_int(step);
-	}
-	if (rb_funcall(step, '<', 1, INT2FIX(0))) {
-	    rb_raise(rb_eArgError, "step can't be negative");
-	}
-	else if (!rb_funcall(step, '>', 1, INT2FIX(0))) {
-	    rb_raise(rb_eArgError, "step can't be 0");
-	}
-    }
 
-    if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(step)) { /* fixnums are special */
+    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, unit = FIX2LONG(step);
+	long i;
 
-	if (!EXCL(range))
-	    end += 1;
-	i = FIX2LONG(b);	
-	while (i < end) {
+	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));
-	    if (i + unit < i) break;
-	    i += unit;
-	}
-
-    }
-    else if (rb_obj_is_kind_of(b, rb_cNumeric) ||
-	     !NIL_P(rb_check_to_integer(b, "to_int")) ||
-	     !NIL_P(rb_check_to_integer(e, "to_int"))) {
-	ID op = EXCL(range) ? '<' : rb_intern("<=");
-
-	while (RTEST(rb_funcall(b, op, 1, e))) {
-	    rb_yield(b);
-	    b = rb_funcall(b, '+', 1, step);
 	}
     }
     else {
-	tmp = rb_check_string_type(b);
+	VALUE tmp = rb_check_string_type(b);
 
 	if (!NIL_P(tmp)) {
-	    VALUE args[5], iter[2];
+	    VALUE args[5];
+	    long iter[2];
 
 	    b = tmp;
-	    args[0] = e;
-	    args[1] = EXCL(range) ? Qtrue : Qfalse;
-	    iter[0] = INT2FIX(1);
-	    iter[1] = step;
-	    rb_block_call(b, rb_intern("upto"), 2, args, step_i, (VALUE)iter);
+	    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) ||
-		 !NIL_P(rb_check_to_integer(b, "to_int")) ||
-		 !NIL_P(rb_check_to_integer(e, "to_int"))) {
-	    ID c = EXCL(range) ? '<' : rb_intern("<=");
+	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 {
-	    VALUE args[2];
+	    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_raise(rb_eTypeError, "cannot iterate from %s",
 			 rb_obj_classname(b));
 	    }
-	    args[0] = INT2FIX(1);
-	    args[1] = step;
+	
+	    args[0] = 1;
+	    args[1] = unit;
 	    range_each_func(range, step_i, b, e, args);
 	}
     }
     return range;
 }
 
-static void
+static VALUE
 each_i(v, arg)
     VALUE v;
     void *arg;
 {
-    rb_yield(v);
+    return rb_yield(v);
 }
 
 /*
@@ -404,9 +361,7 @@ each_i(v, arg)
  *     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).
+ *  block.
  *     
  *     (10..15).each do |n|
  *        print n, ' '
@@ -423,13 +378,11 @@ range_each(range)
 {
     VALUE beg, end;
 
-    RETURN_ENUMERATOR(range, 0, 0);
-
     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_raise(rb_eTypeError, "cannot iterate from %s",
 		 rb_obj_classname(beg));
     }
     if (FIXNUM_P(beg) && FIXNUM_P(end)) { /* fixnums are special */
@@ -442,12 +395,12 @@ range_each(range)
 	}
     }
     else if (TYPE(beg) == T_STRING) {
-	VALUE args[5], iter[2];
+	VALUE args[5];
+	long iter[2];
 
 	args[0] = beg; args[1] = end; args[2] = range;
-	iter[0] = INT2FIX(1); iter[1] = INT2FIX(1);
-	rb_iterate((VALUE(*)_((VALUE)))str_step, (VALUE)args, step_i,
-		   (VALUE)iter);
+	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);
@@ -510,12 +463,14 @@ rb_range_beg_len(range, begp, lenp, len, err)
     }
     if (err == 0 || err == 2) {
 	if (beg > len) goto out_of_range;
-	if (end > len) end = len;
+	if (end > len)
+	    end = len;
     }
     if (end < 0) end += len;
     if (!EXCL(range)) end++;	/* include end point */
+    if (end < 0) goto out_of_range;
     len = end - beg;
-    if (len < 0) len = 0;
+    if (len < 0) goto out_of_range;
 
     *begp = beg;
     *lenp = len;
@@ -529,13 +484,6 @@ rb_range_beg_len(range, begp, lenp, len, err)
     return Qnil;
 }
 
-/*
- * call-seq:
- *   rng.to_s   => string
- *
- * Convert this range object to a printable form.
- */
-
 static VALUE
 range_to_s(range)
     VALUE range;
@@ -552,16 +500,6 @@ range_to_s(range)
     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;
@@ -578,11 +516,39 @@ range_inspect(range)
     return str;
 }
 
+static void
+member_i(v, args)
+    VALUE v;
+    VALUE *args;
+{
+    if (rb_equal(v, args[0])) {
+	args[1] = Qtrue;
+    }
+}
+
+static VALUE
+range_member(range, val)
+    VALUE range, val;
+{
+    VALUE beg, end;
+    VALUE args[2];
+
+    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, "cannot iterate from %s",
+		 rb_obj_classname(beg));
+    }
+    args[0] = val;
+    args[1] = Qfalse;
+    range_each_func(range, member_i, beg, end, args);
+    return args[1];
+}
+
 /*
  *  call-seq:
- *     rng === obj       =>  true or false
- *     rng.member?(val)  =>  true or false
- *     rng.include?(val) =>  true or false
+ *     rng === obj    => true or false
  *  
  *  Returns <code>true</code> if <i>obj</i> is an element of
  *  <i>rng</i>, <code>false</code> otherwise. Conveniently,
@@ -693,7 +659,7 @@ Init_Range()
 
     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, "member?", range_member, 1);
     rb_define_method(rb_cRange, "include?", range_include, 1);
 
     id_cmp = rb_intern("<=>");
diff --git a/re.c b/re.c
index a0ac6a84c8..29f5a89d16 100644
--- a/re.c
+++ b/re.c
@@ -13,7 +13,7 @@
 #include "re.h"
 #include <ctype.h>
 
-VALUE rb_eRegexpError;
+static VALUE rb_eRegexpError;
 
 #define BEG(no) regs->beg[no]
 #define END(no) regs->end[no]
@@ -70,15 +70,14 @@ static const char casetable[] = {
 #endif
 
 int
-rb_memcicmp(x, y, len)
-    const void *x, *y;
+rb_memcicmp(p1, p2, len)
+    char *p1, *p2;
     long len;
 {
-    const unsigned char *p1 = x, *p2 = y;
     int tmp;
 
     while (len--) {
-	if ((tmp = casetable[(unsigned)*p1++] - casetable[(unsigned)*p2++]) != 0)
+	if (tmp = casetable[(unsigned)*p1++] - casetable[(unsigned)*p2++])
 	    return tmp;
     }
     return 0;
@@ -86,7 +85,7 @@ rb_memcicmp(x, y, len)
 
 int
 rb_memcmp(p1, p2, len)
-    const void *p1, *p2;
+    char *p1, *p2;
     long len;
 {
     if (!ruby_ignorecase) {
@@ -97,16 +96,16 @@ rb_memcmp(p1, p2, len)
 
 long
 rb_memsearch(x0, m, y0, n)
-    const void *x0, *y0;
+    char *x0, *y0;
     long m, n;
 {
-    const unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
-    const unsigned char *s, *e;
+    unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
+    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))
+#define KR_REHASH(a, b, h) (((h) << 1) - ((a)<<d) + (b))
 
     if (m > n) return -1;
     s = y; e = s + n - m;
@@ -152,7 +151,6 @@ rb_memsearch(x0, m, y0, n)
     return s-y;
 }
 
-#define REG_LITERAL FL_USER5
 #define REG_CASESTATE  FL_USER0
 #define KCODE_NONE  0
 #define KCODE_EUC   FL_USER1
@@ -200,8 +198,8 @@ kcode_none(re)
 
 static int curr_kcode;
 
-void
-rb_kcode_set_option(re)
+static void
+kcode_set_option(re)
     VALUE re;
 {
     if (!FL_TEST(re, KCODE_FIXED)) return;
@@ -224,8 +222,8 @@ rb_kcode_set_option(re)
     }
 }	  
 
-void
-rb_kcode_reset_option()
+static void
+kcode_reset_option()
 {
     if (reg_kcode == curr_kcode) return;
     switch (reg_kcode) {
@@ -253,9 +251,9 @@ rb_reg_mbclen2(c, re)
 
     if (!FL_TEST(re, KCODE_FIXED))
 	return mbclen(c);
-    rb_kcode_set_option(re);
+    kcode_set_option(re);
     len = mbclen(c);
-    rb_kcode_reset_option();
+    kcode_reset_option();
     return len;
 }
 
@@ -366,16 +364,6 @@ rb_reg_desc(s, len, 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;
@@ -388,17 +376,6 @@ rb_reg_source(re)
     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;
@@ -407,27 +384,6 @@ rb_reg_inspect(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;
@@ -486,11 +442,11 @@ rb_reg_to_s(re)
 	}
 	if (*ptr == ':' && ptr[len-1] == ')') {
 	    Regexp *rp;
-	    rb_kcode_set_option(re);
+	    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();
+	    kcode_reset_option();
 	    re_free_pattern(rp);
 	}
 	if (err) {
@@ -534,14 +490,6 @@ rb_reg_raise(s, len, err, re)
 	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;
@@ -551,30 +499,6 @@ rb_reg_casefold_p(re)
     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;
@@ -583,19 +507,11 @@ rb_reg_options_m(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;
 {
-    const char *kcode;
+    char *kcode;
 
     if (FL_TEST(re, KCODE_FIXED)) {
 	switch (RBASIC(re)->flags & KCODE_MASK) {
@@ -623,7 +539,7 @@ make_regexp(s, len, flags)
     int flags;
 {
     Regexp *rp;
-    const char *err;
+    char *err;
 
     /* Handle escaped characters first. */
 
@@ -643,28 +559,12 @@ make_regexp(s, len, 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 rb_cMatch;
 
 static VALUE match_alloc _((VALUE));
 static VALUE
@@ -682,7 +582,6 @@ match_alloc(klass)
     return (VALUE)match;
 }
 
-/* :nodoc: */
 static VALUE
 match_init_copy(obj, orig)
     VALUE obj, orig;
@@ -700,19 +599,6 @@ match_init_copy(obj, orig)
     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;
@@ -720,19 +606,6 @@ match_size(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;
@@ -749,19 +622,6 @@ match_offset(match, n)
 			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;
@@ -777,19 +637,6 @@ match_begin(match, n)
     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;
@@ -846,10 +693,10 @@ rb_reg_prepare_re(re)
     }
 
     if (need_recompile) {
-	const char *err;
+	char *err;
 
 	if (FL_TEST(re, KCODE_FIXED))
-	    rb_kcode_set_option(re);
+	    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);
@@ -870,9 +717,9 @@ rb_reg_adjust_startpos(re, str, pos, reverse)
     if (may_need_recompile) rb_reg_prepare_re(re);
 
     if (FL_TEST(re, KCODE_FIXED))
-	rb_kcode_set_option(re);
+	kcode_set_option(re);
     else if (reg_kcode != curr_kcode)
-	rb_kcode_reset_option();
+	kcode_reset_option();
 
     if (reverse) {
 	range = -pos;
@@ -892,7 +739,7 @@ rb_reg_search(re, str, pos, reverse)
 {
     long result;
     VALUE match;
-    struct re_registers regs;
+    static struct re_registers regs;
     long range;
 
     if (pos > RSTRING(str)->len || pos < 0) {
@@ -904,9 +751,9 @@ rb_reg_search(re, str, pos, reverse)
     if (may_need_recompile) rb_reg_prepare_re(re);
 
     if (FL_TEST(re, KCODE_FIXED))
-	rb_kcode_set_option(re);
+	kcode_set_option(re);
     else if (reg_kcode != curr_kcode)
-	rb_kcode_reset_option();
+	kcode_reset_option();
 
     if (reverse) {
 	range = -pos;
@@ -914,12 +761,11 @@ rb_reg_search(re, str, pos, reverse)
     else {
 	range = RSTRING(str)->len - pos;
     }
-    MEMZERO(&regs, struct re_registers, 1);
     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();
+	kcode_reset_option();
 
     if (result == -2) {
 	rb_reg_raise(RREGEXP(re)->str, RREGEXP(re)->len,
@@ -927,7 +773,6 @@ rb_reg_search(re, str, pos, reverse)
     }
 
     if (result < 0) {
-	re_free_registers(&regs);
 	rb_backref_set(Qnil);
 	return result;
     }
@@ -944,7 +789,6 @@ rb_reg_search(re, str, pos, reverse)
     }
 
     re_copy_registers(RMATCH(match)->regs, &regs);
-    re_free_registers(&regs);
     RMATCH(match)->str = rb_str_new4(str);
     rb_backref_set(match);
 
@@ -1002,18 +846,6 @@ rb_reg_last_match(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;
@@ -1027,18 +859,6 @@ rb_reg_match_pre(match)
     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;
@@ -1118,33 +938,6 @@ match_array(match, start)
     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;
@@ -1152,19 +945,6 @@ match_to_a(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;
@@ -1172,26 +952,6 @@ match_captures(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;
@@ -1217,19 +977,6 @@ match_entry(match, n)
     return rb_reg_nth_match(n, match);
 }
 
-
-/*
- *  call-seq:
- *     mtch.values_at([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.values_at(0, 2, -2)   #=> ["HX1138", "X", "113"]
- */
-
 static VALUE
 match_values_at(argc, argv, match)
     int argc;
@@ -1239,18 +986,6 @@ match_values_at(argc, argv, match)
     return rb_values_at(match, RMATCH(match)->regs->num_regs, argc, argv, match_entry);
 }
 
-
-/*
- *  call-seq:
- *     mtch.select{|obj| block}   => array
- *  
- *  Returns an array containing match strings for which <em>block</em>
- *  gives <code>true</code>.  MatchData#select will be removed from Ruby 1.9.
- *     
- *     m = /(.)(.)(\d+)(\d)/.match("THX1138: The Movie")
- *     p m.select{|x| /X/ =~ x}   #=> ["HX1138", "X"]
- */
-
 static VALUE
 match_select(argc, argv, match)
     int argc;
@@ -1258,7 +993,7 @@ match_select(argc, argv, match)
     VALUE match;
 {
     if (argc > 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
     }
     else {
 	struct re_registers *regs = RMATCH(match)->regs;
@@ -1278,18 +1013,6 @@ match_select(argc, argv, match)
     }
 }
 
-
-
-/*
- *  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;
@@ -1302,17 +1025,6 @@ match_to_s(match)
     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;
@@ -1320,55 +1032,6 @@ match_string(match)
     return RMATCH(match)->str;	/* str is frozen */
 }
 
-/*
- * call-seq:
- *    mtch.inspect   => str
- *
- * Returns a printable version of <i>mtch</i>.
- *