Index: test-module-public.rb
===================================================================
--- test-module-public.rb	(revision 27)
+++ test-module-public.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module TestModulePublic
   def t_make_public(klass, *args)
Index: htree-template.rb
===================================================================
--- htree-template.rb	(revision 27)
+++ htree-template.rb	(working copy)
@@ -9,7 +9,7 @@
 
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module HTree
   class Attr < Hash
Index: mock-sendmail.rb
===================================================================
--- mock-sendmail.rb	(revision 27)
+++ mock-sendmail.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module QuickML
   class MockSendmail
Index: act-counter.rb
===================================================================
--- act-counter.rb	(revision 27)
+++ act-counter.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: htree-get.rb
===================================================================
--- htree-get.rb	(revision 27)
+++ htree-get.rb	(working copy)
@@ -10,7 +10,7 @@
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/htree-template'
 
 module HTree
Index: site-monitor.rb
===================================================================
--- site-monitor.rb	(revision 27)
+++ site-monitor.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'monitor'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: act-edit.rb
===================================================================
--- act-edit.rb	(revision 27)
+++ act-edit.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-save'
 require 'qwik/act-files'	# files_form
 
Index: util-kconv.rb
===================================================================
--- util-kconv.rb	(revision 27)
+++ util-kconv.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'kconv'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-charset'
 
 class String
Index: page-title.rb
===================================================================
--- page-title.rb	(revision 27)
+++ page-title.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class PageTitle
Index: htree-html-generator.rb
===================================================================
--- htree-html-generator.rb	(revision 27)
+++ htree-html-generator.rb	(working copy)
@@ -9,7 +9,7 @@
 
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/html-generator'
 require 'qwik/htree-generator'
 
Index: act-graphviz.rb
===================================================================
--- act-graphviz.rb	(revision 27)
+++ act-graphviz.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-text'
 
 module Qwik
Index: site-footer.rb
===================================================================
--- site-footer.rb	(revision 27)
+++ site-footer.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site-plan'
 #require 'qwik/act-date'
 
Index: password.rb
===================================================================
--- password.rb	(revision 27)
+++ password.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 require 'qwik/util-string'
 require 'qwik/server-memory'
Index: act-takahashi.rb
===================================================================
--- act-takahashi.rb	(revision 27)
+++ act-takahashi.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: qwikweb-catalog-validator.rb
===================================================================
--- qwikweb-catalog-validator.rb	(revision 27)
+++ qwikweb-catalog-validator.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/gettext'
 include Qwik
 include Qwik::GetText
Index: act-style.rb
===================================================================
--- act-style.rb	(revision 27)
+++ act-style.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: wabisabi-format-xml.rb
===================================================================
--- wabisabi-format-xml.rb	(revision 27)
+++ wabisabi-format-xml.rb	(working copy)
@@ -7,23 +7,25 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-escape'
 
-$LOAD_PATH << '../..' unless $LOAD_PATH.include?('../..')
+$LOAD_PATH << '../../ext' unless $LOAD_PATH.include?('../../ext')
 
 $have_xmlformatter_so = false
 begin
-  require 'ext/xmlformatter.so'
+  require 'xmlformatter.so'
   $have_xmlformatter_so = true
 rescue LoadError
-#  p "error"
+  #p "No extention.  Use Ruby version."
   $have_xmlformatter_so = false
 end
 
 module Qwik
   class RB_XMLFormatter
     # copied from gonzui-0.1
+    # Extend some functions by Kouichirou Eto
+
     # To eliminate costs for object creation, the following
     # strings are defined as constants. It makes format_xml
     # 1.2 times faster.
@@ -64,7 +66,6 @@
       end
 
       element = ar[0].to_s.escapeHTML
-      #qp element
 
       if element == XMLDECL # XML Declaration
 	attributes = ''
@@ -284,18 +285,34 @@
 	 [:'?xml', '1.0', 'utf-8', 'yes'])
       ok("<?xml version=\"1.0\" encoding=\"utf-8\"?><a\n/>",
 	 [[:'?xml', '1.0', 'utf-8'], [:a]])
+
+      # check_wabisabi_output
+      html = [:html,
+	[:head,
+	  [:title, 'hello']],
+	[:body,
+	  [:h1, 'hello, world!'],
+	  [:p, 'This is a ',
+	    [:a, {:href=>'hello.html'}, 'hello, world'],
+	    ' example.']]]
+      #puts html.format_xml
+      ok("<html
+><head
+><title
+>hello</title
+></head
+><body
+><h1
+>hello, world!</h1
+><p
+>This is a <a href=\"hello.html\"
+>hello, world</a
+> example.</p
+></body
+></html
+>",
+	 html)
     end
   end
 end
 
-if defined?($check) && $check
-html = [:html,
-  [:head,
-    [:title, 'hello']],
-  [:body,
-    [:h1, 'hello, world!'],
-    [:p, 'This is a ',
-      [:a, {:href=>'hello.html'}, 'hello, world'],
-      ' example.']]]
-puts html.format_xml
-end
Index: bench-emode.rb
===================================================================
--- bench-emode.rb	(revision 27)
+++ bench-emode.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/bench-module-session'
 require 'qwik/test-common'
 
Index: act-comment.rb
===================================================================
--- act-comment.rb	(revision 27)
+++ act-comment.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: util-integer.rb
===================================================================
--- util-integer.rb	(revision 27)
+++ util-integer.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 class Integer
   # 12345.commify => '12,345'
Index: wabisabi-parent.rb
===================================================================
--- wabisabi-parent.rb	(revision 27)
+++ wabisabi-parent.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module WabisabiParentModule
   def set_all_parent
Index: common-session.rb
===================================================================
--- common-session.rb	(revision 27)
+++ common-session.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: page-images.rb
===================================================================
--- page-images.rb	(revision 27)
+++ page-images.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/page-files'
 
 module Qwik
Index: act-tableform.rb
===================================================================
--- act-tableform.rb	(revision 27)
+++ act-tableform.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: dev-backup.rb
===================================================================
--- dev-backup.rb	(revision 27)
+++ dev-backup.rb	(working copy)
@@ -1,4 +1,4 @@
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Backup
Index: site-resolve.rb
===================================================================
--- site-resolve.rb	(revision 27)
+++ site-resolve.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-template'
 
 module Qwik
Index: act-qrcode.rb
===================================================================
--- act-qrcode.rb	(revision 27)
+++ act-qrcode.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/qrcode-view'
 require 'qwik/server-memory'
 require 'qwik/act-text'
Index: page-put.rb
===================================================================
--- page-put.rb	(revision 27)
+++ page-put.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-string'
 
 module Qwik
Index: act-embed-html.rb
===================================================================
--- act-embed-html.rb	(revision 27)
+++ act-embed-html.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/html-to-wabisabi'
 
 module Qwik
Index: common-response.rb
===================================================================
--- common-response.rb	(revision 27)
+++ common-response.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-describe.rb
===================================================================
--- act-describe.rb	(revision 27)
+++ act-describe.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/description'
 require 'qwik/description-ja'
 # FIXME: Load description files from all languages.
Index: wabisabi-index.rb
===================================================================
--- wabisabi-index.rb	(revision 27)
+++ wabisabi-index.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-get'
 require 'qwik/wabisabi-traverse'
 require 'qwik/wabisabi-parent'
Index: act-ring-new.rb
===================================================================
--- act-ring-new.rb	(revision 27)
+++ act-ring-new.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-ring-common'
 require 'qwik/act-ring-user'
 
