--- suikawiki/script/wiki.cgi	2002/06/02 06:37:36	1.20
+++ suikawiki/script/wiki.cgi	2003/01/01 12:30:24	1.44
@@ -1,163 +1,43 @@
 #!/usr/bin/perl
-#!perl
-#
 # wiki.cgi - This is YukiWiki, yet another Wiki clone.
 #
-# Copyright (C) 2000-2002 by Hiroshi Yuki.
-# <hyuki@hyuki.com>
-# http://www.hyuki.com/yukiwiki/
-#
 # This program is free software; you can redistribute it and/or
 # modify it under the same terms as Perl itself.
-#
-##############################
-#
-# walwiki.cgi based on yukiwiki.cgi - Yet another WikiWikiWeb clone.
-#
-# WalWikiの現バージョンは、YukiWiki 2.0.beta1をベースにしています。
-# 
-# * 更新内容
-# 
-# 2.0.beta1.wal.1 on 2002/05/19,22:32:19
-# (1) Footerの変更
-# (2) WikiNameの拡張 : PerlCEも包含、PPMInstallは含まない
-# (3) 別名リンク（[別名 URL]）に対応。
-# (4) ISBNをアマゾン.jpのAsociateプログラムリンクに変換。
-# (5) [[#box:InterWikiName]]でInterWikiなテキストボックス生成
-# (6) HTMLモード対応。
-#
-# 旧2.0.alpha0.wal.3版までの修正の内、以下に変更があります。
-# ・以下はYukiWiki2に実装されたため、独自コードはなくなりました。
-#   - インラインの画像変換
-#   - YukiWikiDB対応
-#   - テーブル
-#   - DB関連モジュールuseのeval化
-#   - BracketNameによるキーからブラケットを排除
-# ・ISBN番号への対応はWalWiki2.0より、InterWikiへのAdd-Onになりました。
-#   [[ISBN http://www.amazon.co.jp/exec/obidos/ASIN/isbn($1)/walrdigi-22]]のように登録。
-#
-#=======================================
-
-# Walrus add (debug) start
-my $walrus_log;
-my $walrus_debugging = 0;
-# Walrus add (debug) end
 
-# Libraries.
 use strict;
-use lib qw(./WalWiki/lib);
-use CGI qw(:standard);
+use lib qw(./lib);
 use CGI::Carp qw(fatalsToBrowser);
-use Yuki::RSS;
+
+require 'wikidata/suikawiki-config.ph';
 use Yuki::DiffText qw(difftext);
-use Yuki::YukiWikiDB;
-use AnyDBM_File;
-require 'jcode.pl';
-# use Jcode;
 use Fcntl;
-my $version = '2.0.beta1.2002-05-29';
-my $walversion;
-##############################
-#
-# You MUST modify following '$modifier_...' variables.
-#
-my $modifier_mail = 'w@suika.fam.cx';	# Your mail address, like 'walrus@digit.que.ne.jp'.
-my $modifier_url  = 'http://suika.fam.cx/~wakaba/';	# Your web page, like 'http://digit.que.ne.jp/work/'.
-my $modifier_name = '和';	# Your name, like 'Makio Tsukamoto'.
-# my $modifier_dbtype = 'AnyDBM_File';  # Fast, not available on some server, page size limited.
-# my $modifier_dbtype = 'dbmopen';      # Fast, not available on some server, page size limited.
-my $modifier_dbtype = 'YukiWikiDB';     # Slow, available on all environment.
-# my $modifier_sendmail = '/usr/sbin/sendmail -t -n'; # Your sendmail.
-my $modifier_sendmail = ''; # If you don't need mail notification.
-my $modifier_dir_data = './wikidata'; # Your data directory.
-my $modifier_rss_title = "WalWiki $walversion";
-my $modifier_rss_link = 'http://suika.fam.cx/~wakaba/-temp/wiki2/wiki';	# Blank is not allowed.
-my $modifier_rss_description = 'This is WalWiki, yet another Wiki clone based on YukiWiki';
-##############################
-#
-# You MAY modify following variables.
-#
-my $file_touch = "$modifier_dir_data/touched.txt";
-my $file_resource = "$modifier_dir_data/resource.txt";
-my $file_FrontPage = "$modifier_dir_data/frontpage.txt";
-my $file_conflict = "$modifier_dir_data/conflict.txt";
-my $file_format = "$modifier_dir_data/format.txt";
-my $url_cgi = 'wiki';
-my $url_stylesheet = 'wiki-style.css';
-my $icontag = '<img src="/icons/folder" alt="*" width="40" height="40" />';
-my $maxrecent = 50;
-my $cols = 80;
-my $rows = 20;
-##############################
-#
-# You MAY, but do NOT NEED modify following variables.
-# 
-my $dataname = "$modifier_dir_data/wiki";
-my $infoname = "$modifier_dir_data/info";
-my $diffname = "$modifier_dir_data/diff";
-my $editchar = '?';
-my $subject_delimiter = ' - ';
-my $use_autoimg = 1; # automatically convert image URL into <img> tag.
-my $use_exists = 0; # If you can use 'exists' method for your DB.
 ##############################
