Gusev's proposed patch

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
2025-08-06 14:16:32 +02:00 · 2013-10-12 21:24:38 -07:00
470 changed files with 8327 additions and 14963 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,12 +1 @@
-/.gitattributes export-ignore
-/.gitignore export-ignore
-/Doxyfile export-ignore
-/art/ export-ignore
-/benchmarks/ export-ignore
-/configdoc/ export-ignore
-/configdoc/usage.xml -crlf
-/docs/ export-ignore
-/maintenance/ export-ignore
-/phpdoc.ini
-/smoketests/ export-ignore
-/tests/ export-ignore
+configdoc/usage.xml -crlf
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,3 @@ docs/doxygen*
 /*.php
 vendor
 composer.lock
-*.rej
-*.orig
-*.bak
-core
--- a/2
+++ b/2
@@ -31,7 +31,7 @@ PROJECT_NAME           = HTMLPurifier
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.

-PROJECT_NUMBER         = 4.7.0
+PROJECT_NUMBER         = 4.5.0

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
--- a/13
+++ b/13
@@ -0,0 +1,13 @@
+4 - Minor feature enhancements
+
+[ Appendix A: Release focus IDs ]
+0 - N/A
+1 - Initial freshmeat announcement
+2 - Documentation
+3 - Code cleanup
+4 - Minor feature enhancements
+5 - Major feature enhancements
+6 - Minor bugfixes
+7 - Major bugfixes
+8 - Minor security fixes
+9 - Major security fixes
--- a/INSTALL.fr.utf8
+++ b/INSTALL.fr.utf8
@@ -2,59 +2,68 @@
 Installation
    Comment installer HTML Purifier

-Attention : Ce document est encodé en UTF-8, si les lettres avec des accents
-ne s'affichent pas, prenez un meilleur éditeur de texte.
+Attention: Ce document a encode en UTF-8. Si les lettres avec les accents
+est essoreuse, prenez un mieux editeur de texte.
+
+À L'Aide: Je ne suis pas un diseur natif de français. Si vous trouvez une
+erreur dans ce document, racontez-moi! Merci.
+
+
+L'installation de HTML Purifier est trés simple, parce qu'il ne doit pas
+la configuration.  Dans le pied de de document, les utilisateurs
+impatient peuvent trouver le code, mais je recommande que vous lisez
+ce document pour quelques choses.

-L'installation de HTML Purifier est très simple, parce qu'il n'a pas besoin
-de configuration. Pour les utilisateurs impatients, le code se trouve dans le
-pied de page, mais je recommande de lire le document.

 1.  Compatibilité

-HTML Purifier fonctionne avec PHP 5. PHP 5.0.5 est la dernière version testée.
-Il ne dépend pas d'autres librairies.
+HTML Purifier fonctionne dans PHP 5. PHP 5.0.5 est le dernier
+version que je le testais.  Il ne dépend de les autre librairies.

-Les extensions optionnelles sont iconv (généralement déjà installée) et tidy
-(répendue aussi). Si vous utilisez UTF-8 et que vous ne voulez pas l'indentation,
-vous pouvez utiliser HTML Purifier sans ces extensions.
+Les extensions optionnel est iconv (en général déjà installer) et
+tidy (répandu aussi). Si vous utilisez UTF-8 et ne voulez pas
+l'indentation, vous pouvez utiliser HTML Purifier sans ces extensions.


-2.  Inclure la librairie
+2.  Inclure la librarie

-Quand vous devez l'utilisez, incluez le :
+Utilisez:

-    require_once('/path/to/library/HTMLPurifier.auto.php');
+    require_once '/path/to/library/HTMLPurifier.auto.php';

-Ne pas l'inclure si ce n'est pas nécessaire, car HTML Purifier est lourd.
+...quand vous devez utiliser HTML Purifier (ne inclure pas quand vous
+ne devez pas, parce que HTML Purifier est trés grand.)

-HTML Purifier utilise "autoload". Si vous avez défini la fonction __autoload,
-vous devez ajouter cette fonction :
+HTML Purifier utilise 'autoload'. Si vous avez définu la fonction
+__autoload, vous doivez ajoute cet programme:

    spl_autoload_register('__autoload')

-Plus d'informations dans le document "INSTALL".
+Plus d'information est dans le document 'INSTALL'.

-3.  Installation rapide

-Si votre site Web est en UTF-8 et XHTML Transitional, utilisez :
+3.   Installation vite
+
+Si votre site web est en UTF-8 et XHTML Transitional, utilisez:

 <?php
-    require_once('/path/to/htmlpurifier/library/HTMLPurifier.auto.php');
+    require_once '/path/to/htmlpurifier/library/HTMLPurifier.auto.php';
+
    $purificateur = new HTMLPurifier();
-    $html_propre = $purificateur->purify($html_a_purifier);
+    $html_propre = $purificateur->purify($html_salle);
 ?>

-Sinon, utilisez :
+Sinon, utilisez:

 <?php
-    require_once('/path/to/html/purifier/library/HTMLPurifier.auto.load');
-    $config = $HTMLPurifier_Config::createDefault();
-    $config->set('Core', 'Encoding', 'ISO-8859-1'); //Remplacez par votre
-    encodage
-    $config->set('Core', 'XHTML', true); //Remplacer par false si HTML 4.01
-    $purificateur = new HTMLPurifier($config);
-    $html_propre = $purificateur->purify($html_a_purifier);
-?>
+    require_once '/path/to/htmlpurifier/library/HTMLPurifier.auto.php';

+    $config = HTMLPurifier_Config::createDefault();
+    $config->set('Core', 'Encoding', 'ISO-8859-1'); //remplacez avec votre encoding
+    $config->set('Core', 'XHTML', true); //remplacez avec false si HTML 4.01
+    $purificateur = new HTMLPurifier($config);
+
+    $html_propre = $purificateur->purify($html_salle);
+?>

    vim: et sw=4 sts=4
--- a/35
+++ b/35
@@ -9,43 +9,10 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
    . Internal change
 ==========================

-4.7.0, released 2015-08-04
-# opacity is now considered a "tricky" CSS property rather than a
-  proprietary one.
-! %AutoFormat.RemoveEmpty.Predicate for specifying exactly when
-  an element should be considered "empty" (maybe preserve if it
-  has attributes), and modify iframe support so that the iframe
-  is removed if it is missing a src attribute.  Thanks meeva for
-  reporting.
- Don't truncate upon encountering </div> when using DOMLex.  Thanks
-  Myrto Christina for finally convincing me to fix this.
- Update YouTube filter for new code.
- Fix parsing of rgb() values with spaces in them for 'border'
-  attribute.
- Don't remove foo="" attributes if foo is a boolean attribute.  Thanks
-  valME for reporting.
-
-4.6.0, released 2013-11-30
-# Secure URI munge hashing algorithm has changed to hash_hmac("sha256", $url, $secret).
-  Please update any verification scripts you may have.
+4.6.0, unknown release date
 # URI parsing algorithm was made more strict, so only prefixes which
  looks like schemes will actually be schemes.  Thanks
  Michael Gusev <mgusev@sugarcrm.com> for fixing.
-# %Core.EscapeInvalidChildren is no longer supported, and no longer does
-  anything.
-! New directive %Core.AllowHostnameUnderscore which allows underscores
-  in hostnames.
- Eliminate quadratic behavior in DOMLex by using a proper queue.
-  Thanks Ole Laursen for noticing this.
- Rewritten MakeWellFormed/FixNesting implementation eliminates quadratic
-  behavior in the rest of the purificaiton pipeline.  Thanks Chedburn
-  Networks for sponsoring this work.
- Made Linkify URL parser a bit less permissive, so that non-breaking
-  spaces and commas are not included as part of URL.  Thanks nAS for fixing.
- Fix some bad interactions with %HTML.Allowed and injectors.  Thanks
-  David Hirtz for reporting.
- Fix infinite loop in DirectLex. Thanks Ashar Javed (@soaj1664ashar)
-  for reporting.

 4.5.0, released 2013-02-17
 # Fix bug where stacked attribute transforms clobber each other;
--- a/2
+++ b/2
@@ -32,7 +32,7 @@ Things to do as soon as possible:
 FUTURE VERSIONS
 ---------------

-4.8 release [OMG CONFIG PONIES]
+4.6 release [OMG CONFIG PONIES]
 ! Fix Printer. It's from the old days when we didn't have decent XML classes
 ! Factor demo.php into a set of Printer classes, and then create a stub
   file for users here (inside the actual HTML Purifier library)
--- a/2
+++ b/2
@@ -1 +1 @@
-4.7.0
+4.5.0
--- a/10
+++ b/10
@@ -1,4 +1,6 @@
-HTML Purifier 4.7.0 is a bugfix release, collecting two years
-worth of accumulated bug fixes.  Highlighted bugfixes are updated
-YouTube filter code, corrected rgb() CSS parsing, and one new
-configuration option, %AutoFormat.RemoveEmpty.Predicate.
+HTML Purifier 4.5.0 is a minor bugfix and feature release, containing an
+accumulation of changes over a year.  CSS support has been extended to
+support display:inline-block, white-space, underscores in font families,
+page-break-* CSS3 properties (when proprietary is enabled.)  We now use
+SHA-1 to identify cached definitions, and the semantics of stacked
+attribute transforms has changed slightly.
--- a/benchmarks/Lexer.php
+++ b/benchmarks/Lexer.php
@@ -23,16 +23,15 @@ if (version_compare(PHP_VERSION, '5', '>=')) {
 class RowTimer extends Benchmark_Timer
 {

-    public $name;
+    var $name;

-    public function RowTimer($name, $auto = false)
-    {
+    function RowTimer($name, $auto = false) {
        $this->name = htmlentities($name);
        $this->Benchmark_Timer($auto);
    }

-    public function getOutput()
-    {
+    function getOutput() {
+
        $total  = $this->TimeElapsed();
        $result = $this->getProfiling();
        $dashes = '';
@@ -69,8 +68,7 @@ class RowTimer extends Benchmark_Timer
    }
 }

-function print_lexers()
-{
+function print_lexers() {
    global $LEXERS;
    $first = true;
    foreach ($LEXERS as $key => $value) {
@@ -80,8 +78,7 @@ function print_lexers()
    }
 }

-function do_benchmark($name, $document)
-{
+function do_benchmark($name, $document) {
    global $LEXERS, $RUNS;

    $config = HTMLPurifier_Config::createDefault();
--- a/configdoc/usage.xml
+++ b/configdoc/usage.xml
@@ -2,551 +2,546 @@
 <usage>
 <directive id="Core.CollectErrors">
  <file name="HTMLPurifier.php">
-   <line>162</line>
+   <line>131</line>
  </file>
  <file name="HTMLPurifier/Lexer.php">
-   <line>85</line>
-   <line>315</line>
+   <line>81</line>
+   <line>284</line>
  </file>
  <file name="HTMLPurifier/Lexer/DirectLex.php">
-   <line>67</line>
-   <line>87</line>
-   <line>385</line>
+   <line>53</line>
+   <line>73</line>
+   <line>348</line>
  </file>
  <file name="HTMLPurifier/Strategy/RemoveForeignElements.php">
-   <line>57</line>
+   <line>50</line>
  </file>
 </directive>
 <directive id="CSS.MaxImgLength">
  <file name="HTMLPurifier/CSSDefinition.php">
-   <line>226</line>
+   <line>157</line>
  </file>
 </directive>
 <directive id="CSS.Proprietary">
  <file name="HTMLPurifier/CSSDefinition.php">
-   <line>319</line>
+   <line>215</line>
  </file>
 </directive>
 <directive id="CSS.AllowTricky">
  <file name="HTMLPurifier/CSSDefinition.php">
-   <line>323</line>
+   <line>219</line>
  </file>
 </directive>
 <directive id="CSS.Trusted">
  <file name="HTMLPurifier/CSSDefinition.php">
-   <line>327</line>
+   <line>223</line>
  </file>
 </directive>
 <directive id="CSS.AllowImportant">
  <file name="HTMLPurifier/CSSDefinition.php">
-   <line>331</line>
+   <line>227</line>
  </file>
 </directive>
 <directive id="CSS.AllowedProperties">
  <file name="HTMLPurifier/CSSDefinition.php">
-   <line>447</line>
+   <line>302</line>
  </file>
 </directive>
 <directive id="CSS.ForbiddenProperties">
  <file name="HTMLPurifier/CSSDefinition.php">
-   <line>463</line>
+   <line>316</line>
  </file>
 </directive>
 <directive id="Cache.DefinitionImpl">
  <file name="HTMLPurifier/DefinitionCacheFactory.php">
-   <line>66</line>
+   <line>49</line>
  </file>
 </directive>
 <directive id="HTML.Doctype">
  <file name="HTMLPurifier/DoctypeRegistry.php">
-   <line>119</line>
+   <line>83</line>
  </file>
 </directive>
 <directive id="HTML.CustomDoctype">
  <file name="HTMLPurifier/DoctypeRegistry.php">
-   <line>123</line>
+   <line>85</line>
  </file>
 </directive>
 <directive id="HTML.XHTML">
  <file name="HTMLPurifier/DoctypeRegistry.php">
-   <line>128</line>
+   <line>88</line>
  </file>
 </directive>
 <directive id="HTML.Strict">
  <file name="HTMLPurifier/DoctypeRegistry.php">
-   <line>133</line>
+   <line>93</line>
  </file>
 </directive>
 <directive id="Core.Encoding">
  <file name="HTMLPurifier/Encoder.php">
-   <line>374</line>
-   <line>422</line>
+   <line>337</line>
+   <line>372</line>
  </file>
 </directive>
 <directive id="Test.ForceNoIconv">
  <file name="HTMLPurifier/Encoder.php">
-   <line>382</line>
-   <line>433</line>
+   <line>341</line>
+   <line>379</line>
  </file>
 </directive>
 <directive id="Core.EscapeNonASCIICharacters">
  <file name="HTMLPurifier/Encoder.php">
-   <line>423</line>
+   <line>373</line>
  </file>
 </directive>
 <directive id="Output.CommentScriptContents">
  <file name="HTMLPurifier/Generator.php">
-   <line>70</line>
+   <line>61</line>
  </file>
 </directive>
 <directive id="Output.FixInnerHTML">
  <file name="HTMLPurifier/Generator.php">
-   <line>71</line>
+   <line>62</line>
  </file>
 </directive>
 <directive id="Output.SortAttr">
  <file name="HTMLPurifier/Generator.php">
-   <line>72</line>
+   <line>63</line>
  </file>
 </directive>
 <directive id="Output.FlashCompat">
  <file name="HTMLPurifier/Generator.php">
-   <line>73</line>
+   <line>64</line>
  </file>
 </directive>
 <directive id="Output.TidyFormat">
  <file name="HTMLPurifier/Generator.php">
-   <line>104</line>
+   <line>93</line>
  </file>
 </directive>
 <directive id="Core.NormalizeNewlines">
  <file name="HTMLPurifier/Generator.php">
-   <line>122</line>
+   <line>107</line>
  </file>
  <file name="HTMLPurifier/Lexer.php">
-   <line>297</line>
+   <line>266</line>
  </file>
 </directive>
 <directive id="Output.Newline">
  <file name="HTMLPurifier/Generator.php">
-   <line>123</line>
+   <line>108</line>
  </file>
 </directive>
 <directive id="HTML.BlockWrapper">
  <file name="HTMLPurifier/HTMLDefinition.php">
-   <line>263</line>
+   <line>222</line>
  </file>
 </directive>
 <directive id="HTML.Parent">
  <file name="HTMLPurifier/HTMLDefinition.php">
-   <line>273</line>
+   <line>230</line>
  </file>
 </directive>
 <directive id="HTML.AllowedElements">
  <file name="HTMLPurifier/HTMLDefinition.php">
-   <line>291</line>
+   <line>247</line>
  </file>
 </directive>
 <directive id="HTML.AllowedAttributes">
  <file name="HTMLPurifier/HTMLDefinition.php">
-   <line>292</line>
+   <line>248</line>
  </file>
 </directive>
 <directive id="HTML.Allowed">
  <file name="HTMLPurifier/HTMLDefinition.php">
-   <line>295</line>
+   <line>251</line>
  </file>
 </directive>
 <directive id="HTML.ForbiddenElements">
  <file name="HTMLPurifier/HTMLDefinition.php">
-   <line>399</line>
+   <line>342</line>
  </file>
 </directive>
 <directive id="HTML.ForbiddenAttributes">
  <file name="HTMLPurifier/HTMLDefinition.php">
-   <line>400</line>
+   <line>343</line>
  </file>
 </directive>
 <directive id="HTML.Trusted">
  <file name="HTMLPurifier/HTMLModuleManager.php">
-   <line>234</line>
+   <line>204</line>
  </file>
  <file name="HTMLPurifier/Lexer.php">
-   <line>302</line>
+   <line>271</line>
  </file>
  <file name="HTMLPurifier/HTMLModule/Image.php">
-   <line>37</line>
+   <line>27</line>
  </file>
  <file name="HTMLPurifier/Lexer/DirectLex.php">
-   <line>47</line>
+   <line>36</line>
  </file>
  <file name="HTMLPurifier/Strategy/RemoveForeignElements.php">
-   <line>30</line>
+   <line>23</line>
  </file>
 </directive>
 <directive id="HTML.AllowedModules">
  <file name="HTMLPurifier/HTMLModuleManager.php">
-   <line>241</line>
+   <line>211</line>
  </file>
 </directive>
 <directive id="HTML.CoreModules">
  <file name="HTMLPurifier/HTMLModuleManager.php">
-   <line>242</line>
+   <line>212</line>
  </file>
 </directive>
 <directive id="HTML.Proprietary">
  <file name="HTMLPurifier/HTMLModuleManager.php">
-   <line>256</line>
+   <line>222</line>
  </file>
 </directive>
 <directive id="HTML.SafeObject">
  <file name="HTMLPurifier/HTMLModuleManager.php">
-   <line>259</line>
+   <line>225</line>
  </file>
 </directive>
 <directive id="HTML.SafeEmbed">
  <file name="HTMLPurifier/HTMLModuleManager.php">
-   <line>262</line>
+   <line>228</line>
  </file>
 </directive>
 <directive id="HTML.SafeScripting">
  <file name="HTMLPurifier/HTMLModuleManager.php">
-   <line>265</line>
+   <line>231</line>
  </file>
  <file name="HTMLPurifier/HTMLModule/SafeScripting.php">
-   <line>22</line>
+   <line>17</line>
  </file>
 </directive>
 <directive id="HTML.Nofollow">
  <file name="HTMLPurifier/HTMLModuleManager.php">
-   <line>268</line>
+   <line>234</line>
  </file>
 </directive>
 <directive id="HTML.TargetBlank">
  <file name="HTMLPurifier/HTMLModuleManager.php">
-   <line>271</line>
+   <line>237</line>
  </file>
 </directive>
 <directive id="Attr.IDBlacklist">
  <file name="HTMLPurifier/IDAccumulator.php">
-   <line>27</line>
+   <line>26</line>
  </file>
 </directive>
 <directive id="Core.Language">
  <file name="HTMLPurifier/LanguageFactory.php">
-   <line>93</line>
+   <line>88</line>
  </file>
 </directive>
 <directive id="Core.LexerImpl">
  <file name="HTMLPurifier/Lexer.php">
-   <line>80</line>
+   <line>76</line>
  </file>
 </directive>
 <directive id="Core.MaintainLineNumbers">
  <file name="HTMLPurifier/Lexer.php">
-   <line>84</line>
+   <line>80</line>
  </file>
  <file name="HTMLPurifier/Lexer/DirectLex.php">
-   <line>62</line>
+   <line>48</line>
  </file>
 </directive>
 <directive id="Core.ConvertDocumentToFragment">
  <file name="HTMLPurifier/Lexer.php">
-   <line>313</line>
+   <line>282</line>
  </file>
 </directive>
 <directive id="Core.RemoveProcessingInstructions">
  <file name="HTMLPurifier/Lexer.php">
-   <line>334</line>
+   <line>303</line>
  </file>
 </directive>
 <directive id="URI.">
  <file name="HTMLPurifier/URIDefinition.php">
-   <line>65</line>
+   <line>60</line>
  </file>
  <file name="HTMLPurifier/URIFilter/Munge.php">
-   <line>46</line>
+   <line>12</line>
  </file>
 </directive>
 <directive id="URI.Host">
  <file name="HTMLPurifier/URIDefinition.php">
-   <line>76</line>
+   <line>70</line>
  </file>
  <file name="HTMLPurifier/URIScheme.php">
-   <line>89</line>
+   <line>81</line>
  </file>
 </directive>
 <directive id="URI.Base">
  <file name="HTMLPurifier/URIDefinition.php">
-   <line>77</line>
+   <line>71</line>
  </file>
 </directive>
 <directive id="URI.DefaultScheme">
  <file name="HTMLPurifier/URIDefinition.php">
-   <line>84</line>
+   <line>78</line>
  </file>
 </directive>
 <directive id="URI.AllowedSchemes">
  <file name="HTMLPurifier/URISchemeRegistry.php">
-   <line>48</line>
+   <line>41</line>
  </file>
 </directive>
 <directive id="URI.OverrideAllowedSchemes">
  <file name="HTMLPurifier/URISchemeRegistry.php">
-   <line>49</line>
+   <line>42</line>
  </file>
 </directive>
 <directive id="URI.Disable">
  <file name="HTMLPurifier/AttrDef/URI.php">
-   <line>47</line>
+   <line>28</line>
  </file>
 </directive>
 <directive id="Core.ColorKeywords">
  <file name="HTMLPurifier/AttrDef/CSS/Color.php">
-   <line>19</line>
+   <line>12</line>
  </file>
  <file name="HTMLPurifier/AttrDef/HTML/Color.php">
-   <line>19</line>
+   <line>12</line>
  </file>
 </directive>
 <directive id="CSS.AllowedFonts">
  <file name="HTMLPurifier/AttrDef/CSS/FontFamily.php">
-   <line>64</line>
+   <line>50</line>
  </file>
 </directive>
 <directive id="Attr.AllowedClasses">
  <file name="HTMLPurifier/AttrDef/HTML/Class.php">
-   <line>33</line>
+   <line>18</line>
  </file>
 </directive>
 <directive id="Attr.ForbiddenClasses">
  <file name="HTMLPurifier/AttrDef/HTML/Class.php">
-   <line>34</line>
+   <line>19</line>
  </file>
 </directive>
 <directive id="Attr.AllowedFrameTargets">
  <file name="HTMLPurifier/AttrDef/HTML/FrameTarget.php">
-   <line>32</line>
+   <line>15</line>
  </file>
 </directive>
 <directive id="Attr.EnableID">
  <file name="HTMLPurifier/AttrDef/HTML/ID.php">
-   <line>41</line>
+   <line>30</line>
  </file>
 </directive>
 <directive id="Attr.IDPrefix">
  <file name="HTMLPurifier/AttrDef/HTML/ID.php">
-   <line>51</line>
+   <line>36</line>
  </file>
 </directive>
 <directive id="Attr.IDPrefixLocal">
  <file name="HTMLPurifier/AttrDef/HTML/ID.php">
-   <line>53</line>
-   <line>58</line>
+   <line>38</line>
+   <line>41</line>
  </file>
 </directive>
 <directive id="Attr.IDBlacklistRegexp">
  <file name="HTMLPurifier/AttrDef/HTML/ID.php">
-   <line>89</line>
+   <line>64</line>
  </file>
 </directive>
 <directive id="Attr.">
  <file name="HTMLPurifier/AttrDef/HTML/LinkTypes.php">
-   <line>46</line>
-  </file>
- </directive>
- <directive id="Core.AllowHostnameUnderscore">
-  <file name="HTMLPurifier/AttrDef/URI/Host.php">
-   <line>77</line>
+   <line>30</line>
  </file>
 </directive>
 <directive id="Core.EnableIDNA">
  <file name="HTMLPurifier/AttrDef/URI/Host.php">
-   <line>96</line>
+   <line>67</line>
  </file>
 </directive>
 <directive id="Attr.DefaultTextDir">
  <file name="HTMLPurifier/AttrTransform/BdoDir.php">
-   <line>22</line>
+   <line>13</line>
  </file>
 </directive>
 <directive id="Core.RemoveInvalidImg">
  <file name="HTMLPurifier/AttrTransform/ImgRequired.php">
-   <line>24</line>
+   <line>18</line>
  </file>
  <file name="HTMLPurifier/Strategy/RemoveForeignElements.php">
-   <line>27</line>
+   <line>20</line>
  </file>
 </directive>
 <directive id="Attr.DefaultInvalidImage">
  <file name="HTMLPurifier/AttrTransform/ImgRequired.php">
-   <line>27</line>
+   <line>19</line>
  </file>
 </directive>
 <directive id="Attr.DefaultImageAlt">
  <file name="HTMLPurifier/AttrTransform/ImgRequired.php">
-   <line>33</line>
+   <line>25</line>
  </file>
 </directive>
 <directive id="Attr.DefaultInvalidImageAlt">
  <file name="HTMLPurifier/AttrTransform/ImgRequired.php">
-   <line>41</line>
+   <line>33</line>
  </file>
 </directive>
 <directive id="HTML.Attr.Name.UseCDATA">
  <file name="HTMLPurifier/AttrTransform/Name.php">
-   <line>18</line>
+   <line>11</line>
  </file>
  <file name="HTMLPurifier/HTMLModule/Name.php">
-   <line>19</line>
+   <line>13</line>
  </file>
 </directive>
 <directive id="HTML.FlashAllowFullScreen">
  <file name="HTMLPurifier/AttrTransform/SafeParam.php">
-   <line>53</line>
+   <line>38</line>
+  </file>
+ </directive>
+ <directive id="Core.EscapeInvalidChildren">
+  <file name="HTMLPurifier/ChildDef/Required.php">
+   <line>62</line>
  </file>
 </directive>
 <directive id="Cache.SerializerPath">
  <file name="HTMLPurifier/DefinitionCache/Serializer.php">
-   <line>171</line>
+   <line>91</line>
  </file>
 </directive>
 <directive id="Cache.SerializerPermissions">
  <file name="HTMLPurifier/DefinitionCache/Serializer.php">
-   <line>188</line>
-   <line>206</line>
+   <line>107</line>
+   <line>124</line>
  </file>
 </directive>
 <directive id="Filter.ExtractStyleBlocks.TidyImpl">
  <file name="HTMLPurifier/Filter/ExtractStyleBlocks.php">
-   <line>94</line>
+   <line>55</line>
  </file>
 </directive>
 <directive id="Filter.ExtractStyleBlocks.Scope">
  <file name="HTMLPurifier/Filter/ExtractStyleBlocks.php">
-   <line>122</line>
+   <line>79</line>
  </file>
 </directive>
 <directive id="Filter.ExtractStyleBlocks.Escaping">
  <file name="HTMLPurifier/Filter/ExtractStyleBlocks.php">
-   <line>327</line>
+   <line>277</line>
  </file>
 </directive>
 <directive id="HTML.SafeIframe">
  <file name="HTMLPurifier/HTMLModule/Iframe.php">
-   <line>28</line>
+   <line>17</line>
  </file>
  <file name="HTMLPurifier/URIFilter/SafeIframe.php">
-   <line>48</line>
+   <line>23</line>
  </file>
 </directive>
 <directive id="HTML.MaxImgLength">
  <file name="HTMLPurifier/HTMLModule/Image.php">
-   <line>21</line>
+   <line>14</line>
  </file>
  <file name="HTMLPurifier/HTMLModule/SafeEmbed.php">
-   <line>18</line>
+   <line>13</line>
  </file>
  <file name="HTMLPurifier/HTMLModule/SafeObject.php">
-   <line>24</line>
+   <line>19</line>
  </file>
 </directive>
 <directive id="HTML.TidyLevel">
  <file name="HTMLPurifier/HTMLModule/Tidy.php">
-   <line>50</line>
+   <line>45</line>
  </file>
 </directive>
 <directive id="HTML.TidyAdd">
  <file name="HTMLPurifier/HTMLModule/Tidy.php">
-   <line>54</line>
+   <line>49</line>
  </file>
 </directive>
 <directive id="HTML.TidyRemove">
  <file name="HTMLPurifier/HTMLModule/Tidy.php">
-   <line>55</line>
+   <line>50</line>
  </file>
 </directive>
 <directive id="AutoFormat.PurifierLinkify.DocURL">
  <file name="HTMLPurifier/Injector/PurifierLinkify.php">
-   <line>31</line>
+   <line>15</line>
  </file>
 </directive>
 <directive id="AutoFormat.RemoveEmpty.RemoveNbsp">
  <file name="HTMLPurifier/Injector/RemoveEmpty.php">
-   <line>46</line>
+   <line>15</line>
  </file>
 </directive>
 <directive id="AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions">
  <file name="HTMLPurifier/Injector/RemoveEmpty.php">
-   <line>47</line>
-  </file>
- </directive>
- <directive id="AutoFormat.RemoveEmpty.Predicate">
-  <file name="HTMLPurifier/Injector/RemoveEmpty.php">
-   <line>48</line>
+   <line>16</line>
  </file>
 </directive>
 <directive id="Core.AggressivelyFixLt">
  <file name="HTMLPurifier/Lexer/DOMLex.php">
-   <line>54</line>
+   <line>44</line>
  </file>
 </directive>
 <directive id="Core.DirectLexLineNumberSyncInterval">
  <file name="HTMLPurifier/Lexer/DirectLex.php">
-   <line>84</line>
+   <line>70</line>
  </file>
 </directive>
 <directive id="Core.DisableExcludes">
  <file name="HTMLPurifier/Strategy/FixNesting.php">
-   <line>54</line>
+   <line>57</line>
  </file>
 </directive>
 <directive id="Core.EscapeInvalidTags">
  <file name="HTMLPurifier/Strategy/MakeWellFormed.php">
-   <line>72</line>
+   <line>53</line>
  </file>
  <file name="HTMLPurifier/Strategy/RemoveForeignElements.php">
-   <line>26</line>
+   <line>19</line>
  </file>
 </directive>
 <directive id="HTML.AllowedComments">
  <file name="HTMLPurifier/Strategy/RemoveForeignElements.php">
-   <line>31</line>
+   <line>24</line>
  </file>
 </directive>
 <directive id="HTML.AllowedCommentsRegexp">
  <file name="HTMLPurifier/Strategy/RemoveForeignElements.php">
-   <line>32</line>
+   <line>25</line>
  </file>
 </directive>
 <directive id="Core.RemoveScriptContents">
  <file name="HTMLPurifier/Strategy/RemoveForeignElements.php">
-   <line>35</line>
+   <line>28</line>
  </file>
 </directive>
 <directive id="Core.HiddenElements">
  <file name="HTMLPurifier/Strategy/RemoveForeignElements.php">
-   <line>36</line>
+   <line>29</line>
  </file>
 </directive>
 <directive id="URI.HostBlacklist">
  <file name="HTMLPurifier/URIFilter/HostBlacklist.php">
-   <line>25</line>
+   <line>12</line>
  </file>
 </directive>
 <directive id="URI.MungeResources">
  <file name="HTMLPurifier/URIFilter/Munge.php">
-   <line>48</line>
+   <line>14</line>
  </file>
 </directive>
 <directive id="URI.MungeSecretKey">
  <file name="HTMLPurifier/URIFilter/Munge.php">
-   <line>49</line>
+   <line>15</line>
  </file>
 </directive>
 <directive id="URI.SafeIframeRegexp">
  <file name="HTMLPurifier/URIFilter/SafeIframe.php">
-   <line>35</line>
+   <line>18</line>
  </file>
 </directive>
 </usage>
--- a/extras/ConfigDoc/HTMLXSLTProcessor.php
+++ b/extras/ConfigDoc/HTMLXSLTProcessor.php
@@ -11,8 +11,7 @@ class ConfigDoc_HTMLXSLTProcessor
     */
    protected $xsltProcessor;