Index: act-table.rb
===================================================================
--- act-table.rb	(revision 27)
+++ act-table.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-edit'
 require 'qwik/wabisabi-table'
 
Index: act-mdlb-list.rb
===================================================================
--- act-mdlb-list.rb	(revision 27)
+++ act-mdlb-list.rb	(working copy)
@@ -9,7 +9,7 @@
 
 # special mode for modulobe.com
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/modulobe'
 
 module Qwik
Index: act-emode.rb
===================================================================
--- act-emode.rb	(revision 27)
+++ act-emode.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/parser-emode'
 require 'qwik/act-include'
 
Index: site.rb
===================================================================
--- site.rb	(revision 27)
+++ site.rb	(working copy)
@@ -10,7 +10,7 @@
 require 'time'
 require 'fileutils'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/server-memory'
 require 'qwik/pages'
 require 'qwik/site-config'
Index: site-theme.rb
===================================================================
--- site-theme.rb	(revision 27)
+++ site-theme.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site'
 require 'qwik/site-config'
 
Index: parser-inline.rb
===================================================================
--- parser-inline.rb	(revision 27)
+++ parser-inline.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 #require 'qwik/util-escape'
 
 module Qwik
Index: test-ms-quopri.rb
===================================================================
--- test-ms-quopri.rb	(revision 27)
+++ test-ms-quopri.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: act-sitelog.rb
===================================================================
--- act-sitelog.rb	(revision 27)
+++ act-sitelog.rb	(working copy)
@@ -1,4 +1,4 @@
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: site-report.rb
===================================================================
--- site-report.rb	(revision 27)
+++ site-report.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/farm'
 require 'qwik/mail'
Index: action.rb
===================================================================
--- action.rb	(revision 27)
+++ action.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 # Load utils.
 require 'qwik/util-basic'
Index: test-ms-post.rb
===================================================================
--- test-ms-post.rb	(revision 27)
+++ test-ms-post.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: test-submit-forward.rb
===================================================================
--- test-submit-forward.rb	(revision 27)
+++ test-submit-forward.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-ml'
 
 class TestSubmitForward < Test::Unit::TestCase
Index: dev-js-compressor.rb
===================================================================
--- dev-js-compressor.rb	(revision 27)
+++ dev-js-compressor.rb	(working copy)
@@ -1,4 +1,4 @@
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 
 class JavaScriptCompressor
Index: request-path.rb
===================================================================
--- request-path.rb	(revision 27)
+++ request-path.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class UnknownPathException < Exception; end
Index: util-iconv.rb
===================================================================
--- util-iconv.rb	(revision 27)
+++ util-iconv.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'iconv'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-charset'
 
 class String
Index: util-filename.rb
===================================================================
--- util-filename.rb	(revision 27)
+++ util-filename.rb	(working copy)
@@ -9,7 +9,7 @@
 
 # Thanks to Mr. Shuhei Yamamoto.
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-escape'
 require 'qwik/util-charset'
 
Index: qwik-mail.rb
===================================================================
--- qwik-mail.rb	(revision 27)
+++ qwik-mail.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   # FIXME: This class is too ad hoc.
Index: act-book.rb
===================================================================
--- act-book.rb	(revision 27)
+++ act-book.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: ml-sendmail.rb
===================================================================
--- ml-sendmail.rb	(revision 27)
+++ ml-sendmail.rb	(working copy)
@@ -10,7 +10,7 @@
 
 require 'socket'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module QuickML
   class Sendmail
Index: common-date.rb
===================================================================
--- common-date.rb	(revision 27)
+++ common-date.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-time'
 
 module Qwik
Index: common-notice.rb
===================================================================
--- common-notice.rb	(revision 27)
+++ common-notice.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: test-module-ml.rb
===================================================================
--- test-module-ml.rb	(revision 27)
+++ test-module-ml.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'pp'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/testunit'
 require 'qwik/test-module-path'
 require 'qwik/test-module-session'
Index: act-backup.rb
===================================================================
--- act-backup.rb	(revision 27)
+++ act-backup.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-diff'
 
 module Qwik
Index: page.rb
===================================================================
--- page.rb	(revision 27)
+++ page.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/page-get'
 require 'qwik/page-put'
 require 'qwik/page-title'
Index: qwikweb-watchlog.rb
===================================================================
--- qwikweb-watchlog.rb	(revision 27)
+++ qwikweb-watchlog.rb	(working copy)
@@ -9,7 +9,7 @@
 
 #require 'pp'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/qp'
 require 'qwik/util-tail'
Index: act-tag.rb
===================================================================
--- act-tag.rb	(revision 27)
+++ act-tag.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-christel.rb
===================================================================
--- act-christel.rb	(revision 27)
+++ act-christel.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: tokenizer-inline.rb
===================================================================
--- tokenizer-inline.rb	(revision 27)
+++ tokenizer-inline.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'strscan'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class InlineTokenizer
Index: common-url.rb
===================================================================
--- common-url.rb	(revision 27)
+++ common-url.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'uri'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: page-get.rb
===================================================================
--- page-get.rb	(revision 27)
+++ page-get.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Page
Index: dev-bench.rb
===================================================================
--- dev-bench.rb	(revision 27)
+++ dev-bench.rb	(working copy)
@@ -11,7 +11,7 @@
 require 'optparse'
 require 'fileutils'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/bench-module-session'
 require 'qwik/test-common'
 
Index: group.rb
===================================================================
--- group.rb	(revision 27)
+++ group.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mail'
 require 'qwik/ml-config'
 require 'qwik/ml-gettext'
Index: act-monitor.rb
===================================================================
--- act-monitor.rb	(revision 27)
+++ act-monitor.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site-monitor'
 
 module Qwik
Index: check-event.rb
===================================================================
--- check-event.rb	(revision 27)
+++ check-event.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-server'
 
 if $0 == __FILE__
Index: qwikweb-adduser.rb
===================================================================
--- qwikweb-adduser.rb	(revision 27)
+++ qwikweb-adduser.rb	(working copy)
@@ -1,4 +1,4 @@
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/farm'
 
Index: util-webrick.rb
===================================================================
--- util-webrick.rb	(revision 27)
+++ util-webrick.rb	(working copy)
@@ -1,6 +1,6 @@
 require 'webrick'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module WEBrick
   class HTTPRequest
Index: test-submit-base64.rb
===================================================================
--- test-submit-base64.rb	(revision 27)
+++ test-submit-base64.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-ml'
 
 if $0 == __FILE__
Index: util-css.rb
===================================================================
--- util-css.rb	(revision 27)
+++ util-css.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class CSS
Index: site-attach.rb
===================================================================
--- site-attach.rb	(revision 27)
+++ site-attach.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 require 'qwik/page-files'
 
Index: act-history.rb
===================================================================
--- act-history.rb	(revision 27)
+++ act-history.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-backup'
 
 module Qwik
Index: mail-header.rb
===================================================================
--- mail-header.rb	(revision 27)
+++ mail-header.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mail'
 require 'qwik/mailaddress'
 require 'qwik/mail-multipart'
Index: util-pathname.rb
===================================================================
--- util-pathname.rb	(revision 27)
+++ util-pathname.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'pathname'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 class String
   def path
Index: act-attach.rb
===================================================================
--- act-attach.rb	(revision 27)
+++ act-attach.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-file'
 require 'qwik/site-attach'
 
Index: common-gettext.rb
===================================================================
--- common-gettext.rb	(revision 27)
+++ common-gettext.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/catalog-factory'
 require 'qwik/gettext'
 
