From 495164e9389936f3d58bc4647657fcf78fceca2e Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Wed, 27 Jun 2007 14:30:45 +0000
Subject: [PATCH] Release 2.0.1, merged in 1181 to HEAD.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/branches/strict@1255 48356398-32a2-884e-a903-53898d9a118a
---
 Doxyfile                                           |   2 +-
 INSTALL                                            |  53 ++++-
 NEWS                                               |  44 ++++
 TODO                                               |  38 +---
 VERSION                                            |   2 +-
 WHATSNEW                                           |  19 +-
 art/100cases.png                                   | Bin 0 -> 2732 bytes
 benchmarks/Lexer.php                               |   2 +-
 benchmarks/ProfileDirectLex.php                    |   2 -
 configdoc/generate.php                             |   5 +-
 configdoc/library/ConfigDoc.auto.php               |   1 -
 configdoc/library/ConfigDoc.php                    |   1 -
 configdoc/library/ConfigDoc/HTMLXSLTProcessor.php  |   2 +-
 configdoc/library/ConfigDoc/XMLSerializer.php      |   1 -
 .../ConfigDoc/XMLSerializer/ConfigSchema.php       |   7 +-
 .../library/ConfigDoc/XMLSerializer/Types.php      |   1 -
 configdoc/styles/plain.xsl                         |  22 +-
 docs/dev-advanced-api.html                         |   2 +-
 docs/dev-naming.html                               |   2 +-
 docs/dev-optimization.html                         |   2 +-
 docs/dev-progress.html                             |   2 +-
 docs/enduser-customize.html                        |   7 +-
 docs/enduser-id.html                               |   2 +-
 docs/enduser-slow.html                             |   2 +-
 docs/enduser-tidy.html                             |   7 +-
 docs/enduser-utf8.html                             |   2 +-
 docs/enduser-youtube.html                          |   2 +-
 docs/examples/basic.php                            |   1 -
 docs/index.html                                    |   2 +-
 docs/ref-devnetwork.html                           |   2 +-
 docs/ref-proprietary-tags.txt                      |   2 +-
 library/HTMLPurifier.auto.php                      |   1 -
 library/HTMLPurifier.func.php                      |   1 -
 library/HTMLPurifier.php                           |  24 +-
 library/HTMLPurifier/AttrCollections.php           |   1 -
 library/HTMLPurifier/AttrDef.php                   |   1 -
 library/HTMLPurifier/AttrDef/CSS.php               |   1 -
 library/HTMLPurifier/AttrDef/CSS/Background.php    |   1 -
 .../AttrDef/CSS/BackgroundPosition.php             |   1 -
 library/HTMLPurifier/AttrDef/CSS/Border.php        |   1 -
 library/HTMLPurifier/AttrDef/CSS/Color.php         |   1 -
 library/HTMLPurifier/AttrDef/CSS/Composite.php     |   1 -
 library/HTMLPurifier/AttrDef/CSS/Font.php          |   1 -
 library/HTMLPurifier/AttrDef/CSS/FontFamily.php    |   1 -
 library/HTMLPurifier/AttrDef/CSS/Length.php        |   1 -
 library/HTMLPurifier/AttrDef/CSS/ListStyle.php     |   1 -
 library/HTMLPurifier/AttrDef/CSS/Multiple.php      |   1 -
 library/HTMLPurifier/AttrDef/CSS/Number.php        |   1 -
 library/HTMLPurifier/AttrDef/CSS/Percentage.php    |   1 -
 .../HTMLPurifier/AttrDef/CSS/TextDecoration.php    |   1 -
 library/HTMLPurifier/AttrDef/CSS/URI.php           |   1 -
 library/HTMLPurifier/AttrDef/Enum.php              |   1 -
 library/HTMLPurifier/AttrDef/HTML/Bool.php         |   1 -
 library/HTMLPurifier/AttrDef/HTML/Color.php        |   1 -
 library/HTMLPurifier/AttrDef/HTML/FrameTarget.php  |   1 -
 library/HTMLPurifier/AttrDef/HTML/ID.php           |   1 -
 library/HTMLPurifier/AttrDef/HTML/Length.php       |   1 -
 library/HTMLPurifier/AttrDef/HTML/LinkTypes.php    |   1 -
 library/HTMLPurifier/AttrDef/HTML/MultiLength.php  |   1 -
 library/HTMLPurifier/AttrDef/HTML/Nmtokens.php     |   1 -
 library/HTMLPurifier/AttrDef/HTML/Pixels.php       |   1 -
 library/HTMLPurifier/AttrDef/Integer.php           |   1 -
 library/HTMLPurifier/AttrDef/Lang.php              |   1 -
 library/HTMLPurifier/AttrDef/Text.php              |   1 -
 library/HTMLPurifier/AttrDef/URI.php               |   2 +-
 library/HTMLPurifier/AttrDef/URI/Email.php         |   1 -
 .../HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php |   1 -
 library/HTMLPurifier/AttrDef/URI/Host.php          |   1 -
 library/HTMLPurifier/AttrDef/URI/IPv4.php          |   1 -
 library/HTMLPurifier/AttrDef/URI/IPv6.php          |   1 -
 library/HTMLPurifier/AttrTransform.php             |   1 -
 library/HTMLPurifier/AttrTransform/BdoDir.php      |   1 -
 library/HTMLPurifier/AttrTransform/BgColor.php     |   1 -
 library/HTMLPurifier/AttrTransform/BoolToCSS.php   |   1 -
 library/HTMLPurifier/AttrTransform/Border.php      |   1 -
 library/HTMLPurifier/AttrTransform/EnumToCSS.php   |   1 -
 library/HTMLPurifier/AttrTransform/ImgRequired.php |   1 -
 library/HTMLPurifier/AttrTransform/ImgSpace.php    |   1 -
 library/HTMLPurifier/AttrTransform/Lang.php        |   1 -
 library/HTMLPurifier/AttrTransform/Length.php      |   1 -
 library/HTMLPurifier/AttrTransform/Name.php        |   1 -
 library/HTMLPurifier/AttrTypes.php                 |   2 +-
 library/HTMLPurifier/AttrValidator.php             |  68 ++++--
 library/HTMLPurifier/CSSDefinition.php             |   1 -
 library/HTMLPurifier/ChildDef.php                  |   7 +-
 library/HTMLPurifier/ChildDef/Chameleon.php        |   2 +-
 library/HTMLPurifier/ChildDef/Custom.php           |   7 +-
 library/HTMLPurifier/ChildDef/Empty.php            |   1 -
 library/HTMLPurifier/ChildDef/Optional.php         |   1 -
 library/HTMLPurifier/ChildDef/Required.php         |   3 +-
 library/HTMLPurifier/ChildDef/StrictBlockquote.php |   1 -
 library/HTMLPurifier/ChildDef/Table.php            |   3 +-
 library/HTMLPurifier/Config.php                    |  86 +++++--
 library/HTMLPurifier/ConfigDef.php                 |   1 -
 library/HTMLPurifier/ConfigDef/Directive.php       |   7 +-
 library/HTMLPurifier/ConfigDef/DirectiveAlias.php  |   1 -
 library/HTMLPurifier/ConfigDef/Namespace.php       |   1 -
 library/HTMLPurifier/ConfigSchema.php              |   5 +-
 library/HTMLPurifier/ContentSets.php               |   1 -
 library/HTMLPurifier/Context.php                   |  16 +-
 library/HTMLPurifier/Definition.php                |   1 -
 library/HTMLPurifier/DefinitionCache.php           |  21 +-
 library/HTMLPurifier/DefinitionCache/Decorator.php |   4 -
 .../DefinitionCache/Decorator/Cleanup.php          |   1 -
 .../DefinitionCache/Decorator/Memory.php           |   1 -
 .../DefinitionCache/Decorator/Template.php.in      |   1 -
 library/HTMLPurifier/DefinitionCache/Null.php      |   1 -
 .../HTMLPurifier/DefinitionCache/Serializer.php    |  73 +++++-
 library/HTMLPurifier/DefinitionCacheFactory.php    |  12 +-
 library/HTMLPurifier/Doctype.php                   |  21 +-
 library/HTMLPurifier/DoctypeRegistry.php           |  13 +-
 library/HTMLPurifier/ElementDef.php                |  12 +-
 library/HTMLPurifier/Encoder.php                   |   1 -
 library/HTMLPurifier/EntityLookup.php              |   1 -
 library/HTMLPurifier/EntityParser.php              |   1 -
 library/HTMLPurifier/Error.php                     |   1 -
 library/HTMLPurifier/ErrorCollector.php            |  97 +++++---
 library/HTMLPurifier/Filter.php                    |   1 -
 library/HTMLPurifier/Filter/YouTube.php            |   1 -
 library/HTMLPurifier/Generator.php                 |  39 +++-
 library/HTMLPurifier/HTMLDefinition.php            |   6 +-
 library/HTMLPurifier/HTMLModule.php                |   1 -
 library/HTMLPurifier/HTMLModule/Bdo.php            |   1 -
 .../HTMLPurifier/HTMLModule/CommonAttributes.php   |   1 -
 library/HTMLPurifier/HTMLModule/Edit.php           |   1 -
 library/HTMLPurifier/HTMLModule/Hypertext.php      |   1 -
 library/HTMLPurifier/HTMLModule/Image.php          |   1 -
 library/HTMLPurifier/HTMLModule/Legacy.php         |   1 -
 library/HTMLPurifier/HTMLModule/List.php           |   4 +-
 .../HTMLModule/NonXMLCommonAttributes.php          |   1 -
 library/HTMLPurifier/HTMLModule/Presentation.php   |   1 -
 library/HTMLPurifier/HTMLModule/Scripting.php      |  10 +-
 library/HTMLPurifier/HTMLModule/StyleAttribute.php |   1 -
 library/HTMLPurifier/HTMLModule/Tables.php         |   6 +-
 library/HTMLPurifier/HTMLModule/Target.php         |   1 -
 library/HTMLPurifier/HTMLModule/Text.php           |   9 +-
 library/HTMLPurifier/HTMLModule/Tidy.php           |   2 +-
 .../HTMLPurifier/HTMLModule/Tidy/Proprietary.php   |   1 -
 library/HTMLPurifier/HTMLModule/Tidy/XHTML.php     |   1 -
 .../HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php |   1 -
 .../HTMLPurifier/HTMLModule/Tidy/XHTMLStrict.php   |   1 -
 .../HTMLModule/XMLCommonAttributes.php             |   1 -
 library/HTMLPurifier/HTMLModuleManager.php         |  50 +++-
 library/HTMLPurifier/IDAccumulator.php             |   1 -
 library/HTMLPurifier/Injector.php                  |  85 +++++++
 library/HTMLPurifier/Injector/AutoParagraph.php    | 244 ++++++++++++++++++++
 library/HTMLPurifier/Injector/Linkify.php          |  52 +++++
 library/HTMLPurifier/Injector/PurifierLinkify.php  |  62 +++++
 library/HTMLPurifier/Language.php                  |  95 +++++++-
 .../HTMLPurifier/Language/classes/en-x-test.php    |   1 -
 .../HTMLPurifier/Language/messages/en-x-test.php   |   3 +-
 library/HTMLPurifier/Language/messages/en.php      |  71 ++++--
 library/HTMLPurifier/LanguageFactory.php           |  26 ++-
 library/HTMLPurifier/Lexer.php                     |  36 ++-
 library/HTMLPurifier/Lexer/DOMLex.php              |  20 +-
 library/HTMLPurifier/Lexer/DirectLex.php           |  94 ++++++--
 library/HTMLPurifier/Lexer/PEARSax3.php            |   1 -
 library/HTMLPurifier/PercentEncoder.php            |   1 -
 library/HTMLPurifier/Printer.php                   |  11 +-
 library/HTMLPurifier/Printer/CSSDefinition.php     |   1 -
 library/HTMLPurifier/Printer/ConfigForm.php        |  58 +++--
 library/HTMLPurifier/Printer/HTMLDefinition.php    |  89 ++++++--
 library/HTMLPurifier/Strategy.php                  |   1 -
 library/HTMLPurifier/Strategy/Composite.php        |   1 -
 library/HTMLPurifier/Strategy/Core.php             |   1 -
 library/HTMLPurifier/Strategy/FixNesting.php       |  31 ++-
 library/HTMLPurifier/Strategy/MakeWellFormed.php   | 251 +++++++++++++++-----
 .../Strategy/RemoveForeignElements.php             |  60 ++++-
 .../HTMLPurifier/Strategy/ValidateAttributes.php   |   9 +-
 library/HTMLPurifier/TagTransform.php              |   1 -
 library/HTMLPurifier/TagTransform/Font.php         |   4 +-
 library/HTMLPurifier/TagTransform/Simple.php       |   1 -
 library/HTMLPurifier/Token.php                     |  30 +--
 library/HTMLPurifier/TokenFactory.php              |   1 -
 library/HTMLPurifier/URIScheme.php                 |   1 -
 library/HTMLPurifier/URIScheme/ftp.php             |   1 -
 library/HTMLPurifier/URIScheme/http.php            |   1 -
 library/HTMLPurifier/URIScheme/https.php           |   1 -
 library/HTMLPurifier/URIScheme/mailto.php          |   1 -
 library/HTMLPurifier/URIScheme/news.php            |   1 -
 library/HTMLPurifier/URIScheme/nntp.php            |   1 -
 library/HTMLPurifier/URISchemeRegistry.php         |   2 +-
 maintenance/flush-htmldefinition-cache.php         |   1 -
 maintenance/generate-entity-file.php               |   1 -
 package.php                                        |   1 -
 release1-update.php                                |   1 -
 release2-strict.php                                |   1 -
 release3-tag.php                                   |   1 -
 smoketests/all.php                                 |   2 +-
 smoketests/attrTransform.php                       |   2 +-
 smoketests/attrTransform.xml                       |   2 +-
 smoketests/basic.php                               |   2 +-
 smoketests/basic/allElements.css                   |   2 +-
 smoketests/basic/allElements.html                  |   2 +-
 smoketests/basic/legacy.html                       |   2 +-
 smoketests/common.php                              |   1 -
 smoketests/configForm.php                          |   4 +-
 smoketests/loadFunc.php                            |   2 +-
 smoketests/preserveYouTube.php                     |   2 +-
 smoketests/printDefinition.php                     |  17 +-
 smoketests/testSchema.php                          |  83 ++++---
 smoketests/utf8.php                                |   2 +-
 smoketests/variableWidthAttack.php                 |   2 +-
 smoketests/xssAttacks.php                          |   2 +-
 svn.php                                            |   1 -
 test-settings.sample.php                           |   1 -
 tests/Debugger.php                                 |  14 +-
 tests/HTMLPurifier/AttrCollectionsTest.php         |   7 +-
 .../AttrDef/CSS/BackgroundPositionTest.php         |   1 -
 tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php  |   1 -
 tests/HTMLPurifier/AttrDef/CSS/BorderTest.php      |   1 -
 tests/HTMLPurifier/AttrDef/CSS/ColorTest.php       |   1 -
 tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php   |  13 +-
 tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php  |   1 -
 tests/HTMLPurifier/AttrDef/CSS/FontTest.php        |   1 -
 tests/HTMLPurifier/AttrDef/CSS/LengthTest.php      |   1 -
 tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php   |   1 -
 tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php    |   1 -
 tests/HTMLPurifier/AttrDef/CSS/NumberTest.php      |   1 -
 tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php  |   1 -
 .../AttrDef/CSS/TextDecorationTest.php             |   1 -
 tests/HTMLPurifier/AttrDef/CSS/URITest.php         |   1 -
 tests/HTMLPurifier/AttrDef/CSSTest.php             |   1 -
 tests/HTMLPurifier/AttrDef/EnumTest.php            |   1 -
 tests/HTMLPurifier/AttrDef/HTML/BoolTest.php       |   1 -
 tests/HTMLPurifier/AttrDef/HTML/ColorTest.php      |   1 -
 .../HTMLPurifier/AttrDef/HTML/FrameTargetTest.php  |   1 -
 tests/HTMLPurifier/AttrDef/HTML/IDTest.php         |   1 -
 tests/HTMLPurifier/AttrDef/HTML/LengthTest.php     |   1 -
 tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php  |   1 -
 .../HTMLPurifier/AttrDef/HTML/MultiLengthTest.php  |   1 -
 tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php   |   1 -
 tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php     |   1 -
 tests/HTMLPurifier/AttrDef/IntegerTest.php         |   1 -
 tests/HTMLPurifier/AttrDef/LangTest.php            |   1 -
 tests/HTMLPurifier/AttrDef/TextTest.php            |   1 -
 .../AttrDef/URI/Email/SimpleCheckTest.php          |   1 -
 tests/HTMLPurifier/AttrDef/URI/EmailHarness.php    |   1 -
 tests/HTMLPurifier/AttrDef/URI/HostTest.php        |   1 -
 tests/HTMLPurifier/AttrDef/URI/IPv6Test.php        |   1 -
 tests/HTMLPurifier/AttrDef/URITest.php             |   6 +-
 tests/HTMLPurifier/AttrDefHarness.php              |   1 -
 tests/HTMLPurifier/AttrDefTest.php                 |   1 -
 tests/HTMLPurifier/AttrTransform/BdoDirTest.php    |   1 -
 tests/HTMLPurifier/AttrTransform/BgColorTest.php   |   1 -
 tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php |   1 -
 tests/HTMLPurifier/AttrTransform/BorderTest.php    |   1 -
 tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php |   1 -
 .../HTMLPurifier/AttrTransform/ImgRequiredTest.php |   1 -
 tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php  |   1 -
 tests/HTMLPurifier/AttrTransform/LangTest.php      |   1 -
 tests/HTMLPurifier/AttrTransform/LengthTest.php    |   1 -
 tests/HTMLPurifier/AttrTransform/NameTest.php      |   1 -
 tests/HTMLPurifier/AttrTransformHarness.php        |   1 -
 tests/HTMLPurifier/AttrTransformTest.php           |   1 -
 tests/HTMLPurifier/AttrTypesTest.php               |   1 -
 tests/HTMLPurifier/AttrValidator_ErrorsTest.php    |  49 ++++
 tests/HTMLPurifier/ChildDef/ChameleonTest.php      |   1 -
 tests/HTMLPurifier/ChildDef/CustomTest.php         |  11 +-
 tests/HTMLPurifier/ChildDef/OptionalTest.php       |   1 -
 tests/HTMLPurifier/ChildDef/RequiredTest.php       |   1 -
 .../HTMLPurifier/ChildDef/StrictBlockquoteTest.php |   8 +-
 tests/HTMLPurifier/ChildDef/TableTest.php          |   6 +-
 tests/HTMLPurifier/ChildDefHarness.php             |   2 +-
 tests/HTMLPurifier/ConfigSchemaTest.php            |   1 -
 tests/HTMLPurifier/ConfigTest.php                  |  88 ++++++-
 tests/HTMLPurifier/ContextTest.php                 |   9 +-
 .../DefinitionCache/Decorator/CleanupTest.php      |   1 -
 .../DefinitionCache/Decorator/MemoryTest.php       |   1 -
 .../DefinitionCache/DecoratorHarness.php           |   3 +-
 .../HTMLPurifier/DefinitionCache/DecoratorTest.php |   3 +-
 .../DefinitionCache/SerializerTest.php             |  33 ++-
 tests/HTMLPurifier/DefinitionCacheFactoryTest.php  |   1 -
 tests/HTMLPurifier/DefinitionCacheHarness.php      |   3 +-
 tests/HTMLPurifier/DefinitionCacheTest.php         |  23 +-
 tests/HTMLPurifier/DefinitionTest.php              |   1 -
 tests/HTMLPurifier/DoctypeRegistryTest.php         |   1 -
 tests/HTMLPurifier/ElementDefTest.php              |  13 --
 tests/HTMLPurifier/EncoderTest.php                 |   1 -
 tests/HTMLPurifier/EntityLookupTest.php            |   1 -
 tests/HTMLPurifier/EntityParserTest.php            |   1 -
 tests/HTMLPurifier/ErrorCollectorEMock.php         |  46 ++++
 tests/HTMLPurifier/ErrorCollectorTest.php          | 183 +++++++++++----
 tests/HTMLPurifier/ErrorsHarness.php               |  31 +++
 tests/HTMLPurifier/GeneratorTest.php               |  26 ++-
 tests/HTMLPurifier/HTMLDefinitionTest.php          |   1 -
 tests/HTMLPurifier/HTMLModule/ScriptingTest.php    |  16 +-
 tests/HTMLPurifier/HTMLModule/TidyTest.php         |   3 +-
 tests/HTMLPurifier/HTMLModuleHarness.php           |   1 -
 tests/HTMLPurifier/HTMLModuleManagerTest.php       |   7 +-
 tests/HTMLPurifier/HTMLModuleTest.php              |   1 -
 tests/HTMLPurifier/Harness.php                     |  15 +-
 tests/HTMLPurifier/IDAccumulatorTest.php           |   1 -
 tests/HTMLPurifier/Injector/AutoParagraphTest.php  | 253 +++++++++++++++++++++
 tests/HTMLPurifier/Injector/LinkifyTest.php        |  38 ++++
 .../HTMLPurifier/Injector/PurifierLinkifyTest.php  |  42 ++++
 tests/HTMLPurifier/InjectorHarness.php             |  15 ++
 tests/HTMLPurifier/LanguageFactoryTest.php         |  14 +-
 tests/HTMLPurifier/LanguageTest.php                | 104 ++++++---
 tests/HTMLPurifier/Lexer/DirectLexTest.php         |  25 +-
 tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php  |  55 +++++
 tests/HTMLPurifier/LexerTest.php                   |  30 ++-
 tests/HTMLPurifier/PercentEncoderTest.php          |   1 -
 tests/HTMLPurifier/SimpleTest/Reporter.php         |   1 -
 tests/HTMLPurifier/Strategy/CompositeTest.php      |   7 +-
 tests/HTMLPurifier/Strategy/CoreTest.php           |   5 +-
 tests/HTMLPurifier/Strategy/ErrorsHarness.php      |  19 ++
 tests/HTMLPurifier/Strategy/FixNestingTest.php     |   6 +-
 .../Strategy/FixNesting_ErrorsTest.php             |  38 ++++
 tests/HTMLPurifier/Strategy/MakeWellFormedTest.php |  45 +++-
 .../Strategy/MakeWellFormed_ErrorsTest.php         |  56 +++++
 .../Strategy/RemoveForeignElementsTest.php         |  13 +-
 .../Strategy/RemoveForeignElements_ErrorsTest.php  |  59 +++++
 .../Strategy/ValidateAttributesTest.php            |   2 +-
 tests/HTMLPurifier/StrategyHarness.php             |   1 -
 tests/HTMLPurifier/TagTransformTest.php            |   1 -
 tests/HTMLPurifier/TokenFactoryTest.php            |   1 -
 tests/HTMLPurifier/TokenTest.php                   |   1 -
 tests/HTMLPurifier/URISchemeRegistryTest.php       |   7 +-
 tests/HTMLPurifier/URISchemeTest.php               |   1 -
 tests/HTMLPurifierTest.php                         |  40 +++-
 tests/generate_mock_once.func.php                  |   1 -
 tests/index.php                                    |   2 +-
 tests/path2class.func.php                          |   1 -
 tests/tally_errors.func.php                        |   1 -
 tests/test_files.php                               |   9 +-
 326 files changed, 3097 insertions(+), 898 deletions(-)
 rewrite WHATSNEW (100%)
 create mode 100644 art/100cases.png
 create mode 100644 library/HTMLPurifier/Injector.php
 create mode 100644 library/HTMLPurifier/Injector/AutoParagraph.php
 create mode 100644 library/HTMLPurifier/Injector/Linkify.php
 create mode 100644 library/HTMLPurifier/Injector/PurifierLinkify.php
 rewrite library/HTMLPurifier/Language/messages/en.php (61%)
 rewrite smoketests/testSchema.php (70%)
 create mode 100644 tests/HTMLPurifier/AttrValidator_ErrorsTest.php
 create mode 100644 tests/HTMLPurifier/ErrorCollectorEMock.php
 rewrite tests/HTMLPurifier/ErrorCollectorTest.php (65%)
 create mode 100644 tests/HTMLPurifier/ErrorsHarness.php
 create mode 100644 tests/HTMLPurifier/Injector/AutoParagraphTest.php
 create mode 100644 tests/HTMLPurifier/Injector/LinkifyTest.php
 create mode 100644 tests/HTMLPurifier/Injector/PurifierLinkifyTest.php
 create mode 100644 tests/HTMLPurifier/InjectorHarness.php
 rewrite tests/HTMLPurifier/LanguageTest.php (61%)
 create mode 100644 tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php
 create mode 100644 tests/HTMLPurifier/Strategy/ErrorsHarness.php
 create mode 100644 tests/HTMLPurifier/Strategy/FixNesting_ErrorsTest.php
 create mode 100644 tests/HTMLPurifier/Strategy/MakeWellFormed_ErrorsTest.php
 create mode 100644 tests/HTMLPurifier/Strategy/RemoveForeignElements_ErrorsTest.php

diff --git a/Doxyfile b/Doxyfile
index c96f6773..8ecf65ae 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = HTML Purifier
-PROJECT_NUMBER         = 2.0.0
+PROJECT_NUMBER         = 2.0.1
 OUTPUT_DIRECTORY       = "C:/Documents and Settings/Edward/My Documents/My Webs/htmlpurifier/docs/doxygen"
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
diff --git a/INSTALL b/INSTALL
index f8f137aa..1d68c0c9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -49,7 +49,7 @@ be standards compliant.  HTML Purifier can deal with these doctypes:
 * XHTML 1.0 Strict
 * HTML 4.01 Transitional
 * HTML 4.01 Strict
-* XHTML 1.1 sans Ruby
+* XHTML 1.1 (sans Ruby)
 
 ...and these character encodings:
 
@@ -117,8 +117,9 @@ websites):
 Note that HTML Purifier's support for non-Unicode encodings is crippled by the
 fact that any character not supported by that encoding will be silently
 dropped, EVEN if it is ampersand escaped.  If you want to work around
-this, you are welcome to read docs/enduser-utf8.html for a workaround,
-but please be cognizant of the issues the "solution" creates.
+this, you are welcome to read docs/enduser-utf8.html for a fix,
+but please be cognizant of the issues the "solution" creates (for this
+reason, I do not include the solution in this document).
 
 
 
@@ -148,7 +149,9 @@ Other supported doctypes include:
 There are more configuration directives which can be read about
 here: <http://htmlpurifier.org/live/configdoc/plain.html>  They're a bit boring,
 but they can help out for those of you who like to exert maximum control over
-your code.
+your code.  Some of the more interesting ones are configurable at the
+demo <http://htmlpurifier.org/demo.php> and are well worth looking into
+for your own system.
 
 
 
@@ -165,13 +168,15 @@ The interface is mind-numbingly simple:
     $clean_html = $purifier->purify( $dirty_html );
 
 That's it!  For more examples, check out docs/examples/ (they aren't very
-different though).  Also, SLOW gives advice on what to do if HTML Purifier
-is slowing down your application.
+different though).  Also, docs/enduser-slow.html gives advice on what to
+do if HTML Purifier is slowing down your application.
 
 
 
 6.   Quick install
 
+First, make sure library/HTMLPurifier/DefinitionCache/Serializer is
+writable by the webserver (see Section 7: Caching below for details).
 If your website is in UTF-8 and XHTML Transitional, use this code:
 
 <?php
@@ -198,6 +203,36 @@ If your website is in a different encoding or doctype, use this code:
 
 7. Caching
 
-HTML Purifier generates some cache files to speed up its execution. For
-maximum performance, make sure that library/HTMLPurifier/DefinitionCache/Serializer
-is writeable by the webserver.
\ No newline at end of file
+HTML Purifier generates some cache files (generally one or two) to speed up
+its execution. For maximum performance, make sure that
+library/HTMLPurifier/DefinitionCache/Serializer is writeable by the webserver.
+
+If you are in the library/ folder of HTML Purifier, you can set the
+appropriate permissions using:
+
+    chmod -R 0755 HTMLPurifier/DefinitionCache/Serializer
+
+If the above command doesn't work, you may need to assign write permissions
+to all. This may be necessary if your webserver runs as nobody, but is
+not recommended since it means any other user can write files in the
+directory. Use:
+
+    chmod -R 0777 HTMLPurifier/DefinitionCache/Serializer
+
+You can also chmod files via your FTP client; this option
+is usually accessible by right clicking the corresponding directory and
+then selecting "chmod" or "file permissions".
+
+Starting with 2.0.1, HTML Purifier will generate friendly error messages
+that will tell you exactly what you have to chmod the directory to, if in doubt,
+follow its advice.
+
+If you are unable or unwilling to give write permissions to the cache
+directory, you can either disable the cache (and suffer a performance
+hit):
+
+    $config->set('Core', 'DefinitionCache', null);
+
+Or move the cache directory somewhere else (no trailing slash):
+
+    $config->set('Cache', 'SerializerPath', '/home/user/absolute/path');
diff --git a/NEWS b/NEWS
index b13db9b2..19b70259 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,50 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
     . Internal change
 ==========================
 
+2.0.1, released 2007-06-27
+! Tag auto-closing now based on a ChildDef heuristic rather than a
+  manually set auto_close array; some behavior may change
+! Experimental AutoFormat functionality added: auto-paragraph and
+  linkify your HTML input by setting %AutoFormat.AutoParagraph and
+  %AutoFormat.Linkify to true
+! Newlines normalized internally, and then converted back to the
+  value of PHP_EOL. If this is not desired, set your newline format
+  using %Output.Newline.
+! Beta error collection, messages are implemented for the most generic
+  cases involving Lexing or Strategies
+- Clean up special case code for <script> tags
+- Reorder includes for DefinitionCache decorators, fixes a possible
+  missing class error
+- Fixed bug where manually modified definitions were not saved via cache
+  (mostly harmless, except for the fact that it would be a little slower)
+- Configuration objects with different serials do not clobber each
+  others when revision numbers are unequal
+- Improve Serializer DefinitionCache directory permissions checks
+- DefinitionCache no longer throws errors when it encounters old
+  serial files that do not conform to the current style
+- Stray xmlns attributes removed from configuration documentation
+- configForm.php smoketest no longer has XSS vulnerability due to
+  unescaped print_r output
+- Printer adheres to configuration's directives on output format
+- Fix improperly named form field in ConfigForm printer
+. Rewire some test-cases to swallow errors rather than expect them
+. HTMLDefinition printer updated with some of the new attributes
+. DefinitionCache keys reordered to reflect precedence: version number,
+  hash, then revision number
+. %Core.DefinitionCache renamed to %Cache.DefinitionImpl
+. Interlinking in configuration documentation added using
+  Injector_PurifierLinkify
+. Directives now keep track of aliases to themselves
+. Error collector now requires a severity to be passed, use PHP's internal
+  error constants for this
+. HTMLPurifier_Config::getAllowedDirectivesForForm implemented, allows
+  much easier selective embedding of configuration values
+. Doctype objects now accept public and system DTD identifiers
+. %HTML.Doctype is now constrained by specific values, to specify a custom
+  doctype use new %HTML.CustomDoctype
+. ConfigForm truncates long directives to keep the form small, and does
+  not re-output namespaces
+
 2.0.0, released 2007-06-20
 # Completely refactored HTMLModuleManager, decentralizing safety
   information
diff --git a/TODO b/TODO
index 632273eb..5bce0a60 100644
--- a/TODO
+++ b/TODO
@@ -7,31 +7,17 @@ TODO List
 ==========================
 
 2.1 release [Refactor, refactor!]
-
-
-
-
-
-
-
-
  # URI validation routines tighter (see docs/dev-code-quality.html) (COMPLEX)
  # Advanced URI filtering schemes (see docs/proposal-new-directives.txt)
+ # Ruby support
  - Configuration profiles: predefined directives set with one func call
  - Implement IDREF support (harder than it seems, since you cannot have
    IDREFs to non-existent IDs)
  - Allow non-ASCII characters in font names
- - Genericize special cases in RemoveForeignElements
 
 2.2 release [Error'ed]
  # Error logging for filtering/cleanup procedures
-    - Requires I18N facilities to be created first (COMPLEX)
  - XSS-attempt detection
- - More fine-grained control over escaping behavior
-
-
-
-
 
 2.3 release [Do What I Mean, Not What I Say]
  # Additional support for poorly written HTML
@@ -56,14 +42,9 @@ TODO List
    AttrDef class)
  # More control over allowed CSS properties (maybe modularize it in the
    same fashion!)
- # Formatters for plaintext (COMPLEX)
-    - Auto-paragraphing (be sure to leverage fact that we know when things
-      shouldn't be paragraphed, such as lists and tables).
-    - Linkify URLs
+ # Formatters for plaintext
     - Smileys
-    - Linkification for HTML Purifier docs: notably configuration and classes
- - Allow tags to be "armored", an internal flag that protects them
-   from validation and passes them out unharmed
+ - Standardize token armor for all areas of processing
  - Fixes for Firefox's inability to handle COL alignment props (Bug 915)
  - Automatically add non-breaking spaces to empty table cells when
    empty-cells:show is applied to have compatibility with Internet Explorer
@@ -75,12 +56,13 @@ TODO List
     - Hooks for adding custom processors to custom namespaced tags and
       attributes, offer default implementation
     - Lots of documentation and samples
- - XHTML 1.1 support
 
 Ongoing
  - Lots of profiling, make it faster!
  - Plugins for major CMSes (COMPLEX)
     - WordPress (mostly written, needs beta-testing)
+    - phpBB
+    - Phorum
     - eFiction
     - more! (look for ones that use WYSIWYGs)
  - Complete basic smoketests
@@ -89,7 +71,8 @@ Unknown release (on a scratch-an-itch basis)
  ? Semi-lossy dumb alternate character encoding transfor
  ? Have 'lang' attribute be checked against official lists, achieved by
    encoding all characters that have string entity equivalents
- - Explain how to use HTML Purifier in non-PHP languages
+ - Explain how to use HTML Purifier in non-PHP languages / create
+   a simple command line stub
  - Abstract ChildDef_BlockQuote to work with all elements that only
    allow blocks in them, required or optional
  - Reorganize Unit Tests
@@ -97,10 +80,11 @@ Unknown release (on a scratch-an-itch basis)
  - Reorganize configuration directives (Create more namespaces! Get messy!)
 
 Requested
- ? Native content compression, whitespace stripping (don't rely on Tidy, make
-   sure we don't remove from <pre> or related tags)
 
 Wontfix
  - Non-lossy smart alternate character encoding transformations (unless
    patch provided)
- - Pretty-printing HTML, users can use Tidy on the output on entire page
\ No newline at end of file
+ - Pretty-printing HTML, users can use Tidy on the output on entire page
+ - Native content compression, whitespace stripping (don't rely on Tidy, make
+   sure we don't remove from <pre> or related tags): use gzip if this is
+   really important
diff --git a/VERSION b/VERSION
index 359a5b95..10bf840e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0
\ No newline at end of file
+2.0.1
\ No newline at end of file
diff --git a/WHATSNEW b/WHATSNEW
dissimilarity index 100%
index 0a971637..2f0b2d9d 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,7 +1,12 @@
-HTML Purifier 2.0 is the culmination of two major architectural changes. 
-The first is Tidy, which enables HTML Purifier to both natively support 
-deprecated elements and also convert them to standards-compliant 
-alternatives. The second is the Advanced API, which enables users to 
-create new elements and attributes with ease. Keeping in line with a 
-commitment to high quality, there are also five esoteric bug-fixes and a 
-plethora of subtle improvements that enhance the library. 
+The 2.0.1 release introduces a number of stability and usability fixes,
+as well as a number of (disabled by default) experimental features.  The
+security-minded should note that a reflected XSS vulnerability was patched
+in smoketests/configForm.php; if you cannot upgrade immediately, please
+delete that file (if that directory is not publically accessible, there
+is no security risk).  The maintenance changes include more helpful file
+permissions errors, internal newline normalization, reordered includes
+to prevent a missing class definition in some setups, and better cache
+revision and id handling.  The two experimental features are auto-formatting
+(auto-paragraphing and linkification) and error collection, these can
+be enabled with %AutoFormat.AutoParagraph, %AutoFormat.Linkify and
+%Core.CollectErrors respectively.
diff --git a/art/100cases.png b/art/100cases.png
new file mode 100644
index 0000000000000000000000000000000000000000..03103a07e5b19dca4547b9637b10508479722b99
GIT binary patch
literal 2732
zcwW6$Sv1>;8vj#TMb%ccNktX4w6<7^5}hh-sak?)VsB#?u|=%Y&Y)^*i=wu+mYLX>
ziArM|qPVuJme^CZ)f%K3gv6NpHcxZUeYg+ba(?Gq&v(x6e2G?;W@q>>@B;vF=I$L6
z8vx*nJNCo)xR3R(>Qdlib2{*jV=w>+QT`IHOcfyz0Ps8CHMt27&)b-J;01Ev?%E!*
z@iKQbQ5;u7s+0D_Yjkt(*FAaBd5v`Sa|zD^IB4Qc@+Cw08cAM{yduFk>93Q&j0o?)
z0J~dT$Y|z%f2+Fg#`6x2c6-@<Nt7(3_T37RZP>K5(R+wzptb5;*6GW_3pu*<!M<<H
zx<$1%ThTNwK;Uq-#sC0XWzvB0r#HA=1$Ov;yw-ggX!suiSr6$AI$e@KuDQ9H@+wX^
z-EN6^{$Dy4z$qmUX~S5~G&aw)=p~|#M)yRNI8@q`XR3}Kx>llQH^RzCeHs)1aMKSB
zbcR}1uWWLBhg&Ve!fU>NC2{gS+74w`V&fegZ0irV?QvDl&dbvx;6sv<l6E&|Ksc2)
zk=Ku7Mgl%8_IY`FUZHa2$YC1~-MR0HiHR{IqAS=U7g9b=PEK-Z@qpbNckV>b8-{Pm
zv<^s-!nfVac0332&f7jH4kJ6MW_8W*2QHMfIIl4yY;A2<U)h(3&b9M8fk@8PalLZ(
zq9i-#$&EkO*Zok#Kwn7##1OwD7swlO#9<$@(q*PV9M^Wfwr8Ighd7*=YHB%Lxy0tK
zDhi2&?th^vH#=iIJc>}NNxyLE=;*ZHk`g=#0)gJQt*-i1Q;$2YqWpY)RfJ9Fx&%a3
zxVB<rE=)~L6)f+!K(b{=eYE@S-$<CPSS;OZ`0(L&j}LM6fWu;a+^co2?$u<+xIC(o
zs$RxxKE2IF4Het<ahC_+E3;BnYtJP+=G3=@z(NVN{^J>Dn#qqWLdZ@e6QeP?TlWGK
zlX7(Z5vPGmouCdz6S`h0wqn$06=|K1;+d*ZNaNN}hQd`RW@m-2iUcd(?Bnmx)v4h5
z@x|AaxsO%)r&mMt<8Qh?kmgl|c4&7CJRl+na8anzwlN7m9G?jYThKk}8yik7QI65V
z*oX-Iz_X8WIBHEp$Iki$w1e9xNc%#{#KgqtsNI!CvrrP88+<vQWLG{q0y{7Eu=4f8
z%qFt<TW<}dXWtq%YlQw{>!Pn-mj-6CSQL0_%_Er5(O6*(+rv52E(tZb`AW-=fg8;f
zLiF?D=M?O@jnzLoPfbiXB9Tdl(rImld$4HMNO60I=$*meUEiw3u8mz|-imMw4u;wl
z{nc7P;oUi1y`3VXJ^Jp!6U{dg&=7^bCeeMarhoeowL;5Ioc8k?|IJMv_<3P}XmfLO
zwA^8SOd_eXjrpt}M;y#I_=O|2XP(vEY=~`j3_skfjcTr`k-@y?Me9fWRbP_TC^|^@
zE(rZjiz=|<n+6a4mR$zL+SrNi#W(m6l}(rN1uWyA5Fq^S!)QL0K=MZ#J+eSD+)JkR
zc-_sJDIX%GdK+C&NG#rx&t-|&?3v3f$|s{UNn2EqcR`<ciYbR+Mu6KO9el++ByB;=
z9#h(`;h=znJnWg)@zq>e!bQT0!+tuKlL(92%xtZ9YZ0RT4gF|a%M27XGwpGCCXPH4
z@Bvv(y{$;D0_hP}LiFp(m`tYeujlQ#+jiL+F&e@^ar+UDr%hr(1VFwp1N?4EbJg(T
z{~ti70ak^-H}0qPQ-C_`pUCKMfRs|&p*$?eZE}%BJuNmr9?G6#b2eh8u>>aqUbkt^
zC4P=bRM8Hdi|}?5Uz=WEnC;p2cE+&GV;ILgV7i{yn6H+Vc0frjr#<4EPuED(;<84l
zioX_^%Sc2SZR(47S{V4(>F7D;CZk4K!E0lXfc)?y$^a}(qSZ;TqIv%ycZV1`=5)Q@
zDysV1^?~mR!?R~FV5fcurVTNc48!?UvC9mPbu8JX8Gc4G{fhrIUWJp&wrcMV<nzeX
zNTUdyxhj6}P{JzRC<q^Jry5!|ReF)So!CI3W4dt;;kr!%5SQ_YT5aay$YIewv9+4u
zYoKdDZ(&p&4zcs6Vn$W3N?wRO(}hJ_4lInPYdGd0bM{=_*E+}6sr5*;1_h&RL=JKY
z^Inf<o)ebR&4LPE!cD{4$49G1j#GYfAudDu6Q}`$nAXEV^U$6Si1a{=;o5ael5-e%
zdHIMFrOpQDOSvwn(<BlMejca8BBl~u=wE4VU<7;dt*RhKw92ZUgnqZ*km%bnBWByV
zb!T+!1g~f=bRu$9+^$;7DG0nwIk<8tAG=#fE{tL%qU@UChDW)KbmHAm{jgm!d36cK
zS?g*v>Pk^zV0!|K`yS7hdq2pe7^e3c%bLA&eEfN?qwg|9O#g&NQ+LNzmvXiCTuP{R
z6RFga;hxy<t#kG)1<xo>Uav3JOK<j!SucHVn>ue1t!H;s;jHJhLfedGeyBG27KP;`
zm9(mM`Xk6T!Qkb&vu7{ktfw14OJ`Z9!j%&v?P4{h3X~Nh(HXVh1|^upIkM@-*2{cI
zoOkNYG6bBC^!7<TjC=8JrF+;xni&{>Qdv;^S?@GOEF=Spm<5SCaAgi>W|A_=v>9eV
zc$z`liQQN5!UER!gDl#qQuC*1)KZsxlU#K=#blxQs{g64%0owEL%JD?O_hFHo4Oy-
zSIUtWi*7u>A!3%-QYNNyKY!j!-({)x`ulw|M&|Ij?TDp?zP_HEIH*8SWrPm3YQ%`e
zG{Y8-t>l0uL8<V@Lbt?=>I69#Y@$baXOU9yG~H9uG~C^Iz^ZOk@7^$`h~*i&kCEN2
zIM~O)va*5*1wUxQR7ns5+#`9-vrH)4!Ci4wxZUvlcGLhgZDf{mUx=xzX<7lb2|q;u
zT?lYT9G`h9;aZR;rg2wxY7`^&Ejy;><#c_(m(KhdgP#gd9#2V+chGY>f2h@1AK8Ux
z>)6sPcRF_<SxNMBboNR?>%xI~%rb2VUku6OG%iFIfBoboyRrYe67l8mH0G5X-yFNT
z=RUjL1&wck7$#GOouUhW&g#kszr@|zDTCH_8ZTnaWmQHn()cH?jg_U0Iqo+%y`2-5
z51+8aaJL_Er5{+;Sui4kH%Cxk7{qRDXh2vgEYF^*8bg+9=@-|l>W&u0qckB({de6p
zKN-`wt519#Q0#YQPL&zRbqKeod}3bOY<iATJp1^M8|_oF8;@4~vCro9%gEnry4m<?
zI)uwx#B~0a^hNAT9DnMMx4@Ea8EQ<cpyrcp5`F(jS^s&c{@C{euDkws!G8nxAl;r9
W>q~xz;E&%=;O=cpld2zFpZ*D!lsB{h

literal 0
HcwPel00001

diff --git a/benchmarks/Lexer.php b/benchmarks/Lexer.php
index 86df149b..6d9cc5b2 100644
--- a/benchmarks/Lexer.php
+++ b/benchmarks/Lexer.php
@@ -165,4 +165,4 @@ echo '<div>Random input was: ' .
 ?>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/benchmarks/ProfileDirectLex.php b/benchmarks/ProfileDirectLex.php
index 20ff0159..24875ca0 100644
--- a/benchmarks/ProfileDirectLex.php
+++ b/benchmarks/ProfileDirectLex.php
@@ -15,5 +15,3 @@ $context = new HTMLPurifier_Context();
 for ($i = 0; $i < 10; $i++) {
     $tokens = $lexer->tokenizeHTML($input, $config, $context);
 }
-
-?>
\ No newline at end of file
diff --git a/configdoc/generate.php b/configdoc/generate.php
index 80eacd76..97e96433 100644
--- a/configdoc/generate.php
+++ b/configdoc/generate.php
@@ -22,6 +22,10 @@ error_reporting(E_ALL); // probably not possible to use E_STRICT
 require_once '../library/HTMLPurifier.auto.php';
 require_once 'library/ConfigDoc.auto.php';
 
+$purifier = HTMLPurifier::getInstance(array(
+    'AutoFormat.PurifierLinkify' => true
+));
+
 $schema = HTMLPurifier_ConfigSchema::instance();
 $style = 'plain'; // use $_GET in the future
 $configdoc = new ConfigDoc();
@@ -37,4 +41,3 @@ if (php_sapi_name() != 'cli') {
     echo 'Files generated successfully.';
 }
 
-?>
\ No newline at end of file
diff --git a/configdoc/library/ConfigDoc.auto.php b/configdoc/library/ConfigDoc.auto.php
index 8dbe120b..0dab4700 100644
--- a/configdoc/library/ConfigDoc.auto.php
+++ b/configdoc/library/ConfigDoc.auto.php
@@ -7,4 +7,3 @@
 set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
 require_once 'ConfigDoc.php';
 
-?>
\ No newline at end of file
diff --git a/configdoc/library/ConfigDoc.php b/configdoc/library/ConfigDoc.php
index 2e2ae610..41e9e066 100644
--- a/configdoc/library/ConfigDoc.php
+++ b/configdoc/library/ConfigDoc.php
@@ -36,4 +36,3 @@ class ConfigDoc
     
 }
 
-?>
\ No newline at end of file
diff --git a/configdoc/library/ConfigDoc/HTMLXSLTProcessor.php b/configdoc/library/ConfigDoc/HTMLXSLTProcessor.php
index 64966c5b..36cb767a 100644
--- a/configdoc/library/ConfigDoc/HTMLXSLTProcessor.php
+++ b/configdoc/library/ConfigDoc/HTMLXSLTProcessor.php
@@ -36,6 +36,7 @@ class ConfigDoc_HTMLXSLTProcessor
         // fudges for HTML backwards compatibility
         $out = str_replace('/>', ' />', $out); // <br /> not <br/>
         $out = str_replace(' xmlns=""', '', $out); // rm unnecessary xmlns
+        $out = str_replace(' xmlns="http://www.w3.org/1999/xhtml"', '', $out); // rm unnecessary xmlns
         if (class_exists('Tidy')) {
             // cleanup output
             $config = array(
@@ -59,4 +60,3 @@ class ConfigDoc_HTMLXSLTProcessor
     
 }
 
-?>
\ No newline at end of file
diff --git a/configdoc/library/ConfigDoc/XMLSerializer.php b/configdoc/library/ConfigDoc/XMLSerializer.php
index cbab5d3b..0a86bb95 100644
--- a/configdoc/library/ConfigDoc/XMLSerializer.php
+++ b/configdoc/library/ConfigDoc/XMLSerializer.php
@@ -23,4 +23,3 @@ class ConfigDoc_XMLSerializer
     
 }
 
-?>
\ No newline at end of file
diff --git a/configdoc/library/ConfigDoc/XMLSerializer/ConfigSchema.php b/configdoc/library/ConfigDoc/XMLSerializer/ConfigSchema.php
index 57675a2a..691d5eea 100644
--- a/configdoc/library/ConfigDoc/XMLSerializer/ConfigSchema.php
+++ b/configdoc/library/ConfigDoc/XMLSerializer/ConfigSchema.php
@@ -50,6 +50,12 @@ class ConfigDoc_XMLSerializer_ConfigSchema extends ConfigDoc_XMLSerializer
                     $dom_document->createElement('name', $name)
                 );
                 
+                $dom_aliases = $dom_document->createElement('aliases');
+                $dom_directive->appendChild($dom_aliases);
+                foreach ($info->directiveAliases as $alias) {
+                    $dom_aliases->appendChild($dom_document->createElement('alias', $alias));
+                }
+                
                 $dom_constraints = $dom_document->createElement('constraints');
                 $dom_directive->appendChild($dom_constraints);
                 
@@ -115,4 +121,3 @@ class ConfigDoc_XMLSerializer_ConfigSchema extends ConfigDoc_XMLSerializer
     
 }
 
-?>
\ No newline at end of file
diff --git a/configdoc/library/ConfigDoc/XMLSerializer/Types.php b/configdoc/library/ConfigDoc/XMLSerializer/Types.php
index a3d4716c..414778e2 100644
--- a/configdoc/library/ConfigDoc/XMLSerializer/Types.php
+++ b/configdoc/library/ConfigDoc/XMLSerializer/Types.php
@@ -24,4 +24,3 @@ class ConfigDoc_XMLSerializer_Types extends ConfigDoc_XMLSerializer
     
 }
 
-?>
\ No newline at end of file
diff --git a/configdoc/styles/plain.xsl b/configdoc/styles/plain.xsl
index 3952bf0d..f8b1cdf9 100644
--- a/configdoc/styles/plain.xsl
+++ b/configdoc/styles/plain.xsl
@@ -72,8 +72,16 @@
         <xsl:apply-templates />
     </xsl:template>
     <xsl:template match="directive/name">
+        <xsl:apply-templates select="../aliases/alias" mode="anchor" />
         <h3 id="{../@id}"><xsl:value-of select="../@id" /></h3>
     </xsl:template>
+    <xsl:template match="alias" mode="anchor">
+        <a id="{.}"></a>
+    </xsl:template>
+    
+    <!-- Do not pass through -->
+    <xsl:template match="alias"></xsl:template>
+    
     <xsl:template match="directive/constraints">
         <table class="constraints">
             <xsl:apply-templates />
@@ -89,8 +97,20 @@
                     </td>
                 </tr>
             </xsl:if>
+            <xsl:if test="../aliases/alias">
+                <xsl:apply-templates select="../aliases" mode="constraints" />
+            </xsl:if>
         </table>
     </xsl:template>
+    <xsl:template match="directive/aliases" mode="constraints">
+        <th>Aliases:</th>
+        <td>
+            <xsl:for-each select="alias">
+                <xsl:if test="position()&gt;1">, </xsl:if>
+                <xsl:value-of select="." />
+            </xsl:for-each>
+        </td>
+    </xsl:template>
     <xsl:template match="directive//description">
         <div class="description">
             <xsl:copy-of select="div/node()" />
@@ -128,4 +148,4 @@
         </tr>
     </xsl:template>
     
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/docs/dev-advanced-api.html b/docs/dev-advanced-api.html
index 9cbe6366..ebd25231 100644
--- a/docs/dev-advanced-api.html
+++ b/docs/dev-advanced-api.html
@@ -210,4 +210,4 @@ the usual things required are:</p>
 
 <div id="version">$Id$</div>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/dev-naming.html b/docs/dev-naming.html
index 9fffbb65..d39866a1 100644
--- a/docs/dev-naming.html
+++ b/docs/dev-naming.html
@@ -79,4 +79,4 @@ help you find the correct functionality more quickly.  Here they are:</p>
 
 <div id="version">$Id$</div>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/dev-optimization.html b/docs/dev-optimization.html
index 0d18cde6..6b2be684 100644
--- a/docs/dev-optimization.html
+++ b/docs/dev-optimization.html
@@ -30,4 +30,4 @@ that itch, put it here!</p>
 
 <div id="version">$Id$</div>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/dev-progress.html b/docs/dev-progress.html
index 8d245308..b3109df2 100644
--- a/docs/dev-progress.html
+++ b/docs/dev-progress.html
@@ -299,4 +299,4 @@ Mozilla on inside and needs -moz-outline, no IE support.</td></tr>
 
 <div id="version">$Id$</div>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/enduser-customize.html b/docs/enduser-customize.html
index 672e92c6..8e9fe1dd 100644
--- a/docs/enduser-customize.html
+++ b/docs/enduser-customize.html
@@ -17,11 +17,6 @@
 <div id="index">Return to the <a href="index.html">index</a>.</div>
 <div id="home"><a href="http://htmlpurifier.org/">HTML Purifier</a> End-User Documentation</div>
 
-<div id="applicability">
-  This document covers currently unreleased functionality and
-  only applies to recent SVN checkouts.
-</div>
-
 <p>
   You may have heard of the <a href="dev-advanced-api.html">Advanced API</a>.
   If you're interested in reading dry prose and boring functional
@@ -788,4 +783,4 @@ $form->excludes = array('form' => true);</strong></pre>
 
 <div id="version">$Id: enduser-tidy.html 1158 2007-06-18 19:26:29Z Edward $</div>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/enduser-id.html b/docs/enduser-id.html
index 8b227ae5..8321a0a2 100644
--- a/docs/enduser-id.html
+++ b/docs/enduser-id.html
@@ -144,4 +144,4 @@ anchors is beyond me.</p>
 <div id="version">$Id$</div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/enduser-slow.html b/docs/enduser-slow.html
index dc3484bb..12bdff1d 100644
--- a/docs/enduser-slow.html
+++ b/docs/enduser-slow.html
@@ -114,4 +114,4 @@ if you decide to do that! Especially if you port HTML Purifier to C++.
 <tt>;-)</tt></p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/enduser-tidy.html b/docs/enduser-tidy.html
index cc04834c..b3f79f60 100644
--- a/docs/enduser-tidy.html
+++ b/docs/enduser-tidy.html
@@ -16,11 +16,6 @@
 <div id="index">Return to the <a href="index.html">index</a>.</div>
 <div id="home"><a href="http://htmlpurifier.org/">HTML Purifier</a> End-User Documentation</div>
 
-<div id="applicability">
-  This document covers currently unreleased functionality and
-  only applies to recent SVN checkouts.
-</div>
-
 <p>You've probably heard of HTML Tidy, Dave Raggett's little piece
 of software that cleans up poorly written HTML.  Let me say it straight
 out:</p>
@@ -232,4 +227,4 @@ effectively in the background.</p>
 
 <div id="version">$Id$</div>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/enduser-utf8.html b/docs/enduser-utf8.html
index 6d03ad91..ef8c136b 100644
--- a/docs/enduser-utf8.html
+++ b/docs/enduser-utf8.html
@@ -1043,4 +1043,4 @@ a more in-depth look into character sets and encodings.</p>
 </ul>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/enduser-youtube.html b/docs/enduser-youtube.html
index a827033a..2437b488 100644
--- a/docs/enduser-youtube.html
+++ b/docs/enduser-youtube.html
@@ -149,4 +149,4 @@ like that, for that matter), send it over and it might get included
 with the core!</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/examples/basic.php b/docs/examples/basic.php
index 8910254d..72739b67 100644
--- a/docs/examples/basic.php
+++ b/docs/examples/basic.php
@@ -20,4 +20,3 @@ $pure_html = $purifier->purify($html);
 
 echo '<pre>' . htmlspecialchars($pure_html) . '</pre>';
 
-?>
\ No newline at end of file
diff --git a/docs/index.html b/docs/index.html
index 69ee6207..437a8bfd 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -162,4 +162,4 @@ the code. They may be upgraded to HTML files or stay as TXT scratchpads.</p>
 
 <div id="version">$Id$</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/ref-devnetwork.html b/docs/ref-devnetwork.html
index 9a009284..88bf4d18 100644
--- a/docs/ref-devnetwork.html
+++ b/docs/ref-devnetwork.html
@@ -42,4 +42,4 @@ the development of this library in these forum threads:</p>
 
 <div id="version">$Id$</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/ref-proprietary-tags.txt b/docs/ref-proprietary-tags.txt
index 4daba763..9989e813 100644
--- a/docs/ref-proprietary-tags.txt
+++ b/docs/ref-proprietary-tags.txt
@@ -21,4 +21,4 @@ HTML Purifier context.
 <xmp>, monospace, replace with pre
 
 These should be put into their own Tidy module, not loaded by default(?). These
-all qualify as "lenient" transforms.
\ No newline at end of file
+all qualify as "lenient" transforms.
diff --git a/library/HTMLPurifier.auto.php b/library/HTMLPurifier.auto.php
index a66fd2e2..cb6a8426 100644
--- a/library/HTMLPurifier.auto.php
+++ b/library/HTMLPurifier.auto.php
@@ -7,4 +7,3 @@
 set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
 require_once 'HTMLPurifier.php';
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier.func.php b/library/HTMLPurifier.func.php
index 876ad7b2..b8cdacec 100644
--- a/library/HTMLPurifier.func.php
+++ b/library/HTMLPurifier.func.php
@@ -18,4 +18,3 @@ function HTMLPurifier($html, $config = null) {
     return $purifier->purify($html, $config);
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier.php b/library/HTMLPurifier.php
index 731e1dfd..ebbde869 100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -22,7 +22,7 @@
  */
 
 /*
-    HTML Purifier 2.0.0 - Standards Compliant HTML Filtering
+    HTML Purifier 2.0.1 - Standards Compliant HTML Filtering
     Copyright (C) 2006 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -51,17 +51,10 @@ require_once 'HTMLPurifier/Generator.php';
 require_once 'HTMLPurifier/Strategy/Core.php';
 require_once 'HTMLPurifier/Encoder.php';
 
+require_once 'HTMLPurifier/ErrorCollector.php';
 require_once 'HTMLPurifier/LanguageFactory.php';
 
 HTMLPurifier_ConfigSchema::define(
-    'Core', 'Language', 'en', 'string', '
-ISO 639 language code for localizable things in HTML Purifier to use,
-which is mainly error reporting. There is currently only an English (en)
-translation, so this directive is currently useless.
-This directive has been available since 2.0.0.
-');
-
-HTMLPurifier_ConfigSchema::define(
     'Core', 'CollectErrors', false, 'bool', '
 Whether or not to collect errors found while filtering the document. This
 is a useful way to give feedback to your users. CURRENTLY NOT IMPLEMENTED.
@@ -81,7 +74,7 @@ This directive has been available since 2.0.0.
 class HTMLPurifier
 {
     
-    var $version = '2.0.0';
+    var $version = '2.0.1';
     
     var $config;
     var $filters;
@@ -139,15 +132,19 @@ class HTMLPurifier
         
         $context = new HTMLPurifier_Context();
         
+        // our friendly neighborhood generator, all primed with configuration too!
+        $this->generator->generateFromTokens(array(), $config, $context);
+        $context->register('Generator', $this->generator);
+        
         // set up global context variables
         if ($config->get('Core', 'CollectErrors')) {
             // may get moved out if other facilities use it
             $language_factory = HTMLPurifier_LanguageFactory::instance();
-            $language = $language_factory->create($config->get('Core', 'Language'));
+            $language = $language_factory->create($config, $context);
             $context->register('Locale', $language);
             
-            $error_collector = new HTMLPurifier_ErrorCollector();
-            $context->register('ErrorCollector', $language);
+            $error_collector = new HTMLPurifier_ErrorCollector($context);
+            $context->register('ErrorCollector', $error_collector);
         }
         
         $html = HTMLPurifier_Encoder::convertToUTF8($html, $config, $context);
@@ -216,4 +213,3 @@ class HTMLPurifier
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrCollections.php b/library/HTMLPurifier/AttrCollections.php
index 61bce40e..0aa55f12 100644
--- a/library/HTMLPurifier/AttrCollections.php
+++ b/library/HTMLPurifier/AttrCollections.php
@@ -127,4 +127,3 @@ class HTMLPurifier_AttrCollections
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef.php b/library/HTMLPurifier/AttrDef.php
index d9d2d944..882b6260 100644
--- a/library/HTMLPurifier/AttrDef.php
+++ b/library/HTMLPurifier/AttrDef.php
@@ -84,4 +84,3 @@ class HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS.php b/library/HTMLPurifier/AttrDef/CSS.php
index 220ec0d0..d0f49bc4 100644
--- a/library/HTMLPurifier/AttrDef/CSS.php
+++ b/library/HTMLPurifier/AttrDef/CSS.php
@@ -66,4 +66,3 @@ class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/Background.php b/library/HTMLPurifier/AttrDef/CSS/Background.php
index 42d8bcf0..b82e98e5 100644
--- a/library/HTMLPurifier/AttrDef/CSS/Background.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Background.php
@@ -84,4 +84,3 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
index 77a3ddd6..0d10ab68 100644
--- a/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ b/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
@@ -127,4 +127,3 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/Border.php b/library/HTMLPurifier/AttrDef/CSS/Border.php
index 583f14fd..f6d4d684 100644
--- a/library/HTMLPurifier/AttrDef/CSS/Border.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Border.php
@@ -42,4 +42,3 @@ class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/Color.php b/library/HTMLPurifier/AttrDef/CSS/Color.php
index 4b0fa231..30b38f92 100644
--- a/library/HTMLPurifier/AttrDef/CSS/Color.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Color.php
@@ -98,4 +98,3 @@ class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/Composite.php b/library/HTMLPurifier/AttrDef/CSS/Composite.php
index 9d2803d2..44ad5421 100644
--- a/library/HTMLPurifier/AttrDef/CSS/Composite.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Composite.php
@@ -35,4 +35,3 @@ class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/Font.php b/library/HTMLPurifier/AttrDef/CSS/Font.php
index 34dfa19a..6ce18efb 100644
--- a/library/HTMLPurifier/AttrDef/CSS/Font.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Font.php
@@ -148,4 +148,3 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
index ab6d9d8b..223e7769 100644
--- a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -59,4 +59,3 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/Length.php b/library/HTMLPurifier/AttrDef/CSS/Length.php
index 7da26a8f..095eaade 100644
--- a/library/HTMLPurifier/AttrDef/CSS/Length.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Length.php
@@ -53,4 +53,3 @@ class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/ListStyle.php b/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
index 2d2ed12d..a89d6792 100644
--- a/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
+++ b/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
@@ -77,4 +77,3 @@ class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/Multiple.php b/library/HTMLPurifier/AttrDef/CSS/Multiple.php
index 0d1c8406..9a818d10 100644
--- a/library/HTMLPurifier/AttrDef/CSS/Multiple.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Multiple.php
@@ -55,4 +55,3 @@ class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/Number.php b/library/HTMLPurifier/AttrDef/CSS/Number.php
index 48f1335a..4f22f829 100644
--- a/library/HTMLPurifier/AttrDef/CSS/Number.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Number.php
@@ -58,4 +58,3 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/Percentage.php b/library/HTMLPurifier/AttrDef/CSS/Percentage.php
index cc96f15d..4625bde6 100644
--- a/library/HTMLPurifier/AttrDef/CSS/Percentage.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Percentage.php
@@ -40,4 +40,3 @@ class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
index a5d82d10..501ab261 100644
--- a/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
+++ b/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
@@ -34,4 +34,3 @@ class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/CSS/URI.php b/library/HTMLPurifier/AttrDef/CSS/URI.php
index ba1a628c..107545cc 100644
--- a/library/HTMLPurifier/AttrDef/CSS/URI.php
+++ b/library/HTMLPurifier/AttrDef/CSS/URI.php
@@ -55,4 +55,3 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/Enum.php b/library/HTMLPurifier/AttrDef/Enum.php
index fce16b0a..011adda8 100644
--- a/library/HTMLPurifier/AttrDef/Enum.php
+++ b/library/HTMLPurifier/AttrDef/Enum.php
@@ -63,4 +63,3 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/HTML/Bool.php b/library/HTMLPurifier/AttrDef/HTML/Bool.php
index 7ba3f130..ff6f0a86 100644
--- a/library/HTMLPurifier/AttrDef/HTML/Bool.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Bool.php
@@ -27,4 +27,3 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/HTML/Color.php b/library/HTMLPurifier/AttrDef/HTML/Color.php
index 8cfcfda5..d6fa6749 100644
--- a/library/HTMLPurifier/AttrDef/HTML/Color.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Color.php
@@ -32,4 +32,3 @@ class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
index 5893bbfa..fdca8cb2 100644
--- a/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
+++ b/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
@@ -31,4 +31,3 @@ class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/HTML/ID.php b/library/HTMLPurifier/AttrDef/HTML/ID.php
index c8bf2991..641749ce 100644
--- a/library/HTMLPurifier/AttrDef/HTML/ID.php
+++ b/library/HTMLPurifier/AttrDef/HTML/ID.php
@@ -118,4 +118,3 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/HTML/Length.php b/library/HTMLPurifier/AttrDef/HTML/Length.php
index ac83295a..c4f98436 100644
--- a/library/HTMLPurifier/AttrDef/HTML/Length.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Length.php
@@ -41,4 +41,3 @@ class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
index 854f88e5..1122f0c8 100644
--- a/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
+++ b/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
@@ -70,4 +70,3 @@ class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/HTML/MultiLength.php b/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
index f50259b6..4c0c88c8 100644
--- a/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
+++ b/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
@@ -41,4 +41,3 @@ class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Le
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
index 1eaeaa7e..6e58a80d 100644
--- a/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
@@ -48,4 +48,3 @@ class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/HTML/Pixels.php b/library/HTMLPurifier/AttrDef/HTML/Pixels.php
index 4c290912..38bc7d68 100644
--- a/library/HTMLPurifier/AttrDef/HTML/Pixels.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Pixels.php
@@ -34,4 +34,3 @@ class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/Integer.php b/library/HTMLPurifier/AttrDef/Integer.php
index d6953d61..822ed677 100644
--- a/library/HTMLPurifier/AttrDef/Integer.php
+++ b/library/HTMLPurifier/AttrDef/Integer.php
@@ -72,4 +72,3 @@ class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/Lang.php b/library/HTMLPurifier/AttrDef/Lang.php
index 72d67f64..4fbd9f67 100644
--- a/library/HTMLPurifier/AttrDef/Lang.php
+++ b/library/HTMLPurifier/AttrDef/Lang.php
@@ -72,4 +72,3 @@ class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/Text.php b/library/HTMLPurifier/AttrDef/Text.php
index eb2a24a7..c0634664 100644
--- a/library/HTMLPurifier/AttrDef/Text.php
+++ b/library/HTMLPurifier/AttrDef/Text.php
@@ -14,4 +14,3 @@ class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/URI.php b/library/HTMLPurifier/AttrDef/URI.php
index ca214980..6250d08e 100644
--- a/library/HTMLPurifier/AttrDef/URI.php
+++ b/library/HTMLPurifier/AttrDef/URI.php
@@ -302,4 +302,4 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
     
 }
 
-?>
+
diff --git a/library/HTMLPurifier/AttrDef/URI/Email.php b/library/HTMLPurifier/AttrDef/URI/Email.php
index 80b8d367..5a7085db 100644
--- a/library/HTMLPurifier/AttrDef/URI/Email.php
+++ b/library/HTMLPurifier/AttrDef/URI/Email.php
@@ -14,4 +14,3 @@ class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
index e35b1b4b..6623f190 100644
--- a/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+++ b/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
@@ -20,4 +20,3 @@ class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_UR
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/URI/Host.php b/library/HTMLPurifier/AttrDef/URI/Host.php
index 5344cdac..ac729ebd 100644
--- a/library/HTMLPurifier/AttrDef/URI/Host.php
+++ b/library/HTMLPurifier/AttrDef/URI/Host.php
@@ -51,4 +51,3 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/URI/IPv4.php b/library/HTMLPurifier/AttrDef/URI/IPv4.php
index b9aa98ae..9a1af293 100644
--- a/library/HTMLPurifier/AttrDef/URI/IPv4.php
+++ b/library/HTMLPurifier/AttrDef/URI/IPv4.php
@@ -39,4 +39,3 @@ class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrDef/URI/IPv6.php b/library/HTMLPurifier/AttrDef/URI/IPv6.php
index 8de8f68f..f48b803d 100644
--- a/library/HTMLPurifier/AttrDef/URI/IPv6.php
+++ b/library/HTMLPurifier/AttrDef/URI/IPv6.php
@@ -98,4 +98,3 @@ class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform.php b/library/HTMLPurifier/AttrTransform.php
index 2fa07b47..ce69fcbe 100644
--- a/library/HTMLPurifier/AttrTransform.php
+++ b/library/HTMLPurifier/AttrTransform.php
@@ -55,4 +55,3 @@ class HTMLPurifier_AttrTransform
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/BdoDir.php b/library/HTMLPurifier/AttrTransform/BdoDir.php
index 0ea5eb6d..f127feb2 100644
--- a/library/HTMLPurifier/AttrTransform/BdoDir.php
+++ b/library/HTMLPurifier/AttrTransform/BdoDir.php
@@ -28,4 +28,3 @@ class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/BgColor.php b/library/HTMLPurifier/AttrTransform/BgColor.php
index a7bb2b45..de2867ef 100644
--- a/library/HTMLPurifier/AttrTransform/BgColor.php
+++ b/library/HTMLPurifier/AttrTransform/BgColor.php
@@ -23,4 +23,3 @@ extends HTMLPurifier_AttrTransform {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/BoolToCSS.php b/library/HTMLPurifier/AttrTransform/BoolToCSS.php
index f4a16a7f..25548eea 100644
--- a/library/HTMLPurifier/AttrTransform/BoolToCSS.php
+++ b/library/HTMLPurifier/AttrTransform/BoolToCSS.php
@@ -36,4 +36,3 @@ extends HTMLPurifier_AttrTransform {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/Border.php b/library/HTMLPurifier/AttrTransform/Border.php
index 10c62e3c..7da4f6a8 100644
--- a/library/HTMLPurifier/AttrTransform/Border.php
+++ b/library/HTMLPurifier/AttrTransform/Border.php
@@ -17,4 +17,3 @@ class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/EnumToCSS.php b/library/HTMLPurifier/AttrTransform/EnumToCSS.php
index ed4dfc32..0470413d 100644
--- a/library/HTMLPurifier/AttrTransform/EnumToCSS.php
+++ b/library/HTMLPurifier/AttrTransform/EnumToCSS.php
@@ -57,4 +57,3 @@ class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/ImgRequired.php b/library/HTMLPurifier/AttrTransform/ImgRequired.php
index 159afd2f..d0428055 100644
--- a/library/HTMLPurifier/AttrTransform/ImgRequired.php
+++ b/library/HTMLPurifier/AttrTransform/ImgRequired.php
@@ -51,4 +51,3 @@ class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/ImgSpace.php b/library/HTMLPurifier/AttrTransform/ImgSpace.php
index 53c787e2..60d5edc7 100644
--- a/library/HTMLPurifier/AttrTransform/ImgSpace.php
+++ b/library/HTMLPurifier/AttrTransform/ImgSpace.php
@@ -44,4 +44,3 @@ extends HTMLPurifier_AttrTransform {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/Lang.php b/library/HTMLPurifier/AttrTransform/Lang.php
index acb1786a..899f5c8d 100644
--- a/library/HTMLPurifier/AttrTransform/Lang.php
+++ b/library/HTMLPurifier/AttrTransform/Lang.php
@@ -27,4 +27,3 @@ class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/Length.php b/library/HTMLPurifier/AttrTransform/Length.php
index 2292aa13..a8904c5e 100644
--- a/library/HTMLPurifier/AttrTransform/Length.php
+++ b/library/HTMLPurifier/AttrTransform/Length.php
@@ -26,4 +26,3 @@ class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTransform/Name.php b/library/HTMLPurifier/AttrTransform/Name.php
index f14c1479..248d0e02 100644
--- a/library/HTMLPurifier/AttrTransform/Name.php
+++ b/library/HTMLPurifier/AttrTransform/Name.php
@@ -18,4 +18,3 @@ class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/AttrTypes.php b/library/HTMLPurifier/AttrTypes.php
index 4064de78..4cb70be7 100644
--- a/library/HTMLPurifier/AttrTypes.php
+++ b/library/HTMLPurifier/AttrTypes.php
@@ -79,4 +79,4 @@ class HTMLPurifier_AttrTypes
     }
 }
 
-?>
+
diff --git a/library/HTMLPurifier/AttrValidator.php b/library/HTMLPurifier/AttrValidator.php
index d6a1a563..f02bd208 100644
--- a/library/HTMLPurifier/AttrValidator.php
+++ b/library/HTMLPurifier/AttrValidator.php
@@ -1,32 +1,53 @@
 <?php
 
+/**
+ * Validates the attributes of a token. Doesn't manage required attributes
+ * very well. The only reason we factored this out was because RemoveForeignElements
+ * also needed it besides ValidateAttributes.
+ */
 class HTMLPurifier_AttrValidator
 {
     
-    
-    function validateToken($token, &$config, &$context) {
+    /**
+     * Validates the attributes of a token, returning a modified token
+     * that has valid tokens
+     * @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
+     */
+    function validateToken(&$token, &$config, &$context) {
             
         $definition = $config->getHTMLDefinition();
+        $e =& $context->get('ErrorCollector', true);
+        
+        // initialize CurrentToken if necessary
+        $current_token =& $context->get('CurrentToken', true);
+        if (!$current_token) $context->register('CurrentToken', $token);
+        
+        if ($token->type !== 'start' && $token->type !== 'empty') return $token;
         
         // create alias to global definition array, see also $defs
         // DEFINITION CALL
         $d_defs = $definition->info_global_attr;
         
-        // copy out attributes for easy manipulation
-        $attr = $token->attr;
+        // reference attributes for easy manipulation
+        $attr =& $token->attr;
         
         // do global transformations (pre)
         // nothing currently utilizes this
         foreach ($definition->info_attr_transform_pre as $transform) {
-            $attr = $transform->transform($attr, $config, $context);
+            $attr = $transform->transform($o = $attr, $config, $context);
+            if ($e && ($attr != $o)) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
         }
         
         // do local transformations only applicable to this element (pre)
         // ex. <p align="right"> to <p style="text-align:right;">
-        foreach ($definition->info[$token->name]->attr_transform_pre
-            as $transform
-        ) {
-            $attr = $transform->transform($attr, $config, $context);
+        foreach ($definition->info[$token->name]->attr_transform_pre as $transform) {
+            $attr = $transform->transform($o = $attr, $config, $context);
+            if ($e && ($attr != $o)) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
         }
         
         // create alias to this element's attribute definition array, see
@@ -34,6 +55,9 @@ class HTMLPurifier_AttrValidator
         // DEFINITION CALL
         $defs = $definition->info[$token->name]->attr;
         
+        $attr_key = false;
+        $context->register('CurrentAttr', $attr_key);
+        
         // iterate through all the attribute keypairs
         // Watch out for name collisions: $key has previously been used
         foreach ($attr as $attr_key => $value) {
@@ -67,9 +91,17 @@ class HTMLPurifier_AttrValidator
             
             // put the results into effect
             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');
+                
                 // remove the attribute
                 unset($attr[$attr_key]);
             } elseif (is_string($result)) {
+                // generally, if a substitution is happening, there
+                // was some sort of implicit correction going on. We'll
+                // delegate it to the attribute classes to say exactly what.
+                
                 // simple substitution
                 $attr[$attr_key] = $result;
             }
@@ -81,25 +113,27 @@ class HTMLPurifier_AttrValidator
             // others would prepend themselves).
         }
         
+        $context->destroy('CurrentAttr');
+        
         // post transforms
         
-        // ex. <x lang="fr"> to <x lang="fr" xml:lang="fr">
+        // global (error reporting untested)
         foreach ($definition->info_attr_transform_post as $transform) {
-            $attr = $transform->transform($attr, $config, $context);
+            $attr = $transform->transform($o = $attr, $config, $context);
+            if ($e && ($attr != $o)) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
         }
         
-        // ex. <bdo> to <bdo dir="ltr">
+        // local (error reporting untested)
         foreach ($definition->info[$token->name]->attr_transform_post as $transform) {
-            $attr = $transform->transform($attr, $config, $context);
+            $attr = $transform->transform($o = $attr, $config, $context);
+            if ($e && ($attr != $o)) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
         }
         
-        // commit changes
-        $token->attr = $attr;
-        return $token;
+        // destroy CurrentToken if we made it ourselves
+        if (!$current_token) $context->destroy('CurrentToken');
         
     }
     
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/CSSDefinition.php b/library/HTMLPurifier/CSSDefinition.php
index 78612f23..8de2aa7b 100644
--- a/library/HTMLPurifier/CSSDefinition.php
+++ b/library/HTMLPurifier/CSSDefinition.php
@@ -226,4 +226,3 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ChildDef.php b/library/HTMLPurifier/ChildDef.php
index bed43cac..5236d266 100644
--- a/library/HTMLPurifier/ChildDef.php
+++ b/library/HTMLPurifier/ChildDef.php
@@ -37,6 +37,11 @@ class HTMLPurifier_ChildDef
     var $allow_empty;
     
     /**
+     * Lookup array of all elements that this definition could possibly allow
+     */
+    var $elements = array();
+    
+    /**
      * Validates nodes according to definition and returns modification.
      * 
      * @public
@@ -52,4 +57,4 @@ class HTMLPurifier_ChildDef
     }
 }
 
-?>
+
diff --git a/library/HTMLPurifier/ChildDef/Chameleon.php b/library/HTMLPurifier/ChildDef/Chameleon.php
index afe0299f..b338354d 100644
--- a/library/HTMLPurifier/ChildDef/Chameleon.php
+++ b/library/HTMLPurifier/ChildDef/Chameleon.php
@@ -35,6 +35,7 @@ class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
     function HTMLPurifier_ChildDef_Chameleon($inline, $block) {
         $this->inline = new HTMLPurifier_ChildDef_Optional($inline);
         $this->block  = new HTMLPurifier_ChildDef_Optional($block);
+        $this->elements = $this->block->elements;
     }
     
     function validateChildren($tokens_of_children, $config, &$context) {
@@ -48,4 +49,3 @@ class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ChildDef/Custom.php b/library/HTMLPurifier/ChildDef/Custom.php
index 9f90b04b..ba722d05 100644
--- a/library/HTMLPurifier/ChildDef/Custom.php
+++ b/library/HTMLPurifier/ChildDef/Custom.php
@@ -44,6 +44,12 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
         // COMPLICATED! AND MIGHT BE BUGGY! I HAVE NO CLUE WHAT I'M
         // DOING! Seriously: if there's problems, please report them.
         
+        // collect all elements into the $elements array
+        preg_match_all("/$el/", $reg, $matches);
+        foreach ($matches[0] as $match) {
+            $this->elements[$match] = true;
+        }
+        
         // setup all elements as parentheticals with leading commas
         $reg = preg_replace("/$el/", '(,\\0)', $reg);
         
@@ -85,4 +91,3 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ChildDef/Empty.php b/library/HTMLPurifier/ChildDef/Empty.php
index 1ab4fdd6..6e637307 100644
--- a/library/HTMLPurifier/ChildDef/Empty.php
+++ b/library/HTMLPurifier/ChildDef/Empty.php
@@ -19,4 +19,3 @@ class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ChildDef/Optional.php b/library/HTMLPurifier/ChildDef/Optional.php
index cc888326..779a7f06 100644
--- a/library/HTMLPurifier/ChildDef/Optional.php
+++ b/library/HTMLPurifier/ChildDef/Optional.php
@@ -20,4 +20,3 @@ class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ChildDef/Required.php b/library/HTMLPurifier/ChildDef/Required.php
index 4d253398..f4d908b0 100644
--- a/library/HTMLPurifier/ChildDef/Required.php
+++ b/library/HTMLPurifier/ChildDef/Required.php
@@ -25,7 +25,7 @@ class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
             $elements = array_flip($elements);
             foreach ($elements as $i => $x) {
                 $elements[$i] = true;
-                if (empty($i)) unset($elements[$i]);
+                if (empty($i)) unset($elements[$i]); // remove blank
             }
         }
         $this->elements = $elements;
@@ -109,4 +109,3 @@ class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ChildDef/StrictBlockquote.php b/library/HTMLPurifier/ChildDef/StrictBlockquote.php
index c4c78810..60dcbc4a 100644
--- a/library/HTMLPurifier/ChildDef/StrictBlockquote.php
+++ b/library/HTMLPurifier/ChildDef/StrictBlockquote.php
@@ -73,4 +73,3 @@ extends HTMLPurifier_ChildDef_Required
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ChildDef/Table.php b/library/HTMLPurifier/ChildDef/Table.php
index 3534cdd0..ca3c83cc 100644
--- a/library/HTMLPurifier/ChildDef/Table.php
+++ b/library/HTMLPurifier/ChildDef/Table.php
@@ -9,6 +9,8 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
 {
     var $allow_empty = false;
     var $type = 'table';
+    var $elements = array('tr' => true, 'tbody' => true, 'thead' => true,
+        'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
     function HTMLPurifier_ChildDef_Table() {}
     function validateChildren($tokens_of_children, $config, &$context) {
         if (empty($tokens_of_children)) return false;
@@ -139,4 +141,3 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php
index 5ba0dfff..b6dff4b5 100644
--- a/library/HTMLPurifier/Config.php
+++ b/library/HTMLPurifier/Config.php
@@ -41,7 +41,7 @@ class HTMLPurifier_Config
     /**
      * HTML Purifier's version
      */
-    var $version = '2.0.0';
+    var $version = '2.0.1';
     
     /**
      * Two-level associative array of configuration directives
@@ -152,11 +152,15 @@ class HTMLPurifier_Config
     /**
      * Returns a md5 signature of a segment of the configuration object
      * that uniquely identifies that particular configuration
+     * @note Revision is handled specially and is removed from the batch
+     *       before processing!
      * @param $namespace Namespace to get serial for
      */
     function getBatchSerial($namespace) {
         if (empty($this->serials[$namespace])) {
-            $this->serials[$namespace] = md5(serialize($this->getBatch($namespace)));
+            $batch = $this->getBatch($namespace);
+            unset($batch['DefinitionRev']);
+            $this->serials[$namespace] = md5(serialize($batch));
         }
         return $this->serials[$namespace];
     }
@@ -243,14 +247,16 @@ class HTMLPurifier_Config
      *             called before it's been setup, otherwise won't work.
      */
     function &getHTMLDefinition($raw = false) {
-        return $this->getDefinition('HTML', $raw);
+        $def =& $this->getDefinition('HTML', $raw);
+        return $def; // prevent PHP 4.4.0 from complaining
     }
     
     /**
      * Retrieves reference to the CSS definition
      */
     function &getCSSDefinition($raw = false) {
-        return $this->getDefinition('CSS', $raw);
+        $def =& $this->getDefinition('CSS', $raw);
+        return $def;
     }
     
     /**
@@ -267,6 +273,7 @@ class HTMLPurifier_Config
             if (!empty($this->definitions[$type])) {
                 if (!$this->definitions[$type]->setup) {
                     $this->definitions[$type]->setup($this);
+                    $cache->set($this->definitions[$type], $this);
                 }
                 return $this->definitions[$type];
             }
@@ -298,7 +305,7 @@ class HTMLPurifier_Config
             if (is_null($this->get($type, 'DefinitionID'))) {
                 // fatally error out if definition ID not set
                 trigger_error("Cannot retrieve raw version without specifying %$type.DefinitionID", E_USER_ERROR);
-                $false = false;
+                $false = new HTMLPurifier_Error();
                 return $false;
             }
             return $this->definitions[$type];
@@ -334,24 +341,77 @@ class HTMLPurifier_Config
     }
     
     /**
+     * Returns a list of array(namespace, directive) for all directives
+     * that are allowed in a web-form context as per an allowed
+     * namespaces/directives list.
+     * @param $allowed List of allowed namespaces/directives
+     * @static
+     */
+    static function getAllowedDirectivesForForm($allowed) {
+        $schema = HTMLPurifier_ConfigSchema::instance();
+        if ($allowed !== true) {
+             if (is_string($allowed)) $allowed = array($allowed);
+             $allowed_ns = array();
+             $allowed_directives = array();
+             $blacklisted_directives = array();
+             foreach ($allowed as $ns_or_directive) {
+                 if (strpos($ns_or_directive, '.') !== false) {
+                     // directive
+                     if ($ns_or_directive[0] == '-') {
+                         $blacklisted_directives[substr($ns_or_directive, 1)] = true;
+                     } else {
+                         $allowed_directives[$ns_or_directive] = true;
+                     }
+                 } else {
+                     // namespace
+                     $allowed_ns[$ns_or_directive] = true;
+                 }
+             }
+        }
+        $ret = array();
+        foreach ($schema->info as $ns => $keypairs) {
+            foreach ($keypairs as $directive => $def) {
+                if ($allowed !== true) {
+                    if (isset($blacklisted_directives["$ns.$directive"])) continue;
+                    if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
+                }
+                if ($def->class == 'alias') continue;
+                if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
+                $ret[] = array($ns, $directive);
+            }
+        }
+        return $ret;
+    }
+    
+    /**
      * Loads configuration values from $_GET/$_POST that were posted
      * via ConfigForm
      * @param $array $_GET or $_POST array to import
      * @param $index Index/name that the config variables are in
+     * @param $allowed List of allowed namespaces/directives 
      * @param $mq_fix Boolean whether or not to enable magic quotes fix
      * @static
      */
-    function loadArrayFromForm($array, $index, $mq_fix = true) {
+    static function loadArrayFromForm($array, $index, $allowed = true, $mq_fix = true) {
         $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
         $mq = get_magic_quotes_gpc() && $mq_fix;
-        foreach ($array as $key => $value) {
-            if (!strncmp($key, 'Null_', 5) && !empty($value)) {
-                unset($array[substr($key, 5)]);
-                unset($array[$key]);
+        
+        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed);
+        $ret = array();
+        foreach ($allowed as $key) {
+            list($ns, $directive) = $key;
+            $skey = "$ns.$directive";
+            if (!empty($array["Null_$skey"])) {
+                $ret[$ns][$directive] = null;
+                continue;
             }
-            if ($mq) $array[$key] = stripslashes($value);
+            if (!isset($array[$skey])) continue;
+            $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
+            $ret[$ns][$directive] = $value;
         }
-        return @HTMLPurifier_Config::create($array);
+        
+        $config = HTMLPurifier_Config::create($ret);
+        return $config;
     }
     
     /**
@@ -392,4 +452,4 @@ class HTMLPurifier_Config
     
 }
 
-?>
+
diff --git a/library/HTMLPurifier/ConfigDef.php b/library/HTMLPurifier/ConfigDef.php
index b92640dc..21825e01 100644
--- a/library/HTMLPurifier/ConfigDef.php
+++ b/library/HTMLPurifier/ConfigDef.php
@@ -7,4 +7,3 @@ class HTMLPurifier_ConfigDef {
     var $class = false;
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ConfigDef/Directive.php b/library/HTMLPurifier/ConfigDef/Directive.php
index 39026540..21c33fae 100644
--- a/library/HTMLPurifier/ConfigDef/Directive.php
+++ b/library/HTMLPurifier/ConfigDef/Directive.php
@@ -62,6 +62,12 @@ class HTMLPurifier_ConfigDef_Directive extends HTMLPurifier_ConfigDef
     var $aliases = array();
     
     /**
+     * Advisory list of directive aliases, i.e. other directives that
+     * redirect here
+     */
+    var $directiveAliases = array();
+    
+    /**
      * Adds a description to the array
      */
     function addDescription($file, $line, $description) {
@@ -71,4 +77,3 @@ class HTMLPurifier_ConfigDef_Directive extends HTMLPurifier_ConfigDef
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ConfigDef/DirectiveAlias.php b/library/HTMLPurifier/ConfigDef/DirectiveAlias.php
index 81a44514..66378026 100644
--- a/library/HTMLPurifier/ConfigDef/DirectiveAlias.php
+++ b/library/HTMLPurifier/ConfigDef/DirectiveAlias.php
@@ -24,4 +24,3 @@ class HTMLPurifier_ConfigDef_DirectiveAlias extends HTMLPurifier_ConfigDef
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ConfigDef/Namespace.php b/library/HTMLPurifier/ConfigDef/Namespace.php
index f53892b4..21d73211 100644
--- a/library/HTMLPurifier/ConfigDef/Namespace.php
+++ b/library/HTMLPurifier/ConfigDef/Namespace.php
@@ -20,4 +20,3 @@ class HTMLPurifier_ConfigDef_Namespace extends HTMLPurifier_ConfigDef {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ConfigSchema.php b/library/HTMLPurifier/ConfigSchema.php
index 5a3fc07e..13ad6036 100644
--- a/library/HTMLPurifier/ConfigSchema.php
+++ b/library/HTMLPurifier/ConfigSchema.php
@@ -67,6 +67,8 @@ class HTMLPurifier_ConfigSchema {
         $this->defineNamespace('URI', 'Features regarding Uniform Resource Identifiers.');
         $this->defineNamespace('HTML', 'Configuration regarding allowed HTML.');
         $this->defineNamespace('CSS', 'Configuration regarding allowed CSS.');
+        $this->defineNamespace('AutoFormat', 'Configuration for activating auto-formatting functionality (also known as <code>Injector</code>s)');
+        $this->defineNamespace('AutoFormatParam', 'Configuration for customizing auto-formatting functionality');
         $this->defineNamespace('Output', 'Configuration relating to the generation of (X)HTML.');
         $this->defineNamespace('Cache', 'Configuration for DefinitionCache and related subclasses.');
         $this->defineNamespace('Test', 'Developer testing configuration for our unit tests.');
@@ -293,6 +295,7 @@ class HTMLPurifier_ConfigSchema {
         $def->info[$namespace][$name] =
             new HTMLPurifier_ConfigDef_DirectiveAlias(
                 $new_namespace, $new_name);
+        $def->info[$new_namespace][$new_name]->directiveAliases[] = "$namespace.$name";
     }
     
     /**
@@ -401,4 +404,4 @@ class HTMLPurifier_ConfigSchema {
     }
 }
 
-?>
+
diff --git a/library/HTMLPurifier/ContentSets.php b/library/HTMLPurifier/ContentSets.php
index 42d87b4d..001f4814 100644
--- a/library/HTMLPurifier/ContentSets.php
+++ b/library/HTMLPurifier/ContentSets.php
@@ -147,4 +147,3 @@ class HTMLPurifier_ContentSets
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Context.php b/library/HTMLPurifier/Context.php
index ce6fe51e..a78a6fb6 100644
--- a/library/HTMLPurifier/Context.php
+++ b/library/HTMLPurifier/Context.php
@@ -2,6 +2,8 @@
 
 /**
  * Registry object that contains information about the current context.
+ * @warning Is a bit buggy when variables are set to null: it thinks
+ *          they don't exist! So use false instead, please.
  */
 class HTMLPurifier_Context
 {
@@ -19,7 +21,7 @@ class HTMLPurifier_Context
      */
     function register($name, &$ref) {
         if (isset($this->_storage[$name])) {
-            trigger_error('Name collision, cannot re-register',
+            trigger_error("Name $name produces collision, cannot re-register",
                           E_USER_ERROR);
             return;
         }
@@ -29,11 +31,14 @@ class HTMLPurifier_Context
     /**
      * Retrieves a variable reference from the context.
      * @param $name String name
+     * @param $ignore_error Boolean whether or not to ignore error
      */
-    function &get($name) {
+    function &get($name, $ignore_error = false) {
         if (!isset($this->_storage[$name])) {
-            trigger_error('Attempted to retrieve non-existent variable',
-                          E_USER_ERROR);
+            if (!$ignore_error) {
+                trigger_error("Attempted to retrieve non-existent variable $name",
+                              E_USER_ERROR);
+            }
             $var = null; // so we can return by reference
             return $var;
         }
@@ -46,7 +51,7 @@ class HTMLPurifier_Context
      */
     function destroy($name) {
         if (!isset($this->_storage[$name])) {
-            trigger_error('Attempted to destroy non-existent variable',
+            trigger_error("Attempted to destroy non-existent variable $name",
                           E_USER_ERROR);
             return;
         }
@@ -73,4 +78,3 @@ class HTMLPurifier_Context
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Definition.php b/library/HTMLPurifier/Definition.php
index f45951bb..8f958e47 100644
--- a/library/HTMLPurifier/Definition.php
+++ b/library/HTMLPurifier/Definition.php
@@ -38,4 +38,3 @@ class HTMLPurifier_Definition
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/DefinitionCache.php b/library/HTMLPurifier/DefinitionCache.php
index 81cd7b33..d4c9d239 100644
--- a/library/HTMLPurifier/DefinitionCache.php
+++ b/library/HTMLPurifier/DefinitionCache.php
@@ -4,6 +4,8 @@ require_once 'HTMLPurifier/DefinitionCache/Serializer.php';
 require_once 'HTMLPurifier/DefinitionCache/Null.php';
 
 require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
+require_once 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
+require_once 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
 
 /**
  * Abstract class representing Definition cache managers that implements
@@ -36,8 +38,8 @@ class HTMLPurifier_DefinitionCache
      */
     function generateKey($config) {
         return $config->version . '-' . // possibly replace with function calls
-               $config->get($this->type, 'DefinitionRev') . '-' .
-               $config->getBatchSerial($this->type);
+               $config->getBatchSerial($this->type) . '-' .
+               $config->get($this->type, 'DefinitionRev');
     }
     
     /**
@@ -47,11 +49,17 @@ class HTMLPurifier_DefinitionCache
      * @param $config Instance of HTMLPurifier_Config to test against
      */
     function isOld($key, $config) {
-        list($version, $revision, $hash) = explode('-', $key, 3);
+        if (substr_count($key, '-') < 2) return true;
+        list($version, $hash, $revision) = explode('-', $key, 3);
         $compare = version_compare($version, $config->version);
-        if ($compare > 0) return false;
-        if ($compare == 0 && $revision >= $config->get($this->type, 'DefinitionRev')) return false;
-        return true;
+        // version mismatch, is always old
+        if ($compare != 0) return true;
+        // versions match, ids match, check revision number
+        if (
+            $hash == $config->getBatchSerial($this->type) &&
+            $revision < $config->get($this->type, 'DefinitionRev')
+        ) return true;
+        return false;
     }
     
     /**
@@ -118,4 +126,3 @@ class HTMLPurifier_DefinitionCache
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/DefinitionCache/Decorator.php b/library/HTMLPurifier/DefinitionCache/Decorator.php
index 46546717..14fca859 100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator.php
+++ b/library/HTMLPurifier/DefinitionCache/Decorator.php
@@ -2,9 +2,6 @@
 
 require_once 'HTMLPurifier/DefinitionCache.php';
 
-require_once 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require_once 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-
 class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
 {
     
@@ -60,4 +57,3 @@ class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCach
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
index f67a0c6a..eb47c433 100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
+++ b/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
@@ -42,4 +42,3 @@ class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
index 91817f9a..c824c2e2 100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
+++ b/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
@@ -45,4 +45,3 @@ class HTMLPurifier_DefinitionCache_Decorator_Memory extends
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
index 71acf0c9..62235e22 100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
+++ b/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
@@ -44,4 +44,3 @@ class HTMLPurifier_DefinitionCache_Decorator_Template extends
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/DefinitionCache/Null.php b/library/HTMLPurifier/DefinitionCache/Null.php
index bc7e25ac..559fc9ba 100644
--- a/library/HTMLPurifier/DefinitionCache/Null.php
+++ b/library/HTMLPurifier/DefinitionCache/Null.php
@@ -34,4 +34,3 @@ class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/DefinitionCache/Serializer.php b/library/HTMLPurifier/DefinitionCache/Serializer.php
index 64b79eba..2b07da13 100644
--- a/library/HTMLPurifier/DefinitionCache/Serializer.php
+++ b/library/HTMLPurifier/DefinitionCache/Serializer.php
@@ -21,14 +21,14 @@ class HTMLPurifier_DefinitionCache_Serializer extends
         if (!$this->checkDefType($def)) return;
         $file = $this->generateFilePath($config);
         if (file_exists($file)) return false;
-        $this->_prepareDir($config);
+        if (!$this->_prepareDir($config)) return false;
         return $this->_write($file, serialize($def));
     }
     
     function set($def, $config) {
         if (!$this->checkDefType($def)) return;
         $file = $this->generateFilePath($config);
-        $this->_prepareDir($config);
+        if (!$this->_prepareDir($config)) return false;
         return $this->_write($file, serialize($def));
     }
     
@@ -36,7 +36,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends
         if (!$this->checkDefType($def)) return;
         $file = $this->generateFilePath($config);
         if (!file_exists($file)) return false;
-        $this->_prepareDir($config);
+        if (!$this->_prepareDir($config)) return false;
         return $this->_write($file, serialize($def));
     }
     
@@ -53,6 +53,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends
     }
     
     function flush($config) {
+        if (!$this->_prepareDir($config)) return false;
         $dir = $this->generateDirectoryPath($config);
         $dh  = opendir($dir);
         while (false !== ($filename = readdir($dh))) {
@@ -63,7 +64,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends
     }
     
     function cleanup($config) {
-        $this->_prepareDir($config);
+        if (!$this->_prepareDir($config)) return false;
         $dir = $this->generateDirectoryPath($config);
         $dh  = opendir($dir);
         while (false !== ($filename = readdir($dh))) {
@@ -88,9 +89,18 @@ class HTMLPurifier_DefinitionCache_Serializer extends
      * @note No trailing slash
      */
     function generateDirectoryPath($config) {
+        $base = $this->generateBaseDirectoryPath($config);
+        return $base . '/' . $this->type;
+    }
+    
+    /**
+     * Generates path to base directory that contains all definition type
+     * serials
+     */
+    function generateBaseDirectoryPath($config) {
         $base = $config->get('Cache', 'SerializerPath');
         $base = is_null($base) ? dirname(__FILE__) . '/Serializer' : $base;
-        return $base . '/' . $this->type;
+        return $base;
     }
     
     /**
@@ -116,14 +126,65 @@ class HTMLPurifier_DefinitionCache_Serializer extends
     
     /**
      * Prepares the directory that this type stores the serials in
+     * @return True if successful
      */
     function _prepareDir($config) {
         $directory = $this->generateDirectoryPath($config);
         if (!is_dir($directory)) {
+            $base = $this->generateBaseDirectoryPath($config);
+            if (!is_dir($base)) {
+                trigger_error('Base directory '.$base.' does not exist,
+                    please create or change using %Cache.SerializerPath',
+                    E_USER_ERROR);
+                return false;
+            } elseif (!$this->_testPermissions($base)) {
+                return false;
+            }
             mkdir($directory);
+        } elseif (!$this->_testPermissions($directory)) {
+            return false;
+        }
+        return true;
+    }
+    
+    /**
+     * Tests permissions on a directory and throws out friendly
+     * error messages and attempts to chmod it itself if possible
+     */
+    function _testPermissions($dir) {
+        // early abort, if it is writable, everything is hunky-dory
+        if (is_writable($dir)) return true;
+        if (!is_dir($dir)) {
+            // generally, you'll want to handle this beforehand
+            // so a more specific error message can be given
+            trigger_error('Directory '.$dir.' does not exist',
+                E_USER_ERROR);
+            return false;
+        }
+        if (function_exists('posix_getuid')) {
+            // POSIX system, we can give more specific advice
+            if (fileowner($dir) === posix_getuid()) {
+                // we can chmod it ourselves
+                chmod($dir, 0755);
+                return true;
+            } elseif (filegroup($dir) === posix_getgid()) {
+                $chmod = '775';
+            } else {
+                // PHP's probably running as nobody, so we'll
+                // need to give global permissions
+                $chmod = '777';
+            }
+            trigger_error('Directory '.$dir.' not writable, '.
+                'please chmod to ' . $chmod,
+                E_USER_ERROR);
+        } else {
+            // generic error message
+            trigger_error('Directory '.$dir.' not writable, '.
+                'please alter file permissions',
+                E_USER_ERROR);
         }
+        return false;
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/DefinitionCacheFactory.php b/library/HTMLPurifier/DefinitionCacheFactory.php
index cf4253e6..b9fa53fe 100644
--- a/library/HTMLPurifier/DefinitionCacheFactory.php
+++ b/library/HTMLPurifier/DefinitionCacheFactory.php
@@ -3,7 +3,7 @@
 require_once 'HTMLPurifier/DefinitionCache.php';
 
 HTMLPurifier_ConfigSchema::define(
-    'Core', 'DefinitionCache', 'Serializer', 'string/null', '
+    'Cache', 'DefinitionImpl', 'Serializer', 'string/null', '
 This directive defines which method to use when caching definitions,
 the complex data-type that makes HTML Purifier tick. Set to null
 to disable caching (not recommended, as you will see a definite
@@ -11,7 +11,12 @@ performance degradation). This directive has been available since 2.0.0.
 ');
 
 HTMLPurifier_ConfigSchema::defineAllowedValues(
-    'Core', 'DefinitionCache', array('Serializer')
+    'Cache', 'DefinitionImpl', array('Serializer')
+);
+
+HTMLPurifier_ConfigSchema::defineAlias(
+    'Core', 'DefinitionCache',
+    'Cache', 'DefinitionImpl'
 );
 
 
@@ -54,7 +59,7 @@ class HTMLPurifier_DefinitionCacheFactory
     function &create($type, $config) {
         // only one implementation as for right now, $config will
         // be used to determine implementation
-        $method = $config->get('Core', 'DefinitionCache');
+        $method = $config->get('Cache', 'DefinitionImpl');
         if ($method === null) {
             $null = new HTMLPurifier_DefinitionCache_Null($type);
             return $null;
@@ -87,4 +92,3 @@ class HTMLPurifier_DefinitionCacheFactory
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Doctype.php b/library/HTMLPurifier/Doctype.php
index d54d5fe1..7afdcd74 100644
--- a/library/HTMLPurifier/Doctype.php
+++ b/library/HTMLPurifier/Doctype.php
@@ -3,6 +3,8 @@
 /**
  * Represents a document type, contains information on which modules
  * need to be loaded.
+ * @note This class is inspected by Printer_HTMLDefinition->renderDoctype.
+ *       If structure changes, please update that function.
  */
 class HTMLPurifier_Doctype
 {
@@ -32,24 +34,33 @@ class HTMLPurifier_Doctype
      */
     var $aliases = array();
     
+    /**
+     * Public DTD identifier
+     */
+    var $dtdPublic;
+    
+    /**
+     * System DTD identifier
+     */
+    var $dtdSystem;
+    
     function HTMLPurifier_Doctype($name = null, $xml = true, $modules = array(),
-        $tidyModules = array(), $aliases = array()
+        $tidyModules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
     ) {
         $this->name         = $name;
         $this->xml          = $xml;
         $this->modules      = $modules;
         $this->tidyModules  = $tidyModules;
         $this->aliases      = $aliases;
+        $this->dtdPublic    = $dtd_public;
+        $this->dtdSystem    = $dtd_system;
     }
     
     /**
      * Clones the doctype, use before resolving modes and the like
      */
     function copy() {
-        return new HTMLPurifier_Doctype(
-            $this->name, $this->xml, $this->modules, $this->tidyModules, $this->aliases
-        );
+        return unserialize(serialize($this));
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/DoctypeRegistry.php b/library/HTMLPurifier/DoctypeRegistry.php
index 57ccd506..e657b3da 100644
--- a/library/HTMLPurifier/DoctypeRegistry.php
+++ b/library/HTMLPurifier/DoctypeRegistry.php
@@ -44,14 +44,14 @@ class HTMLPurifier_DoctypeRegistry
      * @return Reference to registered doctype (usable for further editing)
      */
     function &register($doctype, $xml = true, $modules = array(),
-        $tidy_modules = array(), $aliases = array()
+        $tidy_modules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
     ) {
         if (!is_array($modules)) $modules = array($modules);
         if (!is_array($tidy_modules)) $tidy_modules = array($tidy_modules);
         if (!is_array($aliases)) $aliases = array($aliases);
         if (!is_object($doctype)) {
             $doctype = new HTMLPurifier_Doctype(
-                $doctype, $xml, $modules, $tidy_modules, $aliases
+                $doctype, $xml, $modules, $tidy_modules, $aliases, $dtd_public, $dtd_system
             );
         }
         $this->doctypes[$doctype->name] =& $doctype;
@@ -76,7 +76,7 @@ class HTMLPurifier_DoctypeRegistry
     function &get($doctype) {
         if (isset($this->aliases[$doctype])) $doctype = $this->aliases[$doctype];
         if (!isset($this->doctypes[$doctype])) {
-            trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist');
+            trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist', E_USER_ERROR);
             $anon = new HTMLPurifier_Doctype($doctype);
             return $anon;
         }
@@ -103,9 +103,9 @@ class HTMLPurifier_DoctypeRegistry
     function getDoctypeFromConfig($config) {
         // recommended test
         $doctype = $config->get('HTML', 'Doctype');
-        if ($doctype !== null) {
-            return $doctype;
-        }
+        if (!empty($doctype)) return $doctype;
+        $doctype = $config->get('HTML', 'CustomDoctype');
+        if (!empty($doctype)) return $doctype;
         // backwards-compatibility
         if ($config->get('HTML', 'XHTML')) {
             $doctype = 'XHTML 1.0';
@@ -122,4 +122,3 @@ class HTMLPurifier_DoctypeRegistry
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ElementDef.php b/library/HTMLPurifier/ElementDef.php
index 9c744ed2..f2c8f77a 100644
--- a/library/HTMLPurifier/ElementDef.php
+++ b/library/HTMLPurifier/ElementDef.php
@@ -3,6 +3,8 @@
 /**
  * Structure that stores an HTML element definition. Used by
  * HTMLPurifier_HTMLDefinition and HTMLPurifier_HTMLModule.
+ * @note This class is inspected by HTMLPurifier_Printer_HTMLDefinition.
+ *       Please update that class too.
  */
 class HTMLPurifier_ElementDef
 {
@@ -70,13 +72,6 @@ class HTMLPurifier_ElementDef
     
     
     /**
-     * Lookup table of tags that close this tag. Used during parsing
-     * to make sure we don't attempt to nest unclosed tags.
-     * @public
-     */
-    var $auto_close = array();
-    
-    /**
      * Does the element have a content model (#PCDATA | Inline)*? This
      * is important for chameleon ins and del processing in 
      * HTMLPurifier_ChildDef_Chameleon. Dynamically set: modules don't
@@ -149,7 +144,6 @@ class HTMLPurifier_ElementDef
         }
         $this->_mergeAssocArray($this->attr_transform_pre, $def->attr_transform_pre);
         $this->_mergeAssocArray($this->attr_transform_post, $def->attr_transform_post);
-        $this->_mergeAssocArray($this->auto_close, $def->auto_close);
         $this->_mergeAssocArray($this->excludes, $def->excludes);
         
         if(!empty($def->content_model)) {
@@ -190,4 +184,4 @@ class HTMLPurifier_ElementDef
     
 }
 
-?>
+
diff --git a/library/HTMLPurifier/Encoder.php b/library/HTMLPurifier/Encoder.php
index 9844850a..91992c4c 100644
--- a/library/HTMLPurifier/Encoder.php
+++ b/library/HTMLPurifier/Encoder.php
@@ -398,4 +398,3 @@ class HTMLPurifier_Encoder
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/EntityLookup.php b/library/HTMLPurifier/EntityLookup.php
index a2066c6b..ed3ea3df 100644
--- a/library/HTMLPurifier/EntityLookup.php
+++ b/library/HTMLPurifier/EntityLookup.php
@@ -43,4 +43,3 @@ class HTMLPurifier_EntityLookup {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/EntityParser.php b/library/HTMLPurifier/EntityParser.php
index d5422995..25472413 100644
--- a/library/HTMLPurifier/EntityParser.php
+++ b/library/HTMLPurifier/EntityParser.php
@@ -154,4 +154,3 @@ class HTMLPurifier_EntityParser
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Error.php b/library/HTMLPurifier/Error.php
index adc81dc5..2ca4d732 100644
--- a/library/HTMLPurifier/Error.php
+++ b/library/HTMLPurifier/Error.php
@@ -5,4 +5,3 @@
  */
 class HTMLPurifier_Error {}
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/ErrorCollector.php b/library/HTMLPurifier/ErrorCollector.php
index db0c091e..70ac5d9a 100644
--- a/library/HTMLPurifier/ErrorCollector.php
+++ b/library/HTMLPurifier/ErrorCollector.php
@@ -10,15 +10,54 @@ class HTMLPurifier_ErrorCollector
 {
     
     var $errors = array();
+    var $locale;
+    var $generator;
+    var $context;
+    
+    function HTMLPurifier_ErrorCollector(&$context) {
+        $this->locale  =& $context->get('Locale');
+        $this->generator =& $context->get('Generator');
+        $this->context =& $context;
+    }
     
     /**
      * Sends an error message to the collector for later use
-     * @param string Error message text
-     * @param HTMLPurifier_Token Token that caused error
-     * @param array Tokens surrounding the offending token above, use true as placeholder
+     * @param $line Integer line number, or HTMLPurifier_Token that caused error
+     * @param $severity int Error severity, PHP error style (don't use E_USER_)
+     * @param $msg string Error message text
      */
-    function send($msg, $token, $context_tokens = array(true)) {
-        $this->errors[] = array($msg, $token, $context_tokens);
+    function send($severity, $msg) {
+        
+        $args = array();
+        if (func_num_args() > 2) {
+            $args = func_get_args();
+            array_shift($args);
+            unset($args[0]);
+        }
+        
+        $token = $this->context->get('CurrentToken', true);
+        $line  = $token ? $token->line : $this->context->get('CurrentLine', true);
+        $attr  = $this->context->get('CurrentAttr', true);
+        
+        // perform special substitutions, also add custom parameters
+        $subst = array();
+        if (!is_null($token)) {
+            $args['CurrentToken'] = $token;
+        }
+        if (!is_null($attr)) {
+            $subst['$CurrentAttr.Name'] = $attr;
+            if (isset($token->attr[$attr])) $subst['$CurrentAttr.Value'] = $token->attr[$attr];
+        }
+        
+        if (empty($args)) {
+            $msg = $this->locale->getMessage($msg);
+        } else {
+            $msg = $this->locale->formatMessage($msg, $args);
+        }
+        
+        if (!empty($subst)) $msg = strtr($msg, $subst);
+        
+        $this->errors[] = array($line, $severity, $msg);
     }
     
     /**
@@ -35,39 +74,45 @@ class HTMLPurifier_ErrorCollector
      * @param $config Configuration array, vital for HTML output nature
      */
     function getHTMLFormatted($config) {
-        $generator = new HTMLPurifier_Generator();
-        $context = new HTMLPurifier_Context();
-        $generator->generateFromTokens(array(), $config, $context); // initialize
         $ret = array();
         
         $errors = $this->errors;
         
         // sort error array by line
-        if ($config->get('Core', 'MaintainLineNumbers')) {
-            $lines  = array();
-            foreach ($errors as $error) $lines[] = $error[1]->line;
-            array_multisort($lines, SORT_ASC, $errors);
+        // line numbers are enabled if they aren't explicitly disabled
+        if ($config->get('Core', 'MaintainLineNumbers') !== false) {
+            $has_line       = array();
+            $lines          = array();
+            $original_order = array();
+            foreach ($errors as $i => $error) {
+                $has_line[] = (int) (bool) $error[0];
+                $lines[] = $error[0];
+                $original_order[] = $i;
+            }
+            array_multisort($has_line, SORT_DESC, $lines, SORT_ASC, $original_order, SORT_ASC, $errors);
         }
         
         foreach ($errors as $error) {
-            $string = $generator->escape($error[0]); // message
-            if (!empty($error[1]->line)) {
-                $string .= ' at line ' . $error[1]->line;
+            list($line, $severity, $msg) = $error;
+            $string = '';
+            $string .= '<strong>' . $this->locale->getErrorName($severity) . '</strong>: ';
+            $string .= $this->generator->escape($msg); 
+            if ($line) {
+                // have javascript link generation that causes 
+                // textarea to skip to the specified line
+                $string .= $this->locale->formatMessage(
+                    'ErrorCollector: At line', array('line' => $line));
             }
-            $string .= ' (<code>';
-            foreach ($error[2] as $token) {
-                if ($token !== true) {
-                    $string .= $generator->escape($generator->generateFromToken($token));
-                } else {
-                    $string .= '<strong>' . $generator->escape($generator->generateFromToken($error[1])) . '</strong>';
-                }
-            }
-            $string .= '</code>)';
             $ret[] = $string;
         }
-        return $ret;
+        
+        if (empty($errors)) {
+            return '<p>' . $this->locale->getMessage('ErrorCollector: No errors') . '</p>';
+        } else {
+            return '<ul><li>' . implode('</li><li>', $ret) . '</li></ul>';
+        }
+        
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Filter.php b/library/HTMLPurifier/Filter.php
index 94c5ae7b..99cdeeba 100644
--- a/library/HTMLPurifier/Filter.php
+++ b/library/HTMLPurifier/Filter.php
@@ -36,4 +36,3 @@ class HTMLPurifier_Filter
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Filter/YouTube.php b/library/HTMLPurifier/Filter/YouTube.php
index 433f17cf..4f63ad6d 100644
--- a/library/HTMLPurifier/Filter/YouTube.php
+++ b/library/HTMLPurifier/Filter/YouTube.php
@@ -31,4 +31,3 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Generator.php b/library/HTMLPurifier/Generator.php
index 63750e9c..5322b8c2 100644
--- a/library/HTMLPurifier/Generator.php
+++ b/library/HTMLPurifier/Generator.php
@@ -4,7 +4,7 @@ HTMLPurifier_ConfigSchema::define(
     'Output', 'CommentScriptContents', true, 'bool',
     'Determines whether or not HTML Purifier should attempt to fix up '.
     'the contents of script tags for legacy browsers with comments. This '.
-    'directive was available since 1.7.'
+    'directive was available since 2.0.0.'
 );
 HTMLPurifier_ConfigSchema::defineAlias('Core', 'CommentScriptContents', 'Output', 'CommentScriptContents');
 
@@ -35,9 +35,19 @@ HTML
 );
 HTMLPurifier_ConfigSchema::defineAlias('Core', 'TidyFormat', 'Output', 'TidyFormat');
 
+HTMLPurifier_ConfigSchema::define('Output', 'Newline', null, 'string/null', '
+<p>
+    Newline string to format final output with. If left null, HTML Purifier
+    will auto-detect the default newline type of the system and use that;
+    you can manually override it here. Remember, \r\n is Windows, \r
+    is Mac, and \n is Unix. This directive was available since 2.0.1.
+</p>
+');
+
 /**
  * Generates HTML from tokens.
- * @todo Create a configuration-wide instance that all objects retrieve
+ * @todo Refactor interface so that configuration/context is determined
+ *     upon instantiation, no need for messy generateFromTokens() calls
  */
 class HTMLPurifier_Generator
 {
@@ -76,13 +86,17 @@ class HTMLPurifier_Generator
         
         if (!$tokens) return '';
         for ($i = 0, $size = count($tokens); $i < $size; $i++) {
-            if ($this->_scriptFix && $tokens[$i]->name === 'script') {
+            if ($this->_scriptFix && $tokens[$i]->name === 'script'
+                && $i + 2 < $size && $tokens[$i+2]->type == 'end') {
                 // script special case
+                // the contents of the script block must be ONE token
+                // for this to work
                 $html .= $this->generateFromToken($tokens[$i++]);
                 $html .= $this->generateScriptFromToken($tokens[$i++]);
-                while ($tokens[$i]->name != 'script') {
-                    $html .= $this->generateScriptFromToken($tokens[$i++]);
-                }
+                // We're not going to do this: it wouldn't be valid anyway
+                //while ($tokens[$i]->name != 'script') {
+                //    $html .= $this->generateScriptFromToken($tokens[$i++]);
+                //}
             }
             $html .= $this->generateFromToken($tokens[$i]);
         }
@@ -110,6 +124,10 @@ class HTMLPurifier_Generator
                 $html = (string) $tidy;
             }
         }
+        // normalize newlines to system
+        $nl = $config->get('Output', 'Newline');
+        if ($nl === null) $nl = PHP_EOL;
+        $html = str_replace("\n", $nl, $html);
         return $html;
     }
     
@@ -148,10 +166,12 @@ class HTMLPurifier_Generator
      *          --> somewhere inside the script contents.
      */
     function generateScriptFromToken($token) {
-        if (!$token->type == 'text') return $this->generateFromToken($token);
-        return '<!--' . PHP_EOL . $token->data . PHP_EOL . '// -->';
+        if ($token->type != 'text') return $this->generateFromToken($token);
+        // return '<!--' . "\n" . trim($token->data) . "\n" . '// -->';
         // more advanced version:
-        // return '<!--//--><![CDATA[//><!--' . PHP_EOL . $token->data . PHP_EOL . '//--><!]]>';
+        // thanks <http://lachy.id.au/log/2005/05/script-comments>
+        $data = preg_replace('#//\s*$#', '', $token->data);
+        return '<!--//--><![CDATA[//><!--' . "\n" . trim($data) . "\n" . '//--><!]]>';
     }
     
     /**
@@ -186,4 +206,3 @@ class HTMLPurifier_Generator
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLDefinition.php b/library/HTMLPurifier/HTMLDefinition.php
index dc7a07b9..9ed413c7 100644
--- a/library/HTMLPurifier/HTMLDefinition.php
+++ b/library/HTMLPurifier/HTMLDefinition.php
@@ -145,8 +145,8 @@ HTMLPurifier_ConfigSchema::define(
  * Purifier internals. Many of them, however, are public, and may be
  * edited by userspace code to tweak the behavior of HTMLDefinition.
  * 
- * HTMLPurifier_Printer_HTMLDefinition is a notable exception to this
- * rule: in the interest of comprehensiveness, it will sniff everything.
+ * @note This class is inspected by Printer_HTMLDefinition; please
+ *       update that class if things here change.
  */
 class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
 {
@@ -451,4 +451,4 @@ class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
     
 }
 
-?>
+
diff --git a/library/HTMLPurifier/HTMLModule.php b/library/HTMLPurifier/HTMLModule.php
index 4560a184..077daff8 100644
--- a/library/HTMLPurifier/HTMLModule.php
+++ b/library/HTMLPurifier/HTMLModule.php
@@ -221,4 +221,3 @@ class HTMLPurifier_HTMLModule
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Bdo.php b/library/HTMLPurifier/HTMLModule/Bdo.php
index 84b9a0b0..2d9dffb6 100644
--- a/library/HTMLPurifier/HTMLModule/Bdo.php
+++ b/library/HTMLPurifier/HTMLModule/Bdo.php
@@ -31,4 +31,3 @@ class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/library/HTMLPurifier/HTMLModule/CommonAttributes.php
index 34b991f6..7e291c4a 100644
--- a/library/HTMLPurifier/HTMLModule/CommonAttributes.php
+++ b/library/HTMLPurifier/HTMLModule/CommonAttributes.php
@@ -24,4 +24,3 @@ class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
     );
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Edit.php b/library/HTMLPurifier/HTMLModule/Edit.php
index 1d14ce8d..37a53c33 100644
--- a/library/HTMLPurifier/HTMLModule/Edit.php
+++ b/library/HTMLPurifier/HTMLModule/Edit.php
@@ -38,4 +38,3 @@ class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Hypertext.php b/library/HTMLPurifier/HTMLModule/Hypertext.php
index a9a9d352..74aa6929 100644
--- a/library/HTMLPurifier/HTMLModule/Hypertext.php
+++ b/library/HTMLPurifier/HTMLModule/Hypertext.php
@@ -30,4 +30,3 @@ class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Image.php b/library/HTMLPurifier/HTMLModule/Image.php
index 6b1574c3..64ce2a09 100644
--- a/library/HTMLPurifier/HTMLModule/Image.php
+++ b/library/HTMLPurifier/HTMLModule/Image.php
@@ -34,4 +34,3 @@ class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Legacy.php b/library/HTMLPurifier/HTMLModule/Legacy.php
index 5ec1f66b..f702b581 100644
--- a/library/HTMLPurifier/HTMLModule/Legacy.php
+++ b/library/HTMLPurifier/HTMLModule/Legacy.php
@@ -138,4 +138,3 @@ class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/List.php b/library/HTMLPurifier/HTMLModule/List.php
index 894ac5aa..dea99f36 100644
--- a/library/HTMLPurifier/HTMLModule/List.php
+++ b/library/HTMLPurifier/HTMLModule/List.php
@@ -26,8 +26,7 @@ class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
         $this->addElement('ul', true, 'List', 'Required: li', 'Common');
         $this->addElement('dl', true, 'List', 'Required: dt | dd', 'Common');
         
-        $li =& $this->addElement('li', true, false, 'Flow', 'Common');
-        $li->auto_close = array('li' => true);
+        $this->addElement('li', true, false, 'Flow', 'Common');
         
         $this->addElement('dd', true, false, 'Flow', 'Common');
         $this->addElement('dt', true, false, 'Inline', 'Common');
@@ -35,4 +34,3 @@ class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
index a0fed7e6..6d209975 100644
--- a/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
+++ b/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
@@ -13,4 +13,3 @@ class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLMo
     );
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Presentation.php b/library/HTMLPurifier/HTMLModule/Presentation.php
index dbcaba27..9e483dc1 100644
--- a/library/HTMLPurifier/HTMLModule/Presentation.php
+++ b/library/HTMLPurifier/HTMLModule/Presentation.php
@@ -30,4 +30,3 @@ class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Scripting.php b/library/HTMLPurifier/HTMLModule/Scripting.php
index 56eff967..d9f9db1a 100644
--- a/library/HTMLPurifier/HTMLModule/Scripting.php
+++ b/library/HTMLPurifier/HTMLModule/Scripting.php
@@ -5,14 +5,6 @@
 WARNING: THIS MODULE IS EXTREMELY DANGEROUS AS IT ENABLES INLINE SCRIPTING
 INSIDE HTML PURIFIER DOCUMENTS. USE ONLY WITH TRUSTED USER INPUT!!!
 
-Usage:
-
-require_once 'HTMLPurifier/HTMLModule/Scripting.php';
-$def =& $config->getHTMLDefinition(true); // get the raw version
-$def->manager->addModule('Scripting');
-
-This must come before any other calls to getHTMLDefinition()
-
 */
 
 /**
@@ -63,9 +55,9 @@ class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule
         );
         $this->info['script']->content_model = '#PCDATA';
         $this->info['script']->content_model_type = 'optional';
+        $this->info['script']->attr_transform_pre['type'] =
         $this->info['script']->attr_transform_post['type'] =
             new HTMLPurifier_AttrTransform_ScriptRequired();
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/StyleAttribute.php b/library/HTMLPurifier/HTMLModule/StyleAttribute.php
index 5ee5d1cf..d121d740 100644
--- a/library/HTMLPurifier/HTMLModule/StyleAttribute.php
+++ b/library/HTMLPurifier/HTMLModule/StyleAttribute.php
@@ -24,4 +24,3 @@ class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Tables.php b/library/HTMLPurifier/HTMLModule/Tables.php
index 043c8101..2b2d41ce 100644
--- a/library/HTMLPurifier/HTMLModule/Tables.php
+++ b/library/HTMLPurifier/HTMLModule/Tables.php
@@ -56,10 +56,7 @@ class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
             $cell_align
         );
         $this->addElement('col',      true, false, 'Empty',         'Common', $cell_col);
-        $colgroup =& $this->addElement('colgroup', true, false, 'Optional: col', 'Common', $cell_col);
-        $colgroup->auto_close = $this->makeLookup(
-            'thead', 'tbody', 'tfoot', 'tr'
-        );
+        $this->addElement('colgroup', true, false, 'Optional: col', 'Common', $cell_col);
         
         $this->addElement('tbody', true, false, 'Required: tr', 'Common', $cell_align);
         $this->addElement('thead', true, false, 'Required: tr', 'Common', $cell_align);
@@ -69,4 +66,3 @@ class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Target.php b/library/HTMLPurifier/HTMLModule/Target.php
index 6cb8e510..57da9c3a 100644
--- a/library/HTMLPurifier/HTMLModule/Target.php
+++ b/library/HTMLPurifier/HTMLModule/Target.php
@@ -22,4 +22,3 @@ class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Text.php b/library/HTMLPurifier/HTMLModule/Text.php
index c8abe1d7..2ebb9d68 100644
--- a/library/HTMLPurifier/HTMLModule/Text.php
+++ b/library/HTMLPurifier/HTMLModule/Text.php
@@ -55,17 +55,10 @@ class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule
         $this->addElement('h6', true, 'Heading', 'Inline', 'Common');
         
         // Block Structural -----------------------------------------------
-        $p =& $this->addElement('p', true, 'Block', 'Inline', 'Common');
-        // this seems really ad hoc: implementing some general
-        // heuristics would probably be better
-        $p->auto_close = $this->makeLookup(
-            'address', 'blockquote', 'dd', 'dir', 'div', 'dl', 'dt',
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'ol', 'p', 'pre',
-            'table', 'ul' );
+        $this->addElement('p', true, 'Block', 'Inline', 'Common');
         $this->addElement('div', true, 'Block', 'Flow', 'Common');
         
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Tidy.php b/library/HTMLPurifier/HTMLModule/Tidy.php
index b81bf3ad..411fd47b 100644
--- a/library/HTMLPurifier/HTMLModule/Tidy.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy.php
@@ -238,4 +238,4 @@ class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
     
 }
 
-?>
\ No newline at end of file
+
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
index 624b066d..3b4b1160 100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
@@ -15,4 +15,3 @@ class HTMLPurifier_HTMLModule_Tidy_Proprietary extends
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
index 78ddef47..0dea8b00 100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
@@ -18,4 +18,3 @@ class HTMLPurifier_HTMLModule_Tidy_XHTML extends
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
index 4d70cafc..386cf365 100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
@@ -190,4 +190,3 @@ class HTMLPurifier_HTMLModule_Tidy_Strict extends
     var $defaultLevel = 'light';
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/XHTMLStrict.php b/library/HTMLPurifier/HTMLModule/Tidy/XHTMLStrict.php
index b985870a..b701491e 100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/XHTMLStrict.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/XHTMLStrict.php
@@ -24,4 +24,3 @@ class HTMLPurifier_HTMLModule_Tidy_XHTMLStrict extends
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
index 341a8761..67f7fc8a 100644
--- a/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
+++ b/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
@@ -13,4 +13,3 @@ class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModul
     );
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/HTMLModuleManager.php b/library/HTMLPurifier/HTMLModuleManager.php
index f6b1b089..69628dd8 100644
--- a/library/HTMLPurifier/HTMLModuleManager.php
+++ b/library/HTMLPurifier/HTMLModuleManager.php
@@ -37,13 +37,26 @@ require_once 'HTMLPurifier/HTMLModule/Tidy/XHTMLStrict.php';
 require_once 'HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
 
 HTMLPurifier_ConfigSchema::define(
-    'HTML', 'Doctype', null, 'string/null',
-    'Doctype to use, pre-defined values are HTML 4.01 Transitional, HTML 4.01 '.
-    'Strict, XHTML 1.0 Transitional, XHTML 1.0 Strict, XHTML 1.1. '.
+    'HTML', 'Doctype', '', 'string',
+    'Doctype to use during filtering. '.
     'Technically speaking this is not actually a doctype (as it does '.
     'not identify a corresponding DTD), but we are using this name '.
-    'for sake of simplicity. This will override any older directives '.
-    'like %Core.XHTML or %HTML.Strict.'
+    'for sake of simplicity. When non-blank, this will override any older directives '.
+    'like %HTML.XHTML or %HTML.Strict.'
+);
+HTMLPurifier_ConfigSchema::defineAllowedValues('HTML', 'Doctype', array(
+    '', 'HTML 4.01 Transitional', 'HTML 4.01 Strict',
+    'XHTML 1.0 Transitional', 'XHTML 1.0 Strict',
+    'XHTML 1.1'
+));
+
+HTMLPurifier_ConfigSchema::define(
+    'HTML', 'CustomDoctype', null, 'string/null',
+'
+A custom doctype for power-users who defined there own document
+type. This directive only applies when %HTML.Doctype is blank.
+This directive has been available since 2.0.1.
+'
 );
 
 HTMLPurifier_ConfigSchema::define(
@@ -167,31 +180,46 @@ class HTMLPurifier_HTMLModuleManager
         $this->doctypes->register(
             'HTML 4.01 Transitional', false,
             array_merge($common, $transitional, $non_xml),
-            array('Tidy_Transitional', 'Tidy_Proprietary')
+            array('Tidy_Transitional', 'Tidy_Proprietary'),
+            array(),
+            '-//W3C//DTD HTML 4.01 Transitional//EN',
+            'http://www.w3.org/TR/html4/loose.dtd'
         );
         
         $this->doctypes->register(
             'HTML 4.01 Strict', false,
             array_merge($common, $non_xml),
-            array('Tidy_Strict', 'Tidy_Proprietary')
+            array('Tidy_Strict', 'Tidy_Proprietary'),
+            array(),
+            '-//W3C//DTD HTML 4.01//EN',
+            'http://www.w3.org/TR/html4/strict.dtd'
         );
         
         $this->doctypes->register(
             'XHTML 1.0 Transitional', true,
             array_merge($common, $transitional, $xml, $non_xml),
-            array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary')
+            array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary'),
+            array(),
+            '-//W3C//DTD XHTML 1.0 Transitional//EN',
+            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
         );
         
         $this->doctypes->register(
             'XHTML 1.0 Strict', true,
             array_merge($common, $xml, $non_xml),
-            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_XHTMLStrict', 'Tidy_Proprietary')
+            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_XHTMLStrict', 'Tidy_Proprietary'),
+            array(),
+            '-//W3C//DTD XHTML 1.0 Strict//EN',
+            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
         );
         
         $this->doctypes->register(
             'XHTML 1.1', true,
             array_merge($common, $xml),
-            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary') // Tidy_XHTML1_1
+            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary'), // Tidy_XHTML1_1
+            array(),
+            '-//W3C//DTD XHTML 1.1//EN',
+            'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
         );
         
     }
@@ -461,4 +489,4 @@ class HTMLPurifier_HTMLModuleManager
     
 }
 
-?>
+
diff --git a/library/HTMLPurifier/IDAccumulator.php b/library/HTMLPurifier/IDAccumulator.php
index 40ff2384..525c9aa0 100644
--- a/library/HTMLPurifier/IDAccumulator.php
+++ b/library/HTMLPurifier/IDAccumulator.php
@@ -39,4 +39,3 @@ class HTMLPurifier_IDAccumulator
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Injector.php b/library/HTMLPurifier/Injector.php
new file mode 100644
index 00000000..939f307e
--- /dev/null
+++ b/library/HTMLPurifier/Injector.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Injects tokens into the document while parsing for well-formedness.
+ * This enables "formatter-like" functionality such as auto-paragraphing,
+ * smiley-ification and linkification to take place.
+ */
+class HTMLPurifier_Injector
+{
+    
+    /**
+     * Amount of tokens the injector needs to skip + 1. Because
+     * the decrement is the first thing that happens, this needs to
+     * be one greater than the "real" skip count.
+     */
+    var $skip = 1;
+    
+    /**
+     * Instance of HTMLPurifier_HTMLDefinition
+     */
+    var $htmlDefinition;
+    
+    /**
+     * Reference to CurrentNesting variable in Context. This is an array
+     * list of tokens that we are currently "inside"
+     */
+    var $currentNesting;
+    
+    /**
+     * Reference to InputTokens variable in Context. This is an array
+     * list of the input tokens that are being processed.
+     */
+    var $inputTokens;
+    
+    /**
+     * Reference to InputIndex variable in Context. This is an integer
+     * array index for $this->inputTokens that indicates what token
+     * is currently being processed.
+     */
+    var $inputIndex;
+    
+    /**
+     * Prepares the injector by giving it the config and context objects,
+     * so that important variables can be extracted and not passed via
+     * parameter constantly. Remember: always instantiate a new injector
+     * when handling a set of HTML.
+     */
+    function prepare($config, &$context) {
+        $this->htmlDefinition = $config->getHTMLDefinition();
+        $this->currentNesting =& $context->get('CurrentNesting');
+        $this->inputTokens    =& $context->get('InputTokens');
+        $this->inputIndex     =& $context->get('InputIndex');
+    }
+    
+    /**
+     * Tests if the context node allows a certain element
+     * @param $name Name of element to test for
+     * @return True if element is allowed, false if it is not
+     */
+    function allowsElement($name) {
+        if (!empty($this->currentNesting)) {
+            $parent_token = array_pop($this->currentNesting);
+            $this->currentNesting[] = $parent_token;
+            $parent = $this->htmlDefinition->info[$parent_token->name];
+        } else {
+            $parent = $this->htmlDefinition->info_parent_def;
+        }
+        if (!isset($parent->child->elements[$name]) || isset($parent->excludes[$name])) {
+            return false;
+        }
+        return true;
+    }
+    
+    /**
+     * Handler that is called when a text token is processed
+     */
+    function handleText(&$token, $config, &$context) {}
+    
+    /**
+     * Handler that is called when a start token is processed
+     */
+    function handleStart(&$token, $config, &$context) {}
+    
+}
+
diff --git a/library/HTMLPurifier/Injector/AutoParagraph.php b/library/HTMLPurifier/Injector/AutoParagraph.php
new file mode 100644
index 00000000..e8e2e34f
--- /dev/null
+++ b/library/HTMLPurifier/Injector/AutoParagraph.php
@@ -0,0 +1,244 @@
+<?php
+
+require_once 'HTMLPurifier/Injector.php';
+
+HTMLPurifier_ConfigSchema::define(
+    'AutoFormat', 'AutoParagraph', false, 'bool', '
+<p>
+  This directive turns on auto-paragraphing, where double newlines are
+  converted in to paragraphs whenever possible. Auto-paragraphing
+  applies when:
+</p>
+<ul>
+  <li>There are inline elements or text in the root node</li>
+  <li>There are inline elements or text with double newlines or
+      block elements in nodes that allow paragraph tags</li>
+  <li>There are double newlines in paragraph tags</li>
+</ul>
+<p>
+  This directive has been available since 2.0.1.
+</p>
+');
+
+/**
+ * Injector that auto paragraphs text in the root node based on
+ * double-spacing.
+ */
+class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
+{
+    
+    function _pStart() {
+        $par = new HTMLPurifier_Token_Start('p');
+        $par->armor['MakeWellFormed_TagClosedError'] = true;
+        return $par;
+    }
+    
+    function handleText(&$token, $config, &$context) {
+        $text = $token->data;
+        if (empty($this->currentNesting)) {
+            if (!$this->allowsElement('p')) return;
+            // case 1: we're in root node (and it allows paragraphs)
+            $token = array($this->_pStart());
+            $this->_splitText($text, $token);
+        } elseif ($this->currentNesting[count($this->currentNesting)-1]->name == 'p') {
+            // case 2: we're in a paragraph
+            $token = array();
+            $this->_splitText($text, $token);
+        } elseif ($this->allowsElement('p')) {
+            // case 3: we're in an element that allows paragraphs
+            if (strpos($text, "\n\n") !== false) {
+                // case 3.1: this text node has a double-newline
+                $token = array($this->_pStart());
+                $this->_splitText($text, $token);
+            } else {
+                $ok = false;
+                // test if up-coming tokens are either block or have
+                // a double newline in them
+                for ($i = $this->inputIndex + 1; isset($this->inputTokens[$i]); $i++) {
+                    if ($this->inputTokens[$i]->type == 'start'){
+                        if (!$this->_isInline($this->inputTokens[$i])) {
+                            $ok = true;
+                        }
+                        break;
+                    }
+                    if ($this->inputTokens[$i]->type == 'end') break;
+                    if ($this->inputTokens[$i]->type == 'text') {
+                        if (strpos($this->inputTokens[$i]->data, "\n\n") !== false) {
+                            $ok = true;
+                        }
+                        if (!$this->inputTokens[$i]->is_whitespace) break;
+                    }
+                }
+                if ($ok) {
+                    // case 3.2: this text node is next to another node
+                    // that will start a paragraph
+                    $token = array($this->_pStart(), $token);
+                }
+            }
+        }
+        
+    }
+    
+    function handleStart(&$token, $config, &$context) {
+        // check if we're inside a tag already
+        if (!empty($this->currentNesting)) {
+            if ($this->allowsElement('p')) {
+                // special case: we're in an element that allows paragraphs
+                
+                // this token is already paragraph, abort
+                if ($token->name == 'p') return;
+                
+                // check if this token is adjacent to the parent
+                if ($this->inputTokens[$this->inputIndex - 1]->type != 'start') {
+                    // not adjacent, we can abort early
+                    // add lead paragraph tag if our token is inline
+                    if ($this->_isInline($token)) {
+                        $token = array($this->_pStart(), $token);
+                    }
+                    return;
+                }
+                
+                // this token is the first child of the element that allows
+                // paragraph. We have to peek ahead and see whether or not
+                // there is anything inside that suggests that a paragraph
+                // will be needed
+                $ok = false;
+                // maintain a mini-nesting counter, this lets us bail out
+                // early if possible
+                $j = 2; // current nesting, is two due to parent and this start
+                for ($i = $this->inputIndex + 1; isset($this->inputTokens[$i]); $i++) {
+                    if ($this->inputTokens[$i]->type == 'start') $j++;
+                    if ($this->inputTokens[$i]->type == 'end') $j--;
+                    if ($this->inputTokens[$i]->type == 'text') {
+                        if (strpos($this->inputTokens[$i]->data, "\n\n") !== false) {
+                            $ok = true;
+                            break;
+                        }
+                    }
+                    if ($j <= 0) break;
+                }
+                if ($ok) {
+                    $token = array($this->_pStart(), $token);
+                }
+            }
+            return;
+        }
+        
+        // check if the start tag counts as a "block" element
+        if (!$this->_isInline($token)) return;
+        
+        // append a paragraph tag before the token
+        $token = array($this->_pStart(), $token);
+    }
+    
+    /**
+     * Splits up a text in paragraph tokens and appends them
+     * to the result stream that will replace the original
+     * @param $data String text data that will be processed
+     *    into paragraphs
+     * @param $result Reference to array of tokens that the
+     *    tags will be appended onto
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     * @private
+     */
+    function _splitText($data, &$result) {
+        $raw_paragraphs = explode("\n\n", $data);
+        
+        // remove empty paragraphs
+        $paragraphs = array();
+        $needs_start = false;
+        $needs_end   = false;
+        
+        for ($i = 0, $c = count($raw_paragraphs); $i < $c; $i++) {
+            $par = $raw_paragraphs[$i];
+            if (trim($par) !== '') {
+                $paragraphs[] = $par;
+                continue;
+            }
+            if ($i == 0 && empty($result)) {
+                // The empty result indicates that the AutoParagraph
+                // injector did not add any start paragraph tokens.
+                // The fact that the first paragraph is empty indicates
+                // that there was a double-newline at the start of the
+                // data.
+                // Combined together, this means that we are in a paragraph,
+                // and the newline means we should start a new one.
+                $result[] = new HTMLPurifier_Token_End('p');
+                // However, the start token should only be added if 
+                // there is more processing to be done (i.e. there are
+                // real paragraphs in here). If there are none, the
+                // next start paragraph tag will be handled by the
+                // next run-around the injector
+                $needs_start = true;
+            } elseif ($i + 1 == $c) {
+                // a double-paragraph at the end indicates that
+                // there is an overriding need to start a new paragraph
+                // for the next section. This has no effect until
+                // we've processed all of the other paragraphs though
+                $needs_end = true;
+            }
+        }
+        
+        // check if there are no "real" paragraphs to be processed
+        if (empty($paragraphs)) {
+            return;
+        }
+        
+        // add a start tag if an end tag was added while processing
+        // the raw paragraphs (that happens if there's a leading double
+        // newline)
+        if ($needs_start) $result[] = $this->_pStart();
+        
+        // append the paragraphs onto the result
+        foreach ($paragraphs as $par) {
+            $result[] = new HTMLPurifier_Token_Text($par);
+            $result[] = new HTMLPurifier_Token_End('p');
+            $result[] = $this->_pStart();
+        }
+        
+        // remove trailing start token, if one is needed, it will
+        // be handled the next time this injector is called
+        array_pop($result);
+        
+        // check the outside to determine whether or not the
+        // end paragraph tag should be removed. It should be removed
+        // unless the next non-whitespace token is a paragraph
+        // or a block element.
+        $remove_paragraph_end = true;
+        
+        if (!$needs_end) {
+            // Start of the checks one after the current token's index
+            for ($i = $this->inputIndex + 1; isset($this->inputTokens[$i]); $i++) {
+                if ($this->inputTokens[$i]->type == 'start' || $this->inputTokens[$i]->type == 'empty') {
+                    $remove_paragraph_end = $this->_isInline($this->inputTokens[$i]);
+                }
+                // check if we can abort early (whitespace means we carry-on!)
+                if ($this->inputTokens[$i]->type == 'text' && !$this->inputTokens[$i]->is_whitespace) break;
+                // end tags will automatically be handled by MakeWellFormed,
+                // so we don't have to worry about them
+                if ($this->inputTokens[$i]->type == 'end') break;
+            }
+        } else {
+            $remove_paragraph_end = false;
+        }
+        
+        // check the outside to determine whether or not the
+        // end paragraph tag should be removed
+        if ($remove_paragraph_end) {
+            array_pop($result);
+        }
+        
+    }
+    
+    /**
+     * Returns true if passed token is inline (and, ergo, allowed in
+     * paragraph tags)
+     * @private
+     */
+    function _isInline($token) {
+        return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
+    }
+    
+}
+
diff --git a/library/HTMLPurifier/Injector/Linkify.php b/library/HTMLPurifier/Injector/Linkify.php
new file mode 100644
index 00000000..7ada1d7a
--- /dev/null
+++ b/library/HTMLPurifier/Injector/Linkify.php
@@ -0,0 +1,52 @@
+<?php
+
+require_once 'HTMLPurifier/Injector.php';
+
+HTMLPurifier_ConfigSchema::define(
+    'AutoFormat', 'Linkify', false, 'bool', '
+<p>
+  This directive turns on linkification, auto-linking http, ftp and
+  https URLs. This directive has been available since 2.0.1.
+</p>
+');
+
+/**
+ * Injector that converts http, https and ftp text URLs to actual links.
+ */
+class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
+{
+    
+    function handleText(&$token, $config, &$context) {
+        if (!$this->allowsElement('a')) return;
+        
+        if (strpos($token->data, '://') === false) {
+            // our really quick heuristic failed, abort
+            // this may not work so well if we want to match things like
+            // "google.com", but then again, most people don't
+            return;
+        }
+        
+        // there is/are URL(s). Let's split the string:
+        // Note: this regex is extremely permissive
+        $bits = preg_split('#((?:https?|ftp)://[^\s\'"<>()]+)#S', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+        
+        $token = array();
+        
+        // $i = index
+        // $c = count
+        // $l = is link
+        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
+            if (!$l) {
+                if ($bits[$i] === '') continue;
+                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
+            } else {
+                $token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));
+                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
+                $token[] = new HTMLPurifier_Token_End('a');
+            }
+        }
+        
+    }
+    
+}
+
diff --git a/library/HTMLPurifier/Injector/PurifierLinkify.php b/library/HTMLPurifier/Injector/PurifierLinkify.php
new file mode 100644
index 00000000..d6f2e607
--- /dev/null
+++ b/library/HTMLPurifier/Injector/PurifierLinkify.php
@@ -0,0 +1,62 @@
+<?php
+
+require_once 'HTMLPurifier/Injector.php';
+
+HTMLPurifier_ConfigSchema::define(
+    'AutoFormat', 'PurifierLinkify', false, 'bool', '
+<p>
+  Internal auto-formatter that converts configuration directives in
+  syntax <a>%Namespace.Directive</a> to links. This directive has been available
+  since 2.0.1.
+</p>
+');
+
+HTMLPurifier_ConfigSchema::define(
+    'AutoFormatParam', 'PurifierLinkifyDocURL', '#%s', 'string', '
+<p>
+  Location of configuration documentation to link to, let %s substitute
+  into the configuration\'s namespace and directive names sans the percent
+  sign. This directive has been available since 2.0.1.
+</p>
+');
+
+/**
+ * Injector that converts configuration directive syntax %Namespace.Directive
+ * to links
+ */
+class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector
+{
+    
+    var $docURL;
+    
+    function prepare($config, &$context) {
+        parent::prepare($config, $context);
+        $this->docURL = $config->get('AutoFormatParam', 'PurifierLinkifyDocURL');
+    }
+    
+    function handleText(&$token, $config, &$context) {
+        if (!$this->allowsElement('a')) return;
+        if (strpos($token->data, '%') === false) return;
+        
+        $bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $token = array();
+        
+        // $i = index
+        // $c = count
+        // $l = is link
+        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
+            if (!$l) {
+                if ($bits[$i] === '') continue;
+                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
+            } else {
+                $token[] = new HTMLPurifier_Token_Start('a',
+                    array('href' => str_replace('%s', $bits[$i], $this->docURL)));
+                $token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
+                $token[] = new HTMLPurifier_Token_End('a');
+            }
+        }
+        
+    }
+    
+}
+
diff --git a/library/HTMLPurifier/Language.php b/library/HTMLPurifier/Language.php
index 6b0845fb..b660bee5 100644
--- a/library/HTMLPurifier/Language.php
+++ b/library/HTMLPurifier/Language.php
@@ -21,12 +21,27 @@ class HTMLPurifier_Language
     var $messages = array();
     
     /**
+     * Array of localizable error codes
+     */
+    var $errorNames = array();
+    
+    /**
      * Has the language object been loaded yet?
      * @private
      */
     var $_loaded = false;
     
     /**
+     * Instances of HTMLPurifier_Config and HTMLPurifier_Context
+     */
+    var $config, $context;
+    
+    function HTMLPurifier_Language($config, &$context) {
+        $this->config  = $config;
+        $this->context =& $context;
+    }
+    
+    /**
      * Loads language object with necessary info from factory cache
      * @note This is a lazy loader
      */
@@ -52,23 +67,87 @@ class HTMLPurifier_Language
     }
     
     /**
+     * Retrieves a localised error name.
+     * @param $int integer error number, corresponding to PHP's error
+     *             reporting
+     * @return string localised message
+     */
+    function getErrorName($int) {
+        if (!$this->_loaded) $this->load();
+        if (!isset($this->errorNames[$int])) return "[Error: $int]";
+        return $this->errorNames[$int];
+    }
+    
+    /**
+     * Converts an array list into a string readable representation
+     */
+    function listify($array) {
+        $sep      = $this->getMessage('Item separator');
+        $sep_last = $this->getMessage('Item separator last');
+        $ret = '';
+        for ($i = 0, $c = count($array); $i < $c; $i++) {
+            if ($i == 0) {
+            } elseif ($i + 1 < $c) {
+                $ret .= $sep;
+            } else {
+                $ret .= $sep_last;
+            }
+            $ret .= $array[$i];
+        }
+        return $ret;
+    }
+    
+    /**
      * Formats a localised message with passed parameters
      * @param $key string identifier of message
-     * @param $param Parameter to substitute in (arbitrary number)
+     * @param $args Parameters to substitute in
      * @return string localised message
+     * @todo Implement conditionals? Right now, some messages make
+     *     reference to line numbers, but those aren't always available
      */
-    function formatMessage($key) {
+    function formatMessage($key, $args = array()) {
         if (!$this->_loaded) $this->load();
         if (!isset($this->messages[$key])) return "[$key]";
         $raw = $this->messages[$key];
-        $args = func_get_args();
-        $substitutions = array();
-        for ($i = 1; $i < count($args); $i++) {
-            $substitutions['$' . $i] = $args[$i];
+        $subst = array();
+        $generator = false;
+        foreach ($args as $i => $value) {
+            if (is_object($value)) {
+                if ($value instanceof HTMLPurifier_Token) {
+                    // factor this out some time
+                    if (!$generator) $generator = $this->context->get('Generator');
+                    if (isset($value->name)) $subst['$'.$i.'.Name'] = $value->name;
+                    if (isset($value->data)) $subst['$'.$i.'.Data'] = $value->data;
+                    $subst['$'.$i.'.Compact'] = 
+                    $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
+                    // a more complex algorithm for compact representation
+                    // could be introduced for all types of tokens. This
+                    // may need to be factored out into a dedicated class
+                    if (!empty($value->attr)) {
+                        $stripped_token = $value->copy();
+                        $stripped_token->attr = array();
+                        $subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token);
+                    }
+                    $subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown';
+                }
+                continue;
+            } elseif (is_array($value)) {
+                $keys = array_keys($value);
+                if (array_keys($keys) === $keys) {
+                    // list
+                    $subst['$'.$i] = $this->listify($value);
+                } else {
+                    // associative array
+                    // no $i implementation yet, sorry
+                    $subst['$'.$i.'.Keys'] = $this->listify($keys);
+                    $subst['$'.$i.'.Values'] = $this->listify(array_values($value));
+                }
+                continue;
+            }
+            $subst['$' . $i] = $value;
         }
-        return strtr($raw, $substitutions);
+        return strtr($raw, $subst);
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Language/classes/en-x-test.php b/library/HTMLPurifier/Language/classes/en-x-test.php
index 303ba4ba..cbf0e612 100644
--- a/library/HTMLPurifier/Language/classes/en-x-test.php
+++ b/library/HTMLPurifier/Language/classes/en-x-test.php
@@ -9,4 +9,3 @@ class HTMLPurifier_Language_en_x_test extends HTMLPurifier_Language
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Language/messages/en-x-test.php b/library/HTMLPurifier/Language/messages/en-x-test.php
index 115662bd..3eac9ec6 100644
--- a/library/HTMLPurifier/Language/messages/en-x-test.php
+++ b/library/HTMLPurifier/Language/messages/en-x-test.php
@@ -5,7 +5,6 @@
 $fallback = 'en';
 
 $messages = array(
-    'htmlpurifier' => 'HTML Purifier X'
+    'HTMLPurifier' => 'HTML Purifier X'
 );
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Language/messages/en.php b/library/HTMLPurifier/Language/messages/en.php
dissimilarity index 61%
index 3327460c..a64cf301 100644
--- a/library/HTMLPurifier/Language/messages/en.php
+++ b/library/HTMLPurifier/Language/messages/en.php
@@ -1,14 +1,57 @@
-<?php
-
-$fallback = false;
-
-$messages = array(
-
-'htmlpurifier' => 'HTML Purifier',
-'pizza' => 'Pizza', // for unit testing purposes
-
-
-
-);
-
-?>
\ No newline at end of file
+<?php
+
+$fallback = false;
+
+$messages = array(
+
+'HTMLPurifier' => 'HTML Purifier',
+
+// for unit testing purposes
+'LanguageFactoryTest: Pizza' => 'Pizza',
+'LanguageTest: List' => '$1',
+'LanguageTest: Hash' => '$1.Keys; $1.Values',
+
+'Item separator' => ', ',
+'Item separator last' => ' and ', // non-Harvard style
+
+'ErrorCollector: No errors' => 'No errors detected. However, because error reporting is still incomplete, there may have been errors that the error collector was not notified of; please inspect the output HTML carefully.',
+'ErrorCollector: At line' => ' at line $line',
+
+'Lexer: Unclosed comment'      => 'Unclosed comment',
+'Lexer: Unescaped lt'          => 'Unescaped less-than sign (<) should be &lt;',
+'Lexer: Missing gt'            => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
+'Lexer: Missing attribute key' => 'Attribute declaration has no key',
+'Lexer: Missing end quote'     => 'Attribute declaration has no end quote',
+
+'Strategy_RemoveForeignElements: Tag transform'              => '<$1> element transformed into $CurrentToken.Serialized',
+'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
+'Strategy_RemoveForeignElements: Foreign element to text'    => 'Unrecognized $CurrentToken.Serialized tag converted to text',
+'Strategy_RemoveForeignElements: Foreign element removed'    => 'Unrecognized $CurrentToken.Serialized tag removed',
+'Strategy_RemoveForeignElements: Comment removed'            => 'Comment containing "$CurrentToken.Data" removed',
+'Strategy_RemoveForeignElements: Script removed'             => 'Script removed',
+'Strategy_RemoveForeignElements: Token removed to end'       => 'Tags and text starting from $1 element where removed to end',
+
+'Strategy_MakeWellFormed: Unnecessary end tag removed' => 'Unnecessary $CurrentToken.Serialized tag removed',
+'Strategy_MakeWellFormed: Unnecessary end tag to text' => 'Unnecessary $CurrentToken.Serialized tag converted to text',
+'Strategy_MakeWellFormed: Tag auto closed'             => '$1.Compact started on line $1.Line auto-closed by $CurrentToken.Compact',
+'Strategy_MakeWellFormed: Stray end tag removed'       => 'Stray $CurrentToken.Serialized tag removed',
+'Strategy_MakeWellFormed: Stray end tag to text'       => 'Stray $CurrentToken.Serialized tag converted to text',
+'Strategy_MakeWellFormed: Tag closed by element end'   => '$1.Compact tag started on line $1.Line closed by end of $CurrentToken.Serialized',
+'Strategy_MakeWellFormed: Tag closed by document end'  => '$1.Compact tag started on line $1.Line closed by end of document',
+
+'Strategy_FixNesting: Node removed'          => '$CurrentToken.Compact node removed',
+'Strategy_FixNesting: Node excluded'         => '$CurrentToken.Compact node removed due to descendant exclusion by ancestor element',
+'Strategy_FixNesting: Node reorganized'      => 'Contents of $CurrentToken.Compact node reorganized to enforce its content model',
+'Strategy_FixNesting: Node contents removed' => 'Contents of $CurrentToken.Compact node removed',
+
+'AttrValidator: Attributes transformed' => 'Attributes on $CurrentToken.Compact transformed from $1.Keys to $2.Keys',
+'AttrValidator: Attribute removed' => '$CurrentAttr.Name attribute on $CurrentToken.Compact removed',
+
+);
+
+$errorNames = array(
+    E_ERROR => 'Error',
+    E_WARNING => 'Warning',
+    E_NOTICE => 'Notice'
+);
+
diff --git a/library/HTMLPurifier/LanguageFactory.php b/library/HTMLPurifier/LanguageFactory.php
index c7b4b434..71539ded 100644
--- a/library/HTMLPurifier/LanguageFactory.php
+++ b/library/HTMLPurifier/LanguageFactory.php
@@ -3,6 +3,14 @@
 require_once 'HTMLPurifier/Language.php';
 require_once 'HTMLPurifier/AttrDef/Lang.php';
 
+HTMLPurifier_ConfigSchema::define(
+    'Core', 'Language', 'en', 'string', '
+ISO 639 language code for localizable things in HTML Purifier to use,
+which is mainly error reporting. There is currently only an English (en)
+translation, so this directive is currently useless.
+This directive has been available since 2.0.0.
+');
+
 /**
  * Class responsible for generating HTMLPurifier_Language objects, managing
  * caching and fallbacks.
@@ -24,7 +32,7 @@ class HTMLPurifier_LanguageFactory
      * variables to slurp out of a message file.
      * @value array list
      */
-    var $keys = array('fallback', 'messages');
+    var $keys = array('fallback', 'messages', 'errorNames');
     
     /**
      * Instance of HTMLPurifier_AttrDef_Lang to validate language codes
@@ -43,7 +51,7 @@ class HTMLPurifier_LanguageFactory
      * Keys whose contents are a hash map and can be merged
      * @value array lookup
      */
-    var $mergeable_keys_map = array('messages' => true);
+    var $mergeable_keys_map = array('messages' => true, 'errorNames' => true);
     
     /**
      * Keys whose contents are a list and can be merged
@@ -79,12 +87,15 @@ class HTMLPurifier_LanguageFactory
     
     /**
      * Creates a language object, handles class fallbacks
-     * @param $code string language code
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
      */
-    function create($code) {
+    function create($config, &$context) {
         
-        $config = $context = false; // hope it doesn't use these!
-        $code = $this->validator->validate($code, $config, $context);
+        // validate language code
+        $code = $this->validator->validate(
+          $config->get('Core', 'Language'), $config, $context
+        );
         if ($code === false) $code = 'en'; // malformed code becomes English
         
         $pcode = str_replace('-', '_', $code); // make valid PHP classname
@@ -111,7 +122,7 @@ class HTMLPurifier_LanguageFactory
             $lang = HTMLPurifier_LanguageFactory::factory( $fallback );
             $depth--;
         } else {
-            $lang = new $class;
+            $lang = new $class($config, $context);
         }
         $lang->code = $code;
         
@@ -193,4 +204,3 @@ class HTMLPurifier_LanguageFactory
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Lexer.php b/library/HTMLPurifier/Lexer.php
index 6b2e87ab..839782ca 100644
--- a/library/HTMLPurifier/Lexer.php
+++ b/library/HTMLPurifier/Lexer.php
@@ -54,14 +54,15 @@ HTMLPurifier_ConfigSchema::define(
 );
 
 HTMLPurifier_ConfigSchema::define(
-    'Core', 'MaintainLineNumbers', false, 'bool', '
+    'Core', 'MaintainLineNumbers', null, 'bool/null', '
 <p>
   If true, HTML Purifier will add line number information to all tokens.
   This is useful when error reporting is turned on, but can result in
   significant performance degradation and should not be used when
   unnecessary. This directive must be used with the DirectLex lexer,
-  as the DOMLex lexer does not (yet) support this functionality. This directive
-  has been available since 2.0.0.
+  as the DOMLex lexer does not (yet) support this functionality. 
+  If the value is null, an appropriate value will be selected based
+  on other configuration. This directive has been available since 2.0.0.
 </p>
 ');
 
@@ -154,7 +155,11 @@ class HTMLPurifier_Lexer
             
             // once PHP DOM implements native line numbers, or we
             // hack out something using XSLT, remove this stipulation
-            if ($config->get('Core', 'MaintainLineNumbers')) {
+            $line_numbers = $config->get('Core', 'MaintainLineNumbers');
+            if (
+                $line_numbers === true ||
+                ($line_numbers === null && $config->get('Core', 'CollectErrors'))
+            ) {
                 $lexer = 'DirectLex';
                 break;
             }
@@ -259,7 +264,18 @@ class HTMLPurifier_Lexer
      */
     static function escapeCDATA($string) {
         return preg_replace_callback(
-            '/<!\[CDATA\[(.+?)\]\]>/',
+            '/<!\[CDATA\[(.+?)\]\]>/s',
+            array('HTMLPurifier_Lexer', 'CDATACallback'),
+            $string
+        );
+    }
+    
+    /**
+     * Special CDATA case that is especiall convoluted for <script>
+     */
+    function escapeCommentedCDATA($string) {
+        return preg_replace_callback(
+            '#<!--//--><!\[CDATA\[//><!--(.+?)//--><!\]\]>#s',
             array('HTMLPurifier_Lexer', 'CDATACallback'),
             $string
         );
@@ -291,6 +307,15 @@ class HTMLPurifier_Lexer
             $html = $this->extractBody($html);
         }
         
+        // normalize newlines to \n
+        $html = str_replace("\r\n", "\n", $html);
+        $html = str_replace("\r", "\n", $html);
+        
+        if ($config->get('HTML', 'Trusted')) {
+            // escape convoluted CDATA
+            $html = $this->escapeCommentedCDATA($html);
+        }
+        
         // escape CDATA
         $html = $this->escapeCDATA($html);
         
@@ -320,4 +345,3 @@ class HTMLPurifier_Lexer
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Lexer/DOMLex.php b/library/HTMLPurifier/Lexer/DOMLex.php
index de9d6871..82865673 100644
--- a/library/HTMLPurifier/Lexer/DOMLex.php
+++ b/library/HTMLPurifier/Lexer/DOMLex.php
@@ -38,25 +38,25 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
         $this->factory = new HTMLPurifier_TokenFactory();
     }
     
-    public function tokenizeHTML($string, $config, &$context) {
+    public function tokenizeHTML($html, $config, &$context) {
         
-        $string = $this->normalize($string, $config, $context);
+        $html = $this->normalize($html, $config, $context);
         
-        // preprocess string, essential for UTF-8
-        $string =
+        // preprocess html, essential for UTF-8
+        $html =
             '<!DOCTYPE html '.
                 'PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'.
                 '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'.
             '<html><head>'.
             '<meta http-equiv="Content-Type" content="text/html;'.
                 ' charset=utf-8" />'.
-            '</head><body><div>'.$string.'</div></body></html>';
+            '</head><body><div>'.$html.'</div></body></html>';
         
         $doc = new DOMDocument();
         $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
         
         set_error_handler(array($this, 'muteErrorHandler'));
-        $doc->loadHTML($string);
+        $doc->loadHTML($html);
         restore_error_handler();
         
         $tokens = array();
@@ -83,10 +83,13 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
         // intercept non element nodes. WE MUST catch all of them,
         // but we're not getting the character reference nodes because
         // those should have been preprocessed
-        if ($node->nodeType === XML_TEXT_NODE ||
-                  $node->nodeType === XML_CDATA_SECTION_NODE) {
+        if ($node->nodeType === XML_TEXT_NODE) {
             $tokens[] = $this->factory->createText($node->data);
             return;
+        } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
+            // undo DOM's special treatment of <script> tags
+            $tokens[] = $this->factory->createText($this->parseData($node->data));
+            return;
         } elseif ($node->nodeType === XML_COMMENT_NODE) {
             $tokens[] = $this->factory->createComment($node->data);
             return;
@@ -150,4 +153,3 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Lexer/DirectLex.php b/library/HTMLPurifier/Lexer/DirectLex.php
index a34e0517..883f4956 100644
--- a/library/HTMLPurifier/Lexer/DirectLex.php
+++ b/library/HTMLPurifier/Lexer/DirectLex.php
@@ -22,12 +22,9 @@ HTMLPurifier_ConfigSchema::define(
  * A pure PHP parser, DirectLex has absolutely no dependencies, making
  * it a reasonably good default for PHP4.  Written with efficiency in mind,
  * it can be four times faster than HTMLPurifier_Lexer_PEARSax3, although it
- * pales in comparison to HTMLPurifier_Lexer_DOMLex.  It will support UTF-8
- * completely eventually.
+ * pales in comparison to HTMLPurifier_Lexer_DOMLex.
  * 
  * @todo Reread XML spec and document differences.
- * 
- * @todo Determine correct behavior in transforming comment data. (preserve dashes?)
  */
 class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
 {
@@ -38,8 +35,25 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
      */
     var $_whitespace = "\x20\x09\x0D\x0A";
     
+    /**
+     * Callback function for script CDATA fudge
+     * @param $matches, in form of array(opening tag, contents, closing tag)
+     * @static
+     */
+    static function scriptCallback($matches) {
+        return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8') . $matches[3];
+    }
+    
     function tokenizeHTML($html, $config, &$context) {
         
+        // special normalization for script tags without any armor
+        // our "armor" heurstic is a < sign any number of whitespaces after
+        // the first script tag
+        if ($config->get('HTML', 'Trusted')) {
+            $html = preg_replace_callback('#(<script[^>]*>)(\s*[^<].+?)(</script>)#si',
+                array('HTMLPurifier_Lexer_DirectLex', 'scriptCallback'), $html);
+        }
+        
         $html = $this->normalize($html, $config, $context);
         
         $cursor = 0; // our location in the text
@@ -47,12 +61,26 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
         $array = array(); // result array
         
         $maintain_line_numbers = $config->get('Core', 'MaintainLineNumbers');
-        $current_line = 1;
-        $nl = PHP_EOL;
+        
+        if ($maintain_line_numbers === null) {
+            // automatically determine line numbering by checking
+            // if error collection is on
+            $maintain_line_numbers = $config->get('Core', 'CollectErrors');
+        }
+        
+        if ($maintain_line_numbers) $current_line = 1;
+        else $current_line = false;
+        $context->register('CurrentLine', $current_line);
+        $nl = "\n";
         // how often to manually recalculate. This will ALWAYS be right,
         // but it's pretty wasteful. Set to 0 to turn off
         $synchronize_interval = $config->get('Core', 'DirectLexLineNumberSyncInterval'); 
         
+        $e = false;
+        if ($config->get('Core', 'CollectErrors')) {
+            $e =& $context->get('ErrorCollector');
+        }
+        
         // infinite loop protection
         // has to be pretty big, since html docs can be big
         // we're allow two hundred thousand tags... more than enough?
@@ -126,22 +154,35 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
                 
                 // Check if it's a comment
                 if (
-                    substr($segment, 0, 3) == '!--' &&
-                    substr($segment, $strlen_segment-2, 2) == '--'
+                    substr($segment, 0, 3) == '!--'
                 ) {
+                    // re-determine segment length, looking for -->
+                    $position_comment_end = strpos($html, '-->', $cursor);
+                    if ($position_comment_end === false) {
+                        // uh oh, we have a comment that extends to
+                        // infinity. Can't be helped: set comment
+                        // end position to end of string
+                        if ($e) $e->send(E_WARNING, 'Lexer: Unclosed comment');
+                        $position_comment_end = strlen($html);
+                        $end = true;
+                    } else {
+                        $end = false;
+                    }
+                    $strlen_segment = $position_comment_end - $cursor;
+                    $segment = substr($html, $cursor, $strlen_segment);
                     $token = new
                         HTMLPurifier_Token_Comment(
                             substr(
-                                $segment, 3, $strlen_segment - 5
+                                $segment, 3, $strlen_segment - 3
                             )
                         );
                     if ($maintain_line_numbers) {
                         $token->line = $current_line;
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+                        $current_line += $this->substrCount($html, $nl, $cursor, $strlen_segment);
                     }
                     $array[] = $token;
+                    $cursor = $end ? $position_comment_end : $position_comment_end + 3;
                     $inside_tag = false;
-                    $cursor = $position_next_gt + 1;
                     continue;
                 }
                 
@@ -164,6 +205,7 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
                 // have accidently grabbed an emoticon. Translate into
                 // text and go our merry way
                 if (!ctype_alnum($segment[0])) {
+                    if ($e) $e->send(E_NOTICE, 'Lexer: Unescaped lt');
                     $token = new
                         HTMLPurifier_Token_Text(
                             '<' .
@@ -242,6 +284,8 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
                 $inside_tag = false;
                 continue;
             } else {
+                // inside tag, but there's no ending > sign
+                if ($e) $e->send(E_WARNING, 'Lexer: Missing gt');
                 $token = new
                     HTMLPurifier_Token_Text(
                         '<' .
@@ -256,6 +300,8 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
             }
             break;
         }
+        
+        $context->destroy('CurrentLine');
         return $array;
     }
     
@@ -286,6 +332,11 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
         
         if ($string == '') return array(); // no attributes
         
+        $e = false;
+        if ($config->get('Core', 'CollectErrors')) {
+            $e =& $context->get('ErrorCollector');
+        }
+        
         // let's see if we can abort as quickly as possible
         // one equal sign, no spaces => one attribute
         $num_equal = substr_count($string, '=');
@@ -297,7 +348,10 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
             // only one attribute
             list($key, $quoted_value) = explode('=', $string);
             $quoted_value = trim($quoted_value);
-            if (!$key) return array();
+            if (!$key) {
+                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+                return array();
+            }
             if (!$quoted_value) return array($key => '');
             $first_char = @$quoted_value[0];
             $last_char  = @$quoted_value[strlen($quoted_value)-1];
@@ -311,6 +365,7 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
             } else {
                 // not well behaved
                 if ($open_quote) {
+                    if ($e) $e->send(E_ERROR, 'Lexer: Missing end quote');
                     $value = substr($quoted_value, 1);
                 } else {
                     $value = $quoted_value;
@@ -334,7 +389,10 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
         while(true) {
             
             // infinite loop protection
-            if (++$loops > 1000) return array();
+            if (++$loops > 1000) {
+                trigger_error('Infinite loop detected in attribute parsing', E_USER_WARNING);
+                return array();
+            }
             
             if ($cursor >= $size) {
                 break;
@@ -353,7 +411,11 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
             
             $key = substr($string, $key_begin, $key_end - $key_begin);
             
-            if (!$key) continue; // empty key
+            if (!$key) {
+                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+                $cursor += strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
+                continue; // empty key
+            }
             
             // scroll past all whitespace
             $cursor += strspn($string, $this->_whitespace, $cursor);
@@ -398,6 +460,9 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
                 // boolattr
                 if ($key !== '') {
                     $array[$key] = $key;
+                } else {
+                    // purely theoretical
+                    if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
                 }
                 
             }
@@ -407,4 +472,3 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Lexer/PEARSax3.php b/library/HTMLPurifier/Lexer/PEARSax3.php
index 18777ef7..3888229b 100644
--- a/library/HTMLPurifier/Lexer/PEARSax3.php
+++ b/library/HTMLPurifier/Lexer/PEARSax3.php
@@ -107,4 +107,3 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/PercentEncoder.php b/library/HTMLPurifier/PercentEncoder.php
index 7a12caaa..e32421e1 100644
--- a/library/HTMLPurifier/PercentEncoder.php
+++ b/library/HTMLPurifier/PercentEncoder.php
@@ -44,4 +44,3 @@ class HTMLPurifier_PercentEncoder
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Printer.php b/library/HTMLPurifier/Printer.php
index 95be17a2..7e20daaf 100644
--- a/library/HTMLPurifier/Printer.php
+++ b/library/HTMLPurifier/Printer.php
@@ -27,6 +27,16 @@ class HTMLPurifier_Printer
     }
     
     /**
+     * Give generator necessary configuration if possible
+     */
+    function prepareGenerator($config) {
+        // hack for smoketests/configForm.php
+        if (empty($config->conf['HTML'])) return;
+        $context = new HTMLPurifier_Context();
+        $this->generator->generateFromTokens(array(), $config, $context);
+    }
+    
+    /**
      * Main function that renders object or aspect of that object
      * @note Parameters vary depending on printer
      */
@@ -160,4 +170,3 @@ class HTMLPurifier_Printer
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Printer/CSSDefinition.php b/library/HTMLPurifier/Printer/CSSDefinition.php
index 7745f5f4..7d3ad61e 100644
--- a/library/HTMLPurifier/Printer/CSSDefinition.php
+++ b/library/HTMLPurifier/Printer/CSSDefinition.php
@@ -37,4 +37,3 @@ class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Printer/ConfigForm.php b/library/HTMLPurifier/Printer/ConfigForm.php
index c157f2ab..fb86f5f3 100644
--- a/library/HTMLPurifier/Printer/ConfigForm.php
+++ b/library/HTMLPurifier/Printer/ConfigForm.php
@@ -38,18 +38,19 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
     /**
      * Returns HTML output for a configuration form
      * @param $config Configuration object of current form state
-     * @param $ns Optional namespace(s) to restrict form to
+     * @param $allowed Optional namespace(s) and directives to restrict form to.
      */
-    function render($config, $ns = true) {
+    function render($config, $allowed = true, $render_controls = true) {
         $this->config = $config;
-        if ($ns === true) {
-            $all = $config->getAll();
-        } else {
-            if (is_string($ns)) $ns = array($ns);
-            foreach ($ns as $n) {
-                $all = array($n => $config->getBatch($n));
-            }
+        $this->prepareGenerator($config);
+        
+        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed);
+        $all = array();
+        foreach ($allowed as $key) {
+            list($ns, $directive) = $key;
+            $all[$ns][$directive] = $config->get($ns, $directive);
         }
+        
         $ret = '';
         $ret .= $this->start('table', array('class' => 'hp-config'));
         $ret .= $this->start('thead');
@@ -61,13 +62,16 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
         foreach ($all as $ns => $directives) {
             $ret .= $this->renderNamespace($ns, $directives);
         }
-        $ret .= $this->start('tfoot');
-        $ret .= $this->start('tr');
-            $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
-                $ret .= '<input type="submit" value="Submit" /> [<a href="?">Reset</a>]';
-            $ret .= $this->end('td');
-        $ret .= $this->end('tr');
-        $ret .= $this->end('tfoot');
+        if ($render_controls) {
+             $ret .= $this->start('tfoot');
+             $ret .= $this->start('tr');
+                 $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
+                     $ret .= $this->elementEmpty('input', array('type' => 'Submit', 'value' => 'Submit'));
+                     $ret .= '[<a href="?">Reset</a>]';
+                 $ret .= $this->end('td');
+             $ret .= $this->end('tr');
+             $ret .= $this->end('tfoot');
+        }
         $ret .= $this->end('table');
         return $ret;
     }
@@ -93,11 +97,20 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
                 $url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);
                 $ret .= $this->start('a', array('href' => $url));
             }
+                $attr = array('for' => "{$this->name}:$ns.$directive");
+                // crop directive name if it's too long
+                if (strlen($directive) < 14) {
+                    $directive_disp = $directive;
+                } else {
+                    $directive_disp = substr($directive, 0, 12) . '...';
+                    $attr['title'] = $directive;
+                }
+                
                 $ret .= $this->element(
                     'label',
-                    "%$ns.$directive",
+                    $directive_disp,
                     // component printers must create an element with this id
-                    array('for' => "{$this->name}:$ns.$directive")
+                    $attr
                 );
             if ($this->docURL) $ret .= $this->end('a');
             $ret .= $this->end('th');
@@ -136,6 +149,7 @@ class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer
         $this->obj = $obj;
     }
     function render($ns, $directive, $value, $name, $config) {
+        $this->prepareGenerator($config);
         $ret = '';
         $ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
         $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
@@ -145,7 +159,7 @@ class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer
             'type' => 'checkbox',
             'value' => '1',
             'class' => 'null-toggle',
-            'name' => "$name:Null_$ns.$directive",
+            'name' => "$name"."[Null_$ns.$directive]",
             'id' => "$name:Null_$ns.$directive",
             'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
         );
@@ -163,6 +177,7 @@ class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer
  */
 class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
     function render($ns, $directive, $value, $name, $config) {
+        $this->prepareGenerator($config);
         // this should probably be split up a little
         $ret = '';
         $def = $config->def->info[$ns][$directive];
@@ -193,7 +208,6 @@ class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
             $value = serialize($value);
         }
         $attr = array(
-            'type' => 'text',
             'name' => "$name"."[$ns.$directive]",
             'id' => "$name:$ns.$directive"
         );
@@ -208,6 +222,7 @@ class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
             $ret .= $this->end('select');
         } else {
             $attr['value'] = $value;
+            $attr['type'] = 'text';
             $ret .= $this->elementEmpty('input', $attr);
         }
         return $ret;
@@ -219,8 +234,8 @@ class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
  */
 class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer {
     function render($ns, $directive, $value, $name, $config) {
+        $this->prepareGenerator($config);
         $ret = '';
-        
         $ret .= $this->start('div', array('id' => "$name:$ns.$directive"));
         
         $ret .= $this->start('label', array('for' => "$name:Yes_$ns.$directive"));
@@ -257,4 +272,3 @@ class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer {
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Printer/HTMLDefinition.php b/library/HTMLPurifier/Printer/HTMLDefinition.php
index a677c58b..52650c63 100644
--- a/library/HTMLPurifier/Printer/HTMLDefinition.php
+++ b/library/HTMLPurifier/Printer/HTMLDefinition.php
@@ -15,9 +15,44 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
         $this->config =& $config;
         
         $this->def = $config->getHTMLDefinition();
-        $def =& $this->def;
         
         $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
+        
+        $ret .= $this->renderDoctype();
+        $ret .= $this->renderEnvironment();
+        $ret .= $this->renderContentSets();
+        $ret .= $this->renderInfo();
+        
+        $ret .= $this->end('div');
+        
+        return $ret;
+    }
+    
+    /**
+     * Renders the Doctype table
+     */
+    function renderDoctype() {
+        $doctype = $this->def->doctype;
+        $ret = '';
+        $ret .= $this->start('table');
+        $ret .= $this->element('caption', 'Doctype');
+        $ret .= $this->row('Name', $doctype->name);
+        $ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
+        $ret .= $this->row('Default Modules', implode($doctype->modules, ', '));
+        $ret .= $this->row('Default Tidy Modules', implode($doctype->tidyModules, ', '));
+        $ret .= $this->end('table');
+        return $ret;
+    }
+    
+    
+    /**
+     * Renders environment table, which is miscellaneous info
+     */
+    function renderEnvironment() {
+        $def = $this->def;
+        
+        $ret = '';
+        
         $ret .= $this->start('table');
         $ret .= $this->element('caption', 'Environment');
         
@@ -51,13 +86,22 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
         $ret .= $this->end('tr');
         
         $ret .= $this->end('table');
-        
-        
-        $ret .= $this->renderInfo();
-        
-        
-        $ret .= $this->end('div');
-        
+        return $ret;
+    }
+    
+    /**
+     * Renders the Content Sets table
+     */
+    function renderContentSets() {
+        $ret = '';
+        $ret .= $this->start('table');
+        $ret .= $this->element('caption', 'Content Sets');
+        foreach ($this->def->info_content_sets as $name => $lookup) {
+            $ret .= $this->heavyHeader($name);
+            $ret .= $this->start('tr');
+            $ret .= $this->element('td', $this->listifyTagLookup($lookup));
+            $ret .= $this->end('tr');
+        }
         return $ret;
     }
     
@@ -69,15 +113,13 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
         $ret .= $this->start('table');
         $ret .= $this->element('caption', 'Elements ($info)');
         ksort($this->def->info);
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Allowed tags', array('colspan' => 2, 'class' => 'heavy'));
-        $ret .= $this->end('tr');
+        $ret .= $this->heavyHeader('Allowed tags', 2);
         $ret .= $this->start('tr');
         $ret .= $this->element('td', $this->listifyTagLookup($this->def->info), array('colspan' => 2));
         $ret .= $this->end('tr');
         foreach ($this->def->info as $name => $def) {
             $ret .= $this->start('tr');
-                $ret .= $this->element('th', "<$name>", array('class'=>'heavy', 'colspan' => 2));
+                $ret .= $this->element('th', "<$name>" . ($def->safe ? '' : ' (unsafe)'), array('class'=>'heavy' . ($def->safe ? '' : ' unsafe'), 'colspan' => 2));
             $ret .= $this->end('tr');
             $ret .= $this->start('tr');
                 $ret .= $this->element('th', 'Inline content');
@@ -109,9 +151,13 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
             }
             $ret .= $this->start('tr');
                 $ret .= $this->element('th', 'Allowed attributes');
-                $ret .= $this->element('td',$this->listifyAttr($def->attr),0,0);
+                $ret .= $this->element('td',$this->listifyAttr($def->attr), array(), 0);
             $ret .= $this->end('tr');
             
+            if (!empty($def->required_attr)) {
+                $ret .= $this->row('Required attributes', $this->listify($def->required_attr));
+            }
+            
             $ret .= $this->renderChildren($def->child);
         }
         $ret .= $this->end('table');
@@ -154,6 +200,11 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
                     '<em>Inline</em>: ' .
                     $this->escape($this->listifyTagLookup($def->inline->elements)),0,0);
                 
+            } elseif ($def->type == 'custom') {
+                
+                $ret .= $this->element('td', '<em>'.ucfirst($def->type).'</em>: ' .
+                    $def->dtd_regex);
+                
             } else {
                 $ret .= $this->element('td',
                     '<em>'.ucfirst($def->type).'</em>: ' .
@@ -205,6 +256,16 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
         return $this->listify($list);
     }
     
+    /**
+     * Creates a heavy header row
+     */
+    function heavyHeader($text, $num = 1) {
+        $ret = '';
+        $ret .= $this->start('tr');
+        $ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));
+        $ret .= $this->end('tr');
+        return $ret;
+    }
+    
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Strategy.php b/library/HTMLPurifier/Strategy.php
index 746b0a2d..a6ab7e8b 100644
--- a/library/HTMLPurifier/Strategy.php
+++ b/library/HTMLPurifier/Strategy.php
@@ -30,4 +30,3 @@ class HTMLPurifier_Strategy
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Strategy/Composite.php b/library/HTMLPurifier/Strategy/Composite.php
index bd868747..fcd230f4 100644
--- a/library/HTMLPurifier/Strategy/Composite.php
+++ b/library/HTMLPurifier/Strategy/Composite.php
@@ -27,4 +27,3 @@ class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Strategy/Core.php b/library/HTMLPurifier/Strategy/Core.php
index 66e7bb36..93d05104 100644
--- a/library/HTMLPurifier/Strategy/Core.php
+++ b/library/HTMLPurifier/Strategy/Core.php
@@ -22,4 +22,3 @@ class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Strategy/FixNesting.php b/library/HTMLPurifier/Strategy/FixNesting.php
index e6a779e5..51a14a78 100644
--- a/library/HTMLPurifier/Strategy/FixNesting.php
+++ b/library/HTMLPurifier/Strategy/FixNesting.php
@@ -54,6 +54,9 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
         $is_inline = $definition->info_parent_def->descendants_are_inline;
         $context->register('IsInline', $is_inline);
         
+        // setup error collector
+        $e =& $context->get('ErrorCollector', true);
+        
         //####################################################################//
         // Loop initialization
         
@@ -67,6 +70,11 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
         // processed, i.e. there won't be empty exclusions.
         $exclude_stack = array();
         
+        // variable that contains the start token while we are processing
+        // nodes. This enables error reporting to do its job
+        $start_token = false;
+        $context->register('CurrentToken', $start_token);
+        
         //####################################################################//
         // Loop
         
@@ -100,6 +108,8 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
             // $i is index of start token
             // $j is index of end token
             
+            $start_token = $tokens[$i]; // to make token available via CurrentToken
+            
             //################################################################//
             // Gather information on parent
             
@@ -200,6 +210,14 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
             } elseif($result === false) {
                 // remove entire node
                 
+                if ($e) {
+                    if ($excluded) {
+                        $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded');
+                    } else {
+                        $e->send(E_ERROR, 'Strategy_FixNesting: Node removed');
+                    }
+                }
+                
                 // calculate length of inner tokens and current tokens
                 $length = $j - $i + 1;
                 
@@ -216,7 +234,7 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
                 // this is a rought heuristic that covers 100% of HTML's
                 // cases and 99% of all other cases. A child definition
                 // that would be tricked by this would be something like:
-                // ( | a b c) where it's all or nothing. Fortunantely,
+                // ( | a b c) where it's all or nothing. Fortunately,
                 // our current implementation claims that that case would
                 // not allow empty, even if it did
                 if (!$parent_def->child->allow_empty) {
@@ -234,6 +252,14 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
                 // calculate length of inner tokens
                 $length = $j - $i - 1;
                 
+                if ($e) {
+                    if (empty($result) && $length) {
+                        $e->send(E_ERROR, 'Strategy_FixNesting: Node contents removed');
+                    } else {
+                        $e->send(E_WARNING, 'Strategy_FixNesting: Node reorganized');
+                    }
+                }
+                
                 // perform replacement
                 array_splice($tokens, $i + 1, $length, $result);
                 
@@ -291,6 +317,7 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
         
         // remove context variables
         $context->destroy('IsInline');
+        $context->destroy('CurrentToken');
         
         //####################################################################//
         // Return
@@ -301,4 +328,4 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
     
 }
 
-?>
+
diff --git a/library/HTMLPurifier/Strategy/MakeWellFormed.php b/library/HTMLPurifier/Strategy/MakeWellFormed.php
index 9d440452..3a8109cf 100644
--- a/library/HTMLPurifier/Strategy/MakeWellFormed.php
+++ b/library/HTMLPurifier/Strategy/MakeWellFormed.php
@@ -4,129 +4,229 @@ require_once 'HTMLPurifier/Strategy.php';
 require_once 'HTMLPurifier/HTMLDefinition.php';
 require_once 'HTMLPurifier/Generator.php';
 
+require_once 'HTMLPurifier/Injector/AutoParagraph.php';
+require_once 'HTMLPurifier/Injector/Linkify.php';
+require_once 'HTMLPurifier/Injector/PurifierLinkify.php';
+
+HTMLPurifier_ConfigSchema::define(
+    'AutoFormat', 'Custom', array(), 'list', '
+<p>
+  This directive can be used to add custom auto-format injectors.
+  Specify an array of injector names (class name minus the prefix)
+  or concrete implementations. Injector class must exist. This directive
+  has been available since 2.0.1.
+</p>
+'
+);
+
 /**
  * Takes tokens makes them well-formed (balance end tags, etc.)
  */
 class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
 {
     
+    /**
+     * Locally shared variable references
+     * @private
+     */
+    var $inputTokens, $inputIndex, $outputTokens, $currentNesting,
+        $currentInjector, $injectors;
+    
     function execute($tokens, $config, &$context) {
+        
         $definition = $config->getHTMLDefinition();
-        $generator = new HTMLPurifier_Generator();
+        
+        // CurrentNesting
+        $this->currentNesting = array();
+        $context->register('CurrentNesting', $this->currentNesting);
+        
+        // InputIndex
+        $this->inputIndex = false;
+        $context->register('InputIndex', $this->inputIndex);
+        
+        // InputTokens
+        $context->register('InputTokens', $tokens);
+        $this->inputTokens =& $tokens;
+        
+        // OutputTokens
         $result = array();
-        $current_nesting = array();
+        $this->outputTokens =& $result;
+        
+        // %Core.EscapeInvalidTags
         $escape_invalid_tags = $config->get('Core', 'EscapeInvalidTags');
-        foreach ($tokens as $token) {
+        $generator = new HTMLPurifier_Generator();
+        
+        $e =& $context->get('ErrorCollector', true);
+        
+        // -- begin INJECTOR --
+        
+        $this->injectors = array();
+        
+        $injectors = $config->getBatch('AutoFormat');
+        $custom_injectors = $injectors['Custom'];
+        unset($injectors['Custom']); // special case
+        foreach ($injectors as $injector => $b) {
+            $injector = "HTMLPurifier_Injector_$injector";
+            if ($b) $this->injectors[] = new $injector;
+        }
+        foreach ($custom_injectors as $injector) {
+            if (is_string($injector)) {
+                $injector = "HTMLPurifier_Injector_$injector";
+                $injector = new $injector;
+            }
+            $this->injectors[] = $injector;
+        }
+        
+        // array index of the injector that resulted in an array
+        // substitution. This enables processTokens() to know which
+        // injectors are affected by the added tokens and which are
+        // not (namely, the ones after the current injector are not
+        // affected)
+        $this->currentInjector = false;
+        
+        // give the injectors references to the definition and context
+        // variables for performance reasons
+        foreach ($this->injectors as $i => $x) {
+            $this->injectors[$i]->prepare($config, $context);
+        }
+        
+        // -- end INJECTOR --
+        
+        $token = false;
+        $context->register('CurrentToken', $token);
+        
+        for ($this->inputIndex = 0; isset($tokens[$this->inputIndex]); $this->inputIndex++) {
+            
+            // if all goes well, this token will be passed through unharmed
+            $token = $tokens[$this->inputIndex];
+            
+            foreach ($this->injectors as $i => $x) {
+                if ($x->skip > 0) $this->injectors[$i]->skip--;
+            }
+            
+            // quick-check: if it's not a tag, no need to process
             if (empty( $token->is_tag )) {
-                $result[] = $token;
+                if ($token->type === 'text') {
+                     // injector handler code; duplicated for performance reasons
+                     foreach ($this->injectors as $i => $x) {
+                         if (!$x->skip) $x->handleText($token, $config, $context);
+                         if (is_array($token)) {
+                             $this->currentInjector = $i;
+                             break;
+                         }
+                     }
+                }
+                $this->processToken($token, $config, $context);
                 continue;
             }
             
-            // DEFINITION CALL
             $info = $definition->info[$token->name]->child;
             
+            // quick checks:
             // test if it claims to be a start tag but is empty
-            if ($info->type == 'empty' &&
-                $token->type == 'start' ) {
-                
-                $result[] = new HTMLPurifier_Token_Empty($token->name,
-                                                         $token->attr);
+            if ($info->type == 'empty' && $token->type == 'start') {
+                $result[] = new HTMLPurifier_Token_Empty($token->name, $token->attr);
                 continue;
             }
-            
             // test if it claims to be empty but really is a start tag
-            if ($info->type != 'empty' &&
-                $token->type == 'empty' ) {
-                
-                $result[] = new HTMLPurifier_Token_Start($token->name,
-                                                         $token->attr);
+            if ($info->type != 'empty' && $token->type == 'empty' ) {
+                $result[] = new HTMLPurifier_Token_Start($token->name, $token->attr);
                 $result[] = new HTMLPurifier_Token_End($token->name);
-                
                 continue;
             }
-            
             // automatically insert empty tags
             if ($token->type == 'empty') {
                 $result[] = $token;
                 continue;
             }
             
-            // we give start tags precedence, so automatically accept unless...
-            // it's one of those special cases
+            // start tags have precedence, so they get passed through...
             if ($token->type == 'start') {
                 
-                // if there's a parent, check for special case
-                if (!empty($current_nesting)) {
+                // ...unless they also have to close their parent
+                if (!empty($this->currentNesting)) {
                     
-                    $parent = array_pop($current_nesting);
-                    $parent_name = $parent->name;
-                    $parent_info = $definition->info[$parent_name];
+                    $parent = array_pop($this->currentNesting);
+                    $parent_info = $definition->info[$parent->name];
                     
-                    // we need to replace this with a more general
-                    // algorithm
-                    if (isset($parent_info->auto_close[$token->name])) {
-                        $result[] = new HTMLPurifier_Token_End($parent_name);
+                    // this can be replaced with a more general algorithm:
+                    // if the token is not allowed by the parent, auto-close
+                    // the parent
+                    if (!isset($parent_info->child->elements[$token->name])) {
+                        if ($e) $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag auto closed', $parent);
+                        // close the parent, then append the token
+                        $result[] = new HTMLPurifier_Token_End($parent->name);
                         $result[] = $token;
-                        $current_nesting[] = $token;
+                        $this->currentNesting[] = $token;
                         continue;
                     }
                     
-                    $current_nesting[] = $parent; // undo the pop
+                    $this->currentNesting[] = $parent; // undo the pop
                 }
                 
-                $result[] = $token;
-                $current_nesting[] = $token;
+                // injector handler code; duplicated for performance reasons
+                foreach ($this->injectors as $i => $x) {
+                    if (!$x->skip) $x->handleStart($token, $config, $context);
+                    if (is_array($token)) {
+                        $this->currentInjector = $i;
+                        break;
+                    }
+                }
+                
+                $this->processToken($token, $config, $context);
                 continue;
             }
             
-            // sanity check
+            // sanity check: we should be dealing with a closing tag
             if ($token->type != 'end') continue;
             
-            // okay, we're dealing with a closing tag
-            
             // make sure that we have something open
-            if (empty($current_nesting)) {
+            if (empty($this->currentNesting)) {
                 if ($escape_invalid_tags) {
+                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
                     $result[] = new HTMLPurifier_Token_Text(
                         $generator->generateFromToken($token, $config, $context)
                     );
+                } elseif ($e) {
+                    $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
                 }
                 continue;
             }
             
             // first, check for the simplest case: everything closes neatly
-            
-            // current_nesting is modified
-            $current_parent = array_pop($current_nesting);
+            $current_parent = array_pop($this->currentNesting);
             if ($current_parent->name == $token->name) {
                 $result[] = $token;
                 continue;
             }
             
-            // undo the array_pop
-            $current_nesting[] = $current_parent;
-            
             // okay, so we're trying to close the wrong tag
             
-            // scroll back the entire nest, trying to find our tag
-            // feature could be to specify how far you'd like to go
-            $size = count($current_nesting);
+            // undo the pop previous pop
+            $this->currentNesting[] = $current_parent;
+            
+            // scroll back the entire nest, trying to find our tag.
+            // (feature could be to specify how far you'd like to go)
+            $size = count($this->currentNesting);
             // -2 because -1 is the last element, but we already checked that
             $skipped_tags = false;
             for ($i = $size - 2; $i >= 0; $i--) {
-                if ($current_nesting[$i]->name == $token->name) {
+                if ($this->currentNesting[$i]->name == $token->name) {
                     // current nesting is modified
-                    $skipped_tags = array_splice($current_nesting, $i);
+                    $skipped_tags = array_splice($this->currentNesting, $i);
                     break;
                 }
             }
             
-            // we still didn't find the tag, so translate to text
+            // we still didn't find the tag, so remove
             if ($skipped_tags === false) {
                 if ($escape_invalid_tags) {
                     $result[] = new HTMLPurifier_Token_Text(
                         $generator->generateFromToken($token, $config, $context)
                     );
+                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
+                } elseif ($e) {
+                    $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
                 }
                 continue;
             }
@@ -134,27 +234,66 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
             // okay, we found it, close all the skipped tags
             // note that skipped tags contains the element we need closed
             $size = count($skipped_tags);
-            for ($i = $size - 1; $i >= 0; $i--) {
+            for ($i = $size - 1; $i > 0; $i--) {
+                if ($e && !isset($skipped_tags[$i]->armor['MakeWellFormed_TagClosedError'])) {
+                    $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', $skipped_tags[$i]);
+                }
                 $result[] = new HTMLPurifier_Token_End($skipped_tags[$i]->name);
             }
             
-            // done!
+            $result[] = new HTMLPurifier_Token_End($skipped_tags[$i]->name);
             
         }
         
-        // we're at the end now, fix all still unclosed tags
+        $context->destroy('CurrentNesting');
+        $context->destroy('InputTokens');
+        $context->destroy('InputIndex');
+        $context->destroy('CurrentToken');
         
-        if (!empty($current_nesting)) {
-            $size = count($current_nesting);
+        // we're at the end now, fix all still unclosed tags
+        // not using processToken() because at this point we don't
+        // care about current nesting
+        if (!empty($this->currentNesting)) {
+            $size = count($this->currentNesting);
             for ($i = $size - 1; $i >= 0; $i--) {
+                if ($e && !isset($this->currentNesting[$i]->armor['MakeWellFormed_TagClosedError'])) {
+                    $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by document end', $this->currentNesting[$i]);
+                }
                 $result[] =
-                    new HTMLPurifier_Token_End($current_nesting[$i]->name);
+                    new HTMLPurifier_Token_End($this->currentNesting[$i]->name);
             }
         }
         
+        unset($this->outputTokens, $this->injectors, $this->currentInjector,
+          $this->currentNesting, $this->inputTokens, $this->inputIndex);
+        
         return $result;
     }
     
+    function processToken($token, $config, &$context) {
+        if (is_array($token)) {
+            // the original token was overloaded by an injector, time
+            // to some fancy acrobatics
+            
+            // $this->inputIndex is decremented so that the entire set gets
+            // re-processed
+            array_splice($this->inputTokens, $this->inputIndex--, 1, $token);
+            
+            // adjust the injector skips based on the array substitution
+            $offset = count($token) + 1;
+            for ($i = 0; $i <= $this->currentInjector; $i++) {
+                $this->injectors[$i]->skip += $offset;
+            }
+        } elseif ($token) {
+            // regular case
+            $this->outputTokens[] = $token;
+            if ($token->type == 'start') {
+                $this->currentNesting[] = $token;
+            } elseif ($token->type == 'end') {
+                array_pop($this->currentNesting); // not actually used
+            }
+        }
+    }
+    
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/library/HTMLPurifier/Strategy/RemoveForeignElements.php
index 9a1e80c0..c14662c3 100644
--- a/library/HTMLPurifier/Strategy/RemoveForeignElements.php
+++ b/library/HTMLPurifier/Strategy/RemoveForeignElements.php
@@ -17,9 +17,11 @@ HTMLPurifier_ConfigSchema::define(
 
 HTMLPurifier_ConfigSchema::define(
     'Core', 'RemoveScriptContents', true, 'bool', '
-This directive enables HTML Purifier to remove not only script tags
-but all of their contents. This directive has been available since 2.0.0,
-revert to pre-2.0.0 behavior by setting to false.
+<p>
+  This directive enables HTML Purifier to remove not only script tags
+  but all of their contents. This directive has been available since 2.0.0,
+  revert to pre-2.0.0 behavior by setting to false.
+</p>
 '
 );
 
@@ -48,6 +50,17 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
         // removes tokens until it reaches a closing tag with its value
         $remove_until = false;
         
+        // converts comments into text tokens when this is equal to a tag name
+        $textify_comments = false;
+        
+        $token = false;
+        $context->register('CurrentToken', $token);
+        
+        $e = false;
+        if ($config->get('Core', 'CollectErrors')) {
+            $e =& $context->get('ErrorCollector');
+        }
+        
         foreach($tokens as $token) {
             if ($remove_until) {
                 if (empty($token->is_tag) || $token->name !== $remove_until) {
@@ -61,11 +74,13 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
                 if (
                     isset($definition->info_tag_transform[$token->name])
                 ) {
+                    $original_name = $token->name;
                     // there is a transformation for this tag
                     // DEFINITION CALL
                     $token = $definition->
                                 info_tag_transform[$token->name]->
                                     transform($token, $config, $context);
+                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
                 }
                 
                 if (isset($definition->info[$token->name])) {
@@ -76,7 +91,7 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
                         $definition->info[$token->name]->required_attr &&
                         ($token->name != 'img' || $remove_invalid_img) // ensure config option still works
                     ) {
-                        $token = $attr_validator->validateToken($token, $config, $context);
+                        $attr_validator->validateToken($token, $config, $context);
                         $ok = true;
                         foreach ($definition->info[$token->name]->required_attr as $name) {
                             if (!isset($token->attr[$name])) {
@@ -84,12 +99,23 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
                                 break;
                             }
                         }
-                        if (!$ok) continue;
+                        if (!$ok) {
+                            if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', $name);
+                            continue;
+                        }
                         $token->armor['ValidateAttributes'] = true;
                     }
                     
+                    // CAN BE GENERICIZED
+                    if ($token->name == 'script' && $token->type == 'start') {
+                        $textify_comments = $token->name;
+                    } elseif ($token->name === $textify_comments && $token->type == 'end') {
+                        $textify_comments = false;
+                    }
+                    
                 } elseif ($escape_invalid_tags) {
-                    // invalid tag, generate HTML and insert in
+                    // invalid tag, generate HTML representation and insert in
+                    if ($e) $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
                     $token = new HTMLPurifier_Token_Text(
                         $generator->generateFromToken($token, $config, $context)
                     );
@@ -104,21 +130,37 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
                         } else {
                             $remove_until = false;
                         }
+                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Script removed');
+                    } else {
+                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
                     }
                     continue;
                 }
             } elseif ($token->type == 'comment') {
-                // strip comments
-                continue;
+                // textify comments in script tags when they are allowed
+                if ($textify_comments !== false) {
+                    $data = $token->data;
+                    $token = new HTMLPurifier_Token_Text($data);
+                } else {
+                    // strip comments
+                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+                    continue;
+                }
             } elseif ($token->type == 'text') {
             } else {
                 continue;
             }
             $result[] = $token;
         }
+        if ($remove_until && $e) {
+            // we removed tokens until the end, throw error
+            $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
+        }
+        
+        $context->destroy('CurrentToken');
+        
         return $result;
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Strategy/ValidateAttributes.php b/library/HTMLPurifier/Strategy/ValidateAttributes.php
index 1c9e09b3..4b3d7486 100644
--- a/library/HTMLPurifier/Strategy/ValidateAttributes.php
+++ b/library/HTMLPurifier/Strategy/ValidateAttributes.php
@@ -27,6 +27,9 @@ class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
         // setup validator
         $validator = new HTMLPurifier_AttrValidator();
         
+        $token = false;
+        $context->register('CurrentToken', $token);
+        
         foreach ($tokens as $key => $token) {
             
             // only process tokens that have attributes,
@@ -36,7 +39,10 @@ class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
             // skip tokens that are armored
             if (!empty($token->armor['ValidateAttributes'])) continue;
             
-            $tokens[$key] = $validator->validateToken($token, $config, $context);
+            // note that we have no facilities here for removing tokens
+            $validator->validateToken($token, $config, $context);
+            
+            $tokens[$key] = $token; // for PHP 4
         }
         
         $context->destroy('IDAccumulator');
@@ -46,4 +52,3 @@ class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/TagTransform.php b/library/HTMLPurifier/TagTransform.php
index 367ec8be..f5de99ce 100644
--- a/library/HTMLPurifier/TagTransform.php
+++ b/library/HTMLPurifier/TagTransform.php
@@ -38,4 +38,3 @@ class HTMLPurifier_TagTransform
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/TagTransform/Font.php b/library/HTMLPurifier/TagTransform/Font.php
index dedaf8b2..5bc22df9 100644
--- a/library/HTMLPurifier/TagTransform/Font.php
+++ b/library/HTMLPurifier/TagTransform/Font.php
@@ -39,7 +39,8 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
     function transform($tag, $config, &$context) {
         
         if ($tag->type == 'end') {
-            $new_tag = new HTMLPurifier_Token_End($this->transform_to);
+            $new_tag = $tag->copy();
+            $new_tag->name = $this->transform_to;
             return $new_tag;
         }
         
@@ -91,4 +92,3 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/TagTransform/Simple.php b/library/HTMLPurifier/TagTransform/Simple.php
index f8299e11..0b5a84d4 100644
--- a/library/HTMLPurifier/TagTransform/Simple.php
+++ b/library/HTMLPurifier/TagTransform/Simple.php
@@ -34,4 +34,3 @@ class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Token.php b/library/HTMLPurifier/Token.php
index dfcc5cbc..bd859d7f 100644
--- a/library/HTMLPurifier/Token.php
+++ b/library/HTMLPurifier/Token.php
@@ -15,7 +15,8 @@ class HTMLPurifier_Token {
     
     /**
      * Lookup array of processing that this token is exempt from.
-     * Currently, the only valid value is "ValidateAttributes".
+     * Currently, valid values are "ValidateAttributes" and
+     * "MakeWellFormed_TagClosedError"
      */
     var $armor = array();
     
@@ -24,7 +25,7 @@ class HTMLPurifier_Token {
      * @return Copied token
      */
     function copy() {
-        trigger_error('Cannot copy abstract class', E_USER_ERROR);
+        return unserialize(serialize($this));
     }
 }
 
@@ -65,7 +66,7 @@ class HTMLPurifier_Token_Tag extends HTMLPurifier_Token // abstract
      * @param $name String name.
      * @param $attr Associative array of attributes.
      */
-    function HTMLPurifier_Token_Tag($name, $attr = array()) {
+    function HTMLPurifier_Token_Tag($name, $attr = array(), $line = null) {
         $this->name = ctype_lower($name) ? $name : strtolower($name);
         foreach ($attr as $key => $value) {
             // normalization only necessary when key is not lowercase
@@ -80,6 +81,7 @@ class HTMLPurifier_Token_Tag extends HTMLPurifier_Token // abstract
             }
         }
         $this->attr = $attr;
+        $this->line = $line;
     }
 }
 
@@ -89,9 +91,6 @@ class HTMLPurifier_Token_Tag extends HTMLPurifier_Token // abstract
 class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
 {
     var $type = 'start';
-    function copy() {
-        return new HTMLPurifier_Token_Start($this->name, $this->attr);
-    }
 }
 
 /**
@@ -100,9 +99,6 @@ class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
 class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
 {
     var $type = 'empty';
-    function copy() {
-        return new HTMLPurifier_Token_Empty($this->name, $this->attr);
-    }
 }
 
 /**
@@ -115,9 +111,6 @@ class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
 class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag
 {
     var $type = 'end';
-    function copy() {
-        return new HTMLPurifier_Token_End($this->name);
-    }
 }
 
 /**
@@ -142,12 +135,10 @@ class HTMLPurifier_Token_Text extends HTMLPurifier_Token
      * 
      * @param $data String parsed character data.
      */
-    function HTMLPurifier_Token_Text($data) {
+    function HTMLPurifier_Token_Text($data, $line = null) {
         $this->data = $data;
         $this->is_whitespace = ctype_space($data);
-    }
-    function copy() {
-        return new HTMLPurifier_Token_Text($this->data);
+        $this->line = $line;
     }
     
 }
@@ -164,12 +155,9 @@ class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
      * 
      * @param $data String comment data.
      */
-    function HTMLPurifier_Token_Comment($data) {
+    function HTMLPurifier_Token_Comment($data, $line = null) {
         $this->data = $data;
-    }
-    function copy() {
-        return new HTMLPurifier_Token_Comment($this->data);
+        $this->line = $line;
     }
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/TokenFactory.php b/library/HTMLPurifier/TokenFactory.php
index 25cc4122..d15ee1a9 100644
--- a/library/HTMLPurifier/TokenFactory.php
+++ b/library/HTMLPurifier/TokenFactory.php
@@ -93,4 +93,3 @@ class HTMLPurifier_TokenFactory
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/URIScheme.php b/library/HTMLPurifier/URIScheme.php
index 20a9781b..9be99752 100644
--- a/library/HTMLPurifier/URIScheme.php
+++ b/library/HTMLPurifier/URIScheme.php
@@ -41,4 +41,3 @@ class HTMLPurifier_URIScheme
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/URIScheme/ftp.php b/library/HTMLPurifier/URIScheme/ftp.php
index dab9c981..3dbb1446 100644
--- a/library/HTMLPurifier/URIScheme/ftp.php
+++ b/library/HTMLPurifier/URIScheme/ftp.php
@@ -42,4 +42,3 @@ class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/URIScheme/http.php b/library/HTMLPurifier/URIScheme/http.php
index 54b250da..18a1cf87 100644
--- a/library/HTMLPurifier/URIScheme/http.php
+++ b/library/HTMLPurifier/URIScheme/http.php
@@ -21,4 +21,3 @@ class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/URIScheme/https.php b/library/HTMLPurifier/URIScheme/https.php
index 7f896592..bbd69b9c 100644
--- a/library/HTMLPurifier/URIScheme/https.php
+++ b/library/HTMLPurifier/URIScheme/https.php
@@ -11,4 +11,3 @@ class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/URIScheme/mailto.php b/library/HTMLPurifier/URIScheme/mailto.php
index 2292072e..8e552f5c 100644
--- a/library/HTMLPurifier/URIScheme/mailto.php
+++ b/library/HTMLPurifier/URIScheme/mailto.php
@@ -27,4 +27,3 @@ class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/URIScheme/news.php b/library/HTMLPurifier/URIScheme/news.php
index c9d1c2b0..7b81834f 100644
--- a/library/HTMLPurifier/URIScheme/news.php
+++ b/library/HTMLPurifier/URIScheme/news.php
@@ -21,4 +21,3 @@ class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/URIScheme/nntp.php b/library/HTMLPurifier/URIScheme/nntp.php
index 49fca4c3..8f513419 100644
--- a/library/HTMLPurifier/URIScheme/nntp.php
+++ b/library/HTMLPurifier/URIScheme/nntp.php
@@ -21,4 +21,3 @@ class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme {
     
 }
 
-?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/URISchemeRegistry.php b/library/HTMLPurifier/URISchemeRegistry.php
index 1ece1a2a..5d8c462c 100644
--- a/library/HTMLPurifier/URISchemeRegistry.php
+++ b/library/HTMLPurifier/URISchemeRegistry.php
@@ -101,4 +101,4 @@ class HTMLPurifier_URISchemeRegistry
     
 }
 
-?>
+
diff --git a/maintenance/flush-htmldefinition-cache.php b/maintenance/flush-htmldefinition-cache.php
index 780be373..c6d31bfb 100644
--- a/maintenance/flush-htmldefinition-cache.php
+++ b/maintenance/flush-htmldefinition-cache.php
@@ -21,4 +21,3 @@ $cache->flush($config);
 
 echo 'Cache flushed successfully.';
 
-?>
\ No newline at end of file
diff --git a/maintenance/generate-entity-file.php b/maintenance/generate-entity-file.php
index 8bf34a31..062fed1c 100644
--- a/maintenance/generate-entity-file.php
+++ b/maintenance/generate-entity-file.php
@@ -71,4 +71,3 @@ fclose($fh);
 
 echo "Completed successfully.";
 
-?>
\ No newline at end of file
diff --git a/package.php b/package.php
index 06a50514..c47e4c1b 100644
--- a/package.php
+++ b/package.php
@@ -53,4 +53,3 @@ $compat =& $pkg->exportCompatiblePackageFile1();
 $compat->writePackageFile();
 $pkg->writePackageFile();
 
-?>
\ No newline at end of file
diff --git a/release1-update.php b/release1-update.php
index 05b6b904..4d51ab3a 100644
--- a/release1-update.php
+++ b/release1-update.php
@@ -92,4 +92,3 @@ file_put_contents('library/HTMLPurifier/Config.php', $config_c);
 
 echo "Review changes, write something in WHATSNEW, and then SVN commit with log 'Release $version.'" . PHP_EOL;
 
-?>
\ No newline at end of file
diff --git a/release2-strict.php b/release2-strict.php
index 4a8b8fd9..51e8aa98 100644
--- a/release2-strict.php
+++ b/release2-strict.php
@@ -28,4 +28,3 @@ foreach ($out as $line) {
 $version = trim(file_get_contents('VERSION'));
 echo "Resolve conflicts and then commit as 'Release $version, merged in $last_rev to HEAD.'";
 
-?>
\ No newline at end of file
diff --git a/release3-tag.php b/release3-tag.php
index c6f72758..3c0a4ee9 100644
--- a/release3-tag.php
+++ b/release3-tag.php
@@ -23,4 +23,3 @@ passthru("svn copy --message \"Tag $version release.\" $trunk_url $trunk_tag_url
 echo "Tagging strict to tags/$version-strict...";
 passthru("svn copy --message \"Tag $version-strict release.\" $strict_url $strict_tag_url");
 
-?>
\ No newline at end of file
diff --git a/smoketests/all.php b/smoketests/all.php
index de09412c..3f514e84 100644
--- a/smoketests/all.php
+++ b/smoketests/all.php
@@ -38,4 +38,4 @@ while (false !== ($filename = readdir($dh))) {
 ?>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/attrTransform.php b/smoketests/attrTransform.php
index 05f61813..e1cf7a42 100644
--- a/smoketests/attrTransform.php
+++ b/smoketests/attrTransform.php
@@ -66,4 +66,4 @@ foreach ($xml->group as $group) {
 
 ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/attrTransform.xml b/smoketests/attrTransform.xml
index 74500488..ca0ee5b1 100644
--- a/smoketests/attrTransform.xml
+++ b/smoketests/attrTransform.xml
@@ -186,4 +186,4 @@
         <sample><![CDATA[]]></sample>
     </group>
     -->
-</samples>
\ No newline at end of file
+</samples>
diff --git a/smoketests/basic.php b/smoketests/basic.php
index 7c791be5..e8ffed80 100644
--- a/smoketests/basic.php
+++ b/smoketests/basic.php
@@ -67,4 +67,4 @@ if ($page) {
 
 ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/basic/allElements.css b/smoketests/basic/allElements.css
index 874c094c..58fb0546 100644
--- a/smoketests/basic/allElements.css
+++ b/smoketests/basic/allElements.css
@@ -45,4 +45,4 @@ div > * {background:#F00; color:#FFF; font-weight:bold; padding:0.2em; margin:0.
 .insert-declarations-above
  {background:#008000; margin:0; padding:0.2em;}
 #module-text span, #module-text div {padding:0; margin:0.1em;}
-#module-list li, #module-list dd, #module-list dt {border:1px solid #FFF;}
\ No newline at end of file
+#module-list li, #module-list dd, #module-list dt {border:1px solid #FFF;}
diff --git a/smoketests/basic/allElements.html b/smoketests/basic/allElements.html
index a3fa408a..9f727258 100644
--- a/smoketests/basic/allElements.html
+++ b/smoketests/basic/allElements.html
@@ -76,4 +76,4 @@ otherwise there will be problems.</p>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/basic/legacy.html b/smoketests/basic/legacy.html
index 00919734..30239379 100644
--- a/smoketests/basic/legacy.html
+++ b/smoketests/basic/legacy.html
@@ -121,4 +121,4 @@ hr@size
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/common.php b/smoketests/common.php
index c9b09dbf..8b3785a9 100644
--- a/smoketests/common.php
+++ b/smoketests/common.php
@@ -11,4 +11,3 @@ function escapeHTML($string) {
     return $string;
 }
 
-?>
diff --git a/smoketests/configForm.php b/smoketests/configForm.php
index 63385dc7..f84bb48d 100644
--- a/smoketests/configForm.php
+++ b/smoketests/configForm.php
@@ -70,8 +70,8 @@ echo $printer->render($config);
 </form>
 <pre>
 <?php
-print_r($config->getAll());
+echo htmlspecialchars(print_r($config->getAll(), true));
 ?>
 </pre>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/loadFunc.php b/smoketests/loadFunc.php
index d93cc0a7..bff9a879 100644
--- a/smoketests/loadFunc.php
+++ b/smoketests/loadFunc.php
@@ -37,4 +37,4 @@ not the library is lazy loaded.</p>
 <p>HTMLPurifier class exists: <?php printb(class_exists('HTMLPurifier')); ?></li></p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/preserveYouTube.php b/smoketests/preserveYouTube.php
index 24820f8d..342fb681 100644
--- a/smoketests/preserveYouTube.php
+++ b/smoketests/preserveYouTube.php
@@ -41,4 +41,4 @@ echo $youtube_purifier->purify($string);
 ?></div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/printDefinition.php b/smoketests/printDefinition.php
index 02552adb..86fd9494 100644
--- a/smoketests/printDefinition.php
+++ b/smoketests/printDefinition.php
@@ -6,24 +6,13 @@ require_once 'HTMLPurifier/Printer/HTMLDefinition.php';
 require_once 'HTMLPurifier/Printer/CSSDefinition.php';
 require_once 'HTMLPurifier/Printer/ConfigForm.php';
 
-$config = HTMLPurifier_Config::loadArrayFromForm($_GET, 'config');
+$config = HTMLPurifier_Config::loadArrayFromForm($_GET, 'config', 'HTML');
 
 // you can do custom configuration!
 if (file_exists('printDefinition.settings.php')) {
     include 'printDefinition.settings.php';
 }
 
-/* // sample local definition, obviously needs to be less clunky
-$html_definition =& $config->getHTMLDefinition(true);
-$module = new HTMLPurifier_HTMLModule();
-$module->name = 'Marquee';
-$module->info['marquee'] = new HTMLPurifier_ElementDef();
-$module->info['marquee']->content_model = '#PCDATA | Inline';
-$module->info['marquee']->content_model_type = 'optional';
-$module->content_sets = array('Inline' => 'marquee');
-$html_definition->manager->addModule($module);
-*/
-
 $printer_html_definition = new HTMLPurifier_Printer_HTMLDefinition();
 $printer_css_definition  = new HTMLPurifier_Printer_CSSDefinition();
 
@@ -33,6 +22,7 @@ $printer_config_form = new HTMLPurifier_Printer_ConfigForm(
 );
 
 echo '<?xml version="1.0" encoding="UTF-8" ?>';
+
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -51,6 +41,7 @@ echo '<?xml version="1.0" encoding="UTF-8" ?>';
         .HTMLPurifier_Printer caption {font-size:1.5em; font-weight:bold;
             width:100%;}
         .HTMLPurifier_Printer .heavy {background:#99C;text-align:center;}
+        .HTMLPurifier_Printer .unsafe {background:#C99;}
         dt {font-weight:bold;}
     </style>
     <link rel="stylesheet" href="../library/HTMLPurifier/Printer/ConfigForm.css" type="text/css" />
@@ -120,4 +111,4 @@ Null/Disabled will mean that user whitelisting functionality is disabled.</p>
 <h2>CSSDefinition</h2>
 <?php echo $printer_css_definition->render($config) ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/testSchema.php b/smoketests/testSchema.php
dissimilarity index 70%
index 1295566e..6e8bc74b 100644
--- a/smoketests/testSchema.php
+++ b/smoketests/testSchema.php
@@ -1,44 +1,39 @@
-<?php
-
-// overload default configuration schema temporarily
-$custom_schema = new HTMLPurifier_ConfigSchema();
-$old = HTMLPurifier_ConfigSchema::instance();
-$custom_schema =& HTMLPurifier_ConfigSchema::instance($custom_schema);
-
-if (!class_exists('CS')) {
-    class CS extends HTMLPurifier_ConfigSchema {}
-}
-
-CS::defineNamespace('Element', 'Chemical substances that cannot be further decomposed');
-
-CS::define('Element', 'Abbr', 'H', 'string', 'Abbreviation of element name.');
-CS::define('Element', 'Name', 'hydrogen', 'istring', 'Full name of atoms.');
-CS::define('Element', 'Number', 1, 'int', 'Atomic number, is identity.');
-CS::define('Element', 'Mass', 1.00794, 'float', 'Atomic mass.');
-CS::define('Element', 'Radioactive', false, 'bool', 'Does it have rapid decay?');
-CS::define('Element', 'Isotopes', array('1' => true, '2' => true, '3' => true), 'lookup',
-    'What numbers of neutrons for this element have been observed?');
-CS::define('Element', 'Traits', array('nonmetallic', 'odorless', 'flammable'), 'list',
-    'What are general properties of the element?');
-CS::define('Element', 'IsotopeNames', array('1' => 'protium', '2' => 'deuterium', '3' => 'tritium'), 'hash',
-    'Lookup hash of neutron counts to formal names.');
-
-CS::defineNamespace('Instrument', 'Of the musical type.');
-
-CS::define('Instrument', 'Manufacturer', 'Yamaha', 'string', 'Who made it?');
-CS::defineAllowedValues('Instrument', 'Manufacturer', array(
-    'Yamaha', 'Conn-Selmer', 'Vandoren', 'Laubin', 'Buffet', 'other'));
-CS::defineValueAliases('Instrument', 'Manufacturer', array(
-    'Selmer' => 'Conn-Selmer'));
-
-CS::define('Instrument', 'Family', 'woodwind', 'istring', 'What family is it?');
-CS::defineAllowedValues('Instrument', 'Family', array(
-    'brass', 'woodwind', 'percussion', 'string', 'keyboard', 'electronic'));
-CS::defineValueAliases('Instrument', 'Family', array(
-    'synth' => 'electronic'));
-
-CS::defineNamespace('ReportCard', 'It is for grades.');
-CS::define('ReportCard', 'English', null, 'string/null', 'Grade from English class.');
-CS::define('ReportCard', 'Absences', 0, 'int', 'How many times missing from school?');
-
-?>
\ No newline at end of file
+<?php
+
+// overload default configuration schema temporarily
+$custom_schema = new HTMLPurifier_ConfigSchema();
+$old = HTMLPurifier_ConfigSchema::instance();
+$custom_schema =& HTMLPurifier_ConfigSchema::instance($custom_schema);
+
+HTMLPurifier_ConfigSchema::defineNamespace('Element', 'Chemical substances that cannot be further decomposed');
+
+HTMLPurifier_ConfigSchema::define('Element', 'Abbr', 'H', 'string', 'Abbreviation of element name.');
+HTMLPurifier_ConfigSchema::define('Element', 'Name', 'hydrogen', 'istring', 'Full name of atoms.');
+HTMLPurifier_ConfigSchema::define('Element', 'Number', 1, 'int', 'Atomic number, is identity.');
+HTMLPurifier_ConfigSchema::define('Element', 'Mass', 1.00794, 'float', 'Atomic mass.');
+HTMLPurifier_ConfigSchema::define('Element', 'Radioactive', false, 'bool', 'Does it have rapid decay?');
+HTMLPurifier_ConfigSchema::define('Element', 'Isotopes', array('1' => true, '2' => true, '3' => true), 'lookup',
+    'What numbers of neutrons for this element have been observed?');
+HTMLPurifier_ConfigSchema::define('Element', 'Traits', array('nonmetallic', 'odorless', 'flammable'), 'list',
+    'What are general properties of the element?');
+HTMLPurifier_ConfigSchema::define('Element', 'IsotopeNames', array('1' => 'protium', '2' => 'deuterium', '3' => 'tritium'), 'hash',
+    'Lookup hash of neutron counts to formal names.');
+
+HTMLPurifier_ConfigSchema::defineNamespace('Instrument', 'Of the musical type.');
+
+HTMLPurifier_ConfigSchema::define('Instrument', 'Manufacturer', 'Yamaha', 'string', 'Who made it?');
+HTMLPurifier_ConfigSchema::defineAllowedValues('Instrument', 'Manufacturer', array(
+    'Yamaha', 'Conn-Selmer', 'Vandoren', 'Laubin', 'Buffet', 'other'));
+HTMLPurifier_ConfigSchema::defineValueAliases('Instrument', 'Manufacturer', array(
+    'Selmer' => 'Conn-Selmer'));
+
+HTMLPurifier_ConfigSchema::define('Instrument', 'Family', 'woodwind', 'istring', 'What family is it?');
+HTMLPurifier_ConfigSchema::defineAllowedValues('Instrument', 'Family', array(
+    'brass', 'woodwind', 'percussion', 'string', 'keyboard', 'electronic'));
+HTMLPurifier_ConfigSchema::defineValueAliases('Instrument', 'Family', array(
+    'synth' => 'electronic'));
+
+HTMLPurifier_ConfigSchema::defineNamespace('ReportCard', 'It is for grades.');
+HTMLPurifier_ConfigSchema::define('ReportCard', 'English', null, 'string/null', 'Grade from English class.');
+HTMLPurifier_ConfigSchema::define('ReportCard', 'Absences', 0, 'int', 'How many times missing from school?');
+
diff --git a/smoketests/utf8.php b/smoketests/utf8.php
index 2d23330b..97f1441f 100644
--- a/smoketests/utf8.php
+++ b/smoketests/utf8.php
@@ -37,4 +37,4 @@ in <strong>Purified</strong>.  If <strong>Purified</strong> is mangled, there
 is likely trouble a-brewing in the library. If
 both are mangled, check to see that this file was not corrupted.</p>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/variableWidthAttack.php b/smoketests/variableWidthAttack.php
index 5c256803..c4054f66 100644
--- a/smoketests/variableWidthAttack.php
+++ b/smoketests/variableWidthAttack.php
@@ -51,4 +51,4 @@ for ($i = 0; $i < 256; $i++) {
 removed, as well as escaping quotes outside of tags, this is a non-threat.</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smoketests/xssAttacks.php b/smoketests/xssAttacks.php
index f5bb78bb..bd39cab2 100644
--- a/smoketests/xssAttacks.php
+++ b/smoketests/xssAttacks.php
@@ -93,4 +93,4 @@ foreach ($xml->attack as $attack) {
 </tbody>
 </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/svn.php b/svn.php
index db588754..c57e4483 100644
--- a/svn.php
+++ b/svn.php
@@ -11,4 +11,3 @@ function svn_info($dir) {
     return $svn_info;
 }
 
-?>
\ No newline at end of file
diff --git a/test-settings.sample.php b/test-settings.sample.php
index 1fbcfe4e..bd1f622b 100644
--- a/test-settings.sample.php
+++ b/test-settings.sample.php
@@ -14,4 +14,3 @@ $GLOBALS['HTMLPurifierTest']['Runs'] = 2;
 // Where is SimpleTest located?
 $simpletest_location = '/path/to/simpletest/';
 
-?>
\ No newline at end of file
diff --git a/tests/Debugger.php b/tests/Debugger.php
index 0691eb24..0fccd041 100644
--- a/tests/Debugger.php
+++ b/tests/Debugger.php
@@ -54,6 +54,19 @@ function isInScopes($array = array()) {
 }
 /**#@-*/
 
+function printTokens($tokens, $index) {
+    $string = '<pre>';
+    $generator = new HTMLPurifier_Generator();
+    foreach ($tokens as $i => $token) {
+        if ($index == $i) $string .= '[<strong>';
+        $string .= "<sup>$i</sup>";
+        $string .= $generator->escape($generator->generateFromToken($token));
+        if ($index == $i) $string .= '</strong>]';
+    }
+    $string .= '</pre>';
+    echo $string;
+}
+
 /**
  * The debugging singleton. Most interesting stuff happens here.
  */
@@ -145,4 +158,3 @@ class Debugger
     
 }
 
-?>
diff --git a/tests/HTMLPurifier/AttrCollectionsTest.php b/tests/HTMLPurifier/AttrCollectionsTest.php
index 632f75ed..6420a6ac 100644
--- a/tests/HTMLPurifier/AttrCollectionsTest.php
+++ b/tests/HTMLPurifier/AttrCollectionsTest.php
@@ -18,7 +18,7 @@ class HTMLPurifier_AttrCollectionsTest extends UnitTestCase
         
         $collections = new HTMLPurifier_AttrCollectionsTest_NoConstructor();
         
-        $types = new HTMLPurifier_AttrTypesMock($this);
+        $types = new HTMLPurifier_AttrTypesMock();
         
         $modules = array();
         
@@ -68,7 +68,7 @@ class HTMLPurifier_AttrCollectionsTest extends UnitTestCase
         
         generate_mock_once('HTMLPurifier_AttrTypes');
         
-        $types = new HTMLPurifier_AttrTypesMock($this);
+        $types = new HTMLPurifier_AttrTypesMock();
         $collections = new HTMLPurifier_AttrCollections($types, array());
         $collections->info = array(
             'Core' => array(0 => array('Inclusion', 'Undefined'), 'attr-original' => 'Type'),
@@ -106,7 +106,7 @@ class HTMLPurifier_AttrCollectionsTest extends UnitTestCase
         
         generate_mock_once('HTMLPurifier_AttrTypes');
         
-        $types = new HTMLPurifier_AttrTypesMock($this);
+        $types = new HTMLPurifier_AttrTypesMock();
         $collections = new HTMLPurifier_AttrCollections($types, array());
         
         $attr = array(
@@ -136,4 +136,3 @@ class HTMLPurifier_AttrCollectionsTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/BackgroundPositionTest.php b/tests/HTMLPurifier/AttrDef/CSS/BackgroundPositionTest.php
index 911823f4..134df679 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/BackgroundPositionTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/BackgroundPositionTest.php
@@ -68,4 +68,3 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPositionTest extends HTMLPurifier_AttrD
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php b/tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php
index d4db8493..7cd60d34 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php
@@ -19,4 +19,3 @@ class HTMLPurifier_AttrDef_CSS_BackgroundTest extends HTMLPurifier_AttrDefHarnes
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/BorderTest.php b/tests/HTMLPurifier/AttrDef/CSS/BorderTest.php
index 6e130e46..5eaceae4 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/BorderTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/BorderTest.php
@@ -19,4 +19,3 @@ class HTMLPurifier_AttrDef_CSS_BorderTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/ColorTest.php b/tests/HTMLPurifier/AttrDef/CSS/ColorTest.php
index 89afd121..030c6224 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/ColorTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/ColorTest.php
@@ -34,4 +34,3 @@ class HTMLPurifier_AttrDef_CSS_ColorTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php b/tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php
index 037131fb..34abb35a 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php
@@ -29,8 +29,8 @@ class HTMLPurifier_AttrDef_CSS_CompositeTest extends HTMLPurifier_AttrDefHarness
         // first test: value properly validates on first definition
         // so second def is never called
         
-        $def1 = new HTMLPurifier_AttrDefMock($this);
-        $def2 = new HTMLPurifier_AttrDefMock($this);
+        $def1 = new HTMLPurifier_AttrDefMock();
+        $def2 = new HTMLPurifier_AttrDefMock();
         $defs = array(&$def1, &$def2);
         $def = new HTMLPurifier_AttrDef_CSS_Composite_Testable($defs);
         $input = 'FOOBAR';
@@ -48,8 +48,8 @@ class HTMLPurifier_AttrDef_CSS_CompositeTest extends HTMLPurifier_AttrDefHarness
         
         // second test, first def fails, second def works
         
-        $def1 = new HTMLPurifier_AttrDefMock($this);
-        $def2 = new HTMLPurifier_AttrDefMock($this);
+        $def1 = new HTMLPurifier_AttrDefMock();
+        $def2 = new HTMLPurifier_AttrDefMock();
         $defs = array(&$def1, &$def2);
         $def = new HTMLPurifier_AttrDef_CSS_Composite_Testable($defs);
         $input = 'BOOMA';
@@ -68,8 +68,8 @@ class HTMLPurifier_AttrDef_CSS_CompositeTest extends HTMLPurifier_AttrDefHarness
         
         // third test, all fail, so composite faiils
         
-        $def1 = new HTMLPurifier_AttrDefMock($this);
-        $def2 = new HTMLPurifier_AttrDefMock($this);
+        $def1 = new HTMLPurifier_AttrDefMock();
+        $def2 = new HTMLPurifier_AttrDefMock();
         $defs = array(&$def1, &$def2);
         $def = new HTMLPurifier_AttrDef_CSS_Composite_Testable($defs);
         $input = 'BOOMA';
@@ -90,4 +90,3 @@ class HTMLPurifier_AttrDef_CSS_CompositeTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php b/tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php
index a802d45f..861cbb32 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php
@@ -21,4 +21,3 @@ class HTMLPurifier_AttrDef_CSS_FontFamilyTest extends HTMLPurifier_AttrDefHarnes
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/FontTest.php b/tests/HTMLPurifier/AttrDef/CSS/FontTest.php
index 6bcb4fe2..48650864 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/FontTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/FontTest.php
@@ -34,4 +34,3 @@ class HTMLPurifier_AttrDef_CSS_FontTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/LengthTest.php b/tests/HTMLPurifier/AttrDef/CSS/LengthTest.php
index 56129af2..d7914e80 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/LengthTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/LengthTest.php
@@ -40,4 +40,3 @@ class HTMLPurifier_AttrDef_CSS_LengthTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php b/tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php
index 6863c489..ff9391a2 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php
@@ -35,4 +35,3 @@ class HTMLPurifier_AttrDef_CSS_ListStyleTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php b/tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php
index 075c56ad..81342a7c 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php
@@ -30,4 +30,3 @@ class HTMLPurifier_AttrDef_CSS_MultipleTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/NumberTest.php b/tests/HTMLPurifier/AttrDef/CSS/NumberTest.php
index f8f714f6..071135be 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/NumberTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/NumberTest.php
@@ -37,4 +37,3 @@ class HTMLPurifier_AttrDef_CSS_NumberTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php b/tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php
index 2aa0d401..3ca210a5 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php
@@ -24,4 +24,3 @@ class HTMLPurifier_AttrDef_CSS_PercentageTest extends HTMLPurifier_AttrDefHarnes
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/TextDecorationTest.php b/tests/HTMLPurifier/AttrDef/CSS/TextDecorationTest.php
index e5f3e0c7..fb0ccf4f 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/TextDecorationTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/TextDecorationTest.php
@@ -24,4 +24,3 @@ class HTMLPurifier_AttrDef_CSS_TextDecorationTest extends HTMLPurifier_AttrDefHa
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSS/URITest.php b/tests/HTMLPurifier/AttrDef/CSS/URITest.php
index 2a238d22..97e547c8 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/URITest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/URITest.php
@@ -34,4 +34,3 @@ class HTMLPurifier_AttrDef_CSS_URITest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/CSSTest.php b/tests/HTMLPurifier/AttrDef/CSSTest.php
index 9371f788..2d1b4c60 100644
--- a/tests/HTMLPurifier/AttrDef/CSSTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSSTest.php
@@ -108,4 +108,3 @@ class HTMLPurifier_AttrDef_CSSTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/EnumTest.php b/tests/HTMLPurifier/AttrDef/EnumTest.php
index fe405d85..013b660d 100644
--- a/tests/HTMLPurifier/AttrDef/EnumTest.php
+++ b/tests/HTMLPurifier/AttrDef/EnumTest.php
@@ -37,4 +37,3 @@ class HTMLPurifier_AttrDef_EnumTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/HTML/BoolTest.php b/tests/HTMLPurifier/AttrDef/HTML/BoolTest.php
index 47a31fc3..87e8a8eb 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/BoolTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/BoolTest.php
@@ -22,4 +22,3 @@ class HTMLPurifier_AttrDef_HTML_BoolTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/HTML/ColorTest.php b/tests/HTMLPurifier/AttrDef/HTML/ColorTest.php
index 39bd80db..72f6c90f 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/ColorTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/ColorTest.php
@@ -20,4 +20,3 @@ class HTMLPurifier_AttrDef_HTML_ColorTest extends HTMLPurifier_AttrDefHarness
     }
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/HTML/FrameTargetTest.php b/tests/HTMLPurifier/AttrDef/HTML/FrameTargetTest.php
index 1e28ea16..11353336 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/FrameTargetTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/FrameTargetTest.php
@@ -28,4 +28,3 @@ class HTMLPurifier_AttrDef_HTML_FrameTargetTest extends HTMLPurifier_AttrDefHarn
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/HTML/IDTest.php b/tests/HTMLPurifier/AttrDef/HTML/IDTest.php
index add764fd..dda0db41 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/IDTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/IDTest.php
@@ -109,4 +109,3 @@ class HTMLPurifier_AttrDef_HTML_IDTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/HTML/LengthTest.php b/tests/HTMLPurifier/AttrDef/HTML/LengthTest.php
index e5b89f22..8fba0476 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/LengthTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/LengthTest.php
@@ -32,4 +32,3 @@ class HTMLPurifier_AttrDef_HTML_LengthTest extends HTMLPurifier_AttrDef_HTML_Pix
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php b/tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php
index 0acfac03..a6643f74 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php
@@ -21,4 +21,3 @@ class HTMLPurifier_AttrDef_HTML_LinkTypesTest extends HTMLPurifier_AttrDefHarnes
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/HTML/MultiLengthTest.php b/tests/HTMLPurifier/AttrDef/HTML/MultiLengthTest.php
index eaa34952..7a305c30 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/MultiLengthTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/MultiLengthTest.php
@@ -28,4 +28,3 @@ class HTMLPurifier_AttrDef_HTML_MultiLengthTest extends HTMLPurifier_AttrDef_HTM
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php b/tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php
index 00b55eec..3d218061 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php
@@ -32,4 +32,3 @@ class HTMLPurifier_AttrDef_HTML_NmtokensTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php b/tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php
index 414fa3ad..6fa899bf 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php
@@ -38,4 +38,3 @@ class HTMLPurifier_AttrDef_HTML_PixelsTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/IntegerTest.php b/tests/HTMLPurifier/AttrDef/IntegerTest.php
index 98cefbac..43714d8e 100644
--- a/tests/HTMLPurifier/AttrDef/IntegerTest.php
+++ b/tests/HTMLPurifier/AttrDef/IntegerTest.php
@@ -61,4 +61,3 @@ class HTMLPurifier_AttrDef_IntegerTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/LangTest.php b/tests/HTMLPurifier/AttrDef/LangTest.php
index a5472e91..cafa5db2 100644
--- a/tests/HTMLPurifier/AttrDef/LangTest.php
+++ b/tests/HTMLPurifier/AttrDef/LangTest.php
@@ -85,4 +85,3 @@ class HTMLPurifier_AttrDef_LangTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/TextTest.php b/tests/HTMLPurifier/AttrDef/TextTest.php
index 2aa4128d..4977edcd 100644
--- a/tests/HTMLPurifier/AttrDef/TextTest.php
+++ b/tests/HTMLPurifier/AttrDef/TextTest.php
@@ -17,4 +17,3 @@ class HTMLPurifier_AttrDef_TextTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/URI/Email/SimpleCheckTest.php b/tests/HTMLPurifier/AttrDef/URI/Email/SimpleCheckTest.php
index edbde119..6b8cae31 100644
--- a/tests/HTMLPurifier/AttrDef/URI/Email/SimpleCheckTest.php
+++ b/tests/HTMLPurifier/AttrDef/URI/Email/SimpleCheckTest.php
@@ -13,4 +13,3 @@ class HTMLPurifier_AttrDef_URI_Email_SimpleCheckTest
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/URI/EmailHarness.php b/tests/HTMLPurifier/AttrDef/URI/EmailHarness.php
index b0398424..3c14e4eb 100644
--- a/tests/HTMLPurifier/AttrDef/URI/EmailHarness.php
+++ b/tests/HTMLPurifier/AttrDef/URI/EmailHarness.php
@@ -31,4 +31,3 @@ class HTMLPurifier_AttrDef_URI_EmailHarness extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/URI/HostTest.php b/tests/HTMLPurifier/AttrDef/URI/HostTest.php
index d3e44753..33424eca 100644
--- a/tests/HTMLPurifier/AttrDef/URI/HostTest.php
+++ b/tests/HTMLPurifier/AttrDef/URI/HostTest.php
@@ -21,4 +21,3 @@ class HTMLPurifier_AttrDef_URI_HostTest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/URI/IPv6Test.php b/tests/HTMLPurifier/AttrDef/URI/IPv6Test.php
index 8a6511b0..33b56ad4 100644
--- a/tests/HTMLPurifier/AttrDef/URI/IPv6Test.php
+++ b/tests/HTMLPurifier/AttrDef/URI/IPv6Test.php
@@ -43,4 +43,3 @@ class HTMLPurifier_AttrDef_URI_IPv6Test extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDef/URITest.php b/tests/HTMLPurifier/AttrDef/URITest.php
index e6aab057..a4d2521e 100644
--- a/tests/HTMLPurifier/AttrDef/URITest.php
+++ b/tests/HTMLPurifier/AttrDef/URITest.php
@@ -202,11 +202,11 @@ class HTMLPurifier_AttrDef_URITest extends HTMLPurifier_AttrDefHarness
         // $fake_registry isn't the real mock, because due to PHP 4 weirdness
         // I cannot set a default value to function parameters that are passed
         // by reference. So we use the value instance() returns.
-        $fake_registry = new HTMLPurifier_URISchemeRegistryMock($this);
+        $fake_registry = new HTMLPurifier_URISchemeRegistryMock();
         $registry =& HTMLPurifier_URISchemeRegistry::instance($fake_registry);
         
         // now, let's add a pseudo-scheme to the registry
-        $this->scheme = new HTMLPurifier_URISchemeMock($this);
+        $this->scheme = new HTMLPurifier_URISchemeMock();
         
         // here are the schemes we will support with overloaded mocks
         $registry->setReturnReference('getScheme', $this->scheme, array('http', '*', '*'));
@@ -325,4 +325,4 @@ class HTMLPurifier_AttrDef_URITest extends HTMLPurifier_AttrDefHarness
     
 }
 
-?>
+
diff --git a/tests/HTMLPurifier/AttrDefHarness.php b/tests/HTMLPurifier/AttrDefHarness.php
index e6c6359e..84d8cc9e 100644
--- a/tests/HTMLPurifier/AttrDefHarness.php
+++ b/tests/HTMLPurifier/AttrDefHarness.php
@@ -30,4 +30,3 @@ class HTMLPurifier_AttrDefHarness extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrDefTest.php b/tests/HTMLPurifier/AttrDefTest.php
index a8963bc4..0cd11310 100644
--- a/tests/HTMLPurifier/AttrDefTest.php
+++ b/tests/HTMLPurifier/AttrDefTest.php
@@ -27,4 +27,3 @@ class HTMLPurifier_AttrDefTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/BdoDirTest.php b/tests/HTMLPurifier/AttrTransform/BdoDirTest.php
index 93b051dc..d1ef2468 100644
--- a/tests/HTMLPurifier/AttrTransform/BdoDirTest.php
+++ b/tests/HTMLPurifier/AttrTransform/BdoDirTest.php
@@ -29,4 +29,3 @@ class HTMLPurifier_AttrTransform_BdoDirTest extends HTMLPurifier_AttrTransformHa
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/BgColorTest.php b/tests/HTMLPurifier/AttrTransform/BgColorTest.php
index 6ad35bde..69429ad8 100644
--- a/tests/HTMLPurifier/AttrTransform/BgColorTest.php
+++ b/tests/HTMLPurifier/AttrTransform/BgColorTest.php
@@ -40,4 +40,3 @@ class HTMLPurifier_AttrTransform_BgColorTest extends HTMLPurifier_AttrTransformH
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php b/tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php
index b6794600..70b4fbdb 100644
--- a/tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php
+++ b/tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php
@@ -36,4 +36,3 @@ class HTMLPurifier_AttrTransform_BoolToCSSTest extends HTMLPurifier_AttrTransfor
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/BorderTest.php b/tests/HTMLPurifier/AttrTransform/BorderTest.php
index a592e41b..25fb3c66 100644
--- a/tests/HTMLPurifier/AttrTransform/BorderTest.php
+++ b/tests/HTMLPurifier/AttrTransform/BorderTest.php
@@ -37,4 +37,3 @@ class HTMLPurifier_AttrTransform_BorderTest extends HTMLPurifier_AttrTransformHa
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php b/tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php
index 565cee45..38bc0f14 100644
--- a/tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php
+++ b/tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php
@@ -75,4 +75,3 @@ class HTMLPurifier_AttrTransform_EnumToCSSTest extends HTMLPurifier_AttrTransfor
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php b/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php
index a9ad9a8c..b1d871b4 100644
--- a/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php
+++ b/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php
@@ -48,4 +48,3 @@ class HTMLPurifier_AttrTransform_ImgRequiredTest extends HTMLPurifier_AttrTransf
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php b/tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php
index 8426f15c..8fc9178f 100644
--- a/tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php
+++ b/tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php
@@ -54,4 +54,3 @@ class HTMLPurifier_AttrTransform_ImgSpaceTest extends HTMLPurifier_AttrTransform
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/LangTest.php b/tests/HTMLPurifier/AttrTransform/LangTest.php
index 2e3551b3..42232ca3 100644
--- a/tests/HTMLPurifier/AttrTransform/LangTest.php
+++ b/tests/HTMLPurifier/AttrTransform/LangTest.php
@@ -46,4 +46,3 @@ class HTMLPurifier_AttrTransform_LangTest
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/LengthTest.php b/tests/HTMLPurifier/AttrTransform/LengthTest.php
index e0c9474b..62068e4b 100644
--- a/tests/HTMLPurifier/AttrTransform/LengthTest.php
+++ b/tests/HTMLPurifier/AttrTransform/LengthTest.php
@@ -34,4 +34,3 @@ class HTMLPurifier_AttrTransform_LengthTest extends HTMLPurifier_AttrTransformHa
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransform/NameTest.php b/tests/HTMLPurifier/AttrTransform/NameTest.php
index da4498fb..30e9e58b 100644
--- a/tests/HTMLPurifier/AttrTransform/NameTest.php
+++ b/tests/HTMLPurifier/AttrTransform/NameTest.php
@@ -25,4 +25,3 @@ class HTMLPurifier_AttrTransform_NameTest extends HTMLPurifier_AttrTransformHarn
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransformHarness.php b/tests/HTMLPurifier/AttrTransformHarness.php
index aff1d6b7..1f7839d0 100644
--- a/tests/HTMLPurifier/AttrTransformHarness.php
+++ b/tests/HTMLPurifier/AttrTransformHarness.php
@@ -11,4 +11,3 @@ class HTMLPurifier_AttrTransformHarness extends HTMLPurifier_Harness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTransformTest.php b/tests/HTMLPurifier/AttrTransformTest.php
index fac01633..e75352fb 100644
--- a/tests/HTMLPurifier/AttrTransformTest.php
+++ b/tests/HTMLPurifier/AttrTransformTest.php
@@ -39,4 +39,3 @@ class HTMLPurifier_AttrTransformTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrTypesTest.php b/tests/HTMLPurifier/AttrTypesTest.php
index 9d919a83..3f09dd1f 100644
--- a/tests/HTMLPurifier/AttrTypesTest.php
+++ b/tests/HTMLPurifier/AttrTypesTest.php
@@ -25,4 +25,3 @@ class HTMLPurifier_AttrTypesTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/AttrValidator_ErrorsTest.php b/tests/HTMLPurifier/AttrValidator_ErrorsTest.php
new file mode 100644
index 00000000..08f59c99
--- /dev/null
+++ b/tests/HTMLPurifier/AttrValidator_ErrorsTest.php
@@ -0,0 +1,49 @@
+<?php
+
+require_once 'HTMLPurifier/ErrorsHarness.php';
+require_once 'HTMLPurifier/AttrValidator.php';
+
+class HTMLPurifier_AttrValidator_ErrorsTest extends HTMLPurifier_ErrorsHarness
+{
+    
+    function invoke($input) {
+        $validator = new HTMLPurifier_AttrValidator();
+        $validator->validateToken($input, $this->config, $this->context);
+    }
+    
+    function testAttributesTransformedGlobalPre() {
+        $this->config->set('HTML', 'DefinitionID',
+          'HTMLPurifier_AttrValidator_ErrorsTest::testAttributesTransformedGlobalPre');
+        $def =& $this->config->getHTMLDefinition(true);
+        generate_mock_once('HTMLPurifier_AttrTransform');
+        $transform = new HTMLPurifier_AttrTransformMock();
+        $input = array('original' => 'value');
+        $output = array('class' => 'value'); // must be valid
+        $transform->setReturnValue('transform', $output, array($input, new AnythingExpectation(), new AnythingExpectation()));
+        $def->info_attr_transform_pre[] = $transform;
+        $this->expectErrorCollection(E_NOTICE, 'AttrValidator: Attributes transformed', $input, $output);
+        $token = new HTMLPurifier_Token_Start('span', $input, 1);
+        $this->invoke($token);
+    }
+    
+    function testAttributesTransformedLocalPre() {
+        $this->config->set('HTML', 'TidyLevel', 'heavy');
+        $input = array('align' => 'right');
+        $output = array('style' => 'text-align:right;');
+        $this->expectErrorCollection(E_NOTICE, 'AttrValidator: Attributes transformed', $input, $output);
+        $token = new HTMLPurifier_Token_Start('p', $input, 1);
+        $this->invoke($token);
+    }
+    
+    // to lazy to check for global post and global pre
+    
+    function testAttributeRemoved() {
+        $this->expectErrorCollection(E_ERROR, 'AttrValidator: Attribute removed');
+        $this->expectContext('CurrentAttr', 'foobar');
+        $token = new HTMLPurifier_Token_Start('p', array('foobar' => 'right'), 1);
+        $this->expectContext('CurrentToken', $token);
+        $this->invoke($token);
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/ChildDef/ChameleonTest.php b/tests/HTMLPurifier/ChildDef/ChameleonTest.php
index 529d9193..676bbe48 100644
--- a/tests/HTMLPurifier/ChildDef/ChameleonTest.php
+++ b/tests/HTMLPurifier/ChildDef/ChameleonTest.php
@@ -32,4 +32,3 @@ class HTMLPurifier_ChildDef_ChameleonTest extends HTMLPurifier_ChildDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ChildDef/CustomTest.php b/tests/HTMLPurifier/ChildDef/CustomTest.php
index e4f00a62..2b33f7cf 100644
--- a/tests/HTMLPurifier/ChildDef/CustomTest.php
+++ b/tests/HTMLPurifier/ChildDef/CustomTest.php
@@ -10,6 +10,9 @@ class HTMLPurifier_ChildDef_CustomTest extends HTMLPurifier_ChildDefHarness
         
         $this->obj = new HTMLPurifier_ChildDef_Custom('(a,b?,c*,d+,(a,b)*)');
         
+        $this->assertEqual($this->obj->elements, array('a' => true,
+            'b' => true, 'c' => true, 'd' => true));
+        
         $this->assertResult('', false);
         $this->assertResult('<a /><a />', false);
         
@@ -21,6 +24,8 @@ class HTMLPurifier_ChildDef_CustomTest extends HTMLPurifier_ChildDefHarness
     
     function testNesting() {
         $this->obj = new HTMLPurifier_ChildDef_Custom('(a,b,(c|d))+');
+        $this->assertEqual($this->obj->elements, array('a' => true,
+            'b' => true, 'c' => true, 'd' => true));
         $this->assertResult('', false);
         $this->assertResult('<a /><b /><c /><a /><b /><d />');
         $this->assertResult('<a /><b /><c /><d />', false);
@@ -28,6 +33,8 @@ class HTMLPurifier_ChildDef_CustomTest extends HTMLPurifier_ChildDefHarness
     
     function testNestedEitherOr() {
         $this->obj = new HTMLPurifier_ChildDef_Custom('b,(a|(c|d))+');
+        $this->assertEqual($this->obj->elements, array('a' => true,
+            'b' => true, 'c' => true, 'd' => true));
         $this->assertResult('', false);
         $this->assertResult('<b /><a /><c /><d />');
         $this->assertResult('<b /><d /><a /><a />');
@@ -37,6 +44,7 @@ class HTMLPurifier_ChildDef_CustomTest extends HTMLPurifier_ChildDefHarness
     
     function testNestedQuantifier() {
         $this->obj = new HTMLPurifier_ChildDef_Custom('(b,c+)*');
+        $this->assertEqual($this->obj->elements, array('b' => true, 'c' => true));
         $this->assertResult('');
         $this->assertResult('<b /><c />');
         $this->assertResult('<b /><c /><c /><c />');
@@ -47,6 +55,7 @@ class HTMLPurifier_ChildDef_CustomTest extends HTMLPurifier_ChildDefHarness
     function testEitherOr() {
         
         $this->obj = new HTMLPurifier_ChildDef_Custom('a|b');
+        $this->assertEqual($this->obj->elements, array('a' => true, 'b' => true));
         $this->assertResult('', false);
         $this->assertResult('<a />');
         $this->assertResult('<b />');
@@ -57,6 +66,7 @@ class HTMLPurifier_ChildDef_CustomTest extends HTMLPurifier_ChildDefHarness
     function testCommafication() {
         
         $this->obj = new HTMLPurifier_ChildDef_Custom('a,b');
+        $this->assertEqual($this->obj->elements, array('a' => true, 'b' => true));
         $this->assertResult('<a /><b />');
         $this->assertResult('<ab />', false);
         
@@ -64,4 +74,3 @@ class HTMLPurifier_ChildDef_CustomTest extends HTMLPurifier_ChildDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ChildDef/OptionalTest.php b/tests/HTMLPurifier/ChildDef/OptionalTest.php
index 4e44e8b7..bdb5ac05 100644
--- a/tests/HTMLPurifier/ChildDef/OptionalTest.php
+++ b/tests/HTMLPurifier/ChildDef/OptionalTest.php
@@ -17,4 +17,3 @@ class HTMLPurifier_ChildDef_OptionalTest extends HTMLPurifier_ChildDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ChildDef/RequiredTest.php b/tests/HTMLPurifier/ChildDef/RequiredTest.php
index 0e8c8b1e..e708abea 100644
--- a/tests/HTMLPurifier/ChildDef/RequiredTest.php
+++ b/tests/HTMLPurifier/ChildDef/RequiredTest.php
@@ -66,4 +66,3 @@ class HTMLPurifier_ChildDef_RequiredTest extends HTMLPurifier_ChildDefHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php b/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
index 76113bcd..dd00bfa8 100644
--- a/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
+++ b/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
@@ -42,12 +42,14 @@ extends HTMLPurifier_ChildDefHarness
         $this->assertResult('Needs wrap', '<div>Needs wrap</div>',
             array('HTML.BlockWrapper' => 'div'));
         
-        $this->expectError('Cannot use non-block element as block wrapper.');
+    }
+    
+    function testError() {
+        $this->obj = new HTMLPurifier_ChildDef_StrictBlockquote('div | p');
         $this->assertResult('Needs wrap', '<p>Needs wrap</p>',
             array('HTML.BlockWrapper' => 'dav'));
-        
+        $this->swallowErrors();
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ChildDef/TableTest.php b/tests/HTMLPurifier/ChildDef/TableTest.php
index d5780a63..466ca6ee 100644
--- a/tests/HTMLPurifier/ChildDef/TableTest.php
+++ b/tests/HTMLPurifier/ChildDef/TableTest.php
@@ -38,14 +38,14 @@ class HTMLPurifier_ChildDef_TableTest extends HTMLPurifier_ChildDefHarness
         
         // whitespace sticks to the previous element, last whitespace is
         // stationary
-        $this->assertResult("\n   <tr />\n  <tr />\n ");
+        $this->assertResult("\n   <tr />\n  <tr />\n ", true, array('Output.Newline' => "\n"));
         $this->assertResult(
           "\n\t<tbody />\n\t\t<tfoot />\n\t\t\t",
-          "\n\t\t<tfoot />\n\t<tbody />\n\t\t\t"
+          "\n\t\t<tfoot />\n\t<tbody />\n\t\t\t",
+          array('Output.Newline' => "\n")
         );
         
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ChildDefHarness.php b/tests/HTMLPurifier/ChildDefHarness.php
index 37c3f406..1ea04089 100644
--- a/tests/HTMLPurifier/ChildDefHarness.php
+++ b/tests/HTMLPurifier/ChildDefHarness.php
@@ -15,4 +15,4 @@ class HTMLPurifier_ChildDefHarness extends HTMLPurifier_Harness
     
 }
 
-?>
+
diff --git a/tests/HTMLPurifier/ConfigSchemaTest.php b/tests/HTMLPurifier/ConfigSchemaTest.php
index c743606f..8dfb8f4c 100644
--- a/tests/HTMLPurifier/ConfigSchemaTest.php
+++ b/tests/HTMLPurifier/ConfigSchemaTest.php
@@ -336,4 +336,3 @@ class HTMLPurifier_ConfigSchemaTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ConfigTest.php b/tests/HTMLPurifier/ConfigTest.php
index 5387a3c4..a2dff2d2 100644
--- a/tests/HTMLPurifier/ConfigTest.php
+++ b/tests/HTMLPurifier/ConfigTest.php
@@ -252,9 +252,10 @@ class HTMLPurifier_ConfigTest extends UnitTestCase
         
         // test retrieval of raw definition
         $config->set('HTML', 'DefinitionID', 'HTMLPurifier_ConfigTest->test_getHTMLDefinition()');
+        $config->set('HTML', 'DefinitionRev', 3);
         $def =& $config->getHTMLDefinition(true);
         $this->assertNotEqual($def, $def2);
-        $this->assertFalse($def->setup);
+        $this->assertEqual(false, $def->setup);
         
         // auto initialization
         $config->getHTMLDefinition();
@@ -277,8 +278,8 @@ class HTMLPurifier_ConfigTest extends UnitTestCase
     }
     
     function test_getDefinition() {
-        CS::defineNamespace('Core', 'Core stuff');
-        CS::define('Core', 'DefinitionCache', null, 'string/null', 'Cache?');
+        CS::defineNamespace('Cache', 'Cache stuff');
+        CS::define('Cache', 'DefinitionImpl', null, 'string/null', 'Cache?');
         CS::defineNamespace('Crust', 'Krusty Krabs');
         $config = HTMLPurifier_Config::createDefault();
         $this->expectError("Definition of Crust type not supported");
@@ -375,6 +376,85 @@ class HTMLPurifier_ConfigTest extends UnitTestCase
         
     }
     
+    function test_loadArrayFromForm() {
+        
+        CS::defineNamespace('Pancake', 'This should not be user customizable');
+        CS::define('Pancake', 'Mix', 'buttermilk', 'string', 'Type of pancake mix to use.');
+        CS::define('Pancake', 'Served', true, 'bool', 'But this is customizable by user.');
+        CS::defineNamespace('Toppings', 'This is user customizable');
+        CS::define('Toppings', 'Syrup', true, 'bool', 'Absolutely standard!');
+        CS::define('Toppings', 'Flavor', 'maple', 'string', 'What flavor is the syrup?');
+        CS::define('Toppings', 'Strawberries', 3, 'int', 'Quite delightful fruit.');
+        CS::define('Toppings', 'Calories', 2000, 'int/null', 'Some things are best left unknown.');
+        CS::define('Toppings', 'DefinitionID', null, 'string/null', 'Do not let this be set');
+        CS::define('Toppings', 'DefinitionRev', 1, 'int', 'Do not let this be set');
+        CS::define('Toppings', 'Protected', 1, 'int', 'Do not let this be set');
+        
+        $get = array(
+            'breakfast' => array(
+                'Pancake.Mix' => 'nasty',
+                'Pancake.Served' => '0',
+                'Toppings.Syrup' => '0',
+                'Toppings.Flavor' => "juice",
+                'Toppings.Strawberries' => '999',
+                'Toppings.Calories' => '',
+                'Null_Toppings.Calories' => '1',
+                'Toppings.DefinitionID' => '<argh>',
+                'Toppings.DefinitionRev' => '65',
+                'Toppings.Protected' => '4',
+            )
+        );
+        
+        $config_expect = HTMLPurifier_Config::create(array(
+            'Pancake.Served' => false,
+            'Toppings.Syrup' => false,
+            'Toppings.Flavor' => "juice",
+            'Toppings.Strawberries' => 999,
+            'Toppings.Calories' => null
+        ));
+        
+        $config_result = HTMLPurifier_Config::loadArrayFromForm($get, 'breakfast', array('Pancake.Served', 'Toppings', '-Toppings.Protected'));
+        
+        $this->assertEqual($config_expect, $config_result);
+        
+        /*
+        MAGIC QUOTES NOT TESTED!!!
+        
+        $get = array(
+            'breakfast' => array(
+                'Pancake.Mix' => 'n\\asty'
+            )
+        );
+        $config_expect = HTMLPurifier_Config::create(array(
+            'Pancake.Mix' => 'n\\asty'
+        ));
+        $config_result = HTMLPurifier_Config::loadArrayFromForm($get, 'breakfast', true, false);
+        $this->assertEqual($config_expect, $config_result);
+        */
+    }
+    
+    function test_getAllowedDirectivesForForm() {
+        CS::defineNamespace('Unused', 'Not mentioned, so deny');
+        CS::define('Unused', 'Unused', 'Foobar', 'string', 'Not mentioned, do not allow');
+        CS::defineNamespace('Partial', 'Some are mentioned, allow only those');
+        CS::define('Partial', 'Allowed', true, 'bool', 'Mentioned, allowed');
+        CS::define('Partial', 'Unused', 'Foobar', 'string', 'Not mentioned, do not allow');
+        CS::defineNamespace('All', 'Entire namespace allowed, allow all unless...');
+        CS::define('All', 'Allowed', true, 'bool', 'Not mentioned, allowed');
+        CS::define('All', 'Blacklisted', 'Foobar', 'string', 'Specifically blacklisted');
+        CS::define('All', 'DefinitionID', 'Foobar', 'string/null', 'Special case, auto-blacklisted');
+        CS::define('All', 'DefinitionRev', 2, 'int', 'Special case, auto-blacklisted');
+        
+        $input = array('Partial.Allowed', 'All', '-All.Blacklisted');
+        $output = HTMLPurifier_Config::getAllowedDirectivesForForm($input);
+        $expect = array(
+            array('Partial', 'Allowed'),
+            array('All', 'Allowed')
+        );
+        
+        $this->assertEqual($output, $expect);
+        
+    }
+    
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ContextTest.php b/tests/HTMLPurifier/ContextTest.php
index 195a5030..8e038159 100644
--- a/tests/HTMLPurifier/ContextTest.php
+++ b/tests/HTMLPurifier/ContextTest.php
@@ -20,7 +20,7 @@ class HTMLPurifier_ContextTest extends UnitTestCase
         
         $this->assertFalse($this->context->exists('IDAccumulator'));
         
-        $accumulator = new HTMLPurifier_IDAccumulatorMock($this);
+        $accumulator = new HTMLPurifier_IDAccumulatorMock();
         $this->context->register('IDAccumulator', $accumulator);
         $this->assertTrue($this->context->exists('IDAccumulator'));
         
@@ -30,11 +30,11 @@ class HTMLPurifier_ContextTest extends UnitTestCase
         $this->context->destroy('IDAccumulator');
         $this->assertFalse($this->context->exists('IDAccumulator'));
         
-        $this->expectError('Attempted to retrieve non-existent variable');
+        $this->expectError('Attempted to retrieve non-existent variable IDAccumulator');
         $accumulator_3 =& $this->context->get('IDAccumulator');
         $this->assertNull($accumulator_3);
         
-        $this->expectError('Attempted to destroy non-existent variable');
+        $this->expectError('Attempted to destroy non-existent variable IDAccumulator');
         $this->context->destroy('IDAccumulator');
         
     }
@@ -44,7 +44,7 @@ class HTMLPurifier_ContextTest extends UnitTestCase
         $var = true;
         $this->context->register('OnceOnly', $var);
         
-        $this->expectError('Name collision, cannot re-register');
+        $this->expectError('Name OnceOnly produces collision, cannot re-register');
         $this->context->register('OnceOnly', $var);
         
         // destroy it, now registration is okay
@@ -85,4 +85,3 @@ class HTMLPurifier_ContextTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DefinitionCache/Decorator/CleanupTest.php b/tests/HTMLPurifier/DefinitionCache/Decorator/CleanupTest.php
index 758a4cb8..dc60752a 100644
--- a/tests/HTMLPurifier/DefinitionCache/Decorator/CleanupTest.php
+++ b/tests/HTMLPurifier/DefinitionCache/Decorator/CleanupTest.php
@@ -56,4 +56,3 @@ class HTMLPurifier_DefinitionCache_Decorator_CleanupTest extends HTMLPurifier_De
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DefinitionCache/Decorator/MemoryTest.php b/tests/HTMLPurifier/DefinitionCache/Decorator/MemoryTest.php
index b7f89c56..cba780fb 100644
--- a/tests/HTMLPurifier/DefinitionCache/Decorator/MemoryTest.php
+++ b/tests/HTMLPurifier/DefinitionCache/Decorator/MemoryTest.php
@@ -70,4 +70,3 @@ class HTMLPurifier_DefinitionCache_Decorator_MemoryTest extends HTMLPurifier_Def
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DefinitionCache/DecoratorHarness.php b/tests/HTMLPurifier/DefinitionCache/DecoratorHarness.php
index c5c75635..78c753a3 100644
--- a/tests/HTMLPurifier/DefinitionCache/DecoratorHarness.php
+++ b/tests/HTMLPurifier/DefinitionCache/DecoratorHarness.php
@@ -9,7 +9,7 @@ class HTMLPurifier_DefinitionCache_DecoratorHarness extends HTMLPurifier_Definit
 {
     
     function setup() {
-        $this->mock     = new HTMLPurifier_DefinitionCacheMock($this);
+        $this->mock     = new HTMLPurifier_DefinitionCacheMock();
         $this->mock->type = 'Test';
         $this->cache    = $this->cache->decorate($this->mock);
         $this->def      = $this->generateDefinition();
@@ -23,4 +23,3 @@ class HTMLPurifier_DefinitionCache_DecoratorHarness extends HTMLPurifier_Definit
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DefinitionCache/DecoratorTest.php b/tests/HTMLPurifier/DefinitionCache/DecoratorTest.php
index 49b1c68d..1390d543 100644
--- a/tests/HTMLPurifier/DefinitionCache/DecoratorTest.php
+++ b/tests/HTMLPurifier/DefinitionCache/DecoratorTest.php
@@ -9,7 +9,7 @@ class HTMLPurifier_DefinitionCache_DecoratorTest extends HTMLPurifier_Definition
     function test() {
         
         generate_mock_once('HTMLPurifier_DefinitionCache');
-        $mock = new HTMLPurifier_DefinitionCacheMock($this);
+        $mock = new HTMLPurifier_DefinitionCacheMock();
         $mock->type = 'Test';
         
         $cache = new HTMLPurifier_DefinitionCache_Decorator();
@@ -42,4 +42,3 @@ class HTMLPurifier_DefinitionCache_DecoratorTest extends HTMLPurifier_Definition
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DefinitionCache/SerializerTest.php b/tests/HTMLPurifier/DefinitionCache/SerializerTest.php
index 99867b03..4925ff8e 100644
--- a/tests/HTMLPurifier/DefinitionCache/SerializerTest.php
+++ b/tests/HTMLPurifier/DefinitionCache/SerializerTest.php
@@ -14,7 +14,7 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
         $config->setReturnValue('get', 2, array('Test', 'DefinitionRev'));
         $config->version = '1.0.0';
         
-        $config_md5   = '1.0.0-2-serial';
+        $config_md5   = '1.0.0-serial-2';
         
         $file = realpath(
             $rel_file = dirname(__FILE__) .
@@ -138,6 +138,32 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
         
     }
     
+    function testCleanupOnlySameID() {
+        
+        $cache = new HTMLPurifier_DefinitionCache_Serializer('Test');
+        
+        $config1 = $this->generateConfigMock('serial1');
+        $config1->version = '1.0.0';
+        $config1->setReturnValue('get', 1, array('Test', 'DefinitionRev'));
+        $def1 = $this->generateDefinition(array('info' => 1));
+        
+        $config2 = $this->generateConfigMock('serial2');
+        $config2->version = '1.0.0';
+        $config2->setReturnValue('get', 34, array('Test', 'DefinitionRev'));
+        $def2 = $this->generateDefinition(array('info' => 3));
+        
+        $cache->set($def1, $config1);
+        $cache->cleanup($config1);
+        $this->assertEqual($def1, $cache->get($config1)); // no change
+        
+        $cache->set($def2, $config2);
+        $cache->cleanup($config2);
+        $this->assertEqual($def1, $cache->get($config1));
+        $this->assertEqual($def2, $cache->get($config2));
+        
+        $cache->flush($config1);
+    }
+    
     /**
      * Asserts that a file exists, ignoring the stat cache
      */
@@ -164,13 +190,12 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
         
         $def_original = $this->generateDefinition();
         $cache->add($def_original, $config);
-        $this->assertFileExist($dir . '/Test/1.0.0-1-serial.ser');
+        $this->assertFileExist($dir . '/Test/1.0.0-serial-1.ser');
         
-        unlink($dir . '/Test/1.0.0-1-serial.ser');
+        unlink($dir . '/Test/1.0.0-serial-1.ser');
         rmdir( $dir . '/Test');
         
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DefinitionCacheFactoryTest.php b/tests/HTMLPurifier/DefinitionCacheFactoryTest.php
index 892f8805..beabc33c 100644
--- a/tests/HTMLPurifier/DefinitionCacheFactoryTest.php
+++ b/tests/HTMLPurifier/DefinitionCacheFactoryTest.php
@@ -62,4 +62,3 @@ class HTMLPurifier_DefinitionCacheFactoryTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DefinitionCacheHarness.php b/tests/HTMLPurifier/DefinitionCacheHarness.php
index efcb49a4..7304ecdd 100644
--- a/tests/HTMLPurifier/DefinitionCacheHarness.php
+++ b/tests/HTMLPurifier/DefinitionCacheHarness.php
@@ -10,7 +10,7 @@ class HTMLPurifier_DefinitionCacheHarness extends UnitTestCase
      */
     function generateConfigMock($serial = 'defaultserial') {
         generate_mock_once('HTMLPurifier_Config');
-        $config = new HTMLPurifier_ConfigMock($this);
+        $config = new HTMLPurifier_ConfigMock();
         $config->setReturnValue('getBatchSerial', $serial, array('Test'));
         $config->version = '1.0.0';
         return $config;
@@ -31,4 +31,3 @@ class HTMLPurifier_DefinitionCacheHarness extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DefinitionCacheTest.php b/tests/HTMLPurifier/DefinitionCacheTest.php
index 702712ff..eef49f14 100644
--- a/tests/HTMLPurifier/DefinitionCacheTest.php
+++ b/tests/HTMLPurifier/DefinitionCacheTest.php
@@ -15,16 +15,22 @@ class HTMLPurifier_DefinitionCacheTest extends UnitTestCase
         HTMLPurifier_ConfigSchema::defineNamespace('Test', 'Test namespace');
         HTMLPurifier_ConfigSchema::define('Test', 'DefinitionRev', 1, 'int', 'Definition revision.');
         
-        $config = HTMLPurifier_Config::createDefault();
-        $config->version = '1.0.0';
-        $config->set('Test', 'DefinitionRev', 10);
+        generate_mock_once('HTMLPurifier_Config');
+        $config = new HTMLPurifier_ConfigMock();
+        $config->version = '1.0.0'; // hopefully no conflicts
+        $config->setReturnValue('get', 10, array('Test', 'DefinitionRev'));
+        $config->setReturnValue('getBatchSerial', 'hash', array('Test'));
         
-        $this->assertIdentical($cache->isOld('1.0.0-10-hashstuffhere', $config), false);
-        $this->assertIdentical($cache->isOld('1.5.0-1-hashstuffhere', $config), false);
+        $this->assertIdentical($cache->isOld('1.0.0-hash-10', $config), false);
+        $this->assertIdentical($cache->isOld('1.5.0-hash-1', $config), true);
         
-        $this->assertIdentical($cache->isOld('0.9.0-1-hashstuffhere', $config), true);
-        $this->assertIdentical($cache->isOld('1.0.0-1-hashstuffhere', $config), true);
-        $this->assertIdentical($cache->isOld('1.0.0beta-11-hashstuffhere', $config), true);
+        $this->assertIdentical($cache->isOld('0.9.0-hash-1', $config), true);
+        $this->assertIdentical($cache->isOld('1.0.0-hash-1', $config), true);
+        $this->assertIdentical($cache->isOld('1.0.0beta-hash-11', $config), true);
+        
+        $this->assertIdentical($cache->isOld('0.9.0-hash2-1', $config), true);
+        $this->assertIdentical($cache->isOld('1.0.0-hash2-1', $config), false); // if hash is different, don't touch!
+        $this->assertIdentical($cache->isOld('1.0.0beta-hash2-11', $config), true);
         
         HTMLPurifier_ConfigSchema::instance($old_copy);
         
@@ -32,4 +38,3 @@ class HTMLPurifier_DefinitionCacheTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DefinitionTest.php b/tests/HTMLPurifier/DefinitionTest.php
index 2ce85d07..250e0845 100644
--- a/tests/HTMLPurifier/DefinitionTest.php
+++ b/tests/HTMLPurifier/DefinitionTest.php
@@ -30,4 +30,3 @@ class HTMLPurifier_DefinitionTest extends UnitTestCase
     }
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/DoctypeRegistryTest.php b/tests/HTMLPurifier/DoctypeRegistryTest.php
index 385859c9..23375411 100644
--- a/tests/HTMLPurifier/DoctypeRegistryTest.php
+++ b/tests/HTMLPurifier/DoctypeRegistryTest.php
@@ -76,4 +76,3 @@ class HTMLPurifier_DoctypeRegistryTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ElementDefTest.php b/tests/HTMLPurifier/ElementDefTest.php
index 23ef6e17..04b4b0af 100644
--- a/tests/HTMLPurifier/ElementDefTest.php
+++ b/tests/HTMLPurifier/ElementDefTest.php
@@ -33,10 +33,6 @@ class HTMLPurifier_ElementDefTest extends UnitTestCase
         $def1->child = $overloaded_old;
         $def1->content_model = 'old';
         $def1->content_model_type = $overloaded_old;
-        $def1->auto_close = array(
-            'old' => true,
-            'removed-old' => true
-        );
         $def1->descendants_are_inline = false;
         $def1->excludes = array(
             'old' => true,
@@ -60,10 +56,6 @@ class HTMLPurifier_ElementDefTest extends UnitTestCase
         $def2->child = $new;
         $def2->content_model = 'new';
         $def2->content_model_type = $overloaded_new;
-        $def2->auto_close = array(
-            'new' => true,
-            'removed-old' => false
-        );
         $def2->descendants_are_inline = true;
         $def2->excludes = array(
             'new' => true,
@@ -90,10 +82,6 @@ class HTMLPurifier_ElementDefTest extends UnitTestCase
         $this->assertIdentical($def1->child, $new);
         $this->assertIdentical($def1->content_model, 'old | new');
         $this->assertIdentical($def1->content_model_type, $overloaded_new);
-        $this->assertIdentical($def1->auto_close, array(
-            'old' => true,
-            'new' => true
-        ));
         $this->assertIdentical($def1->descendants_are_inline, true);
         $this->assertIdentical($def1->excludes, array(
             'old' => true,
@@ -105,4 +93,3 @@ class HTMLPurifier_ElementDefTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/EncoderTest.php b/tests/HTMLPurifier/EncoderTest.php
index 0bab873e..5cf6a240 100644
--- a/tests/HTMLPurifier/EncoderTest.php
+++ b/tests/HTMLPurifier/EncoderTest.php
@@ -141,4 +141,3 @@ class HTMLPurifier_EncoderTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/EntityLookupTest.php b/tests/HTMLPurifier/EntityLookupTest.php
index c490d55a..706b7c18 100644
--- a/tests/HTMLPurifier/EntityLookupTest.php
+++ b/tests/HTMLPurifier/EntityLookupTest.php
@@ -26,4 +26,3 @@ class HTMLPurifier_EntityLookupTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/EntityParserTest.php b/tests/HTMLPurifier/EntityParserTest.php
index 54328d34..2d3a4d29 100644
--- a/tests/HTMLPurifier/EntityParserTest.php
+++ b/tests/HTMLPurifier/EntityParserTest.php
@@ -82,4 +82,3 @@ class HTMLPurifier_EntityParserTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/ErrorCollectorEMock.php b/tests/HTMLPurifier/ErrorCollectorEMock.php
new file mode 100644
index 00000000..c0f577d5
--- /dev/null
+++ b/tests/HTMLPurifier/ErrorCollectorEMock.php
@@ -0,0 +1,46 @@
+<?php
+
+require_once 'HTMLPurifier/ErrorCollector.php';
+
+generate_mock_once('HTMLPurifier_ErrorCollector');
+
+/**
+ * Extended error collector mock that has the ability to expect context
+ */
+class HTMLPurifier_ErrorCollectorEMock extends HTMLPurifier_ErrorCollectorMock
+{
+    
+    var $_context;
+    var $_expected_context = array();
+    var $_expected_context_at = array();
+    
+    function prepare(&$context) {
+        $this->_context =& $context;
+    }
+    
+    function expectContext($key, $value) {
+        $this->_expected_context[$key] = $value;
+    }
+    function expectContextAt($step, $key, $value) {
+        $this->_expected_context_at[$step][$key] = $value;
+    }
+    
+    function send($severity, $msg) {
+        // test for context
+        $test = &$this->_getCurrentTestCase();
+        foreach ($this->_expected_context as $key => $value) {
+            $test->assertEqual($value, $this->_context->get($key));
+        }
+        $step = $this->getCallCount('send');
+        if (isset($this->_expected_context_at[$step])) {
+            foreach ($this->_expected_context_at[$step] as $key => $value) {
+                $test->assertEqual($value, $this->_context->get($key));
+            }
+        }
+        // boilerplate mock code, does not have return value or references
+        $args = func_get_args();
+        $this->_invoke('send', $args);
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/ErrorCollectorTest.php b/tests/HTMLPurifier/ErrorCollectorTest.php
dissimilarity index 65%
index 31ac3052..508efcab 100644
--- a/tests/HTMLPurifier/ErrorCollectorTest.php
+++ b/tests/HTMLPurifier/ErrorCollectorTest.php
@@ -1,42 +1,141 @@
-<?php
-
-require_once 'HTMLPurifier/ErrorCollector.php';
-
-class HTMLPurifier_ErrorCollectorTest extends UnitTestCase
-{
-    
-    function test() {
-        
-        $tok1 = new HTMLPurifier_Token_Text('Token that caused error');
-        $tok1->line = 23;
-        $tok2 = new HTMLPurifier_Token_Start('a'); // also caused error
-        $tok2->line = 3;
-        $tok3 = new HTMLPurifier_Token_Text('Context before'); // before $tok2
-        $tok3->line = 3;
-        $tok4 = new HTMLPurifier_Token_Text('Context after'); // after $tok2
-        $tok4->line = 3;
-        
-        $collector = new HTMLPurifier_ErrorCollector();
-        $collector->send('Big fat error', $tok1);
-        $collector->send('Another <error>', $tok2, array($tok3, true, $tok4));
-        
-        $result = array(
-            0 => array('Big fat error', $tok1, array(true)),
-            1 => array('Another <error>', $tok2, array($tok3, true, $tok4))
-        );
-        
-        $this->assertIdentical($collector->getRaw(), $result);
-        
-        $formatted_result = array(
-            0 => 'Another &lt;error&gt; at line 3 (<code>Context before<strong>&lt;a&gt;</strong>Context after</code>)',
-            1 => 'Big fat error at line 23 (<code><strong>Token that caused error</strong></code>)'
-        );
-        
-        $config = HTMLPurifier_Config::create(array('Core.MaintainLineNumbers' => true));
-        $this->assertIdentical($collector->getHTMLFormatted($config), $formatted_result);
-        
-    }
-    
-}
-
-?>
\ No newline at end of file
+<?php
+
+require_once 'HTMLPurifier/ErrorCollector.php';
+
+class HTMLPurifier_ErrorCollectorTest extends UnitTestCase
+{
+    
+    function setup() {
+        generate_mock_once('HTMLPurifier_Language');
+        generate_mock_once('HTMLPurifier_Generator');
+    }
+    
+    function test() {
+        
+        $language = new HTMLPurifier_LanguageMock();
+        $language->setReturnValue('getErrorName', 'Error', array(E_ERROR));
+        $language->setReturnValue('getErrorName', 'Warning', array(E_WARNING));
+        $language->setReturnValue('getMessage', 'Message 1', array('message-1'));
+        $language->setReturnValue('formatMessage', 'Message 2', array('message-2', array(1 => 'param')));
+        $language->setReturnValue('formatMessage', ' at line 23', array('ErrorCollector: At line', array('line' => 23)));
+        $language->setReturnValue('formatMessage', ' at line 3', array('ErrorCollector: At line', array('line' => 3)));
+        
+        $line = false;
+        
+        $context = new HTMLPurifier_Context();
+        $context->register('Locale', $language);
+        $context->register('CurrentLine', $line);
+        
+        $generator = new HTMLPurifier_Generator();
+        $context->register('Generator', $generator);
+        
+        $collector = new HTMLPurifier_ErrorCollector($context);
+        
+        $line = 23;
+        $collector->send(E_ERROR, 'message-1');
+        
+        $line = 3;
+        $collector->send(E_WARNING, 'message-2', 'param');
+        
+        $result = array(
+            0 => array(23, E_ERROR, 'Message 1'),
+            1 => array(3, E_WARNING, 'Message 2')
+        );
+        
+        $this->assertIdentical($collector->getRaw(), $result);
+        
+        $formatted_result = 
+            '<ul><li><strong>Warning</strong>: Message 2 at line 3</li>'.
+            '<li><strong>Error</strong>: Message 1 at line 23</li></ul>';
+        
+        $config = HTMLPurifier_Config::create(array('Core.MaintainLineNumbers' => true));
+        
+        $this->assertIdentical($collector->getHTMLFormatted($config), $formatted_result);
+        
+    }
+    
+    function testNoErrors() {
+        $language = new HTMLPurifier_LanguageMock();
+        $language->setReturnValue('getMessage', 'No errors', array('ErrorCollector: No errors'));
+        $context = new HTMLPurifier_Context();
+        $context->register('Locale', $language);
+        
+        $generator = new HTMLPurifier_Generator();
+        $context->register('Generator', $generator);
+        
+        $collector = new HTMLPurifier_ErrorCollector($context);
+        $formatted_result = '<p>No errors</p>';
+        $config = HTMLPurifier_Config::createDefault();
+        $this->assertIdentical($collector->getHTMLFormatted($config), $formatted_result);
+    }
+    
+    function testNoLineNumbers() {
+        $language = new HTMLPurifier_LanguageMock();
+        $language->setReturnValue('getMessage', 'Message 1', array('message-1'));
+        $language->setReturnValue('getMessage', 'Message 2', array('message-2'));
+        $language->setReturnValue('getErrorName', 'Error', array(E_ERROR));
+        $context = new HTMLPurifier_Context();
+        $context->register('Locale', $language);
+        
+        $generator = new HTMLPurifier_Generator();
+        $context->register('Generator', $generator);
+        
+        $collector = new HTMLPurifier_ErrorCollector($context);
+        $collector->send(E_ERROR, 'message-1');
+        $collector->send(E_ERROR, 'message-2');
+        
+        $result = array(
+            0 => array(null, E_ERROR, 'Message 1'),
+            1 => array(null, E_ERROR, 'Message 2')
+        );
+        $this->assertIdentical($collector->getRaw(), $result);
+        
+        $formatted_result = 
+            '<ul><li><strong>Error</strong>: Message 1</li>'.
+            '<li><strong>Error</strong>: Message 2</li></ul>';
+        $config = HTMLPurifier_Config::createDefault();
+        $this->assertIdentical($collector->getHTMLFormatted($config), $formatted_result);
+    }
+    
+    function testContextSubstitutions() {
+        
+        $language = new HTMLPurifier_LanguageMock();
+        $context  = new HTMLPurifier_Context();
+        $context->register('Locale', $language);
+        
+        $generator = new HTMLPurifier_Generator();
+        $context->register('Generator', $generator);
+        
+        $current_token = false;
+        $context->register('CurrentToken', $current_token);
+        
+        $collector = new HTMLPurifier_ErrorCollector($context);
+        
+        // 0
+        $current_token = new HTMLPurifier_Token_Start('a', array('href' => 'http://example.com'), 32);
+        $language->setReturnValue('formatMessage', 'Token message',
+          array('message-data-token', array('CurrentToken' => $current_token)));
+        $collector->send(E_NOTICE, 'message-data-token');
+        
+        $current_attr  = 'href';
+        $language->setReturnValue('formatMessage', '$CurrentAttr.Name => $CurrentAttr.Value',
+          array('message-attr', array('CurrentToken' => $current_token)));
+        
+        // 1
+        $collector->send(E_NOTICE, 'message-attr'); // test when context isn't available
+        
+        // 2
+        $context->register('CurrentAttr', $current_attr);
+        $collector->send(E_NOTICE, 'message-attr');
+        
+        $result = array(
+            0 => array(32, E_NOTICE, 'Token message'),
+            1 => array(32, E_NOTICE, '$CurrentAttr.Name => $CurrentAttr.Value'),
+            2 => array(32, E_NOTICE, 'href => http://example.com')
+        );
+        $this->assertIdentical($collector->getRaw(), $result);
+        
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/ErrorsHarness.php b/tests/HTMLPurifier/ErrorsHarness.php
new file mode 100644
index 00000000..359492a3
--- /dev/null
+++ b/tests/HTMLPurifier/ErrorsHarness.php
@@ -0,0 +1,31 @@
+<?php
+
+require_once 'HTMLPurifier/ErrorCollectorEMock.php';
+require_once 'HTMLPurifier/Lexer/DirectLex.php';
+
+class HTMLPurifier_ErrorsHarness extends UnitTestCase
+{
+    
+    var $config, $context;
+    var $collector, $generator;
+    
+    function setup() {
+        $this->config = HTMLPurifier_Config::create(array('Core.CollectErrors' => true));
+        $this->context = new HTMLPurifier_Context();
+        generate_mock_once('HTMLPurifier_ErrorCollector');
+        $this->collector = new HTMLPurifier_ErrorCollectorEMock();
+        $this->collector->prepare($this->context);
+        $this->context->register('ErrorCollector', $this->collector);
+    }
+    
+    function expectErrorCollection() {
+        $args = func_get_args();
+        $this->collector->expectOnce('send', $args);
+    }
+    
+    function expectContext($key, $value) {
+        $this->collector->expectContext($key, $value);
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/GeneratorTest.php b/tests/HTMLPurifier/GeneratorTest.php
index 2656e82f..9039d1fb 100644
--- a/tests/HTMLPurifier/GeneratorTest.php
+++ b/tests/HTMLPurifier/GeneratorTest.php
@@ -141,9 +141,31 @@ class HTMLPurifier_GeneratorTest extends HTMLPurifier_Harness
                 new HTMLPurifier_Token_Text('alert(3 < 5);'),
                 new HTMLPurifier_Token_End('script')
             ),
-            "<script><!--\nalert(3 < 5);\n// --></script>"
+            "<script><!--//--><![CDATA[//><!--\nalert(3 < 5);\n//--><!]]></script>"
         );
         
+        // if missing close tag, don't do anything
+        $this->assertGeneration(
+            array(
+                new HTMLPurifier_Token_Start('script'),
+                new HTMLPurifier_Token_Text('alert(3 < 5);'),
+            ),
+            "<script>alert(3 &lt; 5);"
+        );
+        
+        // if two script blocks, don't do anything
+        $this->assertGeneration(
+            array(
+                new HTMLPurifier_Token_Start('script'),
+                new HTMLPurifier_Token_Text('alert(3 < 5);'),
+                new HTMLPurifier_Token_Text('foo();'),
+                new HTMLPurifier_Token_End('script')
+            ),
+            "<script>alert(3 &lt; 5);foo();</script>"
+        );
+        
+        
+        
         $this->config = HTMLPurifier_Config::createDefault();
         $this->config->set('Core', 'CommentScriptContents', false);
         
@@ -185,6 +207,7 @@ class HTMLPurifier_GeneratorTest extends HTMLPurifier_Harness
         
         $this->config = HTMLPurifier_Config::createDefault();
         $this->config->set('Core', 'TidyFormat', true);
+        $this->config->set('Output', 'Newline', "\n");
         
         // nice wrapping please
         $this->assertGeneration(
@@ -200,4 +223,3 @@ class HTMLPurifier_GeneratorTest extends HTMLPurifier_Harness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/HTMLDefinitionTest.php b/tests/HTMLPurifier/HTMLDefinitionTest.php
index 13804472..3581f8cf 100644
--- a/tests/HTMLPurifier/HTMLDefinitionTest.php
+++ b/tests/HTMLPurifier/HTMLDefinitionTest.php
@@ -84,4 +84,3 @@ class HTMLPurifier_HTMLDefinitionTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/HTMLModule/ScriptingTest.php b/tests/HTMLPurifier/HTMLModule/ScriptingTest.php
index 70008d1e..2bb4a0e8 100644
--- a/tests/HTMLPurifier/HTMLModule/ScriptingTest.php
+++ b/tests/HTMLPurifier/HTMLModule/ScriptingTest.php
@@ -18,6 +18,14 @@ class HTMLPurifier_HTMLModule_ScriptingTest extends HTMLPurifier_HTMLModuleHarne
             array('HTML.Trusted' => true)
         );
         
+        // CDATA
+        $this->assertResult(
+'//<![CDATA[
+alert("<This is compatible with XHTML>");
+//]]> ', true,
+            array('HTML.Trusted' => true)
+        );
+        
         // max
         $this->assertResult(
             '<script
@@ -38,15 +46,7 @@ class HTMLPurifier_HTMLModule_ScriptingTest extends HTMLPurifier_HTMLModuleHarne
             array('HTML.Trusted' => true, 'Core.CommentScriptContents' => false)
         );
         
-        // invalid children
-        $this->assertResult(
-            '<script type="text/javascript">PCDATA<span</script>',
-            '<script type="text/javascript">PCDATA</script>',
-            array('HTML.Trusted' => true, 'Core.CommentScriptContents' => false)
-        );
-        
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/HTMLModule/TidyTest.php b/tests/HTMLPurifier/HTMLModule/TidyTest.php
index f3a1f977..ff8d844d 100644
--- a/tests/HTMLPurifier/HTMLModule/TidyTest.php
+++ b/tests/HTMLPurifier/HTMLModule/TidyTest.php
@@ -45,7 +45,7 @@ class HTMLPurifier_HTMLModule_TidyTest extends UnitTestCase
         $i = 0; // counter, helps us isolate expectations
         
         // initialize partial mock
-        $module = new HTMLPurifier_HTMLModule_Tidy_TestForConstruct($this);
+        $module = new HTMLPurifier_HTMLModule_Tidy_TestForConstruct();
         $module->fixesForLevel['light']  = array('light-fix-1', 'light-fix-2');
         $module->fixesForLevel['medium'] = array('medium-fix-1', 'medium-fix-2');
         $module->fixesForLevel['heavy']  = array('heavy-fix-1', 'heavy-fix-2');
@@ -227,4 +227,3 @@ class HTMLPurifier_HTMLModule_TidyTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/HTMLModuleHarness.php b/tests/HTMLPurifier/HTMLModuleHarness.php
index 1f60f435..8ca2df33 100644
--- a/tests/HTMLPurifier/HTMLModuleHarness.php
+++ b/tests/HTMLPurifier/HTMLModuleHarness.php
@@ -11,4 +11,3 @@ class HTMLPurifier_HTMLModuleHarness extends HTMLPurifier_StrategyHarness
     }
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/HTMLModuleManagerTest.php b/tests/HTMLPurifier/HTMLModuleManagerTest.php
index c273856a..d5219ca1 100644
--- a/tests/HTMLPurifier/HTMLModuleManagerTest.php
+++ b/tests/HTMLPurifier/HTMLModuleManagerTest.php
@@ -13,7 +13,7 @@ class HTMLPurifier_HTMLModuleManagerTest extends UnitTestCase
         $attrdef_nmtokens->_name = 'nmtokens'; // for testing only
         
         generate_mock_once('HTMLPurifier_AttrDef');
-        $attrdef = new HTMLPurifier_AttrDefMock($this);
+        $attrdef = new HTMLPurifier_AttrDefMock();
         $attrdef->setReturnValue('make', $attrdef_nmtokens);
         $manager->attrTypes->info['NMTOKENS'] =& $attrdef;
         
@@ -38,7 +38,7 @@ class HTMLPurifier_HTMLModuleManagerTest extends UnitTestCase
         
         $config = HTMLPurifier_Config::createDefault();
         $config->set('HTML', 'Trusted', false);
-        $config->set('HTML', 'Doctype', 'Blank');
+        $config->set('HTML', 'CustomDoctype', 'Blank');
         
         $manager->setup($config);
         
@@ -94,7 +94,7 @@ class HTMLPurifier_HTMLModuleManagerTest extends UnitTestCase
         $manager->registerModule($magic_module);
         
         $config = HTMLPurifier_Config::create(array(
-            'HTML.Doctype' => 'Fantasy Inventory 1.0',
+            'HTML.CustomDoctype' => 'Fantasy Inventory 1.0',
             'HTML.AllowedModules' => 'Weapons'
         ));
         $manager->setup($config);
@@ -106,4 +106,3 @@ class HTMLPurifier_HTMLModuleManagerTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/HTMLModuleTest.php b/tests/HTMLPurifier/HTMLModuleTest.php
index 9e0b7100..238ca42a 100644
--- a/tests/HTMLPurifier/HTMLModuleTest.php
+++ b/tests/HTMLPurifier/HTMLModuleTest.php
@@ -147,4 +147,3 @@ class HTMLPurifier_HTMLModuleTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/Harness.php b/tests/HTMLPurifier/Harness.php
index c591db32..84cea5eb 100644
--- a/tests/HTMLPurifier/Harness.php
+++ b/tests/HTMLPurifier/Harness.php
@@ -47,6 +47,11 @@ class HTMLPurifier_Harness extends UnitTestCase
      */
     var $config;
     
+    /**
+     * Default context to fall back on if no context is available
+     */
+    var $context;
+    
     function HTMLPurifier_Harness() {
         $this->lexer     = new HTMLPurifier_Lexer_DirectLex();
         $this->generator = new HTMLPurifier_Generator();
@@ -77,8 +82,12 @@ class HTMLPurifier_Harness extends UnitTestCase
         // setup context object. Note that we are operating on a copy of it!
         // When necessary, extend the test harness to allow post-tests
         // on the context object
-        $context = new HTMLPurifier_Context();
-        $context->loadArray($context_array);
+        if (empty($this->context)) {
+            $context = new HTMLPurifier_Context();
+            $context->loadArray($context_array);
+        } else {
+            $context =& $this->context;
+        }
         
         if ($this->to_tokens && is_string($input)) {
             // $func may cause $input to change, so "clone" another copy
@@ -116,4 +125,4 @@ class HTMLPurifier_Harness extends UnitTestCase
     
 }
 
-?>
+
diff --git a/tests/HTMLPurifier/IDAccumulatorTest.php b/tests/HTMLPurifier/IDAccumulatorTest.php
index 8ff04545..05db0b2a 100644
--- a/tests/HTMLPurifier/IDAccumulatorTest.php
+++ b/tests/HTMLPurifier/IDAccumulatorTest.php
@@ -32,4 +32,3 @@ class HTMLPurifier_IDAccumulatorTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/Injector/AutoParagraphTest.php b/tests/HTMLPurifier/Injector/AutoParagraphTest.php
new file mode 100644
index 00000000..8611fd9b
--- /dev/null
+++ b/tests/HTMLPurifier/Injector/AutoParagraphTest.php
@@ -0,0 +1,253 @@
+<?php
+
+require_once 'HTMLPurifier/InjectorHarness.php';
+require_once 'HTMLPurifier/Injector/AutoParagraph.php';
+
+class HTMLPurifier_Injector_AutoParagraphTest extends HTMLPurifier_InjectorHarness
+{
+    
+    function setup() {
+        parent::setup();
+        $this->config = array('AutoFormat.AutoParagraph' => true);
+    }
+    
+    function test() {
+        $this->assertResult(
+            'Foobar',
+            '<p>Foobar</p>'
+        );
+        
+        $this->assertResult(
+'Par 1
+Par 1 still',
+'<p>Par 1
+Par 1 still</p>'
+        );
+        
+        $this->assertResult(
+'Par1
+
+Par2',
+            '<p>Par1</p><p>Par2</p>'
+        );
+        
+        $this->assertResult(
+'Par1
+
+ 
+
+Par2',
+            '<p>Par1</p><p>Par2</p>'
+        );
+        
+        $this->assertResult(
+'<b>Par1</b>
+
+<i>Par2</i>',
+            '<p><b>Par1</b></p><p><i>Par2</i></p>'
+        );
+        
+        
+        $this->assertResult(
+'<b>Par1
+
+Par2</b>',
+'<p><b>Par1
+
+Par2</b></p>'
+        );
+        
+        $this->assertResult(
+            'Par1<p>Par2</p>',
+            '<p>Par1</p><p>Par2</p>'
+        );
+        
+        $this->assertResult(
+            '<b>Par1',
+            '<p><b>Par1</b></p>'
+        );
+        
+        $this->assertResult(
+'<pre>Par1
+
+Par1</pre>'
+        );
+        
+        $this->assertResult(
+'Par1
+
+  ',
+'<p>Par1</p>'
+        );
+        $this->assertResult(
+'Par1
+
+<div>Par2</div>
+
+Par3',
+'<p>Par1</p><div>Par2</div><p>Par3</p>'
+        );
+        
+        $this->assertResult(
+'Par<b>1</b>',
+            '<p>Par<b>1</b></p>'
+        );
+        
+        $this->assertResult(
+'
+
+Par',
+            '<p>Par</p>'
+        );
+        
+        $this->assertResult(
+'
+
+Par
+
+',
+            '<p>Par</p>'
+        );
+        
+        $this->assertResult(
+'<div>Par1
+
+Par2</div>',
+            '<div><p>Par1</p><p>Par2</p></div>'
+        );
+        
+        $this->assertResult(
+'<div><b>Par1</b>
+
+Par2</div>',
+            '<div><p><b>Par1</b></p><p>Par2</p></div>'
+        );
+        
+        $this->assertResult('<div>Par1</div>');
+        
+        $this->assertResult(
+'<div><b>Par1</b>
+
+<i>Par2</i></div>',
+            '<div><p><b>Par1</b></p><p><i>Par2</i></p></div>'
+        );
+        
+        $this->assertResult(
+'<pre><b>Par1</b>
+
+<i>Par2</i></pre>',
+            true
+        );
+        
+        $this->assertResult(
+'<div><p>Foo
+
+Bar</p></div>',
+            '<div><p>Foo</p><p>Bar</p></div>'
+        );
+        
+        $this->assertResult(
+'<div><p><b>Foo</b>
+
+<i>Bar</i></p></div>',
+            '<div><p><b>Foo</b></p><p><i>Bar</i></p></div>'
+        );
+        
+        $this->assertResult(
+'<div><b>Foo</b></div>',
+            '<div><b>Foo</b></div>'
+        );
+        
+        $this->assertResult(
+'<blockquote>Par1
+
+Par2</blockquote>',
+            '<blockquote><p>Par1</p><p>Par2</p></blockquote>'
+        );
+        
+        $this->assertResult(
+'<ul><li>Foo</li>
+
+<li>Bar</li></ul>', true
+        );
+        
+        $this->assertResult(
+'<div>
+
+Bar
+
+</div>', 
+        '<div><p>Bar</p></div>'
+        );
+        
+        $this->assertResult(
+'<b>Par1</b>a
+
+
+
+Par2', 
+        '<p><b>Par1</b>a</p><p>Par2</p>'
+        );
+        
+        $this->assertResult(
+'Par1
+
+Par2</p>', 
+        '<p>Par1</p><p>Par2</p>'
+        );
+        
+        $this->assertResult(
+'Par1
+
+Par2</div>', 
+        '<p>Par1</p><p>Par2</p>'
+        );
+        
+        $this->assertResult(
+'<div>
+Par1
+</div>', true
+        );
+        
+        $this->assertResult(
+'<div>Par1
+
+<div>Par2</div></div>',
+'<div><p>Par1</p><div>Par2</div></div>'
+        );
+        
+        $this->assertResult(
+'<div>Par1
+<div>Par2</div></div>',
+'<div><p>Par1
+</p><div>Par2</div></div>'
+        );
+        
+        $this->assertResult(
+'Par1
+<div>Par2</div>',
+'<p>Par1
+</p><div>Par2</div>'
+        );
+        
+        $this->assertResult(
+'Par1
+
+<b>Par2</b>',
+'<p>Par1</p><p><b>Par2</b></p>'
+        );
+        
+    }
+    
+    function testInlineRootNode() {
+        $this->assertResult(
+'Par
+
+Par2',
+            true,
+            array('AutoFormat.AutoParagraph' => true, 'HTML.Parent' => 'span')
+        );
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/Injector/LinkifyTest.php b/tests/HTMLPurifier/Injector/LinkifyTest.php
new file mode 100644
index 00000000..b91908ee
--- /dev/null
+++ b/tests/HTMLPurifier/Injector/LinkifyTest.php
@@ -0,0 +1,38 @@
+<?php
+
+require_once 'HTMLPurifier/InjectorHarness.php';
+require_once 'HTMLPurifier/Injector/Linkify.php';
+
+class HTMLPurifier_Injector_LinkifyTest extends HTMLPurifier_InjectorHarness
+{
+    
+    function setup() {
+        parent::setup();
+        $this->config = array('AutoFormat.Linkify' => true);
+    }
+    
+    function testLinkify() {
+        
+        $this->assertResult(
+            'http://example.com',
+            '<a href="http://example.com">http://example.com</a>'
+        );
+        
+        $this->assertResult(
+            '<b>http://example.com</b>',
+            '<b><a href="http://example.com">http://example.com</a></b>'
+        );
+        
+        $this->assertResult(
+            'This URL http://example.com is what you need',
+            'This URL <a href="http://example.com">http://example.com</a> is what you need'
+        );
+        
+        $this->assertResult(
+            '<a>http://example.com/</a>'
+        );
+        
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/Injector/PurifierLinkifyTest.php b/tests/HTMLPurifier/Injector/PurifierLinkifyTest.php
new file mode 100644
index 00000000..d538c489
--- /dev/null
+++ b/tests/HTMLPurifier/Injector/PurifierLinkifyTest.php
@@ -0,0 +1,42 @@
+<?php
+
+require_once 'HTMLPurifier/InjectorHarness.php';
+require_once 'HTMLPurifier/Injector/PurifierLinkify.php';
+
+class HTMLPurifier_Injector_PurifierLinkifyTest extends HTMLPurifier_InjectorHarness
+{
+    
+    function setup() {
+        parent::setup();
+        $this->config = array(
+            'AutoFormat.PurifierLinkify' => true,
+            'AutoFormatParam.PurifierLinkifyDocURL' => '#%s'
+        );
+    }
+    
+    function testLinkify() {
+        
+        $this->assertResult('Foobar');
+        $this->assertResult('20% off!');
+        $this->assertResult('%Core namespace (not recognized)');
+        $this->assertResult(
+          '%Namespace.Directive',
+          '<a href="#Namespace.Directive">%Namespace.Directive</a>'
+        );
+        $this->assertResult(
+          'This %Namespace.Directive thing',
+          'This <a href="#Namespace.Directive">%Namespace.Directive</a> thing'
+        );
+        $this->assertResult(
+          '<div>This %Namespace.Directive thing</div>',
+          '<div>This <a href="#Namespace.Directive">%Namespace.Directive</a> thing</div>'
+        );
+        $this->assertResult(
+          '<a>%Namespace.Directive</a>'
+        );
+        
+        
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/InjectorHarness.php b/tests/HTMLPurifier/InjectorHarness.php
new file mode 100644
index 00000000..1b20b126
--- /dev/null
+++ b/tests/HTMLPurifier/InjectorHarness.php
@@ -0,0 +1,15 @@
+<?php
+
+require_once 'HTMLPurifier/StrategyHarness.php';
+require_once 'HTMLPurifier/Strategy/MakeWellFormed.php';
+
+class HTMLPurifier_InjectorHarness extends HTMLPurifier_StrategyHarness
+{
+    
+    function setUp() {
+        parent::setUp();
+        $this->obj = new HTMLPurifier_Strategy_MakeWellFormed();
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/LanguageFactoryTest.php b/tests/HTMLPurifier/LanguageFactoryTest.php
index 1355b5d9..eb0f4556 100644
--- a/tests/HTMLPurifier/LanguageFactoryTest.php
+++ b/tests/HTMLPurifier/LanguageFactoryTest.php
@@ -9,7 +9,9 @@ class HTMLPurifier_LanguageFactoryTest extends UnitTestCase
         
         $factory = HTMLPurifier_LanguageFactory::instance();
         
-        $language = $factory->create('en');
+        $config = HTMLPurifier_Config::create(array('Core.Language' => 'en'));
+        $context = new HTMLPurifier_Context();
+        $language = $factory->create($config, $context);
         
         $this->assertIsA($language, 'HTMLPurifier_Language');
         $this->assertIdentical($language->code, 'en');
@@ -27,7 +29,10 @@ class HTMLPurifier_LanguageFactoryTest extends UnitTestCase
         
         $factory = HTMLPurifier_LanguageFactory::instance();
         
-        $language = $factory->create('en-x-test');
+        $config = HTMLPurifier_Config::create(array('Core.Language' => 'en-x-test'));
+        $context = new HTMLPurifier_Context();
+        
+        $language = $factory->create($config, $context);
         
         $this->assertIsA($language, 'HTMLPurifier_Language_en_x_test');
         $this->assertIdentical($language->code, 'en-x-test');
@@ -35,13 +40,12 @@ class HTMLPurifier_LanguageFactoryTest extends UnitTestCase
         $language->load();
         
         // test overloaded message
-        $this->assertIdentical($language->getMessage('htmlpurifier'), 'HTML Purifier X');
+        $this->assertIdentical($language->getMessage('HTMLPurifier'), 'HTML Purifier X');
         
         // test inherited message
-        $this->assertIdentical($language->getMessage('pizza'), 'Pizza');
+        $this->assertIdentical($language->getMessage('LanguageFactoryTest: Pizza'), 'Pizza');
         
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/LanguageTest.php b/tests/HTMLPurifier/LanguageTest.php
dissimilarity index 61%
index 21e55206..f846c619 100644
--- a/tests/HTMLPurifier/LanguageTest.php
+++ b/tests/HTMLPurifier/LanguageTest.php
@@ -1,27 +1,77 @@
-<?php
-
-require_once 'HTMLPurifier/Language.php';
-
-class HTMLPurifier_LanguageTest extends UnitTestCase
-{
-    
-    var $lang;
-    
-    function test_getMessage() {
-        $lang = new HTMLPurifier_Language();
-        $lang->_loaded = true;
-        $lang->messages['htmlpurifier'] = 'HTML Purifier';
-        $this->assertIdentical($lang->getMessage('htmlpurifier'), 'HTML Purifier');
-        $this->assertIdentical($lang->getMessage('totally-non-existent-key'), '[totally-non-existent-key]');
-    }
-    
-    function test_formatMessage() {
-        $lang = new HTMLPurifier_Language();
-        $lang->_loaded = true;
-        $lang->messages['error'] = 'Error is $1 on line $2';
-        $this->assertIdentical($lang->formatMessage('error', 'fatal', 32), 'Error is fatal on line 32');
-    }
-    
-}
-
-?>
\ No newline at end of file
+<?php
+
+require_once 'HTMLPurifier/Language.php';
+
+class HTMLPurifier_LanguageTest extends UnitTestCase
+{
+    
+    var $lang;
+    
+    function generateEnLanguage() {
+        $factory = HTMLPurifier_LanguageFactory::instance();
+        $config = HTMLPurifier_Config::create(array('Core.Language' => 'en'));
+        $context = new HTMLPurifier_Context();
+        return $factory->create($config, $context);
+    }
+    
+    function test_getMessage() {
+        $config = HTMLPurifier_Config::createDefault();
+        $context = new HTMLPurifier_Context();
+        $lang = new HTMLPurifier_Language($config, $context);
+        $lang->_loaded = true;
+        $lang->messages['HTMLPurifier'] = 'HTML Purifier';
+        $this->assertIdentical($lang->getMessage('HTMLPurifier'), 'HTML Purifier');
+        $this->assertIdentical($lang->getMessage('LanguageTest: Totally non-existent key'), '[LanguageTest: Totally non-existent key]');
+    }
+    
+    function test_formatMessage() {
+        $config = HTMLPurifier_Config::createDefault();
+        $context = new HTMLPurifier_Context();
+        $lang = new HTMLPurifier_Language($config, $context);
+        $lang->_loaded = true;
+        $lang->messages['LanguageTest: Error'] = 'Error is $1 on line $2';
+        $this->assertIdentical($lang->formatMessage('LanguageTest: Error', array(1=>'fatal', 32)), 'Error is fatal on line 32');
+    }
+    
+    function test_formatMessage_tokenParameter() {
+        $config = HTMLPurifier_Config::createDefault();
+        $context = new HTMLPurifier_Context();
+        $generator = new HTMLPurifier_Generator(); // replace with mock if this gets icky
+        $context->register('Generator', $generator);
+        $lang = new HTMLPurifier_Language($config, $context);
+        $lang->_loaded = true;
+        $lang->messages['LanguageTest: Element info'] = 'Element Token: $1.Name, $1.Serialized, $1.Compact, $1.Line';
+        $lang->messages['LanguageTest: Data info']    = 'Data Token: $1.Data, $1.Serialized, $1.Compact, $1.Line';
+        $this->assertIdentical($lang->formatMessage('LanguageTest: Element info',
+            array(1=>new HTMLPurifier_Token_Start('a', array('href'=>'http://example.com'), 18))),
+            'Element Token: a, <a href="http://example.com">, <a>, 18');
+        $this->assertIdentical($lang->formatMessage('LanguageTest: Data info',
+            array(1=>new HTMLPurifier_Token_Text('data>', 23))),
+            'Data Token: data>, data&gt;, data&gt;, 23');
+    }
+    
+    function test_listify() {
+        $lang = $this->generateEnLanguage();
+        $this->assertEqual($lang->listify(array('Item')), 'Item');
+        $this->assertEqual($lang->listify(array('Item', 'Item2')), 'Item and Item2');
+        $this->assertEqual($lang->listify(array('Item', 'Item2', 'Item3')), 'Item, Item2 and Item3');
+    }
+    
+    function test_formatMessage_arrayParameter() {
+        $lang = $this->generateEnLanguage();
+        
+        $array = array('Item1', 'Item2', 'Item3');
+        $this->assertIdentical(
+            $lang->formatMessage('LanguageTest: List', array(1=>$array)),
+            'Item1, Item2 and Item3'
+        );
+        
+        $array = array('Key1' => 'Value1', 'Key2' => 'Value2');
+        $this->assertIdentical(
+            $lang->formatMessage('LanguageTest: Hash', array(1=>$array)),
+            'Key1 and Key2; Value1 and Value2'
+        );
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/Lexer/DirectLexTest.php b/tests/HTMLPurifier/Lexer/DirectLexTest.php
index 37c516f3..ba7d0fe7 100644
--- a/tests/HTMLPurifier/Lexer/DirectLexTest.php
+++ b/tests/HTMLPurifier/Lexer/DirectLexTest.php
@@ -53,6 +53,12 @@ class HTMLPurifier_Lexer_DirectLexTest extends UnitTestCase
         $input[10] = 'name="input" selected';
         $expect[10] = array('name' => 'input', 'selected' => 'selected');
         
+        $input[11] = '=""';
+        $expect[11] = array();
+        
+        $input[12] = '="" =""';
+        $expect[12] = array('"' => ''); // tough to say, just don't throw a loop
+        
         $config = HTMLPurifier_Config::createDefault();
         $context = new HTMLPurifier_Context();
         $size = count($input);
@@ -66,32 +72,23 @@ class HTMLPurifier_Lexer_DirectLexTest extends UnitTestCase
     
     function testLineNumbers() {
         
-        $html = '<b>Line 1</b>
-                 <i>Line 2</i>
-                 Still Line 2<br
-                 />Now Line 4
-                 
-                 <br />';
+        $html = "<b>Line 1</b>\n<i>Line 2</i>\nStill Line 2<br\n/>Now Line 4\n\n<br />";
         
         $expect = array(
             // line 1
             0 => new HTMLPurifier_Token_Start('b')
            ,1 => new HTMLPurifier_Token_Text('Line 1')
            ,2 => new HTMLPurifier_Token_End('b')
-           ,3 => new HTMLPurifier_Token_Text('
-                 ')
+           ,3 => new HTMLPurifier_Token_Text("\n")
             // line 2
            ,4 => new HTMLPurifier_Token_Start('i')
            ,5 => new HTMLPurifier_Token_Text('Line 2')
            ,6 => new HTMLPurifier_Token_End('i')
-           ,7 => new HTMLPurifier_Token_Text('
-                 Still Line 2')
+           ,7 => new HTMLPurifier_Token_Text("\nStill Line 2")
             // line 3
            ,8 => new HTMLPurifier_Token_Empty('br')
             // line 4
-           ,9 => new HTMLPurifier_Token_Text('Now Line 4
-                 
-                 ')
+           ,9 => new HTMLPurifier_Token_Text("Now Line 4\n\n")
             // line SIX
            ,10 => new HTMLPurifier_Token_Empty('br')
         );
@@ -123,7 +120,5 @@ class HTMLPurifier_Lexer_DirectLexTest extends UnitTestCase
         
     }
     
-    
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php b/tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php
new file mode 100644
index 00000000..ad048d2d
--- /dev/null
+++ b/tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php
@@ -0,0 +1,55 @@
+<?php
+
+require_once 'HTMLPurifier/ErrorsHarness.php';
+require_once 'HTMLPurifier/Lexer/DirectLex.php';
+
+class HTMLPurifier_Lexer_DirectLex_ErrorsTest extends HTMLPurifier_ErrorsHarness
+{
+    
+    function invoke($input) {
+        $lexer = new HTMLPurifier_Lexer_DirectLex();
+        $lexer->tokenizeHTML($input, $this->config, $this->context);
+    }
+    
+    function invokeAttr($input) {
+        $lexer = new HTMLPurifier_Lexer_DirectLex();
+        $lexer->parseAttributeString($input, $this->config, $this->context);
+    }
+    
+    function testUnclosedComment() {
+        $this->expectErrorCollection(E_WARNING, 'Lexer: Unclosed comment');
+        $this->expectContext('CurrentLine', 1);
+        $this->invoke('<!-- >');
+    }
+    
+    function testUnescapedLt() {
+        $this->expectErrorCollection(E_NOTICE, 'Lexer: Unescaped lt');
+        $this->expectContext('CurrentLine', 1);
+        $this->invoke('< foo>');
+    }
+    
+    function testMissingGt() {
+        $this->expectErrorCollection(E_WARNING, 'Lexer: Missing gt');
+        $this->expectContext('CurrentLine', 1);
+        $this->invoke('<a href=""');
+    }
+    
+    // these are sub-errors, will only be thrown in context of collector
+    
+    function testMissingAttributeKey1() {
+        $this->expectErrorCollection(E_ERROR, 'Lexer: Missing attribute key');
+        $this->invokeAttr('=""');
+    }
+    
+    function testMissingAttributeKey2() {
+        $this->expectErrorCollection(E_ERROR, 'Lexer: Missing attribute key');
+        $this->invokeAttr('foo="bar" =""');
+    }
+    
+    function testMissingEndQuote() {
+        $this->expectErrorCollection(E_ERROR, 'Lexer: Missing end quote');
+        $this->invokeAttr('src="foo');
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/LexerTest.php b/tests/HTMLPurifier/LexerTest.php
index 0228b834..c16b0611 100644
--- a/tests/HTMLPurifier/LexerTest.php
+++ b/tests/HTMLPurifier/LexerTest.php
@@ -70,7 +70,7 @@ class HTMLPurifier_LexerTest extends UnitTestCase
         $this->assertExtractBody('<html><body><b>Bold</b></body></html>', '<b>Bold</b>');
         $this->assertExtractBody('<HTML><BODY><B>Bold</B></BODY></HTML>', '<B>Bold</B>');
         $this->assertExtractBody(
-'<?xml version="1.0"?>
+'<?xml version="1.0"
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -298,6 +298,33 @@ class HTMLPurifier_LexerTest extends UnitTestCase
         $sax_expect[19] = false; // SAX drops the < character
         $dom_expect[19] = false; // DOM drops the entire pseudo-tag
         
+        // test comment parsing with funky characters inside
+        $input[20] = '<!-- This >< comment --><br />';
+        $expect[20] = array(
+            new HTMLPurifier_Token_Comment(' This >< comment '),
+            new HTMLPurifier_Token_Empty('br')
+        );
+        $sax_expect[20] = false;
+        
+        // test comment parsing of missing end
+        $input[21] = '<!-- This >< comment';
+        $expect[21] = array(
+            new HTMLPurifier_Token_Comment(' This >< comment')
+        );
+        $sax_expect[21] = false;
+        $dom_expect[21] = false;
+        
+        // test CDATA tags
+        $input[22] = '<script>alert("<foo>");</script>';
+        $expect[22] = array(
+            new HTMLPurifier_Token_Start('script')
+           ,new HTMLPurifier_Token_Text('alert("<foo>");')
+           ,new HTMLPurifier_Token_End('script')
+        );
+        $config[22] = HTMLPurifier_Config::create(array('HTML.Trusted' => true));
+        $sax_expect[22] = false;
+        //$dom_expect[22] = false;
+        
         $default_config = HTMLPurifier_Config::createDefault();
         $default_context = new HTMLPurifier_Context();
         foreach($input as $i => $discard) {
@@ -344,4 +371,3 @@ class HTMLPurifier_LexerTest extends UnitTestCase
     
 }
 
-?>
diff --git a/tests/HTMLPurifier/PercentEncoderTest.php b/tests/HTMLPurifier/PercentEncoderTest.php
index 7d014f03..ea52021d 100644
--- a/tests/HTMLPurifier/PercentEncoderTest.php
+++ b/tests/HTMLPurifier/PercentEncoderTest.php
@@ -39,4 +39,3 @@ class HTMLPurifier_PercentEncoderTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/SimpleTest/Reporter.php b/tests/HTMLPurifier/SimpleTest/Reporter.php
index 241b91f4..c3b7a5f4 100644
--- a/tests/HTMLPurifier/SimpleTest/Reporter.php
+++ b/tests/HTMLPurifier/SimpleTest/Reporter.php
@@ -32,4 +32,3 @@ class HTMLPurifier_SimpleTest_Reporter extends HTMLReporter
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/Strategy/CompositeTest.php b/tests/HTMLPurifier/Strategy/CompositeTest.php
index 591fc3ef..606d786b 100644
--- a/tests/HTMLPurifier/Strategy/CompositeTest.php
+++ b/tests/HTMLPurifier/Strategy/CompositeTest.php
@@ -26,9 +26,9 @@ class HTMLPurifier_Strategy_CompositeTest extends UnitTestCase
         
         // setup a bunch of mock strategies to inject into our composite test
         
-        $mock_1 = new HTMLPurifier_StrategyMock($this);
-        $mock_2 = new HTMLPurifier_StrategyMock($this);
-        $mock_3 = new HTMLPurifier_StrategyMock($this);
+        $mock_1 = new HTMLPurifier_StrategyMock();
+        $mock_2 = new HTMLPurifier_StrategyMock();
+        $mock_3 = new HTMLPurifier_StrategyMock();
         
         // setup the object
         
@@ -73,4 +73,3 @@ class HTMLPurifier_Strategy_CompositeTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/Strategy/CoreTest.php b/tests/HTMLPurifier/Strategy/CoreTest.php
index f2be4f50..89b75ad1 100644
--- a/tests/HTMLPurifier/Strategy/CoreTest.php
+++ b/tests/HTMLPurifier/Strategy/CoreTest.php
@@ -20,7 +20,7 @@ class HTMLPurifier_Strategy_CoreTest extends HTMLPurifier_StrategyHarness
         );
         $this->assertResult(
             '<b><div>Fix nesting.</div></b>',
-            '<b>Fix nesting.</b>'
+            '<b></b><div>Fix nesting.</div>'
         );
         $this->assertResult(
             '<asdf>Foreign element removal.</asdf>',
@@ -28,11 +28,10 @@ class HTMLPurifier_Strategy_CoreTest extends HTMLPurifier_StrategyHarness
         );
         $this->assertResult(
             '<foo><b><div>All three.</div></b>',
-            '<b>All three.</b>'
+            '<b></b><div>All three.</div>'
         );
         
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/Strategy/ErrorsHarness.php b/tests/HTMLPurifier/Strategy/ErrorsHarness.php
new file mode 100644
index 00000000..97b6475a
--- /dev/null
+++ b/tests/HTMLPurifier/Strategy/ErrorsHarness.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once 'HTMLPurifier/ErrorsHarness.php';
+
+class HTMLPurifier_Strategy_ErrorsHarness extends HTMLPurifier_ErrorsHarness
+{
+    
+    // needs to be defined
+    function getStrategy() {}
+    
+    function invoke($input) {
+        $strategy = $this->getStrategy();
+        $lexer = new HTMLPurifier_Lexer_DirectLex();
+        $tokens = $lexer->tokenizeHTML($input, $this->config, $this->context);
+        $strategy->execute($tokens, $this->config, $this->context);
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/Strategy/FixNestingTest.php b/tests/HTMLPurifier/Strategy/FixNestingTest.php
index e68583a0..2a323c57 100644
--- a/tests/HTMLPurifier/Strategy/FixNestingTest.php
+++ b/tests/HTMLPurifier/Strategy/FixNestingTest.php
@@ -102,12 +102,15 @@ class HTMLPurifier_Strategy_FixNestingTest extends HTMLPurifier_StrategyHarness
         $this->assertResult(
             '<div>Reject</div>', 'Reject', array('HTML.Parent' => 'span')
         );
-        
+   }
+   
+   function testError() {
         // test fallback to div
         $this->expectError('Cannot use unrecognized element as parent.');
         $this->assertResult(
             '<div>Accept</div>', true, array('HTML.Parent' => 'obviously-impossible')
         );
+        $this->swallowErrors();
         
     }
     
@@ -130,4 +133,3 @@ class HTMLPurifier_Strategy_FixNestingTest extends HTMLPurifier_StrategyHarness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/Strategy/FixNesting_ErrorsTest.php b/tests/HTMLPurifier/Strategy/FixNesting_ErrorsTest.php
new file mode 100644
index 00000000..4ba30f36
--- /dev/null
+++ b/tests/HTMLPurifier/Strategy/FixNesting_ErrorsTest.php
@@ -0,0 +1,38 @@
+<?php
+
+require_once 'HTMLPurifier/Strategy/ErrorsHarness.php';
+require_once 'HTMLPurifier/Strategy/FixNesting.php';
+
+class HTMLPurifier_Strategy_FixNesting_ErrorsTest extends HTMLPurifier_Strategy_ErrorsHarness
+{
+    
+    function getStrategy() {
+        return new HTMLPurifier_Strategy_FixNesting();
+    }
+    
+    function testNodeRemoved() {
+        $this->expectErrorCollection(E_ERROR, 'Strategy_FixNesting: Node removed');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Start('ul', array(), 1));
+        $this->invoke('<ul></ul>');
+    }
+    
+    function testNodeExcluded() {
+        $this->expectErrorCollection(E_ERROR, 'Strategy_FixNesting: Node excluded');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Start('a', array(), 2));
+        $this->invoke("<a>\n<a></a></a>");
+    }
+    
+    function testNodeReorganized() {
+        $this->expectErrorCollection(E_WARNING, 'Strategy_FixNesting: Node reorganized');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Start('span', array(), 1));
+        $this->invoke("<span>Valid<div>Invalid</div></span>");
+    }
+    
+    function testNodeContentsRemoved() {
+        $this->expectErrorCollection(E_ERROR, 'Strategy_FixNesting: Node contents removed');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Start('span', array(), 1));
+        $this->invoke("<span><div></div></span>");
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/Strategy/MakeWellFormedTest.php b/tests/HTMLPurifier/Strategy/MakeWellFormedTest.php
index 3aa7e302..5a1cca99 100644
--- a/tests/HTMLPurifier/Strategy/MakeWellFormedTest.php
+++ b/tests/HTMLPurifier/Strategy/MakeWellFormedTest.php
@@ -9,6 +9,7 @@ class HTMLPurifier_Strategy_MakeWellFormedTest extends HTMLPurifier_StrategyHarn
     function setUp() {
         parent::setUp();
         $this->obj = new HTMLPurifier_Strategy_MakeWellFormed();
+        $this->config = array();
     }
     
     function testNormalIntegration() {
@@ -74,6 +75,48 @@ class HTMLPurifier_Strategy_MakeWellFormedTest extends HTMLPurifier_StrategyHarn
         
     }
     
+    function testMultipleInjectors() {
+        
+        $this->config = array('AutoFormat.AutoParagraph' => true, 'AutoFormat.Linkify' => true);
+        
+        $this->assertResult(
+            'Foobar',
+            '<p>Foobar</p>'
+        );
+        
+        $this->assertResult(
+            'http://example.com',
+            '<p><a href="http://example.com">http://example.com</a></p>'
+        );
+        
+        $this->assertResult(
+            '<b>http://example.com</b>',
+            '<p><b><a href="http://example.com">http://example.com</a></b></p>'
+        );
+        
+        $this->assertResult(
+            '<b>http://example.com',
+            '<p><b><a href="http://example.com">http://example.com</a></b></p>'
+        );
+        
+        $this->assertResult(
+'http://example.com
+
+http://dev.example.com',
+            '<p><a href="http://example.com">http://example.com</a></p><p><a href="http://dev.example.com">http://dev.example.com</a></p>'
+        );
+        
+        $this->assertResult(
+            'http://example.com <div>http://example.com</div>',
+            '<p><a href="http://example.com">http://example.com</a> </p><div><a href="http://example.com">http://example.com</a></div>'
+        );
+        
+        $this->assertResult(
+            'This URL http://example.com is what you need',
+            '<p>This URL <a href="http://example.com">http://example.com</a> is what you need</p>'
+        );
+        
+    }
+    
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/Strategy/MakeWellFormed_ErrorsTest.php b/tests/HTMLPurifier/Strategy/MakeWellFormed_ErrorsTest.php
new file mode 100644
index 00000000..da201106
--- /dev/null
+++ b/tests/HTMLPurifier/Strategy/MakeWellFormed_ErrorsTest.php
@@ -0,0 +1,56 @@
+<?php
+
+require_once 'HTMLPurifier/Strategy/ErrorsHarness.php';
+require_once 'HTMLPurifier/Strategy/MakeWellFormed.php';
+
+class HTMLPurifier_Strategy_MakeWellFormed_ErrorsTest extends HTMLPurifier_Strategy_ErrorsHarness
+{
+    
+    function getStrategy() {
+        return new HTMLPurifier_Strategy_MakeWellFormed();
+    }
+    
+    function testUnnecessaryEndTagRemoved() {
+        $this->expectErrorCollection(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_End('b', array(), 1));
+        $this->invoke('</b>');
+    }
+    
+    function testUnnecessaryEndTagToText() {
+        $this->config->set('Core', 'EscapeInvalidTags', true);
+        $this->expectErrorCollection(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_End('b', array(), 1));
+        $this->invoke('</b>');
+    }
+    
+    function testTagAutoClosed() {
+        $this->expectErrorCollection(E_NOTICE, 'Strategy_MakeWellFormed: Tag auto closed', new HTMLPurifier_Token_Start('b', array(), 1));
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Start('div', array(), 1));
+        $this->invoke('<b>Foo<div>Bar</div>');
+    }
+    
+    function testStrayEndTagRemoved() {
+        $this->expectErrorCollection(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_End('b', array(), 1));
+        $this->invoke('<i></b></i>');
+    }
+    
+    function testStrayEndTagToText() {
+        $this->config->set('Core', 'EscapeInvalidTags', true);
+        $this->expectErrorCollection(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_End('b', array(), 1));
+        $this->invoke('<i></b></i>');
+    }
+    
+    function testTagClosedByElementEnd() {
+        $this->expectErrorCollection(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', new HTMLPurifier_Token_Start('b', array(), 1));
+        $this->invoke('<i><b>Foobar</i>');
+    }
+    
+    function testTagClosedByDocumentEnd() {
+        $this->expectErrorCollection(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by document end', new HTMLPurifier_Token_Start('b', array(), 1));
+        $this->invoke('<b>Foobar');
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/Strategy/RemoveForeignElementsTest.php b/tests/HTMLPurifier/Strategy/RemoveForeignElementsTest.php
index a357abbb..c4289d98 100644
--- a/tests/HTMLPurifier/Strategy/RemoveForeignElementsTest.php
+++ b/tests/HTMLPurifier/Strategy/RemoveForeignElementsTest.php
@@ -79,8 +79,19 @@ class HTMLPurifier_Strategy_RemoveForeignElementsTest
             array('HTML.Allowed' => 'div')
         );
         
+        // text-ify commented script contents ( the trailing comment gets
+        // removed during generation )
+        $this->assertResult(
+'<script type="text/javascript"><!--
+alert(<b>bold</b>);
+// --></script>',
+'<script type="text/javascript">
+alert(&lt;b&gt;bold&lt;/b&gt;);
+// </script>',
+            array('HTML.Trusted' => true, 'Output.CommentScriptContents' => false)
+        );
+        
     }
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/Strategy/RemoveForeignElements_ErrorsTest.php b/tests/HTMLPurifier/Strategy/RemoveForeignElements_ErrorsTest.php
new file mode 100644
index 00000000..6b7ac74f
--- /dev/null
+++ b/tests/HTMLPurifier/Strategy/RemoveForeignElements_ErrorsTest.php
@@ -0,0 +1,59 @@
+<?php
+
+require_once 'HTMLPurifier/Strategy/ErrorsHarness.php';
+require_once 'HTMLPurifier/Strategy/RemoveForeignElements.php';
+
+class HTMLPurifier_Strategy_RemoveForeignElements_ErrorsTest extends HTMLPurifier_Strategy_ErrorsHarness
+{
+    
+    function setup() {
+        parent::setup();
+        $this->config->set('HTML', 'TidyLevel', 'heavy');
+    }
+    
+    function getStrategy() {
+        return new HTMLPurifier_Strategy_RemoveForeignElements();
+    }
+    
+    function testTagTransform() {
+        $this->expectErrorCollection(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', 'center');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Start('div', array('style' => 'text-align:center;'), 1));
+        $this->invoke('<center>');
+    }
+    
+    function testMissingRequiredAttr() {
+        // a little fragile, since img has two required attributes
+        $this->expectErrorCollection(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', 'alt');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Empty('img', array(), 1));
+        $this->invoke('<img />');
+    }
+    
+    function testForeignElementToText() {
+        $this->config->set('Core', 'EscapeInvalidTags', true);
+        $this->expectErrorCollection(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Start('invalid', array(), 1));
+        $this->invoke('<invalid>');
+    }
+    
+    function testForeignElementRemoved() {
+        // uses $CurrentToken.Serialized
+        $this->expectErrorCollection(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Start('invalid', array(), 1));
+        $this->invoke('<invalid>');
+    }
+    
+    function testCommentRemoved() {
+        $this->expectErrorCollection(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+        $this->expectContext('CurrentToken', new HTMLPurifier_Token_Comment(' test ', 1));
+        $this->invoke('<!-- test -->');
+    }
+    
+    function testScriptRemoved() {
+        $this->collector->expectAt(0, 'send', array(E_ERROR, 'Strategy_RemoveForeignElements: Script removed'));
+        $this->collector->expectContextAt(0, 'CurrentToken', new HTMLPurifier_Token_Start('script', array(), 1));
+        $this->collector->expectAt(1, 'send', array(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', 'script'));
+        $this->invoke('<script>asdf');
+    }
+    
+}
+
diff --git a/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php b/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php
index 06b8060a..fc7de460 100644
--- a/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php
+++ b/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php
@@ -439,4 +439,4 @@ class HTMLPurifier_Strategy_ValidateAttributesTest extends
     
 }
 
-?>
+
diff --git a/tests/HTMLPurifier/StrategyHarness.php b/tests/HTMLPurifier/StrategyHarness.php
index 9b452a8b..d8b2d5fd 100644
--- a/tests/HTMLPurifier/StrategyHarness.php
+++ b/tests/HTMLPurifier/StrategyHarness.php
@@ -13,4 +13,3 @@ class HTMLPurifier_StrategyHarness extends HTMLPurifier_Harness
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/TagTransformTest.php b/tests/HTMLPurifier/TagTransformTest.php
index ed9828ad..b3d6f461 100644
--- a/tests/HTMLPurifier/TagTransformTest.php
+++ b/tests/HTMLPurifier/TagTransformTest.php
@@ -177,4 +177,3 @@ class HTMLPurifier_TagTransformTest extends UnitTestCase
     }
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/TokenFactoryTest.php b/tests/HTMLPurifier/TokenFactoryTest.php
index 9007824f..8a35cbbc 100644
--- a/tests/HTMLPurifier/TokenFactoryTest.php
+++ b/tests/HTMLPurifier/TokenFactoryTest.php
@@ -16,4 +16,3 @@ class HTMLPurifier_TokenFactoryTest extends UnitTestCase
     }
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/TokenTest.php b/tests/HTMLPurifier/TokenTest.php
index d87b4c4c..22926fb5 100644
--- a/tests/HTMLPurifier/TokenTest.php
+++ b/tests/HTMLPurifier/TokenTest.php
@@ -33,4 +33,3 @@ class HTMLPurifier_TokenTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/URISchemeRegistryTest.php b/tests/HTMLPurifier/URISchemeRegistryTest.php
index 8edc3bdc..02b938e4 100644
--- a/tests/HTMLPurifier/URISchemeRegistryTest.php
+++ b/tests/HTMLPurifier/URISchemeRegistryTest.php
@@ -18,9 +18,9 @@ class HTMLPurifier_URISchemeRegistryTest extends UnitTestCase
         $registry = new HTMLPurifier_URISchemeRegistry();
         $this->assertIsA($registry->getScheme('http', $config, $context), 'HTMLPurifier_URIScheme_http');
         
-        $scheme_http = new HTMLPurifier_URISchemeMock($this);
-        $scheme_telnet = new HTMLPurifier_URISchemeMock($this);
-        $scheme_foobar = new HTMLPurifier_URISchemeMock($this);
+        $scheme_http = new HTMLPurifier_URISchemeMock();
+        $scheme_telnet = new HTMLPurifier_URISchemeMock();
+        $scheme_foobar = new HTMLPurifier_URISchemeMock();
         
         // register a new scheme
         $registry->register('telnet', $scheme_telnet);
@@ -48,4 +48,3 @@ class HTMLPurifier_URISchemeRegistryTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/URISchemeTest.php b/tests/HTMLPurifier/URISchemeTest.php
index 5cec57cf..1e236a80 100644
--- a/tests/HTMLPurifier/URISchemeTest.php
+++ b/tests/HTMLPurifier/URISchemeTest.php
@@ -155,4 +155,3 @@ class HTMLPurifier_URISchemeTest extends UnitTestCase
     
 }
 
-?>
\ No newline at end of file
diff --git a/tests/HTMLPurifierTest.php b/tests/HTMLPurifierTest.php
index d39be235..ba338fba 100644
--- a/tests/HTMLPurifierTest.php
+++ b/tests/HTMLPurifierTest.php
@@ -12,9 +12,9 @@ class HTMLPurifierTest extends UnitTestCase
         $this->purifier = new HTMLPurifier();
     }
     
-    function assertPurification($input, $expect = null) {
+    function assertPurification($input, $expect = null, $config = array()) {
         if ($expect === null) $expect = $input;
-        $result = $this->purifier->purify($input);
+        $result = $this->purifier->purify($input, $config);
         $this->assertIdentical($expect, $result);
     }
     
@@ -97,6 +97,40 @@ class HTMLPurifierTest extends UnitTestCase
         
     }
     
+    function testScript() {
+        $this->purifier = new HTMLPurifier(array('HTML.Trusted' => true));
+        $ideal = '<script type="text/javascript"><!--//--><![CDATA[//><!--
+alert("<This is compatible with XHTML>");
+//--><!]]></script>';
+        
+        $this->assertPurification($ideal);
+        
+        $this->assertPurification(
+            '<script type="text/javascript"><![CDATA[
+alert("<This is compatible with XHTML>");
+]]></script>',
+            $ideal
+        );
+        
+        $this->assertPurification(
+            '<script type="text/javascript">alert("<This is compatible with XHTML>");</script>',
+            $ideal
+        );
+        
+        $this->assertPurification(
+            '<script type="text/javascript"><!--
+alert("<This is compatible with XHTML>");
+//--></script>',
+            $ideal
+        );
+        
+        $this->assertPurification(
+            '<script type="text/javascript"><![CDATA[
+alert("<This is compatible with XHTML>");
+//]]></script>',
+            $ideal
+        );
+    }
+    
 }
 
-?>
\ No newline at end of file
diff --git a/tests/generate_mock_once.func.php b/tests/generate_mock_once.func.php
index 3e4d5b6d..1c74340b 100644
--- a/tests/generate_mock_once.func.php
+++ b/tests/generate_mock_once.func.php
@@ -8,4 +8,3 @@ function generate_mock_once($name) {
     Mock::generate($name, $mock_name);
 }
 
-?>
\ No newline at end of file
diff --git a/tests/index.php b/tests/index.php
index e823a347..aad6a94c 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -84,4 +84,4 @@ else $reporter = new HTMLPurifier_SimpleTest_Reporter('UTF-8');
 
 $test->run($reporter);
 
-?>
+
diff --git a/tests/path2class.func.php b/tests/path2class.func.php
index 1fad4ea6..4680e422 100644
--- a/tests/path2class.func.php
+++ b/tests/path2class.func.php
@@ -11,4 +11,3 @@ function path2class($path) {
     return $temp;
 }
 
-?>
\ No newline at end of file
diff --git a/tests/tally_errors.func.php b/tests/tally_errors.func.php
index cd945c3d..562d69b9 100644
--- a/tests/tally_errors.func.php
+++ b/tests/tally_errors.func.php
@@ -15,4 +15,3 @@ function tally_errors($test) {
     $queue->_expectation_queue = array();
 }
 
-?>
\ No newline at end of file
diff --git a/tests/test_files.php b/tests/test_files.php
index c2c8bada..5920981e 100644
--- a/tests/test_files.php
+++ b/tests/test_files.php
@@ -52,6 +52,7 @@ $test_files[] = 'HTMLPurifier/AttrTransform/LangTest.php';
 $test_files[] = 'HTMLPurifier/AttrTransform/LengthTest.php';
 $test_files[] = 'HTMLPurifier/AttrTransform/NameTest.php';
 $test_files[] = 'HTMLPurifier/AttrTypesTest.php';
+$test_files[] = 'HTMLPurifier/AttrValidator_ErrorsTest.php';
 $test_files[] = 'HTMLPurifier/ChildDef/ChameleonTest.php';
 $test_files[] = 'HTMLPurifier/ChildDef/CustomTest.php';
 $test_files[] = 'HTMLPurifier/ChildDef/OptionalTest.php';
@@ -81,16 +82,23 @@ $test_files[] = 'HTMLPurifier/HTMLModuleTest.php';
 $test_files[] = 'HTMLPurifier/HTMLModule/ScriptingTest.php';
 $test_files[] = 'HTMLPurifier/HTMLModule/TidyTest.php';
 $test_files[] = 'HTMLPurifier/IDAccumulatorTest.php';
+$test_files[] = 'HTMLPurifier/Injector/AutoParagraphTest.php';
+$test_files[] = 'HTMLPurifier/Injector/LinkifyTest.php';
+$test_files[] = 'HTMLPurifier/Injector/PurifierLinkifyTest.php';
 $test_files[] = 'HTMLPurifier/LanguageFactoryTest.php';
 $test_files[] = 'HTMLPurifier/LanguageTest.php';
 $test_files[] = 'HTMLPurifier/Lexer/DirectLexTest.php';
+$test_files[] = 'HTMLPurifier/Lexer/DirectLex_ErrorsTest.php';
 $test_files[] = 'HTMLPurifier/LexerTest.php';
 $test_files[] = 'HTMLPurifier/PercentEncoderTest.php';
 $test_files[] = 'HTMLPurifier/Strategy/CompositeTest.php';
 $test_files[] = 'HTMLPurifier/Strategy/CoreTest.php';
 $test_files[] = 'HTMLPurifier/Strategy/FixNestingTest.php';
+$test_files[] = 'HTMLPurifier/Strategy/FixNesting_ErrorsTest.php';
 $test_files[] = 'HTMLPurifier/Strategy/MakeWellFormedTest.php';
+$test_files[] = 'HTMLPurifier/Strategy/MakeWellFormed_ErrorsTest.php';
 $test_files[] = 'HTMLPurifier/Strategy/RemoveForeignElementsTest.php';
+$test_files[] = 'HTMLPurifier/Strategy/RemoveForeignElements_ErrorsTest.php';
 $test_files[] = 'HTMLPurifier/Strategy/ValidateAttributesTest.php';
 $test_files[] = 'HTMLPurifier/TagTransformTest.php';
 $test_files[] = 'HTMLPurifier/TokenTest.php';
@@ -106,4 +114,3 @@ if (version_compare(PHP_VERSION, '5', '>=')) {
 
 // ... none yet
 
-?>
\ No newline at end of file
-- 
2.11.4.GIT