PukiWiki 1.4.7: Incompatibility from PukiWiki 1.4.6 (for en)

[pukiwiki/pukiwiki.git] / keitai.ini.php

diff --git a/keitai.ini.php b/keitai.ini.php
index 3783fda..2ba515d 100644 (file)
--- a/keitai.ini.php
+++ b/keitai.ini.php
@@ -1,14 +1,21 @@
 <?php
-/////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
-//
-// $Id: keitai.ini.php,v 1.13 2004/09/20 04:25:38 henoheno Exp $
+// $Id: keitai.ini.php,v 1.25 2005/12/10 07:57:30 henoheno Exp $
+// Copyright (C)
+//   2002-2005 PukiWiki Developers Team
+//   2001-2002 Originally written by yu-ji
+// License: GPL v2 or (at your option) any later version
 //
 // PukiWiki setting file (Cell phones, PDAs and other thin clients)
 
 /////////////////////////////////////////////////
+// ·ÈÂÓ¡¦PDAÀìÍѤΥڡ¼¥¸¤ò½é´ü¥Ú¡¼¥¸¤È¤·¤Æ»ØÄꤹ¤ë
+
+// $defaultpage = 'm';
+
+/////////////////////////////////////////////////
 // ¥¹¥­¥ó¥Õ¥¡¥¤¥ë¤Î¾ì½ê
-define('SKIN_FILE', DATA_HOME . SKIN_DIR . 'keitai.skin.ja.php');
+define('SKIN_FILE', DATA_HOME . SKIN_DIR . 'keitai.skin.php');
 
 /////////////////////////////////////////////////
 // ¿÷·Á¤È¤¹¤ë¥Ú¡¼¥¸¤ÎÆɤ߹þ¤ß¤ò²Äǽ¤Ë¤¹¤ë
@@ -24,43 +31,62 @@ $list_index = 0;
 
 /////////////////////////////////////////////////
 // ¥ê¥¹¥È¹½Â¤¤Îº¸¥Þ¡¼¥¸¥ó
-$_ul_left_margin = 0;   // ¥ê¥¹¥È¤È²èÌ̺¸Ã¼¤È¤Î´Ö³Ö(px)
-$_ul_margin = 16;       // ¥ê¥¹¥È¤Î³¬Áش֤δֳÖ(px)
-$_ol_left_margin = 0;   // ¥ê¥¹¥È¤È²èÌ̺¸Ã¼¤È¤Î´Ö³Ö(px)
-$_ol_margin = 16;       // ¥ê¥¹¥È¤Î³¬Áش֤δֳÖ(px)
-$_dl_left_margin = 0;   // ¥ê¥¹¥È¤È²èÌ̺¸Ã¼¤È¤Î´Ö³Ö(px)
-$_dl_margin = 16;        // ¥ê¥¹¥È¤Î³¬Áش֤δֳÖ(px)
-$_list_pad_str = '';
+$_ul_left_margin =  0; // ¥ê¥¹¥È¤È²èÌ̺¸Ã¼¤È¤Î´Ö³Ö(px)
+$_ul_margin      = 16; // ¥ê¥¹¥È¤Î³¬Áش֤δֳÖ(px)
+$_ol_left_margin =  0; // ¥ê¥¹¥È¤È²èÌ̺¸Ã¼¤È¤Î´Ö³Ö(px)
+$_ol_margin      = 16; // ¥ê¥¹¥È¤Î³¬Áش֤δֳÖ(px)
+$_dl_left_margin =  0; // ¥ê¥¹¥È¤È²èÌ̺¸Ã¼¤È¤Î´Ö³Ö(px)
+$_dl_margin      = 16; // ¥ê¥¹¥È¤Î³¬Áش֤δֳÖ(px)
+$_list_pad_str   = '';
 
 /////////////////////////////////////////////////
 // Â硦¾®¸«½Ð¤·¤«¤éÌܼ¡¤ØÌá¤ë¥ê¥ó¥¯¤Îʸ»ú
 $top = '';
 
 /////////////////////////////////////////////////