-my $InterWikiName = 'InterWikiName';
-my $RecentChanges = 'RecentChanges';
-my $AdminChangePassword = 'AdminChangePassword';
-my $CompletedSuccessfully = 'CompletedSuccessfully';
-my $FrontPage = 'HomePage';
-my $IndexPage = 'IndexPage';
-my $SearchPage = 'SearchPage';
-my $CreatePage = 'CreatePage';
-my $ErrorPage = 'ErrorPage';
-my $RssPage = 'RssPage';
-my $AdminSpecialPage = 'Admin Special Page'; # must include spaces.
-##############################
-# my $wiki_name = '\b([A-Z][a-z]+([A-Z][a-z]+)+)\b';        # Walrus del (2)
-my $wiki_name   = '\b([A-Z][a-z]+([A-Z][a-z]*)+)\b';        # Walrus add (2)
-my $bracket_name = '\[\[(\S+?)\]\]';
-my $embedded_name = '\[\[(#\S+?)\]\]';
-my $interwiki_definition = '\[\[(\S+?)\ (\S+?)\]\]';
-my $interwiki_name = '([^:]+):([^:].*)';
-##############################
-my $embed_comment = '[[#comment]]';
-my $embed_rcomment = '[[#rcomment]]';
-my $embed_interwiki = '^\[\[#(box|text|password):(\S+)\]\]$';    # Walrus add (5)
+my %fmt;	## formatter objects
+my %embed_command = (
+	searched	=> '^\[\[#searched:([^\]]+)\]\]$',
+	form	=> qr/\[\[\#form(?:\(([A-Za-z0-9-]+)\))?:'((?:[^'\\]|\\.)*)':'((?:[^'\\]|\\.)*)'(?::'((?:[^'\\]|\\.)*)')?\]\]/,
+);
+our ($modifier_dbtype,$url_cgi,%uri,%PathTo,$use_exists);
+our (%PageName,$kanjicode,$lang,%fixedpage);
+
 ##############################
 my $info_LastModified = 'LastModified';
 my $info_IsFrozen = 'IsFrozen';
-my $info_AdminPassword = 'AdminPassword';
 ##############################
-my $kanjicode = 'euc';
-my $charset = 'EUC-JP';
-my $lang = 'ja';
-my %fixedpage = (
-    $IndexPage => 1,
-    $CreatePage => 1,
-    $ErrorPage => 1,
-    $RssPage => 1,
-    $RecentChanges => 1,
-    $SearchPage => 1,
-    $AdminChangePassword => 1,
-    $CompletedSuccessfully => 1,
-    #$FrontPage => 1,
-);
 my %form;
 my %database;
 my %infobase;
 my %diffbase;
-my %resource;
 my %interwiki;
 ##############################
 my %page_command = (
-    $IndexPage => 'index',
-    $SearchPage => 'searchform',
-    $CreatePage => 'create',
-    $RssPage => 'rss',
-    $AdminChangePassword => 'adminchangepasswordform',
-    #$FrontPage => 'FrontPage',
+    $PageName{IndexPage} => 'index',
+    $PageName{RssPage} => 'rss',
+    AdminChangePassword => 'adminchangepasswordform',
 );
 my %command_do = (
     read => \&do_read,
+    TEXT_CSS => \&do_output_css,
     edit => \&do_edit,
     adminedit => \&do_adminedit,
     adminchangepasswordform => \&do_adminchangepasswordform,
@@ -165,88 +45,156 @@
     write => \&do_write,
     index => \&do_index,
     searchform => \&do_searchform,
-    search => \&do_search,
-    create => \&do_create,
-    createresult => \&do_createresult,
-    FrontPage => \&do_FrontPage,
     comment => \&do_comment,
+    RandomJump	=> \&do_random_jump,
     rss => \&do_rss,
     diff => \&do_diff,
-    interwikibox => \&do_interwiki_box, # Walrus add (5)
+    wikiform	=> \&do_wikiform,
+    map	=> \&do_map,
 );
-##############################
-my @ignore_html_page = ('FrontPage');        # Walrus add (6)
-my @ignore_html_tags = ('a', 'br', 'img');   # Walrus add (6)
-my $walversion = '2.0.beta1.wal.1';          # Walrus add (1)
-##############################
-# &test_convert;
-&main;
-exit(0);
+my $UA = '';  ## User agent name
+$| = 1;
 ##############################
 
 sub main {
-    &init_resource;
+    $UA = $main::ENV{HTTP_USER_AGENT};
     &open_db;
     &init_form;
-    &init_InterWikiName;
     if ($command_do{$form{mycmd}}) {
         &{$command_do{$form{mycmd}}};
     } else {
-        &do_FrontPage;
+        &{$command_do{read}};
     }
     &close_db;
 }
 
 sub do_read {
-    &print_header($form{mypage});
-    &print_content($database{$form{mypage}});
-    &print_footer($form{mypage});
+  my $content = $database{$form{mypage}};
+  #print "content-type:text/plain;charset=euc-jp\n\n".gmtime."Get Lastmodified\n";
+  my $lm = &get_info($form{mypage}, $info_LastModified);
+  wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
+  wiki::useragent::add ($ENV{HTTP_USER_AGENT});
+  #print gmtime."Search...\n";
+  my ($r, $c) = get_search_result ($form{mypage});
+  my $rl = wiki::referer::list_html ($form{mypage});
+  my @toc;
+  push @toc, qq(-<a href="#wikipage-see-also">@{[&Resource('SeeAlso',escape=>1)]}</a>) if $c;
+  push @toc, qq(-<a href="#wikipage-referer">@{[&Resource('Referers',escape=>1)]}</a>) if $rl;
+    my $cf = 'SuikaWiki/0.9';
+    ## Should be support at least:
+    ## - 'SuikaWiki/0.9' CRLF
+    ## - 'H2H/' ("0.9" / "1.0" / "1.1") CRLF
+    ## - "/*" WSP* 'W3C-CSS/' ("1.0" / "2.0") "*/" CRLF
+    $cf = $1 if $content =~ s#^(?:/\*\s*|[\#<]\?)?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.\x0D\x0A][^\x0D\x0A]*)?)[\x0D\x0A]+##s;
+    if ($cf =~ m!^(?:\#\?)?SuikaWiki/0.9(?:$|\s)!) {
+    #print gmtime."Header...\n";
+      &print_header ($form{mypage}, -last_modified => $lm, -expires => time + 120,
+        -content_format => $cf, -noindex => ($cf =~ /obsoleted="yes"/ ? 1 : 0));
+        #print "\n". gmtime."Body...\n";
+      &print_content ($content, content_format => $cf, last_modified => $lm,
+        -toc => \@toc);
+      print &text_to_html (q([[#comment]])) if $cf !~ /obsoleted="yes"/ && !$fixedpage{$form{mypage}};
+    } else {
+      &print_header($form{mypage}, -expires => time + 120, -last_modified => $lm);
+      print "<pre>@{[&escape($content)]}</pre>";
+    }
+    if ($c) {
+      print qq{<h2 @{[&id_and_name('wikipage-see-also')]}>@{[&Resource('SeeAlso',escape=>1)]}</h2>};
+      print $r;
+    }
+    if ($rl) {
+      print qq(<div @{[&id_and_name('wikipage-referer')]}><h2>@{[&Resource('Referers',escape=>1)]}</h2>\n$rl</div>\n);
+    }
+        #print "\n". gmtime."Footer...\n";
+  &print_footer($form{mypage}, $lm);
+        #print "\n". gmtime."Fin...\n";
+}
+
+sub do_output_css {
+  wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
+  wiki::useragent::add ($ENV{HTTP_USER_AGENT});
+  my $content = $database{$form{mypage}};
+  if ($content =~ m#^\s*/\*\s*W3C-CSS#) {
+    my $lm = gmtime &get_info($form{mypage}, $info_LastModified);
+    print "Content-Type: text/css; charset=@{[&get_charset_name($kanjicode)]}\n";
+    print "Last-Modified: $lm\n";
+    print "Expires: @{[scalar gmtime time+3600]}\n";	## TODO: don't use asctime
+    print "\n";
+    print $content;
+  } else {
+    print "Status: 406 Unsupported Media Type\n";
+    &print_header('WikiPageIsNotCSS', -noindex => 1);
+    &print_content($database{WikiPageIsNotCSS});
+    &print_footer('WikiPageIsNotCSS');
+  }
+}
+
+sub id_and_name ($) {
+    my $name = shift;
+    if ($UA =~ m#Mozilla/[12]\.|Microsoft Internet Explorer#) {
+      qq{id="$name"><a name="$name"></a};
+    } else {
+	qq{id="$name"};
+    }
 }
 
 sub do_edit {
     my ($page) = &unarmor_name(&armor_name($form{mypage}));
-    &print_header($page);
     if (not &is_editable($page)) {
-        &print_message($resource{cantchange});
+        &print_header($page, -noindex => 1);
+        &print_message(&Resource('Error:ThisPageIsUneditable'));
     } elsif (&is_frozen($page)) {
-        &print_message($resource{cantchange});
+        &print_header($page, -noindex => 1);
+        &print_message(&Resource('Error:ThisPageIsUneditable'));
     } else {
+        &print_header($page, -noindex => 1, -expires => time+60);
         &print_editform($database{$page}, &get_info($page, $info_LastModified), admin=>0);
     }
+    wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
+    wiki::useragent::add ($ENV{HTTP_USER_AGENT});
+    my ($r, $c) = get_search_result ($form{mypage});
+    my $rl = wiki::referer::list_html ($form{mypage});
+    if ($c) {
+      print qq{<h2 id="wikipage-see-also">@{[&Resource('SeeAlso',escape=>1)]}</h2>};
+      print $r;
+    }
+    if ($rl) {
+      print qq(<div id="wikipage-referer"><h2>@{[&Resource('Referers',escape=>1)]}</h2>\n$rl</div>\n);
+    }
     &print_footer($page);
 }
 
 sub do_adminedit {
     my ($page) = &unarmor_name(&armor_name($form{mypage}));
-    &print_header($page);
+    &print_header($page, -noindex => 1);
     if (not &is_editable($page)) {
-        &print_message($resource{cantchange});
+        &print_message(&Resource('Error:ThisPageIsUneditable'));
     } else {
-        &print_message($resource{passwordneeded});
+        &print_message(&Resource('Error:PasswordIsNotSpecified'));
         &print_editform($database{$page}, &get_info($page, $info_LastModified), admin=>1);
     }
     &print_footer($page);
 }
 
 sub do_adminchangepasswordform {
-    &print_header($AdminChangePassword);
+    &print_header('AdminChangePassword', -noindex => 1);
     &print_passwordform;
-    &print_footer($AdminChangePassword);
+    &print_footer('AdminChangePassword');
 }
 
 sub do_adminchangepassword {
     if ($form{mynewpassword} ne $form{mynewpassword2}) {
-        &print_error($resource{passwordmismatcherror});
+        &print_error(&Resource('Error:PasswordMismatch'));
     }
-    my ($validpassword_crypt) = &get_info($AdminSpecialPage, $info_AdminPassword);
+    my ($validpassword_crypt) = &get_info($PageName{AdminSpecialPage}, 'AdminPassword');
     if ($validpassword_crypt) {
         if (not &valid_password($form{myoldpassword})) {
-            &send_mail_to_admin(<<"EOD", "AdminChangePassword");
-myoldpassword=$form{myoldpassword}
-mynewpassword=$form{mynewpassword}
-mynewpassword2=$form{mynewpassword2}
-EOD
-            &print_error($resource{passworderror});
+#            &send_mail_to_admin(<<"EOD", "AdminChangePassword");
+#myoldpassword=$form{myoldpassword}
+#mynewpassword=$form{mynewpassword}
+#mynewpassword2=$form{mynewpassword2}
+#EOD
+            &print_error(&Resource('Error:PasswordIsIncorrect'));
         }
     }
     my ($sec, $min, $hour, $day, $mon, $year, $weekday) = localtime(time);
@@ -254,25 +202,34 @@
     my $salt1 = $token[(time | $$) % scalar(@token)];
     my $salt2 = $token[($sec + $min*60 + $hour*60*60) % scalar(@token)];
     my $crypted = crypt($form{mynewpassword}, "$salt1$salt2");
-    &set_info($AdminSpecialPage, $info_AdminPassword, $crypted);
+    &set_info($PageName{AdminSpecialPage}, 'AdminPassword', $crypted);
 
-    &print_header($CompletedSuccessfully);
-    &print_message($resource{passwordchanged});
-    &print_footer($CompletedSuccessfully);
+    &print_header('CompletedSuccessfully', -noindex => 1);
+    &print_message(&Resource('Error:PasswordIsChanged'));
+    &print_footer('CompletedSuccessfully');
 }
 
 sub do_index {
-    &print_header($IndexPage);
+  wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
+  wiki::useragent::add ($ENV{HTTP_USER_AGENT});
+    &print_header($PageName{IndexPage});
     print qq(<ul>);
     foreach my $page (sort keys %database) {
         if (&is_editable($page)) {
-            print qq(<li><a href="$url_cgi?@{[&encode($page)]}">$page</a>@{[&escape(&get_subjectline($page))]}</li>);
-            # print qq(<li>@{[&get_info($page, $info_IsFrozen)]}</li>);
-            # print qq(<li>@{[0 + &is_frozen($page)]}</li>);
+            print qq(<li><a href="$url_cgi?@{[&encode($page)]}">@{[&escape($page)]}</a>@{[&escape(&get_subjectline($page))]}</li>);
         }
     }
     print qq(</ul>);
-    &print_footer($IndexPage);
+    my ($r, $c) = get_search_result ($form{mypage});
+    if ($c) {
+      print qq{<h2 @{[&id_and_name('wikipage-see-also')]}>@{[&Resource('SeeAlso',escape=>1)]}</h2>};
+      print $r;
+    }
+    my $rl = wiki::referer::list_html ($form{mypage});
+    if ($rl) {
+	print qq(<div @{[&id_and_name('wikipage-referer')]}><h2>@{[&Resource('Referers',escape=>1)]}</h2>\n$rl</div>\n);
+    }
+    &print_footer($PageName{IndexPage});
 }
 
 sub do_write {
@@ -281,8 +238,8 @@
     }
 
     if (not &is_editable($form{mypage})) {
-        &print_header($form{mypage});
-        &print_message($resource{cantchange});
+        &print_header($form{mypage}, -noindex => 1);
+        &print_message(&Resource('Error:ThisPageIsUneditable'));
         &print_footer($form{mypage});
         return;
     }
@@ -302,191 +259,225 @@
 
     if ($form{mymsg}) {
         $database{$form{mypage}} = $form{mymsg};
-        &send_mail_to_admin($form{mypage}, "Modify");
+        #&send_mail_to_admin($form{mypage}, "Modify");
         if ($form{mytouch}) {
-            &set_info($form{mypage}, $info_LastModified, '' . localtime);
+            &set_info($form{mypage}, $info_LastModified, time);
             &update_recent_changes;
         }
         &set_info($form{mypage}, $info_IsFrozen, 0 + $form{myfrozen});
-        &print_header($CompletedSuccessfully);
-        &print_message($resource{saved});
-        &print_content("$resource{continuereading} @{[&armor_name($form{mypage})]}");
-        &print_footer($CompletedSuccessfully);
+	my $fragment = '';
+	$fragment .= qq(;after_edit_cmd=@{[&encode($form{after_edit_cmd})]}) if $form{after_edit_cmd};
+	if ($form{__comment_anchor_index}) {
+	    $fragment .= qq(#anchor-$form{__comment_anchor_index});
+	} elsif ($form{__wikiform_anchor_index}) {
+	    $fragment .= qq(#wikiform-$form{__wikiform_anchor_index});
+	}
+        &print_header('CompletedSuccessfully', -noindex => 1, -goto => $url_cgi.'?mycmd='.&encode($form{after_edit_cmd}||'read').';mypage='.&encode($form{mypage}).qq(;x-param=@{[time.[0..9]->[rand 10]]}$fragment));
+        &print_message(&Resource('Error:SavedSuccessfully'));
+        &print_content(&Resource('Error:ContinueReading')." @{[&armor_name($form{mypage})]}");
+        &print_footer('CompletedSuccessfully');
     } else {
-        &send_mail_to_admin($form{mypage}, "Delete");
+        #&send_mail_to_admin($form{mypage}, "Delete");
         delete $database{$form{mypage}};
         delete $infobase{$form{mypage}};
         if ($form{mytouch}) {
             &update_recent_changes;
         }
-        &print_header($form{mypage});
-        &print_message($resource{deleted});
+        &print_header($form{mypage}, -noindex => 1);
+        &print_message(&Resource('Error:PageIsDeletedSuccessfully'));
         &print_footer($form{mypage});
     }
 }
 
-sub do_searchform {
-    &print_header($SearchPage);
-    &print_searchform("");
-    &print_footer($SearchPage);
-}
-
-sub do_search {
-    my $word = &escape($form{mymsg});
-    &print_header($SearchPage);
-    &print_searchform($word);
-    my $counter = 0;
-    foreach my $page (sort keys %database) {
-        next if $page =~ /^$RecentChanges$/;
-        if ($database{$page} =~ /\Q$form{mymsg}\E/ or $page =~ /\Q$form{mymsg}\E/) {
-            if ($counter == 0) {
-                print qq|<ul>|;
-            }
-            print qq(<li><a href ="$url_cgi?@{[&encode($page)]}">$page</a>@{[&escape(&get_subjectline($page))]}</li>);
-            $counter++;
-        }
-    }
-    if ($counter == 0) {
-        &print_message($resource{notfound});
-    } else {
-        print qq|</ul>|;
-    }
-    &print_footer($SearchPage);
-}
-
-sub do_create {
-    &print_header($CreatePage);
-    print <<"EOD";
-<form action="$url_cgi" method="post">
-    <input type="hidden" name="mycmd" value="edit">
-    <strong>$resource{newpagename}</strong><br>
-    <input type="text" name="mypage" value="" size="20">
-    <input type="submit" value="$resource{createbutton}"><br>
-</form>
-EOD
-    &print_footer($CreatePage);
-}
-
-sub do_FrontPage {
-    open(FILE, $file_FrontPage) or &print_error("($file_FrontPage)");
-    my $content = join('', <FILE>);
-    &code_convert(\$content, $kanjicode);
-    close(FILE);
-    &print_header($FrontPage);
-    &print_content($content);
-    &print_footer($FrontPage);
+sub get_search_result ($;%) {
+  my $word = lc shift;
+  my %option = @_;
+  my @r;
+  foreach my $page (keys %database) {
+    next if !$option{-match_myself} && ($page eq $word);
+    my $content = lc $database{$page};
+    if (index (lc $page, $word) > -1) {
+      my $c = $content =~ s/\Q$word\E//g;
+      push @r, [$page, $c+20];
+    } elsif (index ($word, lc $page) > -1) {
+      my $c = $content =~ s/\Q$word\E//g;
+      push @r, [$page, $c+10];
+    } elsif (my $c = $content =~ s/\Q$word\E//g) {
+      push @r, [$page, $c];
+    }
+  }
+  #my $em = sub { my $s = shift; $s =~ s#(\Q$word\E)#<em>$1</em>#gi; $s };
+  my $r = join "\n", map {qq(<li>[$_->[1]] <a href ="$url_cgi?@{[&encode($_->[0])]}" class="wiki">@{[&escape($_->[0])]}</a> <span class="wikipage-summary">@{[&escape(&get_subjectline($_->[0]))]}</span></li>)} sort {$b->[1] <=> $a->[1] || $a->[0] cmp $b->[0]} @r;
+  $r = qq|<ul class="search-result">$r</ul>| if $r;
+  wantarray? ($r, scalar @r): $r;
+}
+
+sub do_random_jump {
+  my @list = keys %database;
+  my $name = &encode ($list[rand @list]);
+  my $scheme = 'http';
+  $scheme = lc $1 if $main::ENV{SERVER_PROTOCOL} =~ m#([A-Za-z0-9+.%-]+)#;
+  print "Location: $scheme://$main::ENV{SERVER_NAME}:$main::ENV{SERVER_PORT}$url_cgi?$name\n";
+  print "\n";
 }
 
 sub print_error {
     my ($msg) = @_;
-    &print_header($ErrorPage);
+    &print_header($PageName{ErrorPage}, -noindex => 1);
     print qq(<p><strong class="error">$msg</strong></p>);
-    &print_footer($ErrorPage);
+    &print_footer($PageName{ErrorPage});
     exit(0);
 }
 
-sub print_header {
-    my ($page) = @_;
-    my $bodyclass = "normal";
-    my $editable = 0;
-    my $admineditable = 0;
-    if (&is_frozen($page) and $form{mycmd} =~ /^(read|write)$/) {
-        $editable = 0;
-        $admineditable = 1;
-        $bodyclass = "frozen";
-    } elsif (&is_editable($page) and $form{mycmd} =~ /^(read|write)$/) {
-        $admineditable = 1;
-        $editable = 1;
-    } else {
-        $editable = 0;
+sub print_header ($;%) {
+    my ($page, %option) = @_;
+    my @head;
+    $option{body_class} = &is_frozen($page) ? 'frozen' : 'normal';
+    $option{body_class} .= " wiki-page-obsoleted" if $option{-content_format} =~ /obsoleted="yes"/;
+    if ($option{-goto}) {
+      if ($UA =~ m#Opera|MSIE 2\.#) {
+          ## WARNING: This code may output unsafe HTML document if
+          ##          $option{-goto} is not clean.
+	  $option{-goto} =~ tr/;/&/ if $UA =~ m#Opera#;
+	  print qq{Refresh: 0; url=$option{-goto}\n};
+	  push @head, qq(<meta http-equiv="refresh" content="0; url=$option{-goto}">);
+      } else {
+	  $option{-goto} =~ tr/;/&/ if $UA =~ m#Mozilla/[1-4]\.#;
+	  print qq{Refresh: 0; url="$option{-goto}"\n};
+	  push @head, qq(<meta http-equiv="refresh" content="0; url=&quot;@{[&escape($option{-goto})]}&quot;">);
+      }
     }
-    my $cookedpage = &encode($page);
+    print qq{Last-Modified: @{[scalar gmtime $option{-last_modified}]}\n} if $option{-last_modified};
+    if ($option{-expires}) {
+      print qq{Expires: @{[scalar gmtime $option{-expires}]}\n};
+    }
+    if ($UA =~ m#Mozilla/2#) {
+	my $ct = qq{text/html; charset=@{[&get_charset_name($kanjicode,compatible=>1)]}};
+	print qq{Content-Type: $ct\n};
+	push @head, qq{<meta http-equiv="content-type" content="$ct">};
+    } elsif ($UA =~ m#Infomosaic#) {
+	print qq{Content-Type: text/html\n};
+    } else {
+	print qq{Content-Type: text/html; charset=@{[&get_charset_name($kanjicode)]}\n};
+    }
+    push @head, qq(<title>@{[&escape($page)]}</title>);
+    if ($UA !~ m#Mozilla/[1-4]\.# || $UA =~ m#MSIE (?:[4-9]\.|\d\d)#) {
+      push @head, qq(<link rel="stylesheet" type="text/css" href="@{[&escape($uri{wiki}.'?mycmd=TEXT_CSS;mypage='.&encode($PageName{DefaultStyleForHTML}).';x-lm='.&get_info($PageName{DefaultStyleForHTML}, $info_LastModified))]}");
+    }
+    push @head, q(<meta name="ROBOTS" content="NOINDEX">) if $option{-noindex};
+    my ($Links, $links) = &make_navigate_links ($page);
+    #print $Links;	## Link: fields
+    $links = join "\n", (@head, $links);
     print <<"EOD";
-Content-type: text/html; charset=$charset
 Content-Language: $lang
 Content-Style-Type: text/css
 
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="$lang">
-<head>
-    <title>$page @{[&escape(&get_subjectline($page))]}</title>
-    <link rel="index" href="$url_cgi?$IndexPage">
-    <link rev="made" href="mailto:$modifier_mail">
-    <link rel="stylesheet" type="text/css" href="$url_stylesheet">
+<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd"> + RUBY -->
+<html lang="$lang" class="$option{body_class}">
+<head profile="http://suika.fam.cx/~wakaba/-temp/wiki/wiki?WikiHTMLMetaProfile">
+$links
 </head>
-<body class="$bodyclass">
+<body class="$option{body_class}">
+EOD
+    &print_navigate_links ($page);
+    print <<EOD;
+<h1 class="header">@{[&escape($page)]}</h1>
+EOD
+}
+
+sub get_charset_name ($;%) {
+    my ($charset, %option) = (lc shift, @_);
+    if ($charset =~ 'euc') {
+	$charset = $option{compatible} ? 'x-euc-jp' : 'euc-jp';
+    } elsif ($charset =~ 'sjis' || $charset =~ 'shift') {
+	$charset = $option{compatible} ? 'x-sjis' : 'shift_jis';
+    } elsif ($charset =~ 'jis') {
+        $charset = 'iso-2022-jp';
+    }
+    $charset;
+}
+
+sub print_navigate_links (@) {
+  my ($page) = @_;
+  my $editable = (&is_editable($page) && !&is_frozen($page)) ? 1 : 0;
+  my $cookedpage = &encode($page);
+  print <<EOH;
 <div class="tools">
-    @{[ $admineditable
-        ? qq(<a title="$resource{admineditthispage}" href="$url_cgi?mycmd=adminedit;mypage=$cookedpage">$resource{admineditbutton}</a> | )
-        : qq()
-    ]}
     @{[ $editable
-        ? qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedpage">$resource{editbutton}</a> | )
-        : qq()
-    ]}
-    @{[ $admineditable
-        ? qq(<a href="$url_cgi?mycmd=diff;mypage=$cookedpage">$resource{diffbutton}</a> | )
+        ? qq(<a title="@{[&Resource('EditThisPageLong',escape=>1)]}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E" class="wiki-cmd">@{[&Resource('EditThisPage',escape=>1)]}</a> | )
         : qq()
     ]}
-    <a href="$url_cgi?$CreatePage">$resource{createbutton}</a> | 
-    <a href="$url_cgi?$IndexPage">$resource{indexbutton}</a> | 
-    <a href="$url_cgi?$RssPage">$resource{rssbutton}</a> | 
-    <a href="$url_cgi?$FrontPage">$FrontPage</a> | 
-    <a href="$url_cgi?$SearchPage">$resource{searchbutton}</a> | 
-    <a href="$url_cgi?$RecentChanges">$resource{recentchangesbutton}</a>
+    <a href="$url_cgi?mycmd=read;mypage=$cookedpage;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki-cmd" title="@{[&Resource('ViewThisPageLong',escape=>1)]}">@{[&Resource('ViewThisPage',escape=>1)]}</a> | 
+    <a href="$url_cgi?mycmd=map;mypage=$cookedpage" class="wiki-cmd" title="@{[&Resource('ShowMapOfThisPageLong',escape=>1)]}">@{[&Resource('ShowMapOfThisPage',escape=>1)]}</a> | 
+    <a href="$url_cgi?$PageName{CreatePage}" class="wiki" title="@{[&Resource('GoToCreatePageLong',escape=>1)]}">@{[&Resource('GoToCreatePage',escape=>1)]}</a> | 
+    <a href="$url_cgi?$PageName{IndexPage}" class="wiki" title="@{[&Resource('GoToIndexPageLong',escape=>1)]}">@{[&Resource('GoToIndexPage',escape=>1)]}</a> | 
+    <a href="$url_cgi?$PageName{FrontPage}" class="wiki" title="@{[&Resource('GoToHomePageLong',escape=>1)]}">@{[&Resource('GoToHomePage',escape=>1)]}</a> | 
+    <a href="$url_cgi?$PageName{SearchPage}" class="wiki" title="@{[&Resource('GoToSearchPageLong',escape=>1)]}">@{[&Resource('GoToSearchPage',escape=>1)]}</a> | 
+    <a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink" title="@{[&Resource('GoSomewhereLong',escape=>1)]}">@{[&Resource('GoSomewhere',escape=>1)]}</a> | 
+    <a href="$url_cgi?RecentChanges" class="wiki" title="@{[&Resource('GoToRecentChangesLong',escape=>1)]}">@{[&Resource('GoToRecentChanges',escape=>1)]}</a>
 </div>
-<h1 class="header"><a
-    title="$resource{searchthispage}"
-    href="$url_cgi?mycmd=search;mymsg=$cookedpage">$page</a>@{[&escape(&get_subjectline($page))]}</h1>
-EOD
+EOH
+}
+
+sub make_navigate_links ($) {
+    my $page = shift;
+    my @link;
+    push @link, {rel=>'edit', href=>"$url_cgi?mycmd=edit;mypage=@{[&encode($page)]}", class=>"wiki-command", title=>&Resource('EditThisPageLink')} if &is_editable ($page) && !&is_frozen ($page);
+    push @link, {rel=>'edit', href=>"$url_cgi?mycmd=adminedit;mypage=@{[&encode($page)]}", class=>"wiki-command", title=>&Resource('AdminEditThisPageLink')} if &is_editable ($page) || &is_frozen ($page);
+    push @link, {rel=>'view', href=>"$url_cgi?mycmd=read;mypage=@{[&encode($page)]};x-p=@{[time.[0..9]->[rand 10]]}", class=>'wiki-command', title=>&Resource('ViewThisPageLink')};
+    push @link, {rel=>'myself', href=>"$url_cgi?@{[&encode($page)]}", class=>'wiki', title=>&Resource('GoToMyselfLink')};
+    push @link, {rel=>'index', href=>"$url_cgi?$PageName{IndexPage}", class=>'wiki', title=>&Resource('GoToIndexPageLink')};
+    push @link, {rel=>'home', href=>"$url_cgi?$PageName{FrontPage}", class=>'wiki', title=>&Resource('GoToHomePageLink')};
+    push @link, {rel=>'News', href=>"$url_cgi?WikiNews", class=>'wiki', title=>&Resource('GoToWikiNewsLink')};
+    push @link, {rel=>'News', href=>"$url_cgi?RecentChanges", class=>"wiki", title=>&Resource('GoToRecentChangesLink')};
+    push @link, {rel=>'News', href=>"$url_cgi?$PageName{RssPage}", class=>"wiki", title=>&Resource('GoToRssPageLink'), type=>'application/xml'};
+    push @link, {rel=>'search', href=>"$url_cgi?$PageName{SearchPage}", class=>'wiki', title=>&Resource('GoToSearchPageLink')};
+    push @link, {rel=>'help', href=>"$url_cgi?WikiHelp", class=>'wiki', title=>&Resource('GoToWikiHelpLink')};
+    push @link, {rel=>'copyright', href=>"$url_cgi?WikiPageLicense", class=>'wiki', title=>&Resource('GoToWikiPageLicenseLink')};
+    push @link, {rel=>'jump', href=>qq(javascript:var%20WikiName=prompt('Please%20input%20the%20WikiName:','','Jump%20to%20SuikaWiki');if(WikiName)%7B_content.location.href='$url_cgi%3F'+encodeURIComponent(WikiName)%7D), class=>'wiki-cmd', title=>&Resource('JumpToLink')};
+    push @link, {rel=>'jump', href=>qq(javascript:var%20WikiName=prompt('Please%20input%20the%20WikiName:','','Jump%20to%20SuikaWiki');if(WikiName)%7B_content.location.href='$url_cgi%3Fmycmd=edit;mypage='+encodeURIComponent(WikiName)%7D), class=>'wiki-cmd', title=>&Resource('JumpToEditLink')};
+    push @link, {rel=>'lucky', href=>"$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}", class=>'wiki randomlink', title=>&Resource('GoSomewhereLink')};
+    push @link, {rel=>'history', href=>$uri{cvs_wikipage}.do{my $s=$page;$s=~s/(.)/sprintf '%02X', ord $1/ges;$s}.'.txt', title=>&Resource('ViewHistoryOfThisPageLink'),hreflang=>'en'} if $uri{cvs_wikipage};
+    push @link, {rel=>'history', href=>"$url_cgi?mycmd=diff;mypage=@{[&encode($page)]}", title=>&Resource('ViewDiffOfThisPageLink'), class=>'wiki-command'};
+    push @link, {rel=>'contents', href=>"$url_cgi?mycmd=map;mypage=@{[&encode($page)]}", title=>&Resource('ShowMapOfThisPageLink'), class=>'wiki-command'};
+    my ($Links, $links) = ('', '');
+    for my $e (@link) {
+	$links .= qq(<link);
+	$Links .= qq(Link: <$e->{href}>);
+	for my $attr (qw/rel rev href title class type hreflang charset/) {
+	    $links .= qq( $attr="@{[&escape($e->{$attr})]}") if $e->{$attr};
+	}
+	for my $attr (qw/rel rev title/) {
+	    $Links .= qq(; $attr="@{[do{$e->{$attr} =~ s/([\\\"])/\\$1/g; $e->{$attr}}]}") if $e->{$attr};
+	}
+	$links .= qq(>\n);
+	$Links .= qq(\n);
+    }
+    wantarray ? ($Links, $links) : $Links;
 }
 
 sub print_footer {
-    my ($page) = @_;
-    $walrus_log = ($walrus_debugging) ? &text_to_html("----\n$walrus_log") : '';    # Walrus add (debug)
-    # Walrus mod (1) start
-my $cvslog = '$Revision: 1.20 $ $Date: 2002/06/02 06:37:36 $';
-    print <<"EOD";
+    my ($page, $lm) = @_;
+    my $epage = &encode ($page);
+  my $cvslog1 = q$Revision: 1.44 $;
+  my $cvslog2 = q$Date: 2003/01/01 12:30:24 $;
+  print_navigate_links ($page);
+  print <<"EOD";
+@{[ $lm ? qq(<div id="wikipage-last-modified">@{[&Resource('LastModified=',escape=>1)]}@{[&_rfc3339_date ($lm)]}</div>) : '' ]}
 <div class="footer">
-<p>
-<a href="http://digit.que.ne.jp/work/">WalWiki</a> $walversion &copy; 2000-2002 by <a href="http://digit.que.ne.jp/">Makio Tsukamoto</a>.<br />
-based on <a href="http://www.hyuki.com/yukiwiki/">YukiWiki</a> $version &copy; 2000-2002 by <a href="http://www.hyuki.com/">Hiroshi Yuki</a>.<br />
-<a href="/gate/cvs/wakaba/wiki/" title="CVS Repository">
-$cvslog
-</a>
-</p>
-<div class="navigation">
-[<a href="/" title="このサーバーの首頁">/</a>
-<a href="/map" title="このサーバーの案内">地図</a>
-<a href="/search/" title="このサーバーの検索">検索</a>]
+<a href="http://www.hyuki.com/yukiwiki/" title="YukiWiki 2.0.beta1.2002-05-29 &copy; 2000-2002 by Hiroshi Yuki">@{[&Resource('About:Name:YukiWiki',escape=>1)]}</a> <a href="http://digit.que.ne.jp/work/" title="WalWiki 2.0.beta1.wal.1 &copy; 2000-2002 by Makio Tsukamoto">@{[&Resource('About:Name:WalWiki',escape=>1)]}</a>
+<a href="/gate/cvs/wakaba/wiki/" title="@{[&Resource('About:SuikaWiki:JumpToCVS',escape=>1)]} ($cvslog2)">@{[&Resource('About:Name:SuikaWiki',escape=>1)]} $cvslog1</a>
 </div>
-</div>
-$walrus_log
 </body>
 </html>
 EOD
-#       print <<"EOD";
-#   <hr>
-#   <address class="footer">
-#       <a href="http://www.hyuki.com/yukiwiki/">YukiWiki</a> $version
-#       &copy; 2000-2002 by <a href="http://www.hyuki.com/">Hiroshi Yuki</a>.<br />
-#       Modified by <a href="$modifier_url">$modifier_name</a>.
-#   </address>
-#   <p class="footer">
-#       <a href="http://www.hyuki.com/yukiwiki/">$icontag</a>
-#   </p>
-#   </body>
-#   </html>
-#   EOD
-    # Walrus mod (1) end
 }
 
 sub escape {
     my $s = shift;
     $s =~ s|\r\n|\n|g;
-    $s =~ s|\&|&amp;|g;
+    $s =~ s|&|&amp;|g;
     $s =~ s|<|&lt;|g;
     $s =~ s|>|&gt;|g;
     $s =~ s|"|&quot;|g;
@@ -496,83 +487,92 @@
 sub unescape {
     my $s = shift;
     # $s =~ s|\n|\r\n|g;
-    $s =~ s|\&amp;|\&|g;
-    $s =~ s|\&lt;|\<|g;
-    $s =~ s|\&gt;|\>|g;
-    $s =~ s|\&quot;|\"|g;
+    $s =~ s|&lt;|<|g;
+    $s =~ s|&gt;|>|g;
+    $s =~ s|&quot;|"|g;
+    $s =~ s|&amp;|&|g;
     return $s;
 }
 
-sub print_content {
-    my ($rawcontent) = @_;
-    print &text_to_html($rawcontent, toc=>1);
+sub print_content ($;$) {
+    my ($rawcontent, %option) = @_;
+    print &text_to_html($rawcontent, toc=>1, %option);
 }
 
 sub text_to_html {
     my ($txt, %option) = @_;
-    my (@txt) = split(/\n/, $txt);
-    my (@toc);
+    my @toc;
+    my @toc2 = @{$option{-toc}||[]};
     my $tocnum = 0;
+    
+    ## Load constants
+    my %const;
+    if ($option{content_format} =~ /import="([^"]+)"/) {
+      for (split /\s*,\s*/, $1) {
+        my $wp = $database{$_};
+        if ($wp =~ m!^\#\?SuikaWikiConst/1.0!) {
+          wiki::suikawikiconst::to_hash ($wp => \%const);
+        }
+      }
+    }
+    
+    $txt =~ s{__&&([^&]+)&&__}{defined $const{$1}?$const{$1}:qq(__&&$1&&__)}ge;
+    my (@txt) = split(/\n/, $txt);
     my (@saved, @result);
     unshift(@saved, "</p>");
     push(@result, "<p>");
     foreach (@txt) {
         chomp;
-        # Walrus mod (6) start
-        #if ($saved[0] eq '</html>') {
-        #    if (/<\/html>/i) { splice(@saved); }
-        #    else { push (@result, &html_to_ignored_html($_)); }
-        #} elsif (/^<html>/i and &is_ignore_html($form{mypage})) {
-        #    push(@result, splice(@saved));
-        #    push(@saved, '</html>');
-        #} els
-        if (/^\*\*\*\*\*(.*)/) {
-            push(@toc, qq(-- <a href="#i$tocnum">@{[&escape($1)]}</a>\n));
-            push(@result, splice(@saved), qq(<h6 id="i$tocnum">) . &inline($1) . '</h6>');
+        if (/^\*\*\*\*\*([^\x0D\x0A]*)/) {
+            push(@toc, qq(----- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+            push(@result, splice(@saved), qq(<h6 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h6>');
             $tocnum++;
-        } elsif (/^\*\*\*\*(.*)/) {
-            push(@toc, qq(-- <a href="#i$tocnum">@{[&escape($1)]}</a>\n));
-            push(@result, splice(@saved), qq(<h5 id="i$tocnum">) . &inline($1) . '</h5>');
+        } elsif (/^\*\*\*\*([^\x0D\x0A]*)/) {
+            push(@toc, qq(---- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+            push(@result, splice(@saved), qq(<h5 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h5>');
             $tocnum++;
-        } elsif (/^\*\*\*(.*)/) {
-            push(@toc, qq(-- <a href="#i$tocnum">@{[&escape($1)]}</a>\n));
-            push(@result, splice(@saved), qq(<h4 id="i$tocnum">) . &inline($1) . '</h4>');
+        } elsif (/^\*\*\*([^\x0D\x0A]*)/) {
+            push(@toc, qq(--- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+            push(@result, splice(@saved), qq(<h4 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h4>');
             $tocnum++;
-        } elsif (/^\*\*(.*)/) {
+        } elsif (/^\*\*([^\x0D\x0A]*)/) {
         # if (/^\*\*(.*)/) {
         # Walrus mod (6) end
-            push(@toc, qq(-- <a href="#i$tocnum">@{[&escape($1)]}</a>\n));
-            push(@result, splice(@saved), qq(<h3><a name="i$tocnum"> </a>) . &inline($1) . '</h3>');
+            push(@toc, qq(-- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+            push(@result, splice(@saved), qq(<h3 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h3>');
             $tocnum++;
-        } elsif (/^\*(.*)/) {
-            push(@toc, qq(- <a href="#i$tocnum">@{[&escape($1)]}</a>\n));
-            push(@result, splice(@saved), qq(<h2><a name="i$tocnum"> </a>) . &inline($1) . '</h2>');
+        } elsif (/^\*([^\x0D\x0A]*)/) {
+            push(@toc, qq(- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+            push(@result, splice(@saved), qq(<h2 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h2>');
             $tocnum++;
-        #} elsif (/^----/) {
-        #    push(@result, splice(@saved), '<hr>');
-        } elsif (/^(={1,5})(.*)/) {
+        } elsif (/^(={1,6})(.*)/) {
             &back_push('ol', length($1), \@saved, \@result);
-            push(@result, '<li>' . &inline($2) . '</li>');
-        } elsif (/^(-{1,5})(.*)/) {
-            &back_push('ul', length($1), \@saved, \@result);
-            push(@result, '<li>' . &inline($2) . '</li>');
+            push(@result, '<li>' . &inline($2, const => \%const) . '</li>');
+        } elsif (/^(-{1,6})(.*)/) {
+          &back_push('ul', length($1), \@saved, \@result);
+          my ($pf, $l) = ('', $2);
+          if (!$main::_EMBEDED && $l =~ s/^\s*\[([0-9]+)\]//) {
+            my $num = 0+$1;
+            $pf = qq(<a name="anchor-$num" id="anchor-$num" class="anchor">[$num]</a>);
+          }
+          push(@result, '<li>' . $pf . &inline ($l, const => \%const) . '</li>');
         } elsif (/^:([^:]+):(.*)/) {
             &back_push('dl', 1, \@saved, \@result);
-            push(@result, '<dt>' . &inline($1) . '</dt>', '<dd>' . &inline($2) . '</dd>');
-        } elsif (/^(>{1,5})(.*)/) {
+            push(@result, '<dt>' . &inline($1, const => \%const) . '</dt>', '<dd>' . &inline($2, const => \%const) . '</dd>');
+        } elsif (/^(?!>>\d)(>{1,5})(.*)/) {
             &back_push('blockquote', length($1), \@saved, \@result);
-            push(@result, &inline($2));
+            push @result, "<p>";
+            push(@result, &inline($2, const => \%const));
+            unshift @saved, "</p>";
         } elsif (/^\s*$/) {
             push(@result, splice(@saved));
-            unshift(@saved, "</p>");
             push(@result, "<p>");
+            unshift(@saved, "</p>");
         } elsif (/^(\s+.*)$/) {
             &back_push('pre', 1, \@saved, \@result);
-            #push(@result, &escape($1)); # Not &inline, but &escape
-            push(@result, &inline($1)); # Not &inline, but &escape
-#       } elsif (/^\,(.*)$/) {             # Walrus del (BF)
-        } elsif (/^\,(.*?)[\x0D\x0A]*$/) { # Walrus add (BF)
-            &back_push('table', 1, \@saved, \@result, ' border="1"');
+            push(@result, &inline($1, const => \%const));
+        } elsif (/^\,(.*?)[\x0D\x0A]*$/) {
+            &back_push('table', 1, \@saved, \@result);
             #######
             # This part is taken from Mr. Ohzaki's Perl Memo and Makio Tsukamoto's WalWiki.
             # XXXXX
@@ -586,7 +586,7 @@
                         $colspan[$i]++;
                     }
                     $colspan[$i] = ($colspan[$i] > 1) ? sprintf(' colspan="%d"', $colspan[$i]) : '';
-                    $value[$i] = sprintf('<td%s%s>%s</td>', $align[$i], $colspan[$i], &inline($value[$i]));
+                    $value[$i] = sprintf('<td%s%s>%s</td>', $align[$i], $colspan[$i], &inline($value[$i], const => \%const));
                 } else {
                     $value[$i] = '';
                 }
@@ -594,27 +594,42 @@
             push(@result, join('', '<tr>', @value, '</tr>'));
             # XXXXX
             #######
+        } elsif (/^\[(INS|DEL|PRE)\[\s*$/) {
+            push @result, splice (@saved), '<'.lc($1).'>';
+            unshift @saved, "</p>";
+            push @result, "<p>";
+        } elsif (/^\](INS|DEL|PRE)\]\s*$/) {
+            push @result, splice (@saved), '</'.lc($1).'>';
+        } elsif (/^\[([0-9]+)\](.*)$/ && !$main::_EMBEDED) {
+          my $num = 0+$1;
+          push @result, qq(<a name="anchor-$num" id="anchor-$num" class="anchor">[$num]</a>);
+          push @result, &inline ($2, const => \%const);
         } else {
-            push(@result, &inline($_));
+            push(@result, &inline($_, const => \%const));
         }
     }
     push(@result, splice(@saved));
-
+    
+    my $toc = '';
     if ($option{toc}) {
         # Convert @toc (table of contents) to HTML.
         # This part is taken from Makio Tsukamoto's WalWiki.
         my (@tocsaved, @tocresult);
-        foreach (@toc) {
-            if (/^(-{1,3})(.*)/) {
+        foreach (@toc,@toc2) {
+            if (/^(-{1,6})(.*)$/) {
                 &back_push('ul', length($1), \@tocsaved, \@tocresult);
                 push(@tocresult, '<li>' . $2 . '</li>');
             }
         }
         push(@tocresult, splice(@tocsaved));
-        return join("\n", @tocresult, @result);
-    } else {
-        return join("\n", @result);
+        $toc = join("\n", @tocresult);
+        $toc = $toc ? qq(<div id="wikipage-toc">$toc</div>) : '';
     }
+    $toc .= join("\n", @result);
+    $toc =~ s#<p>\n</p>##g;
+    $toc =~ s#[\x0D\x0A]+</#</#g;
+    $toc =~ s#<pre>\n#<pre>#g;
+    $toc;
 }
 
 sub back_push {
@@ -631,149 +646,174 @@
     }
 }
 
-sub inline {
-    my ($line) = @_;
+sub inline ($;%) {
+    my ($line, %option) = @_;
     $line = &escape($line);
-    $line =~ s|'''([^']+?)'''|<strong>$1</strong>|g;
-    $line =~ s|''([^']+?)''|<em>$1</em>|g;
-    $line =~ s|(\d\d\d\d-\d\d-\d\d \(\w\w\w\) \d\d:\d\d:\d\d)|<span class="date">$1</span>|g;   # Date
-    $line =~ s!
-      (
-        (?:&lt;(?:mailto|http|https|ftp|urn):[\x21-\x7E]*)&gt;
-      |
-        ($bracket_name)	# [[likethis]], [[#comment]], [[Friend:remotelink]]
-      |
-        ($interwiki_definition)	# [[Friend http://somewhere/?q=sjis($1)]]
-      #|
-      #  ($wiki_name)
-      )
-            !
-                &make_link($1)
-            !gex;
+    $line =~ s{$embed_command{form}}{&make_custom_form ($1, $2, $3, $4)}ge;
+    $line =~ s{\[(INS|DEL|SUP|SUB|VAR|CODE|KBD|SAMP|DFN)(?:\(([A-Za-z0-9\x20-]+)\))?\[(.+?)\]\]}{<@{[lc $1]}@{[$2 ? qq( class="$2") : '']}>$3</@{[lc $1]}>}g;
+    $line =~ s:\[(WEAK)\[(.+?)\]\]:<span class="@{[lc $1]}">$2</span>:g;
+    $line =~ s:\[ABBR\[([^]]+)\] \[([^]]+)\]\]:<acronym title="$2">$1</acronym>:g;
+    $line =~ s:\[RUBYB\[([^]]+)\] \[([^]]+)\] \[([^]]+)\]\]:<span class="ruby"><ruby class="rb"><rb>$1</rb><rp>(</rp><rt>$2</rt><rp>)</rp></ruby><span class="rp"> (</span><span class="rt-below">$3</span><span class="rp">) </span></span>:g;
+    $line =~ s:\[RUBY\[([^]]+)\] \[([^]]+)\]\]:<ruby><rb>$1</rb><rp>(</rp><rt>$2</rt><rp>)</rp></ruby>:g;
+    $line =~ s:\[RUBYB\[([^]]+)\] \[([^]]+)\]\]:<span class="ruby"><span class="rb">$1</span><span class="rp"> (</span><span class="rt-below">$2</span><span class="rp">) </span></span>:g;
+    $line =~ s%\[Q\[([^]]+)\](?: \[&lt;([\x21-\x5A\x5E-\x7E]+)&gt;\])?\]%「<q@{[$2?qq( cite="$2"):'']}>$1</q>」%g;
+    $line =~ s|'''([^']+)'''|<strong>$1</strong>|g;
+    $line =~ s|''([^']+)''|<em>$1</em>|g;
+    $line =~ s{
+      (\[\[(\#\S+?)\]\])
+      |\[\[([^[]+?)](?:&gt;&gt;([0-9]+))?]
+      |&gt;&gt;([0-9]+)
+      |&lt;([A-Za-z0-9%]+:(?:(?!&gt;).)+)&gt;
+    }{
+      my ($l, $page,$anchor, $anum, $uri) = ($1, $3,$4, 0+$5, $6);
+      if ($l) {
+        return &embedded_to_html($1);
+      } elsif (defined $page) {
+        &make_wikilink ($page, anchor => 0+$anchor);
+      } elsif ($anum) {
+        qq(<a href="#anchor-$anum" class="wiki-anchor">&gt;&gt;$anum</a>);
+      } elsif ($uri) {
+        &make_urilink ($uri);
+      }
+    }gex;
     return $line;
 }
 
-sub make_link {
-    my $chunk = shift;
-    # Walrus add (3) start
-    my $name  = $chunk;
-    $name =~ s/^&lt;(.*)&gt;$/$1/;
-    if ($chunk =~ /^\[\[([^ ]+?) ([^ ]+?)\]\]$/ and $form{mypage} ne $InterWikiName) {
-        ($name, $chunk) = ($1, $2);
-    } elsif ($chunk =~ /^mailto:(.*)$/) {
-        $name = $1;
-    }
-    if ($use_autoimg and $name =~ /^(http|https|ftp|):.+\.(png|gif|jpe?g)/) {
-        $name = qq(<img src="$name">) ;
-    }
-    $name = &unarmor_name($name);
-    # Walrus add (3) end
-    if ($chunk =~ /^(http|https|ftp):/) {
-        # Walrus mod (3) start
-#       if ($use_autoimg and $chunk =~ /\.(gif|png|jpeg|jpg)$/) {
-#           return qq(<a href="$chunk"><img src="$chunk"></a>);
-#       } else {
-#           return qq(<a href="$chunk">$chunk</a>);
-#       }
-        return qq(<a href="$chunk">$name</a>);
-        # Walrus mod (3) end
-    } elsif ($chunk =~ m#^urn:[0-9A-Za-z_:;/.-]+#) {
-        return qq|&lt;<a href="/uri-res/N2L?${name}">$name</a>&gt;|;
-    } elsif ($chunk =~ /^mailto:(.*)/) {
-#       return qq(<a href="$chunk">$2</a>);                 # Walrus del (3)
-        return qq(&lt;<a href="$chunk">$name</a>&gt;);              # Walrus add (3)
-    } elsif ($chunk =~ /^$interwiki_definition$/) {
-#       return qq(<span class="InterWiki">$chunk</span>);   # Walrus del (3)
-        return qq(<span class="InterWiki">$name</span>);    # Walrus add (3)
-    } elsif ($chunk =~ /^$embedded_name$/) {
-        return &embedded_to_html($chunk);
-    } else {
-        $chunk = &unarmor_name($chunk);
-        $chunk = &unescape($chunk); # To treat '&' or '>' or '<' correctly.
-        my $cookedchunk = &encode($chunk);
-        if ($chunk =~ /^$interwiki_name$/) {
-            my ($intername, $localname) = ($1, $2);
-            my $remoteurl = $interwiki{$intername};
-            if ($remoteurl) {
-#               $remoteurl =~ s/\b(euc|sjis|ykwk|asis)\(\$1\)/&interwiki_convert($1, $localname)/e;      # Walrus del (4)
-                $remoteurl =~ s/\b(euc|sjis|ykwk|asis|isbn)\(\$1\)/&interwiki_convert($1, $localname)/e; # Walrus add (4)
-#               return qq(<a href="$remoteurl">$chunk</a>); # Walrus del (3)
-                return qq(<a href="$remoteurl">$name</a>);  # Walrus add (3)
-            } else {
-#               return $chunk;                              # Walrus del (3)
-                return $name;                               # Walrus add (3)
-            }
-        } elsif ($database{$chunk}) {
-            my $subject = &escape(&get_subjectline($chunk, delimiter => ''));
-#           return qq(<a title="$subject" href="$url_cgi?$cookedchunk">$chunk</a>);  # Walrus del (3)
-            return qq(<a title="$subject" href="$url_cgi?$cookedchunk">$name</a>);   # Walrus add (3)
-        } elsif ($page_command{$chunk}) {
-#           return qq(<a title="$chunk" href="$url_cgi?$cookedchunk">$chunk</a>);    # Walrus del (3)
-            return qq(<a title="$chunk" href="$url_cgi?$cookedchunk" class="wiki">$name</a>);     # Walrus add (3)
-        } else {
-            return qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedchunk" class="wiki">$name<span class="mark">$editchar</span></a>);
-        }
-    }
-}
-
-# Walrus add (6) start
-sub is_ignore_html {
-    my ($pagename) = @_;
-    foreach (@ignore_html_page) {
-        return 1 if ($pagename eq $_);
-    }
-    return 0;
-}
-# Walrus add (6) end
-
-# Walrus add (6) start
-sub html_to_ignored_html {
-    my $str = shift(@_);
-    my $text_regex        = q{[^<]*};
-    my $tag_regex_        = q{[^"'<>]*(?:"[^"]*"[^"'<>]*|'[^']*'[^"'<>]*)*(?:>|(?=<)|$(?!\n))}; #'}}}}
-    my $comment_tag_regex = '<!(?:--[^-]*-(?:[^-]+-)*?-(?:[^>-]*(?:-[^>-]+)*?)??)*(?:>|$(?!\n)|--.*$)';
-    my $tag_regex         = qq{$comment_tag_regex|<$tag_regex_};
-    my $ignored           = join('|', @ignore_html_tags);
-    my $result = '';
-    while ($str =~ /($text_regex)($tag_regex)?/gso) {
-      last if $1 eq '' and $2 eq '';
-      $result .= $1;
-      my $tag_tmp = $2;
-      $result .= ($tag_tmp =~ /^<\/?($ignored)(?![0-9A-Za-z])/i) ? $tag_tmp : &escape($tag_tmp);
-      if ($tag_tmp =~ /^<(XMP|PLAINTEXT|SCRIPT)(?![0-9A-Za-z])/i) {
-        $str =~ /(.*?)(?:<\/$1(?![0-9A-Za-z])$tag_regex_|$)/gsi;
-        $result .= &escape($1);
+sub make_wikilink ($%) {
+  my ($ename, %option) = @_;
+  my $name = &unescape ($ename);
+  if ($database{$name}) {
+    my $subject = &escape (&get_subjectline ($name, delimiter => ''));
+    if ($option{anchor}) {
+      return qq(<a title="$subject" href="$url_cgi?@{[&encode($name)]}#anchor-$option{anchor}" class="wiki">$ename&gt;&gt;$option{anchor}</a>);
+    } else {
+      return qq(<a title="$subject" href="$url_cgi?@{[&encode($name)]}" class="wiki">$ename</a>);
+    }
+  } else {
+    return qq(<a title="@{[&Resource('JumpAndEditWikiPage',escape=>1)]}" href="$url_cgi?@{[&escape($name)]}" class="wiki not-exist">$ename<span class="mark">@{[&Resource('JumpAndEditWikiPageMark',escape=>1)]}</span></a>);
+  }
+}
+
+sub make_urilink ($;%) {
+  require URI;
+  my $uri = shift;
+  if ($uri =~ s/^IW://) {	## InterWiki (not URI)
+    $uri = &unescape ($uri);
+    if ($uri =~ /^([^\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]+|"(?:\\.|[^"\\])+"):([^\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]+|"(?:\\.|[^"\\])+")$/) {
+      my ($site, $name) = ($1, $2);
+      for ($site, $name) {
+        if (s/^"//) { s/"$//; s/\\(.)/$1/g }
+      }
+      &init_InterWikiName () unless $interwiki{'[[]]'};
+      if ($interwiki{$site}) {
+        &load_formatter ('interwiki');
+        my $uri = &escape ($fmt{interwiki}->replace ($interwiki{$site} => {site => $site, name => $name}));
+        $site = &escape ($site); $name = &escape ($name);
+        qq(&lt;<a href="$uri" class="out-of-wiki interwiki" title="$name ($site); URI: &lt;$uri&gt;"><span class="interwiki-site">$site:</span><span class="interwiki-name">$name</span></a>&gt;);
+      } else {
+        qq(&lt;@{[&Resource('Error:UnknownInterWikiName=',escape=>1)]}@{[&escape ($site)]}&gt;);
       }
+    } else {
+      qq(&lt;@{[&Resource('Error:InvalidInterWiki=',escape=>1)]}@{[&escape($uri)]}&gt;);
     }
-    return $result;
-}
-# Walrus add (6) end
+  } elsif ($uri =~ /^urn:/) {	## URN
+    my $uri2 = &escape (URI->new ('/uri-res/N2L?'.&unescape ($uri), 'http')->canonical);
+    qq(&lt;<a href="$uri2" title="URI: &lt;$uri&gt; (via &lt;$uri2&gt;)" class="out-of-wiki urn">$uri</a>&gt;);
+  } elsif ($uri =~ s/^MAIL://) {	## mail address (not URI)
+    my $uri2 = &escape (URI->new ('mailto:'.&unescape ($uri))->canonical);
+    qq(&lt;<a href="$uri2" class="out-of-wiki mail">$uri</a>&gt;);
+  } elsif ($uri =~ s/^IMG(?:\([^)]+\))?://) {	## image (not URI itself)
+    my $uri2 = &escape (URI->new (&unescape ($uri))->canonical);
+    qq(<img src="$uri2" alt="" title="URI: &lt;$uri2&gt;" class="out-of-wiki">);
+  } else {	## misc. URI
+    CGI::Carp::warningsToBrowser (0);
+    my $uri2 = &escape (URI->new (&unescape ($uri))->canonical);
+    CGI::Carp::warningsToBrowser (1);
+    qq(&lt;<a href="$uri2" title="URI: &lt;$uri2&gt;" class="out-of-wiki">$uri</a>&gt;);
+  }
+}
+
+{my $FormIndex = 0;
+sub make_custom_form ($$$$) {
+    my ($wfname, $definition, $template, $option) = @_;
+    ## $template and $option is currently not used in this procedure.
+    unless ($main::_EMBEDED) {
+	$FormIndex++;
+	if (length $definition) {
+	    my $param = bless {}, 'SuikaWiki::Plugin';
+	    my $lastmodified = &get_info($form{mypage}, $info_LastModified);
+	    &load_formatter (qw/form_input form_option/);
+	    $definition = &unescape ($definition);
+	    $definition =~ s/\\(.)/$1/g;
+	    $option = &unescape ($option);
+	    $option =~ s/\\(.)/$1/g;
+	    $fmt{form_option}->replace ($option, $param);
+	    $param->{output}->{form} = 1 unless defined $param->{output}->{form};
+	    $definition .= ' %submit;' if $definition !~ /%submit/ && !$param->{output}->{nosubmit} && $param->{output}->{form};
+	    my $target_page = $param->{output}->{page} || $form{mypage};
+	    $param->{form_disabled} = 1 if $fixedpage{$target_page};
+	    my $target_form = $param->{output}->{id};
+	    my $r = '';
+	    $r = <<EOH if $param->{output}->{form};
+<form method="post" action="$url_cgi" id="wikiform-$FormIndex" class="wikiform">
+  <input type="hidden" name="mycmd" value="@{[$param->{form_disabled}?'read':'wikiform']}">
+  <input type="hidden" name="mypage" value="@{[&escape($target_page)]}">
+  <input type="hidden" name="myLastModified" value="$lastmodified">
+  <input type="hidden" name="mytouch" value="on">
+  <input type="hidden" name="@{[$target_form? qq(wikiform_targetform" value="@{[&escape($target_form)]}) : qq(wikiform_index" value="$FormIndex)]}">
+EOH
+            $r .= qq(<a name="wikiform-$FormIndex"></a>) if $UA =~ m#Mozilla/[12]\.#;
+	    $r .= $fmt{form_input}->replace ($definition, $param);
+	    $r .= "</form>\n" if $param->{output}->{form};
+            $r;
+       } else {  ## No input-interface WikiForm
+	   qq(<a id="wikiform-$FormIndex" name="wikiform-$FormIndex"><!-- #form --></a>);
+       }
+    } else {
+        qq(<ins class="wiki-error">@{[&Resource('Error:WikiForm:EmbedIsNotSupported',escape=>1)]}</ins>);
+    }
+}}
 
 sub print_message {
     my ($msg) = @_;
-    print qq(<p><strong>$msg</strong></p>);
+    print qq(<p><strong>@{[&escape($msg)]}</strong></p>);
 }
 
 sub init_form {
-    if (param()) {
-        foreach my $var (param()) {
-            $form{$var} = param($var);
-        }
-    } else {
-        $ENV{QUERY_STRING} = $FrontPage;
-    }
-
-    my $query = &decode($ENV{QUERY_STRING});
-    if ($page_command{$query}) {
+    ## TODO: Support multipart/form-data
+    my $query = '';
+    if (uc $main::ENV{REQUEST_METHOD} eq 'POST') {
+      read STDIN, $query, $main::ENV{CONTENT_LENGTH};
+    }
+    $query .= ($query ? ';' : '') . $main::ENV{QUERY_STRING};
+    if ($main::ENV{REQUEST_METHOD} ne 'POST' && $main::ENV{QUERY_STRING} && $main::ENV{QUERY_STRING} !~ /[&;=]/) {
+      my $query = &decode($main::ENV{QUERY_STRING});
+      $query = &code_convert(\$query, $kanjicode);
+      if ($page_command{$query}) {
         $form{mycmd} = $page_command{$query};
         $form{mypage} = $query;
-    } elsif ($query =~ /^($wiki_name)$/) {
-        $form{mycmd} = 'read';
-        $form{mypage} = $1;
-    } elsif ($database{$query}) {
-        $form{mycmd} = 'read';
+      } else {
         $form{mypage} = $query;
+        $form{mycmd} = $database{$form{mypage}} ? 'read' : 'edit';
+      }
+    } else {
+      for (split /[;&]/, $query) {
+        if (my ($n, $v) = split /=/, $_, 2) {
+          for ($n, $v) {tr/+/ /; s/%([0-9A-Fa-f][0-9A-Fa-f])/pack 'C', hex $1/ge};
+          $form{$n} = $v;
+        }
+      }
+      unless (defined $form{mypage}) {
+        $form{mypage} = $form{epage};
+        $form{mypage} =~ s/([0-9A-F]{2})/ord hex $1/g;
+      }
+      if ($page_command{$form{mypage}} && $form{mycmd} eq 'read') {
+        $form{mypage} = &code_convert(\$form{mypage}, $kanjicode);
+        $form{mycmd} = $page_command{$form{mypage}};
+      }
     }
+    $form{mypage} ||= 'HomePage';
+    $form{mycmd} ||= 'read';
 
     # mypreview_edit        -> do_edit, with preview.
     # mypreview_adminedit   -> do_adminedit, with preview.
@@ -785,92 +825,73 @@
         }
     }
 
-    #
+    # 
     # $form{mycmd} is frozen here.
-    #
+    # 
 
+    for (grep /^wikiform__/, keys %form) {
+	$form{$_} = &code_convert (\$form{$_}, $kanjicode);
+    }
     $form{mymsg} = &code_convert(\$form{mymsg}, $kanjicode);
     $form{myname} = &code_convert(\$form{myname}, $kanjicode);
 }
 
 sub update_recent_changes {
-    my $update = "- @{[&get_now]} @{[&armor_name($form{mypage})]} @{[&get_subjectline($form{mypage})]}";
-    my @oldupdates = split(/\r?\n/, $database{$RecentChanges});
+    my $update = "- @{[&get_now]} [[$form{mypage}]] @{[&get_subjectline($form{mypage})]}";
+    my @oldupdates = split(/\x0D?\x0A/, $database{RecentChanges});
+    shift @oldupdates; ## '#?' magic line
     my @updates;
     foreach (@oldupdates) {
-        /^\- \d\d\d\d\-\d\d\-\d\d \(...\) \d\d:\d\d:\d\d (\S+)/;    # date format.
-        my $name = &unarmor_name($1);
-        if (&is_exist_page($name) and ($name ne $form{mypage})) {
-            push(@updates, $_);
+        /^\- \d\d\d\d\-\d\d\-\d\d \d\d:\d\d \[\[([^]]+)\]\]/;
+        my $name = $1;
+        if ($name ne $form{mypage}) {
+            push @updates, $_;
         }
     }
     if (&is_exist_page($form{mypage})) {
-        unshift(@updates, $update);
+      unshift @updates, $update;
     }
-    splice(@updates, $maxrecent + 1);
-    $database{$RecentChanges} = join("\n", @updates);
-    if ($file_touch) {
-        open(FILE, "> $file_touch");
+    splice @updates, (&Resource ('RecentChanges:Max') || 50) + 1;
+    $database{RecentChanges} = "#?SuikaWiki/0.9\n" . join("\n", @updates);
+    if ($PathTo{TouchFile}) {
+        open(FILE, "> ".$PathTo{TouchFile});
         print FILE localtime() . "\n";
         close(FILE);
     }
 }
 
+{my %SubjectLine;
 sub get_subjectline {
     my ($page, %option) = @_;
-    if (not &is_editable($page)) {
-        return "";
+    unless (defined $SubjectLine{$page}) {
+      if (not &is_editable($page)) {
+        $SubjectLine{$page} = "";
+      } else {
+        $SubjectLine{$page} = $database{$page};
+        $SubjectLine{$page} =~ s!^\#\?[^\x0A\x0D]+[\x0A\x0D]*!!s;
+        $SubjectLine{$page} =~ s/\x0D?\x0A.*//s;
+      }
+    }
+    if (length $SubjectLine{$page}) {
+      $option{delimiter} = defined $option{delimiter} ? $option{delimiter} : &Resource('Title-Summary Delimiter');
+      $option{delimiter}.$SubjectLine{$page}.$option{tail};
     } else {
-        # Delimiter check.
-        my $delim = $subject_delimiter;
-        if (defined($option{delimiter})) {
-            $delim = $option{delimiter};
-        }
-
-        # Get the subject of the page.
-        my $subject = $database{$page};
-        $subject =~ s/\r?\n.*//s;
-        return "$delim$subject";
+      '';
     }
-}
-
-sub send_mail_to_admin {
-    my ($page, $mode) = @_;
-    return unless $modifier_sendmail;
-    my $message = <<"EOD";
-To: $modifier_mail
-From: $modifier_mail
-Subject: [Wiki]
-MIME-Version: 1.0
-Content-Type: text/plain; charset=ISO-2022-JP
-Content-Transfer-Encoding: 7bit
-
---------
-MODE = $mode
-REMOTE_ADDR = $ENV{REMOTE_ADDR}
-REMOTE_HOST = $ENV{REMOTE_HOST}
---------
-$page
---------
-$database{$page}
---------
-EOD
-    &code_convert(\$message, 'jis');
-    open(MAIL, "| $modifier_sendmail");
-    print MAIL $message;
-    close(MAIL);
-}
+}}
 
 sub open_db {
     if ($modifier_dbtype eq 'dbmopen') {
-        dbmopen(%database, $dataname, 0666) or &print_error("(dbmopen) $dataname");
-        dbmopen(%infobase, $infoname, 0666) or &print_error("(dbmopen) $infoname");
+        dbmopen(%database, $PathTo{WikiDataBase}, 0666) or &print_error("(dbmopen) $PathTo{WikiDataBase}");
+        dbmopen(%infobase, $PathTo{WikiInfoBase}, 0666) or &print_error("(dbmopen) $PathTo{WikiInfoBase}");
     } elsif ($modifier_dbtype eq 'AnyDBM_File') {
-        tie(%database, "AnyDBM_File", $dataname, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $dataname");
-        tie(%infobase, "AnyDBM_File", $infoname, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $infoname");
-    } else {
-        tie(%database, "Yuki::YukiWikiDB", $dataname) or &print_error("(tie Yuki::YukiWikiDB) $dataname");
-        tie(%infobase, "Yuki::YukiWikiDB", $infoname) or &print_error("(tie Yuki::YukiWikiDB) $infoname");
+        eval q{use AnyDBM_File};
+        tie(%database, "AnyDBM_File", $PathTo{WikiDataBase}, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $PathTo{WikiDataBase}");
+        tie(%infobase, "AnyDBM_File", $PathTo{WikiInfoBase}, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $PathTo{WikiInfoBase}");
+    } else {
+        eval q{use Yuki::YukiWikiDB};
+        tie(%database, "Yuki::YukiWikiDB", $PathTo{WikiDataBase}) or &print_error("(tie Yuki::YukiWikiDB) $PathTo{WikiDataBase}");
+        tie(%infobase, "Yuki::YukiWikiDB", $PathTo{WikiInfoBase}) or &print_error("(tie Yuki::YukiWikiDB) $PathTo{WikiInfoBase}");
     }
 }
 
@@ -889,11 +910,11 @@
 
 sub open_diff {
     if ($modifier_dbtype eq 'dbmopen') {
-        dbmopen(%diffbase, $diffname, 0666) or &print_error("(dbmopen) $diffname");
+        dbmopen(%diffbase, $PathTo{WikiDiffBase}, 0666) or &print_error("(dbmopen) $PathTo{WikiDiffBase}");
     } elsif ($modifier_dbtype eq 'AnyDBM_File') {
-        tie(%diffbase, "AnyDBM_File", $diffname, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $diffname");
+        tie(%diffbase, "AnyDBM_File", $PathTo{WikiDiffBase}, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $PathTo{WikiDiffBase}");
     } else {
-        tie(%diffbase, "Yuki::YukiWikiDB", $diffname) or &print_error("(tie Yuki::YukiWikiDB) $diffname");
+        tie(%diffbase, "Yuki::YukiWikiDB", $PathTo{WikiDiffBase}) or &print_error("(tie Yuki::YukiWikiDB) $PathTo{WikiDiffBase}");
     }
 }
 
@@ -907,17 +928,6 @@
     }
 }
 
-sub print_searchform {
-    my ($word) = @_;
-    print <<"EOD";
-<form action="$url_cgi" method="get">
-    <input type="hidden" name="mycmd" value="search">
-    <input type="text" name="mymsg" value="$word" size="20">
-    <input type="submit" value="$resource{searchbutton}">
-</form>
-EOD
-}
-
 sub print_editform {
     my ($mymsg, $lastmodified, %mode) = @_;
     my $frozen = &is_frozen($form{mypage});
@@ -925,52 +935,72 @@
     if ($form{mypreview}) {
         if ($form{mymsg}) {
             unless ($mode{conflict}) {
-                print qq(<h3>$resource{previewtitle}</h3>\n);
-                print qq($resource{previewnotice}\n);
+                print qq(<h3>@{[&Resource('Preview:Title',escape=>1)]}</h3>\n);
+                print qq(<p>@{[&Resource('Preview:Notice',escape=>1)]}</p>\n);
                 print qq(<div class="preview">\n);
                 &print_content($form{mymsg});
                 print qq(</div>\n);
             }
         } else {
-            print qq($resource{previewempty});
+            print @{[&Resource('Preview:Empty',escape=>1)]};
         }
         $mymsg = &escape($form{mymsg});
     } else {
-        $mymsg = &escape($mymsg);
+        $mymsg = &escape($mymsg || $database{NewPageTemplate});
     }
+    my $magic = '';
+    $magic = $1 if $mymsg =~ m/^([^\x0A\x0D]+)/s;
 
     my $edit = $mode{admin} ? 'adminedit' : 'edit';
+    my $escapedmypage = &escape($form{mypage});
+    my $escapedmypassword = &escape($form{mypassword});
+    my $selected = 'read';
+    if ($form{after_edit_cmd}) {
+	$selected = $form{after_edit_cmd};
+    } elsif ($magic =~ /Const|Config|CSS/) {
+	$selected = 'edit';
+    }
+    my $afteredit = <<EOH;
+<select name="after_edit_cmd">
+<option value="read" label="@{[&Resource('Edit:SaveAndView',escape=>1)]}"@{[$selected eq 'read' ? ' selected="selected"':'']}>@{[&Resource('Edit:SaveAndView',escape=>1)]}</option>
+<option value="edit" label="@{[&Resource('Edit:SaveAndEdit',escape=>1)]}"@{[$selected eq 'edit' ? ' selected="selected"':'']}>@{[&Resource('Edit:SaveAndEdit',escape=>1)]}</option>
+</select>
+EOH
 
     print <<"EOD";
 <form action="$url_cgi" method="post">
-    @{[ $mode{admin} ? qq($resource{frozenpassword} <input type="password" name="mypassword" value="$form{mypassword}" size="10"><br>) : "" ]}
+<h2>@{[&Resource('Edit:Title',escape=>1)]}</h2>
+    @{[ $mode{conflict} ? '' : qq(<input type="submit" name="mypreview_write" value="@{[&Resource('Edit:Save',escape=>1)]}"><kbd>S</kbd>) ]}
+    @{[ $mode{admin} ? qq(<label>@{[&Resource('Edit:Password=',escape=>1)]}<input type="password" name="mypassword" value="$escapedmypassword" size="10"></label>) : "" ]} [@{[do {my $n = 0;
+               $mymsg =~ s/(?:-+\s)?\[([0-9]+)\]/$n = $1 if $1 > $n; $&/mge;
+               ++$n}]}]<br>
     <input type="hidden" name="myLastModified" value="$lastmodified">
-    <input type="hidden" name="mypage" value="$form{mypage}">
-    <textarea cols="$cols" rows="$rows" name="mymsg" wrap="off">$mymsg</textarea><br>
+    <input type="hidden" name="mypage" value="$escapedmypage">
+    <textarea cols="@{[&Resource('Edit:Form:Cols')+0||80]}" rows="@{[&Resource('Edit:Form:Rows')+0||20]}" name="mymsg" tabindex="1">$mymsg</textarea><br>
 @{[
     $mode{admin} ?
     qq(
-    <input type="radio" name="myfrozen" value="1" @{[$frozen ? qq(checked="checked") : ""]}>$resource{frozenbutton}
-    <input type="radio" name="myfrozen" value="0" @{[$frozen ? "" : qq(checked="checked")]}>$resource{notfrozenbutton}<br>)
+    <label><input type="radio" name="myfrozen" value="1" @{[$frozen ? qq(checked="checked") : ""]}>@{[&Resource('Edit:Freeze',escape=>1)]}</label>
+    <label><input type="radio" name="myfrozen" value="0" @{[$frozen ? "" : qq(checked="checked")]}>@{[&Resource('Edit:DontFreeze',escape=>1)]}</label><br>)
     : ""
 ]}
 @{[
     $mode{conflict} ? "" :
     qq(
-        <input type="checkbox" name="mytouch" value="on" checked="checked">$resource{touch}<br>
-        <input type="submit" name="mypreview_$edit" value="$resource{previewbutton}">
-        <input type="submit" name="mypreview_write" value="$resource{savebutton}"><br>
+        <input type="checkbox" name="mytouch" value="on" checked="checked">@{[&Resource('Edit:UpdateTimeStamp',escape=>1)]}<br>
+        <input type="submit" name="mypreview_$edit" value="@{[&Resource('Edit:Preview',escape=>1)]}">
+        <input type="submit" name="mypreview_write" value="@{[&Resource('Edit:Save',escape=>1)]}" accesskey="S"><kbd>S</kbd>
+       $afteredit
+       <br>
     )
 ]}
 </form>
 EOD
     unless ($mode{conflict}) {
-        # Show the format rule.
-        open(FILE, $file_format) or &print_error("($file_format)");
-        my $content = join('', <FILE>);
-        &code_convert(\$content, $kanjicode);
-        close(FILE);
-        print &text_to_html($content, toc=>0);
+        ## Show help text
+        my $help = $database{WikiEditHelp};
+        $help =~ s!^\#\?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.\x0D\x0A][^\x0D\x0A]*)?)[\x0D\x0A]+!!s;
+        print &text_to_html ($help, toc => 0);
     }
 }
 
@@ -978,25 +1008,17 @@
         print <<"EOD";
 <form action="$url_cgi" method="post">
     <input type="hidden" name="mycmd" value="adminchangepassword">
-    $resource{oldpassword} <input type="password" name="myoldpassword" size="10"><br>
-    $resource{newpassword} <input type="password" name="mynewpassword" size="10"><br>
-    $resource{newpassword2} <input type="password" name="mynewpassword2" size="10"><br>
-    <input type="submit" value="$resource{changepasswordbutton}"><br>
+    <label>@{[&Resource('Password:Old=',escape=>1)]}<input type="password" name="myoldpassword" size="10"></label><br>
+    <label>@{[&Resource('Password:New1=',escape=>1)]}<input type="password" name="mynewpassword" size="10"></label><br>
+    <label>@{[&Resource('Password:New2=',escape=>1)]}<input type="password" name="mynewpassword2" size="10"></label><br>
+    <input type="submit" value="@{[&Resource('WikiForm:Change',escape=>1)]}"><br>
 </form>
 EOD
 }
 
 sub is_editable {
     my ($page) = @_;
-    if (&is_bracket_name($page)) {
-        return 0;
-    } elsif ($fixedpage{$page}) {
-        return 0;
-    } elsif ($page =~ /\s/) {
-        return 0;
-    } elsif ($page =~ /^\#/) {
-        return 0;
-    } elsif ($page =~ /^$interwiki_name$/) {
+    if ($fixedpage{$page} || $page =~ /\s/ || $page =~ /^\#/) {
         return 0;
     } else {
         return 1;
@@ -1006,36 +1028,20 @@
 # armor_name:
 #   WikiName -> WikiName
 #   not_wiki_name -> [[not_wiki_name]]
-sub armor_name {
-    my ($name) = @_;
-    if ($name =~ /^$wiki_name$/) {
-        return $name;
-    } else {
-        return "[[$name]]";
-    }
-}
+sub armor_name { qq([[$_[0]]]) }
 
 # unarmor_name:
 #   [[bracket_name]] -> bracket_name
 #   WikiName -> WikiName
 sub unarmor_name {
     my ($name) = @_;
-    if ($name =~ /^$bracket_name$/) {
+    if ($name =~ /^\[\[(\S+?)\]\]$/) {
         return $1;
     } else {
         return $name;
     }
 }
 
-sub is_bracket_name {
-    my ($name) = @_;
-    if ($name =~ /^$bracket_name$/) {
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
 sub decode {
     my ($s) = @_;
     $s =~ tr/+/ /;
@@ -1056,80 +1062,40 @@
     return $encoded;
 }
 
-sub init_resource {
-    open(FILE, $file_resource) or &print_error("(resource)");
-    while (<FILE>) {
-        chomp;
-        next if /^#/;
-        my ($key, $value) = split(/=/, $_, 2);
-        $resource{$key} = &code_convert(\$value, $kanjicode);
-    }
-    close(FILE);
-}
-
 sub conflict {
     my ($page, $rawmsg) = @_;
     if ($form{myLastModified} eq &get_info($page, $info_LastModified)) {
         return 0;
     }
-    open(FILE, $file_conflict) or &print_error("(conflict)");
-    my $content = join('', <FILE>);
-    &code_convert(\$content, $kanjicode);
-    close(FILE);
-    &print_header($page);
-    &print_content($content);
+    &print_header($page, -noindex => 1);
+    &print_content(&Resource('Error:Conflict'));
     &print_editform($rawmsg, $form{myLastModified}, frozen=>0, conflict=>1);
     &print_footer($page);
     return 1;
 }
 
 sub get_now {
-    my (@week) = qw(Sun Mon Tue Wed Thu Fri Sat);
-    my ($sec, $min, $hour, $day, $mon, $year, $weekday) = localtime(time);
+    my ($sec, $min, $hour, $day, $mon, $year) = localtime(time);
     $year += 1900;
     $mon++;
     $mon = "0$mon" if $mon < 10;
     $day = "0$day" if $day < 10;
     $hour = "0$hour" if $hour < 10;
     $min = "0$min" if $min < 10;
-    $sec = "0$sec" if $sec < 10;
-    $weekday = $week[$weekday];
-    return "$year-$mon-$day ($weekday) $hour:$min:$sec";
+    #$sec = "0$sec" if $sec < 10;
+    return "$year-$mon-$day $hour:$min";
 }
 
-# [[YukiWiki http://www.hyuki.com/yukiwiki/wiki.cgi?euc($1)]]
 sub init_InterWikiName {
-    my $content = $database{$InterWikiName};
-    while ($content =~ /\[\[(\S+) +(\S+)\]\]/g) {
-        my ($name, $url) = ($1, $2);
-        $interwiki{$name} = $url;
+  my @content = split /\n/, $database{InterWikiName};
+  for (@content) {
+    if (/^([^#]\S*)\s+(\S[^\x0A\x0D]+)/) {
+      $interwiki{$1} = $2;
     }
+  }
+  $interwiki{'[[]]'} = 1;	## dummy
 }
 
-sub interwiki_convert {
-    my ($type, $localname) = @_;
-    if ($type eq 'sjis' or $type eq 'euc') {
-        &code_convert(\$localname, $type);
-        return &encode($localname);
-    } elsif ($type eq 'ykwk') {
-        # for YukiWiki1
-        if ($localname =~ /^$wiki_name$/) {
-            return $localname;
-        } else {
-            &code_convert(\$localname, 'sjis');
-            return &encode("[[" . $localname . "]]");
-        }
-    } elsif ($type eq 'asis') {
-        return $localname;
-    # Walrus add (4) start
-    } elsif ($type eq 'isbn') {
-        $localname = join('', ($localname =~ /[0-9x]/g)) if ($localname =~ /^(\d-?){9}[\dx]$/);
-        return $localname;
-    # Walrus add (4) end
-    } else {
-        return $localname;
-    }
-}
 
 sub get_info {
     my ($page, $key) = @_;
@@ -1158,14 +1124,14 @@
         # You are admin.
         return 0;
     } else {
-        &print_error($resource{passworderror});
+        &print_error(&Resource('Error:PasswordIsIncorrect'));
         return 1;
     }
 }
 
 sub valid_password {
     my ($givenpassword) = @_;
-    my ($validpassword_crypt) = &get_info($AdminSpecialPage, $info_AdminPassword);
+    my ($validpassword_crypt) = &get_info($PageName{AdminSpecialPage}, 'AdminPassword');
     if (crypt($givenpassword, $validpassword_crypt) eq $validpassword_crypt) {
         return 1;
     } else {
@@ -1184,14 +1150,36 @@
 
 sub do_comment {
     my ($content) = $database{$form{mypage}};
-    my $datestr = &get_now;
-    my $namestr = $form{myname} ? " ''[[$form{myname}]]'' : " : " ";
-    if ($content =~ s/(\Q$embed_comment\E)/- $datestr$namestr$form{mymsg}\n$1/) {
-        ;
-    } else {
-        $content =~ s/(\Q$embed_rcomment\E)/$1\n- $datestr$namestr$form{mymsg}/;
+    my $default_name;	## this code does not strict.
+    $default_name = $1 if $content =~ /default-name="([^"]+)"/;
+    my $datestr = '[WEAK['.&get_now.']]';
+    my $namestr = $form{myname} || $default_name || &Resource('WikiForm:WikiComment:DefaultName');
+    ($namestr = '', $datestr = '') if $form{myname} eq 'nodate';
+    if ($namestr =~ /^(?:>>)?[0-9]/) {
+      $namestr = qq( ''$namestr'': );
+    } elsif (length $namestr) {
+      $namestr = qq( ''[[$namestr]]'': );
+    }
+    my $anchor = &get_new_anchor_index ($content);
+    my $i = 1;  my $o = 0;
+    $content =~ s{(\[\[\#r?comment\]\])}{
+      my $embed = $1;
+      if ($i == $form{comment_index}) {
+        if ($embed ne '[[#rcomment]]') {
+          $embed = "- [$anchor] $datestr$namestr$form{mymsg}\n$embed";  $o = 1;
+        } else {
+          $embed .= "\n- [$anchor] $datestr$namestr$form{mymsg}";  $o = 1;
+        }
+      }
+      $i++; $embed;
+    }ge;
+    unless ($o) {
+      $content = "#?SuikaWiki/0.9\n\n" unless $content;
+      $content .= "\n" unless $content =~ /\n$/s;
+      $content .= "- [$anchor] $datestr$namestr$form{mymsg}\n";
     }
-    if ($form{mymsg}) {
+    $form{__comment_anchor_index} = $anchor;
+    if ($form{mymsg} || $form{myname}) {
         $form{mymsg} = $content;
         $form{mytouch} = 'on';
         &do_write;
@@ -1201,137 +1189,153 @@
     }
 }
 
+sub get_new_anchor_index ($) {
+    my $content = shift;
+    my $anchor = 0;
+    $content =~ s/^(?:[-=]+\s*)?\[([0-9]+)\]/$anchor = $1 if $1 > $anchor; $&/mge;
+    $anchor + 1;
+}
+
+my $CommentIndex = 0;
 sub embedded_to_html {
     my ($embedded) = @_;
-    if ($embedded eq $embed_comment or $embedded eq $embed_rcomment) {
+    if ($embedded eq '[[#comment]]' or $embedded eq '[[#rcomment]]') {
+      unless ($main::_EMBEDED) {
         my $lastmodified = &get_info($form{mypage}, $info_LastModified);
         return <<"EOD";
-<form action="$url_cgi" method="post">
+<form action="$url_cgi" method="post" id="x-comment-@{[++$CommentIndex]}" class="comment"><p>
     <input type="hidden" name="mycmd" value="comment">
     <input type="hidden" name="mypage" value="$form{mypage}">
     <input type="hidden" name="myLastModified" value="$lastmodified">
     <input type="hidden" name="mytouch" value="on">
-    $resource{yourname}
-    <input type="text" name="myname" value="" size="10">
-    <input type="text" name="mymsg" value="" size="40">
-    <input type="submit" value="$resource{commentbutton}">
-</form>
+    <input type="hidden" name="comment_index" value="$CommentIndex">
+    @{[&Resource('WikiForm:WikiComment:Name=',escape=>1)]}
+    <input type="text" name="myname" value="" size="10" class="comment-name">
+    <input type="text" name="mymsg" value="" size="60" class="comment-msg">
+    <input type="submit" value="@{[&Resource('WikiForm:Add',escape=>1)]}" title="@{[&Resource('WikiForm:AddLong',escape=>1)]}" class="comment-submit">
+</p></form>
+EOD
+     } else {
+        return <<"EOD";
+<del><form action="$url_cgi" method="get">
+    <input type="hidden" name="mycmd" value="read">
+    <input type="hidden" name="mypage" value="$form{mypage}">
+    @{[&Resource('WikiForm:WikiComment:Name=',escape=>1)]}
+    <input type="text" name="myname" value="" size="10" disabled="disabled">
+    <input type="text" name="mymsg" value="" size="60" disabled="disabled">
+</form></del>
 EOD
-    # Walrus add (5) start
-    } elsif ($embedded =~ /$embed_interwiki/ and my $remoteurl = $interwiki{$2}) {
-        $_ = &make_interwiki_box($1, $2);
-        return ($_) ? $_ : $embedded;
-    # Walrus add (5) end
-    } else {
-        return $embedded;
+    }
+  } elsif ($embedded =~ /$embed_command{searched}/) {
+    return get_search_result ($1, -match_myself => 1);
+  } elsif ($embedded =~ /^\[\[\#embed:(.+)\]\]$/) {
+    my ($name, $r) = ($1, '');
+    if ($main::_EMBEDED != 1) {
+      my ($content, $cf) = ($database{$name}, 'SuikaWiki/0.9');
+      $cf = $1 if $content =~ s!^(?:[\#<]\?|/\*\s*)?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.][^\x0D\x0A]*)?)[\x0D\x0A]+!!s;
+      if ($cf =~ m!^(?:\#\?)?SuikaWiki/0.9(?:$|\s)!) {
+        $main::_EMBEDED = 1;
+        $r = &text_to_html ($content, content_format => $cf);
+        $main::_EMBEDED = 0;
+      } elsif (length $content) {
+        $r = "<pre>@{[&escape ($content)]}</pre>";
+      } else {
+        $r = &text_to_html ("[INS[\n[[$name]]: @{[&Resource('Embed:PageNotFound')]}\n]INS]\n", content_format => 'SuikaWiki/0.9');
+      }
+    } else {	## nested #EMBED
+      $r = &text_to_html ("[INS[\n[[$name]]: @{[&Resource('Embed:Nested',escape=>1)]}\n]INS]\n", content_format => 'SuikaWiki/0.9');
+    }
+    return qq(<blockquote title="@{[&escape($name)]}" class="wiki-embed">$r<div class="cite-note">『<cite><a href="$url_cgi?@{[&encode($name)]}" class="wiki">@{[&escape($name)]}</a></cite>』</div></blockquote>);
+  } elsif ($embedded =~ /^\[\[\#randomlink:(.+)\]\]$/) {
+    return qq(<a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink">$1</a>);
+  } else {
+    return $embedded;
+  }
+}
+
+sub load_formatter (@) {
+    for my $t (@_) {
+	unless ($fmt{$t}) {
+	    require Message::Util::Formatter;
+	    $fmt{$t} = Message::Util::Formatter->new;
+	    for (@{$SuikaWiki::Plugin::List{'wiki'.$t}||[]}) {
+		$_->load_formatter ($fmt{$t}, type => 'wiki'.$t);
+	    }
+	}
     }
 }
 
-# Walrus add (5) start
-sub do_interwiki_box {
-    my $remoteurl = $interwiki{$form{'myintername'}};
-    if ($remoteurl) {
-        $remoteurl =~ s/\b(euc|sjis|ykwk|asis|isbn)\(\$1\)/&interwiki_convert($1, $form{'mylocalname'})/e;
-        print "Location: $remoteurl\n\n";
-        exit(1);
+sub do_wikiform {
+    my $content = $database{$form{mypage}};
+    my $anchor = &get_new_anchor_index ($content);
+    &load_formatter (qw/form_template form_option/);
+    my $write = 0;
+    my $i = 1;
+    $content =~ s{$embed_command{form}}{
+	my ($embed, $wfname, $template, $option) = ($&, $1, $3, $4);
+	if (($wfname && $wfname eq $form{wikiform_targetform})
+	    || $i == $form{wikiform_index}) {
+	    $template =~ s/\\(.)/$1/g;
+	    $option =~ s/\\(.)/$1/g;
+	    my $param = bless {}, 'SuikaWiki::Plugin';
+	    $param->{page} = $form{mypage};
+	    $param->{form_index} = $i;
+	    $param->{form_name} = $wfname;
+	    $param->{anchor_index} = $anchor;
+	    $param->{argv} = \%form;
+	    $param->{default_name} = $1 if $content =~ /default-name="([^"]+)"/;
+            $param->{default_name} ||= &Resource('WikiForm:WikiComment:DefaultName');
+	    $fmt{form_option}->replace ($option, $param);
+            my $t = 1;
+            for (@{$param->{require}||[]}) {
+                (undef $t, last) unless length $param->{argv}->{'wikiform__'.$_};
+            }
+	    $t = $fmt{form_template}->replace ($template, $param) if $t;
+	    if (length $t) {
+		if ($param->{output}->{reverse}) {
+		    $embed .= "\n" . $t;
+		} else {
+		    $embed = $t . "\n" . $embed;
+		}
+		$write = 1;
+                $form{__comment_anchor_index} = $anchor
+                  if $param->{anchor_index_};  ## $anchor is used!
+            }
+            $form{__wikiform_anchor_index} = $i;
+            undef $form{wikiform_targetform};  ## make sure never to match
+            undef $form{wikiform_index};       ## with WikiForm in rest of page
+	}
+	$i++; $embed;
+    }ge;
+    unless ($write) {
+      #$content = "#?SuikaWiki/0.9\n\n" unless $content;
+      #$content .= "\n" unless $content =~ /\n$/s;
+      #
+    }
+    if ($write) {
+        $form{mymsg} = $content;
+        $form{mytouch} = 'on';
+        &do_write;
     } else {
+        $form{mycmd} = 'read';
         &do_read;
     }
 }
-# Walrus add (5) end
-
-# Walrus add (5) start
-sub make_interwiki_box {
-    my ($localname, $intername) = @_;
-    my %ignoretype = (
-        'box'      => 'text',
-        'text'     => 'text',
-        'pass'     => 'password',
-        'password' => 'password'
-    );
-    my $converted = ($ignoretype{$localname}) ? <<EOD : undef;
-<form action="$url_cgi" method="post">
-    <input type="hidden" name="mycmd" value="interwikibox">
-    <input type="hidden" name="mypage" value="$form{mypage}">
-    <input type="hidden" name="myintername" value="$intername">
-    $intername:
-    <input type="$ignoretype{$localname}" name="mylocalname" value="" size="10">
-    <input type="submit" value="Submit">
-</form>
-EOD
-}
-# Walrus add (5) end
 
 sub code_convert {
-    my ($contentref, $kanjicode) = @_;
-#   &Jcode::convert($contentref, $kanjicode);       # for Jcode.pm
-    &jcode::convert($contentref, $kanjicode);       # for jcode.pl
+  require Jcode;
+    my ($contentref, $code) = (shift, shift || $kanjicode);
+    $code = 'jis' if $code =~ /iso/;
+    $code = 'euc' if $code =~ /euc/;
+    $code = 'sjis' if $code =~ /shift/;
+    $code = 'utf8' if $code =~ /utf/;
+    #&Jcode::convert($contentref, $code);       # for Jcode.pm
+#    &jcode::convert($contentref, $code);       # for jcode.pl
+    #&Jcode::tr ($contentref, "\xA3\xB0-\xA3\xB9\xA3\xC1-\xA3\xDA\xA3\xE1-\xA3\xFA\xA1\xF5\xA1\xA4\xA1\xA5\xA1\xA7\xA1\xA8\xA1\xA9\xA1\xAA\xA1\xAE\xA1\xB0\xA1\xB2\xA1\xBF\xA1\xC3\xA1\xCA\xA1\xCB\xA1\xCE\xA1\xCF\xA1\xD0\xA1\xD1\xA1\xDC\xA1\xF0\xA1\xF3\xA1\xF4\xA1\xF6\xA1\xF7\xA1\xE1\xA2\xAF\xA2\xB0\xA2\xB2\xA2\xB1\xA1\xE4\xA1\xE3\xA1\xC0\xA1\xA1" => q(0-9A-Za-z&,.:;?!`^_/|()[]{}+$%#*@='"~-><\ )) if $code eq 'euc';
+    $$contentref = Jcode->new ($contentref)->tr ("\xA3\xB0-\xA3\xB9\xA3\xC1-\xA3\xDA\xA3\xE1-\xA3\xFA\xA1\xF5\xA1\xA4\xA1\xA5\xA1\xA7\xA1\xA8\xA1\xA9\xA1\xAA\xA1\xAE\xA1\xB0\xA1\xB2\xA1\xBF\xA1\xC3\xA1\xCA\xA1\xCB\xA1\xCE\xA1\xCF\xA1\xD0\xA1\xD1\xA1\xDC\xA1\xF0\xA1\xF3\xA1\xF4\xA1\xF6\xA1\xF7\xA1\xE1\xA2\xAF\xA2\xB0\xA2\xB2\xA2\xB1\xA1\xE4\xA1\xE3\xA1\xC0\xA1\xA1" => q(0-9A-Za-z&,.:;?!`^_/|()[]{}+$%#*@='"~-><\ ))->$code;
     return $$contentref;
 }
 
-sub test_convert {
-    my $txt = &text_to_html(<<"EOD", toc=>1);
-*HEADER1
-**HEADER1-1
--ITEM1
--ITEM2
--ITEM3
-PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
-PAR1PAR1PAR1PAR1PAR1PAR1''BOLD''PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
-PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
-
-PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2
-PAR2PAR2PAR2PAR2PAR2PAR2'''ITALIC'''PAR2PAR2PAR2PAR2PAR2PAR2PAR2
-PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2
-**HEADER1-2
-:TERM1:DESCRIPTION1 AND ''BOLD''
-PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
-PAR1PAR1PAR1PAR1PAR1PAR1''BOLD''PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
-PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
-:TERM2:DESCRIPTION2
-:TERM3:DESCRIPTION3
-----
-*HEADER2
-**HEADER2-1
-http://www.hyuki.com/
-**HEADER2-2
-
-[[YukiWiki2]]
-
-PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
-PAR1PAR1PAR1PAR1PAR1PAR1'''''BOLD ITALIC'''''PAR1PAR1PAR1PAR1PAR1
-PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
->PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2
->PAR2PAR2PAR2PAR2PAR2PAR2'''ITALIC'''PAR2PAR2PAR2PAR2PAR2PAR2PAR2
->PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2
-
-LEVEL0LEVEL0LEVEL0LEVEL0LEVEL0LEVEL0LEVEL0
-
->LEVEL1
->LEVEL1
->LEVEL1
->>LEVEL2
->>LEVEL2
->>LEVEL2
->>>LEVEL3
--HELLO-1
---HELLO-2
-(HELLO-2, HELLO-2, HELLO-2)
----HELLO-3
-(HELLO-3, HELLO-3, HELLO-3)
---HELLO-2
----HELLO-3
---HELLO-2
----HELLO-3
->>>LEVEL3
->>>LEVEL3
->>>LEVEL3
->>>LEVEL3
-EOD
-    print $txt;
-    exit;
-}
-
 sub do_diff {
     if (not &is_editable($form{mypage})) {
         &do_read;
@@ -1339,17 +1343,17 @@
     }
     &open_diff;
     my $title = $form{mypage};
-    &print_header($title);
+    &print_header($title, -noindex => 1);
     $_ = &escape($diffbase{$form{mypage}});
     &close_diff;
-    print qq(<h3>$resource{difftitle}</h3>);
-    print qq($resource{diffnotice});
+    print qq(<h3>@{[&Resource('Diff:Title',escape=>1)]}</h3>);
+    print qq(<p>@{[&Resource('Diff:Notice',escape=>1)]}</p>);
     print qq(<pre class="diff">);
     foreach (split(/\n/, $_)) {
         if (/^\+(.*)/) {
-            print qq(<b class="added">$1</b>\n);
+            print qq(<ins class="added">$1</ins>\n);
         } elsif (/^\-(.*)/) {
-            print qq(<s class="deleted">$1</s>\n);
+            print qq(<del class="deleted">$1</del>\n);
         } elsif (/^\=(.*)/) {
             print qq(<span class="same">$1</span>\n);
         } else {
@@ -1357,44 +1361,56 @@
         }
     }
     print qq(</pre>);
-    print qq(<hr>);
     &print_footer($title);
 }
 
 sub do_rss {
+    eval q{use Yuki::RSS};
     my $rss = new Yuki::RSS(
         version => '1.0',
-        encoding => $charset,
+        encoding => &get_charset_name ($kanjicode),
+    );
+    my $scheme = 'http';
+    $scheme = lc $1 if $main::ENV{SERVER_PROTOCOL} =~ m#([A-Za-z0-9+.%-]+)#;
+    my $myuri = "$scheme://$main::ENV{SERVER_NAME}:$main::ENV{SERVER_PORT}$url_cgi";
+    $rss->stylesheet (
+      href	=> $myuri . "?mycmd=TEXT_CSS;mypage=WikiStyle:RSS",
+      type	=> 'text/css',
     );
     $rss->channel(
-        title => $modifier_rss_title,
-        link  => $modifier_rss_link,
-        description => $modifier_rss_description,
+        title	=> &Resource ('RSS:WikiTitle'),
+        link	=> $myuri,
+        description	=> &Resource ('RSS:WikiDescription'),
+        'dc:language'	=> $lang,
     );
-    my $recentchanges = $database{$RecentChanges};
+    my $recentchanges = $database{RecentChanges};
     my $count = 0;
     foreach (split(/\n/, $recentchanges)) {
         last if ($count >= 15);
-        /^\- \d\d\d\d\-\d\d\-\d\d \(...\) \d\d:\d\d:\d\d (\S+)/;    # date format.
-        my $title = &unarmor_name($1);
-        my $escaped_title = &escape($title);
-        my $link = $modifier_rss_link . '?' . &encode($title);
-        my $description = $escaped_title . &escape(&get_subjectline($title));
-        $rss->add_item(
-            title => $escaped_title,
-            link  => $link,
-            description => $description,
-        );
-        $count++;
+        if (/\[\[([^]]+)\]\]/) {
+          my $title = $1;
+          $rss->add_item (
+            title	=> &escape($title),
+            link	=> $myuri . '?' . &encode($title),
+            description	=> &escape(&get_subjectline($title,delimiter=>'')),
+            'dc:date'	=> &get_info ($title, $info_LastModified),
+          );
+          $count++;
+        }
     }
     # print RSS information (as XML).
     print <<"EOD"
-Content-type: text/xml
+Content-type: application/xml; charset=@{[&get_charset_name ($kanjicode)]}
 
 @{[$rss->as_string]}
 EOD
 }
 
+sub _rfc3339_date ($) {
+  my @time = gmtime (shift);
+  sprintf '%04d-%02d-%02dT%02d:%02d:%02d+00:00', $time[5]+1900,$time[4]+1,@time[3,2,1,0];
+}
+
 sub is_exist_page {
     my ($name) = @_;
     if ($use_exists) {
@@ -1404,11 +1420,289 @@
     }
 }
 
+sub __get_database ($) { $database{ $_[0] } }
+sub __set_database ($$) { $database{ $_[0] } = $_[1] }
+
+sub do_map {
+    my $page = $form{mypage};
+    &print_header ($page);
+    wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
+    wiki::useragent::add ($ENV{HTTP_USER_AGENT});
+    my ($r, $c) = get_search_result ($form{mypage});
+    my $rl = wiki::referer::list_html ($form{mypage});
+    print "<h2>@{[&Resource('Map:Title',escape=>1)]}</h2>\n<p>@{[&Resource('Map:Description',escape=>1)]}</p>\n";
+    my %option = (level => 0+&Resource('Map:Depth'), weight_list => {}, not_exist => {},
+      map_from_here => &Resource('Map:FromHere'),
+      map_from_here_description => &Resource('Map:FromHereLong'));
+    &wiki::map::make_list ($page, %option);
+    print &wiki::map::list_to_html ($page, $option{weight_list}, %option);
+    if ($c) {
+      print qq{<h2 id="wikipage-see-also">@{[&Resource('SeeAlso',escape=>1)]}</h2>};
+      print $r;
+    }
+    if ($rl) {
+      print qq(<div id="wikipage-referer"><h2>@{[&Resource('Referers',escape=>1)]}</h2>\n$rl</div>\n);
+    }
+    &print_footer ($page);
+}
+
+my %_Resource;
+sub Resource ($;%) {
+  my ($s, %o) = @_;
+  unless (defined $_Resource{$s}) {
+    $_Resource{$_[0]} = &wiki::resource::get ($s, $_Resource{__option});
+  }
+  $o{escape} ? &escape ($_Resource{$s}) : $_Resource{$s};
+}
+
+package wiki::referer;
+sub add ($$) {
+  my $page = shift;
+  my $uri = shift;
+  unless (ref $uri) {
+    require URI;
+    $uri = URI->new ($uri);
+    ## Some schemes do not have query part.
+    eval q{ $uri->query (undef) if $uri->query =~ /^[0-9]{6,8}$/ };
+    $uri->fragment (undef);
+  }
+  $uri = $uri->canonical;
+  return unless $uri;
+  for my $regex (&get_dont_record) {
+    return if $uri =~ /$regex/;
+  }
+  my %list = get ($page);
+  $list{ $uri }++;
+  set ($page, \%list);
+}
+sub get ($) {
+  my $page = shift;
+  split /"/, main::get_info ($page, 'Referer');
+}
+sub set ($%) {
+  my $page = shift;
+  my $list = shift;
+  main::set_info ($page, Referer => join '"', %$list);
+}
+
+sub get_dont_record () {
+  map {s/\$/\\\$/g; s/\@/\\\@/g; $_}
+  grep !/^#/,
+  split /[\x0D\x0A]+/, &main::__get_database ('RefererDontRecord');
+}
+sub get_site_name () {
+  my @lines = grep /[^#]/, split /[\x0D\x0A]+/, &main::__get_database('RefererSiteName');
+  my @item;
+  for (@lines) {
+    next if /^#/;
+    my ($uri, $name) = split /\s+/, $_, 2;
+    $uri =~ s/\$/\\\$/g;  $uri =~ s/\@/\\\@/g;  $uri =~ s/\//\\\//g;
+    $name =~ s!([()/\\])!\\$1!g;  $name =~ s/\$([0-9]+)/).__decode (\${$1}).q(/g;
+    push @item, [$uri, qq(q($name))];
+  }
+  @item;
+}
+
+sub list_html ($) {
+  my $page = shift;
+  my %list = get ($page);
+  my $r = '';
+  my @name = get_site_name;
+  for my $uri (sort keys %list) {
+    my $title;
+    for my $item (@name) {
+      if ($uri =~ /$item->[0]/) {
+        $title = $uri;
+        eval qq{\$title =~ s/^.*$item->[0].*\$/$item->[1]/e}
+          or die $@ ;#. qq{\$title =~ s/^.*$item->[0].*\$/$item->[1]/e};
+        last;
+      }
+    }
+    my $euri = main::escape ($uri);
+    if ($title) {
+      $r .= qq(<li>[$list{$uri}] <a href="$euri" title="URI: &lt;$euri&gt;">@{[main::escape ($title)]}</a></li>\n);
+    } else {
+      $r .= qq(<li>[$list{$uri}] &lt;<a href="$euri">$euri</a>&gt;</li>\n);
+    }
+  }
+  $r ? qq(<ul>$r</ul>\n) : '';
+}
+
+sub __decode ($) {
+  my $s = shift;
+  $s =~ tr/+/ /;
+  $s =~ s/%([0-9A-Fa-f][0-9A-Fa-f])/chr hex $1/ge;
+  main::code_convert (\$s);
+}
+
+package wiki::useragent;
+
+sub add ($) {
+  my $s = shift;
+  return unless length $s;
+  $s =~ s/([\x00-\x08\x0A-\x1F\x25\x7F-\xFF])/sprintf '%%%02X', unpack 'C', $1/ge;
+  my %ua;
+  for (split /\n/, &main::__get_database('WikiUserAgentList')) {
+    if (/^-\[(\d+)\] (.+)$/) {
+      my ($t, $n) = ($1, $2);
+      $n =~ tr/\x0A\x0D//d;
+      $ua{$n} = $t;
+    }
+  }
+  $ua{$s}++;
+  my $s = qq(#?SuikaWiki/0.9\n);
+  for (sort {$ua{$a} <=> $ua{$b}} keys %ua) {
+    $s .= sprintf qq(-[%d] %s\n), $ua{$_}, $_;
+  }
+  &main::__set_database ('WikiUserAgentList' => $s);
+}
+
+package wiki::suikawikiconst;
+
+sub to_hash ($;$) {
+  my $page = shift;
+  my $h = shift || {};
+  my $val;
+  for my $line (split /\n/, $page) {
+    $line =~ tr/\x0A\x0D//d;
+    if ($val && $line =~ s/^\s+//) {
+      $h->{$val} .= length $h->{$val} ? "\n" . $line : $line;
+    } elsif ($line =~ /^(.+):/) {
+      $val = $1; $h->{$val} = '';
+    }
+  }
+  $h;
+}
+
+package SuikaWiki::Plugin;
+  our $plugin_directory;  # defined in top of this file.
+  our %List;
+
+sub escape ($$) { main::escape ($_[1]) }
+sub unescape ($$) { main::unescape ($_[1]) }
+sub encode ($$) { main::encode ($_[1]) }
+sub decode ($$) { main::decode ($_[1]) }
+sub __get_datetime ($) { main::get_now () }
+sub resource ($$;%) { shift; &main::Resource (@_) }
+sub uri ($$) { $main::uri{$_[1]} }
+
+sub regist ($@) {
+    my $pack = shift;
+    for (@_) {
+	push @{$List{$_}}, $pack;
+    }
+}
+
+sub import_plugins () {
+    opendir PDIR, $plugin_directory;
+    my @plugin = grep {s/\.pm$//} readdir (PDIR);
+    closedir PDIR;
+    for (@plugin) {
+	eval qq{ use SuikaWiki::Plugin::$_ } unless /[^A-Za-z0-9_]/;
+	push @{$List{_all}}, qq(SuikaWiki::Plugin::$_);
+    }
+}
+
+&import_plugins ();
+
+package wiki::conneg;
+
+## BUG: this parser isn't strict.
+sub get_accept_lang (;$) {
+  my $alang = shift || $main::ENV{HTTP_ACCEPT_LANGUAGE};
+  my %alang = (ja => 0.0002, en => 0.0001);
+  my $i = 0.1;
+  for (split /\s*,\s*/, $alang) {
+    tr/\x09\x0A\x0D\x20//d;
+    if (/((?:(?!;q=).)+)(?:;q="?([0-9.]+)"?)?/) {
+      my $l = lc $1; $l =~ tr/\x22\x5C//d;
+      $alang{$l} = (defined $2 ? $2 : 1.000)*1000;
+      $alang{$l} += $i unless $alang{$l} == 0;
+      $i -= 0.001;
+    }
+  }
+  \%alang;
+}
+
+package wiki::resource;
+
+sub get ($;\%) {
+  my ($resname, $option) = @_;
+  $option->{accept_language} ||= &wiki::conneg::get_accept_lang ();
+  $option->{resource} ||= {};
+  my $v;
+  for my $lang (sort {$option->{accept_language}->{$b} <=> $option->{accept_language}->{$a}} grep {$option->{accept_language}->{$_}!=0} keys %{$option->{accept_language}}) {
+    while (length $lang) {
+      unless ($option->{accept_language}->{defined $option->{accept_language}->{$lang} ? $lang : '*'} == 0) {
+        $option->{resource}->{$lang} ||= &wiki::suikawikiconst::to_hash (&main::__get_database('WikiResource:'.$lang));
+        $v = $option->{resource}->{$lang}->{$resname};
+        last if defined $v;
+      }
+      $lang =~ s/[^+-]*$//; $lang =~ s/[+-]$//;
+    }
+    last if defined $v;
+  }
+  defined $v ? $v : $resname;
+}
+
+package wiki::map;
+
+sub make_list ($;%) {
+  my ($page, %option) = @_;
+  $option{level} ||= 3;
+  my %weight;
+  my $content = &main::__get_database ($page);
+  $content =~ s{^\#\?([^\x0A\x0D]+)}{
+    if ($1 =~ /import="([^"]+)"/) {
+      for (split /\s*,\s*/, $1) {
+        $weight{$_} += 2;
+      }
+    }
+    $&;
+  }ges;
+  ## Bug: this code does not support content type.
+  $content =~ s{\[\[((?!\#)[^]]+)\](?:>>\d+)?\]}{
+    $weight{$1}++; $&;
+  }ge;
+  delete $weight{$page};	## Delete myself
+  for my $page (keys %weight) {
+    my $w = ($content =~ s/\Q$page\E/$&/g);
+    $weight{$page} += $w + $weight{$page}; ## Weight of [[name]] is x2.
+    ($weight{$page} *= 0.1, $option{not_exist}->{$page} = 1) unless &main::is_exist_page ($page);
+  }
+  $option{weight_list}->{$page} = \%weight;
+  if (--$option{level}) {
+    for my $page (keys %weight) {
+      &make_list ($page, %option) unless $option{weight_list}->{$page};
+    }
+  }
+  $option{weight_list};
+}
+
+sub list_to_html ($$;%) {
+  my ($Page, $wlist, %option) = @_;
+  my $r = '';
+  $option{outputed}->{$Page} = 1;
+  for my $page (sort {$wlist->{$Page}->{$b} <=> $wlist->{$Page}->{$a}} keys %{$wlist->{$Page}}) {
+    $r .= qq(<li><span class="weight">[@{[0+$wlist->{$Page}->{$page}]}]</span> <a href="$main::url_cgi?@{[&main::encode($page)]}" class="wiki@{[$option{not_exist}->{$page}?' not-exist':'']}">@{[&main::escape ($page).($option{not_exist}->{$page}?qq(<span class="mark">@{[&main::Resource('JumpAndEditWikiPageMark',escape=>1)]}</span>):'')]}</a> <a href="$main::url_cgi?mycmd=map;mypage=@{[&main::encode($page)]}" class="wiki-cmd map-from-here" title="@{[&main::escape($option{map_from_here_description})]}">@{[&main::escape($option{map_from_here})]}</a> <span class="summary">@{[&main::escape(&main::get_subjectline($page))]}</span>);
+    unless ($option{outputed}->{$page}) {
+      $r .= &list_to_html ($page, $wlist, %option);
+    }
+    $r .= "</li>\n";
+  }
+  $r ? qq(<ul class="map">$r</ul>) : '';
+}
+
+package main;
+&main;
+exit 0;
+
 1;
 __END__
 =head1 NAME
 
 wiki.cgi - This is YukiWiki, yet another Wiki clone.
+walwiki.cgi based on yukiwiki.cgi - Yet another WikiWikiWeb clone.
 
 =head1 DESCRIPTION