diff -ru pukiwiki-1.4.4.puny/lib/auth.php pukiwiki-1.4.4/lib/auth.php
--- pukiwiki-1.4.4.puny/lib/auth.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/lib/auth.php	2005-01-02 14:19:32.000000000 +0900
@@ -22,7 +22,7 @@
 	if (is_freeze($page))
 	{
 		$body .= "(<a href=\"$script?cmd=unfreeze&amp;page=".
-			rawurlencode($page)."\">$_msg_unfreeze</a>)";
+			punyencode($page)."\">$_msg_unfreeze</a>)";
 	}
 
 	$page = str_replace('$1',make_search($page),$_title_cannotedit);
diff -ru pukiwiki-1.4.4.puny/lib/func.php pukiwiki-1.4.4/lib/func.php
--- pukiwiki-1.4.4.puny/lib/func.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/lib/func.php	2005-01-02 14:00:55.000000000 +0900
@@ -209,7 +209,7 @@
 		return array_keys($pages);
 	}
 
-	$r_word = rawurlencode($word);
+	$r_word = punyencode($word);
 	$s_word = htmlspecialchars($word);
 	if (count($pages) == 0) {
 		return str_replace('$1', $s_word, $_msg_notfoundresult);
@@ -219,7 +219,7 @@
 	$retval = "<ul>\n";
 	foreach ($pages as $page=>$time)
 	{
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 		$s_page = htmlspecialchars($page);
 		$passage = get_passage($time);
 		$retval .= " <li><a href=\"$script?cmd=read&amp;page=$r_page&amp;word=$r_word\">$s_page</a>$passage</li>\n";
@@ -284,7 +284,7 @@
 	$list = $matches = array();
 	foreach($pages as $file=>$page)
 	{
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 		$s_page = htmlspecialchars($page, ENT_QUOTES);
 		$passage = get_pg_passage($page);
 
diff -ru pukiwiki-1.4.4.puny/lib/html.php pukiwiki-1.4.4/lib/html.php
--- pukiwiki-1.4.4.puny/lib/html.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/lib/html.php	2005-01-02 14:01:28.000000000 +0900
@@ -19,18 +19,18 @@
 	global $modifierlink;      // 編集者の名前
 
 	$_page = $vars['page'];
-	$r_page = rawurlencode($_page);
+	$r_page = punyencode($_page);
 
 	$link_add      = "$script?cmd=add&amp;page=$r_page";
 	$link_edit     = "$script?cmd=edit&amp;page=$r_page";
 	$link_diff     = "$script?cmd=diff&amp;page=$r_page";
-	$link_top      = "$script?".rawurlencode($defaultpage);
+	$link_top      = "$script?".punyencode($defaultpage);
 	$link_list     = "$script?cmd=list";
 	$link_filelist = "$script?cmd=filelist";
 	$link_search   = "$script?cmd=search";
-	$link_whatsnew = "$script?".rawurlencode($whatsnew);
+	$link_whatsnew = "$script?".punyencode($whatsnew);
 	$link_backup   = "$script?cmd=backup&amp;page=$r_page";
-	$link_help     = "$script?".rawurlencode($help_page);
+	$link_help     = "$script?".punyencode($help_page);
 	$link_rss      = "$script?cmd=rss10";
 	$link_freeze   = "$script?cmd=freeze&amp;page=$r_page";
 	$link_unfreeze = "$script?cmd=unfreeze&amp;page=$r_page";
@@ -170,7 +170,7 @@
 		}
 	}
 
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 	$s_page = htmlspecialchars($page);
 	$s_digest = htmlspecialchars($digest);
 	$s_postdata = htmlspecialchars($refer.$postdata);
@@ -228,7 +228,7 @@
 		{
 			continue;
 		}
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 		$s_page = htmlspecialchars($page);
 		$passage = get_passage($lastmod);
 		$_links[] = $tag ?
@@ -293,7 +293,7 @@
 	global $script,$WikiName;
 
 	$s_page = htmlspecialchars($page);
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 
 	//WikiWikiWeb like...
 	//if(preg_match("/^$WikiName$/",$page))
diff -ru pukiwiki-1.4.4.puny/lib/make_link.php pukiwiki-1.4.4/lib/make_link.php
--- pukiwiki-1.4.4.puny/lib/make_link.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/lib/make_link.php	2005-01-02 14:00:34.000000000 +0900
@@ -658,8 +658,8 @@
 		return "<a href=\"$anchor\">$s_alias</a>";
 	}
 