-// ´ØÏ¢¥Ú¡¼¥¸É½¼¨¤Î¥Ú¡¼¥¸Ì¾¤Î¶èÀÚ¤êʸ»ú
-$related_str = "\n ";
+// źÉÕ¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤ò¾ï¤Ëɽ¼¨¤¹¤ë (Ééô¤¬¤«¤«¤ê¤Þ¤¹)
+// ¢¨keitai¥¹¥­¥ó¤Ë¤Ï¤³¤Î°ìÍ÷¤òɽ¼¨¤¹¤ëµ¡Ç½¤¬¤¢¤ê¤Þ¤»¤ó
+$attach_link = 0;
 
 /////////////////////////////////////////////////
-// À°·Á¥ë¡¼¥ë¤Ç¤Î´ØÏ¢¥Ú¡¼¥¸É½¼¨¤Î¥Ú¡¼¥¸Ì¾¤Î¶èÀÚ¤êʸ»ú
+// ´ØÏ¢¤¹¤ë¥Ú¡¼¥¸¤Î¥ê¥ó¥¯°ìÍ÷¤ò¾ï¤Ëɽ¼¨¤¹¤ë(Ééô¤¬¤«¤«¤ê¤Þ¤¹)
+// ¢¨keitai¥¹¥­¥ó¤Ë¤Ï¤³¤Î°ìÍ÷¤òɽ¼¨¤¹¤ëµ¡Ç½¤¬¤¢¤ê¤Þ¤»¤ó
+$related_link = 0;
+
+// ¥ê¥ó¥¯°ìÍ÷¤Î¶èÀÚ¤êʸ»ú
+// ¢¨¾åƱ
+$related_str = "\n ";
+
+// (#related¥×¥é¥°¥¤¥ó¤¬É½¼¨¤¹¤ë) ¥ê¥ó¥¯°ìÍ÷¤Î¶èÀÚ¤êʸ»ú
 $rule_related_str = "</li>\n<li>";
 
 /////////////////////////////////////////////////
 // ¿åÊ¿Àþ¤Î¥¿¥°
 $hr = '<hr>';
 
+/////////////////////////////////////////////////
+// µÓÃíµ¡Ç½´ØÏ¢
+
+// µÓÃí¤Î¥¢¥ó¥«¡¼¤ËËä¤á¹þ¤àËÜʸ¤ÎºÇÂçĹ
+define('PKWK_FOOTNOTE_TITLE_MAX', 0); // Characters
+
+// µÓÃí¤Î¥¢¥ó¥«¡¼¤òÁêÂХѥ¹¤Çɽ¼¨¤¹¤ë (0 = ÀäÂХѥ¹)
+//  * ÁêÂХѥ¹¤Î¾ì¹ç¡¢°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎOpera¤ÇÌäÂê¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹
+//  * ÀäÂХѥ¹¤Î¾ì¹ç¡¢calendar_viewer¤Ê¤É¤ÇÌäÂê¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹
+// (¾Ü¤·¤¯¤Ï: BugTrack/698)
+define('PKWK_ALLOW_RELATIVE_FOOTNOTE_ANCHOR', 1);
+
 // ʸËö¤ÎÃí¼á¤ÎľÁ°¤Ëɽ¼¨¤¹¤ë¥¿¥°
 $note_hr = '<hr>';
 
 /////////////////////////////////////////////////
-// ´ØÏ¢¤¹¤ë¥ê¥ó¥¯¤ò¾ï¤Ëɽ¼¨¤¹¤ë(Ééô¤¬¤«¤«¤ê¤Þ¤¹)
-$related_link = 0;
-
-/////////////////////////////////////////////////
 // WikiName,BracketName¤Ë·Ð²á»þ´Ö¤òÉղ乤ë
 $show_passage = 0;
 
 /////////////////////////////////////////////////
 // ¥ê¥ó¥¯É½¼¨¤ò¥³¥ó¥Ñ¥¯¥È¤Ë¤¹¤ë
