From 38686d9523084eb155926470745da46a34bfd460 Mon Sep 17 00:00:00 2001
From: panda <panda>
Date: Mon, 2 Dec 2002 11:50:26 +0900
Subject: [PATCH] =?utf8?q?=E3=81=B1=E3=82=93=E3=81=A0:[[BugTrack/80]]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 html.php         | 23 +++++++++++++++++++----
 pukiwiki.ini.php |  5 +----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/html.php b/html.php
index 8a5031d..a00f0d5 100644
--- a/html.php
+++ b/html.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: html.php,v 1.41 2002/11/29 00:09:00 panda Exp $
+// $Id: html.php,v 1.42 2002/12/02 02:50:26 panda Exp $
 /////////////////////////////////////////////////
 
 // ËÜʸ¤ò¥Ú¡¼¥¸Ì¾¤«¤é½ÐÎÏ
@@ -247,7 +247,13 @@ function convert_html($string)
 				array_push($result,"<tr>");
 				foreach($arytable as $td)
 				{
-					array_push($result,"<td class=\"style_td\">");
+					if (preg_match("/^(LEFT|CENTER|RIGHT):(.*)$/",$td,$tmp)) {
+						$style = ' align="'.strtolower($tmp[1]).'"';
+						$td = $tmp[2];
+					} else {
+						$style = '';
+					}
+					array_push($result,"<td class=\"style_td\"$style>");
 					array_push($result,ltrim(inline($td)));
 					array_push($result,"</td>");
 				}
@@ -292,8 +298,17 @@ function convert_html($string)
 				$_p = FALSE;
 			}
 			else if( substr($line,0,1) != '' && !$_p) {
-				array_push($result, "<p>");
-				$_p = TRUE;
+				if (preg_match("/^(LEFT|CENTER|RIGHT):(.*)$/",$line,$tmp)) {
+					if ($tmp[2] != '') {
+						array_push($result,'<p align="'.strtolower($tmp[1]).'">');
+						array_push($result,inline($tmp[2]));
+						array_push($result,"</p>");
+						$line = '';
+					}
+				} else {
+					array_push($result, "<p>");
+					$_p = TRUE;
+				}
 			}
 			if( substr($line,0,1) != '' ){
 				array_push($result, inline($line));
diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index 7b7a60b..48b80ab 100644
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.ini.php,v 1.14 2002/11/29 00:09:00 panda Exp $
+// $Id: pukiwiki.ini.php,v 1.15 2002/12/02 02:50:26 panda Exp $
 //
 // PukiWiki setting file
 
@@ -205,9 +205,6 @@ $line_rules = array(
 "SIZE\(([^\(\)]*)\){([^}]*)}" => "<span style=\"font-size:\\1px;display:inline-block;line-height:130%;text-indent:0px\">\\2</span>",
 "COLOR\(([^\(\)]*)\):((?:(?!COLOR\([^\)]+\)\:).)*)" => "<span style=\"color:\\1\">\\2</span>",
 "SIZE\(([^\(\)]*)\):((?:(?!SIZE\([^\)]+\)\:).)*)" => "<span class=\"size\\1\">\\2</span>",
-"LEFT:((?:(?!LEFT\:).)*)" => "<div style=\"text-align:left\">\\1</div>",
-"CENTER:((?:(?!CENTER\:).)*)" => "<div style=\"text-align:center\">\\1</div>",
-"RIGHT:((?:(?!RIGHT\:).)*)" => "<div style=\"text-align:right\">\\1</div>",
 "%%((?:(?!%%).)*)%%" => "<del>\\1</del>",
 "'''((?:(?!''').)*)'''" => "<em>\\1</em>",
 "''((?:(?!'').)*)''" => "<strong>\\1</strong>",
-- 
2.11.0