Index: page-files.rb
===================================================================
--- page-files.rb	(revision 27)
+++ page-files.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'fileutils'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 require 'qwik/page-images'
 require 'qwik/util-filename'
Index: htree-diff.rb
===================================================================
--- htree-diff.rb	(revision 27)
+++ htree-diff.rb	(working copy)
@@ -11,7 +11,7 @@
 
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'diff'
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-escape'
 require 'qwik/htree-generator'
 
Index: mock-socket.rb
===================================================================
--- mock-socket.rb	(revision 27)
+++ mock-socket.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-safe'
 
 module QuickML
Index: page-wikidb.rb
===================================================================
--- page-wikidb.rb	(revision 27)
+++ page-wikidb.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 class Array
   def to_hash
Index: test-sub-quopri.rb
===================================================================
--- test-sub-quopri.rb	(revision 27)
+++ test-sub-quopri.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-ml'
 
 if $0 == __FILE__
Index: ml-processor.rb
===================================================================
--- ml-processor.rb	(revision 27)
+++ ml-processor.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-gettext'
 require 'qwik/ml-exception'
 require 'qwik/group'
Index: act-aa.rb
===================================================================
--- act-aa.rb	(revision 27)
+++ act-aa.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-ring-msg.rb
===================================================================
--- act-ring-msg.rb	(revision 27)
+++ act-ring-msg.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-ring-catalog'
 require 'qwik/act-ring-user'
 
Index: test-module-suite.rb
===================================================================
--- test-module-suite.rb	(revision 27)
+++ test-module-suite.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'optparse'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 $test = true	# Set $test before require 'qwik/test-common'
 require 'qwik/test-common'
 
Index: act-md5.rb
===================================================================
--- act-md5.rb	(revision 27)
+++ act-md5.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-charset.rb
===================================================================
--- act-charset.rb	(revision 27)
+++ act-charset.rb	(working copy)
@@ -10,7 +10,7 @@
 # $use_charset = true
 if defined?($use_charset) && $use_charset
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 # $LOAD_PATH.unshift('../../../chise/ruby/lib')
 CHISE_DIR = '/chise'
Index: group-config.rb
===================================================================
--- group-config.rb	(revision 27)
+++ group-config.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/group-db'
 
 module QuickML
Index: bench-session.rb
===================================================================
--- bench-session.rb	(revision 27)
+++ bench-session.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-common'
 
 class BenchSession < Test::Unit::TestCase
Index: html-to-wabisabi.rb
===================================================================
--- html-to-wabisabi.rb	(revision 27)
+++ html-to-wabisabi.rb	(working copy)
@@ -10,7 +10,7 @@
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/htree-to-wabisabi'
 require 'qwik/wabisabi-template'
 require 'qwik/util-string'
Index: site-url.rb
===================================================================
--- site-url.rb	(revision 27)
+++ site-url.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: check-htree-rexml.rb
===================================================================
--- check-htree-rexml.rb	(revision 27)
+++ check-htree-rexml.rb	(working copy)
@@ -10,7 +10,7 @@
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/testunit'
 
 class CheckHTree < Test::Unit::TestCase
Index: wabisabi-traverse.rb
===================================================================
--- wabisabi-traverse.rb	(revision 27)
+++ wabisabi-traverse.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-get'
 
 module WabisabiTraverseModule
Index: act-getpass.rb
===================================================================
--- act-getpass.rb	(revision 27)
+++ act-getpass.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mail'
 require 'qwik/util-sendmail'
 
Index: common-condition.rb
===================================================================
--- common-condition.rb	(revision 27)
+++ common-condition.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: test-suite-all.rb
===================================================================
--- test-suite-all.rb	(revision 27)
+++ test-suite-all.rb	(working copy)
@@ -1,4 +1,4 @@
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-suite'
 
 TestSuite.new.test_suite_all
Index: common-res.rb
===================================================================
--- common-res.rb	(revision 27)
+++ common-res.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/parser'
 require 'qwik/resolve'
 require 'qwik/page-generate'
Index: util-string.rb
===================================================================
--- util-string.rb	(revision 27)
+++ util-string.rb	(working copy)
@@ -12,7 +12,7 @@
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'base64'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 class String
   def xchomp
Index: act-monta.rb
===================================================================
--- act-monta.rb	(revision 27)
+++ act-monta.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: ml-catalog-factory.rb
===================================================================
--- ml-catalog-factory.rb	(revision 27)
+++ ml-catalog-factory.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/catalog-factory'
 
 module QuickML
Index: act-metadata.rb
===================================================================
--- act-metadata.rb	(revision 27)
+++ act-metadata.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: group-sendmail.rb
===================================================================
--- group-sendmail.rb	(revision 27)
+++ group-sendmail.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/group'
 require 'qwik/ml-sendmail'
 require 'qwik/util-integer'
Index: act-time-walker.rb
===================================================================
--- act-time-walker.rb	(revision 27)
+++ act-time-walker.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site-timeline'
 
 module Qwik
Index: ml-session.rb
===================================================================
--- ml-session.rb	(revision 27)
+++ ml-session.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-gettext'
 require 'qwik/mail'
 require 'qwik/ml-processor'
Index: bench-page.rb
===================================================================
--- bench-page.rb	(revision 27)
+++ bench-page.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/bench-module-session'
 require 'qwik/test-module-session'
 require 'qwik/pages'
Index: mail-parse.rb
===================================================================
--- mail-parse.rb	(revision 27)
+++ mail-parse.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mail'
 
 module QuickML
Index: response.rb
===================================================================
--- response.rb	(revision 27)
+++ response.rb	(working copy)
@@ -10,7 +10,7 @@
 # $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'webrick/cookie'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/wabisabi-format-xml'
 
Index: act-new.rb
===================================================================
--- act-new.rb	(revision 27)
+++ act-new.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-monitor'
 require 'qwik/page-title'
 
Index: group-member.rb
===================================================================
--- group-member.rb	(revision 27)
+++ group-member.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/group'
 
 module QuickML
Index: check-ext-css.rb
===================================================================
--- check-ext-css.rb	(revision 27)
+++ check-ext-css.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-common'
 require 'qwik/act-style'
 
Index: test-ms-member.rb
===================================================================
--- test-ms-member.rb	(revision 27)
+++ test-ms-member.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: bench-s-md5.rb
===================================================================
--- bench-s-md5.rb	(revision 27)
+++ bench-s-md5.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-common'
 require 'qwik/act-md5'
 
Index: util-charset.rb
===================================================================
--- util-charset.rb	(revision 27)
+++ util-charset.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-kconv'
 require 'qwik/util-iconv'
 
Index: config.rb
===================================================================
--- config.rb	(revision 27)
+++ config.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'optparse'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/version'
 require 'qwik/qp'
 
Index: act-under-const.rb
===================================================================
--- act-under-const.rb	(revision 27)
+++ act-under-const.rb	(working copy)
@@ -9,7 +9,7 @@
 
 # Under construction.
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: loadlib.rb
===================================================================
--- loadlib.rb	(revision 27)
+++ loadlib.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class LoadLibrary
Index: qwikweb-makesite.rb
===================================================================
--- qwikweb-makesite.rb	(revision 27)
+++ qwikweb-makesite.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/farm'
 
Index: tokenizer.rb
===================================================================
--- tokenizer.rb	(revision 27)
+++ tokenizer.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'strscan'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 #require 'qwik/tokenizer-inline'
 
 module Qwik
Index: act-login.rb
===================================================================
--- act-login.rb	(revision 27)
+++ act-login.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mail'
 require 'qwik/password'
 require 'qwik/act-httpauth'