-	$r_page = rawurlencode($page);
-	$r_refer = ($refer == '') ? '' : '&amp;refer='.rawurlencode($refer);
+	$r_page = punyencode($page);
+	$r_refer = ($refer == '') ? '' : '&amp;refer='.punyencode($refer);
 
 	if (!array_key_exists($page,$related) and $page != $vars['page'] and is_page($page))
 	{
diff -ru pukiwiki-1.4.4.puny/lib/trackback.php pukiwiki-1.4.4/lib/trackback.php
--- pukiwiki-1.4.4.puny/lib/trackback.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/lib/trackback.php	2005-01-02 14:12:03.000000000 +0900
@@ -94,7 +94,7 @@
 		return;
 	}
 
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 	$excerpt = strip_htmltag(convert_html(get_source($page)));
 
 	// 自文書の情報
@@ -162,7 +162,7 @@
 		return '';
 	}
 
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 	$tb_id = tb_get_id($page);
 	// $dcdate = substr_replace(get_date('Y-m-d\TH:i:sO',$time),':',-2,0);
 	// dc:date="$dcdate"
diff -ru pukiwiki-1.4.4.puny/plugin/amazon.inc.php pukiwiki-1.4.4/plugin/amazon.inc.php
--- pukiwiki-1.4.4.puny/plugin/amazon.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/amazon.inc.php	2005-01-02 14:03:12.000000000 +0900
@@ -166,7 +166,7 @@
   global $amazon_body;
   global $asin, $asin_ext, $asin_all;
 
