コミット: 1ab8355c87012924f70267046959d9a8308ff9f3 - pukiwiki-fork (git)

コミットメタ情報

• リビジョン: 1ab8355c87012924f70267046959d9a8308ff9f3 (tree)
• 日時: 2017-08-16 22:07:49
• 作者: umorigu <umorigu@gmai...>
• コミッター: umorigu

ログメッセージ

BugTrack/2188 Define List styles by CSS instead of ini files

* Define List styles by CSS instead of ini files
* Remove unused list margin logic
* Remove manual style logic in ls2 plugin

変更サマリ

• modified: default.ini.php
• modified: keitai.ini.php
• modified: lib/convert_html.php
• modified: lib/html.php
• modified: plugin/ls2.inc.php
• modified: skin/pukiwiki.css
• modified: skin/tdiary.css

差分

--- a/default.ini.php
+++ b/default.ini.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: default.ini.php,v 1.25 2005/12/20 14:04:40 henoheno Exp $
-// Copyright (C)
-//   2003-2005 PukiWiki Developers Team
+// default.ini.php
+// Copyright
+//   2003-2017 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -30,14 +30,15 @@ $search_word_color = 1;
 $list_index = 1;
 
 /////////////////////////////////////////////////
-// リスト構造の左マージン
+// Obsolete: リスト構造の左マージン (Leaves for compatibility of plugins)
+// Use list-n, list1,list2 and list3 CSS class instead
 $_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 = ' class="list%d" style="padding-left:%dpx;margin-left:%dpx"';
+$_list_pad_str = ' class="list-n list%d"';
 
 /////////////////////////////////////////////////
 // テキストエリアのカラム数
@@ -178,5 +179,3 @@ $facemark_rules = array(
 	'&amp;(phoneto);'=>'[phoneto]',
 	'&amp;(faxto);'	=> '[faxto]',
 );
-
-?>

--- a/keitai.ini.php
+++ b/keitai.ini.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: keitai.ini.php,v 1.25 2005/12/10 07:57:30 henoheno Exp $
-// Copyright (C)
-//   2002-2005 PukiWiki Developers Team
+// keitai.ini.php
+// Copyright
+//   2002-2017 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -30,7 +30,8 @@ $search_word_color = 0;
 $list_index = 0;
 
 /////////////////////////////////////////////////
-// リスト構造の左マージン
+// Obsolete: リスト構造の左マージン (Leaves for compatibility of plugins)
+// Use list-n, list1,list2 and list3 CSS class instead
 $_ul_left_margin =  0;	// リストと画面左端との間隔(px)
 $_ul_margin      = 16;	// リストの階層間の間隔(px)
 $_ol_left_margin =  0;	// リストと画面左端との間隔(px)
@@ -383,5 +384,3 @@ switch ($ua_name) {
 }
 
 unset($matches, $ua_name, $ua_vers, $ua_agent, $special_rules);
-
-?>

--- a/lib/convert_html.php
+++ b/lib/convert_html.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone
 // convert_html.php
 // Copyright
-//   2002-2016 PukiWiki Development Team
+//   2002-2017 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -310,8 +310,6 @@ class ListContainer extends Element
 	var $tag2;
 	var $level;
 	var $style;
-	var $margin;
-	var $left_margin;
 
 	function ListContainer($tag, $tag2, $head, $text)
 	{
@@ -320,14 +318,6 @@ class ListContainer extends Element
 	function __construct($tag, $tag2, $head, $text)
 	{
 		parent::__construct();
-
-		$var_margin      = '_' . $tag . '_margin';
-		$var_left_margin = '_' . $tag . '_left_margin';
-		global $$var_margin, $$var_left_margin;
-
-		$this->margin      = $$var_margin;
-		$this->left_margin = $$var_left_margin;
-
 		$this->tag   = $tag;
 		$this->tag2  = $tag2;
 		$this->level = min(3, strspn($text, $head));
@@ -354,11 +344,7 @@ class ListContainer extends Element
 		if (isset($parent->parent) && is_a($parent->parent, 'ListContainer'))
 			$step -= $parent->parent->level;
 
-		$margin = $this->margin * $step;
-		if ($step == $this->level)
-			$margin += $this->left_margin;
-
-		$this->style = sprintf($_list_pad_str, $this->level, $margin, $margin);
+		$this->style = sprintf($_list_pad_str, $this->level);
 	}
 
 	function & insert(& $obj)
@@ -1071,12 +1057,9 @@ class Contents_UList extends ListContainer
 
 		parent::setParent($parent);
 		$step   = $this->level;
-		$margin = $this->left_margin;
 		if (isset($parent->parent) && is_a($parent->parent, 'ListContainer')) {
 			$step  -= $parent->parent->level;
-			$margin = 0;
 		}
-		$margin += $this->margin * ($step == $this->level ? 1 : $step);
-		$this->style = sprintf($_list_pad_str, $this->level, $margin, $margin);
+		$this->style = sprintf($_list_pad_str, $this->level);
 	}
 }