Index: ml-memory.rb
===================================================================
--- ml-memory.rb	(revision 27)
+++ ml-memory.rb	(working copy)
@@ -1,4 +1,4 @@
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/ml-logger'
 require 'qwik/ml-catalog-factory'
Index: common-send.rb
===================================================================
--- common-send.rb	(revision 27)
+++ common-send.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: ml-sweeper.rb
===================================================================
--- ml-sweeper.rb	(revision 27)
+++ ml-sweeper.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/group'
 
 module QuickML
Index: qrcode-view.rb
===================================================================
--- qrcode-view.rb	(revision 27)
+++ qrcode-view.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/qrcode'
 require 'qwik/wabisabi-generator'
 
Index: act-basic.rb
===================================================================
--- act-basic.rb	(revision 27)
+++ act-basic.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: parser.rb
===================================================================
--- parser.rb	(revision 27)
+++ parser.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-string'
 require 'qwik/tokenizer'
 require 'qwik/parser-inline'
Index: site-group.rb
===================================================================
--- site-group.rb	(revision 27)
+++ site-group.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/group-config'
 
 module Qwik
Index: wabisabi-to-wiki.rb
===================================================================
--- wabisabi-to-wiki.rb	(revision 27)
+++ wabisabi-to-wiki.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-string'
 
 module Qwik
Index: wabisabi-generator.rb
===================================================================
--- wabisabi-generator.rb	(revision 27)
+++ wabisabi-generator.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/html-generator'
 
 module Qwik
Index: modulobe.rb
===================================================================
--- modulobe.rb	(revision 27)
+++ modulobe.rb	(working copy)
@@ -9,7 +9,7 @@
 
 # special mode for modulobe.com
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-time'
 require 'qwik/htree-to-wabisabi'
 require 'qwik/mdlb-sample'
Index: test-ms-multipart.rb
===================================================================
--- test-ms-multipart.rb	(revision 27)
+++ test-ms-multipart.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: test-ml-info.rb
===================================================================
--- test-ml-info.rb	(revision 27)
+++ test-ml-info.rb	(working copy)
@@ -12,7 +12,7 @@
 # This file is just for information.  Do not execute.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/testunit'
 require 'qwik/ml-session'
 
Index: ml-quickml-server.rb
===================================================================
--- ml-quickml-server.rb	(revision 27)
+++ ml-quickml-server.rb	(working copy)
@@ -12,7 +12,7 @@
 
 require 'fileutils'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/ml-memory'
 require 'qwik/ml-server'
Index: act-isearch.rb
===================================================================
--- act-isearch.rb	(revision 27)
+++ act-isearch.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site-index'
 require 'qwik/act-search'
 
Index: act-wysiwyg.rb
===================================================================
--- act-wysiwyg.rb	(revision 27)
+++ act-wysiwyg.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-edit'
 require 'qwik/html-to-wabisabi'
 require 'qwik/wabisabi-to-wiki'
Index: server-webrick.rb
===================================================================
--- server-webrick.rb	(revision 27)
+++ server-webrick.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-webrick'
 
 module Qwik
Index: periodic.rb
===================================================================
--- periodic.rb	(revision 27)
+++ periodic.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/site-report'
 
Index: act-mdlb-upload.rb
===================================================================
--- act-mdlb-upload.rb	(revision 27)
+++ act-mdlb-upload.rb	(working copy)
@@ -9,7 +9,7 @@
 
 # special mode for modulobe.com
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-files'
 require 'qwik/act-mdlb-list'
 
Index: wabisabi-to-htree.rb
===================================================================
--- wabisabi-to-htree.rb	(revision 27)
+++ wabisabi-to-htree.rb	(working copy)
@@ -9,7 +9,7 @@
 
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/htree-generator'
 
 module HTree
Index: test-module-server.rb
===================================================================
--- test-module-server.rb	(revision 27)
+++ test-module-server.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'open-uri'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/testunit'
 require 'qwik/config'
 #require 'qwik/server'
Index: group-sweep.rb
===================================================================
--- group-sweep.rb	(revision 27)
+++ group-sweep.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/group'
 
 module QuickML
Index: check-event2.rb
===================================================================
--- check-event2.rb	(revision 27)
+++ check-event2.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/check-event'
 
 if $0 == __FILE__
Index: common-surface.rb
===================================================================
--- common-surface.rb	(revision 27)
+++ common-surface.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-adminmenu'
 require 'qwik/wabisabi-index'
 
Index: act-textarea.rb
===================================================================
--- act-textarea.rb	(revision 27)
+++ act-textarea.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-adminmenu.rb
===================================================================
--- act-adminmenu.rb	(revision 27)
+++ act-adminmenu.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: test-ms-plan.rb
===================================================================
--- test-ms-plan.rb	(revision 27)
+++ test-ms-plan.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: act-lang.rb
===================================================================
--- act-lang.rb	(revision 27)
+++ act-lang.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-charts.rb
===================================================================
--- act-charts.rb	(revision 27)
+++ act-charts.rb	(working copy)
@@ -11,7 +11,7 @@
 # charts.php v4.1
 # Copyright (c) 2003-2005, maani.us
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 class Array
   def keys
Index: act-ring-common.rb
===================================================================
--- act-ring-common.rb	(revision 27)
+++ act-ring-common.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-ring-catalog'
 
 module Qwik
Index: ml-gettext.rb
===================================================================
--- ml-gettext.rb	(revision 27)
+++ ml-gettext.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module QuickML
   module GetText
Index: dev-release.rb
===================================================================
--- dev-release.rb	(revision 27)
+++ dev-release.rb	(working copy)
@@ -12,7 +12,7 @@
 require 'fileutils'
 include FileUtils
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/util-time'
 require 'qwik/util-pathname'
Index: act-wema.rb
===================================================================
--- act-wema.rb	(revision 27)
+++ act-wema.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-monitor'
 
 module Qwik
Index: dev-css-compressor.rb
===================================================================
--- dev-css-compressor.rb	(revision 27)
+++ dev-css-compressor.rb	(working copy)
@@ -1,4 +1,4 @@
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 
 class CSSCompressor
Index: act-typekey.rb
===================================================================
--- act-typekey.rb	(revision 27)
+++ act-typekey.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 begin
   require 'qwik/typekey'
   $have_typekey = true
@@ -155,6 +155,7 @@
     end
 
     def test_typekey
+      return if $0 != __FILE__	# just only for unit test.
       return if ! $have_typekey
 
       res = session
@@ -178,6 +179,7 @@
     end
 
     def test_verify
+      return if $0 != __FILE__	# just only for unit test.
       return if ! $have_typekey
 
       res = session
Index: act-plan.rb
===================================================================
--- act-plan.rb	(revision 27)
+++ act-plan.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site-plan'
 
 module Qwik
Index: act-presen.rb
===================================================================
--- act-presen.rb	(revision 27)
+++ act-presen.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: check-libxml.rb
===================================================================
--- check-libxml.rb	(revision 27)
+++ check-libxml.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-common'
 
 begin
Index: page-generate.rb
===================================================================
--- page-generate.rb	(revision 27)
+++ page-generate.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/tokenizer'
 require 'qwik/parser'
 require 'qwik/parser-emode'
Index: wabisabi-table.rb
===================================================================
--- wabisabi-table.rb	(revision 27)
+++ wabisabi-table.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-get'
 
 module Qwik
Index: util-sendmail.rb
===================================================================
--- util-sendmail.rb	(revision 27)
+++ util-sendmail.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'net/smtp'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mail'
 require 'qwik/util-kconv'
 
