BugTrack/133, BugTrack/118, BugTrack/136, BugTrack/134, BugTrack/128, BugTrack/120を一気に投入

diff --git a/.htaccess b/.htaccess
deleted file mode 100644 (file)
index 9d6a1fe..0000000
--- a/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-<IfModule mod_php4.c>\r
-    php_flag register_globals Off\r
-</IfModule>\r

diff --git a/html.php b/html.php
index 4dd7a8f..4dfcc43 100644 (file)
--- a/html.php
+++ b/html.php
@@ -1,6 +1,6 @@
 <?
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: html.php,v 1.35 2002/08/07 12:10:59 masui Exp $
+// $Id: html.php,v 1.36 2002/08/21 17:32:04 masui Exp $
 /////////////////////////////////////////////////
 
 // ËÜʸ¤ò¥Ú¡¼¥¸Ì¾¤«¤é½ÐÎÏ
@@ -24,6 +24,7 @@ function catbody($title,$page,$body)
        global $date_format,$weeklabels,$time_format,$related_link;
        global $HTTP_SERVER_VARS,$cantedit;
        global $longtaketime;
+       global $foot_explain, $note_hr;
 
        if($vars["page"] && !arg_check("backup") && $vars["page"] != $whatsnew)
        {
@@ -56,10 +57,12 @@ function catbody($title,$page,$body)
                $is_read = TRUE;
        }
 
-       //if(!$longtaketime)
-               $longtaketime = getmicrotime() - MUTIME;
+       $longtaketime = getmicrotime() - MUTIME;
        $taketime = sprintf("%01.03f",$longtaketime);
 
+       if ($foot_explain)
+               $body .= "\n$note_hr\n".join("\n",inline2($foot_explain));
+
        require(SKIN_FILE);
 }
 
@@ -71,7 +74,9 @@ function convert_html($string)
        global $user_rules,$str_rules,$line_rules,$strip_link_wall;
        global $InterWikiName, $BracketName;
 
-       global $longtaketime;
+       global $content_id;
+       $content_id++;
+       $content_count = 0;
 
        $string = rtrim($string);
        $string = preg_replace("/((\x0D\x0A)|(\x0D)|(\x0A))/","\n",$string);
@@ -87,8 +92,6 @@ function convert_html($string)
        $string = preg_replace("/^#freeze\n/","",$string);
 
        $lines = split("\n", $string);
-       $note_id = 1;
-       $foot_explain = array();
        // ³Æ¹Ô¤Î¹ÔƬ½ñ¼°¤ò³ÊǼ
        $headform = array();
        // ¸½ºß¤Î¹Ô¿ô¤òÆþ¤ì¤Æ¤ª¤³¤¦
@@ -100,7 +103,7 @@ function convert_html($string)
        $table = 0;
 
        if(preg_match("/#contents/",$string))