--- a/lib/html.php
+++ b/lib/html.php
@@ -380,7 +380,7 @@ EOD;
 function make_related($page, $tag = '')
 {
 	global $script, $vars, $rule_related_str, $related_str;
-	global $_ul_left_margin, $_ul_margin, $_list_pad_str;
+	global $_list_pad_str;
 
 	prepare_links_related($page);
 	$links = links_get_related($page);
@@ -407,8 +407,7 @@ function make_related($page, $tag = '')
 	if (empty($_links)) return ''; // Nothing
 
 	if ($tag == 'p') { // From the line-head
-		$margin = $_ul_left_margin + $_ul_margin;
-		$style  = sprintf($_list_pad_str, 1, $margin, $margin);
+		$style  = sprintf($_list_pad_str, 1);
 		$retval =  "\n" . '<ul' . $style . '>' . "\n" .
 			'<li>' . join($rule_related_str, $_links) . '</li>' . "\n" .
 			'</ul>' . "\n";

--- a/plugin/ls2.inc.php
+++ b/plugin/ls2.inc.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: ls2.inc.php,v 1.30 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2002-2004, 2006-2007 PukiWiki Developers Team
+// ls2.inc.php
+// Copyright
+//   2002-2017  PukiWiki Development Team
 //   2002       panda  http://home.arino.jp/?ls2.inc.php 
 //   2002       Y.MASUI GPL2 http://masui.net/pukiwiki/ [e-mail] (ls.inc.php)
 // License: GPL version 2
@@ -167,7 +167,7 @@ function plugin_ls2_get_headings($page, & $params, $level, $include = FALSE)
 //リスト構造を構築する
 function plugin_ls2_list_push(& $params, $level)
 {
-	global $_ul_left_margin, $_ul_margin, $_list_pad_str;
+	global $_list_pad_str;
 
 	$result = & $params['result'];
 	$saved  = & $params['saved'];
@@ -187,14 +187,10 @@ function plugin_ls2_list_push(& $params, $level)
 		$cont = FALSE;
 		array_unshift($saved, $close);
 
-		$left = ($level == $margin) ? $_ul_left_margin : 0;
 		if ($params['compact']) {
-			$left  += $_ul_margin;   // マージンを固定
 			$level -= ($margin - 1); // レベルを修正
-		} else {
-			$left += $margin * $_ul_margin;
 		}
-		$str = sprintf($_list_pad_str, $level, $left, $left);
+		$str = sprintf($_list_pad_str, $level);
 		array_push($result, sprintf($open, $str));
 	}
 
@@ -222,4 +218,3 @@ function plugin_ls2_check_arg($value, & $params)
 
 	$params['_args'][] = htmlsc($value); // Link title
 }
-?>

--- a/skin/pukiwiki.css
+++ b/skin/pukiwiki.css
@@ -2,8 +2,8 @@
 
 /*!
  * PukiWiki - Yet another WikiWikiWeb clone.
- * Copyright (C)
- *   2002-2016 PukiWiki Development Team
+ * Copyright
+ *   2002-2017 PukiWiki Development Team
  *   2001-2002 Originally written by yu-ji
  * License: GPL v2 or (at your option) any later version
  *
@@ -168,6 +168,49 @@ ol.list1 { list-style-type:decimal; }
 ol.list2 { list-style-type:lower-roman; }
 ol.list3 { list-style-type:lower-alpha; }
 
+/* Default list style */
+.list-n {
+	padding-left: 16px;
+	margin-left: 16px
+}
+/* Specific list style for list1-list4 */
+.list1 {
+	padding-left: 16px;
+	margin-left: 16px
+}
+.list2 {
+	padding-left: 32px;
+	margin-left: 32px
+}
+.list3 {
+	padding-left: 48px;
+	margin-left: 48px
+}
+.list1 .list2 {
+	padding-left: 16px;
+	margin-left: 16px
+}
+.list1 .list3 {
+	padding-left: 32px;
+	margin-left: 32px
+}
+.list2 .list3 {
+	padding-left: 16px;
+	margin-left: 16px
+}
+.list1 .list4 {
+	padding-left: 48px;
+	margin-left: 48px
+}
+.list2 .list4 {
+	padding-left: 32px;
+	margin-left: 32px
+}
+.list3 .list4 {
+	padding-left: 16px;
+	margin-left: 16px
+}
+
 div.ie5 { text-align:center; }
 
 span.noexists {

--- a/skin/tdiary.css
+++ b/skin/tdiary.css
@@ -70,6 +70,49 @@ ol.list1 { list-style-type:decimal; }
 ol.list2 { list-style-type:lower-roman; }
 ol.list3 { list-style-type:lower-alpha; }
 
+/* Default list style */
+.list-n {
+	padding-left: 16px;
+	margin-left: 16px
+}
+/* Specific list style for list1-list4 */
+.list1 {
+	padding-left: 16px;
+	margin-left: 16px
+}
+.list2 {
+	padding-left: 32px;
+	margin-left: 32px
+}
+.list3 {
+	padding-left: 48px;
+	margin-left: 48px
+}
+.list1 .list2 {
+	padding-left: 16px;
+	margin-left: 16px
+}
+.list1 .list3 {
+	padding-left: 32px;
+	margin-left: 32px
+}
+.list2 .list3 {
+	padding-left: 16px;
+	margin-left: 16px
+}
+.list1 .list4 {
+	padding-left: 48px;
+	margin-left: 48px
+}
+.list2 .list4 {
+	padding-left: 32px;
+	margin-left: 32px
+}
+.list3 .list4 {
+	padding-left: 16px;
+	margin-left: 16px
+}
+
 div.ie5 { text-align:center; }
 
 /* NoSuchPage? */