-  $asin_all = htmlspecialchars(rawurlencode(strip_bracket($vars['asin'])));
+  $asin_all = htmlspecialchars(punyencode(strip_bracket($vars['asin'])));
   if (! is_asin()) {
     $retvars['msg'] = "ブックレビュー編集";
     $retvars['refer'] = $vars['refer'];
@@ -178,7 +178,7 @@
 
   $s_page = $vars['refer'];
   $r_page = $s_page . '/' . $asin;
-  $r_page_url = rawurlencode($r_page);
+  $r_page_url = punyencode($r_page);
 
   if ($edit_auth and (!isset($_SERVER['PHP_AUTH_USER']) or !array_key_exists($_SERVER['PHP_AUTH_USER'],$edit_auth_users) or
       $edit_auth_users[$_SERVER['PHP_AUTH_USER']] != $_SERVER['PHP_AUTH_PW'])) {
diff -ru pukiwiki-1.4.4.puny/plugin/aname.inc.php pukiwiki-1.4.4/plugin/aname.inc.php
--- pukiwiki-1.4.4.puny/plugin/aname.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/aname.inc.php	2005-01-02 14:12:21.000000000 +0900
@@ -26,7 +26,7 @@
 	$body = count($args) ? preg_replace('/<\/?a[^>]*>/', '', array_pop($args)) : '';
 
 	$class   = in_array('super', $args) ? 'anchor_super' : 'anchor';
-	$url     = in_array('full',  $args) ? "$script?" . rawurlencode($vars['page']) : '';
+	$url     = in_array('full',  $args) ? "$script?" . punyencode($vars['page']) : '';
 	$attr_id = in_array('noid',  $args) ? '' : " id=\"$id\"";
 
 	return "<a class=\"$class\"$attr_id href=\"$url#$id\" title=\"$id\">$body</a>";
diff -ru pukiwiki-1.4.4.puny/plugin/article.inc.php pukiwiki-1.4.4/plugin/article.inc.php
--- pukiwiki-1.4.4.puny/plugin/article.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/article.inc.php	2005-01-02 14:12:39.000000000 +0900
@@ -152,7 +152,7 @@
 			$mailbody .= "\n\n---\n";
 			$mailbody .= $_msg_article_mail_sender . $post['name'] . " ($now)\n";
 			$mailbody .= $_msg_article_mail_page . $post['refer'] . "\n";
-			$mailbody .= '　 URL: ' . $script . '?' . rawurlencode($post['refer']) . "\n";
+			$mailbody .= '　 URL: ' . $script . '?' . punyencode($post['refer']) . "\n";
 			$mailbody = mb_convert_encoding( $mailbody, "JIS" );
 
 			$mailaddheader = "From: " . MAIL_FROM;
diff -ru pukiwiki-1.4.4.puny/plugin/attach.inc.php pukiwiki-1.4.4/plugin/attach.inc.php
--- pukiwiki-1.4.4.puny/plugin/attach.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/attach.inc.php	2005-01-02 14:13:13.000000000 +0900
@@ -331,7 +331,7 @@
 {
 	global $script, $vars, $_attach_messages;
 
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 	$s_page = htmlspecialchars($page);
 	$navi = <<<EOD
   <span class="small">
@@ -442,7 +442,7 @@
 		global $script, $_attach_messages;
 
 		$this->getstatus();
-		$param  = '&amp;file=' . rawurlencode($this->file) . '&amp;refer=' . rawurlencode($this->page) .
+		$param  = '&amp;file=' . punyencode($this->file) . '&amp;refer=' . punyencode($this->page) .
 			($this->age ? '&amp;age=' . $this->age : '');
 		$title = $this->time_str . ' ' . $this->size_str;
 		$label = ($showicon ? FILE_ICON : '') . htmlspecialchars($this->file);
@@ -451,7 +451,7 @@
 		}
 		$info = $count = '';
 		if ($showinfo) {
-			$_title = str_replace('$1', rawurlencode($this->file), $_attach_messages['msg_info']);
+			$_title = str_replace('$1', punyencode($this->file), $_attach_messages['msg_info']);
 			$info = "\n<span class=\"small\">[<a href=\"$script?plugin=attach&amp;pcmd=info$param\" title=\"$_title\">{$_attach_messages['btn_info']}</a>]</span><br />\n";
 			$count = ($showicon && ! empty($this->status['count'][$this->age])) ?
 				sprintf($_attach_messages['msg_count'], $this->status['count'][$this->age]) : '';
@@ -464,7 +464,7 @@
 	{
 		global $script, $_attach_messages;
 
-		$r_page = rawurlencode($this->page);
+		$r_page = punyencode($this->page);
 		$s_page = htmlspecialchars($this->page);
 		$s_file = htmlspecialchars($this->file);
 		$s_err = ($err == '') ? '' : '<p style="font-weight:bold">' . $_attach_messages[$err] . '</p>';
diff -ru pukiwiki-1.4.4.puny/plugin/back.inc.php pukiwiki-1.4.4/plugin/back.inc.php
--- pukiwiki-1.4.4.puny/plugin/back.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/back.inc.php	2005-01-02 14:13:29.000000000 +0900
@@ -43,7 +43,7 @@
 		$hr = trim(strip_tags($argv[2]));
 	}
 	if (func_num_args() > 3) {
-		$href = rawurlencode(trim(strip_tags($argv[3])));
+		$href = punyencode(trim(strip_tags($argv[3])));
 		if ($href == '') $href = 'javascript:history.go(-1)';
 	}
 
diff -ru pukiwiki-1.4.4.puny/plugin/backup.inc.php pukiwiki-1.4.4/plugin/backup.inc.php
--- pukiwiki-1.4.4.puny/plugin/backup.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/backup.inc.php	2005-01-02 14:13:45.000000000 +0900
@@ -21,7 +21,7 @@
 	if ($page) {
 		check_readable($page, true, true);
 		$s_page = htmlspecialchars($page);
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 	} else {
 		return array('msg'=>$_title_backuplist, 'body'=>get_backup_list_all());
 	}
@@ -33,7 +33,7 @@
 			return plugin_backup_delete($page);
 		}
 		$s_action = htmlspecialchars($action);
-		$r_action = rawurlencode($action);
+		$r_action = punyencode($action);
 	}
 
 	$s_age  = (isset($vars['age']) && is_numeric($vars['age'])) ? $vars['age'] : 0;
@@ -176,7 +176,7 @@
 	global $_msg_backuplist, $_msg_diff, $_msg_nowdiff, $_msg_source, $_msg_nobackup;
 	global $_title_backup_delete;
 
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 	$s_page = htmlspecialchars($page);
 	$retval = array();
 	$retval[0] = <<<EOD
diff -ru pukiwiki-1.4.4.puny/plugin/bugtrack.inc.php pukiwiki-1.4.4/plugin/bugtrack.inc.php
--- pukiwiki-1.4.4.puny/plugin/bugtrack.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/bugtrack.inc.php	2005-01-02 14:15:11.000000000 +0900
@@ -43,7 +43,7 @@
 
 	if ($post['mode'] == 'submit') {
 		$page = plugin_bugtrack_write($post['base'], $post['pagename'], $post['summary'], $post['name'], $post['priority'], $post['state'], $post['category'], $post['version'], $post['body']);
-		header("Location: $script?".rawurlencode($page));
+		header("Location: $script?".punyencode($page));
 		die;
 	}
 	return FALSE;
diff -ru pukiwiki-1.4.4.puny/plugin/calendar.inc.php pukiwiki-1.4.4/plugin/calendar.inc.php
--- pukiwiki-1.4.4.puny/plugin/calendar.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/calendar.inc.php	2005-01-02 14:15:24.000000000 +0900
@@ -75,7 +75,7 @@
 
 	$m_name = "$year.$m_num ($cmd)";
 
-	$prefix_url = rawurlencode(is_pagename($pre) ? $pre : "[[$pre]]");
+	$prefix_url = punyencode(is_pagename($pre) ? $pre : "[[$pre]]");
 	$pre = strip_bracket($pre);
 
 	$ret = <<<EOD
@@ -105,10 +105,10 @@
 	{
 		$dt = sprintf('%04d%02d%02d', $year, $m_num, $day);
 		$name = "$prefix$dt";
-		$r_page = rawurlencode($name);
+		$r_page = punyencode($name);
 		$s_page = htmlspecialchars($name);
 
-		$refer = ($cmd == "edit") ? '&amp;refer='.rawurlencode($page) : '';
+		$refer = ($cmd == "edit") ? '&amp;refer='.punyencode($page) : '';
 
 		if ($cmd == 'read' and !is_page($name))
 			$link = "<strong>$day</strong>";
diff -ru pukiwiki-1.4.4.puny/plugin/calendar2.inc.php pukiwiki-1.4.4/plugin/calendar2.inc.php
--- pukiwiki-1.4.4.puny/plugin/calendar2.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/calendar2.inc.php	2005-01-02 14:03:51.000000000 +0900
@@ -32,9 +32,9 @@
 	else {
 		$prefix = $base.'/';
 	}
-	$r_base = rawurlencode($base);
+	$r_base = punyencode($base);
 	$s_base = htmlspecialchars($base);
-	$r_prefix = rawurlencode($prefix);
+	$r_prefix = punyencode($prefix);
 	$s_prefix = htmlspecialchars($prefix);
 
 	$yr = substr($date_str,0,4);
@@ -102,7 +102,7 @@
 	while (checkdate($m_num,$day,$year)) {
 		$dt = sprintf('%4d-%02d-%02d', $year, $m_num, $day);
 		$page = $prefix.$dt;
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 		$s_page = htmlspecialchars($page);
 
 		if ($wday == 0 and $day > 1) {
@@ -141,7 +141,7 @@
 
 	if ($today_view) {
 		$tpage = $prefix.sprintf("%4d-%02d-%02d", $today['year'], $today['mon'], $today['mday']);
-		$r_tpage = rawurlencode($tpage);
+		$r_tpage = punyencode($tpage);
 		if (is_page($tpage)) {
 			$_page = $vars['page'];
 			$get['page'] = $post['page'] = $vars['page'] = $tpage;
diff -ru pukiwiki-1.4.4.puny/plugin/calendar_viewer.inc.php pukiwiki-1.4.4/plugin/calendar_viewer.inc.php
--- pukiwiki-1.4.4.puny/plugin/calendar_viewer.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/calendar_viewer.inc.php	2005-01-02 14:04:09.000000000 +0900
@@ -182,7 +182,7 @@
 			$body = str_replace('$1', $page, $_msg_calendar_viewer_restrict);
 		}
 
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 		$s_page = htmlspecialchars($page);
 		$link   = "<a href=\"$script?cmd=edit&amp;page=$r_page\">$s_page</a>";
 		$head   = "<h1>$link</h1>\n";
@@ -193,7 +193,7 @@
 
 	// ここで、前後のリンクを表示
 	// ?plugin=calendar_viewer&file=ページ名&date=yyyy-mm
-	$enc_pagename = rawurlencode(substr($pagepattern, 0, $pagepattern_len - 1));
+	$enc_pagename = punyencode(substr($pagepattern, 0, $pagepattern_len - 1));
 
 	if ($page_YM != '') {
 		// 年月表示時
diff -ru pukiwiki-1.4.4.puny/plugin/diff.inc.php pukiwiki-1.4.4/plugin/diff.inc.php
--- pukiwiki-1.4.4.puny/plugin/diff.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/diff.inc.php	2005-01-02 14:04:27.000000000 +0900
@@ -28,7 +28,7 @@
 	global $_msg_notfound, $_msg_goto, $_msg_deleted, $_msg_addline, $_msg_delline, $_title_diff;
 	global $_title_diff_delete;
 
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 	$s_page = htmlspecialchars($page);
 
 	$menu = array(
diff -ru pukiwiki-1.4.4.puny/plugin/edit.inc.php pukiwiki-1.4.4/plugin/edit.inc.php
--- pukiwiki-1.4.4.puny/plugin/edit.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/edit.inc.php	2005-01-02 14:04:54.000000000 +0900
@@ -117,7 +117,7 @@
 		page_write($page, $postdata, $notimestamp);
 
 		if ($postdata) {
-			header("Location: $script?" . rawurlencode($page));
+			header("Location: $script?" . punyencode($page));
 			exit;
 		}
 
diff -ru pukiwiki-1.4.4.puny/plugin/include.inc.php pukiwiki-1.4.4/plugin/include.inc.php
--- pukiwiki-1.4.4.puny/plugin/include.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/include.inc.php	2005-01-02 14:15:53.000000000 +0900
@@ -21,7 +21,7 @@
 	list($page) = func_get_args();
 	$page = strip_bracket($page);
 	$s_page = htmlspecialchars($page);
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 	$link = "<a href=\"$script?$r_page\">$s_page</a>"; // Read link
 
 	// Loop yourself
diff -ru pukiwiki-1.4.4.puny/plugin/includesubmenu.inc.php pukiwiki-1.4.4/plugin/includesubmenu.inc.php
--- pukiwiki-1.4.4.puny/plugin/includesubmenu.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/includesubmenu.inc.php	2005-01-02 14:18:26.000000000 +0900
@@ -47,7 +47,7 @@
   $body = convert_html(get_source($SubMenuPageName));
 
   if ($ShowPageName) {
-    $r_page = rawurlencode($SubMenuPageName);
+    $r_page = punyencode($SubMenuPageName);
     $s_page = htmlspecialchars($SubMenuPageName);
     $link = "<a href=\"$script?cmd=edit&amp;page=$r_page\">$s_page</a>";
     $body = "<h1>$link</h1>\n$body";
diff -ru pukiwiki-1.4.4.puny/plugin/ls2.inc.php pukiwiki-1.4.4/plugin/ls2.inc.php
--- pukiwiki-1.4.4.puny/plugin/ls2.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/ls2.inc.php	2005-01-02 14:18:00.000000000 +0900
@@ -98,7 +98,7 @@
 
 	if ($params['link']) {
 		$tmp = array();
-		$tmp[] = 'plugin=ls2&amp;prefix=' . rawurlencode($prefix);
+		$tmp[] = 'plugin=ls2&amp;prefix=' . punyencode($prefix);
 		if (isset($params['title'])) {
 			$tmp[] = 'title=1';
 		}
@@ -152,7 +152,7 @@
 	$is_done = (isset($params["page_$page"]) && $params["page_$page"] > 0);
 	if (! $is_done) $params["page_$page"] = ++$_ls2_anchor;
 
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 	$s_page = htmlspecialchars($page);
 	$title  = $s_page . ' ' . get_pg_passage($page, FALSE);
 	$href   = $script . '?cmd=read&amp;page=' . $r_page;
diff -ru pukiwiki-1.4.4.puny/plugin/map.inc.php pukiwiki-1.4.4/plugin/map.inc.php
--- pukiwiki-1.4.4.puny/plugin/map.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/map.inc.php	2005-01-02 14:18:11.000000000 +0900
@@ -133,7 +133,7 @@
 
 		$this->rels = $reverse ? $this->ref() : $this->rel();
 		$mark = $reverse ? '' : '<sup>+</sup>';
-		$this->mark = "<a id=\"rel_{$this->id}\" href=\"$script?plugin=map&amp;refer=".rawurlencode($this->page)."\">$mark</a>";
+		$this->mark = "<a id=\"rel_{$this->id}\" href=\"$script?plugin=map&amp;refer=".punyencode($this->page)."\">$mark</a>";
 	}
 	function ref()
 	{
diff -ru pukiwiki-1.4.4.puny/plugin/navi.inc.php pukiwiki-1.4.4/plugin/navi.inc.php
--- pukiwiki-1.4.4.puny/plugin/navi.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/navi.inc.php	2005-01-02 14:18:50.000000000 +0900
@@ -117,7 +117,7 @@
 				if ($_page != '')
 				{
 					$s_page = htmlspecialchars($_page);
-					$r_page = rawurlencode($_page);
+					$r_page = punyencode($_page);
 					$head_tags[] = " <link rel=\"$rel\" href=\"$script?$r_page\" title=\"$s_page\" />";
 				}
 			}
diff -ru pukiwiki-1.4.4.puny/plugin/newpage.inc.php pukiwiki-1.4.4/plugin/newpage.inc.php
--- pukiwiki-1.4.4.puny/plugin/newpage.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/newpage.inc.php	2005-01-02 14:17:44.000000000 +0900
@@ -39,9 +39,9 @@
 		return $retvars;
 	}
 	$page = strip_bracket($vars['page']);
-	$r_page = rawurlencode(array_key_exists('refer',$vars) ?
+	$r_page = punyencode(array_key_exists('refer',$vars) ?
 		get_fullname($page,$vars['refer']) : $page);
-	$r_refer = rawurlencode($vars['refer']);
+	$r_refer = punyencode($vars['refer']);
 
 	header("Location: $script?cmd=read&page=$r_page&refer=$r_refer");
 	die();
diff -ru pukiwiki-1.4.4.puny/plugin/paint.inc.php pukiwiki-1.4.4/plugin/paint.inc.php
--- pukiwiki-1.4.4.puny/plugin/paint.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/paint.inc.php	2005-01-02 14:18:59.000000000 +0900
@@ -90,7 +90,7 @@
 		$r_refer = $s_refer = '';
 		if (array_key_exists('refer',$vars))
 		{
-			$r_refer = rawurlencode($vars['refer']);
+			$r_refer = punyencode($vars['refer']);
 			$s_refer = htmlspecialchars($vars['refer']);
 		}
 		$link = "<p><a href=\"$script?$r_refer\">$s_refer</a></p>";;
diff -ru pukiwiki-1.4.4.puny/plugin/pcomment.inc.php pukiwiki-1.4.4/plugin/pcomment.inc.php
--- pukiwiki-1.4.4.puny/plugin/pcomment.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/pcomment.inc.php	2005-01-02 14:19:07.000000000 +0900
@@ -71,7 +71,7 @@
 		return $retval;
 	}
 
-	header("Location: $script?" . rawurlencode($refer));
+	header("Location: $script?" . punyencode($refer));
 	exit;
 }
 
diff -ru pukiwiki-1.4.4.puny/plugin/recent.inc.php pukiwiki-1.4.4/plugin/recent.inc.php
--- pukiwiki-1.4.4.puny/plugin/recent.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/recent.inc.php	2005-01-02 14:05:19.000000000 +0900
@@ -46,7 +46,7 @@
 				"<ul class=\"recent_list\">\n";
 		}
 		$s_page = htmlspecialchars($page);
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 		$pg_passage = get_pg_passage($page, FALSE);
 		if($page == $vars['page']) {
 			// No need to link itself, notifies where you just read
diff -ru pukiwiki-1.4.4.puny/plugin/ref.inc.php pukiwiki-1.4.4/plugin/ref.inc.php
--- pukiwiki-1.4.4.puny/plugin/ref.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/ref.inc.php	2005-01-02 14:16:09.000000000 +0900
@@ -269,8 +269,8 @@
 		$is_image = (! $params['noimg'] && preg_match(PLUGIN_REF_IMAGE, $name));
 
 		// Count downloads with attach plugin
-		$url = $script . '?plugin=attach' . '&amp;refer=' . rawurlencode($page) .
-			'&amp;openfile=' . rawurlencode($name); // Show its filename at the last
+		$url = $script . '?plugin=attach' . '&amp;refer=' . punyencode($page) .
+			'&amp;openfile=' . punyencode($name); // Show its filename at the last
 
 		if ($is_image) {
 			// Swap $url
@@ -279,8 +279,8 @@
 			// URI for in-line image output
 			if (! PLUGIN_REF_DIRECT_ACCESS) {
 				// With ref plugin (faster than attach)
-				$url = $script . '?plugin=ref' . '&amp;page=' . rawurlencode($page) .
-					'&amp;src=' . rawurlencode($name); // Show its filename at the last
+				$url = $script . '?plugin=ref' . '&amp;page=' . punyencode($page) .
+					'&amp;src=' . punyencode($name); // Show its filename at the last
 			} else {
 				// Try direct-access, if possible
 				$url = $file;
diff -ru pukiwiki-1.4.4.puny/plugin/referer.inc.php pukiwiki-1.4.4/plugin/referer.inc.php
--- pukiwiki-1.4.4.puny/plugin/referer.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/referer.inc.php	2005-01-02 14:20:34.000000000 +0900
@@ -129,7 +129,7 @@
 			"  <td>$s_url</td>\n" : "  <td><a href=\"$e_url\">$s_url</a></td>\n";
 		$body .= " </tr>\n";
 	}
-	$href = $script.'?plugin=referer&amp;page='.rawurlencode($page);
+	$href = $script.'?plugin=referer&amp;page='.punyencode($page);
 	return <<<EOD
 <table border="1" cellspacing="1" summary="Referer">
  <tr>
diff -ru pukiwiki-1.4.4.puny/plugin/rename.inc.php pukiwiki-1.4.4/plugin/rename.inc.php
--- pukiwiki-1.4.4.puny/plugin/rename.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/rename.inc.php	2005-01-02 14:05:28.000000000 +0900
@@ -472,7 +472,7 @@
 	{
 		$page = RENAME_LOGPAGE;
 	}
-	header("Location: $script?" . rawurlencode($page));
+	header("Location: $script?" . punyencode($page));
 	die();
 }
 
diff -ru pukiwiki-1.4.4.puny/plugin/rss.inc.php pukiwiki-1.4.4/plugin/rss.inc.php
--- pukiwiki-1.4.4.puny/plugin/rss.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/rss.inc.php	2005-01-02 14:14:06.000000000 +0900
@@ -28,7 +28,7 @@
 	foreach ($lines as $line)
 	{
 		list($time,$page) = explode("\t",rtrim($line));
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 		$title = mb_convert_encoding($page,'UTF-8',SOURCE_ENCODING);
 		$desc = get_date('D, d M Y H:i:s T',$time);
 		$items .= <<<EOD
@@ -43,7 +43,7 @@
 
 	header('Content-type: application/xml');
 
-	$r_whatsnew = rawurlencode($whatsnew);
+	$r_whatsnew = punyencode($whatsnew);
 
 	print <<<EOD
 <?xml version="1.0" encoding="UTF-8"?>
diff -ru pukiwiki-1.4.4.puny/plugin/rss10.inc.php pukiwiki-1.4.4/plugin/rss10.inc.php
--- pukiwiki-1.4.4.puny/plugin/rss10.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/rss10.inc.php	2005-01-02 14:14:14.000000000 +0900
@@ -29,7 +29,7 @@
 	foreach ($lines as $line)
 	{
 		list($time,$page) = explode("\t",rtrim($line));
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 		$title = mb_convert_encoding($page,'UTF-8',SOURCE_ENCODING);
 		// 'O'が出力する時刻を'+09:00'の形に整形
 		$dc_date = substr_replace(get_date('Y-m-d\TH:i:sO',$time),':',-2,0);
@@ -62,7 +62,7 @@
 
 	header('Content-type: application/xml');
 
-	$r_whatsnew = rawurlencode($whatsnew);
+	$r_whatsnew = punyencode($whatsnew);
 
 	print <<<EOD
 <?xml version="1.0" encoding="utf-8"?>
diff -ru pukiwiki-1.4.4.puny/plugin/tb.inc.php pukiwiki-1.4.4/plugin/tb.inc.php
--- pukiwiki-1.4.4.puny/plugin/tb.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/tb.inc.php	2005-01-02 14:14:41.000000000 +0900
@@ -149,7 +149,7 @@
 	}
 
 	$title = htmlspecialchars($page);
-	$link = "$script?" . rawurlencode($page);
+	$link = "$script?" . punyencode($page);
 	$vars['page'] = $page;
 	$excerpt = strip_htmltag(convert_html(get_source($page)));
 	$excerpt = preg_replace("/&$entity_pattern;/", '', $excerpt);
@@ -188,7 +188,7 @@
 	if ($page === FALSE) {
 		return FALSE;
 	}
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 
 	$tb_title = sprintf($_tb_title, $page);
 	$tb_refer = sprintf($_tb_refer, "<a href=\"$script?$r_page\">'$page'</a>", "<a href=\"$script\">$page_title</a>");
diff -ru pukiwiki-1.4.4.puny/plugin/topicpath.inc.php pukiwiki-1.4.4/plugin/topicpath.inc.php
--- pukiwiki-1.4.4.puny/plugin/topicpath.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/topicpath.inc.php	2005-01-02 14:05:44.000000000 +0900
@@ -45,7 +45,7 @@
 
 	$topic_path = array();
 	while (! empty($parts)) {
-		$landing = rawurlencode(join('/', $parts));
+		$landing = punyencode(join('/', $parts));
 		$element = htmlspecialchars(array_pop($parts));
 		if ($b_link)  {
 			$topic_path[] = "<a href=\"$script?$landing\">$element</a>";
diff -ru pukiwiki-1.4.4.puny/plugin/tracker.inc.php pukiwiki-1.4.4/plugin/tracker.inc.php
--- pukiwiki-1.4.4.puny/plugin/tracker.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/tracker.inc.php	2005-01-02 14:16:46.000000000 +0900
@@ -169,7 +169,7 @@
 	// Writing page data, without touch
 	page_write($page, join('', $postdata), TRUE);
 
-	$r_page = rawurlencode($page);
+	$r_page = punyencode($page);
 
 	header("Location: $script?$r_page");
 	exit;
@@ -826,15 +826,15 @@
 			unset($order[$sort]);
 		}
 		$title = $this->fields[$field]->title;
-		$r_page = rawurlencode($this->page);
-		$r_config = rawurlencode($this->config->config_name);
-		$r_list = rawurlencode($this->list);
+		$r_page = punyencode($this->page);
+		$r_config = punyencode($this->config->config_name);
+		$r_list = punyencode($this->list);
 		$_order = array("$sort:$dir");
 		foreach ($order as $key=>$value)
 		{
 			$_order[] = "$key:$value";
 		}
-		$r_order = rawurlencode(join(';',$_order));
+		$r_order = punyencode(join(';',$_order));
 
 		return "[[$title$arrow>$script?plugin=tracker_list&refer=$r_page&config=$r_config&list=$r_list&order=$r_order]]";
 	}
diff -ru pukiwiki-1.4.4.puny/plugin/yetlist.inc.php pukiwiki-1.4.4/plugin/yetlist.inc.php
--- pukiwiki-1.4.4.puny/plugin/yetlist.inc.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/plugin/yetlist.inc.php	2005-01-02 14:05:53.000000000 +0900
@@ -37,13 +37,13 @@
 
 	foreach($refer as $page=>$refs)
 	{
-		$r_page = rawurlencode($page);
+		$r_page = punyencode($page);
 		$s_page = htmlspecialchars($page);
 
 		$link_refs = array();
 		foreach(array_unique($refs) as $_refer)
 		{
-			$r_refer = rawurlencode($_refer);
+			$r_refer = punyencode($_refer);
 			$s_refer = htmlspecialchars($_refer);
 
 			$link_refs[] = "<a href=\"$script?$r_refer\">$s_refer</a>";
diff -ru pukiwiki-1.4.4.puny/skin/keitai.skin.ja.php pukiwiki-1.4.4/skin/keitai.skin.ja.php
--- pukiwiki-1.4.4.puny/skin/keitai.skin.ja.php	2005-01-02 13:59:56.000000000 +0900
+++ pukiwiki-1.4.4/skin/keitai.skin.ja.php	2005-01-02 14:21:47.000000000 +0900
@@ -25,7 +25,7 @@
 
 // ページ番号
 $r_page = isset($vars['page']) ? $vars['page'] : '';
-$r_page = rawurlencode($r_page);
+$r_page = punyencode($r_page);
 $pageno = (isset($vars['p']) and is_numeric($vars['p'])) ? $vars['p'] : 0;
 $pagecount = ceil(strlen($body) / $max_size);
 $lastpage = $pagecount - 1;