Index: db-filesystem.rb
===================================================================
--- db-filesystem.rb	(revision 27)
+++ db-filesystem.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 
 module Qwik
Index: act-ring-catalog.rb
===================================================================
--- act-ring-catalog.rb	(revision 27)
+++ act-ring-catalog.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: group-mail.rb
===================================================================
--- group-mail.rb	(revision 27)
+++ group-mail.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/group'
 
 module QuickML
Index: mail-body.rb
===================================================================
--- mail-body.rb	(revision 27)
+++ mail-body.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mail'
 
 module QuickML
Index: act-hcomment.rb
===================================================================
--- act-hcomment.rb	(revision 27)
+++ act-hcomment.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: group-db.rb
===================================================================
--- group-db.rb	(revision 27)
+++ group-db.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module QuickML
   class GroupDB
Index: test-ms-org.rb
===================================================================
--- test-ms-org.rb	(revision 27)
+++ test-ms-org.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 require 'qwik/test-module-path'
Index: act-mdlb-model.rb
===================================================================
--- act-mdlb-model.rb	(revision 27)
+++ act-mdlb-model.rb	(working copy)
@@ -9,7 +9,7 @@
 
 # special mode for modulobe.com
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/modulobe'
 
 module Qwik
Index: act-day.rb
===================================================================
--- act-day.rb	(revision 27)
+++ act-day.rb	(working copy)
@@ -9,7 +9,7 @@
 
 # Under construction.
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site-timeline'
 require 'qwik/act-time-walker'
 
Index: test-module-session.rb
===================================================================
--- test-module-session.rb	(revision 27)
+++ test-module-session.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'webrick/log'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/testunit'
 require 'qwik/test-module-path'
 require 'qwik/test-module-public'
Index: parser-emode.rb
===================================================================
--- parser-emode.rb	(revision 27)
+++ parser-emode.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 # Special mode, not for general use.
 
Index: test-submit-uuencode.rb
===================================================================
--- test-submit-uuencode.rb	(revision 27)
+++ test-submit-uuencode.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-ml'
 
 if $0 == __FILE__
Index: act-archive.rb
===================================================================
--- act-archive.rb	(revision 27)
+++ act-archive.rb	(working copy)
@@ -15,7 +15,7 @@
   $have_zip = false
 end
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-presen'
 require 'qwik/act-theme'
 
Index: act-mail.rb
===================================================================
--- act-mail.rb	(revision 27)
+++ act-mail.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-text'
 
 module Qwik
Index: mailaddress.rb
===================================================================
--- mailaddress.rb	(revision 27)
+++ mailaddress.rb	(working copy)
@@ -7,12 +7,17 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 class MailAddress
   def self.valid?(mail)
     return false if mail.nil?
-    return (/\A([0-9a-zA-Z_.+-]+)@([0-9a-zA-Z_.-]+)\z/ =~ mail) != nil
+    return false unless /\A([0-9a-zA-Z_.+-]+)@([0-9a-zA-Z_.-]+)\z/ =~ mail
+    login_part = $1
+    domain_part = $2
+    return false if domain_part.include?('..')
+    #return false if mail.include?('..')
+    return true
   end
 
   def self.obfuscate(address)
@@ -57,12 +62,14 @@
       ok_eq(true,  c.valid?("valid+@example.com"))
       ok_eq(true,  c.valid?("+valid@example.com"))
       ok_eq(true,  c.valid?('_@example.com'))
-      # Make this address valid for enabling local account.
+      ok_eq(true,  c.valid?('us..er@example.com'))
+      # Make this address valid for local account.
       ok_eq(true,  c.valid?('invalid@example'))
       ok_eq(false, c.valid?(nil))
       ok_eq(false, c.valid?(''))
       ok_eq(false, c.valid?("invalid!@example.com"))
       ok_eq(false, c.valid?('invalid'))
+      ok_eq(false, c.valid?('user@example..com'))
     end
 
     def test_obfuscate
Index: request-ua.rb
===================================================================
--- request-ua.rb	(revision 27)
+++ request-ua.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class UserAgent
Index: bench-large-table.rb
===================================================================
--- bench-large-table.rb	(revision 27)
+++ bench-large-table.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/bench-module-session'
 require 'qwik/test-module-session'
 require 'qwik/server'
Index: ml-generator.rb
===================================================================
--- ml-generator.rb	(revision 27)
+++ ml-generator.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module QuickML
   class Generator
Index: test-ms-applemail.rb
===================================================================
--- test-ms-applemail.rb	(revision 27)
+++ test-ms-applemail.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: smil-time.rb
===================================================================
--- smil-time.rb	(revision 27)
+++ smil-time.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class SmilTime < Time
Index: mock-logger.rb
===================================================================
--- mock-logger.rb	(revision 27)
+++ mock-logger.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module QuickML
   class MockLogger
Index: server.rb
===================================================================
--- server.rb	(revision 27)
+++ server.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/server-memory'
 require 'qwik/server-webrick'
Index: site-timeline.rb
===================================================================
--- site-timeline.rb	(revision 27)
+++ site-timeline.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: act-smil.rb
===================================================================
--- act-smil.rb	(revision 27)
+++ act-smil.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/tokenizer'
 require 'qwik/act-media'
 require 'qwik/smil-time'
Index: bench-textformat.rb
===================================================================
--- bench-textformat.rb	(revision 27)
+++ bench-textformat.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/bench-module-session'
 require 'qwik/test-module-session'
 require 'qwik/server'
Index: qwikweb-incgen.rb
===================================================================
--- qwikweb-incgen.rb	(revision 27)
+++ qwikweb-incgen.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/password'
 
Index: template.rb
===================================================================
--- template.rb	(revision 27)
+++ template.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 require 'qwik/wabisabi-traverse'
 
Index: wabisabi-valid.rb
===================================================================
--- wabisabi-valid.rb	(revision 27)
+++ wabisabi-valid.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-get'
 require 'qwik/util-css'
 
Index: act-code.rb
===================================================================
--- act-code.rb	(revision 27)
+++ act-code.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: logger.rb
===================================================================
--- logger.rb	(revision 27)
+++ logger.rb	(working copy)
@@ -8,7 +8,7 @@
 #
 
 require 'resolv'
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 
 module Qwik
Index: ml-msg-validator.rb
===================================================================
--- ml-msg-validator.rb	(revision 27)
+++ ml-msg-validator.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-gettext'
 
 module QuickML
Index: resolve.rb
===================================================================
--- resolve.rb	(revision 27)
+++ resolve.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/resolve-tdiary'
 require 'qwik/act-basic'
 require 'qwik/common-resolve'
Index: db-indexer.rb
===================================================================
--- db-indexer.rb	(revision 27)
+++ db-indexer.rb	(working copy)
@@ -14,7 +14,7 @@
   $have_senna_so = false
 end
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 
 module Qwik
Index: test-ms-large.rb
===================================================================
--- test-ms-large.rb	(revision 27)
+++ test-ms-large.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: test-ms-jfilename.rb
===================================================================
--- test-ms-jfilename.rb	(revision 27)
+++ test-ms-jfilename.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: act-media.rb
===================================================================
--- act-media.rb	(revision 27)
+++ act-media.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'stringio'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-generator'
 require 'qwik/act-smil'
 
Index: test-suite-basic.rb
===================================================================
--- test-suite-basic.rb	(revision 27)
+++ test-suite-basic.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-suite'
 
 testsuite = TestSuite.new
