Re-define $html_transitional => $pkwk_dtd

diff --git a/plugin/color.inc.php b/plugin/color.inc.php
index bb50a5d..dbe8934 100644 (file)
--- a/plugin/color.inc.php
+++ b/plugin/color.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: color.inc.php,v 1.19 2004/12/22 14:34:24 henoheno Exp $
+// $Id: color.inc.php,v 1.20 2005/01/08 04:13:19 henoheno Exp $
 //
 // Text color plugin
 
@@ -13,7 +13,7 @@ define('PLUGIN_COLOR_USAGE', '&color(foreground[,background]){text};');
 define('PLUGIN_COLOR_REGEX', '/^(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z-]+)$/i');
 function plugin_color_inline()
 {
-       global $html_transitional;
+       global $pkwk_dtd;
 
        $args = func_get_args();
        $text = array_pop($args); // htmlspecialchars(text)
@@ -33,7 +33,7 @@ function plugin_color_inline()
                        return '&color():Invalid color: ' . htmlspecialchars($col) . ';';
        }
 
-       if (PLUGIN_COLOR_ALLOW_CSS === TRUE || $html_transitional === FALSE) {
+       if (PLUGIN_COLOR_ALLOW_CSS === TRUE || ! isset($pkwk_dtd) || $pkwk_dtd == PKWK_DTD_XHTML_1_1) {
                $delimiter = '';
                if ($color != '' && $bgcolor != '') $delimiter = '; ';
                if ($color   != '') $color   = 'color:' . $color;

diff --git a/plugin/paint.inc.php b/plugin/paint.inc.php
index 03bb5f2..bc97c47 100644 (file)
--- a/plugin/paint.inc.php
+++ b/plugin/paint.inc.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: paint.inc.php,v 1.16 2004/10/09 08:01:58 henoheno Exp $
+// $Id: paint.inc.php,v 1.17 2005/01/08 04:13:19 henoheno Exp $
 //
 
 /*
@@ -44,9 +44,7 @@ define('PAINT_FORMAT_NOMSG',"\x08NAME\x08 \x08NOW\x08");
 
 function plugin_paint_action()
 {
-       global $script,$vars;
-       global $_paint_messages;
-       global $html_transitional;
+       global $script, $vars, $pkwk_dtd, $_paint_messages;
 
        //Ìá¤êÃͤò½é´ü²½
        $retval['msg'] = $_paint_messages['msg_title'];
@@ -150,7 +148,8 @@ function plugin_paint_action()
  </div>
 EOD;
                // XHTML 1.0 Transitional
-               $html_transitional = TRUE;
+               if (! isset($pkwk_dtd) || $pkwk_dtd == PKWK_DTD_XHTML_1_1)
+                       $pkwk_dtd = PKWK_DTD_XHTML_1_0_TRANSITIONAL;
        }
        return $retval;
 }

diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index 68ff380..2b4ac47 100644 (file)
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.ini.php,v 1.102 2005/01/02 08:51:29 henoheno Exp $
+// $Id: pukiwiki.ini.php,v 1.103 2005/01/08 04:13:18 henoheno Exp $
 //
 // PukiWiki setting file
 
@@ -103,9 +103,14 @@ $interwiki    = 'InterWikiName';   // InterWikiName 
 $menubar      = 'MenuBar';     // ¥á¥Ë¥å¡¼¤È¤·¤Æɽ¼¨¤µ¤»¤ëÆâÍƤò½ñ¤¯¥Ú¡¼¥¸
 
 /////////////////////////////////////////////////
-// XHTML version
-// skinÆâ¤ÇDTDÀë¸À¤òÀÚ¤êÂؤ¨¤ë¤Î¤Ë»ÈÍÑ¡£paint.inc.phpÂкö
-$html_transitional = FALSE; // FALSE:XHTML 1.1, TRUE:XHTML 1.0 Transitional
+// Default Document Type Definition
+// Web¥Ö¥é¥¦¥¶¤Î¥Ð¥°¤ä¡¢Java applet ¤Ê¤É¤¬Strict¤Ç¤Ê¤¤ÃͤòÍ׵᤹¤ë¤³¤È¤¬¤¢¤ë
+// paint¥×¥é¥°¥¤¥ó¤Ï¼«Æ°Åª¤Ëtransitional¤Ë¤¹¤ë
+//$pkwk_dtd = PKWK_DTD_XHTML_1_1; // Default
+//$pkwk_dtd = PKWK_DTD_XHTML_1_0_STRICT;
+//$pkwk_dtd = PKWK_DTD_XHTML_1_0_TRANSITIONAL;
+//$pkwk_dtd = PKWK_DTD_HTML_4_01_STRICT;
+//$pkwk_dtd = PKWK_DTD_HTML_4_01_TRANSITIONAL;
 
 /////////////////////////////////////////////////
 

diff --git a/skin/pukiwiki.skin.php b/skin/pukiwiki.skin.php
index 979611b..aae0b88 100644 (file)
--- a/skin/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: pukiwiki.skin.php,v 1.34 2005/01/08 03:22:41 henoheno Exp $
+// $Id: pukiwiki.skin.php,v 1.35 2005/01/08 04:13:18 henoheno Exp $
 //
 // PukiWiki default skin
 
@@ -55,8 +55,8 @@ header('Pragma: no-cache');
 header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
 
 // Output HTML DTD, <html>, and receive content-type
-if ($html_transitional) {
-       $meta_content_type = pkwk_output_dtd(PKWK_DTD_XHTML_1_0_TRANSITIONAL);
+if (isset($pkwk_dtd)) {
+       $meta_content_type = pkwk_output_dtd($pkwk_dtd);
 } else {
        $meta_content_type = pkwk_output_dtd();
 }

diff --git a/skin/tdiary.skin.php b/skin/tdiary.skin.php
index feef87b..203f42a 100644 (file)
--- a/skin/tdiary.skin.php
+++ b/skin/tdiary.skin.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: tdiary.skin.php,v 1.4 2005/01/08 02:36:11 henoheno Exp $
+// $Id: tdiary.skin.php,v 1.5 2005/01/08 04:13:18 henoheno Exp $
 //
 // tDiary-wrapper skin
 
@@ -233,6 +233,16 @@ case 'yukon':
        break;
 }
 
+// Adjust DTD (between theme(=CSS) and MSIE bug)
+// NOTE:
+//    PukiWiki default: PKWK_DTD_XHTML_1_1
+//    tDiary's default: PKWK_DTD_HTML_4_01_STRICT
+switch($theme){
+case 'christmas':
+       $pkwk_dtd = PKWK_DTD_HTML_4_01_STRICT; // or centering will be ignored via MSIE
+       break;
+}
+
 $lang  = $_LANG['skin'];
 $link  = $_LINK;
 
@@ -249,7 +259,11 @@ header('Pragma: no-cache');
 header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
 
 // Output HTML DTD, <html>, and receive content-type
-$meta_content_type = pkwk_output_dtd(PKWK_DTD_HTML_4_01);
+if (isset($pkwk_dtd)) {
+       $meta_content_type = pkwk_output_dtd($pkwk_dtd);
+} else {
+       $meta_content_type = pkwk_output_dtd();
+}
 
 ?>
 <head>