-               $top_link = "<a href=\"#contents\">$top</a>";
+               $top_link = "<a href=\"#contents_$content_id\">$top</a>";
 
        foreach ($lines as $line)
        {
@@ -160,9 +163,9 @@ function convert_html($string)
                                
                                $level = strlen($out[1]) + 1;
 
-                               array_push($result, "<h$level><a name=\"content:$content_id\"></a>$str $top_link</h$level>");
-                               $arycontents[] = str_repeat("-",$level-1)."<a href=\"#content:$content_id\">".strip_htmltag(make_user_rules($str))."</a>\n";
-                               $content_id++;
+                               array_push($result, "<h$level><a name=\"content_{$content_id}_$content_count\"></a>$str $top_link</h$level>");
+                               $arycontents[] = str_repeat("-",$level-1)."<a href=\"#content_{$content_id}_$content_count\">".strip_htmltag(make_user_rules($str))."</a>\n";
+                               $content_count++;
                        }
                        else if(preg_match("/^(-{1,4})(.*)/",$line,$out))
                        {
@@ -175,14 +178,14 @@ function convert_html($string)
                                else
                                {
                                        list_push($result,$saved,'ul', strlen($out[1]));
-                                       array_push($result, inline($out[2]));
+                                       array_push($result, '<li>'.inline($out[2]));
                                }
                        }
                        else if(preg_match("/^(\+{1,3})(.*)/",$line,$out))
                        {
                                $headform[$_cnt] = $out[1];
                                list_push($result,$saved,'ol', strlen($out[1]));
-                               array_push($result, inline($out[2]));
+                               array_push($result, '<li>'.inline($out[2]));
                        }
                        else if (preg_match("/^:([^:]+):(.*)/",$line,$out))
                        {
@@ -307,7 +310,7 @@ function convert_html($string)
        
        $result_last = $result = array_merge($result,$saved); $saved = array();
 
-       if($content_id != 0)
+       if($content_count != 0)
        {
                $result = array();
                $saved = array();
@@ -317,12 +320,12 @@ function convert_html($string)
                        if(preg_match("/^(-{1,3})(.*)/",$line,$out))
                        {
                                list_push($result,$saved,'ul', strlen($out[1]));
-                               array_push($result, $out[2]);
+                               array_push($result, '<li>'.$out[2]);
                        }
                }
                $result = array_merge($result,$saved); $saved = array();
                
-               $contents = "<a name=\"contents\"></a>\n";
+               $contents = "<a name=\"contents_$content_id\"></a>\n";
                $contents .= join("\n",$result);
                if($strip_link_wall)
                {
@@ -337,15 +340,6 @@ function convert_html($string)
 
        $str = join("\n", $result_last);
 
-       if($foot_explain)
-       {
-               $str .= "\n";
-               $str .= "$note_hr\n";
-               $str .= join("\n",inline2($foot_explain));
-       }
-
-       $longtaketime = getmicrotime() - $start_mtime;
-
 #      $str = preg_replace("/&((amp)|(quot)|(nbsp)|(lt)|(gt));/","&$1;",$str);
 
        return $str;
@@ -367,8 +361,9 @@ function back_push(&$result,&$saved,$tag, $level)
 }
 
 function list_push(&$result,&$saved,$tag,$level) {
+       global $_list_left_margin, $_list_margin, $_list_pad_str;
        $cont = true;
-       $open = "<$tag%s><li>";
+       $open = "<$tag%s>";
        $close = "</li></$tag>";
        
        while (count($saved) > $level or
@@ -385,19 +380,22 @@ function list_push(&$result,&$saved,$tag,$level) {
        if (count($saved) < $level) {
                $cont = false;
                array_unshift($saved, $close);
-               array_push($result, sprintf($open, " style=\"margin-left:".($margin * 3)."em\""));
-//             array_push($result, sprintf($open, " class=\"listmargin$margin\""));
+               
+               $left = $margin * $_list_margin;
+               if ($level == $margin) $left += $_list_left_margin;
+               $str = sprintf($_list_pad_str, $level, $left, $left);
+               array_push($result, sprintf($open, $str));
        }
        
        if ($cont)
-               array_push($result, '</li><li>');
+               array_push($result, '</li>');
 }
 
 // ¥¤¥ó¥é¥¤¥óÍ×ÁǤΥѡ¼¥¹ (Ãí¼á)
 function inline($line)
 {
        $line = htmlspecialchars($line);
-
+       
        $line = preg_replace("/\(\(((?:(?!\)\)).)*)\)\)/ex","make_note(\"$1\")",$line);
 
        return $line;
@@ -496,16 +494,16 @@ function get_list($withfilename)
                                if(preg_match("/([A-Z])|([a-z])/",$head,$match))
                                {
                                        if($match[1])
-                                               $head_nm = "High:$head";
+                                               $head_nm = "High_$head";
                                        else
-                                               $head_nm = "Low:$head";
+                                               $head_nm = "Low_$head";
                                        
                                        if($head_str) $retval2[$page] = "</ul></li>\n";
-                                       $retval2[$page] .= "<li><a href=\"#top:$head_nm\" name=\"$head_nm\"><strong>$head</strong></a>\n<ul>\n";
+                                       $retval2[$page] .= "<li><a href=\"#top_$head_nm\" name=\"$head_nm\"><strong>$head</strong></a>\n<ul>\n";
                                        $head_str = $head;
                                        if($link_counter) $top_link .= "|";
                                        $link_counter = $link_counter + 1;
-                                       $top_link .= "<a href=\"#$head_nm\" name=\"top:$head_nm\"><strong>&nbsp;".$head."&nbsp;</strong></a>";
+                                       $top_link .= "<a href=\"#$head_nm\" name=\"top_$head_nm\"><strong>&nbsp;".$head."&nbsp;</strong></a>";
                                        if($link_counter==16) {
                                                $top_link .= "<br />";
                                                $link_counter = 0;
@@ -516,22 +514,22 @@ function get_list($withfilename)
                                        if(!$symbol_sw)
                                        {
                                                if($head_str) $retval2[$page] = "</ul></li>\n";
-                                               $retval2[$page] .= "<li><a href=\"#top:symbol\" name=\"symbol\"><strong>$_msg_symbol</strong></a>\n<ul>\n";
+                                               $retval2[$page] .= "<li><a href=\"#top_symbol\" name=\"symbol\"><strong>$_msg_symbol</strong></a>\n<ul>\n";
                                                $head_str = $head;
                                                if($link_counter) $top_link .= "|";
                                                $link_counter = $link_counter + 1;
-                                               $top_link .= "<a href=\"#symbol\" name=\"top:symbol\"><strong>$_msg_symbol</strong></a>";
+                                               $top_link .= "<a href=\"#symbol\" name=\"top_symbol\"><strong>$_msg_symbol</strong></a>";
                                                $symbol_sw = 1;
                                        }
                                }
                                else
                                {
                                        if($head_str) $retval2[$page] = "</ul></li>\n";
-                                       $retval2[$page] .= "<li><a href=\"#top:etc\" name=\"etc\"><strong>$_msg_other</strong></a>\n<ul>\n";
+                                       $retval2[$page] .= "<li><a href=\"#top_etc\" name=\"etc\"><strong>$_msg_other</strong></a>\n<ul>\n";
                                        $etc_sw = 1;
                                        if($link_counter) $top_link .= "|";
                                        $link_counter = $link_counter + 1;
-                                       $top_link .= "<a href=\"#etc\" name=\"top:etc\"><strong>$_msg_other</strong></a>";
+                                       $top_link .= "<a href=\"#etc\" name=\"top_etc\"><strong>$_msg_other</strong></a>";
                                }
                        }
                        $retval2[$page] .= $link;
@@ -700,14 +698,14 @@ function make_note($str)
        global $note_id,$foot_explain;
 
        $str = preg_replace("/^\(\(/","",$str);
-       $str = preg_replace("/\)\)$/","",$str);
+       $str = preg_replace("/\s*\)\)$/","",$str);
 
        $str= str_replace("\\'","'",$str);
 
        $str = make_user_rules($str);
 
-       $foot_explain[] = "<a name=\"notefoot:$note_id\" href=\"#notetext:$note_id\" class=\"note_super\">*$note_id</a> <span class=\"small\">$str</span><br />\n";
-       $note =  "<a name=\"notetext:$note_id\" href=\"#notefoot:$note_id\" class=\"note_super\">*$note_id</a>";
+       $foot_explain[] = "<a name=\"notefoot_$note_id\" href=\"#notetext_$note_id\" class=\"note_super\">*$note_id</a> <span class=\"small\">$str</span><br />\n";
+       $note =  "<a name=\"notetext_$note_id\" href=\"#notefoot_$note_id\" class=\"note_super\">*$note_id</a>";
        $note_id++;
 
        return $note;

diff --git a/init.php b/init.php
index 93768b9..0408132 100644 (file)
--- a/init.php
+++ b/init.php
@@ -1,6 +1,6 @@
 <?
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: init.php,v 1.12 2002/08/03 10:28:22 masui Exp $
+// $Id: init.php,v 1.13 2002/08/21 17:32:04 masui Exp $
 /////////////////////////////////////////////////
 
 // ÀßÄê¥Õ¥¡¥¤¥ë¤Î¾ì½ê
@@ -68,8 +68,15 @@ $arg = rawurldecode((getenv('QUERY_STRING') != '')?
 //** ½é´ü½èÍý **
 $update_exec = "";
 $content_id = 0;
+
+if($usefacemark) {
+  $line_rules = array_merge($line_rules,$facemark_rules);
+}
 $user_rules = array_merge($str_rules,$line_rules);
 
+$note_id = 1;
+$foot_explain = array();
+
 // ÊÑ¿ô¤Î¥Á¥§¥Ã¥¯
 if(php_sapi_name()=='cgi' && !preg_match("/^http:\/\/[-a-zA-Z0-9\@:;_.]+\//",$script))
        die_message("please set '\$script' in ".INI_FILE);

diff --git a/plugin/aname.inc.php b/plugin/aname.inc.php
index f825567..d1e5969 100644 (file)
--- a/plugin/aname.inc.php
+++ b/plugin/aname.inc.php
@@ -1,13 +1,13 @@
 <?
-// $Id: aname.inc.php,v 1.3 2002/06/26 06:23:57 masui Exp $
+// $Id: aname.inc.php,v 1.4 2002/08/21 17:32:04 masui Exp $
 
 function plugin_aname_convert()
 {
-       if(func_num_args())
-               $aryargs = func_get_args();
-       else
-               $aryargs = array();
-
-       return "<a name=\"$aryargs[0]\"></a>";
+  if (!func_num_args()) return "Aname no argument!!\n";
+  $aryargs = func_get_args();
+  if (eregi("^[A-Z][A-Z0-9\-_]*$", $aryargs[0]))
+    return "<a name=\"$aryargs[0]\" id=\"$aryargs[0]\"></a>";
+  else
+    return "Bad Aname!! -- ".$aryargs[0]."\n";
 }
-?>
+?>
\ No newline at end of file

diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index 362d267..e25e1cf 100644 (file)
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////\r
 // PukiWiki - Yet another WikiWikiWeb clone.\r
 //\r
-// $Id: pukiwiki.ini.php,v 1.11 2002/07/16 14:48:36 masui Exp $\r
+// $Id: pukiwiki.ini.php,v 1.12 2002/08/21 17:32:04 masui Exp $\r
 //\r
 // PukiWiki setting file\r
 \r
@@ -90,6 +90,12 @@ $link_target = "_top";
 $interwiki_target = "_top";\r
 \r
 /////////////////////////////////////////////////\r
+// ¥ê¥¹¥È¹½Â¤¤Îº¸¥Þ¡¼¥¸¥ó\r
+$_list_left_margin = 0; // ¥ê¥¹¥È¤È²èÌ̺¸Ã¼¤È¤Î´Ö³Ö(px)\r
+$_list_margin = 16;      // ¥ê¥¹¥È¤Î³¬Áش֤δֳÖ(px)\r
+$_list_pad_str = ' class="list%d" style="padding-left:%dpx;margin-left:%dpx"';\r
+\r
+/////////////////////////////////////////////////\r
 // ¥Æ¥­¥¹¥È¥¨¥ê¥¢¤Î¥«¥é¥à¿ô\r
 $cols = 80;\r
 /////////////////////////////////////////////////\r
@@ -202,6 +208,16 @@ $line_rules = array(
 "'''((?:(?!''').)*)'''" => "<em>\\1</em>",\r
 "''((?:(?!'').)*)''" => "<strong>\\1</strong>",\r
 "~((?:<\\/[a-zA-Z]+>)*)$" => "\\1<br />", /* ¹ÔËö¤Ë¥Á¥ë¥À¤Ï²þ¹Ô */\r
+"&amp;aname\(([A-Za-z][\w\-]*)\);" => "<a id=\"\\1\" name=\"\\1\"></a>",\r
+);\r
+\r
+/////////////////////////////////////////////////\r
+// ¥Õ¥§¥¤¥¹¥Þ¡¼¥¯ÄêµÁ¥ë¡¼¥ë\r
+// $usefacemark = 1¤Ê¤é¥Õ¥§¥¤¥¹¥Þ¡¼¥¯¤¬ÃÖ´¹¤µ¤ì¤Þ¤¹\r
+// ʸ¾ÏÆâ¤ËXD¤Ê¤É¤¬Æþ¤Ã¤¿¾ì¹ç¤Ëfacemark¤ËÃÖ´¹¤µ¤ì¤Æ¤·¤Þ¤¦¤Î¤Ç\r
+// ɬÍפΤʤ¤Êý¤Ï $usefacemark¤ò0¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\r
+$usefacemark = 1;\r
+$facemark_rules = array(\r
 "\s(\:\))" => " <img src=\"./face/smile.gif\" alt=\"\\1\" />",\r
 "\s(\:D)" => " <img src=\"./face/bigsmile.gif\" alt=\"\\1\" />",\r
 "\s(\:p)" => " <img src=\"./face/huh.gif\" alt=\"\\1\" />",\r
@@ -210,7 +226,7 @@ $line_rules = array(
 "\s(X\()" => " <img src=\"./face/oh.gif\" alt=\"\\1\" />",\r
 "\s(;\))" => " <img src=\"./face/wink.gif\" alt=\"\\1\" />",\r
 "\s(;\()" => " <img src=\"./face/sad.gif\" alt=\"\\1\" />",\r
-"\s(:\()" => " <img src=\"./face/sad.gif\" alt=\"\\1\" />",\r
+"\s(\:\()" => " <img src=\"./face/sad.gif\" alt=\"\\1\" />",\r
 "(\:heart\:)" => "<img src=\"./face/heart.gif\" alt=\"\\1\" />",\r
 );\r
 \r

diff --git a/skin/default.en.css b/skin/default.en.css
index 34235a9..8a96479 100644 (file)
--- a/skin/default.en.css
+++ b/skin/default.en.css
@@ -284,3 +284,27 @@ span.diff_removed {
        text-indent:0px;
        display:inline-block;
 }
+
+ul.list1{
+       list-style-type:disc;
+}
+
+ul.list2{
+       list-style-type:circle;
+}
+
+ul.list3{
+       list-style-type:square;
+}
+
+ol.list1{
+       list-style-type:decimal;
+}
+
+ol.list2{
+       list-style-type:lower-roman;
+}
+
+ol.list3{
+       list-style-type:lower-alpha;
+}

diff --git a/skin/default.ja.css b/skin/default.ja.css
index b733417..3a855a8 100644 (file)
--- a/skin/default.ja.css
+++ b/skin/default.ja.css
@@ -285,3 +285,27 @@ span.diff_removed {
        text-indent:0px;
        display:inline-block;
 }
+
+ul.list1{
+       list-style-type:disc;
+}
+
+ul.list2{
+       list-style-type:circle;
+}
+
+ul.list3{
+       list-style-type:square;
+}
+
+ol.list1{
+       list-style-type:decimal;
+}
+
+ol.list2{
+       list-style-type:lower-roman;
+}
+
+ol.list3{
+       list-style-type:lower-alpha;
+}