Index: act-mlsubmitform.rb
===================================================================
--- act-mlsubmitform.rb	(revision 27)
+++ act-mlsubmitform.rb	(working copy)
@@ -9,7 +9,7 @@
 
 # Thanks to Mr. Shuhei Yamamoto.
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: db-berkeley.rb
===================================================================
--- db-berkeley.rb	(revision 27)
+++ db-berkeley.rb	(working copy)
@@ -14,7 +14,7 @@
   $have_bdb_so = false
 end
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 require 'qwik/db-b-backup'
 
Index: common-pageattribute.rb
===================================================================
--- common-pageattribute.rb	(revision 27)
+++ common-pageattribute.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: wabisabi-diff.rb
===================================================================
--- wabisabi-diff.rb	(revision 27)
+++ wabisabi-diff.rb	(working copy)
@@ -11,7 +11,7 @@
 
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'diff'
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-escape'
 
 module Qwik
Index: db-backup.rb
===================================================================
--- db-backup.rb	(revision 27)
+++ db-backup.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 
 module Qwik
Index: check-xml-xpath.rb
===================================================================
--- check-xml-xpath.rb	(revision 27)
+++ check-xml-xpath.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-common'
 
 #class TestXPath < Test::Unit::TestCase
Index: act-css.rb
===================================================================
--- act-css.rb	(revision 27)
+++ act-css.rb	(working copy)
@@ -10,7 +10,7 @@
 require 'uri'
 require 'net/http'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: mdlb-sample.rb
===================================================================
--- mdlb-sample.rb	(revision 27)
+++ mdlb-sample.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-charset'
 
 module Modulobe
Index: act-album.rb
===================================================================
--- act-album.rb	(revision 27)
+++ act-album.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-theme'
 
 module Qwik
Index: site-config.rb
===================================================================
--- site-config.rb	(revision 27)
+++ site-config.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: act-html.rb
===================================================================
--- act-html.rb	(revision 27)
+++ act-html.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: test-ms-basic.rb
===================================================================
--- test-ms-basic.rb	(revision 27)
+++ test-ms-basic.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: catalog-factory.rb
===================================================================
--- catalog-factory.rb	(revision 27)
+++ catalog-factory.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 
 module Qwik
Index: act-map.rb
===================================================================
--- act-map.rb	(revision 27)
+++ act-map.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-mcomment.rb
===================================================================
--- act-mcomment.rb	(revision 27)
+++ act-mcomment.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: farm.rb
===================================================================
--- farm.rb	(revision 27)
+++ farm.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site'
 require 'qwik/util-pathname'
 
Index: act-sample.rb
===================================================================
--- act-sample.rb	(revision 27)
+++ act-sample.rb	(working copy)
@@ -11,7 +11,7 @@
 # If you'd like to check the details of qwikWeb plugin, please see URL below.
 # http://qwik.jp/HowToMakePlugin.html
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-event.rb
===================================================================
--- act-event.rb	(revision 27)
+++ act-event.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site-event'
 
 module Qwik
Index: test-ms-confirm.rb
===================================================================
--- test-ms-confirm.rb	(revision 27)
+++ test-ms-confirm.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: group-confirm.rb
===================================================================
--- group-confirm.rb	(revision 27)
+++ group-confirm.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/group'
 require 'qwik/group-db'
 
Index: util-safe.rb
===================================================================
--- util-safe.rb	(revision 27)
+++ util-safe.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 class TooLongLine < Exception; end
 
Index: common-plain.rb
===================================================================
--- common-plain.rb	(revision 27)
+++ common-plain.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: util-basic.rb
===================================================================
--- util-basic.rb	(revision 27)
+++ util-basic.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-escape'
 
 class Hash
Index: bench-bench.rb
===================================================================
--- bench-bench.rb	(revision 27)
+++ bench-bench.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/bench-module-session'
 
 class BenchBenchmark
Index: act-schedule.rb
===================================================================
--- act-schedule.rb	(revision 27)
+++ act-schedule.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-edit'
 require 'qwik/wabisabi-table'
 
Index: act-tagsearch.rb
===================================================================
--- act-tagsearch.rb	(revision 27)
+++ act-tagsearch.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-summary' # Page.get_summary()
 require 'qwik/common-plain' # c_plain()
 require 'qwik/act-tag' # self.tag_get_pages()
Index: act-httpauth.rb
===================================================================
--- act-httpauth.rb	(revision 27)
+++ act-httpauth.rb	(working copy)
@@ -10,7 +10,7 @@
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'base64'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: site-member.rb
===================================================================
--- site-member.rb	(revision 27)
+++ site-member.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: act-member.rb
===================================================================
--- act-member.rb	(revision 27)
+++ act-member.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site-member'
 
 module Qwik
Index: request-webrick.rb
===================================================================
--- request-webrick.rb	(revision 27)
+++ request-webrick.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/request'
 require 'qwik/util-charset'
 
Index: act-list.rb
===================================================================
--- act-list.rb	(revision 27)
+++ act-list.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: check-htree.rb
===================================================================
--- check-htree.rb	(revision 27)
+++ check-htree.rb	(working copy)
@@ -10,7 +10,7 @@
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/testunit'
 
 class CheckHTree < Test::Unit::TestCase
Index: site-log.rb
===================================================================
--- site-log.rb	(revision 27)
+++ site-log.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: act-text.rb
===================================================================
--- act-text.rb	(revision 27)
+++ act-text.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: wabisabi-get.rb
===================================================================
--- wabisabi-get.rb	(revision 27)
+++ wabisabi-get.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-traverse'
 
 module WabisabiGetModule
Index: group-site.rb
===================================================================
--- group-site.rb	(revision 27)
+++ group-site.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/server-memory'
 require 'qwik/farm'
Index: pages.rb
===================================================================
--- pages.rb	(revision 27)
+++ pages.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/db-filesystem'
 require 'qwik/db-backup'
 require 'qwik/db-indexer'
Index: template-generator.rb
===================================================================
--- template-generator.rb	(revision 27)
+++ template-generator.rb	(working copy)
@@ -9,7 +9,7 @@
 
 require 'pp'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 # $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)+'/../lib'))
 # $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)+'/../compat'))
 require 'qwik/config'
Index: util-icase.rb
===================================================================
--- util-icase.rb	(revision 27)
+++ util-icase.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module QuickML
   # It preserves case information. but it accepts an
Index: act-ring-invite.rb
===================================================================
--- act-ring-invite.rb	(revision 27)
+++ act-ring-invite.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-ring-common'
 require 'qwik/act-ring-user'
 
Index: act-summary.rb
===================================================================
--- act-summary.rb	(revision 27)
+++ act-summary.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: common-rewrite-plugin.rb
===================================================================
--- common-rewrite-plugin.rb	(revision 27)
+++ common-rewrite-plugin.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/parse-plugin'
 
 module Qwik
Index: act-save.rb
===================================================================
--- act-save.rb	(revision 27)
+++ act-save.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-password'
 require 'qwik/wabisabi-diff'
 require 'qwik/act-edit'
Index: act-webservice.rb
===================================================================
--- act-webservice.rb	(revision 27)
+++ act-webservice.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-pages.rb
===================================================================
--- act-pages.rb	(revision 27)
+++ act-pages.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: parse-plugin.rb
===================================================================
--- parse-plugin.rb	(revision 27)
+++ parse-plugin.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/parser'
 
 module Qwik
Index: htree-to-wabisabi.rb
===================================================================
--- htree-to-wabisabi.rb	(revision 27)
+++ htree-to-wabisabi.rb	(working copy)
@@ -10,7 +10,7 @@
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module HTree
   class Doc
Index: act-redirect.rb
===================================================================
--- act-redirect.rb	(revision 27)
+++ act-redirect.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: site-index.rb
===================================================================
--- site-index.rb	(revision 27)
+++ site-index.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: act-menu.rb
===================================================================
--- act-menu.rb	(revision 27)
+++ act-menu.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: server-memory.rb
===================================================================
--- server-memory.rb	(revision 27)
+++ server-memory.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 #require 'qwik/farm'	# Do not add farm here.
 
 module Qwik
Index: test-suite-ml.rb
===================================================================
--- test-suite-ml.rb	(revision 27)
+++ test-suite-ml.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-suite'
 
 testsuite = TestSuite.new
Index: qwikweb-server.rb
===================================================================
--- qwikweb-server.rb	(revision 27)
+++ qwikweb-server.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/loadlib'
 require 'qwik/server'
@@ -15,6 +15,8 @@
 module Qwik
   class QwikWebServer
     def self.main(args)
+      return if defined?($qwikweb_server_running) && $qwikweb_server_running
+
       File.umask(0)
 
       config = Config.new
@@ -24,6 +26,7 @@
       init_load_lib(config.lib_dir)
 
       server = Server.new(config)
+      $qwikweb_server_running = true
       server.start
     end
 
Index: check-server.rb
===================================================================
--- check-server.rb	(revision 27)
+++ check-server.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-server'
 
 if $0 == __FILE__
Index: common-plugin.rb
===================================================================
--- common-plugin.rb	(revision 27)
+++ common-plugin.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-csv-tokenizer'
 
 module Qwik
Index: act-include.rb
===================================================================
--- act-include.rb	(revision 27)
+++ act-include.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: check-act-monitor2.rb
===================================================================
--- check-act-monitor2.rb	(revision 27)
+++ check-act-monitor2.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/check-act-monitor'
 
 if $0 == __FILE__
Index: test-ms-attach.rb
===================================================================
--- test-ms-attach.rb	(revision 27)
+++ test-ms-attach.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: mail-multipart.rb
===================================================================
--- mail-multipart.rb	(revision 27)
+++ mail-multipart.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mail'
 
 module QuickML
@@ -52,7 +52,10 @@
 
     # ==================== class method
     def self.boundary(ct)