+// * ¥Ú¡¼¥¸¤ËÂФ¹¤ë¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤«¤é¥¿¥¤¥È¥ë¤ò³°¤¹
+// * Dangling link¤ÎCSS¤ò³°¤¹
 $link_compact = 1;
 
 /////////////////////////////////////////////////
@@ -73,7 +99,7 @@ $accesskey = 'accesskey';
 
 /////////////////////////////////////////////////
 // $script¤òû½Ì
-if (preg_match('#([^/]+)$#',$script,$matches)) {
+if (preg_match('#([^/]+)$#', $script, $matches)) {
        $script = $matches[1];
 }
 
@@ -93,7 +119,7 @@ $cols = 22; $rows = 5;       // i_mode
 $ua_name  = $user_agent['name'];
 $ua_vers  = $user_agent['vers'];
 $ua_agent = $user_agent['agent'];
-$matches = array();
+$matches  = array();
 
 // Browser-name only
 switch ($ua_name) {
@@ -113,15 +139,20 @@ switch ($ua_name) {
                $cols = 22; $rows = 5;  // i_mode
                break;
 
-       // Vodafone (ex. J-PHONE) µ»½Ñ»ñÎÁ: ¥æ¡¼¥¶¡¼¥¨¡¼¥¸¥§¥ó¥È¤Ë¤Ä¤¤¤Æ
+       // Vodafone (ex. J-PHONE)
+       // ¥Ü¡¼¥À¥Õ¥©¥ó¥é¥¤¥Ö¡ª¸þ¤±¥¦¥§¥Ö¥³¥ó¥Æ¥ó¥Ä³«È¯¥¬¥¤¥É [³µÍ×ÊÔ] (Version 1.2.0 P13)
+       // http://www.dp.j-phone.com/dp/tool_dl/download.php?docid=110
+       // µ»½Ñ»ñÎÁ: ¥æ¡¼¥¶¡¼¥¨¡¼¥¸¥§¥ó¥È¤Ë¤Ä¤¤¤Æ
        // http://www.dp.j-phone.com/dp/tool_dl/web/useragent.php
        case 'J-PHONE':
-               if (preg_match('#\bProfile/#', $ua_agent)) {
-                       $max_size = 12; // ¥Ñ¥±¥Ã¥ÈÂбþµ¡
-               } else {
-                       $max_size =  6; // ¥Ñ¥±¥Ã¥ÈÈóÂбþµ¡
+               $matches = array("");
+               preg_match('/^([0-9]+)\./', $user_agent['vers'], $matches);
+               switch($matches[1]){
+               case '3': $max_size =   6; break; // C type: lt   6000bytes
+               case '4': $max_size =  12; break; // P type: lt  12Kbytes
+               case '5': $max_size = 200; break; // W type: lt 200Kbytes
                }
-               $cols = 24; $rows = 20; // jphone
+               $cols = 24; $rows = 20;
                break;
 
        // UP.Browser
@@ -129,9 +160,8 @@ switch ($ua_name) {
                // UP.Browser for KDDI cell phones
                // http://www.au.kddi.com/ezfactory/tec/spec/xhtml.html ('About 9KB max')
                // http://www.au.kddi.com/ezfactory/tec/spec/4_4.html (User-agent strings)
-               if (preg_match('#^KDDI#', $ua_agent)) {
-                       $max_size =  9;
-               }
+               if (preg_match('#^KDDI#', $ua_agent)) $max_size =  9;
+               break;
 }
 
 // Browser-name + version
@@ -160,7 +190,6 @@ $line_rules = array(
        '%%(?!%)((?:(?!%%).)*)%%'       => '<del>$1</del>',
        "'''(?!')((?:(?!''').)*)'''"    => '<em>$1</em>',
        "''(?!')((?:(?!'').)*)''"       => '<strong>$1</strong>',
-       '&amp;br;'      => '<br>',
 );