[3.1.0] Add support for deprecated and version in configdoc

- Hide deprecated elements from ToC
- %HTML.Doctype takes null instead of empty string; this shouldn't affect anyone

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1666 48356398-32a2-884e-a903-53898d9a118a

library/HTMLPurifier/ConfigSchema/Builder/Xml.php

@@ -70,6 +70,7 @@ class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
         $this->endElement(); // aliases
         
         $this->startElement('constraints');
+            if ($directive->version) $this->writeElement('version', $directive->version);
             $this->writeElement('type', $directive->type);
             if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
             if ($directive->allowed) {
@@ -81,6 +82,13 @@ class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
             $this->writeAttribute('xml:space', 'preserve');
         $this->endElement(); // constraints
         
+        if ($directive->deprecatedVersion) {
+            $this->startElement('deprecated');
+                $this->writeElement('version', $directive->deprecatedVersion);
+                $this->writeElement('use', $directive->deprecatedUse->toString());
+            $this->endElement(); // deprecated
+        }
+        
         $this->startElement('description');
             $this->writeHTMLDiv($directive->description);
         $this->endElement(); // description

library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt

@@ -3,7 +3,7 @@ TYPE: bool/null
 DEFAULT: NULL
 VERSION: 2.0.0
 DEPRECATED-VERSION: 2.1.0
-DEPRECATED-USE: %Core.HiddenElements
+DEPRECATED-USE: Core.HiddenElements
 --DESCRIPTION--
 <p>
   This directive enables HTML Purifier to remove not only script tags

library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt

@@ -1,10 +1,10 @@
 HTML.Doctype
-TYPE: string
-DEFAULT: ''
+TYPE: string/null
+DEFAULT: NULL
 --DESCRIPTION--
 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. When non-blank, this will override any
 older directives like %HTML.XHTML or %HTML.Strict.
 --ALLOWED--
-'', 'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'
+'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'

library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt

@@ -2,6 +2,7 @@ HTML.Strict
 TYPE: bool
 VERSION: 1.3.0
 DEFAULT: false
+DEPRECATED-VERSION: 1.7.0
+DEPRECATED-USE: HTML.Doctype
 --DESCRIPTION--
 Determines whether or not to use Transitional (loose) or Strict rulesets.
-This directive is deprecated in favor of %HTML.Doctype. 

library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt

@@ -2,8 +2,9 @@ HTML.XHTML
 TYPE: bool
 DEFAULT: true
 VERSION: 1.1.0
+DEPRECATED-VERSION: 1.7.0
+DEPRECATED-USE: HTML.Doctype
 --DESCRIPTION--
-Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor. This
-directive is deprecated in favor of %HTML.Doctype.
+Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor.
 --ALIASES--
 Core.XHTML