-    public function __construct($proc = false)
-    {
+    public function __construct($proc = false) {
        if ($proc === false) $proc = new XSLTProcessor();
        $this->xsltProcessor = $proc;
    }
@@ -20,8 +19,7 @@ class ConfigDoc_HTMLXSLTProcessor
    /**
     * @note Allows a string $xsl filename to be passed
     */
-    public function importStylesheet($xsl)
-    {
+    public function importStylesheet($xsl) {
        if (is_string($xsl)) {
            $xsl_file = $xsl;
            $xsl = new DOMDocument();
@@ -36,8 +34,7 @@ class ConfigDoc_HTMLXSLTProcessor
     * @return string HTML output
     * @todo Rename to transformToXHTML, as transformToHTML is misleading
     */
-    public function transformToHTML($xml)
-    {
+    public function transformToHTML($xml) {
        if (is_string($xml)) {
            $dom = new DOMDocument();
            $dom->load($xml);
@@ -71,8 +68,7 @@ class ConfigDoc_HTMLXSLTProcessor
     * Bulk sets parameters for the XSL stylesheet
     * @param array $options Associative array of options to set
     */
-    public function setParameters($options)
-    {
+    public function setParameters($options) {
        foreach ($options as $name => $value) {
            $this->xsltProcessor->setParameter('', $name, $value);
        }
@@ -81,8 +77,7 @@ class ConfigDoc_HTMLXSLTProcessor
    /**
     * Forward any other calls to the XSLT processor
     */
-    public function __call($name, $arguments)
-    {
+    public function __call($name, $arguments) {
        call_user_func_array(array($this->xsltProcessor, $name), $arguments);
    }

--- a/extras/FSTools.php
+++ b/extras/FSTools.php
@@ -15,8 +15,7 @@ class FSTools
    /**
     * Returns a global instance of FSTools
     */
-    public static function singleton()
-    {
+    static public function singleton() {
        if (empty(FSTools::$singleton)) FSTools::$singleton = new FSTools();
        return FSTools::$singleton;
    }
@@ -25,8 +24,7 @@ class FSTools
     * Sets our global singleton to something else; useful for overloading
     * functions.
     */
-    public static function setSingleton($singleton)
-    {
+    static public function setSingleton($singleton) {
        FSTools::$singleton = $singleton;
    }

@@ -35,8 +33,7 @@ class FSTools
     * @param string $folder Name of folder to create
     * @note Adapted from the PHP manual comment 76612
     */
-    public function mkdirr($folder)
-    {
+    public function mkdirr($folder) {
        $folders = preg_split("#[\\\\/]#", $folder);
        $base = '';
        for($i = 0, $c = count($folders); $i < $c; $i++) {
@@ -60,8 +57,7 @@ class FSTools
     * so that copied files, if PHP, have includes removed
     * @note Adapted from http://aidanlister.com/repos/v/function.copyr.php
     */
-    public function copyr($source, $dest)
-    {
+    public function copyr($source, $dest) {
        // Simple copy for a file
        if (is_file($source)) {
            return $this->copy($source, $dest);
@@ -96,8 +92,7 @@ class FSTools
     * ignore hidden files, unreadable files, etc. This function
     * applies to copyr().
     */
-    public function copyable($file)
-    {
+    public function copyable($file) {
        return true;
    }

@@ -136,8 +131,7 @@ class FSTools
    /**
     * Recursively globs a directory.
     */
-    public function globr($dir, $pattern, $flags = NULL)
-    {
+    public function globr($dir, $pattern, $flags = NULL) {
        $files = $this->glob("$dir/$pattern", $flags);
        if ($files === false) $files = array();
        $sub_dirs = $this->glob("$dir/*", GLOB_ONLYDIR);
@@ -154,8 +148,7 @@ class FSTools
     * @warning This function will not work for functions that need
     *      to pass references; manually define a stub function for those.
     */
-    public function __call($name, $args)
-    {
+    public function __call($name, $args) {
        return call_user_func_array($name, $args);
    }

--- a/extras/FSTools/File.php
+++ b/extras/FSTools/File.php
@@ -23,8 +23,7 @@ class FSTools_File
     * Filename of file you wish to instantiate.
     * @note This file need not exist
     */
-    public function __construct($name, $fs = false)
-    {
+    public function __construct($name, $fs = false) {
        $this->name = $name;
        $this->fs = $fs ? $fs : FSTools::singleton();
    }
@@ -39,32 +38,27 @@ class FSTools_File
     * Retrieves the contents of a file
     * @todo Throw an exception if file doesn't exist
     */
-    public function get()
-    {
+    public function get() {
        return $this->fs->file_get_contents($this->name);
    }

    /** Writes contents to a file, creates new file if necessary */
-    public function write($contents)
-    {
+    public function write($contents) {
        return $this->fs->file_put_contents($this->name, $contents);
    }

    /** Deletes the file */
-    public function delete()
-    {
+    public function delete() {
        return $this->fs->unlink($this->name);
    }

    /** Returns true if file exists and is a file. */
-    public function exists()
-    {
+    public function exists() {
        return $this->fs->is_file($this->name);
    }

    /** Returns last file modification time */
-    public function getMTime()
-    {
+    public function getMTime() {
        return $this->fs->filemtime($this->name);
    }

@@ -73,22 +67,19 @@ class FSTools_File
     * @note We ignore errors because of some weird owner trickery due
     *       to SVN duality
     */
-    public function chmod($octal_code)
-    {
+    public function chmod($octal_code) {
        return @$this->fs->chmod($this->name, $octal_code);
    }

    /** Opens file's handle */
-    public function open($mode)
-    {
+    public function open($mode) {
        if ($this->handle) $this->close();
        $this->handle = $this->fs->fopen($this->name, $mode);
        return true;
    }

    /** Closes file's handle */
-    public function close()
-    {
+    public function close() {
        if (!$this->handle) return false;
        $status = $this->fs->fclose($this->handle);
        $this->handle = false;
@@ -96,43 +87,37 @@ class FSTools_File
    }

    /** Retrieves a line from an open file, with optional max length $length */
-    public function getLine($length = null)
-    {
+    public function getLine($length = null) {
        if (!$this->handle) $this->open('r');
        if ($length === null) return $this->fs->fgets($this->handle);
        else return $this->fs->fgets($this->handle, $length);
    }

    /** Retrieves a character from an open file */
-    public function getChar()
-    {
+    public function getChar() {
        if (!$this->handle) $this->open('r');
        return $this->fs->fgetc($this->handle);
    }

    /** Retrieves an $length bytes of data from an open data */
-    public function read($length)
-    {
+    public function read($length) {
        if (!$this->handle) $this->open('r');
        return $this->fs->fread($this->handle, $length);
    }

    /** Writes to an open file */
-    public function put($string)
-    {
+    public function put($string) {
        if (!$this->handle) $this->open('a');
        return $this->fs->fwrite($this->handle, $string);
    }

    /** Returns TRUE if the end of the file has been reached */
-    public function eof()
-    {
+    public function eof() {
        if (!$this->handle) return true;
        return $this->fs->feof($this->handle);
    }

-    public function __destruct()
-    {
+    public function __destruct() {
        if ($this->handle) $this->close();
    }

--- a/extras/HTMLPurifierExtras.autoload.php
+++ b/extras/HTMLPurifierExtras.autoload.php
@@ -17,8 +17,7 @@ if (function_exists('spl_autoload_register')) {
        spl_autoload_register('__autoload');
    }
 } elseif (!function_exists('__autoload')) {
-    function __autoload($class)
-    {
+    function __autoload($class) {
        return HTMLPurifierExtras::autoload($class);
    }
 }
--- a/extras/HTMLPurifierExtras.php
+++ b/extras/HTMLPurifierExtras.php
@@ -7,16 +7,14 @@
 class HTMLPurifierExtras
 {

-    public static function autoload($class)
-    {
+    public static function autoload($class) {
        $path = HTMLPurifierExtras::getPath($class);
        if (!$path) return false;
        require $path;
        return true;
    }

-    public static function getPath($class)
-    {
+    public static function getPath($class) {
        if (
            strncmp('FSTools', $class, 7) !== 0 &&
            strncmp('ConfigDoc', $class, 9) !== 0
--- a/library/HTMLPurifier.autoload.php
+++ b/library/HTMLPurifier.autoload.php
@@ -14,8 +14,7 @@ if (function_exists('spl_autoload_register') && function_exists('spl_autoload_un
        spl_autoload_register('__autoload');
    }
 } elseif (!function_exists('__autoload')) {
-    function __autoload($class)
-    {
+    function __autoload($class) {
        return HTMLPurifier_Bootstrap::autoload($class);
    }
 }
--- a/library/HTMLPurifier.composer.php
+++ b/library/HTMLPurifier.composer.php
@@ -1,4 +1,4 @@
 <?php
 if (!defined('HTMLPURIFIER_PREFIX')) {
-    define('HTMLPURIFIER_PREFIX', dirname(__FILE__));
+    define('HTMLPURIFIER_PREFIX', __DIR__);
 }
--- a/library/HTMLPurifier.func.php
+++ b/library/HTMLPurifier.func.php
@@ -8,13 +8,11 @@

 /**
 * Purify HTML.
- * @param string $html String HTML to purify
- * @param mixed $config Configuration to use, can be any value accepted by
+ * @param $html String HTML to purify
+ * @param $config Configuration to use, can be any value accepted by
 *        HTMLPurifier_Config::create()
- * @return string
 */
-function HTMLPurifier($html, $config = null)
-{
+function HTMLPurifier($html, $config = null) {
    static $purifier = false;
    if (!$purifier) {
        $purifier = new HTMLPurifier();
--- a/library/HTMLPurifier.includes.php
+++ b/library/HTMLPurifier.includes.php
@@ -7,7 +7,7 @@
 * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
 * FILE, changes will be overwritten the next time the script is run.
 *
- * @version 4.7.0
+ * @version 4.5.0
 *
 * @warning
 *      You must *not* include any other HTML Purifier files before this file,
@@ -19,7 +19,8 @@
 */

 require 'HTMLPurifier.php';
-require 'HTMLPurifier/Arborize.php';
+require 'HTMLPurifier/Array.php';
+require 'HTMLPurifier/ArrayNode.php';
 require 'HTMLPurifier/AttrCollections.php';
 require 'HTMLPurifier/AttrDef.php';
 require 'HTMLPurifier/AttrTransform.php';
@@ -37,6 +38,7 @@ require 'HTMLPurifier/DefinitionCache.php';
 require 'HTMLPurifier/DefinitionCacheFactory.php';
 require 'HTMLPurifier/Doctype.php';
 require 'HTMLPurifier/DoctypeRegistry.php';
+require 'HTMLPurifier/DoublyLinkedList.php';
 require 'HTMLPurifier/ElementDef.php';
 require 'HTMLPurifier/Encoder.php';
 require 'HTMLPurifier/EntityLookup.php';
@@ -55,11 +57,9 @@ require 'HTMLPurifier/Language.php';
 require 'HTMLPurifier/LanguageFactory.php';
 require 'HTMLPurifier/Length.php';
 require 'HTMLPurifier/Lexer.php';
-require 'HTMLPurifier/Node.php';
 require 'HTMLPurifier/PercentEncoder.php';
 require 'HTMLPurifier/PropertyList.php';
 require 'HTMLPurifier/PropertyListIterator.php';
-require 'HTMLPurifier/Queue.php';
 require 'HTMLPurifier/Strategy.php';
 require 'HTMLPurifier/StringHash.php';
 require 'HTMLPurifier/StringHashParser.php';
@@ -75,7 +75,6 @@ require 'HTMLPurifier/URISchemeRegistry.php';
 require 'HTMLPurifier/UnitConverter.php';
 require 'HTMLPurifier/VarParser.php';
 require 'HTMLPurifier/VarParserException.php';
-require 'HTMLPurifier/Zipper.php';
 require 'HTMLPurifier/AttrDef/CSS.php';
 require 'HTMLPurifier/AttrDef/Clone.php';
 require 'HTMLPurifier/AttrDef/Enum.php';
@@ -193,9 +192,6 @@ require 'HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
 require 'HTMLPurifier/Injector/SafeObject.php';
 require 'HTMLPurifier/Lexer/DOMLex.php';
 require 'HTMLPurifier/Lexer/DirectLex.php';
-require 'HTMLPurifier/Node/Comment.php';
-require 'HTMLPurifier/Node/Element.php';
-require 'HTMLPurifier/Node/Text.php';
 require 'HTMLPurifier/Strategy/Composite.php';
 require 'HTMLPurifier/Strategy/Core.php';
 require 'HTMLPurifier/Strategy/FixNesting.php';
--- a/library/HTMLPurifier.kses.php
+++ b/library/HTMLPurifier.kses.php
@@ -7,8 +7,7 @@

 require_once dirname(__FILE__) . '/HTMLPurifier.auto.php';

-function kses($string, $allowed_html, $allowed_protocols = null)
-{
+function kses($string, $allowed_html, $allowed_protocols = null) {
    $config = HTMLPurifier_Config::createDefault();
    $allowed_elements = array();
    $allowed_attributes = array();
@@ -20,6 +19,7 @@ function kses($string, $allowed_html, $allowed_protocols = null)
    }
    $config->set('HTML.AllowedElements', $allowed_elements);
    $config->set('HTML.AllowedAttributes', $allowed_attributes);
+    $allowed_schemes = array();
    if ($allowed_protocols !== null) {
        $config->set('URI.AllowedSchemes', $allowed_protocols);
    }
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -19,7 +19,7 @@
 */

 /*
-    HTML Purifier 4.7.0 - Standards Compliant HTML Filtering
+    HTML Purifier 4.5.0 - Standards Compliant HTML Filtering
    Copyright (C) 2006-2008 Edward Z. Yang

    This library is free software; you can redistribute it and/or
@@ -54,97 +54,66 @@
 class HTMLPurifier
 {

-    /**
-     * Version of HTML Purifier.
-     * @type string
-     */
-    public $version = '4.7.0';
+    /** Version of HTML Purifier */
+    public $version = '4.5.0';

-    /**
-     * Constant with version of HTML Purifier.
-     */
-    const VERSION = '4.7.0';
+    /** Constant with version of HTML Purifier */
+    const VERSION = '4.5.0';

-    /**
-     * Global configuration object.
-     * @type HTMLPurifier_Config
-     */
+    /** Global configuration object */
    public $config;

-    /**
-     * Array of extra filter objects to run on HTML,
-     * for backwards compatibility.
-     * @type HTMLPurifier_Filter[]
-     */
+    /** Array of extra HTMLPurifier_Filter objects to run on HTML, for backwards compatibility */
    private $filters = array();

-    /**
-     * Single instance of HTML Purifier.
-     * @type HTMLPurifier
-     */
+    /** Single instance of HTML Purifier */
    private static $instance;

-    /**
-     * @type HTMLPurifier_Strategy_Core
-     */
-    protected $strategy;
+    protected $strategy, $generator;

    /**
-     * @type HTMLPurifier_Generator
-     */
-    protected $generator;
-
-    /**
-     * Resultant context of last run purification.
-     * Is an array of contexts if the last called method was purifyArray().
-     * @type HTMLPurifier_Context
+     * Resultant HTMLPurifier_Context of last run purification. Is an array
+     * of contexts if the last called method was purifyArray().
     */
    public $context;

    /**
     * Initializes the purifier.
-     *
-     * @param HTMLPurifier_Config $config Optional HTMLPurifier_Config object
-     *                for all instances of the purifier, if omitted, a default
-     *                configuration is supplied (which can be overridden on a
-     *                per-use basis).
+     * @param $config Optional HTMLPurifier_Config object for all instances of
+     *                the purifier, if omitted, a default configuration is
+     *                supplied (which can be overridden on a per-use basis).
     *                The parameter can also be any type that
     *                HTMLPurifier_Config::create() supports.
     */
-    public function __construct($config = null)
-    {
+    public function __construct($config = null) {
+
        $this->config = HTMLPurifier_Config::create($config);
-        $this->strategy = new HTMLPurifier_Strategy_Core();
+
+        $this->strategy     = new HTMLPurifier_Strategy_Core();
+
    }

    /**
     * Adds a filter to process the output. First come first serve
-     *
-     * @param HTMLPurifier_Filter $filter HTMLPurifier_Filter object
+     * @param $filter HTMLPurifier_Filter object
     */
-    public function addFilter($filter)
-    {
-        trigger_error(
-            'HTMLPurifier->addFilter() is deprecated, use configuration directives' .
-            ' in the Filter namespace or Filter.Custom',
-            E_USER_WARNING
-        );
+    public function addFilter($filter) {
+        trigger_error('HTMLPurifier->addFilter() is deprecated, use configuration directives in the Filter namespace or Filter.Custom', E_USER_WARNING);
        $this->filters[] = $filter;
    }

    /**
     * Filters an HTML snippet/document to be XSS-free and standards-compliant.
     *
-     * @param string $html String of HTML to purify
-     * @param HTMLPurifier_Config $config Config object for this operation,
-     *                if omitted, defaults to the config object specified during this
+     * @param $html String of HTML to purify
+     * @param $config HTMLPurifier_Config object for this operation, if omitted,
+     *                defaults to the config object specified during this
     *                object's construction. The parameter can also be any type
     *                that HTMLPurifier_Config::create() supports.
-     *
-     * @return string Purified HTML
+     * @return Purified HTML
     */
-    public function purify($html, $config = null)
-    {
+    public function purify($html, $config = null) {
+
        // :TODO: make the config merge in, instead of replace
        $config = $config ? HTMLPurifier_Config::create($config) : $this->config;

@@ -182,12 +151,8 @@ class HTMLPurifier
        unset($filter_flags['Custom']);
        $filters = array();
        foreach ($filter_flags as $filter => $flag) {
-            if (!$flag) {
-                continue;
-            }
-            if (strpos($filter, '.') !== false) {
-                continue;
-            }
+            if (!$flag) continue;
+            if (strpos($filter, '.') !== false) continue;
            $class = "HTMLPurifier_Filter_$filter";
            $filters[] = new $class;
        }
@@ -210,12 +175,9 @@ class HTMLPurifier
                    // list of un-purified tokens
                    $lexer->tokenizeHTML(
                        // un-purified HTML
-                        $html,
-                        $config,
-                        $context
+                        $html, $config, $context
                    ),
-                    $config,
-                    $context
+                    $config, $context
                )
            );

@@ -230,15 +192,11 @@ class HTMLPurifier

    /**
     * Filters an array of HTML snippets
-     *
-     * @param string[] $array_of_html Array of html snippets
-     * @param HTMLPurifier_Config $config Optional config object for this operation.
+     * @param $config Optional HTMLPurifier_Config object for this operation.
     *                See HTMLPurifier::purify() for more details.
-     *
-     * @return string[] Array of purified HTML
+     * @return Array of purified HTML
     */
-    public function purifyArray($array_of_html, $config = null)
-    {
+    public function purifyArray($array_of_html, $config = null) {
        $context_array = array();
        foreach ($array_of_html as $key => $html) {
            $array_of_html[$key] = $this->purify($html, $config);
@@ -250,16 +208,11 @@ class HTMLPurifier

    /**
     * Singleton for enforcing just one HTML Purifier in your system
-     *
-     * @param HTMLPurifier|HTMLPurifier_Config $prototype Optional prototype
-     *                   HTMLPurifier instance to overload singleton with,
-     *                   or HTMLPurifier_Config instance to configure the
-     *                   generated version with.
-     *
-     * @return HTMLPurifier
+     * @param $prototype Optional prototype HTMLPurifier instance to
+     *                   overload singleton with, or HTMLPurifier_Config
+     *                   instance to configure the generated version with.
     */
-    public static function instance($prototype = null)
-    {
+    public static function instance($prototype = null) {
        if (!self::$instance || $prototype) {
            if ($prototype instanceof HTMLPurifier) {
                self::$instance = $prototype;
@@ -273,20 +226,12 @@ class HTMLPurifier
    }

    /**
-     * Singleton for enforcing just one HTML Purifier in your system
-     *
-     * @param HTMLPurifier|HTMLPurifier_Config $prototype Optional prototype
-     *                   HTMLPurifier instance to overload singleton with,
-     *                   or HTMLPurifier_Config instance to configure the
-     *                   generated version with.
-     *
-     * @return HTMLPurifier
     * @note Backwards compatibility, see instance()
     */
-    public static function getInstance($prototype = null)
-    {
+    public static function getInstance($prototype = null) {
        return HTMLPurifier::instance($prototype);
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier.safe-includes.php
+++ b/library/HTMLPurifier.safe-includes.php
@@ -13,7 +13,8 @@
 $__dir = dirname(__FILE__);

 require_once $__dir . '/HTMLPurifier.php';
-require_once $__dir . '/HTMLPurifier/Arborize.php';
+require_once $__dir . '/HTMLPurifier/Array.php';
+require_once $__dir . '/HTMLPurifier/ArrayNode.php';
 require_once $__dir . '/HTMLPurifier/AttrCollections.php';
 require_once $__dir . '/HTMLPurifier/AttrDef.php';
 require_once $__dir . '/HTMLPurifier/AttrTransform.php';
@@ -31,6 +32,7 @@ require_once $__dir . '/HTMLPurifier/DefinitionCache.php';
 require_once $__dir . '/HTMLPurifier/DefinitionCacheFactory.php';
 require_once $__dir . '/HTMLPurifier/Doctype.php';
 require_once $__dir . '/HTMLPurifier/DoctypeRegistry.php';
+require_once $__dir . '/HTMLPurifier/DoublyLinkedList.php';
 require_once $__dir . '/HTMLPurifier/ElementDef.php';
 require_once $__dir . '/HTMLPurifier/Encoder.php';
 require_once $__dir . '/HTMLPurifier/EntityLookup.php';
@@ -49,11 +51,9 @@ require_once $__dir . '/HTMLPurifier/Language.php';
 require_once $__dir . '/HTMLPurifier/LanguageFactory.php';
 require_once $__dir . '/HTMLPurifier/Length.php';
 require_once $__dir . '/HTMLPurifier/Lexer.php';
-require_once $__dir . '/HTMLPurifier/Node.php';
 require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
 require_once $__dir . '/HTMLPurifier/PropertyList.php';
 require_once $__dir . '/HTMLPurifier/PropertyListIterator.php';
-require_once $__dir . '/HTMLPurifier/Queue.php';
 require_once $__dir . '/HTMLPurifier/Strategy.php';
 require_once $__dir . '/HTMLPurifier/StringHash.php';
 require_once $__dir . '/HTMLPurifier/StringHashParser.php';
@@ -69,7 +69,6 @@ require_once $__dir . '/HTMLPurifier/URISchemeRegistry.php';
 require_once $__dir . '/HTMLPurifier/UnitConverter.php';
 require_once $__dir . '/HTMLPurifier/VarParser.php';
 require_once $__dir . '/HTMLPurifier/VarParserException.php';
-require_once $__dir . '/HTMLPurifier/Zipper.php';
 require_once $__dir . '/HTMLPurifier/AttrDef/CSS.php';
 require_once $__dir . '/HTMLPurifier/AttrDef/Clone.php';
 require_once $__dir . '/HTMLPurifier/AttrDef/Enum.php';
@@ -187,9 +186,6 @@ require_once $__dir . '/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
 require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
 require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
 require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
-require_once $__dir . '/HTMLPurifier/Node/Comment.php';
-require_once $__dir . '/HTMLPurifier/Node/Element.php';
-require_once $__dir . '/HTMLPurifier/Node/Text.php';
 require_once $__dir . '/HTMLPurifier/Strategy/Composite.php';
 require_once $__dir . '/HTMLPurifier/Strategy/Core.php';
 require_once $__dir . '/HTMLPurifier/Strategy/FixNesting.php';
--- a/library/HTMLPurifier/Arborize.php
+++ b/library/HTMLPurifier/Arborize.php
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Converts a stream of HTMLPurifier_Token into an HTMLPurifier_Node,
- * and back again.
- *
- * @note This transformation is not an equivalence.  We mutate the input
- * token stream to make it so; see all [MUT] markers in code.
- */
-class HTMLPurifier_Arborize
-{
-    public static function arborize($tokens, $config, $context) {
-        $definition = $config->getHTMLDefinition();
-        $parent = new HTMLPurifier_Token_Start($definition->info_parent);
-        $stack = array($parent->toNode());
-        foreach ($tokens as $token) {
-            $token->skip = null; // [MUT]
-            $token->carryover = null; // [MUT]
-            if ($token instanceof HTMLPurifier_Token_End) {
-                $token->start = null; // [MUT]
-                $r = array_pop($stack);
-                assert($r->name === $token->name);
-                assert(empty($token->attr));
-                $r->endCol = $token->col;
-                $r->endLine = $token->line;
-                $r->endArmor = $token->armor;
-                continue;
-            }
-            $node = $token->toNode();
-            $stack[count($stack)-1]->children[] = $node;
-            if ($token instanceof HTMLPurifier_Token_Start) {
-                $stack[] = $node;
-            }
-        }
-        assert(count($stack) == 1);
-        return $stack[0];
-    }
-
-    public static function flatten($node, $config, $context) {
-        $level = 0;
-        $nodes = array($level => new HTMLPurifier_Queue(array($node)));
-        $closingTokens = array();
-        $tokens = array();
-        do {
-            while (!$nodes[$level]->isEmpty()) {
-                $node = $nodes[$level]->shift(); // FIFO
-                list($start, $end) = $node->toTokenPair();
-                if ($level > 0) {
-                    $tokens[] = $start;
-                }
-                if ($end !== NULL) {
-                    $closingTokens[$level][] = $end;
-                }
-                if ($node instanceof HTMLPurifier_Node_Element) {
-                    $level++;
-                    $nodes[$level] = new HTMLPurifier_Queue();
-                    foreach ($node->children as $childNode) {
-                        $nodes[$level]->push($childNode);
-                    }
-                }
-            }
-            $level--;
-            if ($level && isset($closingTokens[$level])) {
-                while ($token = array_pop($closingTokens[$level])) {
-                    $tokens[] = $token;
-                }
-            }
-        } while ($level > 0);
-        return $tokens;
-    }
-}
--- a/library/HTMLPurifier/Array.php
+++ b/library/HTMLPurifier/Array.php
@@ -0,0 +1,184 @@
+<?php
+
+class HTMLPurifier_Array implements ArrayAccess
+{
+    /**
+     * @param HTMLPurifier_ArrayNode
+     */
+    public $head = null;
+
+    /**
+     * @var int
+     */
+    protected $count = 0;
+
+    /**
+     * @var int
+     */
+    protected $offset = 0;
+
+    /**
+     * @var HTMLPurifier_ArrayNode
+     */
+    protected $offsetItem = null;
+
+
+    public function __construct(array $array = array())
+    {
+        /**
+         * @var HTMLPurifier_ArrayNode $temp
+         */
+        $temp = null;
+        $i = 0;
+
+        foreach ($array as &$v) {
+            $item = new HTMLPurifier_ArrayNode($v);
+
+            if ($this->head == null) {
+                $this->head = &$item;
+            }
+            if ($temp instanceof HTMLPurifier_ArrayNode) {
+                $item->prev = &$temp;
+                $temp->next = &$item;
+            }
+            unset($temp);
+            $temp = &$item;
+
+            $i ++;
+
+            unset($item, $v);
+        }
+        $this->count = $i;
+        $this->offset = 0;
+        $this->offsetItem = &$this->head;
+    }
+
+    protected function findIndex($offset)
+    {
+        if ($this->head == null) {
+            return array(
+                'correct' => false,
+                'value' => null
+            );
+        }
+
+        $current = &$this->head;
+        $index = 0;
+
+        if ($this->offset <= $offset && $this->offsetItem instanceof HTMLPurifier_ArrayNode) {
+            $current = &$this->offsetItem;
+            $index = $this->offset;
+        }
+
+        while ($current->next instanceof HTMLPurifier_ArrayNode && $index != $offset) {
+            $current = &$current->next;
+            $index ++;
+        }
+
+        if ($index == $offset) {
+            $this->offset = $offset;
+            $this->offsetItem = &$current;
+            return array(
+                'correct' => true,
+                'value' => &$current
+            );
+        }
+
+        return array(
+            'correct' => false,
+            'value' => &$current
+        );
+    }
+
+    public function insertBefore($offset, $value)
+    {
+        $result = $this->findIndex($offset);
+
+        $this->count ++;
+        $item = new HTMLPurifier_ArrayNode($value);
+        if ($result['correct'] == false) {
+            if ($result['value'] instanceof HTMLPurifier_ArrayNode) {
+                $result['value']->next = &$item;
+                $item->prev = &$result['value'];
+            }
+        } else {
+            if ($result['value'] instanceof HTMLPurifier_ArrayNode) {
+                $item->prev = &$result['value']->prev;
+                $item->next = &$result['value'];
+            }
+            if ($item->prev instanceof HTMLPurifier_ArrayNode) {
+                $item->prev->next = &$item;
+            }
+            if ($result['value'] instanceof HTMLPurifier_ArrayNode) {
+                $result['value']->prev = &$item;
+            }
+        }
+        if ($offset == 0) {
+            $this->head = &$item;
+        }
+        if ($offset <= $this->offset && $this->offsetItem instanceof HTMLPurifier_ArrayNode) {
+            $this->offsetItem = &$this->offsetItem->prev;
+        }
+    }
+
+    public function remove($offset)
+    {
+        $result = $this->findIndex($offset);
+
+        if ($result['correct']) {
+            $this->count --;
+            $item = $result['value'];
+            $item->prev->next = &$result['value']->next;
+            $item->next->prev = &$result['value']->prev;
+            if ($offset == 0) {
+                $this->head = &$item->next;
+            }
+            if ($offset < $this->offset) {
+                $this->offset --;
+            } elseif ($offset == $this->offset) {
+                $this->offsetItem = &$item->next;
+            }
+        }
+    }
+
+    public function getArray()
+    {
+        $return = array();
+        $head = $this->head;
+
+        while ($head instanceof HTMLPurifier_ArrayNode) {
+            $return[] = $head->value;
+            $head = &$head->next;
+        }
+
+        return $return;
+    }
+
+    public function offsetExists($offset)
+    {
+        return $offset >= 0 && $offset < $this->count;
+    }
+
+    public function offsetGet($offset)
+    {
+        $result = $this->findIndex($offset);
+        if ($result['correct']) {
+            return $result['value']->value;
+        }
+
+        return null;
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        $result = $this->findIndex($offset);
+        if ($result['correct']) {
+            $result['value']->value = &$value;
+        }
+    }
+
+    public function offsetUnset($offset)
+    {
+        $this->remove($offset);
+    }
+}
--- a/library/HTMLPurifier/ArrayNode.php
+++ b/library/HTMLPurifier/ArrayNode.php
@@ -0,0 +1,24 @@
+<?php
+
+class HTMLPurifier_ArrayNode
+{
+    public function __construct(&$value)
+    {
+        $this->value = &$value;
+    }
+
+    /**
+     * @var HTMLPurifier_ArrayNode
+     */
+    public $prev = null;
+
+    /**
+     * @var HTMLPurifier_ArrayNode
+     */
+    public $next = null;
+
+    /**
+     * @var mixed
+     */
+    public $value = null;
+}
--- a/library/HTMLPurifier/AttrCollections.php
+++ b/library/HTMLPurifier/AttrCollections.php
@@ -8,8 +8,7 @@ class HTMLPurifier_AttrCollections
 {

    /**
-     * Associative array of attribute collections, indexed by name.
-     * @type array
+     * Associative array of attribute collections, indexed by name
     */
    public $info = array();

@@ -17,11 +16,10 @@ class HTMLPurifier_AttrCollections
     * Performs all expansions on internal data for use by other inclusions
     * It also collects all attribute collection extensions from
     * modules
-     * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
-     * @param HTMLPurifier_HTMLModule[] $modules Hash array of HTMLPurifier_HTMLModule members
+     * @param $attr_types HTMLPurifier_AttrTypes instance
+     * @param $modules Hash array of HTMLPurifier_HTMLModule members
     */
-    public function __construct($attr_types, $modules)
-    {
+    public function __construct($attr_types, $modules) {
        // load extensions from the modules
        foreach ($modules as $module) {
            foreach ($module->attr_collections as $coll_i => $coll) {
@@ -32,9 +30,7 @@ class HTMLPurifier_AttrCollections
                    if ($attr_i === 0 && isset($this->info[$coll_i][$attr_i])) {
                        // merge in includes
                        $this->info[$coll_i][$attr_i] = array_merge(
-                            $this->info[$coll_i][$attr_i],
-                            $attr
-                        );
+                            $this->info[$coll_i][$attr_i], $attr);
                        continue;
                    }
                    $this->info[$coll_i][$attr_i] = $attr;
@@ -53,29 +49,20 @@ class HTMLPurifier_AttrCollections
    /**
     * Takes a reference to an attribute associative array and performs
     * all inclusions specified by the zero index.
-     * @param array &$attr Reference to attribute array
+     * @param &$attr Reference to attribute array
     */
-    public function performInclusions(&$attr)
-    {
-        if (!isset($attr[0])) {
-            return;
-        }
+    public function performInclusions(&$attr) {
+        if (!isset($attr[0])) return;
        $merge = $attr[0];
        $seen  = array(); // recursion guard
        // loop through all the inclusions
        for ($i = 0; isset($merge[$i]); $i++) {
-            if (isset($seen[$merge[$i]])) {
-                continue;
-            }
+            if (isset($seen[$merge[$i]])) continue;
            $seen[$merge[$i]] = true;
            // foreach attribute of the inclusion, copy it over
-            if (!isset($this->info[$merge[$i]])) {
-                continue;
-            }
+            if (!isset($this->info[$merge[$i]])) continue;
            foreach ($this->info[$merge[$i]] as $key => $value) {
-                if (isset($attr[$key])) {
-                    continue;
-                } // also catches more inclusions
+                if (isset($attr[$key])) continue; // also catches more inclusions
                $attr[$key] = $value;
            }
            if (isset($this->info[$merge[$i]][0])) {
@@ -89,24 +76,20 @@ class HTMLPurifier_AttrCollections
    /**
     * Expands all string identifiers in an attribute array by replacing
     * them with the appropriate values inside HTMLPurifier_AttrTypes
-     * @param array &$attr Reference to attribute array
-     * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
+     * @param &$attr Reference to attribute array
+     * @param $attr_types HTMLPurifier_AttrTypes instance
     */
-    public function expandIdentifiers(&$attr, $attr_types)
-    {
+    public function expandIdentifiers(&$attr, $attr_types) {
+
        // because foreach will process new elements we add, make sure we
        // skip duplicates
        $processed = array();

        foreach ($attr as $def_i => $def) {
            // skip inclusions
-            if ($def_i === 0) {
-                continue;
-            }
+            if ($def_i === 0) continue;

-            if (isset($processed[$def_i])) {
-                continue;
-            }
+            if (isset($processed[$def_i])) continue;

            // determine whether or not attribute is required
            if ($required = (strpos($def_i, '*') !== false)) {
@@ -137,7 +120,9 @@ class HTMLPurifier_AttrCollections
                unset($attr[$def_i]);
            }
        }
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef.php
+++ b/library/HTMLPurifier/AttrDef.php
@@ -14,25 +14,23 @@ abstract class HTMLPurifier_AttrDef
 {

    /**
-     * Tells us whether or not an HTML attribute is minimized.
-     * Has no meaning in other contexts.
-     * @type bool
+     * Tells us whether or not an HTML attribute is minimized. Has no
+     * meaning in other contexts.
     */
    public $minimized = false;

    /**
-     * Tells us whether or not an HTML attribute is required.
-     * Has no meaning in other contexts
-     * @type bool
+     * Tells us whether or not an HTML attribute is required. Has no
+     * meaning in other contexts
     */
    public $required = false;

    /**
     * Validates and cleans passed string according to a definition.
     *
-     * @param string $string String to be validated and cleaned.
-     * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object.
-     * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object.
+     * @param $string String to be validated and cleaned.
+     * @param $config Mandatory HTMLPurifier_Config object.
+     * @param $context Mandatory HTMLPurifier_AttrContext object.
     */
    abstract public function validate($string, $config, $context);

@@ -57,8 +55,7 @@ abstract class HTMLPurifier_AttrDef
     *          parsing XML, thus, this behavior may still be correct. We
     *          assume that newlines have been normalized.
     */
-    public function parseCDATA($string)
-    {
+    public function parseCDATA($string) {
        $string = trim($string);
        $string = str_replace(array("\n", "\t", "\r"), ' ', $string);
        return $string;
@@ -66,11 +63,10 @@ abstract class HTMLPurifier_AttrDef

    /**
     * Factory method for creating this class from a string.
-     * @param string $string String construction info
-     * @return HTMLPurifier_AttrDef Created AttrDef object corresponding to $string
+     * @param $string String construction info
+     * @return Created AttrDef object corresponding to $string
     */
-    public function make($string)
-    {
+    public function make($string) {
        // default implementation, return a flyweight of this object.
        // If $string has an effect on the returned object (i.e. you
        // need to overload this method), it is best
@@ -81,20 +77,16 @@ abstract class HTMLPurifier_AttrDef
    /**
     * Removes spaces from rgb(0, 0, 0) so that shorthand CSS properties work
     * properly. THIS IS A HACK!
-     * @param string $string a CSS colour definition
-     * @return string
     */
-    protected function mungeRgb($string)
-    {
+    protected function mungeRgb($string) {
        return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
    }

    /**
-     * Parses a possibly escaped CSS string and returns the "pure"
+     * Parses a possibly escaped CSS string and returns the "pure" 
     * version of it.
     */
-    protected function expandCSSEscape($string)
-    {
+    protected function expandCSSEscape($string) {
        // flexibly parse it
        $ret = '';
        for ($i = 0, $c = strlen($string); $i < $c; $i++) {
@@ -107,32 +99,25 @@ abstract class HTMLPurifier_AttrDef
                if (ctype_xdigit($string[$i])) {
                    $code = $string[$i];
                    for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
-                        if (!ctype_xdigit($string[$i])) {
-                            break;
-                        }
+                        if (!ctype_xdigit($string[$i])) break;
                        $code .= $string[$i];
                    }
                    // We have to be extremely careful when adding
                    // new characters, to make sure we're not breaking
                    // the encoding.
                    $char = HTMLPurifier_Encoder::unichr(hexdec($code));
-                    if (HTMLPurifier_Encoder::cleanUTF8($char) === '') {
-                        continue;
-                    }
+                    if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
                    $ret .= $char;
-                    if ($i < $c && trim($string[$i]) !== '') {
-                        $i--;
-                    }
-                    continue;
-                }
-                if ($string[$i] === "\n") {
+                    if ($i < $c && trim($string[$i]) !== '') $i--;
                    continue;
                }
+                if ($string[$i] === "\n") continue;
            }
            $ret .= $string[$i];
        }
        return $ret;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS.php
+++ b/library/HTMLPurifier/AttrDef/CSS.php
@@ -14,14 +14,8 @@
 class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
 {

-    /**
-     * @param string $css
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($css, $config, $context)
-    {
+    public function validate($css, $config, $context) {
+
        $css = $this->parseCDATA($css);

        $definition = $config->getCSSDefinition();
@@ -42,47 +36,34 @@ class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
        $context->register('CurrentCSSProperty', $property);

        foreach ($declarations as $declaration) {
-            if (!$declaration) {
-                continue;
-            }
-            if (!strpos($declaration, ':')) {
-                continue;
-            }
+            if (!$declaration) continue;
+            if (!strpos($declaration, ':')) continue;
            list($property, $value) = explode(':', $declaration, 2);
            $property = trim($property);
-            $value = trim($value);
+            $value    = trim($value);
            $ok = false;
            do {
                if (isset($definition->info[$property])) {
                    $ok = true;
                    break;
                }
-                if (ctype_lower($property)) {
-                    break;
-                }
+                if (ctype_lower($property)) break;
                $property = strtolower($property);
                if (isset($definition->info[$property])) {
                    $ok = true;
                    break;
                }
-            } while (0);
-            if (!$ok) {
-                continue;
-            }
+            } while(0);
+            if (!$ok) continue;
            // inefficient call, since the validator will do this again
            if (strtolower(trim($value)) !== 'inherit') {
                // inherit works for everything (but only on the base property)
                $result = $definition->info[$property]->validate(
-                    $value,
-                    $config,
-                    $context
-                );
+                    $value, $config, $context );
            } else {
                $result = 'inherit';
            }
-            if ($result === false) {
-                continue;
-            }
+            if ($result === false) continue;
            $propvalues[$property] = $result;
        }

--- a/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
+++ b/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
@@ -3,32 +3,19 @@
 class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
 {

-    public function __construct()
-    {
+    public function __construct() {
        parent::__construct(false); // opacity is non-negative, but we will clamp it
    }

-    /**
-     * @param string $number
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function validate($number, $config, $context)
-    {
+    public function validate($number, $config, $context) {
        $result = parent::validate($number, $config, $context);
-        if ($result === false) {
-            return $result;
-        }
-        $float = (float)$result;
-        if ($float < 0.0) {
-            $result = '0';
-        }
-        if ($float > 1.0) {
-            $result = '1';
-        }
+        if ($result === false) return $result;
+        $float = (float) $result;
+        if ($float < 0.0) $result = '0';
+        if ($float > 1.0) $result = '1';
        return $result;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/Background.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Background.php
@@ -9,16 +9,11 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef

    /**
     * Local copy of component validators.
-     * @type HTMLPurifier_AttrDef[]
     * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
     */
    protected $info;

-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function __construct($config)
-    {
+    public function __construct($config) {
        $def = $config->getCSSDefinition();
        $this->info['background-color'] = $def->info['background-color'];
        $this->info['background-image'] = $def->info['background-image'];
@@ -27,19 +22,11 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
        $this->info['background-position'] = $def->info['background-position'];
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        // regular pre-processing
        $string = $this->parseCDATA($string);
-        if ($string === '') {
-            return false;
-        }
+        if ($string === '') return false;

        // munge rgb() decl if necessary
        $string = $this->mungeRgb($string);
@@ -48,34 +35,27 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
        $bits = explode(' ', $string); // bits to process

        $caught = array();
-        $caught['color'] = false;
-        $caught['image'] = false;
-        $caught['repeat'] = false;
+        $caught['color']    = false;
+        $caught['image']    = false;
+        $caught['repeat']   = false;
        $caught['attachment'] = false;
        $caught['position'] = false;

        $i = 0; // number of catches
+        $none = false;

        foreach ($bits as $bit) {
-            if ($bit === '') {
-                continue;
-            }
+            if ($bit === '') continue;
            foreach ($caught as $key => $status) {
                if ($key != 'position') {
-                    if ($status !== false) {
-                        continue;
-                    }
+                    if ($status !== false) continue;
                    $r = $this->info['background-' . $key]->validate($bit, $config, $context);
                } else {
                    $r = $bit;
                }
-                if ($r === false) {
-                    continue;
-                }
+                if ($r === false) continue;
                if ($key == 'position') {
-                    if ($caught[$key] === false) {
-                        $caught[$key] = '';
-                    }
+                    if ($caught[$key] === false) $caught[$key] = '';
                    $caught[$key] .= $r . ' ';
                } else {
                    $caught[$key] = $r;
@@ -85,9 +65,7 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
            }
        }

-        if (!$i) {
-            return false;
-        }
+        if (!$i) return false;
        if ($caught['position'] !== false) {
            $caught['position'] = $this->info['background-position']->
                validate($caught['position'], $config, $context);
@@ -95,17 +73,15 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef

        $ret = array();
        foreach ($caught as $value) {
-            if ($value === false) {
-                continue;
-            }
+            if ($value === false) continue;
            $ret[] = $value;
        }

-        if (empty($ret)) {
-            return false;
-        }
+        if (empty($ret)) return false;
        return implode(' ', $ret);
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ b/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
@@ -44,30 +44,15 @@
 class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
 {

-    /**
-     * @type HTMLPurifier_AttrDef_CSS_Length
-     */
    protected $length;
-
-    /**
-     * @type HTMLPurifier_AttrDef_CSS_Percentage
-     */
    protected $percentage;

-    public function __construct()
-    {
-        $this->length = new HTMLPurifier_AttrDef_CSS_Length();
+    public function __construct() {
+        $this->length     = new HTMLPurifier_AttrDef_CSS_Length();
        $this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        $string = $this->parseCDATA($string);
        $bits = explode(' ', $string);

@@ -89,9 +74,7 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
        );

        foreach ($bits as $bit) {
-            if ($bit === '') {
-                continue;
-            }
+            if ($bit === '') continue;

            // test for keyword
            $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
@@ -121,37 +104,30 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
                $measures[] = $r;
                $i++;
            }
+
        }

-        if (!$i) {
-            return false;
-        } // no valid values were caught
+        if (!$i) return false; // no valid values were caught

        $ret = array();

        // first keyword
-        if ($keywords['h']) {
-            $ret[] = $keywords['h'];
-        } elseif ($keywords['ch']) {
+        if     ($keywords['h'])     $ret[] = $keywords['h'];
+        elseif ($keywords['ch']) {
            $ret[] = $keywords['ch'];
            $keywords['cv'] = false; // prevent re-use: center = center center
-        } elseif (count($measures)) {
-            $ret[] = array_shift($measures);
        }
+        elseif (count($measures))   $ret[] = array_shift($measures);

-        if ($keywords['v']) {
-            $ret[] = $keywords['v'];
-        } elseif ($keywords['cv']) {
-            $ret[] = $keywords['cv'];
-        } elseif (count($measures)) {
-            $ret[] = array_shift($measures);
-        }
+        if     ($keywords['v'])     $ret[] = $keywords['v'];
+        elseif ($keywords['cv'])    $ret[] = $keywords['cv'];
+        elseif (count($measures))   $ret[] = array_shift($measures);

-        if (empty($ret)) {
-            return false;
-        }
+        if (empty($ret)) return false;
        return implode(' ', $ret);
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/Border.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Border.php
@@ -8,29 +8,17 @@ class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef

    /**
     * Local copy of properties this property is shorthand for.
-     * @type HTMLPurifier_AttrDef[]
     */
    protected $info = array();

-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function __construct($config)
-    {
+    public function __construct($config) {
        $def = $config->getCSSDefinition();
        $this->info['border-width'] = $def->info['border-width'];
        $this->info['border-style'] = $def->info['border-style'];
        $this->info['border-top-color'] = $def->info['border-top-color'];
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        $string = $this->parseCDATA($string);
        $string = $this->mungeRgb($string);
        $bits = explode(' ', $string);
@@ -38,9 +26,7 @@ class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
        $ret = ''; // return value
        foreach ($bits as $bit) {
            foreach ($this->info as $propname => $validator) {
-                if (isset($done[$propname])) {
-                    continue;
-                }
+                if (isset($done[$propname])) continue;
                $r = $validator->validate($bit, $config, $context);
                if ($r !== false) {
                    $ret .= $r . ' ';
@@ -51,6 +37,7 @@ class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
        }
        return rtrim($ret);
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/Color.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Color.php
@@ -6,47 +6,29 @@
 class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
 {

-    /**
-     * @param string $color
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($color, $config, $context)
-    {
+    public function validate($color, $config, $context) {
+
        static $colors = null;
-        if ($colors === null) {
-            $colors = $config->get('Core.ColorKeywords');
-        }
+        if ($colors === null) $colors = $config->get('Core.ColorKeywords');

        $color = trim($color);
-        if ($color === '') {
-            return false;
-        }
+        if ($color === '') return false;

        $lower = strtolower($color);
-        if (isset($colors[$lower])) {
-            return $colors[$lower];
-        }
+        if (isset($colors[$lower])) return $colors[$lower];

        if (strpos($color, 'rgb(') !== false) {
            // rgb literal handling
            $length = strlen($color);
-            if (strpos($color, ')') !== $length - 1) {
-                return false;
-            }
+            if (strpos($color, ')') !== $length - 1) return false;
            $triad = substr($color, 4, $length - 4 - 1);
            $parts = explode(',', $triad);
-            if (count($parts) !== 3) {
-                return false;
-            }
+            if (count($parts) !== 3) return false;
            $type = false; // to ensure that they're all the same type
            $new_parts = array();
            foreach ($parts as $part) {
                $part = trim($part);
-                if ($part === '') {
-                    return false;
-                }
+                if ($part === '') return false;
                $length = strlen($part);
                if ($part[$length - 1] === '%') {
                    // handle percents
@@ -55,13 +37,9 @@ class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
                    } elseif ($type !== 'percentage') {
                        return false;
                    }
-                    $num = (float)substr($part, 0, $length - 1);
-                    if ($num < 0) {
-                        $num = 0;
-                    }
-                    if ($num > 100) {
-                        $num = 100;
-                    }
+                    $num = (float) substr($part, 0, $length - 1);
+                    if ($num < 0) $num = 0;
+                    if ($num > 100) $num = 100;
                    $new_parts[] = "$num%";
                } else {
                    // handle integers
@@ -70,14 +48,10 @@ class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
                    } elseif ($type !== 'integer') {
                        return false;
                    }
-                    $num = (int)$part;
-                    if ($num < 0) {
-                        $num = 0;
-                    }
-                    if ($num > 255) {
-                        $num = 255;
-                    }
-                    $new_parts[] = (string)$num;
+                    $num = (int) $part;
+                    if ($num < 0) $num = 0;
+                    if ($num > 255) $num = 255;
+                    $new_parts[] = (string) $num;
                }
            }
            $new_triad = implode(',', $new_parts);
@@ -91,15 +65,14 @@ class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
                $color = '#' . $color;
            }
            $length = strlen($hex);
-            if ($length !== 3 && $length !== 6) {
-                return false;
-            }
-            if (!ctype_xdigit($hex)) {
-                return false;
-            }
+            if ($length !== 3 && $length !== 6) return false;
+            if (!ctype_xdigit($hex)) return false;
        }
+
        return $color;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/Composite.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Composite.php
@@ -13,36 +13,26 @@ class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
 {

    /**
-     * List of objects that may process strings.
-     * @type HTMLPurifier_AttrDef[]
+     * List of HTMLPurifier_AttrDef objects that may process strings
     * @todo Make protected
     */
    public $defs;

    /**
-     * @param HTMLPurifier_AttrDef[] $defs List of HTMLPurifier_AttrDef objects
+     * @param $defs List of HTMLPurifier_AttrDef objects
     */
-    public function __construct($defs)
-    {
+    public function __construct($defs) {
        $this->defs = $defs;
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        foreach ($this->defs as $i => $def) {
            $result = $this->defs[$i]->validate($string, $config, $context);
-            if ($result !== false) {
-                return $result;
-            }
+            if ($result !== false) return $result;
        }
        return false;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
+++ b/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
@@ -5,38 +5,22 @@
 */
 class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
 {
-    /**
-     * @type HTMLPurifier_AttrDef
-     */
-    public $def;
-    /**
-     * @type string
-     */
-    public $element;
+    public $def, $element;

    /**
-     * @param HTMLPurifier_AttrDef $def Definition to wrap
-     * @param string $element Element to deny
+     * @param $def Definition to wrap
+     * @param $element Element to deny
     */
-    public function __construct($def, $element)
-    {
+    public function __construct($def, $element) {
        $this->def = $def;
        $this->element = $element;
    }
-
    /**
     * Checks if CurrentToken is set and equal to $this->element
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        $token = $context->get('CurrentToken', true);
-        if ($token && $token->name == $this->element) {
-            return false;
-        }
+        if ($token && $token->name == $this->element) return false;
        return $this->def->validate($string, $config, $context);
    }
 }
--- a/library/HTMLPurifier/AttrDef/CSS/Filter.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Filter.php
@@ -7,37 +7,23 @@
 */
 class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
 {
-    /**
-     * @type HTMLPurifier_AttrDef_Integer
-     */
+
    protected $intValidator;

-    public function __construct()
-    {
+    public function __construct() {
        $this->intValidator = new HTMLPurifier_AttrDef_Integer();
    }

-    /**
-     * @param string $value
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($value, $config, $context)
-    {
+    public function validate($value, $config, $context) {
        $value = $this->parseCDATA($value);
-        if ($value === 'none') {
-            return $value;
-        }
+        if ($value === 'none') return $value;
        // if we looped this we could support multiple filters
        $function_length = strcspn($value, '(');
        $function = trim(substr($value, 0, $function_length));
        if ($function !== 'alpha' &&
            $function !== 'Alpha' &&
            $function !== 'progid:DXImageTransform.Microsoft.Alpha'
-        ) {
-            return false;
-        }
+            ) return false;
        $cursor = $function_length + 1;
        $parameters_length = strcspn($value, ')', $cursor);
        $parameters = substr($value, $cursor, $parameters_length);
@@ -46,25 +32,15 @@ class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
        $lookup = array();
        foreach ($params as $param) {
            list($key, $value) = explode('=', $param);
-            $key = trim($key);
+            $key   = trim($key);
            $value = trim($value);
-            if (isset($lookup[$key])) {
-                continue;
-            }
-            if ($key !== 'opacity') {
-                continue;
-            }
+            if (isset($lookup[$key])) continue;
+            if ($key !== 'opacity') continue;
            $value = $this->intValidator->validate($value, $config, $context);
-            if ($value === false) {
-                continue;
-            }
-            $int = (int)$value;
-            if ($int > 100) {
-                $value = '100';
-            }
-            if ($int < 0) {
-                $value = '0';
-            }
+            if ($value === false) continue;
+            $int = (int) $value;
+            if ($int > 100) $value = '100';
+            if ($int < 0) $value = '0';
            $ret_params[] = "$key=$value";
            $lookup[$key] = true;
        }
@@ -72,6 +48,7 @@ class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
        $ret_function = "$function($ret_parameters)";
        return $ret_function;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/Font.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Font.php
@@ -7,8 +7,8 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
 {

    /**
-     * Local copy of validators
-     * @type HTMLPurifier_AttrDef[]
+     * Local copy of component validators.
+     *
     * @note If we moved specific CSS property definitions to their own
     *       classes instead of having them be assembled at run time by
     *       CSSDefinition, this wouldn't be necessary.  We'd instantiate
@@ -16,28 +16,18 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
     */
    protected $info = array();

-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function __construct($config)
-    {
+    public function __construct($config) {
        $def = $config->getCSSDefinition();
-        $this->info['font-style'] = $def->info['font-style'];
+        $this->info['font-style']   = $def->info['font-style'];
        $this->info['font-variant'] = $def->info['font-variant'];
-        $this->info['font-weight'] = $def->info['font-weight'];
-        $this->info['font-size'] = $def->info['font-size'];
-        $this->info['line-height'] = $def->info['line-height'];
-        $this->info['font-family'] = $def->info['font-family'];
+        $this->info['font-weight']  = $def->info['font-weight'];
+        $this->info['font-size']    = $def->info['font-size'];
+        $this->info['line-height']  = $def->info['line-height'];
+        $this->info['font-family']  = $def->info['font-family'];
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        static $system_fonts = array(
            'caption' => true,
            'icon' => true,
@@ -49,9 +39,7 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef

        // regular pre-processing
        $string = $this->parseCDATA($string);
-        if ($string === '') {
-            return false;
-        }
+        if ($string === '') return false;

        // check if it's one of the keywords
        $lowercase_string = strtolower($string);
@@ -66,20 +54,15 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
        $final = ''; // output

        for ($i = 0, $size = count($bits); $i < $size; $i++) {
-            if ($bits[$i] === '') {
-                continue;
-            }
+            if ($bits[$i] === '') continue;
            switch ($stage) {
-                case 0: // attempting to catch font-style, font-variant or font-weight
+
+                // attempting to catch font-style, font-variant or font-weight
+                case 0:
                    foreach ($stage_1 as $validator_name) {
-                        if (isset($caught[$validator_name])) {
-                            continue;
-                        }
+                        if (isset($caught[$validator_name])) continue;
                        $r = $this->info[$validator_name]->validate(
-                            $bits[$i],
-                            $config,
-                            $context
-                        );
+                                                $bits[$i], $config, $context);
                        if ($r !== false) {
                            $final .= $r . ' ';
                            $caught[$validator_name] = true;
@@ -87,17 +70,15 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
                        }
                    }
                    // all three caught, continue on
-                    if (count($caught) >= 3) {
-                        $stage = 1;
-                    }
-                    if ($r !== false) {
-                        break;
-                    }
-                case 1: // attempting to catch font-size and perhaps line-height
+                    if (count($caught) >= 3) $stage = 1;
+                    if ($r !== false) break;
+
+                // attempting to catch font-size and perhaps line-height
+                case 1:
                    $found_slash = false;
                    if (strpos($bits[$i], '/') !== false) {
                        list($font_size, $line_height) =
-                            explode('/', $bits[$i]);
+                                                    explode('/', $bits[$i]);
                        if ($line_height === '') {
                            // ooh, there's a space after the slash!
                            $line_height = false;
@@ -108,19 +89,14 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
                        $line_height = false;
                    }
                    $r = $this->info['font-size']->validate(
-                        $font_size,
-                        $config,
-                        $context
-                    );
+                                              $font_size, $config, $context);
                    if ($r !== false) {
                        $final .= $r;
                        // attempt to catch line-height
                        if ($line_height === false) {
                            // we need to scroll forward
                            for ($j = $i + 1; $j < $size; $j++) {
-                                if ($bits[$j] === '') {
-                                    continue;
-                                }
+                                if ($bits[$j] === '') continue;
                                if ($bits[$j] === '/') {
                                    if ($found_slash) {
                                        return false;
@@ -140,10 +116,7 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
                        if ($found_slash) {
                            $i = $j;
                            $r = $this->info['line-height']->validate(
-                                $line_height,
-                                $config,
-                                $context
-                            );
+                                              $line_height, $config, $context);
                            if ($r !== false) {
                                $final .= '/' . $r;
                            }
@@ -153,14 +126,13 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
                        break;
                    }
                    return false;
-                case 2: // attempting to catch font-family
+
+                // attempting to catch font-family
+                case 2:
                    $font_family =
                        implode(' ', array_slice($bits, $i, $size - $i));
                    $r = $this->info['font-family']->validate(
-                        $font_family,
-                        $config,
-                        $context
-                    );
+                                              $font_family, $config, $context);
                    if ($r !== false) {
                        $final .= $r . ' ';
                        // processing completed successfully
@@ -171,6 +143,7 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
        }
        return false;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -8,18 +8,11 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef

    protected $mask = null;

-    public function __construct()
-    {
+    public function __construct() {
        $this->mask = '_- ';
-        for ($c = 'a'; $c <= 'z'; $c++) {
-            $this->mask .= $c;
-        }
-        for ($c = 'A'; $c <= 'Z'; $c++) {
-            $this->mask .= $c;
-        }
-        for ($c = '0'; $c <= '9'; $c++) {
-            $this->mask .= $c;
-        } // cast-y, but should be fine
+        for ($c = 'a'; $c <= 'z'; $c++) $this->mask .= $c;
+        for ($c = 'A'; $c <= 'Z'; $c++) $this->mask .= $c;
+        for ($c = '0'; $c <= '9'; $c++) $this->mask .= $c; // cast-y, but should be fine
        // special bytes used by UTF-8
        for ($i = 0x80; $i <= 0xFF; $i++) {
            // We don't bother excluding invalid bytes in this range,
@@ -46,14 +39,7 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
        // possible optimization: invert the mask.
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        static $generic_names = array(
            'serif' => true,
            'sans-serif' => true,
@@ -66,11 +52,9 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
        // assume that no font names contain commas in them
        $fonts = explode(',', $string);
        $final = '';
-        foreach ($fonts as $font) {
+        foreach($fonts as $font) {
            $font = trim($font);
-            if ($font === '') {
-                continue;
-            }
+            if ($font === '') continue;
            // match a generic name
            if (isset($generic_names[$font])) {
                if ($allowed_fonts === null || isset($allowed_fonts[$font])) {
@@ -81,13 +65,9 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
            // match a quoted name
            if ($font[0] === '"' || $font[0] === "'") {
                $length = strlen($font);
-                if ($length <= 2) {
-                    continue;
-                }
+                if ($length <= 2) continue;
                $quote = $font[0];
-                if ($font[$length - 1] !== $quote) {
-                    continue;
-                }
+                if ($font[$length - 1] !== $quote) continue;
                $font = substr($font, 1, $length - 2);
            }

@@ -208,9 +188,7 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
            $final .= "'$font', ";
        }
        $final = rtrim($final, ', ');
-        if ($final === '') {
-            return false;
-        }
+        if ($final === '') return false;
        return $final;
    }

--- a/library/HTMLPurifier/AttrDef/CSS/Ident.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Ident.php
@@ -6,27 +6,19 @@
 class HTMLPurifier_AttrDef_CSS_Ident extends HTMLPurifier_AttrDef
 {

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        $string = trim($string);

        // early abort: '' and '0' (strings that convert to false) are invalid
-        if (!$string) {
-            return false;
-        }
+        if (!$string) return false;

        $pattern = '/^(-?[A-Za-z_][A-Za-z_\-0-9]*)$/';
-        if (!preg_match($pattern, $string)) {
-            return false;
-        }
+        if (!preg_match($pattern, $string)) return false;
        return $string;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
+++ b/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
@@ -5,34 +5,20 @@
 */
 class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef
 {
-    /**
-     * @type HTMLPurifier_AttrDef
-     */
-    public $def;
-    /**
-     * @type bool
-     */
-    public $allow;
+    public $def, $allow;

    /**
-     * @param HTMLPurifier_AttrDef $def Definition to wrap
-     * @param bool $allow Whether or not to allow !important
+     * @param $def Definition to wrap
+     * @param $allow Whether or not to allow !important
     */
-    public function __construct($def, $allow = false)
-    {
+    public function __construct($def, $allow = false) {
        $this->def = $def;
        $this->allow = $allow;
    }
-
    /**
     * Intercepts and removes !important if necessary
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        // test for ! and important tokens
        $string = trim($string);
        $is_important = false;
@@ -46,9 +32,7 @@ class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef
            }
        }
        $string = $this->def->validate($string, $config, $context);
-        if ($this->allow && $is_important) {
-            $string .= ' !important';
-        }
+        if ($this->allow && $is_important) $string .= ' !important';
        return $string;
    }
 }
--- a/library/HTMLPurifier/AttrDef/CSS/Length.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Length.php
@@ -6,72 +6,42 @@
 class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
 {

-    /**
-     * @type HTMLPurifier_Length|string
-     */
-    protected $min;
+    protected $min, $max;

    /**
-     * @type HTMLPurifier_Length|string
+     * @param HTMLPurifier_Length $max Minimum length, or null for no bound. String is also acceptable.
+     * @param HTMLPurifier_Length $max Maximum length, or null for no bound. String is also acceptable.
     */
-    protected $max;
-
-    /**
-     * @param HTMLPurifier_Length|string $min Minimum length, or null for no bound. String is also acceptable.
-     * @param HTMLPurifier_Length|string $max Maximum length, or null for no bound. String is also acceptable.
-     */
-    public function __construct($min = null, $max = null)
-    {
+    public function __construct($min = null, $max = null) {
        $this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;
        $this->max = $max !== null ? HTMLPurifier_Length::make($max) : null;
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        $string = $this->parseCDATA($string);

        // Optimizations
-        if ($string === '') {
-            return false;
-        }
-        if ($string === '0') {
-            return '0';
-        }
-        if (strlen($string) === 1) {
-            return false;
-        }
+        if ($string === '') return false;
+        if ($string === '0') return '0';
+        if (strlen($string) === 1) return false;

        $length = HTMLPurifier_Length::make($string);
-        if (!$length->isValid()) {
-            return false;
-        }
+        if (!$length->isValid()) return false;

        if ($this->min) {
            $c = $length->compareTo($this->min);
-            if ($c === false) {
-                return false;
-            }
-            if ($c < 0) {
-                return false;
-            }
+            if ($c === false) return false;
+            if ($c < 0) return false;
        }
        if ($this->max) {
            $c = $length->compareTo($this->max);
-            if ($c === false) {
-                return false;
-            }
-            if ($c > 0) {
-                return false;
-            }
+            if ($c === false) return false;
+            if ($c > 0) return false;
        }
+
        return $length->toString();
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
+++ b/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
@@ -8,72 +8,46 @@ class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
 {

    /**
-     * Local copy of validators.
-     * @type HTMLPurifier_AttrDef[]
+     * Local copy of component validators.
     * @note See HTMLPurifier_AttrDef_CSS_Font::$info for a similar impl.
     */
    protected $info;

-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function __construct($config)
-    {
+    public function __construct($config) {
        $def = $config->getCSSDefinition();
-        $this->info['list-style-type'] = $def->info['list-style-type'];
+        $this->info['list-style-type']     = $def->info['list-style-type'];
        $this->info['list-style-position'] = $def->info['list-style-position'];
        $this->info['list-style-image'] = $def->info['list-style-image'];
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        // regular pre-processing
        $string = $this->parseCDATA($string);
-        if ($string === '') {
-            return false;
-        }
+        if ($string === '') return false;

        // assumes URI doesn't have spaces in it
        $bits = explode(' ', strtolower($string)); // bits to process

        $caught = array();
-        $caught['type'] = false;
+        $caught['type']     = false;
        $caught['position'] = false;
-        $caught['image'] = false;
+        $caught['image']    = false;

        $i = 0; // number of catches
        $none = false;

        foreach ($bits as $bit) {
-            if ($i >= 3) {
-                return;
-            } // optimization bit
-            if ($bit === '') {
-                continue;
-            }
+            if ($i >= 3) return; // optimization bit
+            if ($bit === '') continue;
            foreach ($caught as $key => $status) {
-                if ($status !== false) {
-                    continue;
-                }
+                if ($status !== false) continue;
                $r = $this->info['list-style-' . $key]->validate($bit, $config, $context);
-                if ($r === false) {
-                    continue;
-                }
+                if ($r === false) continue;
                if ($r === 'none') {
-                    if ($none) {
-                        continue;
-                    } else {
-                        $none = true;
-                    }
-                    if ($key == 'image') {
-                        continue;
-                    }
+                    if ($none) continue;
+                    else $none = true;
+                    if ($key == 'image') continue;
                }
                $caught[$key] = $r;
                $i++;
@@ -81,32 +55,24 @@ class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
            }
        }

-        if (!$i) {
-            return false;
-        }
+        if (!$i) return false;

        $ret = array();

        // construct type
-        if ($caught['type']) {
-            $ret[] = $caught['type'];
-        }
+        if ($caught['type']) $ret[] = $caught['type'];

        // construct image
-        if ($caught['image']) {
-            $ret[] = $caught['image'];
-        }
+        if ($caught['image']) $ret[] = $caught['image'];

        // construct position
-        if ($caught['position']) {
-            $ret[] = $caught['position'];
-        }
+        if ($caught['position']) $ret[] = $caught['position'];

-        if (empty($ret)) {
-            return false;
-        }
+        if (empty($ret)) return false;
        return implode(' ', $ret);
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/Multiple.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Multiple.php
@@ -13,9 +13,9 @@
 */
 class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
 {
+
    /**
     * Instance of component definition to defer validation to.
-     * @type HTMLPurifier_AttrDef
     * @todo Make protected
     */
    public $single;
@@ -27,45 +27,32 @@ class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
    public $max;

    /**
-     * @param HTMLPurifier_AttrDef $single HTMLPurifier_AttrDef to multiply
-     * @param int $max Max number of values allowed (usually four)
+     * @param $single HTMLPurifier_AttrDef to multiply
+     * @param $max Max number of values allowed (usually four)
     */
-    public function __construct($single, $max = 4)
-    {
+    public function __construct($single, $max = 4) {
        $this->single = $single;
        $this->max = $max;
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = $this->mungeRgb($this->parseCDATA($string));
-        if ($string === '') {
-            return false;
-        }
+    public function validate($string, $config, $context) {
+        $string = $this->parseCDATA($string);
+        if ($string === '') return false;
        $parts = explode(' ', $string); // parseCDATA replaced \r, \t and \n
        $length = count($parts);
        $final = '';
        for ($i = 0, $num = 0; $i < $length && $num < $this->max; $i++) {
-            if (ctype_space($parts[$i])) {
-                continue;
-            }
+            if (ctype_space($parts[$i])) continue;
            $result = $this->single->validate($parts[$i], $config, $context);
            if ($result !== false) {
                $final .= $result . ' ';
                $num++;
            }
        }
-        if ($final === '') {
-            return false;
-        }
+        if ($final === '') return false;
        return rtrim($final);
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/Number.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Number.php
@@ -7,44 +7,32 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
 {

    /**
-     * Indicates whether or not only positive values are allowed.
-     * @type bool
+     * Bool indicating whether or not only positive values allowed.
     */
    protected $non_negative = false;

    /**
-     * @param bool $non_negative indicates whether negatives are forbidden
+     * @param $non_negative Bool indicating whether negatives are forbidden
     */
-    public function __construct($non_negative = false)
-    {
+    public function __construct($non_negative = false) {
        $this->non_negative = $non_negative;
    }

    /**
-     * @param string $number
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string|bool
     * @warning Some contexts do not pass $config, $context. These
     *          variables should not be used without checking HTMLPurifier_Length
     */
-    public function validate($number, $config, $context)
-    {
+    public function validate($number, $config, $context) {
+
        $number = $this->parseCDATA($number);

-        if ($number === '') {
-            return false;
-        }
-        if ($number === '0') {
-            return '0';
-        }
+        if ($number === '') return false;
+        if ($number === '0') return '0';

        $sign = '';
        switch ($number[0]) {
            case '-':
-                if ($this->non_negative) {
-                    return false;
-                }
+                if ($this->non_negative) return false;
                $sign = '-';
            case '+':
                $number = substr($number, 1);
@@ -56,20 +44,14 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
        }

        // Period is the only non-numeric character allowed
-        if (strpos($number, '.') === false) {
-            return false;
-        }
+        if (strpos($number, '.') === false) return false;

        list($left, $right) = explode('.', $number, 2);

-        if ($left === '' && $right === '') {
-            return false;
-        }
-        if ($left !== '' && !ctype_digit($left)) {
-            return false;
-        }
+        if ($left === '' && $right === '') return false;
+        if ($left !== '' && !ctype_digit($left)) return false;

-        $left = ltrim($left, '0');
+        $left  = ltrim($left,  '0');
        $right = rtrim($right, '0');

        if ($right === '') {
@@ -77,8 +59,11 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
        } elseif (!ctype_digit($right)) {
            return false;
        }
+
        return $sign . $left . '.' . $right;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/Percentage.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Percentage.php
@@ -7,48 +7,34 @@ class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
 {

    /**
-     * Instance to defer number validation to.
-     * @type HTMLPurifier_AttrDef_CSS_Number
+     * Instance of HTMLPurifier_AttrDef_CSS_Number to defer number validation
     */
    protected $number_def;

    /**
-     * @param bool $non_negative Whether to forbid negative values
+     * @param Bool indicating whether to forbid negative values
     */
-    public function __construct($non_negative = false)
-    {
+    public function __construct($non_negative = false) {
        $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        $string = $this->parseCDATA($string);

-        if ($string === '') {
-            return false;
-        }
+        if ($string === '') return false;
        $length = strlen($string);
-        if ($length === 1) {
-            return false;
-        }
-        if ($string[$length - 1] !== '%') {
-            return false;
-        }
+        if ($length === 1) return false;
+        if ($string[$length - 1] !== '%') return false;

        $number = substr($string, 0, $length - 1);
        $number = $this->number_def->validate($number, $config, $context);

-        if ($number === false) {
-            return false;
-        }
+        if ($number === false) return false;
        return "$number%";
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
+++ b/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
@@ -8,14 +8,8 @@
 class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
 {

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        static $allowed_values = array(
            'line-through' => true,
            'overline' => true,
@@ -24,9 +18,7 @@ class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef

        $string = strtolower($this->parseCDATA($string));

-        if ($string === 'none') {
-            return $string;
-        }
+        if ($string === 'none') return $string;

        $parts = explode(' ', $string);
        $final = '';
@@ -36,11 +28,11 @@ class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
            }
        }
        $final = rtrim($final);
-        if ($final === '') {
-            return false;
-        }
+        if ($final === '') return false;
        return $final;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/CSS/URI.php
+++ b/library/HTMLPurifier/AttrDef/CSS/URI.php
@@ -12,39 +12,25 @@
 class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
 {

-    public function __construct()
-    {
+    public function __construct() {
        parent::__construct(true); // always embedded
    }

-    /**
-     * @param string $uri_string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($uri_string, $config, $context)
-    {
+    public function validate($uri_string, $config, $context) {
        // parse the URI out of the string and then pass it onto
        // the parent object

        $uri_string = $this->parseCDATA($uri_string);
-        if (strpos($uri_string, 'url(') !== 0) {
-            return false;
-        }
+        if (strpos($uri_string, 'url(') !== 0) return false;
        $uri_string = substr($uri_string, 4);
        $new_length = strlen($uri_string) - 1;
-        if ($uri_string[$new_length] != ')') {
-            return false;
-        }
+        if ($uri_string[$new_length] != ')') return false;
        $uri = trim(substr($uri_string, 0, $new_length));

        if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
            $quote = $uri[0];
            $new_length = strlen($uri) - 1;
-            if ($uri[$new_length] !== $quote) {
-                return false;
-            }
+            if ($uri[$new_length] !== $quote) return false;
            $uri = substr($uri, 1, $new_length - 1);
        }

@@ -52,9 +38,7 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI

        $result = parent::validate($uri, $config, $context);

-        if ($result === false) {
-            return false;
-        }
+        if ($result === false) return false;

        // extra sanity check; should have been done by URI
        $result = str_replace(array('"', "\\", "\n", "\x0c", "\r"), "", $result);
@@ -67,8 +51,11 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
        // an innerHTML cycle, so a very unlucky query parameter could
        // then change the meaning of the URL.  Unfortunately, there's
        // not much we can do about that...
+
        return "url(\"$result\")";
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/Clone.php
+++ b/library/HTMLPurifier/AttrDef/Clone.php
@@ -7,38 +7,22 @@
 class HTMLPurifier_AttrDef_Clone extends HTMLPurifier_AttrDef
 {
    /**
-     * What we're cloning.
-     * @type HTMLPurifier_AttrDef
+     * What we're cloning
     */
    protected $clone;

-    /**
-     * @param HTMLPurifier_AttrDef $clone
-     */
-    public function __construct($clone)
-    {
+    public function __construct($clone) {
        $this->clone = $clone;
    }

-    /**
-     * @param string $v
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($v, $config, $context)
-    {
+    public function validate($v, $config, $context) {
        return $this->clone->validate($v, $config, $context);
    }

-    /**
-     * @param string $string
-     * @return HTMLPurifier_AttrDef
-     */
-    public function make($string)
-    {
+    public function make($string) {
        return clone $this->clone;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/Enum.php
+++ b/library/HTMLPurifier/AttrDef/Enum.php
@@ -12,10 +12,9 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef

    /**
     * Lookup table of valid values.
-     * @type array
     * @todo Make protected
     */
-    public $valid_values = array();
+    public $valid_values   = array();

    /**
     * Bool indicating whether or not enumeration is case sensitive.
@@ -24,23 +23,17 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
    protected $case_sensitive = false; // values according to W3C spec

    /**
-     * @param array $valid_values List of valid values
-     * @param bool $case_sensitive Whether or not case sensitive
+     * @param $valid_values List of valid values
+     * @param $case_sensitive Bool indicating whether or not case sensitive
     */
-    public function __construct($valid_values = array(), $case_sensitive = false)
-    {
+    public function __construct(
+        $valid_values = array(), $case_sensitive = false
+    ) {
        $this->valid_values = array_flip($valid_values);
        $this->case_sensitive = $case_sensitive;
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        $string = trim($string);
        if (!$this->case_sensitive) {
            // we may want to do full case-insensitive libraries
@@ -52,13 +45,11 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
    }

    /**
-     * @param string $string In form of comma-delimited list of case-insensitive
+     * @param $string In form of comma-delimited list of case-insensitive
     *      valid values. Example: "foo,bar,baz". Prepend "s:" to make
     *      case sensitive
-     * @return HTMLPurifier_AttrDef_Enum
     */
-    public function make($string)
-    {
+    public function make($string) {
        if (strlen($string) > 2 && $string[0] == 's' && $string[1] == ':') {
            $string = substr($string, 2);
            $sensitive = true;
@@ -68,6 +59,7 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
        $values = explode(',', $string);
        return new HTMLPurifier_AttrDef_Enum($values, $sensitive);
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/HTML/Bool.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Bool.php
@@ -6,43 +6,23 @@
 class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
 {

-    /**
-     * @type bool
-     */
    protected $name;
-
-    /**
-     * @type bool
-     */
    public $minimized = true;

-    /**
-     * @param bool $name
-     */
-    public function __construct($name = false)
-    {
-        $this->name = $name;
-    }
+    public function __construct($name = false) {$this->name = $name;}

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+        if (empty($string)) return false;
        return $this->name;
    }

    /**
-     * @param string $string Name of attribute
-     * @return HTMLPurifier_AttrDef_HTML_Bool
+     * @param $string Name of attribute
     */
-    public function make($string)
-    {
+    public function make($string) {
        return new HTMLPurifier_AttrDef_HTML_Bool($string);
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/HTML/Class.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Class.php
@@ -5,14 +5,7 @@
 */
 class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens
 {
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    protected function split($string, $config, $context)
-    {
+    protected function split($string, $config, $context) {
        // really, this twiddle should be lazy loaded
        $name = $config->getDefinition('HTML')->doctype->name;
        if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {
@@ -21,20 +14,13 @@ class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens
            return preg_split('/\s+/', $string);
        }
    }
-
-    /**
-     * @param array $tokens
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    protected function filter($tokens, $config, $context)
-    {
+    protected function filter($tokens, $config, $context) {
        $allowed = $config->get('Attr.AllowedClasses');
        $forbidden = $config->get('Attr.ForbiddenClasses');
        $ret = array();
        foreach ($tokens as $token) {
-            if (($allowed === null || isset($allowed[$token])) &&
+            if (
+                ($allowed === null || isset($allowed[$token])) &&
                !isset($forbidden[$token]) &&
                // We need this O(n) check because of PHP's array
                // implementation that casts -0 to 0.
--- a/library/HTMLPurifier/AttrDef/HTML/Color.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Color.php
@@ -6,46 +6,28 @@
 class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
 {

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        static $colors = null;
-        if ($colors === null) {
-            $colors = $config->get('Core.ColorKeywords');
-        }
+        if ($colors === null) $colors = $config->get('Core.ColorKeywords');

        $string = trim($string);

-        if (empty($string)) {
-            return false;
-        }
+        if (empty($string)) return false;
        $lower = strtolower($string);
-        if (isset($colors[$lower])) {
-            return $colors[$lower];
-        }
-        if ($string[0] === '#') {
-            $hex = substr($string, 1);
-        } else {
-            $hex = $string;
-        }
+        if (isset($colors[$lower])) return $colors[$lower];
+        if ($string[0] === '#') $hex = substr($string, 1);
+        else $hex = $string;

        $length = strlen($hex);
-        if ($length !== 3 && $length !== 6) {
-            return false;
-        }
-        if (!ctype_xdigit($hex)) {
-            return false;
-        }
-        if ($length === 3) {
-            $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
-        }
+        if ($length !== 3 && $length !== 6) return false;
+        if (!ctype_xdigit($hex)) return false;
+        if ($length === 3) $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
+
        return "#$hex";
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
+++ b/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
@@ -6,33 +6,16 @@
 class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
 {

-    /**
-     * @type array
-     */
    public $valid_values = false; // uninitialized value
-
-    /**
-     * @type bool
-     */
    protected $case_sensitive = false;

-    public function __construct()
-    {
-    }
+    public function __construct() {}

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        if ($this->valid_values === false) {
-            $this->valid_values = $config->get('Attr.AllowedFrameTargets');
-        }
+    public function validate($string, $config, $context) {
+        if ($this->valid_values === false) $this->valid_values = $config->get('Attr.AllowedFrameTargets');
        return parent::validate($string, $config, $context);
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/HTML/ID.php
+++ b/library/HTMLPurifier/AttrDef/HTML/ID.php
@@ -18,56 +18,34 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
    /**
     * Determines whether or not we're validating an ID in a CSS
     * selector context.
-     * @type bool
     */
    protected $selector;

-    /**
-     * @param bool $selector
-     */
-    public function __construct($selector = false)
-    {
+    public function __construct($selector = false) {
        $this->selector = $selector;
    }

-    /**
-     * @param string $id
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($id, $config, $context)
-    {
-        if (!$this->selector && !$config->get('Attr.EnableID')) {
-            return false;
-        }
+    public function validate($id, $config, $context) {
+
+        if (!$this->selector && !$config->get('Attr.EnableID')) return false;

        $id = trim($id); // trim it first

-        if ($id === '') {
-            return false;
-        }
+        if ($id === '') return false;

        $prefix = $config->get('Attr.IDPrefix');
        if ($prefix !== '') {
            $prefix .= $config->get('Attr.IDPrefixLocal');
            // prevent re-appending the prefix
-            if (strpos($id, $prefix) !== 0) {
-                $id = $prefix . $id;
-            }
+            if (strpos($id, $prefix) !== 0) $id = $prefix . $id;
        } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
-            trigger_error(
-                '%Attr.IDPrefixLocal cannot be used unless ' .
-                '%Attr.IDPrefix is set',
-                E_USER_WARNING
-            );
+            trigger_error('%Attr.IDPrefixLocal cannot be used unless '.
+                '%Attr.IDPrefix is set', E_USER_WARNING);
        }

        if (!$this->selector) {
            $id_accumulator =& $context->get('IDAccumulator');
-            if (isset($id_accumulator->ids[$id])) {
-                return false;
-            }
+            if (isset($id_accumulator->ids[$id])) return false;
        }

        // we purposely avoid using regex, hopefully this is faster
@@ -75,14 +53,11 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
        if (ctype_alpha($id)) {
            $result = true;
        } else {
-            if (!ctype_alpha(@$id[0])) {
-                return false;
-            }
-            // primitive style of regexps, I suppose
-            $trim = trim(
+            if (!ctype_alpha(@$id[0])) return false;
+            $trim = trim( // primitive style of regexps, I suppose
                $id,
                'A..Za..z0..9:-._'
-            );
+              );
            $result = ($trim === '');
        }

@@ -91,15 +66,15 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
            return false;
        }

-        if (!$this->selector && $result) {
-            $id_accumulator->add($id);
-        }
+        if (!$this->selector && $result) $id_accumulator->add($id);

        // if no change was made to the ID, return the result
        // else, return the new id if stripping whitespace made it
        //     valid, or return false.
        return $result ? $id : false;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/HTML/Length.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Length.php
@@ -10,47 +10,32 @@
 class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
 {

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        $string = trim($string);
-        if ($string === '') {
-            return false;
-        }
+        if ($string === '') return false;

        $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) {
-            return $parent_result;
-        }
+        if ($parent_result !== false) return $parent_result;

        $length = strlen($string);
        $last_char = $string[$length - 1];

-        if ($last_char !== '%') {
-            return false;
-        }
+        if ($last_char !== '%') return false;

        $points = substr($string, 0, $length - 1);

-        if (!is_numeric($points)) {
-            return false;
-        }
+        if (!is_numeric($points)) return false;

-        $points = (int)$points;
+        $points = (int) $points;
+
+        if ($points < 0) return '0%';
+        if ($points > 100) return '100%';
+
+        return ((string) $points) . '%';

-        if ($points < 0) {
-            return '0%';
-        }
-        if ($points > 100) {
-            return '100%';
-        }
-        return ((string)$points) . '%';
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
+++ b/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
@@ -9,44 +9,26 @@
 class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
 {

-    /**
-     * Name config attribute to pull.
-     * @type string
-     */
+    /** Name config attribute to pull. */
    protected $name;

-    /**
-     * @param string $name
-     */
-    public function __construct($name)
-    {
+    public function __construct($name) {
        $configLookup = array(
            'rel' => 'AllowedRel',
            'rev' => 'AllowedRev'
        );
        if (!isset($configLookup[$name])) {
-            trigger_error(
-                'Unrecognized attribute name for link ' .
-                'relationship.',
-                E_USER_ERROR
-            );
+            trigger_error('Unrecognized attribute name for link '.
+                'relationship.', E_USER_ERROR);
            return;
        }
        $this->name = $configLookup[$name];
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        $allowed = $config->get('Attr.' . $this->name);
-        if (empty($allowed)) {
-            return false;
-        }
+        if (empty($allowed)) return false;

        $string = $this->parseCDATA($string);
        $parts = explode(' ', $string);
@@ -55,18 +37,17 @@ class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
        $ret_lookup = array();
        foreach ($parts as $part) {
            $part = strtolower(trim($part));
-            if (!isset($allowed[$part])) {
-                continue;
-            }
+            if (!isset($allowed[$part])) continue;
            $ret_lookup[$part] = true;
        }

-        if (empty($ret_lookup)) {
-            return false;
-        }
+        if (empty($ret_lookup)) return false;
        $string = implode(' ', array_keys($ret_lookup));
+
        return $string;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
+++ b/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
@@ -9,52 +9,33 @@
 class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length
 {

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        $string = trim($string);
-        if ($string === '') {
-            return false;
-        }
+        if ($string === '') return false;

        $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) {
-            return $parent_result;
-        }
+        if ($parent_result !== false) return $parent_result;

        $length = strlen($string);
        $last_char = $string[$length - 1];

-        if ($last_char !== '*') {
-            return false;
-        }
+        if ($last_char !== '*') return false;

        $int = substr($string, 0, $length - 1);

-        if ($int == '') {
-            return '*';
-        }
-        if (!is_numeric($int)) {
-            return false;
-        }
+        if ($int == '') return '*';
+        if (!is_numeric($int)) return false;
+
+        $int = (int) $int;
+
+        if ($int < 0) return false;
+        if ($int == 0) return '0';
+        if ($int == 1) return '*';
+        return ((string) $int) . '*';

-        $int = (int)$int;
-        if ($int < 0) {
-            return false;
-        }
-        if ($int == 0) {
-            return '0';
-        }
-        if ($int == 1) {
-            return '*';
-        }
-        return ((string)$int) . '*';
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
@@ -6,38 +6,24 @@
 class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
 {

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        $string = trim($string);

        // early abort: '' and '0' (strings that convert to false) are invalid
-        if (!$string) {
-            return false;
-        }
+        if (!$string) return false;

        $tokens = $this->split($string, $config, $context);
        $tokens = $this->filter($tokens, $config, $context);
-        if (empty($tokens)) {
-            return false;
-        }
+        if (empty($tokens)) return false;
        return implode(' ', $tokens);
+
    }

    /**
     * Splits a space separated list of tokens into its constituent parts.
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
     */
-    protected function split($string, $config, $context)
-    {
+    protected function split($string, $config, $context) {
        // OPTIMIZABLE!
        // do the preg_match, capture all subpatterns for reformulation

@@ -45,9 +31,9 @@ class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
        // escaping because I don't know how to do that with regexps
        // and plus it would complicate optimization efforts (you never
        // see that anyway).
-        $pattern = '/(?:(?<=\s)|\A)' . // look behind for space or string start
-            '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)' .
-            '(?:(?=\s)|\z)/'; // look ahead for space or string end
+        $pattern = '/(?:(?<=\s)|\A)'. // look behind for space or string start
+                   '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)'.
+                   '(?:(?=\s)|\z)/'; // look ahead for space or string end
        preg_match_all($pattern, $string, $matches);
        return $matches[1];
    }
@@ -56,15 +42,11 @@ class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
     * Template method for removing certain tokens based on arbitrary criteria.
     * @note If we wanted to be really functional, we'd do an array_filter
     *       with a callback. But... we're not.
-     * @param array $tokens
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
     */
-    protected function filter($tokens, $config, $context)
-    {
+    protected function filter($tokens, $config, $context) {
        return $tokens;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/HTML/Pixels.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Pixels.php
@@ -6,71 +6,43 @@
 class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
 {

-    /**
-     * @type int
-     */
    protected $max;

-    /**
-     * @param int $max
-     */
-    public function __construct($max = null)
-    {
+    public function __construct($max = null) {
        $this->max = $max;
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        $string = trim($string);
-        if ($string === '0') {
-            return $string;
-        }
-        if ($string === '') {
-            return false;
-        }
+        if ($string === '0') return $string;
+        if ($string === '')  return false;
        $length = strlen($string);
        if (substr($string, $length - 2) == 'px') {
            $string = substr($string, 0, $length - 2);
        }
-        if (!is_numeric($string)) {
-            return false;
-        }
-        $int = (int)$string;
+        if (!is_numeric($string)) return false;
+        $int = (int) $string;

-        if ($int < 0) {
-            return '0';
-        }
+        if ($int < 0) return '0';

        // upper-bound value, extremely high values can
        // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
        // WARNING, above link WILL crash you if you're using Windows

-        if ($this->max !== null && $int > $this->max) {
-            return (string)$this->max;
-        }
-        return (string)$int;
+        if ($this->max !== null && $int > $this->max) return (string) $this->max;
+
+        return (string) $int;
+
    }

-    /**
-     * @param string $string
-     * @return HTMLPurifier_AttrDef
-     */
-    public function make($string)
-    {
-        if ($string === '') {
-            $max = null;
-        } else {
-            $max = (int)$string;
-        }
+    public function make($string) {
+        if ($string === '') $max = null;
+        else $max = (int) $string;
        $class = get_class($this);
        return new $class($max);
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/Integer.php
+++ b/library/HTMLPurifier/AttrDef/Integer.php
@@ -11,20 +11,17 @@ class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
 {

    /**
-     * Whether or not negative values are allowed.
-     * @type bool
+     * Bool indicating whether or not negative values are allowed
     */
    protected $negative = true;

    /**
-     * Whether or not zero is allowed.
-     * @type bool
+     * Bool indicating whether or not zero is allowed
     */
    protected $zero = true;

    /**
-     * Whether or not positive values are allowed.
-     * @type bool
+     * Bool indicating whether or not positive values are allowed
     */
    protected $positive = true;

@@ -33,59 +30,44 @@ class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
     * @param $zero Bool indicating whether or not zero is allowed
     * @param $positive Bool indicating whether or not positive values are allowed
     */
-    public function __construct($negative = true, $zero = true, $positive = true)
-    {
+    public function __construct(
+        $negative = true, $zero = true, $positive = true
+    ) {
        $this->negative = $negative;
-        $this->zero = $zero;
+        $this->zero     = $zero;
        $this->positive = $positive;
    }

-    /**
-     * @param string $integer
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($integer, $config, $context)
-    {
+    public function validate($integer, $config, $context) {
+
        $integer = $this->parseCDATA($integer);
-        if ($integer === '') {
-            return false;
-        }
+        if ($integer === '') return false;

        // we could possibly simply typecast it to integer, but there are
        // certain fringe cases that must not return an integer.

        // clip leading sign
-        if ($this->negative && $integer[0] === '-') {
+        if ( $this->negative && $integer[0] === '-' ) {
            $digits = substr($integer, 1);
-            if ($digits === '0') {
-                $integer = '0';
-            } // rm minus sign for zero
-        } elseif ($this->positive && $integer[0] === '+') {
+            if ($digits === '0') $integer = '0'; // rm minus sign for zero
+        } elseif( $this->positive && $integer[0] === '+' ) {
            $digits = $integer = substr($integer, 1); // rm unnecessary plus
        } else {
            $digits = $integer;
        }

        // test if it's numeric
-        if (!ctype_digit($digits)) {
-            return false;
-        }
+        if (!ctype_digit($digits)) return false;

        // perform scope tests
-        if (!$this->zero && $integer == 0) {
-            return false;
-        }
-        if (!$this->positive && $integer > 0) {
-            return false;
-        }
-        if (!$this->negative && $integer < 0) {
-            return false;
-        }
+        if (!$this->zero     && $integer == 0) return false;
+        if (!$this->positive && $integer > 0) return false;
+        if (!$this->negative && $integer < 0) return false;

        return $integer;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/Lang.php
+++ b/library/HTMLPurifier/AttrDef/Lang.php
@@ -7,25 +7,15 @@
 class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
 {

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
+
        $string = trim($string);
-        if (!$string) {
-            return false;
-        }
+        if (!$string) return false;

        $subtags = explode('-', $string);
        $num_subtags = count($subtags);

-        if ($num_subtags == 0) { // sanity check
-            return false;
-        }
+        if ($num_subtags == 0) return false; // sanity check

        // process primary subtag : $subtags[0]
        $length = strlen($subtags[0]);
@@ -33,15 +23,15 @@ class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
            case 0:
                return false;
            case 1:
-                if (!($subtags[0] == 'x' || $subtags[0] == 'i')) {
+                if (! ($subtags[0] == 'x' || $subtags[0] == 'i') ) {
                    return false;
                }
                break;
            case 2:
            case 3:
-                if (!ctype_alpha($subtags[0])) {
+                if (! ctype_alpha($subtags[0]) ) {
                    return false;
-                } elseif (!ctype_lower($subtags[0])) {
+                } elseif (! ctype_lower($subtags[0]) ) {
                    $subtags[0] = strtolower($subtags[0]);
                }
                break;
@@ -50,23 +40,17 @@ class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
        }

        $new_string = $subtags[0];
-        if ($num_subtags == 1) {
-            return $new_string;
-        }
+        if ($num_subtags == 1) return $new_string;

        // process second subtag : $subtags[1]
        $length = strlen($subtags[1]);
        if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
            return $new_string;
        }
-        if (!ctype_lower($subtags[1])) {
-            $subtags[1] = strtolower($subtags[1]);
-        }
+        if (!ctype_lower($subtags[1])) $subtags[1] = strtolower($subtags[1]);

        $new_string .= '-' . $subtags[1];
-        if ($num_subtags == 2) {
-            return $new_string;
-        }
+        if ($num_subtags == 2) return $new_string;

        // process all other subtags, index 2 and up
        for ($i = 2; $i < $num_subtags; $i++) {
@@ -79,8 +63,11 @@ class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
            }
            $new_string .= '-' . $subtags[$i];
        }
+
        return $new_string;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/Switch.php
+++ b/library/HTMLPurifier/AttrDef/Switch.php
@@ -6,41 +6,21 @@
 class HTMLPurifier_AttrDef_Switch
 {

-    /**
-     * @type string
-     */
    protected $tag;
-
-    /**
-     * @type HTMLPurifier_AttrDef
-     */
-    protected $withTag;
-
-    /**
-     * @type HTMLPurifier_AttrDef
-     */
-    protected $withoutTag;
+    protected $withTag, $withoutTag;

    /**
     * @param string $tag Tag name to switch upon
     * @param HTMLPurifier_AttrDef $with_tag Call if token matches tag
     * @param HTMLPurifier_AttrDef $without_tag Call if token doesn't match, or there is no token
     */
-    public function __construct($tag, $with_tag, $without_tag)
-    {
+    public function __construct($tag, $with_tag, $without_tag) {
        $this->tag = $tag;
        $this->withTag = $with_tag;
        $this->withoutTag = $without_tag;
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        $token = $context->get('CurrentToken', true);
        if (!$token || $token->name !== $this->tag) {
            return $this->withoutTag->validate($string, $config, $context);
@@ -48,6 +28,7 @@ class HTMLPurifier_AttrDef_Switch
            return $this->withTag->validate($string, $config, $context);
        }
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/Text.php
+++ b/library/HTMLPurifier/AttrDef/Text.php
@@ -6,16 +6,10 @@
 class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
 {

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        return $this->parseCDATA($string);
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/URI.php
+++ b/library/HTMLPurifier/AttrDef/URI.php
@@ -7,54 +7,31 @@
 class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
 {

-    /**
-     * @type HTMLPurifier_URIParser
-     */
    protected $parser;
-
-    /**
-     * @type bool
-     */
    protected $embedsResource;

    /**
-     * @param bool $embeds_resource Does the URI here result in an extra HTTP request?
+     * @param $embeds_resource_resource Does the URI here result in an extra HTTP request?
     */
-    public function __construct($embeds_resource = false)
-    {
+    public function __construct($embeds_resource = false) {
        $this->parser = new HTMLPurifier_URIParser();
-        $this->embedsResource = (bool)$embeds_resource;
+        $this->embedsResource = (bool) $embeds_resource;
    }

-    /**
-     * @param string $string
-     * @return HTMLPurifier_AttrDef_URI
-     */
-    public function make($string)
-    {
+    public function make($string) {
        $embeds = ($string === 'embedded');
        return new HTMLPurifier_AttrDef_URI($embeds);
    }

-    /**
-     * @param string $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($uri, $config, $context)
-    {
-        if ($config->get('URI.Disable')) {
-            return false;
-        }
+    public function validate($uri, $config, $context) {
+
+        if ($config->get('URI.Disable')) return false;

        $uri = $this->parseCDATA($uri);

        // parse the URI
        $uri = $this->parser->parse($uri);
-        if ($uri === false) {
-            return false;
-        }
+        if ($uri === false) return false;

        // add embedded flag to context for validators
        $context->register('EmbeddedURI', $this->embedsResource);
@@ -64,35 +41,23 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef

            // generic validation
            $result = $uri->validate($config, $context);
-            if (!$result) {
-                break;
-            }
+            if (!$result) break;

            // chained filtering
            $uri_def = $config->getDefinition('URI');
            $result = $uri_def->filter($uri, $config, $context);
-            if (!$result) {
-                break;
-            }
+            if (!$result) break;

            // scheme-specific validation
            $scheme_obj = $uri->getSchemeObj($config, $context);
-            if (!$scheme_obj) {
-                break;
-            }
-            if ($this->embedsResource && !$scheme_obj->browsable) {
-                break;
-            }
+            if (!$scheme_obj) break;
+            if ($this->embedsResource && !$scheme_obj->browsable) break;
            $result = $scheme_obj->validate($uri, $config, $context);
-            if (!$result) {
-                break;
-            }
+            if (!$result) break;

            // Post chained filtering
            $result = $uri_def->postFilter($uri, $config, $context);
-            if (!$result) {
-                break;
-            }
+            if (!$result) break;

            // survived gauntlet
            $ok = true;
@@ -100,12 +65,13 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
        } while (false);

        $context->destroy('EmbeddedURI');
-        if (!$ok) {
-            return false;
-        }
+        if (!$ok) return false;
+
        // back to string
        return $uri->toString();
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/URI/Email.php
+++ b/library/HTMLPurifier/AttrDef/URI/Email.php
@@ -5,11 +5,8 @@ abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef

    /**
     * Unpacks a mailbox into its display-name and address
-     * @param string $string
-     * @return mixed
     */
-    public function unpack($string)
-    {
+    function unpack($string) {
        // needs to be implemented
    }

--- a/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+++ b/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
@@ -7,23 +7,15 @@
 class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
 {

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        // no support for named mailboxes i.e. "Bob <bob@example.com>"
        // that needs more percent encoding to be done
-        if ($string == '') {
-            return false;
-        }
+        if ($string == '') return false;
        $string = trim($string);
        $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
        return $result ? $string : false;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/URI/Host.php
+++ b/library/HTMLPurifier/AttrDef/URI/Host.php
@@ -7,31 +7,21 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
 {

    /**
-     * IPv4 sub-validator.
-     * @type HTMLPurifier_AttrDef_URI_IPv4
+     * Instance of HTMLPurifier_AttrDef_URI_IPv4 sub-validator
     */
    protected $ipv4;

    /**
-     * IPv6 sub-validator.
-     * @type HTMLPurifier_AttrDef_URI_IPv6
+     * Instance of HTMLPurifier_AttrDef_URI_IPv6 sub-validator
     */
    protected $ipv6;

-    public function __construct()
-    {
+    public function __construct() {
        $this->ipv4 = new HTMLPurifier_AttrDef_URI_IPv4();
        $this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
    }

-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
+    public function validate($string, $config, $context) {
        $length = strlen($string);
        // empty hostname is OK; it's usually semantically equivalent:
        // the default host as defined by a URI scheme is used:
@@ -39,51 +29,32 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
        //      If the URI scheme defines a default for host, then that
        //      default applies when the host subcomponent is undefined
        //      or when the registered name is empty (zero length).
-        if ($string === '') {
-            return '';
-        }
-        if ($length > 1 && $string[0] === '[' && $string[$length - 1] === ']') {
+        if ($string === '') return '';
+        if ($length > 1 && $string[0] === '[' && $string[$length-1] === ']') {
            //IPv6
            $ip = substr($string, 1, $length - 2);
            $valid = $this->ipv6->validate($ip, $config, $context);
-            if ($valid === false) {
-                return false;
-            }
-            return '[' . $valid . ']';
+            if ($valid === false) return false;
+            return '['. $valid . ']';
        }

        // need to do checks on unusual encodings too
        $ipv4 = $this->ipv4->validate($string, $config, $context);
-        if ($ipv4 !== false) {
-            return $ipv4;
-        }
+        if ($ipv4 !== false) return $ipv4;

        // A regular domain name.

        // This doesn't match I18N domain names, but we don't have proper IRI support,
        // so force users to insert Punycode.

-        // There is not a good sense in which underscores should be
-        // allowed, since it's technically not! (And if you go as
-        // far to allow everything as specified by the DNS spec...
-        // well, that's literally everything, modulo some space limits
-        // for the components and the overall name (which, by the way,
-        // we are NOT checking!).  So we (arbitrarily) decide this:
-        // let's allow underscores wherever we would have allowed
-        // hyphens, if they are enabled.  This is a pretty good match
-        // for browser behavior, for example, a large number of browsers
-        // cannot handle foo_.example.com, but foo_bar.example.com is
-        // fairly well supported.
-        $underscore = $config->get('Core.AllowHostnameUnderscore') ? '_' : '';
-
        // The productions describing this are:
        $a   = '[a-z]';     // alpha
        $an  = '[a-z0-9]';  // alphanum
-        $and = "[a-z0-9-$underscore]"; // alphanum | "-"
+        $and = '[a-z0-9-]'; // alphanum | "-"
        // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
-        $domainlabel = "$an($and*$an)?";
+        $domainlabel   = "$an($and*$an)?";
        // toplabel    = alpha | alpha *( alphanum | "-" ) alphanum
-        $toplabel = "$a($and*$an)?";
+        $toplabel      = "$a($and*$an)?";
        // hostname    = *( domainlabel "." ) toplabel [ "." ]
        if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
            return $string;
@@ -121,8 +92,10 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
                // XXX error reporting
            }
        }
+
        return false;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/URI/IPv4.php
+++ b/library/HTMLPurifier/AttrDef/URI/IPv4.php
@@ -8,38 +8,32 @@ class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
 {

    /**
-     * IPv4 regex, protected so that IPv6 can reuse it.
-     * @type string
+     * IPv4 regex, protected so that IPv6 can reuse it
     */
    protected $ip4;

-    /**
-     * @param string $aIP
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($aIP, $config, $context)
-    {
-        if (!$this->ip4) {
-            $this->_loadRegex();
+    public function validate($aIP, $config, $context) {
+
+        if (!$this->ip4) $this->_loadRegex();
+
+        if (preg_match('#^' . $this->ip4 . '$#s', $aIP))
+        {
+                return $aIP;
        }

-        if (preg_match('#^' . $this->ip4 . '$#s', $aIP)) {
-            return $aIP;
-        }
        return false;
+
    }

    /**
     * Lazy load function to prevent regex from being stuffed in
     * cache.
     */
-    protected function _loadRegex()
-    {
+    protected function _loadRegex() {
        $oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; // 0-255
        $this->ip4 = "(?:{$oct}\\.{$oct}\\.{$oct}\\.{$oct})";
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrDef/URI/IPv6.php
+++ b/library/HTMLPurifier/AttrDef/URI/IPv6.php
@@ -9,81 +9,91 @@
 class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
 {

-    /**
-     * @param string $aIP
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($aIP, $config, $context)
-    {
-        if (!$this->ip4) {
-            $this->_loadRegex();
-        }
+    public function validate($aIP, $config, $context) {
+
+        if (!$this->ip4) $this->_loadRegex();

        $original = $aIP;

        $hex = '[0-9a-fA-F]';
        $blk = '(?:' . $hex . '{1,4})';
-        $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))'; // /0 - /128
+        $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))';   // /0 - /128

        //      prefix check
-        if (strpos($aIP, '/') !== false) {
-            if (preg_match('#' . $pre . '$#s', $aIP, $find)) {
-                $aIP = substr($aIP, 0, 0 - strlen($find[0]));
-                unset($find);
-            } else {
-                return false;
-            }
+        if (strpos($aIP, '/') !== false)
+        {
+                if (preg_match('#' . $pre . '$#s', $aIP, $find))
+                {
+                        $aIP = substr($aIP, 0, 0-strlen($find[0]));
+                        unset($find);
+                }
+                else
+                {
+                        return false;
+                }
        }

        //      IPv4-compatiblity check
-        if (preg_match('#(?<=:' . ')' . $this->ip4 . '$#s', $aIP, $find)) {
-            $aIP = substr($aIP, 0, 0 - strlen($find[0]));
-            $ip = explode('.', $find[0]);
-            $ip = array_map('dechex', $ip);
-            $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
-            unset($find, $ip);
+        if (preg_match('#(?<=:'.')' . $this->ip4 . '$#s', $aIP, $find))
+        {
+                $aIP = substr($aIP, 0, 0-strlen($find[0]));
+                $ip = explode('.', $find[0]);
+                $ip = array_map('dechex', $ip);
+                $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
+                unset($find, $ip);
        }

        //      compression check
        $aIP = explode('::', $aIP);
        $c = count($aIP);
-        if ($c > 2) {
-            return false;
-        } elseif ($c == 2) {
-            list($first, $second) = $aIP;
-            $first = explode(':', $first);
-            $second = explode(':', $second);
-
-            if (count($first) + count($second) > 8) {
+        if ($c > 2)
+        {
                return false;
-            }
+        }
+        elseif ($c == 2)
+        {
+                list($first, $second) = $aIP;
+                $first = explode(':', $first);
+                $second = explode(':', $second);

-            while (count($first) < 8) {
-                array_push($first, '0');
-            }
+                if (count($first) + count($second) > 8)
+                {
+                        return false;
+                }

-            array_splice($first, 8 - count($second), 8, $second);
-            $aIP = $first;
-            unset($first, $second);
-        } else {
-            $aIP = explode(':', $aIP[0]);
+                while(count($first) < 8)
+                {
+                        array_push($first, '0');
+                }
+
+                array_splice($first, 8 - count($second), 8, $second);
+                $aIP = $first;
+                unset($first,$second);
+        }
+        else
+        {
+                $aIP = explode(':', $aIP[0]);
        }
        $c = count($aIP);

-        if ($c != 8) {
-            return false;
+        if ($c != 8)
+        {
+                return false;
        }

        //      All the pieces should be 16-bit hex strings. Are they?
-        foreach ($aIP as $piece) {
-            if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece))) {
-                return false;
-            }
+        foreach ($aIP as $piece)
+        {
+                if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece)))
+                {
+                        return false;
+                }
        }
+
        return $original;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform.php
+++ b/library/HTMLPurifier/AttrTransform.php
@@ -20,41 +20,37 @@ abstract class HTMLPurifier_AttrTransform
    /**
     * Abstract: makes changes to the attributes dependent on multiple values.
     *
-     * @param array $attr Assoc array of attributes, usually from
+     * @param $attr Assoc array of attributes, usually from
     *              HTMLPurifier_Token_Tag::$attr
-     * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object.
-     * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object
-     * @return array Processed attribute array.
+     * @param $config Mandatory HTMLPurifier_Config object.
+     * @param $context Mandatory HTMLPurifier_Context object
+     * @returns Processed attribute array.
     */
    abstract public function transform($attr, $config, $context);

    /**
     * Prepends CSS properties to the style attribute, creating the
     * attribute if it doesn't exist.
-     * @param array &$attr Attribute array to process (passed by reference)
-     * @param string $css CSS to prepend
+     * @param $attr Attribute array to process (passed by reference)
+     * @param $css CSS to prepend
     */
-    public function prependCSS(&$attr, $css)
-    {
+    public function prependCSS(&$attr, $css) {
        $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
        $attr['style'] = $css . $attr['style'];
    }

    /**
     * Retrieves and removes an attribute
-     * @param array &$attr Attribute array to process (passed by reference)
-     * @param mixed $key Key of attribute to confiscate
-     * @return mixed
+     * @param $attr Attribute array to process (passed by reference)
+     * @param $key Key of attribute to confiscate
     */
-    public function confiscateAttr(&$attr, $key)
-    {
-        if (!isset($attr[$key])) {
-            return null;
-        }
+    public function confiscateAttr(&$attr, $key) {
+        if (!isset($attr[$key])) return null;
        $value = $attr[$key];
        unset($attr[$key]);
        return $value;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/Background.php
+++ b/library/HTMLPurifier/AttrTransform/Background.php
@@ -3,26 +3,21 @@
 /**
 * Pre-transform that changes proprietary background attribute to CSS.
 */
-class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['background'])) {
-            return $attr;
-        }
+class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform {
+
+    public function transform($attr, $config, $context) {
+
+        if (!isset($attr['background'])) return $attr;

        $background = $this->confiscateAttr($attr, 'background');
        // some validation should happen here

        $this->prependCSS($attr, "background-image:url($background);");
+
        return $attr;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/BdoDir.php
+++ b/library/HTMLPurifier/AttrTransform/BdoDir.php
@@ -8,20 +8,12 @@
 class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
 {

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (isset($attr['dir'])) {
-            return $attr;
-        }
+    public function transform($attr, $config, $context) {
+        if (isset($attr['dir'])) return $attr;
        $attr['dir'] = $config->get('Attr.DefaultTextDir');
        return $attr;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/BgColor.php
+++ b/library/HTMLPurifier/AttrTransform/BgColor.php
@@ -3,26 +3,21 @@
 /**
 * Pre-transform that changes deprecated bgcolor attribute to CSS.
 */
-class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['bgcolor'])) {
-            return $attr;
-        }
+class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform {
+
+    public function transform($attr, $config, $context) {
+
+        if (!isset($attr['bgcolor'])) return $attr;

        $bgcolor = $this->confiscateAttr($attr, 'bgcolor');
        // some validation should happen here

        $this->prependCSS($attr, "background-color:$bgcolor;");
+
        return $attr;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/BoolToCSS.php
+++ b/library/HTMLPurifier/AttrTransform/BoolToCSS.php
@@ -3,45 +3,34 @@
 /**
 * Pre-transform that changes converts a boolean attribute to fixed CSS
 */
-class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform
-{
+class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform {
+
    /**
-     * Name of boolean attribute that is trigger.
-     * @type string
+     * Name of boolean attribute that is trigger
     */
    protected $attr;

    /**
-     * CSS declarations to add to style, needs trailing semicolon.
-     * @type string
+     * CSS declarations to add to style, needs trailing semicolon
     */
    protected $css;

    /**
-     * @param string $attr attribute name to convert from
-     * @param string $css CSS declarations to add to style (needs semicolon)
+     * @param $attr string attribute name to convert from
+     * @param $css string CSS declarations to add to style (needs semicolon)
     */
-    public function __construct($attr, $css)
-    {
+    public function __construct($attr, $css) {
        $this->attr = $attr;
-        $this->css = $css;
+        $this->css  = $css;
    }

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr[$this->attr])) {
-            return $attr;
-        }
+    public function transform($attr, $config, $context) {
+        if (!isset($attr[$this->attr])) return $attr;
        unset($attr[$this->attr]);
        $this->prependCSS($attr, $this->css);
        return $attr;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/Border.php
+++ b/library/HTMLPurifier/AttrTransform/Border.php
@@ -3,24 +3,16 @@
 /**
 * Pre-transform that changes deprecated border attribute to CSS.
 */
-class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['border'])) {
-            return $attr;
-        }
+class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform {
+
+    public function transform($attr, $config, $context) {
+        if (!isset($attr['border'])) return $attr;
        $border_width = $this->confiscateAttr($attr, 'border');
        // some validation should happen here
        $this->prependCSS($attr, "border:{$border_width}px solid;");
        return $attr;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/EnumToCSS.php
+++ b/library/HTMLPurifier/AttrTransform/EnumToCSS.php
@@ -4,65 +4,55 @@
 * Generic pre-transform that converts an attribute with a fixed number of
 * values (enumerated) to CSS.
 */
-class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform
-{
+class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform {
+
    /**
-     * Name of attribute to transform from.
-     * @type string
+     * Name of attribute to transform from
     */
    protected $attr;

    /**
-     * Lookup array of attribute values to CSS.
-     * @type array
+     * Lookup array of attribute values to CSS
     */
    protected $enumToCSS = array();

    /**
-     * Case sensitivity of the matching.
-     * @type bool
+     * Case sensitivity of the matching
     * @warning Currently can only be guaranteed to work with ASCII
     *          values.
     */
    protected $caseSensitive = false;

    /**
-     * @param string $attr Attribute name to transform from
-     * @param array $enum_to_css Lookup array of attribute values to CSS
-     * @param bool $case_sensitive Case sensitivity indicator, default false
+     * @param $attr String attribute name to transform from
+     * @param $enumToCSS Lookup array of attribute values to CSS
+     * @param $case_sensitive Boolean case sensitivity indicator, default false
     */
-    public function __construct($attr, $enum_to_css, $case_sensitive = false)
-    {
+    public function __construct($attr, $enum_to_css, $case_sensitive = false) {
        $this->attr = $attr;
        $this->enumToCSS = $enum_to_css;
-        $this->caseSensitive = (bool)$case_sensitive;
+        $this->caseSensitive = (bool) $case_sensitive;
    }

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr[$this->attr])) {
-            return $attr;
-        }
+    public function transform($attr, $config, $context) {
+
+        if (!isset($attr[$this->attr])) return $attr;

        $value = trim($attr[$this->attr]);
        unset($attr[$this->attr]);

-        if (!$this->caseSensitive) {
-            $value = strtolower($value);
-        }
+        if (!$this->caseSensitive) $value = strtolower($value);

        if (!isset($this->enumToCSS[$value])) {
            return $attr;
        }
+
        $this->prependCSS($attr, $this->enumToCSS[$value]);
+
        return $attr;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/ImgRequired.php
+++ b/library/HTMLPurifier/AttrTransform/ImgRequired.php
@@ -11,19 +11,11 @@
 class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
 {

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
+    public function transform($attr, $config, $context) {
+
        $src = true;
        if (!isset($attr['src'])) {
-            if ($config->get('Core.RemoveInvalidImg')) {
-                return $attr;
-            }
+            if ($config->get('Core.RemoveInvalidImg')) return $attr;
            $attr['src'] = $config->get('Attr.DefaultInvalidImage');
            $src = false;
        }
@@ -33,7 +25,7 @@ class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
                $alt = $config->get('Attr.DefaultImageAlt');
                if ($alt === null) {
                    // truncate if the alt is too long
-                    $attr['alt'] = substr(basename($attr['src']), 0, 40);
+                    $attr['alt'] = substr(basename($attr['src']),0,40);
                } else {
                    $attr['alt'] = $alt;
                }
@@ -41,8 +33,11 @@ class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
                $attr['alt'] = $config->get('Attr.DefaultInvalidImageAlt');
            }
        }
+
        return $attr;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/ImgSpace.php
+++ b/library/HTMLPurifier/AttrTransform/ImgSpace.php
@@ -3,59 +3,42 @@
 /**
 * Pre-transform that changes deprecated hspace and vspace attributes to CSS
 */
-class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @type string
-     */
-    protected $attr;
+class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform {

-    /**
-     * @type array
-     */
+    protected $attr;
    protected $css = array(
        'hspace' => array('left', 'right'),
        'vspace' => array('top', 'bottom')
    );

-    /**
-     * @param string $attr
-     */
-    public function __construct($attr)
-    {
+    public function __construct($attr) {
        $this->attr = $attr;
        if (!isset($this->css[$attr])) {
            trigger_error(htmlspecialchars($attr) . ' is not valid space attribute');
        }
    }

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr[$this->attr])) {
-            return $attr;
-        }
+    public function transform($attr, $config, $context) {
+
+        if (!isset($attr[$this->attr])) return $attr;

        $width = $this->confiscateAttr($attr, $this->attr);
        // some validation could happen here

-        if (!isset($this->css[$this->attr])) {
-            return $attr;
-        }
+        if (!isset($this->css[$this->attr])) return $attr;

        $style = '';
        foreach ($this->css[$this->attr] as $suffix) {
            $property = "margin-$suffix";
            $style .= "$property:{$width}px;";
        }
+
        $this->prependCSS($attr, $style);
+
        return $attr;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/Input.php
+++ b/library/HTMLPurifier/AttrTransform/Input.php
@@ -4,31 +4,17 @@
 * Performs miscellaneous cross attribute validation and filtering for
 * input elements. This is meant to be a post-transform.
 */
-class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @type HTMLPurifier_AttrDef_HTML_Pixels
-     */
+class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform {
+
    protected $pixels;

-    public function __construct()
-    {
+    public function __construct() {
        $this->pixels = new HTMLPurifier_AttrDef_HTML_Pixels();
    }

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['type'])) {
-            $t = 'text';
-        } else {
-            $t = strtolower($attr['type']);
-        }
+    public function transform($attr, $config, $context) {
+        if (!isset($attr['type'])) $t = 'text';
+        else $t = strtolower($attr['type']);
        if (isset($attr['checked']) && $t !== 'radio' && $t !== 'checkbox') {
            unset($attr['checked']);
        }
@@ -37,11 +23,8 @@ class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform
        }
        if (isset($attr['size']) && $t !== 'text' && $t !== 'password') {
            $result = $this->pixels->validate($attr['size'], $config, $context);
-            if ($result === false) {
-                unset($attr['size']);
-            } else {
-                $attr['size'] = $result;
-            }
+            if ($result === false) unset($attr['size']);
+            else $attr['size'] = $result;
        }
        if (isset($attr['src']) && $t !== 'image') {
            unset($attr['src']);
@@ -51,6 +34,7 @@ class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform
        }
        return $attr;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/Lang.php
+++ b/library/HTMLPurifier/AttrTransform/Lang.php
@@ -8,15 +8,9 @@
 class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
 {

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        $lang = isset($attr['lang']) ? $attr['lang'] : false;
+    public function transform($attr, $config, $context) {
+
+        $lang     = isset($attr['lang']) ? $attr['lang'] : false;
        $xml_lang = isset($attr['xml:lang']) ? $attr['xml:lang'] : false;

        if ($lang !== false && $xml_lang === false) {
@@ -24,8 +18,11 @@ class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
        } elseif ($xml_lang !== false) {
            $attr['lang'] = $xml_lang;
        }
+
        return $attr;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/Length.php
+++ b/library/HTMLPurifier/AttrTransform/Length.php
@@ -6,40 +6,22 @@
 class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
 {

-    /**
-     * @type string
-     */
    protected $name;
-
-    /**
-     * @type string
-     */
    protected $cssName;

-    public function __construct($name, $css_name = null)
-    {
+    public function __construct($name, $css_name = null) {
        $this->name = $name;
        $this->cssName = $css_name ? $css_name : $name;
    }

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr[$this->name])) {
-            return $attr;
-        }
+    public function transform($attr, $config, $context) {
+        if (!isset($attr[$this->name])) return $attr;
        $length = $this->confiscateAttr($attr, $this->name);
-        if (ctype_digit($length)) {
-            $length .= 'px';
-        }
+        if(ctype_digit($length)) $length .= 'px';
        $this->prependCSS($attr, $this->cssName . ":$length;");
        return $attr;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/Name.php
+++ b/library/HTMLPurifier/AttrTransform/Name.php
@@ -6,28 +6,16 @@
 class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
 {

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
+    public function transform($attr, $config, $context) {
        // Abort early if we're using relaxed definition of name
-        if ($config->get('HTML.Attr.Name.UseCDATA')) {
-            return $attr;
-        }
-        if (!isset($attr['name'])) {
-            return $attr;
-        }
+        if ($config->get('HTML.Attr.Name.UseCDATA')) return $attr;
+        if (!isset($attr['name'])) return $attr;
        $id = $this->confiscateAttr($attr, 'name');
-        if (isset($attr['id'])) {
-            return $attr;
-        }
+        if ( isset($attr['id']))   return $attr;
        $attr['id'] = $id;
        return $attr;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/NameSync.php
+++ b/library/HTMLPurifier/AttrTransform/NameSync.php
@@ -8,34 +8,20 @@
 class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform
 {

-    public function __construct()
-    {
+    public function __construct() {
        $this->idDef = new HTMLPurifier_AttrDef_HTML_ID();
    }

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['name'])) {
-            return $attr;
-        }
+    public function transform($attr, $config, $context) {
+        if (!isset($attr['name'])) return $attr;
        $name = $attr['name'];
-        if (isset($attr['id']) && $attr['id'] === $name) {
-            return $attr;
-        }
+        if (isset($attr['id']) && $attr['id'] === $name) return $attr;
        $result = $this->idDef->validate($name, $config, $context);
-        if ($result === false) {
-            unset($attr['name']);
-        } else {
-            $attr['name'] = $result;
-        }
+        if ($result === false) unset($attr['name']);
+        else $attr['name'] = $result;
        return $attr;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/Nofollow.php
+++ b/library/HTMLPurifier/AttrTransform/Nofollow.php
@@ -8,24 +8,14 @@
 */
 class HTMLPurifier_AttrTransform_Nofollow extends HTMLPurifier_AttrTransform
 {
-    /**
-     * @type HTMLPurifier_URIParser
-     */
    private $parser;

-    public function __construct()
-    {
+    public function __construct() {
        $this->parser = new HTMLPurifier_URIParser();
    }

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
+    public function transform($attr, $config, $context) {
+
        if (!isset($attr['href'])) {
            return $attr;
        }
@@ -45,8 +35,11 @@ class HTMLPurifier_AttrTransform_Nofollow extends HTMLPurifier_AttrTransform
                $attr['rel'] = 'nofollow';
            }
        }
+
        return $attr;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/SafeEmbed.php
+++ b/library/HTMLPurifier/AttrTransform/SafeEmbed.php
@@ -2,19 +2,9 @@

 class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
 {
-    /**
-     * @type string
-     */
    public $name = "SafeEmbed";

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
+    public function transform($attr, $config, $context) {
        $attr['allowscriptaccess'] = 'never';
        $attr['allownetworking'] = 'internal';
        $attr['type'] = 'application/x-shockwave-flash';
--- a/library/HTMLPurifier/AttrTransform/SafeObject.php
+++ b/library/HTMLPurifier/AttrTransform/SafeObject.php
@@ -5,22 +5,10 @@
 */
 class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform
 {
-    /**
-     * @type string
-     */
    public $name = "SafeObject";

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['type'])) {
-            $attr['type'] = 'application/x-shockwave-flash';
-        }
+    function transform($attr, $config, $context) {
+        if (!isset($attr['type'])) $attr['type'] = 'application/x-shockwave-flash';
        return $attr;
    }
 }
--- a/library/HTMLPurifier/AttrTransform/SafeParam.php
+++ b/library/HTMLPurifier/AttrTransform/SafeParam.php
@@ -14,30 +14,15 @@
 */
 class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
 {
-    /**
-     * @type string
-     */
    public $name = "SafeParam";
-
-    /**
-     * @type HTMLPurifier_AttrDef_URI
-     */
    private $uri;

-    public function __construct()
-    {
+    public function __construct() {
        $this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
        $this->wmode = new HTMLPurifier_AttrDef_Enum(array('window', 'opaque', 'transparent'));
    }

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
+    public function transform($attr, $config, $context) {
        // If we add support for other objects, we'll need to alter the
        // transforms.
        switch ($attr['name']) {
--- a/library/HTMLPurifier/AttrTransform/ScriptRequired.php
+++ b/library/HTMLPurifier/AttrTransform/ScriptRequired.php
@@ -5,14 +5,7 @@
 */
 class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransform
 {
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
+    public function transform($attr, $config, $context) {
        if (!isset($attr['type'])) {
            $attr['type'] = 'text/javascript';
        }
--- a/library/HTMLPurifier/AttrTransform/TargetBlank.php
+++ b/library/HTMLPurifier/AttrTransform/TargetBlank.php
@@ -9,24 +9,14 @@
 */
 class HTMLPurifier_AttrTransform_TargetBlank extends HTMLPurifier_AttrTransform
 {
-    /**
-     * @type HTMLPurifier_URIParser
-     */
    private $parser;

-    public function __construct()
-    {
+    public function __construct() {
        $this->parser = new HTMLPurifier_URIParser();
    }

-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
+    public function transform($attr, $config, $context) {
+
        if (!isset($attr['href'])) {
            return $attr;
        }
@@ -38,8 +28,11 @@ class HTMLPurifier_AttrTransform_TargetBlank extends HTMLPurifier_AttrTransform
        if ($scheme->browsable && !$url->isBenign($config, $context)) {
            $attr['target'] = '_blank';
        }
+
        return $attr;
+
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTransform/Textarea.php
+++ b/library/HTMLPurifier/AttrTransform/Textarea.php
@@ -5,23 +5,14 @@
 */
 class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform
 {
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
+
+    public function transform($attr, $config, $context) {
        // Calculated from Firefox
-        if (!isset($attr['cols'])) {
-            $attr['cols'] = '22';
-        }
-        if (!isset($attr['rows'])) {
-            $attr['rows'] = '3';
-        }
+        if (!isset($attr['cols'])) $attr['cols'] = '22';
+        if (!isset($attr['rows'])) $attr['rows'] = '3';
        return $attr;
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/AttrTypes.php
+++ b/library/HTMLPurifier/AttrTypes.php
@@ -6,8 +6,7 @@
 class HTMLPurifier_AttrTypes
 {
    /**
-     * Lookup array of attribute string identifiers to concrete implementations.
-     * @type HTMLPurifier_AttrDef[]
+     * Lookup array of attribute string identifiers to concrete implementations
     */
    protected $info = array();

@@ -15,8 +14,7 @@ class HTMLPurifier_AttrTypes
     * Constructs the info array, supplying default implementations for attribute
     * types.
     */
-    public function __construct()
-    {
+    public function __construct() {
        // XXX This is kind of poor, since we don't actually /clone/
        // instances; instead, we use the supplied make() attribute. So,
        // the underlying class must know how to deal with arguments.
@@ -56,39 +54,36 @@ class HTMLPurifier_AttrTypes
        $this->info['Number']   = new HTMLPurifier_AttrDef_Integer(false, false, true);
    }

-    private static function makeEnum($in)
-    {
+    private static function makeEnum($in) {
        return new HTMLPurifier_AttrDef_Clone(new HTMLPurifier_AttrDef_Enum(explode(',', $in)));
    }

    /**
     * Retrieves a type
-     * @param string $type String type name
-     * @return HTMLPurifier_AttrDef Object AttrDef for type
+     * @param $type String type name
+     * @return Object AttrDef for type
     */
-    public function get($type)
-    {
+    public function get($type) {
+
        // determine if there is any extra info tacked on
-        if (strpos($type, '#') !== false) {
-            list($type, $string) = explode('#', $type, 2);
-        } else {
-            $string = '';
-        }
+        if (strpos($type, '#') !== false) list($type, $string) = explode('#', $type, 2);
+        else $string = '';

        if (!isset($this->info[$type])) {
            trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
            return;
        }
+
        return $this->info[$type]->make($string);
+
    }

    /**
     * Sets a new implementation for a type
-     * @param string $type String type name
-     * @param HTMLPurifier_AttrDef $impl Object AttrDef for type
+     * @param $type String type name
+     * @param $impl Object AttrDef for type
     */
-    public function set($type, $impl)
-    {
+    public function set($type, $impl) {
        $this->info[$type] = $impl;
    }
 }
--- a/library/HTMLPurifier/AttrValidator.php
+++ b/library/HTMLPurifier/AttrValidator.php
@@ -9,14 +9,17 @@ class HTMLPurifier_AttrValidator
 {

    /**
-     * Validates the attributes of a token, mutating it as necessary.
+     * Validates the attributes of a token, returning a modified token
     * that has valid tokens
-     * @param HTMLPurifier_Token $token Token to validate.
-     * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
-     * @param HTMLPurifier_Context $context Instance of HTMLPurifier_Context
+     * @param $token Reference to token to validate. We require a reference
+     *     because the operation this class performs on the token are
+     *     not atomic, so the context CurrentToken to be updated
+     *     throughout
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
     */
-    public function validateToken($token, $config, $context)
-    {
+    public function validateToken(&$token, &$config, $context) {
+
        $definition = $config->getHTMLDefinition();
        $e =& $context->get('ErrorCollector', true);

@@ -29,15 +32,12 @@ class HTMLPurifier_AttrValidator

        // initialize CurrentToken if necessary
        $current_token =& $context->get('CurrentToken', true);
-        if (!$current_token) {
-            $context->register('CurrentToken', $token);
-        }
+        if (!$current_token) $context->register('CurrentToken', $token);

-        if (!$token instanceof HTMLPurifier_Token_Start &&
+        if (
+            !$token instanceof HTMLPurifier_Token_Start &&
            !$token instanceof HTMLPurifier_Token_Empty
-        ) {
-            return;
-        }
+        ) return $token;

        // create alias to global definition array, see also $defs
        // DEFINITION CALL
@@ -51,9 +51,7 @@ class HTMLPurifier_AttrValidator
        foreach ($definition->info_attr_transform_pre as $transform) {
            $attr = $transform->transform($o = $attr, $config, $context);
            if ($e) {
-                if ($attr != $o) {
-                    $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-                }
+                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
            }
        }

@@ -62,9 +60,7 @@ class HTMLPurifier_AttrValidator
        foreach ($definition->info[$token->name]->attr_transform_pre as $transform) {
            $attr = $transform->transform($o = $attr, $config, $context);
            if ($e) {
-                if ($attr != $o) {
-                    $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-                }
+                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
            }
        }

@@ -81,7 +77,7 @@ class HTMLPurifier_AttrValidator
        foreach ($attr as $attr_key => $value) {

            // call the definition
-            if (isset($defs[$attr_key])) {
+            if ( isset($defs[$attr_key]) ) {
                // there is a local definition defined
                if ($defs[$attr_key] === false) {
                    // We've explicitly been told not to allow this element.
@@ -93,19 +89,15 @@ class HTMLPurifier_AttrValidator
                } else {
                    // validate according to the element's definition
                    $result = $defs[$attr_key]->validate(
-                        $value,
-                        $config,
-                        $context
-                    );
+                                    $value, $config, $context
+                               );
                }
-            } elseif (isset($d_defs[$attr_key])) {
+            } elseif ( isset($d_defs[$attr_key]) ) {
                // there is a global definition defined, validate according
                // to the global definition
                $result = $d_defs[$attr_key]->validate(
-                    $value,
-                    $config,
-                    $context
-                );
+                                $value, $config, $context
+                           );
            } else {
                // system never heard of the attribute? DELETE!
                $result = false;
@@ -115,9 +107,7 @@ class HTMLPurifier_AttrValidator
            if ($result === false || $result === null) {
                // this is a generic error message that should replaced
                // with more specific ones when possible
-                if ($e) {
-                    $e->send(E_ERROR, 'AttrValidator: Attribute removed');
-                }
+                if ($e) $e->send(E_ERROR, 'AttrValidator: Attribute removed');

                // remove the attribute
                unset($attr[$attr_key]);
@@ -147,9 +137,7 @@ class HTMLPurifier_AttrValidator
        foreach ($definition->info_attr_transform_post as $transform) {
            $attr = $transform->transform($o = $attr, $config, $context);
            if ($e) {
-                if ($attr != $o) {
-                    $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-                }
+                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
            }
        }

@@ -157,18 +145,14 @@ class HTMLPurifier_AttrValidator
        foreach ($definition->info[$token->name]->attr_transform_post as $transform) {
            $attr = $transform->transform($o = $attr, $config, $context);
            if ($e) {
-                if ($attr != $o) {
-                    $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-                }
+                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
            }
        }

        $token->attr = $attr;

        // destroy CurrentToken if we made it ourselves
-        if (!$current_token) {
-            $context->destroy('CurrentToken');
-        }
+        if (!$current_token) $context->destroy('CurrentToken');

    }

--- a/library/HTMLPurifier/Bootstrap.php
+++ b/library/HTMLPurifier/Bootstrap.php
@@ -32,15 +32,11 @@ class HTMLPurifier_Bootstrap

    /**
     * Autoload function for HTML Purifier
-     * @param string $class Class to load
-     * @return bool
+     * @param $class Class to load
     */
-    public static function autoload($class)
-    {
+    public static function autoload($class) {
        $file = HTMLPurifier_Bootstrap::getPath($class);
-        if (!$file) {
-            return false;
-        }
+        if (!$file) return false;
        // Technically speaking, it should be ok and more efficient to
        // just do 'require', but Antonio Parraga reports that with
        // Zend extensions such as Zend debugger and APC, this invariant
@@ -52,14 +48,9 @@ class HTMLPurifier_Bootstrap

    /**
     * Returns the path for a specific class.
-     * @param string $class Class path to get
-     * @return string
     */
-    public static function getPath($class)
-    {
-        if (strncmp('HTMLPurifier', $class, 12) !== 0) {
-            return false;
-        }
+    public static function getPath($class) {
+        if (strncmp('HTMLPurifier', $class, 12) !== 0) return false;
        // Custom implementations
        if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) {
            $code = str_replace('_', '-', substr($class, 22));
@@ -67,19 +58,16 @@ class HTMLPurifier_Bootstrap
        } else {
            $file = str_replace('_', '/', $class) . '.php';
        }
-        if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) {
-            return false;
-        }
+        if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) return false;
        return $file;
    }

    /**
     * "Pre-registers" our autoloader on the SPL stack.
     */
-    public static function registerAutoload()
-    {
+    public static function registerAutoload() {
        $autoload = array('HTMLPurifier_Bootstrap', 'autoload');
-        if (($funcs = spl_autoload_functions()) === false) {
+        if ( ($funcs = spl_autoload_functions()) === false ) {
            spl_autoload_register($autoload);
        } elseif (function_exists('spl_autoload_unregister')) {
            if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
@@ -95,30 +83,27 @@ class HTMLPurifier_Bootstrap
                        // places where we need to error out
                        $reflector = new ReflectionMethod($func[0], $func[1]);
                        if (!$reflector->isStatic()) {
-                            throw new Exception(
-                                'HTML Purifier autoloader registrar is not compatible
+                            throw new Exception('
+                                HTML Purifier autoloader registrar is not compatible
                                with non-static object methods due to PHP Bug #44144;
                                Please do not use HTMLPurifier.autoload.php (or any
                                file that includes this file); instead, place the code:
                                spl_autoload_register(array(\'HTMLPurifier_Bootstrap\', \'autoload\'))
-                                after your own autoloaders.'
-                            );
+                                after your own autoloaders.
+                            ');
                        }
                        // Suprisingly, spl_autoload_register supports the
                        // Class::staticMethod callback format, although call_user_func doesn't
-                        if ($compat) {
-                            $func = implode('::', $func);
-                        }
+                        if ($compat) $func = implode('::', $func);
                    }
                    spl_autoload_unregister($func);
                }
                spl_autoload_register($autoload);
-                foreach ($funcs as $func) {
-                    spl_autoload_register($func);
-                }
+                foreach ($funcs as $func) spl_autoload_register($func);
            }
        }
    }
+
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/CSSDefinition.php
+++ b/library/HTMLPurifier/CSSDefinition.php
@@ -11,59 +11,35 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition

    /**
     * Assoc array of attribute name to definition object.
-     * @type HTMLPurifier_AttrDef[]
     */
    public $info = array();

    /**
     * Constructs the info array.  The meat of this class.
-     * @param HTMLPurifier_Config $config
     */
-    protected function doSetup($config)
-    {
+    protected function doSetup($config) {
+
        $this->info['text-align'] = new HTMLPurifier_AttrDef_Enum(
-            array('left', 'right', 'center', 'justify'),
-            false
-        );
+            array('left', 'right', 'center', 'justify'), false);

        $border_style =
-            $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['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['border-style'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_style);

        $this->info['clear'] = new HTMLPurifier_AttrDef_Enum(
-            array('none', 'left', 'right', 'both'),
-            false
-        );
+            array('none', 'left', 'right', 'both'), false);
        $this->info['float'] = new HTMLPurifier_AttrDef_Enum(
-            array('none', 'left', 'right'),
-            false
-        );
+            array('none', 'left', 'right'), false);
        $this->info['font-style'] = new HTMLPurifier_AttrDef_Enum(
-            array('normal', 'italic', 'oblique'),
-            false
-        );
+            array('normal', 'italic', 'oblique'), false);
        $this->info['font-variant'] = new HTMLPurifier_AttrDef_Enum(
-            array('normal', 'small-caps'),
-            false
-        );
+            array('normal', 'small-caps'), false);

        $uri_or_none = new HTMLPurifier_AttrDef_CSS_Composite(
            array(
@@ -73,31 +49,16 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
        );

        $this->info['list-style-position'] = new HTMLPurifier_AttrDef_Enum(
-            array('inside', 'outside'),
-            false
-        );
+            array('inside', 'outside'), false);
        $this->info['list-style-type'] = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'disc',
-                'circle',
-                'square',
-                'decimal',
-                'lower-roman',
-                'upper-roman',
-                'lower-alpha',
-                'upper-alpha',
-                'none'
-            ),
-            false
-        );
+            array('disc', 'circle', 'square', 'decimal', 'lower-roman',
+            'upper-roman', 'lower-alpha', 'upper-alpha', 'none'), false);
        $this->info['list-style-image'] = $uri_or_none;

        $this->info['list-style'] = new HTMLPurifier_AttrDef_CSS_ListStyle($config);

        $this->info['text-transform'] = new HTMLPurifier_AttrDef_Enum(
-            array('capitalize', 'uppercase', 'lowercase', 'none'),
-            false
-        );
+            array('capitalize', 'uppercase', 'lowercase', 'none'), false);
        $this->info['color'] = new HTMLPurifier_AttrDef_CSS_Color();

        $this->info['background-image'] = $uri_or_none;
@@ -110,137 +71,104 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
        $this->info['background-position'] = new HTMLPurifier_AttrDef_CSS_BackgroundPosition();

        $border_color =
-            $this->info['border-top-color'] =
-            $this->info['border-bottom-color'] =
-            $this->info['border-left-color'] =
-            $this->info['border-right-color'] =
-            $this->info['background-color'] = new HTMLPurifier_AttrDef_CSS_Composite(
-                array(
-                    new HTMLPurifier_AttrDef_Enum(array('transparent')),
-                    new HTMLPurifier_AttrDef_CSS_Color()
-                )
-            );
+        $this->info['border-top-color'] =
+        $this->info['border-bottom-color'] =
+        $this->info['border-left-color'] =
+        $this->info['border-right-color'] =
+        $this->info['background-color'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('transparent')),
+            new HTMLPurifier_AttrDef_CSS_Color()
+        ));

        $this->info['background'] = new HTMLPurifier_AttrDef_CSS_Background($config);

        $this->info['border-color'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_color);

        $border_width =
-            $this->info['border-top-width'] =
-            $this->info['border-bottom-width'] =
-            $this->info['border-left-width'] =
-            $this->info['border-right-width'] = new HTMLPurifier_AttrDef_CSS_Composite(
-                array(
-                    new HTMLPurifier_AttrDef_Enum(array('thin', 'medium', 'thick')),
-                    new HTMLPurifier_AttrDef_CSS_Length('0') //disallow negative
-                )
-            );
+        $this->info['border-top-width'] =
+        $this->info['border-bottom-width'] =
+        $this->info['border-left-width'] =
+        $this->info['border-right-width'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('thin', 'medium', 'thick')),
+            new HTMLPurifier_AttrDef_CSS_Length('0') //disallow negative
+        ));

        $this->info['border-width'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_width);

-        $this->info['letter-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(array('normal')),
-                new HTMLPurifier_AttrDef_CSS_Length()
-            )
-        );
+        $this->info['letter-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('normal')),
+            new HTMLPurifier_AttrDef_CSS_Length()
+        ));

-        $this->info['word-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(array('normal')),
-                new HTMLPurifier_AttrDef_CSS_Length()
-            )
-        );
+        $this->info['word-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('normal')),
+            new HTMLPurifier_AttrDef_CSS_Length()
+        ));

-        $this->info['font-size'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(
-                    array(
-                        'xx-small',
-                        'x-small',
-                        'small',
-                        'medium',
-                        'large',
-                        'x-large',
-                        'xx-large',
-                        'larger',
-                        'smaller'
-                    )
-                ),
-                new HTMLPurifier_AttrDef_CSS_Percentage(),
-                new HTMLPurifier_AttrDef_CSS_Length()
-            )
-        );
+        $this->info['font-size'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('xx-small', 'x-small',
+                'small', 'medium', 'large', 'x-large', 'xx-large',
+                'larger', 'smaller')),
+            new HTMLPurifier_AttrDef_CSS_Percentage(),
+            new HTMLPurifier_AttrDef_CSS_Length()
+        ));

-        $this->info['line-height'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(array('normal')),
-                new HTMLPurifier_AttrDef_CSS_Number(true), // no negatives
-                new HTMLPurifier_AttrDef_CSS_Length('0'),
-                new HTMLPurifier_AttrDef_CSS_Percentage(true)
-            )
-        );
+        $this->info['line-height'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('normal')),
+            new HTMLPurifier_AttrDef_CSS_Number(true), // no negatives
+            new HTMLPurifier_AttrDef_CSS_Length('0'),
+            new HTMLPurifier_AttrDef_CSS_Percentage(true)
+        ));

        $margin =
-            $this->info['margin-top'] =
-            $this->info['margin-bottom'] =
-            $this->info['margin-left'] =
-            $this->info['margin-right'] = new HTMLPurifier_AttrDef_CSS_Composite(
-                array(
-                    new HTMLPurifier_AttrDef_CSS_Length(),
-                    new HTMLPurifier_AttrDef_CSS_Percentage(),
-                    new HTMLPurifier_AttrDef_Enum(array('auto'))
-                )
-            );
+        $this->info['margin-top'] =
+        $this->info['margin-bottom'] =
+        $this->info['margin-left'] =
+        $this->info['margin-right'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_CSS_Length(),
+            new HTMLPurifier_AttrDef_CSS_Percentage(),
+            new HTMLPurifier_AttrDef_Enum(array('auto'))
+        ));

        $this->info['margin'] = new HTMLPurifier_AttrDef_CSS_Multiple($margin);

        // non-negative
        $padding =
-            $this->info['padding-top'] =
-            $this->info['padding-bottom'] =
-            $this->info['padding-left'] =
-            $this->info['padding-right'] = new HTMLPurifier_AttrDef_CSS_Composite(
-                array(
-                    new HTMLPurifier_AttrDef_CSS_Length('0'),
-                    new HTMLPurifier_AttrDef_CSS_Percentage(true)
-                )
-            );
+        $this->info['padding-top'] =
+        $this->info['padding-bottom'] =
+        $this->info['padding-left'] =
+        $this->info['padding-right'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_CSS_Length('0'),
+            new HTMLPurifier_AttrDef_CSS_Percentage(true)
+        ));

        $this->info['padding'] = new HTMLPurifier_AttrDef_CSS_Multiple($padding);

-        $this->info['text-indent'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_CSS_Length(),
-                new HTMLPurifier_AttrDef_CSS_Percentage()
-            )
-        );
+        $this->info['text-indent'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_CSS_Length(),
+            new HTMLPurifier_AttrDef_CSS_Percentage()
+        ));

-        $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_CSS_Length('0'),
-                new HTMLPurifier_AttrDef_CSS_Percentage(true),
-                new HTMLPurifier_AttrDef_Enum(array('auto'))
-            )
-        );
+        $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_CSS_Length('0'),
+            new HTMLPurifier_AttrDef_CSS_Percentage(true),
+            new HTMLPurifier_AttrDef_Enum(array('auto'))
+        ));
        $max = $config->get('CSS.MaxImgLength');

        $this->info['width'] =
        $this->info['height'] =
            $max === null ?
-                $trusted_wh :
-                new HTMLPurifier_AttrDef_Switch(
-                    'img',
-                    // For img tags:
-                    new HTMLPurifier_AttrDef_CSS_Composite(
-                        array(
-                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
-                            new HTMLPurifier_AttrDef_Enum(array('auto'))
-                        )
-                    ),
-                    // For everyone else:
-                    $trusted_wh
-                );
+            $trusted_wh :
+            new HTMLPurifier_AttrDef_Switch('img',
+                // For img tags:
+                new HTMLPurifier_AttrDef_CSS_Composite(array(
+                    new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                    new HTMLPurifier_AttrDef_Enum(array('auto'))
+                )),
+                // For everyone else:
+                $trusted_wh
+            );

        $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();

@@ -248,23 +176,8 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition

        // this could use specialized code
        $this->info['font-weight'] = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'normal',
-                'bold',
-                'bolder',
-                'lighter',
-                '100',
-                '200',
-                '300',
-                '400',
-                '500',
-                '600',
-                '700',
-                '800',
-                '900'
-            ),
-            false
-        );
+            array('normal', 'bold', 'bolder', 'lighter', '100', '200', '300',
+            '400', '500', '600', '700', '800', '900'), false);

        // MUST be called after other font properties, as it references
        // a CSSDefinition object
@@ -277,44 +190,27 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
        $this->info['border-left'] =
        $this->info['border-right'] = new HTMLPurifier_AttrDef_CSS_Border($config);

-        $this->info['border-collapse'] = new HTMLPurifier_AttrDef_Enum(
-            array('collapse', 'separate')
-        );
+        $this->info['border-collapse'] = new HTMLPurifier_AttrDef_Enum(array(
+            'collapse', 'separate'));

-        $this->info['caption-side'] = new HTMLPurifier_AttrDef_Enum(
-            array('top', 'bottom')
-        );
+        $this->info['caption-side'] = new HTMLPurifier_AttrDef_Enum(array(
+            'top', 'bottom'));

-        $this->info['table-layout'] = new HTMLPurifier_AttrDef_Enum(
-            array('auto', 'fixed')
-        );
+        $this->info['table-layout'] = new HTMLPurifier_AttrDef_Enum(array(
+            'auto', 'fixed'));

-        $this->info['vertical-align'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(
-                    array(
-                        'baseline',
-                        'sub',
-                        'super',
-                        'top',
-                        'text-top',
-                        'middle',
-                        'bottom',
-                        'text-bottom'
-                    )
-                ),
-                new HTMLPurifier_AttrDef_CSS_Length(),
-                new HTMLPurifier_AttrDef_CSS_Percentage()
-            )
-        );
+        $this->info['vertical-align'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('baseline', 'sub', 'super',
+                'top', 'text-top', 'middle', 'bottom', 'text-bottom')),
+            new HTMLPurifier_AttrDef_CSS_Length(),
+            new HTMLPurifier_AttrDef_CSS_Percentage()
+        ));

        $this->info['border-spacing'] = new HTMLPurifier_AttrDef_CSS_Multiple(new HTMLPurifier_AttrDef_CSS_Length(), 2);

        // These CSS properties don't work on many browsers, but we live
        // in THE FUTURE!
-        $this->info['white-space'] = new HTMLPurifier_AttrDef_Enum(
-            array('nowrap', 'normal', 'pre', 'pre-wrap', 'pre-line')
-        );
+        $this->info['white-space'] = new HTMLPurifier_AttrDef_Enum(array('nowrap', 'normal', 'pre', 'pre-wrap', 'pre-line'));

        if ($config->get('CSS.Proprietary')) {
            $this->doSetupProprietary($config);
@@ -337,119 +233,76 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
        $this->setupConfigStuff($config);
    }

-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    protected function doSetupProprietary($config)
-    {
+    protected function doSetupProprietary($config) {
        // Internet Explorer only scrollbar colors
-        $this->info['scrollbar-arrow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-base-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-darkshadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-face-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-highlight-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-shadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-arrow-color']        = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-base-color']         = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-darkshadow-color']   = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-face-color']         = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-highlight-color']    = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-shadow-color']       = new HTMLPurifier_AttrDef_CSS_Color();

-        // vendor specific prefixes of opacity
-        $this->info['-moz-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-        $this->info['-khtml-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
+        // technically not proprietary, but CSS3, and no one supports it
+        $this->info['opacity']          = new HTMLPurifier_AttrDef_CSS_AlphaValue();
+        $this->info['-moz-opacity']     = new HTMLPurifier_AttrDef_CSS_AlphaValue();
+        $this->info['-khtml-opacity']   = new HTMLPurifier_AttrDef_CSS_AlphaValue();

        // only opacity, for now
        $this->info['filter'] = new HTMLPurifier_AttrDef_CSS_Filter();

        // more CSS3
        $this->info['page-break-after'] =
-        $this->info['page-break-before'] = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'auto',
-                'always',
-                'avoid',
-                'left',
-                'right'
-            )
-        );
-        $this->info['page-break-inside'] = new HTMLPurifier_AttrDef_Enum(array('auto', 'avoid'));
+        $this->info['page-break-before'] = new HTMLPurifier_AttrDef_Enum(array('auto','always','avoid','left','right'));
+        $this->info['page-break-inside'] = new HTMLPurifier_AttrDef_Enum(array('auto','avoid'));

    }

-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    protected function doSetupTricky($config)
-    {
-        $this->info['display'] = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'inline',
-                'block',
-                'list-item',
-                'run-in',
-                'compact',
-                'marker',
-                'table',
-                'inline-block',
-                'inline-table',
-                'table-row-group',
-                'table-header-group',
-                'table-footer-group',
-                'table-row',
-                'table-column-group',
-                'table-column',
-                'table-cell',
-                'table-caption',
-                'none'
-            )
-        );
-        $this->info['visibility'] = new HTMLPurifier_AttrDef_Enum(
-            array('visible', 'hidden', 'collapse')
-        );
+    protected function doSetupTricky($config) {
+        $this->info['display'] = new HTMLPurifier_AttrDef_Enum(array(
+            'inline', 'block', 'list-item', 'run-in', 'compact',
+            'marker', 'table', 'inline-block', 'inline-table', 'table-row-group',
+            'table-header-group', 'table-footer-group', 'table-row',
+            'table-column-group', 'table-column', 'table-cell', 'table-caption', 'none'
+        ));
+        $this->info['visibility'] = new HTMLPurifier_AttrDef_Enum(array(
+            'visible', 'hidden', 'collapse'
+        ));
        $this->info['overflow'] = new HTMLPurifier_AttrDef_Enum(array('visible', 'hidden', 'auto', 'scroll'));
-        $this->info['opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
    }

-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    protected function doSetupTrusted($config)
-    {
-        $this->info['position'] = new HTMLPurifier_AttrDef_Enum(
-            array('static', 'relative', 'absolute', 'fixed')
-        );
+    protected function doSetupTrusted($config) {
+        $this->info['position'] = new HTMLPurifier_AttrDef_Enum(array(
+            'static', 'relative', 'absolute', 'fixed'
+        ));
        $this->info['top'] =
        $this->info['left'] =
        $this->info['right'] =
-        $this->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_CSS_Length(),
-                new HTMLPurifier_AttrDef_CSS_Percentage(),
-                new HTMLPurifier_AttrDef_Enum(array('auto')),
-            )
-        );
-        $this->info['z-index'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Integer(),
-                new HTMLPurifier_AttrDef_Enum(array('auto')),
-            )
-        );
+        $this->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_CSS_Length(),
+            new HTMLPurifier_AttrDef_CSS_Percentage(),
+            new HTMLPurifier_AttrDef_Enum(array('auto')),
+        ));
+        $this->info['z-index'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Integer(),
+            new HTMLPurifier_AttrDef_Enum(array('auto')),
+        ));
    }

    /**
     * Performs extra config-based processing. Based off of
     * HTMLPurifier_HTMLDefinition.
-     * @param HTMLPurifier_Config $config
     * @todo Refactor duplicate elements into common class (probably using
     *       composition, not inheritance).
     */
-    protected function setupConfigStuff($config)
-    {
+    protected function setupConfigStuff($config) {
+
        // setup allowed elements
-        $support = "(for information on implementing this, see the " .
-            "support forums) ";
+        $support = "(for information on implementing this, see the ".
+                   "support forums) ";
        $allowed_properties = $config->get('CSS.AllowedProperties');
        if ($allowed_properties !== null) {
            foreach ($this->info as $name => $d) {
-                if (!isset($allowed_properties[$name])) {
-                    unset($this->info[$name]);
-                }
+                if(!isset($allowed_properties[$name])) unset($this->info[$name]);
                unset($allowed_properties[$name]);
            }
            // emit errors
@@ -468,6 +321,7 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
                }
            }
        }
+
    }
 }

--- a/library/HTMLPurifier/ChildDef.php
+++ b/library/HTMLPurifier/ChildDef.php
@@ -1,52 +1,48 @@
 <?php

 /**
- * Defines allowed child nodes and validates nodes against it.
+ * Defines allowed child nodes and validates tokens against it.
 */
 abstract class HTMLPurifier_ChildDef
 {
    /**
     * Type of child definition, usually right-most part of class name lowercase.
     * Used occasionally in terms of context.
-     * @type string
     */
    public $type;

    /**
-     * Indicates whether or not an empty array of children is okay.
+     * Bool that indicates whether or not an empty array of children is okay
     *
     * This is necessary for redundant checking when changes affecting
     * a child node may cause a parent node to now be disallowed.
-     * @type bool
     */
    public $allow_empty;

    /**
-     * Lookup array of all elements that this definition could possibly allow.
-     * @type array
+     * Lookup array of all elements that this definition could possibly allow
     */
    public $elements = array();

    /**
     * Get lookup of tag names that should not close this element automatically.
     * All other elements will do so.
-     * @param HTMLPurifier_Config $config HTMLPurifier_Config object
-     * @return array
     */
-    public function getAllowedElements($config)
-    {
+    public function getAllowedElements($config) {
        return $this->elements;
    }

    /**
     * Validates nodes according to definition and returns modification.
     *
-     * @param HTMLPurifier_Node[] $children Array of HTMLPurifier_Node
-     * @param HTMLPurifier_Config $config HTMLPurifier_Config object
-     * @param HTMLPurifier_Context $context HTMLPurifier_Context object
-     * @return bool|array true to leave nodes as is, false to remove parent node, array of replacement children
+     * @param $tokens_of_children Array of HTMLPurifier_Token
+     * @param $config HTMLPurifier_Config object
+     * @param $context HTMLPurifier_Context object
+     * @return bool true to leave nodes as is
+     * @return bool false to remove parent node
+     * @return array of replacement child tokens
     */
-    abstract public function validateChildren($children, $config, $context);
+    abstract public function validateChildren($tokens_of_children, $config, $context);
 }

 // vim: et sw=4 sts=4
--- a/library/HTMLPurifier/ChildDef/Chameleon.php
+++ b/library/HTMLPurifier/ChildDef/Chameleon.php
@@ -14,52 +14,33 @@ class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef

    /**
     * Instance of the definition object to use when inline. Usually stricter.
-     * @type HTMLPurifier_ChildDef_Optional
     */
    public $inline;

    /**
     * Instance of the definition object to use when block.
-     * @type HTMLPurifier_ChildDef_Optional
     */
    public $block;

-    /**
-     * @type string
-     */
    public $type = 'chameleon';

    /**
-     * @param array $inline List of elements to allow when inline.
-     * @param array $block List of elements to allow when block.
+     * @param $inline List of elements to allow when inline.
+     * @param $block List of elements to allow when block.
     */
-    public function __construct($inline, $block)
-    {
+    public function __construct($inline, $block) {
        $this->inline = new HTMLPurifier_ChildDef_Optional($inline);
-        $this->block = new HTMLPurifier_ChildDef_Optional($block);
+        $this->block  = new HTMLPurifier_ChildDef_Optional($block);
        $this->elements = $this->block->elements;
    }

-    /**
-     * @param HTMLPurifier_Node[] $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function validateChildren($children, $config, $context)
-    {
+    public function validateChildren($tokens_of_children, $config, $context) {
        if ($context->get('IsInline') === false) {
            return $this->block->validateChildren(
-                $children,
-                $config,
-                $context
-            );
+                $tokens_of_children, $config, $context);
        } else {
            return $this->inline->validateChildren(
-                $children,
-                $config,
-                $context
-            );
+                $tokens_of_children, $config, $context);
        }
    }
 }
--- a/library/HTMLPurifier/ChildDef/Custom.php
+++ b/library/HTMLPurifier/ChildDef/Custom.php
@@ -8,42 +8,28 @@
 */
 class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
 {
-    /**
-     * @type string
-     */
    public $type = 'custom';
-
-    /**
-     * @type bool
-     */
    public $allow_empty = false;
-
    /**
-     * Allowed child pattern as defined by the DTD.
-     * @type string
+     * Allowed child pattern as defined by the DTD
     */
    public $dtd_regex;
-
    /**
-     * PCRE regex derived from $dtd_regex.
-     * @type string
+     * PCRE regex derived from $dtd_regex
+     * @private
     */
    private $_pcre_regex;
-
    /**
     * @param $dtd_regex Allowed child pattern from the DTD
     */
-    public function __construct($dtd_regex)
-    {
+    public function __construct($dtd_regex) {
        $this->dtd_regex = $dtd_regex;
        $this->_compileRegex();
    }
-
    /**
     * Compiles the PCRE regex from a DTD regex ($dtd_regex to $_pcre_regex)
     */
-    protected function _compileRegex()
-    {
+    protected function _compileRegex() {
        $raw = str_replace(' ', '', $this->dtd_regex);
        if ($raw{0} != '(') {
            $raw = "($raw)";
@@ -71,31 +57,33 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef

        $this->_pcre_regex = $reg;
    }
-
-    /**
-     * @param HTMLPurifier_Node[] $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function validateChildren($children, $config, $context)
-    {
+    public function validateChildren($tokens_of_children, $config, $context) {
        $list_of_children = '';
        $nesting = 0; // depth into the nest
-        foreach ($children as $node) {
-            if (!empty($node->is_whitespace)) {
-                continue;
+        foreach ($tokens_of_children as $token) {
+            if (!empty($token->is_whitespace)) continue;
+
+            $is_child = ($nesting == 0); // direct
+
+            if ($token instanceof HTMLPurifier_Token_Start) {
+                $nesting++;
+            } elseif ($token instanceof HTMLPurifier_Token_End) {
+                $nesting--;
+            }
+
+            if ($is_child) {
+                $list_of_children .= $token->name . ',';
            }
-            $list_of_children .= $node->name . ',';
        }
        // add leading comma to deal with stray comma declarations
        $list_of_children = ',' . rtrim($list_of_children, ',');
        $okay =
            preg_match(
-                '/^,?' . $this->_pcre_regex . '$/',
+                '/^,?'.$this->_pcre_regex.'$/',
                $list_of_children
            );
-        return (bool)$okay;
+
+        return (bool) $okay;
    }
 }

--- a/library/HTMLPurifier/ChildDef/Empty.php
+++ b/library/HTMLPurifier/ChildDef/Empty.php
@@ -9,28 +9,10 @@
 */
 class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
 {
-    /**
-     * @type bool
-     */
    public $allow_empty = true;
-
-    /**
-     * @type string
-     */
    public $type = 'empty';
-
-    public function __construct()
-    {
-    }
-
-    /**
-     * @param HTMLPurifier_Node[] $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function validateChildren($children, $config, $context)
-    {
+    public function __construct() {}
+    public function validateChildren($tokens_of_children, $config, $context) {
        return array();
    }
 }
--- a/library/HTMLPurifier/ChildDef/List.php
+++ b/library/HTMLPurifier/ChildDef/List.php
@@ -2,83 +2,117 @@

 /**
 * Definition for list containers ul and ol.
- *
- * What does this do?  The big thing is to handle ol/ul at the top
- * level of list nodes, which should be handled specially by /folding/
- * them into the previous list node.  We generally shouldn't ever
- * see other disallowed elements, because the autoclose behavior
- * in MakeWellFormed handles it.
 */
 class HTMLPurifier_ChildDef_List extends HTMLPurifier_ChildDef
 {
-    /**
-     * @type string
-     */
    public $type = 'list';
-    /**
-     * @type array
-     */
    // lying a little bit, so that we can handle ul and ol ourselves
    // XXX: This whole business with 'wrap' is all a bit unsatisfactory
    public $elements = array('li' => true, 'ul' => true, 'ol' => true);
-
-    /**
-     * @param array $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function validateChildren($children, $config, $context)
-    {
+    public function validateChildren($tokens_of_children, $config, $context) {
        // Flag for subclasses
        $this->whitespace = false;

        // if there are no tokens, delete parent node
-        if (empty($children)) {
-            return false;
-        }
+        if (empty($tokens_of_children)) return false;

        // the new set of children
        $result = array();

+        // current depth into the nest
+        $nesting = 0;
+
        // a little sanity check to make sure it's not ALL whitespace
        $all_whitespace = true;

-        $current_li = false;
+        $seen_li = false;
+        $need_close_li = false;

-        foreach ($children as $node) {
-            if (!empty($node->is_whitespace)) {
-                $result[] = $node;
+        foreach ($tokens_of_children as $token) {
+            if (!empty($token->is_whitespace)) {
+                $result[] = $token;
                continue;
            }
            $all_whitespace = false; // phew, we're not talking about whitespace

-            if ($node->name === 'li') {
-                // good
-                $current_li = $node;
-                $result[] = $node;
-            } else {
-                // we want to tuck this into the previous li
-                // Invariant: we expect the node to be ol/ul
-                // ToDo: Make this more robust in the case of not ol/ul
-                // by distinguishing between existing li and li created
-                // to handle non-list elements; non-list elements should
-                // not be appended to an existing li; only li created
-                // for non-list. This distinction is not currently made.
-                if ($current_li === false) {
-                    $current_li = new HTMLPurifier_Node_Element('li');
-                    $result[] = $current_li;
-                }
-                $current_li->children[] = $node;
-                $current_li->empty = false; // XXX fascinating! Check for this error elsewhere ToDo
+            if ($nesting == 1 && $need_close_li) {
+                $result[] = new HTMLPurifier_Token_End('li');
+                $nesting--;
+                $need_close_li = false;
            }
+
+            $is_child = ($nesting == 0);
+
+            if ($token instanceof HTMLPurifier_Token_Start) {
+                $nesting++;
+            } elseif ($token instanceof HTMLPurifier_Token_End) {
+                $nesting--;
+            }
+
+            if ($is_child) {
+                if ($token->name === 'li') {
+                    // good
+                    $seen_li = true;
+                } elseif ($token->name === 'ul' || $token->name === 'ol') {
+                    // we want to tuck this into the previous li
+                    $need_close_li = true;
+                    $nesting++;
+                    if (!$seen_li) {
+                        // create a new li element
+                        $result[] = new HTMLPurifier_Token_Start('li');
+                    } else {
+                        // backtrack until </li> found
+                        while(true) {
+                            $t = array_pop($result);
+                            if ($t instanceof HTMLPurifier_Token_End) {
+                                // XXX actually, these invariants could very plausibly be violated
+                                // if we are doing silly things with modifying the set of allowed elements.
+                                // FORTUNATELY, it doesn't make a difference, since the allowed
+                                // elements are hard-coded here!
+                                if ($t->name !== 'li') {
+                                    trigger_error("Only li present invariant violated in List ChildDef", E_USER_ERROR);
+                                    return false;
+                                }
+                                break;
+                            } elseif ($t instanceof HTMLPurifier_Token_Empty) { // bleagh
+                                if ($t->name !== 'li') {
+                                    trigger_error("Only li present invariant violated in List ChildDef", E_USER_ERROR);
+                                    return false;
+                                }
+                                // XXX this should have a helper for it...
+                                $result[] = new HTMLPurifier_Token_Start('li', $t->attr, $t->line, $t->col, $t->armor);
+                                break;
+                            } else {
+                                if (!$t->is_whitespace) {
+                                    trigger_error("Only whitespace present invariant violated in List ChildDef", E_USER_ERROR);
+                                    return false;
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    // start wrapping (this doesn't precisely mimic
+                    // browser behavior, but what browsers do is kind of
+                    // hard to mimic in a standards compliant way
+                    // XXX Actually, this has no impact in practice,
+                    // because this gets handled earlier. Arguably,
+                    // we should rip out all of that processing
+                    $result[] = new HTMLPurifier_Token_Start('li');
+                    $nesting++;
+                    $seen_li = true;
+                    $need_close_li = true;
+                }
+            }
+            $result[] = $token;
        }
-        if (empty($result)) {
-            return false;
+        if ($need_close_li) {
+            $result[] = new HTMLPurifier_Token_End('li');
        }
+        if (empty($result)) return false;
        if ($all_whitespace) {
            return false;
        }
+        if ($tokens_of_children == $result) return true;
        return $result;
    }
 }
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .7.0
 .5.0