BugTrack/2546 Limit SIZE font size

* SIZE(n){ ... } max n length is 2 (max n is 99)
* SIZE(n): n is 1-7 (CSS size1 ... size7; PukiWiki 1.3 compatible)

diff --git a/default.ini.php b/default.ini.php
index 55add5e..61bbc8e 100644 (file)
--- a/default.ini.php
+++ b/default.ini.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone.
 // default.ini.php
 // Copyright
-//   2003-2018 PukiWiki Development Team
+//   2003-2022 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -112,9 +112,10 @@ $usefacemark = 1;
 // ユーザ定義ルール(コンバート時に置換)
 $line_rules = array(
        'COLOR\(([^\(\)]*)\){([^}]*)}'  => '<span style="color:$1">$2</span>',
-       'SIZE\(([^\(\)]*)\){([^}]*)}'   => '<span style="font-size:$1px">$2</span>',
+       'SIZE\((\d{1,2})\){([^}]*)}' => '<span style="font-size:$1px">$2</span>',
        'COLOR\(([^\(\)]*)\):((?:(?!COLOR\([^\)]+\)\:).)*)'     => '<span style="color:$1">$2</span>',
-       'SIZE\(([^\(\)]*)\):((?:(?!SIZE\([^\)]+\)\:).)*)'       => '<span class="size$1">$2</span>',
+       // "SIZE(n):" PukiWiki 1.3 compatible notation
+       'SIZE\(([1-7])\):((?:(?!SIZE\([^\)]+\)\:).)*)' => '<span class="size$1">$2</span>',
        '%%%(?!%)((?:(?!%%%).)*)%%%'    => '<ins>$1</ins>',
        '%%(?!%)((?:(?!%%).)*)%%'       => '<del>$1</del>',
        "'''(?!')((?:(?!''').)*)'''"    => '<em>$1</em>',

diff --git a/keitai.ini.php b/keitai.ini.php
index cf45597..49f0276 100644 (file)
--- a/keitai.ini.php
+++ b/keitai.ini.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone.
 // keitai.ini.php
 // Copyright
-//   2002-2017 PukiWiki Development Team
+//   2002-2022 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -179,9 +179,10 @@ switch ("$ua_name/$ua_vers") {
 // ユーザ定義ルール(コンバート時に置換)
 $line_rules = array(
        'COLOR\(([^\(\)]*)\){([^}]*)}'  => '<font color="$1">$2</font>',
-       'SIZE\(([^\(\)]*)\){([^}]*)}'   => '$2',        // Disabled
+       'SIZE\((\d{1,2})\){([^}]*)}' => '$2', // Disabled
        'COLOR\(([^\(\)]*)\):((?:(?!COLOR\([^\)]+\)\:).)*)'     => '<font color="$1">$2</font>',
-       'SIZE\(([^\(\)]*)\):((?:(?!SIZE\([^\)]+\)\:).)*)'       => '$2', // Disabled
+       // "SIZE(n):" PukiWiki 1.3 compatible notation
+       'SIZE\(([1-7])\):((?:(?!SIZE\([^\)]+\)\:).)*)' => '$2', // Disabled
        '%%%(?!%)((?:(?!%%%).)*)%%%'    => '<ins>$1</ins>',
        '%%(?!%)((?:(?!%%).)*)%%'       => '<del>$1</del>',
        "'''(?!')((?:(?!''').)*)'''"    => '<em>$1</em>',

diff --git a/lib/convert_html.php b/lib/convert_html.php
index 646e63e..87f80c6 100644 (file)
--- a/lib/convert_html.php
+++ b/lib/convert_html.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone
 // convert_html.php
 // Copyright
-//   2002-2021 PukiWiki Development Team
+//   2002-2022 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -522,7 +522,7 @@ class TableCell extends Element
                parent::__construct();
                $this->style = $matches = array();
 
-               while (preg_match('/^(?:(LEFT|CENTER|RIGHT)|(BG)?COLOR\(([#\w]+)\)|SIZE\((\d+)\)|(BOLD)):(.*)$/',
+               while (preg_match('/^(?:(LEFT|CENTER|RIGHT)|(BG)?COLOR\(([#\w]+)\)|SIZE\((\d{1,2})\)|(BOLD)):(.*)$/',
                    $text, $matches)) {
                        if ($matches[1]) {
                                $this->style['align'] = 'text-align:' . strtolower($matches[1]) . ';';