mirrors/htmlpurifier
0
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-03-15 19:07:05 +00:00
Code Releases Activity

Add more information to progress document, fix an invalid definition in CSSDefinition.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@229 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang 2006-08-13 19:08:14 +00:00
parent 8b45c7601a
commit 415b7d3913
3 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
docs/progress.html
View File

@ -133,53 +133,60 @@ thead th {text-align:left;padding:0.1em;background-color:#EEE;}
<tbody>
<tr><th colspan="2">Standard</th></tr>
<tr class="css1"><td>background-color</td><td>-</td></tr>
<tr class="css1"><td>background</td><td>Depends on background-*</td></tr>
<tr class="css1"><td>border</td><td>COMPOSITE</td></tr>
<tr class="css1"><td>border-color</td><td>-</td></tr>
<tr class="css1 impl-yes"><td>border-style</td><td>ENUM(none, hidden, dotted, dashed,
<tr class="css1"><td>background-color</td><td>COMPOSITE(&lt;color&gt;, transparent)</td></tr>
<tr class="css1"><td>background</td><td>SHORTHAND</td></tr>
<tr class="css1"><td>border</td><td>SHORTHAND, MULTIPLE</td></tr>
<tr class="css1"><td>border-color</td><td>MULTIPLE</td></tr>
<tr class="css1"><td>border-style</td><td>MULTIPLE</td></tr>
<tr class="css1"><td>border-width</td><td>MULTIPLE</td></tr>
<tr class="css1"><td>border-*</td><td>SHORTHAND</td></tr>
<tr><td>border-*-color</td><td>COMPOSITE(&lt;color&gt;, transparent)</td></tr>
<tr class="impl-yes"><td>border-*-style</td><td>ENUM(none, hidden, dotted, dashed,
solid, double, groove, ridge, inset, outset)</td></tr>
<tr class="css1"><td>border-width</td><td>-</td></tr>
<tr class="css1"><td>border-*</td><td>COMPOSITE</td></tr>
<tr><td>border-*-color</td><td>-</td></tr>
<tr><td>border-*-style</td><td>-</td></tr>
<tr class="css1"><td>border-*-width</td><td>-</td></tr>
<tr class="css1"><td>border-*-width</td><td>COMPOSITE(&lt;length&gt;, thin, medium, thick)</td></tr>
<tr class="css1 impl-yes"><td>clear</td><td>ENUM(none, left, right, both)</td></tr>
<tr class="css1"><td>color</td><td>-</td></tr>
<tr class="css1"><td>color</td><td>&lt;color&gt;</td></tr>
<tr class="css1 impl-yes"><td>float</td><td>ENUM(left, right, none), May require layout
precautions with clear</td></tr>
<tr class="css1"><td>font</td><td>COMPOSITE</td></tr>
<tr class="css1"><td>font</td><td>SHORTHAND</td></tr>
<tr class="css1"><td>font-family</td><td>CSS validator may complain if fallback font
family not specified</td></tr>
<tr class="css1"><td>font-size</td><td>-</td></tr>
<tr class="css1"><td>font-size</td><td>COMPOSITE(&lt;absolute-size&gt;,
&lt;relative-size&gt;, &lt;length&gt;, &lt;percentage&gt;)</td></tr>
<tr class="css1 impl-yes"><td>font-style</td><td>ENUM(normal, italic, oblique)</td></tr>
<tr class="css1 impl-yes"><td>font-variant</td><td>ENUM(normal, small-caps)</td></tr>
<tr class="css1 impl-yes"><td>font-weight</td><td>ENUM(normal, bold, bolder, lighter,
100, 200, 300, 400, 500, 600, 700, 800, 900), maybe special code for
in-between integers</td></tr>
<tr class="css1"><td>letter-spacing</td><td>-</td></tr>
<tr class="css1"><td>line-height</td><td>-</td></tr>
<tr class="css1"><td>letter-spacing</td><td>COMPOSITE(&lt;length&gt;, normal)</td></tr>
<tr class="css1"><td>line-height</td><td>COMPOSITE(&lt;number&gt;,
&lt;length&gt;, &lt;percentage&gt;, normal)</td></tr>
<tr class="css1 impl-yes"><td>list-style-position</td><td>ENUM(inside, outside),
Strange behavior in browsers</td></tr>
<tr class="css1 impl-yes"><td>list-style-type</td><td>ENUM(...),
Well-supported values are: disc, circle, square,
decimal, lower-roman, upper-roman, lower-alpha and upper-alpha. See also
CSS 3. Mostly IE lack of support.</td></tr>
<tr class="css1"><td>list-style</td><td>COMPOSITE</td></tr>
<tr class="css1"><td>margin</td><td>-</td></tr>
<tr class="css1"><td>margin-*</td><td>-</td></tr>
<tr class="css1"><td>padding</td><td>-</td></tr>
<tr class="css1"><td>padding-*</td><td>-</td></tr>
<tr class="css1"><td>list-style</td><td>SHORTHAND</td></tr>
<tr class="css1"><td>margin</td><td>MULIPLE</td></tr>
<tr class="css1"><td>margin-*</td><td>COMPOSITE(&lt;length&gt;,
&lt;percentage&gt;, auto)</td></tr>
<tr class="css1"><td>padding</td><td>MULTIPLE</td></tr>
<tr class="css1"><td>padding-*</td><td>COMPOSITE(&lt;length&gt;(positive),
&lt;percentage&gt;(positive))</td></tr>
<tr class="css1 impl-yes"><td>text-align</td><td>ENUM(left, right,
center, justify)</td></tr>
<tr class="css1"><td>text-decoration</td><td>No blink (argh my eyes), not
enum, can be combined (composite sorta): underline, overline,
line-through</td></tr>
<tr class="css1"><td>text-indent</td><td>-</td></tr>
<tr class="css1"><td>text-indent</td><td>COMPOSITE(&lt;length&gt;,
&lt;percentage&gt;)</td></tr>
<tr class="css1 impl-yes"><td>text-transform</td><td>ENUM(capitalize, uppercase,
lowercase, none)</td></tr>
<tr class="css1"><td>width</td><td>Interesting</td></tr>
<tr class="css1"><td>word-spacing</td><td>IE 5 no support</td></tr>
<tr class="css1"><td>width</td><td>COMPOSITE(&lt;length&gt;,
&lt;percentage&gt;, auto), Interesting</td></tr>
<tr class="css1"><td>word-spacing</td><td>COMPOSITE(&lt;length&gt;, auto),
IE 5 no support</td></tr>
</tbody>
<tbody>

5
library/HTMLPurifier/CSSDefinition.php
View File

@ -22,7 +22,10 @@ class HTMLPurifier_CSSDefinition
$this->info['text-align'] = new HTMLPurifier_AttrDef_Enum(
array('left', 'right', 'center', 'justify'), false);
$this->info['border-style'] = new HTMLPurifier_AttrDef_Enum(
$this->info['border-bottom-style'] =
$this->info['border-right-style'] =
$this->info['border-left-style'] =
$this->info['border-top-style'] = new HTMLPurifier_AttrDef_Enum(
array('none', 'hidden', 'dotted', 'dashed', 'solid', 'double',
'groove', 'ridge', 'inset', 'outset'), false);
$this->info['clear'] = new HTMLPurifier_AttrDef_Enum(

2
tests/HTMLPurifier/AttrDef/CSSTest.php
View File

@ -11,7 +11,7 @@ class HTMLPurifier_AttrDef_CSSTest extends HTMLPurifier_AttrDefHarness
// regular cases, singular
$this->assertDef('text-align:right;');
$this->assertDef('border-style:solid;');
$this->assertDef('border-left-style:solid;');
$this->assertDef('clear:right;');
$this->assertDef('float:left;');
$this->assertDef('font-style:italic;');