diff options
| author | petko <petko@524c5546-5005-0410-9a3e-e25e191bd360> | 2014-08-17 19:24:02 +0000 |
|---|---|---|
| committer | petko <petko@524c5546-5005-0410-9a3e-e25e191bd360> | 2014-08-17 19:24:02 +0000 |
| commit | f7d329749fe24ea75e4d0ac4848b3c317efc174e (patch) | |
| tree | 914d62b2b6b75fa471fac0d58da91da572a33c1e | |
| parent | 5772fe32c48c8d0d01feb8c88d440f0910077ba6 (diff) | |
| download | pmwiki.svn-f7d329749fe24ea75e4d0ac4848b3c317efc174e.tar.bz2 | |
Add WikiStyles clear, min and max width|height, fix %p class=...% with more than one space
git-svn-id: svn://pmwiki.org/pmwiki/trunk@2995 524c5546-5005-0410-9a3e-e25e191bd360
| -rw-r--r-- | scripts/wikistyles.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/wikistyles.php b/scripts/wikistyles.php index 40d0dfbf..ab2f0bed 100644 --- a/scripts/wikistyles.php +++ b/scripts/wikistyles.php @@ -32,11 +32,11 @@ if (IsEnabled($EnableStdWikiStyles,1)) { SDV($WikiStyle['comment']['display'],'none'); ## display, margin, padding, and border css properties $WikiStyleCSS[] = - 'float|display|(margin|padding|border)(-(left|right|top|bottom))?'; + 'float|clear|display|(margin|padding|border)(-(left|right|top|bottom))?'; $WikiStyleCSS[] = 'white-space'; + $WikiStyleCSS[] = '((min|max)-)?(width|height)'; ## list-styles $WikiStyleCSS[] = 'list-style'; - $WikiStyleCSS[] = 'width|height'; foreach(array('decimal'=>'decimal', 'roman'=>'lower-roman', 'ROMAN'=>'upper-roman', 'alpha'=>'lower-alpha', 'ALPHA'=>'upper-alpha') as $k=>$v) @@ -48,8 +48,8 @@ if (IsEnabled($EnableStdWikiStyles,1)) { 'div' => 'div', 'pre' => 'pre', 'img' => 'img', - 'block' => 'p(?!\\sclass=)|div|ul|ol|dl|li|dt|pre|h[1-6]', - 'p' => 'p(?!\\sclass=)')); + 'block' => 'p(?!\\s+class=)|div|ul|ol|dl|li|dt|pre|h[1-6]', + 'p' => 'p(?!\\s+class=)')); foreach(array('item', 'list', 'block', 'p', 'div') as $c) SDV($WikiStyle[$c],array('apply'=>$c)); ## block justifications |