-      return $2 if /^multipart\/\w+;\s*boundary=("?)(.*)\1/i =~ ct
+     #if /^multipart\/\w+;\s*boundary=("?)(.*)\1/i =~ ct
+      if /^multipart\/\w+;/i =~ ct and /[\s;]boundary=("?)(.*)\1/i =~ ct
+	return $2 
+      end
       return nil
     end
 
@@ -99,6 +102,10 @@
 
       # test_boundary
       ok_eq('b', c.boundary("multipart/mixed; boundary=\"b\""))
+      # ref. https://www.codeblog.org/blog/ryu/?date=20060112#p01
+      # Thanks to Mr. Sato.
+      ok_eq('b', c.boundary("multipart/signed; protocol=\"TYPE/STYPE\";
+           micalg=\"MICALG\"; boundary=\"b\""))
 
       # test_split_body
       ok_eq(['body'], c.split_body('body', ''))
Index: test-common.rb
===================================================================
--- test-common.rb	(revision 27)
+++ test-common.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'pp'
 require 'qwik/qp'
 require 'qwik/testunit'
Index: db-b-backup.rb
===================================================================
--- db-b-backup.rb	(revision 27)
+++ db-b-backup.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'pathname'
 require 'qwik/db-berkeley'
 
Index: act-calc.rb
===================================================================
--- act-calc.rb	(revision 27)
+++ act-calc.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: check-act-monitor.rb
===================================================================
--- check-act-monitor.rb	(revision 27)
+++ check-act-monitor.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-server'
 
 if $0 == __FILE__
Index: site-search.rb
===================================================================
--- site-search.rb	(revision 27)
+++ site-search.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: dev-sendmail.rb
===================================================================
--- dev-sendmail.rb	(revision 27)
+++ dev-sendmail.rb	(working copy)
@@ -10,7 +10,7 @@
 
 # You can send a mail by using SMTP for check the status.
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/util-sendmail'
 require 'qwik/qwik-mail'
Index: act-search.rb
===================================================================
--- act-search.rb	(revision 27)
+++ act-search.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/site-search'
 
 module Qwik
Index: ml-server.rb
===================================================================
--- ml-server.rb	(revision 27)
+++ ml-server.rb	(working copy)
@@ -16,7 +16,7 @@
 require 'time'
 require 'net/smtp'	# FIXME: Which code are using smtp?
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/util-safe'
 require 'qwik/util-pid'
Index: act-logout.rb
===================================================================
--- act-logout.rb	(revision 27)
+++ act-logout.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: mail.rb
===================================================================
--- mail.rb	(revision 27)
+++ mail.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mail-parse'
 require 'qwik/mail-header'
 require 'qwik/mail-body'
Index: site-event.rb
===================================================================
--- site-event.rb	(revision 27)
+++ site-event.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class ListenerMaxExceed < StandardError; end
Index: gettext.rb
===================================================================
--- gettext.rb	(revision 27)
+++ gettext.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   module GetText
Index: act-file.rb
===================================================================
--- act-file.rb	(revision 27)
+++ act-file.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/page-images'
 
 module Qwik
Index: ml-logger.rb
===================================================================
--- ml-logger.rb	(revision 27)
+++ ml-logger.rb	(working copy)
@@ -10,7 +10,7 @@
 
 require 'thread'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-safe'
 require 'qwik/util-pathname'
 
Index: act-secdb.rb
===================================================================
--- act-secdb.rb	(revision 27)
+++ act-secdb.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: dev-replace.rb
===================================================================
--- dev-replace.rb	(revision 27)
+++ dev-replace.rb	(working copy)
@@ -1,34 +1,9 @@
 require 'pp'
 require 'qp'
 
-def nu29replace_line(line)
-  return line if line.include?("\\")
-  return line if line.include?('<')
-  return line if line.include?('>')
-
-  line =  line.gsub(/\"(.*?)\"/) {
-    str = $1
-    ignore = %w(ascii section EOT)
-    if ignore.include?(str)
-      "\"#{str}\""
-#   elsif /\A[A-Za-z0-9\:\.\/_ |-]+\z/ =~ str
-#   elsif /\A[A-Za-z0-9\:\._ |-]+\z/ =~ str
-#   elsif /\A[A-Za-z0-9\@\:\._ |-]+\z/ =~ str
-#   elsif /\A[A-Za-z0-9\%\*\/\@\:\._ |-]+\z/ =~ str
-#   elsif /\A[A-Za-z0-9\%\*\/\@\:\._ |-]+\z/ =~ str
-    elsif /\A[A-Za-z0-9\,\%\*\/\@\:\._ \|-]+\z/ =~ str
-      "'#{str}'"
-    else
-      "\"#{str}\""
-    end
-  }
-
-  return line
-end
-
 def replace_line(line)
-  return line.gsub(%r|assert_text\(\'(.+)\', \'title\'\)|) {
-    "ok_title('#{$1}')"
+  return line.gsub(%r|\A\$LOAD_PATH << \'\.\./\.\./lib\' unless \$LOAD_PATH\.include\?\('\.\./\.\./lib'|) {
+    "\$LOAD_PATH << '..' unless \$LOAD_PATH.include?('..'"
   }
 end
 
@@ -81,6 +56,7 @@
 end
 main
 
+=begin
 # ============================== souko
 def nu_replace_line(line)
   return line.gsub(/require \"t\/test\"/) {
@@ -255,4 +231,35 @@
   }
 end
 
+def nu29replace_line(line)
+  return line if line.include?("\\")
+  return line if line.include?('<')
+  return line if line.include?('>')
 
+  line =  line.gsub(/\"(.*?)\"/) {
+    str = $1
+    ignore = %w(ascii section EOT)
+    if ignore.include?(str)
+      "\"#{str}\""
+#   elsif /\A[A-Za-z0-9\:\.\/_ |-]+\z/ =~ str
+#   elsif /\A[A-Za-z0-9\:\._ |-]+\z/ =~ str
+#   elsif /\A[A-Za-z0-9\@\:\._ |-]+\z/ =~ str
+#   elsif /\A[A-Za-z0-9\%\*\/\@\:\._ |-]+\z/ =~ str
+#   elsif /\A[A-Za-z0-9\%\*\/\@\:\._ |-]+\z/ =~ str
+    elsif /\A[A-Za-z0-9\,\%\*\/\@\:\._ \|-]+\z/ =~ str
+      "'#{str}'"
+    else
+      "\"#{str}\""
+    end
+  }
+
+  return line
+end
+
+def replace_line(line)
+  return line.gsub(%r|assert_text\(\'(.+)\', \'title\'\)|) {
+    "ok_title('#{$1}')"
+  }
+end
+
+=end
Index: request.rb
===================================================================
--- request.rb	(revision 27)
+++ request.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/request-path'
 require 'qwik/request-ua'
Index: typekey.rb
===================================================================
--- typekey.rb	(revision 27)
+++ typekey.rb	(working copy)
@@ -179,6 +179,7 @@
     end
 
     def test_typekey
+      return if $0 != __FILE__	# just only for unit test.
       config = Qwik::Config.new
 
       sitetoken = 't'
@@ -200,6 +201,7 @@
     end
 
     def test_verify
+      return if $0 != __FILE__	# just only for unit test.
       config = Qwik::Config.new
 
       sitetoken = typekey_get_sitetoken(config)
Index: wabisabi-template.rb
===================================================================
--- wabisabi-template.rb	(revision 27)
+++ wabisabi-template.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-get'
 
 module WabisabiTemplateModule
Index: htree-generator.rb
===================================================================
--- htree-generator.rb	(revision 27)
+++ htree-generator.rb	(working copy)
@@ -10,7 +10,7 @@
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module HTree
   module GeneratorModule
Index: htree-format-xml.rb
===================================================================
--- htree-format-xml.rb	(revision 27)
+++ htree-format-xml.rb	(working copy)
@@ -10,7 +10,7 @@
 $LOAD_PATH.unshift('../../compat') unless $LOAD_PATH.include?('../../compat')
 require 'htree'
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module HTree
   module Node
Index: site-plan.rb
===================================================================
--- site-plan.rb	(revision 27)
+++ site-plan.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: test-module-path.rb
===================================================================
--- test-module-path.rb	(revision 27)
+++ test-module-path.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 
 module Qwik
Index: test-ms-close.rb
===================================================================
--- test-ms-close.rb	(revision 27)
+++ test-ms-close.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: act-ring-maker.rb
===================================================================
--- act-ring-maker.rb	(revision 27)
+++ act-ring-maker.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-ring-common'
 require 'qwik/act-ring-user'
 require 'qwik/act-ring-msg'
Index: test-submit-html-mail.rb
===================================================================
--- test-submit-html-mail.rb	(revision 27)
+++ test-submit-html-mail.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-ml'
 
 class TestSubmitHtmlMail < Test::Unit::TestCase
Index: bench-format-xml.rb
===================================================================
--- bench-format-xml.rb	(revision 27)
+++ bench-format-xml.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/bench-module-session'
 require 'qwik/wabisabi-format-xml'
 
Index: act-theme.rb
===================================================================
--- act-theme.rb	(revision 27)
+++ act-theme.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: test-submit-jfilename.rb
===================================================================
--- test-submit-jfilename.rb	(revision 27)
+++ test-submit-jfilename.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-session'
 require 'qwik/test-module-ml'
 #require 'qwik/quickml'
Index: resolve-tdiary.rb
===================================================================
--- resolve-tdiary.rb	(revision 27)
+++ resolve-tdiary.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: qwikweb-showpassword.rb
===================================================================
--- qwikweb-showpassword.rb	(revision 27)
+++ qwikweb-showpassword.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/config'
 require 'qwik/password'
 
Index: group-cond.rb
===================================================================
--- group-cond.rb	(revision 27)
+++ group-cond.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/group-db'
 
 module QuickML
Index: act-ring-user.rb
===================================================================
--- act-ring-user.rb	(revision 27)
+++ act-ring-user.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/act-ring-common'
 
 module Qwik
Index: test-ms-japanese.rb
===================================================================
--- test-ms-japanese.rb	(revision 27)
+++ test-ms-japanese.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/ml-session'
 require 'qwik/test-module-ml'
 
Index: check-uuencode.rb
===================================================================
--- check-uuencode.rb	(revision 27)
+++ check-uuencode.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/testunit'
 
 class CheckUuencode < Test::Unit::TestCase
Index: site-db.rb
===================================================================
--- site-db.rb	(revision 27)
+++ site-db.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: act-license.rb
===================================================================
--- act-license.rb	(revision 27)
+++ act-license.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: util-pid.rb
===================================================================
--- util-pid.rb	(revision 27)
+++ util-pid.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-pathname'
 
 module PidModule
Index: act-mdlb-rss.rb
===================================================================
--- act-mdlb-rss.rb	(revision 27)
+++ act-mdlb-rss.rb	(working copy)
@@ -9,7 +9,7 @@
 
 # special mode for modulobe.com
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/modulobe'
 require 'qwik/act-metadata'
 
Index: act-toc.rb
===================================================================
--- act-toc.rb	(revision 27)
+++ act-toc.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-template'
 
 module Qwik
Index: dev-calctime.rb
===================================================================
--- dev-calctime.rb	(revision 27)
+++ dev-calctime.rb	(working copy)
@@ -8,7 +8,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/util-path'
 
 def die(msg)
Index: site-pages.rb
===================================================================
--- site-pages.rb	(revision 27)
+++ site-pages.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Site
Index: test-submit-japanese.rb
===================================================================
--- test-submit-japanese.rb	(revision 27)
+++ test-submit-japanese.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/test-module-ml'
 #require 'qwik/quickml'
 
Index: common-resolve.rb
===================================================================
--- common-resolve.rb	(revision 27)
+++ common-resolve.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/wabisabi-template'
 
 module Qwik
Index: common-backtrace.rb
===================================================================
--- common-backtrace.rb	(revision 27)
+++ common-backtrace.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-password.rb
===================================================================
--- act-password.rb	(revision 27)
+++ act-password.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-files.rb
===================================================================
--- act-files.rb	(revision 27)
+++ act-files.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: act-interwiki.rb
===================================================================
--- act-interwiki.rb	(revision 27)
+++ act-interwiki.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 
 module Qwik
   class Action
Index: mdlb-model.rb
===================================================================
--- mdlb-model.rb	(revision 27)
+++ mdlb-model.rb	(working copy)
@@ -7,7 +7,7 @@
 # the GNU General Public License version 2.
 #
 
-$LOAD_PATH << '../../lib' unless $LOAD_PATH.include?('../../lib')
+$LOAD_PATH << '..' unless $LOAD_PATH.include?('..')
 require 'qwik/mdlb-sample'
 require 'qwik/htree-to-wabisabi'
 require 'qwik/util-iconv'
