ws & cs

3 files changed, 374 insertions, 361 deletions

diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4
index 069b3ee6b4..bd6e018e12 100644
--- a/ext/tidy/config.m4
+++ b/ext/tidy/config.m4
@@ -6,30 +6,33 @@ PHP_ARG_WITH(tidy,for TIDY support,
 [  --with-tidy[=DIR]      Include TIDY support])
 
 if test "$PHP_TIDY" != "no"; then
-	PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared)
-	if test "$PHP_TIDY" != "yes"; then
-	    TIDY_SEARCH_DIRS=$PHP_TIDY
-	else
-	    TIDY_SEARCH_DIRS="/usr/local /usr"
-	fi
-	for i in $TIDY_SEARCH_DIRS; do
-		if test -f $i/include/tidy/tidy.h; then
-			TIDY_DIR=$i
-			TIDY_INCDIR=$i/include/tidy
-		elif test -f $i/include/tidy.h; then
-			TIDY_DIR=$i
-			TIDY_INCDIR=$i/include
-		fi
-	done
-
-	if test -z "$TIDY_DIR"; then
-		AC_MSG_ERROR(Cannot find libtidy)
-	fi
-
-	TIDY_LIBDIR=$TIDY_DIR/lib
-
-	AC_DEFINE(HAVE_TIDY,1,[ ])
-	PHP_SUBST(TIDY_SHARED_LIBADD)
-	PHP_ADD_LIBRARY_WITH_PATH(tidy, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
-	PHP_ADD_INCLUDE($TIDY_INCDIR)
+
+  if test "$PHP_TIDY" != "yes"; then
+    TIDY_SEARCH_DIRS=$PHP_TIDY
+  else
+    TIDY_SEARCH_DIRS="/usr/local /usr"
+  fi
+
+  for i in $TIDY_SEARCH_DIRS; do
+    if test -f $i/include/tidy/tidy.h; then
+      TIDY_DIR=$i
+      TIDY_INCDIR=$i/include/tidy
+    elif test -f $i/include/tidy.h; then
+      TIDY_DIR=$i
+      TIDY_INCDIR=$i/include
+    fi
+  done
+
+  if test -z "$TIDY_DIR"; then
+    AC_MSG_ERROR(Cannot find libtidy)
+  fi
+
+  TIDY_LIBDIR=$TIDY_DIR/lib
+
+  PHP_ADD_LIBRARY_WITH_PATH(tidy, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
+  PHP_ADD_INCLUDE($TIDY_INCDIR)
+
+  PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared)
+  PHP_SUBST(TIDY_SHARED_LIBADD)
+  AC_DEFINE(HAVE_TIDY,1,[ ])
 fi
diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h
index f924ce732e..f2750288b8 100644
--- a/ext/tidy/php_tidy.h
+++ b/ext/tidy/php_tidy.h
@@ -98,9 +98,9 @@ extern zend_module_entry tidy_module_entry;
 		ce.create_object = tidy_object_new_ ## name; \
 		tidy_ce_ ## name = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
 		tidy_ce_ ## name->ce_flags |= ZEND_ACC_FINAL_CLASS; \
-        memcpy(&tidy_object_handlers_ ## name, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
+		memcpy(&tidy_object_handlers_ ## name, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
 		tidy_object_handlers_ ## name.clone_obj = NULL; \
-    }
+	}
 
 #define TIDY_TAG_CONST(tag) REGISTER_LONG_CONSTANT("TIDY_TAG_" #tag, TidyTag_##tag, CONST_CS | CONST_PERSISTENT)
 #define TIDY_ATTR_CONST(attr) REGISTER_LONG_CONSTANT("TIDY_ATTR_" #attr, TidyAttr_##attr, CONST_CS | CONST_PERSISTENT)
@@ -148,8 +148,8 @@ if (!_obj->ptdoc->parsed) { \
 #define TIDY_PARSED_REPAIR_CHECK(_obj) \
 TIDY_PARSED_CHECK(_obj); \
 if (!_obj->ptdoc->repaired) { \
-    php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must clean and repair the document before executing this function."); \
-    RETURN_FALSE; \
+	php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must clean and repair the document before executing this function."); \
+	RETURN_FALSE; \
 }
 
 #define TIDY_SAFE_MODE_CHECK(filename) \
@@ -168,34 +168,33 @@ typedef struct _PHPTidyDoc PHPTidyDoc;
 typedef struct _PHPTidyObj PHPTidyObj;
 
 typedef enum {
-    is_node,
-    is_attr,
-    is_doc,
-    is_exception
+	is_node,
+	is_attr,
+	is_doc,
+	is_exception
 } tidy_obj_type;
 
 typedef enum {
-    is_root_node,
-    is_html_node,
-    is_head_node,
-    is_body_node
+	is_root_node,
+	is_html_node,
+	is_head_node,
+	is_body_node
 } tidy_base_nodetypes;
 
 struct _PHPTidyDoc {
-    TidyDoc     doc;
-    TidyBuffer  *errbuf;
-    zend_bool   parsed;
-    zend_bool   repaired;
-    unsigned int ref_count;
+	TidyDoc     doc;
+	TidyBuffer  *errbuf;
+	zend_bool   parsed;
+	zend_bool   repaired;
+	unsigned int ref_count;
 };
 
 struct _PHPTidyObj {
-    zend_object         std;
-    TidyNode            node;
-    TidyAttr            attr;
-    tidy_obj_type       type;
-
-    PHPTidyDoc          *ptdoc;
+	zend_object         std;
+	TidyNode            node;
+	TidyAttr            attr;
+	tidy_obj_type       type;
+	PHPTidyDoc          *ptdoc;
 };
 
 static char *php_tidy_file_to_mem(char *, zend_bool TSRMLS_DC);
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 8ef07825c0..c02062910d 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -24,6 +24,9 @@
 
 #include "php.h"
 #include "php_tidy.h"
+
+#if HAVE_TIDY
+
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "Zend/zend_API.h"
@@ -127,8 +130,7 @@ function_entry tidy_funcs_exception[] = {
 	{NULL, NULL, NULL}
 };
 
-zend_class_entry *tidy_ce_doc, *tidy_ce_node,
-                 *tidy_ce_attr, *tidy_ce_exception;
+zend_class_entry *tidy_ce_doc, *tidy_ce_node, *tidy_ce_attr, *tidy_ce_exception;
 
 static zend_object_handlers tidy_object_handlers_doc;
 static zend_object_handlers tidy_object_handlers_node;
@@ -905,7 +907,7 @@ PHP_FUNCTION(tidy_repair_file)
 /* }}} */
 
 /* {{{ proto boolean tidy_diagnose()
-    Run configured diagnostics on parsed and repaired markup. */
+   Run configured diagnostics on parsed and repaired markup. */
 PHP_FUNCTION(tidy_diagnose)
 {
 	TIDY_FETCH_OBJECT;
@@ -922,7 +924,7 @@ PHP_FUNCTION(tidy_diagnose)
 /* }}} */
 
 /* {{{ proto string tidy_get_release()
-    Get release date (version) for Tidy library */
+   Get release date (version) for Tidy library */
 PHP_FUNCTION(tidy_get_release)
 {
 	if (ZEND_NUM_ARGS()) {
@@ -934,7 +936,7 @@ PHP_FUNCTION(tidy_get_release)
 /* }}} */
 
 /* {{{ proto array tidy_get_config()
-    Get current Tidy configuarion */
+   Get current Tidy configuarion */
 PHP_FUNCTION(tidy_get_config)
 {
 	TidyIterator itOpt;
@@ -973,7 +975,7 @@ PHP_FUNCTION(tidy_get_config)
 /* }}} */
 
 /* {{{ proto int tidy_get_status()
-    Get status of specfied document. */
+   Get status of specfied document. */
 PHP_FUNCTION(tidy_get_status)
 {
 	TIDY_FETCH_OBJECT;
@@ -983,7 +985,7 @@ PHP_FUNCTION(tidy_get_status)
 /* }}} */
 
 /* {{{ proto int tidy_get_html_ver()
-    Get the Detected HTML version for the specified document. */
+   Get the Detected HTML version for the specified document. */
 PHP_FUNCTION(tidy_get_html_ver)
 {
 	TIDY_FETCH_PARSED_OBJECT;
@@ -993,7 +995,7 @@ PHP_FUNCTION(tidy_get_html_ver)
 /* }}} */
 
 /* {{{ proto boolean tidy_is_xhtml()
-    Indicates if the document is a XHTML document. */
+   Indicates if the document is a XHTML document. */
 PHP_FUNCTION(tidy_is_xhtml)
 {
 	TIDY_FETCH_PARSED_OBJECT;
@@ -1003,7 +1005,7 @@ PHP_FUNCTION(tidy_is_xhtml)
 /* }}} */
 
 /* {{{ proto boolean tidy_is_xhtml()
-    Indicates if the document is a generic (non HTML/XHTML) XML document. */
+   Indicates if the document is a generic (non HTML/XHTML) XML document. */
 PHP_FUNCTION(tidy_is_xml)
 {
 	TIDY_FETCH_PARSED_OBJECT;
@@ -1013,7 +1015,7 @@ PHP_FUNCTION(tidy_is_xml)
 /* }}} */
 
 /* {{{ proto int tidy_error_count()
-    Returns the Number of Tidy errors encountered for specified document. */
+   Returns the Number of Tidy errors encountered for specified document. */
 PHP_FUNCTION(tidy_error_count)
 {
 	TIDY_FETCH_PARSED_OBJECT;
@@ -1023,7 +1025,7 @@ PHP_FUNCTION(tidy_error_count)
 /* }}} */
 
 /* {{{ proto int tidy_warning_count()
-    Returns the Number of Tidy warnings encountered for specified document. */
+   Returns the Number of Tidy warnings encountered for specified document. */
 PHP_FUNCTION(tidy_warning_count)
 {
 	TIDY_FETCH_PARSED_OBJECT;
@@ -1033,7 +1035,7 @@ PHP_FUNCTION(tidy_warning_count)
 /* }}} */
 
 /* {{{ proto int tidy_access_count()
-    Returns the Number of Tidy accessibility warnings encountered for specified document. */
+   Returns the Number of Tidy accessibility warnings encountered for specified document. */
 PHP_FUNCTION(tidy_access_count)
 {
 	TIDY_FETCH_PARSED_OBJECT;
@@ -1043,7 +1045,7 @@ PHP_FUNCTION(tidy_access_count)
 /* }}} */
 
 /* {{{ proto int tidy_config_count()
-    Returns the Number of Tidy configuration errors encountered for specified document. */
+   Returns the Number of Tidy configuration errors encountered for specified document. */
 PHP_FUNCTION(tidy_config_count)
 {
 	TIDY_FETCH_PARSED_OBJECT;
@@ -1053,7 +1055,7 @@ PHP_FUNCTION(tidy_config_count)
 /* }}} */
 
 /* {{{ proto void tidy_load_config(string filename)
-    Load an ASCII Tidy configuration file */
+   Load an ASCII Tidy configuration file */
 PHP_FUNCTION(tidy_load_config)
 {
 	char *filename;
@@ -1086,7 +1088,7 @@ PHP_FUNCTION(tidy_load_config)
 /* }}} */
 
 /* {{{ proto void tidy_load_config(string filename, string encoding)
-    Load an ASCII Tidy configuration file with the specified encoding */
+   Load an ASCII Tidy configuration file with the specified encoding */
 PHP_FUNCTION(tidy_load_config_enc)
 {
 	char *filename, *encoding;
@@ -1120,9 +1122,7 @@ PHP_FUNCTION(tidy_load_config_enc)
 /* }}} */
 
 /* {{{ proto boolean tidy_set_encoding(string encoding)
-    Set the input/output character encoding for parsing markup.
-    Values include: ascii, latin1, raw, utf8, iso2022, mac, win1252, utf16le,
-    utf16be, utf16, big5 and shiftjis. */
+   Set the input/output character encoding for parsing markup. Values include: ascii, latin1, raw, utf8, iso2022, mac, win1252, utf16le, utf16be, utf16, big5 and shiftjis. */
 PHP_FUNCTION(tidy_set_encoding)
 {
 	zval *object = getThis();
@@ -1198,7 +1198,7 @@ PHP_FUNCTION(tidy_reset_config)
 }
 
 /* {{{ proto boolean tidy_save_config(string filename)
-    Save current settings to named file. Only non-default values are written. */
+   Save current settings to named file. Only non-default values are written. */
 PHP_FUNCTION(tidy_save_config)
 {
 	zval *object = getThis();
@@ -1230,7 +1230,7 @@ PHP_FUNCTION(tidy_save_config)
 /* }}} */
 
 /* {{{ proto boolean tidy_setopt(string option, mixed newvalue)
-    Updates the configuration settings for the specified tidy document. */
+   Updates the configuration settings for the specified tidy document. */
 PHP_FUNCTION(tidy_setopt)
 {
 	zval *object = getThis();
@@ -1297,7 +1297,7 @@ PHP_FUNCTION(tidy_setopt)
 /* }}} */
 
 /* {{{ proto mixed tidy_getopt(string option)
-    Returns the value of the specified configuration option for the tidy document. */
+   Returns the value of the specified configuration option for the tidy document. */
 PHP_FUNCTION(tidy_getopt)
 {
 	zval *object = getThis();
@@ -1354,7 +1354,7 @@ PHP_FUNCTION(tidy_getopt)
 /* }}} */
 
 /* {{{ proto TidyNode tidy_get_root()
-    Returns a TidyNode Object representing the root of the tidy parse tree */
+   Returns a TidyNode Object representing the root of the tidy parse tree */
 PHP_FUNCTION(tidy_get_root)
 {
 	php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_root_node);
@@ -1362,7 +1362,7 @@ PHP_FUNCTION(tidy_get_root)
 /* }}} */
 
 /* {{{ proto TidyNode tidy_get_html()
-    Returns a TidyNode Object starting from the <HTML> tag of the tidy parse tree */
+   Returns a TidyNode Object starting from the <HTML> tag of the tidy parse tree */
 PHP_FUNCTION(tidy_get_html)
 {
 	php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_html_node);
@@ -1370,7 +1370,7 @@ PHP_FUNCTION(tidy_get_html)
 /* }}} */
 
 /* {{{ proto TidyNode tidy_get_head()
-    Returns a TidyNode Object starting from the <HEAD> tag of the tidy parse tree */
+   Returns a TidyNode Object starting from the <HEAD> tag of the tidy parse tree */
 PHP_FUNCTION(tidy_get_head)
 {
 	php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_head_node);
@@ -1378,7 +1378,7 @@ PHP_FUNCTION(tidy_get_head)
 /* }}} */
 
 /* {{{ proto TidyNode tidy_get_body(resource tidy)
-    Returns a TidyNode Object starting from the <BODY> tag of the tidy parse tree */
+   Returns a TidyNode Object starting from the <BODY> tag of the tidy parse tree */
 PHP_FUNCTION(tidy_get_body)
 {
 	php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_body_node);
@@ -1534,300 +1534,311 @@ TIDY_NODE_METHOD(is_php)
 
 void _php_tidy_register_nodetypes(INIT_FUNC_ARGS)
 {
-    TIDY_NODE_CONST(ROOT, Root);
-    TIDY_NODE_CONST(DOCTYPE, DocType);
-    TIDY_NODE_CONST(COMMENT, Comment);
-    TIDY_NODE_CONST(PROCINS, ProcIns);
-    TIDY_NODE_CONST(TEXT, Text);
-    TIDY_NODE_CONST(START, Start);
-    TIDY_NODE_CONST(END, End);
-    TIDY_NODE_CONST(STARTEND, StartEnd);
-    TIDY_NODE_CONST(CDATA, CDATA);
-    TIDY_NODE_CONST(SECTION, Section);
-    TIDY_NODE_CONST(ASP, Asp);
-    TIDY_NODE_CONST(JSTE, Jste);
-    TIDY_NODE_CONST(PHP, Php);
-    TIDY_NODE_CONST(XMLDECL, XmlDecl);
+	TIDY_NODE_CONST(ROOT, Root);
+	TIDY_NODE_CONST(DOCTYPE, DocType);
+	TIDY_NODE_CONST(COMMENT, Comment);
+	TIDY_NODE_CONST(PROCINS, ProcIns);
+	TIDY_NODE_CONST(TEXT, Text);
+	TIDY_NODE_CONST(START, Start);
+	TIDY_NODE_CONST(END, End);
+	TIDY_NODE_CONST(STARTEND, StartEnd);
+	TIDY_NODE_CONST(CDATA, CDATA);
+	TIDY_NODE_CONST(SECTION, Section);
+	TIDY_NODE_CONST(ASP, Asp);
+	TIDY_NODE_CONST(JSTE, Jste);
+	TIDY_NODE_CONST(PHP, Php);
+	TIDY_NODE_CONST(XMLDECL, XmlDecl);
 }
 
 void _php_tidy_register_tags(INIT_FUNC_ARGS)
 {
-    TIDY_TAG_CONST(UNKNOWN);
-    TIDY_TAG_CONST(A);
-    TIDY_TAG_CONST(ABBR);
-    TIDY_TAG_CONST(ACRONYM);
-    TIDY_TAG_CONST(ADDRESS);
-    TIDY_TAG_CONST(ALIGN);
-    TIDY_TAG_CONST(APPLET);
-    TIDY_TAG_CONST(AREA);
-    TIDY_TAG_CONST(B);
-    TIDY_TAG_CONST(BASE);
-    TIDY_TAG_CONST(BASEFONT);
-    TIDY_TAG_CONST(BDO);
-    TIDY_TAG_CONST(BGSOUND);
-    TIDY_TAG_CONST(BIG);
-    TIDY_TAG_CONST(BLINK);
-    TIDY_TAG_CONST(BLOCKQUOTE);
-    TIDY_TAG_CONST(BODY);
-    TIDY_TAG_CONST(BR);
-    TIDY_TAG_CONST(BUTTON);
-    TIDY_TAG_CONST(CAPTION);
-    TIDY_TAG_CONST(CENTER);
-    TIDY_TAG_CONST(CITE);
-    TIDY_TAG_CONST(CODE);
-    TIDY_TAG_CONST(COL);
-    TIDY_TAG_CONST(COLGROUP);
-    TIDY_TAG_CONST(COMMENT);
-    TIDY_TAG_CONST(DD);
-    TIDY_TAG_CONST(DEL);
-    TIDY_TAG_CONST(DFN);
-    TIDY_TAG_CONST(DIR);
-    TIDY_TAG_CONST(DIV);
-    TIDY_TAG_CONST(DL);
-    TIDY_TAG_CONST(DT);
-    TIDY_TAG_CONST(EM);
-    TIDY_TAG_CONST(EMBED);
-    TIDY_TAG_CONST(FIELDSET);
-    TIDY_TAG_CONST(FONT);
-    TIDY_TAG_CONST(FORM);
-    TIDY_TAG_CONST(FRAME);
-    TIDY_TAG_CONST(FRAMESET);
-    TIDY_TAG_CONST(H1);
-    TIDY_TAG_CONST(H2);
-    TIDY_TAG_CONST(H3);
-    TIDY_TAG_CONST(H4);
-    TIDY_TAG_CONST(H5);
-    TIDY_TAG_CONST(H6);
-    TIDY_TAG_CONST(HEAD);
-    TIDY_TAG_CONST(HR);
-    TIDY_TAG_CONST(HTML);
-    TIDY_TAG_CONST(I);
-    TIDY_TAG_CONST(IFRAME);
-    TIDY_TAG_CONST(ILAYER);
-    TIDY_TAG_CONST(IMG);
-    TIDY_TAG_CONST(INPUT);
-    TIDY_TAG_CONST(INS);
-    TIDY_TAG_CONST(ISINDEX);
-    TIDY_TAG_CONST(KBD);
-    TIDY_TAG_CONST(KEYGEN);
-    TIDY_TAG_CONST(LABEL);
-    TIDY_TAG_CONST(LAYER);
-    TIDY_TAG_CONST(LEGEND);
-    TIDY_TAG_CONST(LI);
-    TIDY_TAG_CONST(LINK);
-    TIDY_TAG_CONST(LISTING);
-    TIDY_TAG_CONST(MAP);
-    TIDY_TAG_CONST(MARQUEE);
-    TIDY_TAG_CONST(MENU);
-    TIDY_TAG_CONST(META);
-    TIDY_TAG_CONST(MULTICOL);
-    TIDY_TAG_CONST(NOBR);
-    TIDY_TAG_CONST(NOEMBED);
-    TIDY_TAG_CONST(NOFRAMES);
-    TIDY_TAG_CONST(NOLAYER);
-    TIDY_TAG_CONST(NOSAVE);
-    TIDY_TAG_CONST(NOSCRIPT);
-    TIDY_TAG_CONST(OBJECT);
-    TIDY_TAG_CONST(OL);
-    TIDY_TAG_CONST(OPTGROUP);
-    TIDY_TAG_CONST(OPTION);
-    TIDY_TAG_CONST(P);
-    TIDY_TAG_CONST(PARAM);
-    TIDY_TAG_CONST(PLAINTEXT);
-    TIDY_TAG_CONST(PRE);
-    TIDY_TAG_CONST(Q);
-    TIDY_TAG_CONST(RB);
-    TIDY_TAG_CONST(RBC);
-    TIDY_TAG_CONST(RP);
-    TIDY_TAG_CONST(RT);
-    TIDY_TAG_CONST(RTC);
-    TIDY_TAG_CONST(RUBY);
-    TIDY_TAG_CONST(S);
-    TIDY_TAG_CONST(SAMP);
-    TIDY_TAG_CONST(SCRIPT);
-    TIDY_TAG_CONST(SELECT);
-    TIDY_TAG_CONST(SERVER);
-    TIDY_TAG_CONST(SERVLET);
-    TIDY_TAG_CONST(SMALL);
-    TIDY_TAG_CONST(SPACER);
-    TIDY_TAG_CONST(SPAN);
-    TIDY_TAG_CONST(STRIKE);
-    TIDY_TAG_CONST(STRONG);
-    TIDY_TAG_CONST(STYLE);
-    TIDY_TAG_CONST(SUB);
-    TIDY_TAG_CONST(SUP);
-    TIDY_TAG_CONST(TABLE);
-    TIDY_TAG_CONST(TBODY);
-    TIDY_TAG_CONST(TD);
-    TIDY_TAG_CONST(TEXTAREA);
-    TIDY_TAG_CONST(TFOOT);
-    TIDY_TAG_CONST(TH);
-    TIDY_TAG_CONST(THEAD);
-    TIDY_TAG_CONST(TITLE);
-    TIDY_TAG_CONST(TR);
-    TIDY_TAG_CONST(TT);
-    TIDY_TAG_CONST(U);
-    TIDY_TAG_CONST(UL);
-    TIDY_TAG_CONST(VAR);
-    TIDY_TAG_CONST(WBR);
-    TIDY_TAG_CONST(XMP);
+	TIDY_TAG_CONST(UNKNOWN);
+	TIDY_TAG_CONST(A);
+	TIDY_TAG_CONST(ABBR);
+	TIDY_TAG_CONST(ACRONYM);
+	TIDY_TAG_CONST(ADDRESS);
+	TIDY_TAG_CONST(ALIGN);
+	TIDY_TAG_CONST(APPLET);
+	TIDY_TAG_CONST(AREA);
+	TIDY_TAG_CONST(B);
+	TIDY_TAG_CONST(BASE);
+	TIDY_TAG_CONST(BASEFONT);
+	TIDY_TAG_CONST(BDO);
+	TIDY_TAG_CONST(BGSOUND);
+	TIDY_TAG_CONST(BIG);
+	TIDY_TAG_CONST(BLINK);
+	TIDY_TAG_CONST(BLOCKQUOTE);
+	TIDY_TAG_CONST(BODY);
+	TIDY_TAG_CONST(BR);
+	TIDY_TAG_CONST(BUTTON);
+	TIDY_TAG_CONST(CAPTION);
+	TIDY_TAG_CONST(CENTER);
+	TIDY_TAG_CONST(CITE);
+	TIDY_TAG_CONST(CODE);
+	TIDY_TAG_CONST(COL);
+	TIDY_TAG_CONST(COLGROUP);
+	TIDY_TAG_CONST(COMMENT);
+	TIDY_TAG_CONST(DD);
+	TIDY_TAG_CONST(DEL);
+	TIDY_TAG_CONST(DFN);
+	TIDY_TAG_CONST(DIR);
+	TIDY_TAG_CONST(DIV);
+	TIDY_TAG_CONST(DL);
+	TIDY_TAG_CONST(DT);
+	TIDY_TAG_CONST(EM);
+	TIDY_TAG_CONST(EMBED);
+	TIDY_TAG_CONST(FIELDSET);
+	TIDY_TAG_CONST(FONT);
+	TIDY_TAG_CONST(FORM);
+	TIDY_TAG_CONST(FRAME);
+	TIDY_TAG_CONST(FRAMESET);
+	TIDY_TAG_CONST(H1);
+	TIDY_TAG_CONST(H2);
+	TIDY_TAG_CONST(H3);
+	TIDY_TAG_CONST(H4);
+	TIDY_TAG_CONST(H5);
+	TIDY_TAG_CONST(H6);
+	TIDY_TAG_CONST(HEAD);
+	TIDY_TAG_CONST(HR);
+	TIDY_TAG_CONST(HTML);
+	TIDY_TAG_CONST(I);
+	TIDY_TAG_CONST(IFRAME);
+	TIDY_TAG_CONST(ILAYER);
+	TIDY_TAG_CONST(IMG);
+	TIDY_TAG_CONST(INPUT);
+	TIDY_TAG_CONST(INS);
+	TIDY_TAG_CONST(ISINDEX);
+	TIDY_TAG_CONST(KBD);
+	TIDY_TAG_CONST(KEYGEN);
+	TIDY_TAG_CONST(LABEL);
+	TIDY_TAG_CONST(LAYER);
+	TIDY_TAG_CONST(LEGEND);
+	TIDY_TAG_CONST(LI);
+	TIDY_TAG_CONST(LINK);
+	TIDY_TAG_CONST(LISTING);
+	TIDY_TAG_CONST(MAP);
+	TIDY_TAG_CONST(MARQUEE);
+	TIDY_TAG_CONST(MENU);
+	TIDY_TAG_CONST(META);
+	TIDY_TAG_CONST(MULTICOL);
+	TIDY_TAG_CONST(NOBR);
+	TIDY_TAG_CONST(NOEMBED);
+	TIDY_TAG_CONST(NOFRAMES);
+	TIDY_TAG_CONST(NOLAYER);
+	TIDY_TAG_CONST(NOSAVE);
+	TIDY_TAG_CONST(NOSCRIPT);
+	TIDY_TAG_CONST(OBJECT);
+	TIDY_TAG_CONST(OL);
+	TIDY_TAG_CONST(OPTGROUP);
+	TIDY_TAG_CONST(OPTION);
+	TIDY_TAG_CONST(P);
+	TIDY_TAG_CONST(PARAM);
+	TIDY_TAG_CONST(PLAINTEXT);
+	TIDY_TAG_CONST(PRE);
+	TIDY_TAG_CONST(Q);
+	TIDY_TAG_CONST(RB);
+	TIDY_TAG_CONST(RBC);
+	TIDY_TAG_CONST(RP);
+	TIDY_TAG_CONST(RT);
+	TIDY_TAG_CONST(RTC);
+	TIDY_TAG_CONST(RUBY);
+	TIDY_TAG_CONST(S);
+	TIDY_TAG_CONST(SAMP);
+	TIDY_TAG_CONST(SCRIPT);
+	TIDY_TAG_CONST(SELECT);
+	TIDY_TAG_CONST(SERVER);
+	TIDY_TAG_CONST(SERVLET);
+	TIDY_TAG_CONST(SMALL);
+	TIDY_TAG_CONST(SPACER);
+	TIDY_TAG_CONST(SPAN);
+	TIDY_TAG_CONST(STRIKE);
+	TIDY_TAG_CONST(STRONG);
+	TIDY_TAG_CONST(STYLE);
+	TIDY_TAG_CONST(SUB);
+	TIDY_TAG_CONST(SUP);
+	TIDY_TAG_CONST(TABLE);
+	TIDY_TAG_CONST(TBODY);
+	TIDY_TAG_CONST(TD);
+	TIDY_TAG_CONST(TEXTAREA);
+	TIDY_TAG_CONST(TFOOT);
+	TIDY_TAG_CONST(TH);
+	TIDY_TAG_CONST(THEAD);
+	TIDY_TAG_CONST(TITLE);
+	TIDY_TAG_CONST(TR);
+	TIDY_TAG_CONST(TT);
+	TIDY_TAG_CONST(U);
+	TIDY_TAG_CONST(UL);
+	TIDY_TAG_CONST(VAR);
+	TIDY_TAG_CONST(WBR);
+	TIDY_TAG_CONST(XMP);
 }
 
 void _php_tidy_register_attributes(INIT_FUNC_ARGS)
 {
-    TIDY_ATTR_CONST(UNKNOWN);
-    TIDY_ATTR_CONST(ABBR);
-    TIDY_ATTR_CONST(ACCEPT);
-    TIDY_ATTR_CONST(ACCEPT_CHARSET);
-    TIDY_ATTR_CONST(ACCESSKEY);
-    TIDY_ATTR_CONST(ACTION);
-    TIDY_ATTR_CONST(ADD_DATE);
-    TIDY_ATTR_CONST(ALIGN);
-    TIDY_ATTR_CONST(ALINK);
-    TIDY_ATTR_CONST(ALT);
-    TIDY_ATTR_CONST(ARCHIVE);
-    TIDY_ATTR_CONST(AXIS);
-    TIDY_ATTR_CONST(BACKGROUND);
-    TIDY_ATTR_CONST(BGCOLOR);
-    TIDY_ATTR_CONST(BGPROPERTIES);
-    TIDY_ATTR_CONST(BORDER);
-    TIDY_ATTR_CONST(BORDERCOLOR);
-    TIDY_ATTR_CONST(BOTTOMMARGIN);
-    TIDY_ATTR_CONST(CELLPADDING);
-    TIDY_ATTR_CONST(CELLSPACING);
-    TIDY_ATTR_CONST(CHAR);
-    TIDY_ATTR_CONST(CHAROFF);
-    TIDY_ATTR_CONST(CHARSET);
-    TIDY_ATTR_CONST(CHECKED);
-    TIDY_ATTR_CONST(CITE);
-    TIDY_ATTR_CONST(CLASS);
-    TIDY_ATTR_CONST(CLASSID);
-    TIDY_ATTR_CONST(CLEAR);
-    TIDY_ATTR_CONST(CODE);
-    TIDY_ATTR_CONST(CODEBASE);
-    TIDY_ATTR_CONST(CODETYPE);
-    TIDY_ATTR_CONST(COLOR);
-    TIDY_ATTR_CONST(COLS);
-    TIDY_ATTR_CONST(COLSPAN);
-    TIDY_ATTR_CONST(COMPACT);
-    TIDY_ATTR_CONST(CONTENT);
-    TIDY_ATTR_CONST(COORDS);
-    TIDY_ATTR_CONST(DATA);
-    TIDY_ATTR_CONST(DATAFLD);
+	TIDY_ATTR_CONST(UNKNOWN);
+	TIDY_ATTR_CONST(ABBR);
+	TIDY_ATTR_CONST(ACCEPT);
+	TIDY_ATTR_CONST(ACCEPT_CHARSET);
+	TIDY_ATTR_CONST(ACCESSKEY);
+	TIDY_ATTR_CONST(ACTION);
+	TIDY_ATTR_CONST(ADD_DATE);
+	TIDY_ATTR_CONST(ALIGN);
+	TIDY_ATTR_CONST(ALINK);
+	TIDY_ATTR_CONST(ALT);
+	TIDY_ATTR_CONST(ARCHIVE);
+	TIDY_ATTR_CONST(AXIS);
+	TIDY_ATTR_CONST(BACKGROUND);
+	TIDY_ATTR_CONST(BGCOLOR);
+	TIDY_ATTR_CONST(BGPROPERTIES);
+	TIDY_ATTR_CONST(BORDER);
+	TIDY_ATTR_CONST(BORDERCOLOR);
+	TIDY_ATTR_CONST(BOTTOMMARGIN);
+	TIDY_ATTR_CONST(CELLPADDING);
+	TIDY_ATTR_CONST(CELLSPACING);
+	TIDY_ATTR_CONST(CHAR);
+	TIDY_ATTR_CONST(CHAROFF);
+	TIDY_ATTR_CONST(CHARSET);
+	TIDY_ATTR_CONST(CHECKED);
+	TIDY_ATTR_CONST(CITE);
+	TIDY_ATTR_CONST(CLASS);
+	TIDY_ATTR_CONST(CLASSID);
+	TIDY_ATTR_CONST(CLEAR);
+	TIDY_ATTR_CONST(CODE);
+	TIDY_ATTR_CONST(CODEBASE);
+	TIDY_ATTR_CONST(CODETYPE);
+	TIDY_ATTR_CONST(COLOR);
+	TIDY_ATTR_CONST(COLS);
+	TIDY_ATTR_CONST(COLSPAN);
+	TIDY_ATTR_CONST(COMPACT);
+	TIDY_ATTR_CONST(CONTENT);
+	TIDY_ATTR_CONST(COORDS);
+	TIDY_ATTR_CONST(DATA);
+	TIDY_ATTR_CONST(DATAFLD);
  /* TIDY_ATTR_CONST(DATAFORMATSAS); */
-    TIDY_ATTR_CONST(DATAPAGESIZE);
-    TIDY_ATTR_CONST(DATASRC);
-    TIDY_ATTR_CONST(DATETIME);
-    TIDY_ATTR_CONST(DECLARE);
-    TIDY_ATTR_CONST(DEFER);
-    TIDY_ATTR_CONST(DIR);
-    TIDY_ATTR_CONST(DISABLED);
-    TIDY_ATTR_CONST(ENCODING);
-    TIDY_ATTR_CONST(ENCTYPE);
-    TIDY_ATTR_CONST(FACE);
-    TIDY_ATTR_CONST(FOR);
-    TIDY_ATTR_CONST(FRAME);
-    TIDY_ATTR_CONST(FRAMEBORDER);
-    TIDY_ATTR_CONST(FRAMESPACING);
-    TIDY_ATTR_CONST(GRIDX);
-    TIDY_ATTR_CONST(GRIDY);
-    TIDY_ATTR_CONST(HEADERS);
-    TIDY_ATTR_CONST(HEIGHT);
-    TIDY_ATTR_CONST(HREF);
-    TIDY_ATTR_CONST(HREFLANG);
-    TIDY_ATTR_CONST(HSPACE);
-    TIDY_ATTR_CONST(HTTP_EQUIV);
-    TIDY_ATTR_CONST(ID);
-    TIDY_ATTR_CONST(ISMAP);
-    TIDY_ATTR_CONST(LABEL);
-    TIDY_ATTR_CONST(LANG);
-    TIDY_ATTR_CONST(LANGUAGE);
-    TIDY_ATTR_CONST(LAST_MODIFIED);
-    TIDY_ATTR_CONST(LAST_VISIT);
-    TIDY_ATTR_CONST(LEFTMARGIN);
-    TIDY_ATTR_CONST(LINK);
-    TIDY_ATTR_CONST(LONGDESC);
-    TIDY_ATTR_CONST(LOWSRC);
-    TIDY_ATTR_CONST(MARGINHEIGHT);
-    TIDY_ATTR_CONST(MARGINWIDTH);
-    TIDY_ATTR_CONST(MAXLENGTH);
-    TIDY_ATTR_CONST(MEDIA);
-    TIDY_ATTR_CONST(METHOD);
-    TIDY_ATTR_CONST(MULTIPLE);
-    TIDY_ATTR_CONST(NAME);
-    TIDY_ATTR_CONST(NOHREF);
-    TIDY_ATTR_CONST(NORESIZE);
-    TIDY_ATTR_CONST(NOSHADE);
-    TIDY_ATTR_CONST(NOWRAP);
-    TIDY_ATTR_CONST(OBJECT);
-    TIDY_ATTR_CONST(OnAFTERUPDATE);
-    TIDY_ATTR_CONST(OnBEFOREUNLOAD);
-    TIDY_ATTR_CONST(OnBEFOREUPDATE);
-    TIDY_ATTR_CONST(OnBLUR);
-    TIDY_ATTR_CONST(OnCHANGE);
-    TIDY_ATTR_CONST(OnCLICK);
-    TIDY_ATTR_CONST(OnDATAAVAILABLE);
-    TIDY_ATTR_CONST(OnDATASETCHANGED);
-    TIDY_ATTR_CONST(OnDATASETCOMPLETE);
-    TIDY_ATTR_CONST(OnDBLCLICK);
-    TIDY_ATTR_CONST(OnERRORUPDATE);
-    TIDY_ATTR_CONST(OnFOCUS);
-    TIDY_ATTR_CONST(OnKEYDOWN);
-    TIDY_ATTR_CONST(OnKEYPRESS);
-    TIDY_ATTR_CONST(OnKEYUP);
-    TIDY_ATTR_CONST(OnLOAD);
-    TIDY_ATTR_CONST(OnMOUSEDOWN);
-    TIDY_ATTR_CONST(OnMOUSEMOVE);
-    TIDY_ATTR_CONST(OnMOUSEOUT);
-    TIDY_ATTR_CONST(OnMOUSEOVER);
-    TIDY_ATTR_CONST(OnMOUSEUP);
-    TIDY_ATTR_CONST(OnRESET);
-    TIDY_ATTR_CONST(OnROWENTER);
-    TIDY_ATTR_CONST(OnROWEXIT);
-    TIDY_ATTR_CONST(OnSELECT);
-    TIDY_ATTR_CONST(OnSUBMIT);
-    TIDY_ATTR_CONST(OnUNLOAD);
-    TIDY_ATTR_CONST(PROFILE);
-    TIDY_ATTR_CONST(PROMPT);
-    TIDY_ATTR_CONST(RBSPAN);
-    TIDY_ATTR_CONST(READONLY);
-    TIDY_ATTR_CONST(REL);
-    TIDY_ATTR_CONST(REV);
-    TIDY_ATTR_CONST(RIGHTMARGIN);
-    TIDY_ATTR_CONST(ROWS);
-    TIDY_ATTR_CONST(ROWSPAN);
-    TIDY_ATTR_CONST(RULES);
-    TIDY_ATTR_CONST(SCHEME);
-    TIDY_ATTR_CONST(SCOPE);
-    TIDY_ATTR_CONST(SCROLLING);
-    TIDY_ATTR_CONST(SELECTED);
-    TIDY_ATTR_CONST(SHAPE);
-    TIDY_ATTR_CONST(SHOWGRID);
-    TIDY_ATTR_CONST(SHOWGRIDX);
-    TIDY_ATTR_CONST(SHOWGRIDY);
-    TIDY_ATTR_CONST(SIZE);
-    TIDY_ATTR_CONST(SPAN);
-    TIDY_ATTR_CONST(SRC);
-    TIDY_ATTR_CONST(STANDBY);
-    TIDY_ATTR_CONST(START);
-    TIDY_ATTR_CONST(STYLE);
-    TIDY_ATTR_CONST(SUMMARY);
-    TIDY_ATTR_CONST(TABINDEX);
-    TIDY_ATTR_CONST(TARGET);
-    TIDY_ATTR_CONST(TEXT);
-    TIDY_ATTR_CONST(TITLE);
-    TIDY_ATTR_CONST(TOPMARGIN);
-    TIDY_ATTR_CONST(TYPE);
-    TIDY_ATTR_CONST(USEMAP);
-    TIDY_ATTR_CONST(VALIGN);
-    TIDY_ATTR_CONST(VALUE);
-    TIDY_ATTR_CONST(VALUETYPE);
-    TIDY_ATTR_CONST(VERSION);
-    TIDY_ATTR_CONST(VLINK);
-    TIDY_ATTR_CONST(VSPACE);
-    TIDY_ATTR_CONST(WIDTH);
-    TIDY_ATTR_CONST(WRAP);
-    TIDY_ATTR_CONST(XML_LANG);
-    TIDY_ATTR_CONST(XML_SPACE);
-    TIDY_ATTR_CONST(XMLNS);
+	TIDY_ATTR_CONST(DATAPAGESIZE);
+	TIDY_ATTR_CONST(DATASRC);
+	TIDY_ATTR_CONST(DATETIME);
+	TIDY_ATTR_CONST(DECLARE);
+	TIDY_ATTR_CONST(DEFER);
+	TIDY_ATTR_CONST(DIR);
+	TIDY_ATTR_CONST(DISABLED);
+	TIDY_ATTR_CONST(ENCODING);
+	TIDY_ATTR_CONST(ENCTYPE);
+	TIDY_ATTR_CONST(FACE);
+	TIDY_ATTR_CONST(FOR);
+	TIDY_ATTR_CONST(FRAME);
+	TIDY_ATTR_CONST(FRAMEBORDER);
+	TIDY_ATTR_CONST(FRAMESPACING);
+	TIDY_ATTR_CONST(GRIDX);
+	TIDY_ATTR_CONST(GRIDY);
+	TIDY_ATTR_CONST(HEADERS);
+	TIDY_ATTR_CONST(HEIGHT);
+	TIDY_ATTR_CONST(HREF);
+	TIDY_ATTR_CONST(HREFLANG);
+	TIDY_ATTR_CONST(HSPACE);
+	TIDY_ATTR_CONST(HTTP_EQUIV);
+	TIDY_ATTR_CONST(ID);
+	TIDY_ATTR_CONST(ISMAP);
+	TIDY_ATTR_CONST(LABEL);
+	TIDY_ATTR_CONST(LANG);
+	TIDY_ATTR_CONST(LANGUAGE);
+	TIDY_ATTR_CONST(LAST_MODIFIED);
+	TIDY_ATTR_CONST(LAST_VISIT);
+	TIDY_ATTR_CONST(LEFTMARGIN);
+	TIDY_ATTR_CONST(LINK);
+	TIDY_ATTR_CONST(LONGDESC);
+	TIDY_ATTR_CONST(LOWSRC);
+	TIDY_ATTR_CONST(MARGINHEIGHT);
+	TIDY_ATTR_CONST(MARGINWIDTH);
+	TIDY_ATTR_CONST(MAXLENGTH);
+	TIDY_ATTR_CONST(MEDIA);
+	TIDY_ATTR_CONST(METHOD);
+	TIDY_ATTR_CONST(MULTIPLE);
+	TIDY_ATTR_CONST(NAME);
+	TIDY_ATTR_CONST(NOHREF);
+	TIDY_ATTR_CONST(NORESIZE);
+	TIDY_ATTR_CONST(NOSHADE);
+	TIDY_ATTR_CONST(NOWRAP);
+	TIDY_ATTR_CONST(OBJECT);
+	TIDY_ATTR_CONST(OnAFTERUPDATE);
+	TIDY_ATTR_CONST(OnBEFOREUNLOAD);
+	TIDY_ATTR_CONST(OnBEFOREUPDATE);
+	TIDY_ATTR_CONST(OnBLUR);
+	TIDY_ATTR_CONST(OnCHANGE);
+	TIDY_ATTR_CONST(OnCLICK);
+	TIDY_ATTR_CONST(OnDATAAVAILABLE);
+	TIDY_ATTR_CONST(OnDATASETCHANGED);
+	TIDY_ATTR_CONST(OnDATASETCOMPLETE);
+	TIDY_ATTR_CONST(OnDBLCLICK);
+	TIDY_ATTR_CONST(OnERRORUPDATE);
+	TIDY_ATTR_CONST(OnFOCUS);
+	TIDY_ATTR_CONST(OnKEYDOWN);
+	TIDY_ATTR_CONST(OnKEYPRESS);
+	TIDY_ATTR_CONST(OnKEYUP);
+	TIDY_ATTR_CONST(OnLOAD);
+	TIDY_ATTR_CONST(OnMOUSEDOWN);
+	TIDY_ATTR_CONST(OnMOUSEMOVE);
+	TIDY_ATTR_CONST(OnMOUSEOUT);
+	TIDY_ATTR_CONST(OnMOUSEOVER);
+	TIDY_ATTR_CONST(OnMOUSEUP);
+	TIDY_ATTR_CONST(OnRESET);
+	TIDY_ATTR_CONST(OnROWENTER);
+	TIDY_ATTR_CONST(OnROWEXIT);
+	TIDY_ATTR_CONST(OnSELECT);
+	TIDY_ATTR_CONST(OnSUBMIT);
+	TIDY_ATTR_CONST(OnUNLOAD);
+	TIDY_ATTR_CONST(PROFILE);
+	TIDY_ATTR_CONST(PROMPT);
+	TIDY_ATTR_CONST(RBSPAN);
+	TIDY_ATTR_CONST(READONLY);
+	TIDY_ATTR_CONST(REL);
+	TIDY_ATTR_CONST(REV);
+	TIDY_ATTR_CONST(RIGHTMARGIN);
+	TIDY_ATTR_CONST(ROWS);
+	TIDY_ATTR_CONST(ROWSPAN);
+	TIDY_ATTR_CONST(RULES);
+	TIDY_ATTR_CONST(SCHEME);
+	TIDY_ATTR_CONST(SCOPE);
+	TIDY_ATTR_CONST(SCROLLING);
+	TIDY_ATTR_CONST(SELECTED);
+	TIDY_ATTR_CONST(SHAPE);
+	TIDY_ATTR_CONST(SHOWGRID);
+	TIDY_ATTR_CONST(SHOWGRIDX);
+	TIDY_ATTR_CONST(SHOWGRIDY);
+	TIDY_ATTR_CONST(SIZE);
+	TIDY_ATTR_CONST(SPAN);
+	TIDY_ATTR_CONST(SRC);
+	TIDY_ATTR_CONST(STANDBY);
+	TIDY_ATTR_CONST(START);
+	TIDY_ATTR_CONST(STYLE);
+	TIDY_ATTR_CONST(SUMMARY);
+	TIDY_ATTR_CONST(TABINDEX);
+	TIDY_ATTR_CONST(TARGET);
+	TIDY_ATTR_CONST(TEXT);
+	TIDY_ATTR_CONST(TITLE);
+	TIDY_ATTR_CONST(TOPMARGIN);
+	TIDY_ATTR_CONST(TYPE);
+	TIDY_ATTR_CONST(USEMAP);
+	TIDY_ATTR_CONST(VALIGN);
+	TIDY_ATTR_CONST(VALUE);
+	TIDY_ATTR_CONST(VALUETYPE);
+	TIDY_ATTR_CONST(VERSION);
+	TIDY_ATTR_CONST(VLINK);
+	TIDY_ATTR_CONST(VSPACE);
+	TIDY_ATTR_CONST(WIDTH);
+	TIDY_ATTR_CONST(WRAP);
+	TIDY_ATTR_CONST(XML_LANG);
+	TIDY_ATTR_CONST(XML_SPACE);
+	TIDY_ATTR_CONST(XMLNS);
 }
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */