diff --git a/ChangeLog b/ChangeLog
index 04d4bf10..0c2f2fe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Oct  5 15:49:14 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* HTMLparser.c Makefile.am legacy.c parser.c parserInternals.c
+	  include/libxml/xmlerror.h: more code cleanup, especially around
+	  error messages, the HTML parser has now been upgraded to the new
+	  handling.
+	* result/HTML/*: a few changes in the resulting error messages
+
 Sat Oct  4 23:06:41 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
 	* parser.c include/libxml/xmlerror.h: more error/warning
diff --git a/HTMLparser.c b/HTMLparser.c
index d9ef259a..3ee37a48 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -57,6 +57,81 @@ xmlChar * htmlDecodeEntities(htmlParserCtxtPtr ctxt, int len,
 			     xmlChar end, xmlChar  end2, xmlChar end3);
 static void htmlParseComment(htmlParserCtxtPtr ctxt);
 
+/************************************************************************
+ *									*
+ * 		Some factorized error routines				*
+ *									*
+ ************************************************************************/
+
+/**
+ * xmlErrMemory:
+ * @ctxt:  an HTML parser context
+ * @extra:  extra informations
+ *
+ * Handle a redefinition of attribute error
+ */
+static void
+htmlErrMemory(xmlParserCtxtPtr ctxt, const char *extra)
+{
+    if (ctxt != NULL) {
+        ctxt->errNo = XML_ERR_NO_MEMORY;
+        ctxt->instate = XML_PARSER_EOF;
+        ctxt->disableSAX = 1;
+    }
+    if (extra)
+        __xmlRaiseError(NULL, NULL, ctxt, NULL, XML_FROM_PARSER,
+                        XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, extra,
+                        NULL, NULL, 0, 0,
+                        "Memory allocation failed : %s\n", extra);
+    else
+        __xmlRaiseError(NULL, NULL, ctxt, NULL, XML_FROM_PARSER,
+                        XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, NULL,
+                        NULL, NULL, 0, 0, "Memory allocation failed\n");
+}
+
+/**
+ * htmlParseErr:
+ * @ctxt:  an HTML parser context
+ * @error:  the error number
+ * @msg:  the error message
+ * @str1:  string infor
+ * @str2:  string infor
+ *
+ * Handle a fatal parser error, i.e. violating Well-Formedness constraints
+ */
+static void
+htmlParseErr(xmlParserCtxtPtr ctxt, xmlParserErrors error,
+             const char *msg, const xmlChar *str1, const xmlChar *str2)
+{
+    ctxt->errNo = error;
+    __xmlRaiseError(NULL, NULL, ctxt, NULL, XML_FROM_HTML, error,
+                    XML_ERR_ERROR, NULL, 0,
+		    (const char *) str1, (const char *) str2,
+		    NULL, 0, 0,
+		    msg, str1, str2);
+    ctxt->wellFormed = 0;
+}
+
+/**
+ * htmlParseErrInt:
+ * @ctxt:  an HTML parser context
+ * @error:  the error number
+ * @msg:  the error message
+ * @val:  integer info
+ *
+ * Handle a fatal parser error, i.e. violating Well-Formedness constraints
+ */
+static void
+htmlParseErrInt(xmlParserCtxtPtr ctxt, xmlParserErrors error,
+             const char *msg, int val)
+{
+    ctxt->errNo = error;
+    __xmlRaiseError(NULL, NULL, ctxt, NULL, XML_FROM_HTML, error,
+                    XML_ERR_ERROR, NULL, 0, NULL, NULL,
+		    NULL, val, 0, msg, val);
+    ctxt->wellFormed = 0;
+}
+
 /************************************************************************
  *									*
  * 		Parser stacks related functions and macros		*
@@ -82,7 +157,7 @@ htmlnamePush(htmlParserCtxtPtr ctxt, const xmlChar * value)
                                     ctxt->nameMax *
                                     sizeof(ctxt->nameTab[0]));
         if (ctxt->nameTab == NULL) {
-            xmlGenericError(xmlGenericErrorContext, "realloc failed !\n");
+            htmlErrMemory(ctxt, NULL);
             return (0);
         }
     }
@@ -272,13 +347,8 @@ htmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
 		val |= cur[1] & 0x3f;
 	    }
 	    if (!IS_CHAR(val)) {
-		ctxt->errNo = XML_ERR_INVALID_ENCODING;
-		if ((ctxt->sax != NULL) &&
-		    (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData, 
-				     "Char 0x%X out of allowed range\n", val);
-		ctxt->wellFormed = 0;
-		if (ctxt->recovery == 0) ctxt->disableSAX = 1;
+	        htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
+				"Char 0x%X out of allowed range\n", val);
 	    }    
 	    return(val);
 	} else {
@@ -311,10 +381,10 @@ encoding_error:
      * to ISO-Latin-1 (if you don't like this policy, just declare the
      * encoding !)
      */
-    ctxt->errNo = XML_ERR_INVALID_ENCODING;
+    htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
+		 "Input is not proper UTF-8, indicate encoding !\n",
+		 NULL, NULL);
     if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) {
-	ctxt->sax->error(ctxt->userData, 
-			 "Input is not proper UTF-8, indicate encoding !\n");
 	ctxt->sax->error(ctxt->userData, "Bytes: 0x%02X 0x%02X 0x%02X 0x%02X\n",
 			ctxt->input->cur[0], ctxt->input->cur[1],
 			ctxt->input->cur[2], ctxt->input->cur[3]);
@@ -1039,17 +1109,6 @@ htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
     const htmlElemDesc *info;
     int i, priority;
 
-#ifdef DEBUG
-    const xmlChar *oldname;
-
-    xmlGenericError(xmlGenericErrorContext,
-                    "Close of %s stack: %d elements\n", newtag,
-                    ctxt->nameNr);
-    for (i = 0; i < ctxt->nameNr; i++)
-        xmlGenericError(xmlGenericErrorContext, "%d : %s\n", i,
-                        ctxt->nameTab[i]);
-#endif
-
     priority = htmlGetEndPriority(newtag);
 
     for (i = (ctxt->nameNr - 1); i >= 0; i--) {
@@ -1070,36 +1129,14 @@ htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
 
     while (!xmlStrEqual(newtag, ctxt->name)) {
         info = htmlTagLookup(ctxt->name);
-        if ((info == NULL) || (info->endTag == 1)) {
-#ifdef DEBUG
-            xmlGenericError(xmlGenericErrorContext,
-                            "htmlAutoCloseOnClose: %s closes %s\n", newtag,
-                            ctxt->name);
-#endif
-        } else if (info->endTag == 3) {
-#ifdef DEBUG
-            xmlGenericError(xmlGenericErrorContext,
-                            "End of tag %s: expecting %s\n", newtag,
-                            ctxt->name);
-
-#endif
-            if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-                ctxt->sax->error(ctxt->userData,
-                                 "Opening and ending tag mismatch: %s and %s\n",
-                                 newtag, ctxt->name);
-            ctxt->wellFormed = 0;
+        if ((info != NULL) && (info->endTag == 3)) {
+            htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
+	                 "Opening and ending tag mismatch: %s and %s\n",
+			 NULL, NULL);
         }
         if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
             ctxt->sax->endElement(ctxt->userData, ctxt->name);
-#ifdef DEBUG
-        oldname = htmlnamePop(ctxt);
-        if (oldname != NULL) {
-            xmlGenericError(xmlGenericErrorContext,
-                            "htmlAutoCloseOnClose: popped %s\n", oldname);
-        }
-#else
 	htmlnamePop(ctxt);
-#endif
     }
 }
 
@@ -1113,31 +1150,13 @@ static void
 htmlAutoCloseOnEnd(htmlParserCtxtPtr ctxt)
 {
     int i;
-#ifdef DEBUG
-    const xmlChar *oldname;
-
-    xmlGenericError(xmlGenericErrorContext,
-                    "Close of stack: %d elements\n", ctxt->nameNr);
-#endif
 
     if (ctxt->nameNr == 0)
         return;
     for (i = (ctxt->nameNr - 1); i >= 0; i--) {
-#ifdef DEBUG
-        xmlGenericError(xmlGenericErrorContext, "%d : %s\n", i,
-                        ctxt->nameTab[i]);
-#endif
         if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
             ctxt->sax->endElement(ctxt->userData, ctxt->name);
-#ifdef DEBUG
-        oldname = htmlnamePop(ctxt);
-        if (oldname != NULL) {
-            xmlGenericError(xmlGenericErrorContext,
-                            "htmlAutoCloseOnEnd: popped %s\n", oldname);
-        }
-#else
 	htmlnamePop(ctxt);
-#endif
     }
 }
 
@@ -1156,28 +1175,11 @@ htmlAutoCloseOnEnd(htmlParserCtxtPtr ctxt)
 static void
 htmlAutoClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
 {
-#ifdef DEBUG
-    const xmlChar *oldname;
-#endif
-
     while ((newtag != NULL) && (ctxt->name != NULL) &&
            (htmlCheckAutoClose(newtag, ctxt->name))) {
-#ifdef DEBUG
-        xmlGenericError(xmlGenericErrorContext,
-                        "htmlAutoClose: %s closes %s\n", newtag,
-                        ctxt->name);
-#endif
         if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
             ctxt->sax->endElement(ctxt->userData, ctxt->name);
-#ifdef DEBUG
-        oldname = htmlnamePop(ctxt);
-        if (oldname != NULL) {
-            xmlGenericError(xmlGenericErrorContext,
-                            "htmlAutoClose: popped %s\n", oldname);
-        }
-#else
 	htmlnamePop(ctxt);
-#endif
     }
     if (newtag == NULL) {
         htmlAutoCloseOnEnd(ctxt);
@@ -1187,23 +1189,10 @@ htmlAutoClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
            ((xmlStrEqual(ctxt->name, BAD_CAST "head")) ||
             (xmlStrEqual(ctxt->name, BAD_CAST "body")) ||
             (xmlStrEqual(ctxt->name, BAD_CAST "html")))) {
-#ifdef DEBUG
-        xmlGenericError(xmlGenericErrorContext,
-                        "htmlAutoClose: EOF closes %s\n", ctxt->name);
-#endif
         if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
             ctxt->sax->endElement(ctxt->userData, ctxt->name);
-#ifdef DEBUG
-        oldname = htmlnamePop(ctxt);
-        if (oldname != NULL) {
-            xmlGenericError(xmlGenericErrorContext,
-                            "htmlAutoClose: popped %s\n", oldname);
-        }
-#else
 	htmlnamePop(ctxt);
-#endif
     }
-
 }
 
 /**
@@ -1274,9 +1263,6 @@ htmlCheckImplied(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
     if (xmlStrEqual(newtag, BAD_CAST"html"))
 	return;
     if (ctxt->nameNr <= 0) {
-#ifdef DEBUG
-	xmlGenericError(xmlGenericErrorContext,"Implied element html: pushed html\n");
-#endif    
 	htmlnamePush(ctxt, BAD_CAST"html");
 	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL))
 	    ctxt->sax->startElement(ctxt->userData, BAD_CAST"html", NULL);
@@ -1294,9 +1280,6 @@ htmlCheckImplied(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
 	     * dropped OBJECT ... i you put it first BODY will be
 	     * assumed !
 	     */
-#ifdef DEBUG
-	    xmlGenericError(xmlGenericErrorContext,"Implied element head: pushed head\n");
-#endif    
 	    htmlnamePush(ctxt, BAD_CAST"head");
 	    if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL))
 		ctxt->sax->startElement(ctxt->userData, BAD_CAST"head", NULL);
@@ -1313,9 +1296,6 @@ htmlCheckImplied(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
 	    }
 	}
 	    
-#ifdef DEBUG
-	xmlGenericError(xmlGenericErrorContext,"Implied element body: pushed body\n");
-#endif    
 	htmlnamePush(ctxt, BAD_CAST"body");
 	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL))
 	    ctxt->sax->startElement(ctxt->userData, BAD_CAST"body", NULL);
@@ -1353,9 +1333,6 @@ htmlCheckParagraph(htmlParserCtxtPtr ctxt) {
 	return(0);
     for (i = 0; htmlNoContentElements[i] != NULL; i++) {
 	if (xmlStrEqual(tag, BAD_CAST htmlNoContentElements[i])) {
-#ifdef DEBUG
-	    xmlGenericError(xmlGenericErrorContext,"Implied element paragraph\n");
-#endif    
 	    htmlAutoClose(ctxt, BAD_CAST"p");
 	    htmlCheckImplied(ctxt, BAD_CAST"p");
 	    htmlnamePush(ctxt, BAD_CAST"p");
@@ -1698,7 +1675,7 @@ static const htmlEntityDesc  html40EntitiesTable[] = {
     buffer##_size *= 2;							\
     buffer = (xmlChar *) xmlRealloc(buffer, buffer##_size * sizeof(xmlChar)); \
     if (buffer == NULL) {						\
-	xmlGenericError(xmlGenericErrorContext, "realloc failed\n");	\
+	htmlErrMemory(ctxt, "growing buffer\n");			\
 	return(NULL);							\
     }									\
 }
@@ -1720,9 +1697,6 @@ htmlEntityLookup(const xmlChar *name) {
     for (i = 0;i < (sizeof(html40EntitiesTable)/
                     sizeof(html40EntitiesTable[0]));i++) {
         if (xmlStrEqual(name, BAD_CAST html40EntitiesTable[i].name)) {
-#ifdef DEBUG
-            xmlGenericError(xmlGenericErrorContext,"Found entity %s\n", name);
-#endif
             return((htmlEntityDescPtr) &html40EntitiesTable[i]);
 	}
     }
@@ -1742,28 +1716,14 @@ htmlEntityLookup(const xmlChar *name) {
 const htmlEntityDesc *
 htmlEntityValueLookup(unsigned int value) {
     unsigned int i;
-#ifdef DEBUG
-    unsigned int lv = 0;
-#endif
 
     for (i = 0;i < (sizeof(html40EntitiesTable)/
                     sizeof(html40EntitiesTable[0]));i++) {
         if (html40EntitiesTable[i].value >= value) {
 	    if (html40EntitiesTable[i].value > value)
 		break;
-#ifdef DEBUG
-	    xmlGenericError(xmlGenericErrorContext,"Found entity %s\n", html40EntitiesTable[i].name);
-#endif
             return((htmlEntityDescPtr) &html40EntitiesTable[i]);
 	}
-#ifdef DEBUG
-	if (lv > html40EntitiesTable[i].value) {
-	    xmlGenericError(xmlGenericErrorContext,
-		    "html40EntitiesTable[] is not sorted (%d > %d)!\n",
-		    lv, html40EntitiesTable[i].value);
-	}
-	lv = html40EntitiesTable[i].value;
-#endif
     }
     return(NULL);
 }
@@ -1963,33 +1923,6 @@ htmlEncodeEntities(unsigned char* out, int *outlen,
     return(0);
 }
 
-/**
- * htmlDecodeEntities:
- * @ctxt:  the parser context
- * @len:  the len to decode (in bytes !), -1 for no size limit
- * @end:  an end marker xmlChar, 0 if none
- * @end2:  an end marker xmlChar, 0 if none
- * @end3:  an end marker xmlChar, 0 if none
- *
- * Substitute the HTML entities by their value
- *
- * DEPRECATED !!!!
- *
- * Returns A newly allocated string with the substitution done. The caller
- *      must deallocate it !
- */
-xmlChar *
-htmlDecodeEntities(htmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED, int len ATTRIBUTE_UNUSED,
-	  xmlChar end ATTRIBUTE_UNUSED, xmlChar  end2 ATTRIBUTE_UNUSED, xmlChar end3 ATTRIBUTE_UNUSED) {
-    static int deprecated = 0;
-    if (!deprecated) {
-	xmlGenericError(xmlGenericErrorContext,
-		"htmlDecodeEntities() deprecated function reached\n");
-	deprecated = 1;
-    }
-    return(NULL);
-}
-
 /************************************************************************
  *									*
  *		Commodity functions to handle streams			*
@@ -2009,10 +1942,7 @@ htmlNewInputStream(htmlParserCtxtPtr ctxt) {
 
     input = (xmlParserInputPtr) xmlMalloc(sizeof(htmlParserInput));
     if (input == NULL) {
-        ctxt->errNo = XML_ERR_NO_MEMORY;
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, 
-	                     "malloc: couldn't allocate a new input stream\n");
+        htmlErrMemory(ctxt, "couldn't allocate a new input stream\n");
 	return(NULL);
     }
     memset(input, 0, sizeof(htmlParserInput));
@@ -2126,8 +2056,7 @@ htmlNewDocNoDtD(const xmlChar *URI, const xmlChar *ExternalID) {
      */
     cur = (xmlDocPtr) xmlMalloc(sizeof(xmlDoc));
     if (cur == NULL) {
-        xmlGenericError(xmlGenericErrorContext,
-		"htmlNewDocNoDtD : malloc failed\n");
+	htmlErrMemory(NULL, "HTML document creation failed\n");
 	return(NULL);
     }
     memset(cur, 0, sizeof(xmlDoc));
@@ -2322,8 +2251,7 @@ htmlParseHTMLAttribute(htmlParserCtxtPtr ctxt, const xmlChar stop) {
     buffer_size = HTML_PARSER_BUFFER_SIZE;
     buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar));
     if (buffer == NULL) {
-	xmlGenericError(xmlGenericErrorContext,
-		        "htmlParseHTMLAttribute: malloc failed\n");
+	htmlErrMemory(ctxt, "buffer allocation failed\n");
 	return(NULL);
     }
     out = buffer;
@@ -2458,9 +2386,8 @@ htmlParseEntityRef(htmlParserCtxtPtr ctxt, const xmlChar **str) {
         NEXT;
         name = htmlParseName(ctxt);
 	if (name == NULL) {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, "htmlParseEntityRef: no name\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+	                 "htmlParseEntityRef: no name\n", NULL, NULL);
 	} else {
 	    GROW;
 	    if (CUR == ';') {
@@ -2473,9 +2400,9 @@ htmlParseEntityRef(htmlParserCtxtPtr ctxt, const xmlChar **str) {
 		if (ent != NULL) /* OK that's ugly !!! */
 		    NEXT;
 	    } else {
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData,
-		                     "htmlParseEntityRef: expecting ';'\n");
+		htmlParseErr(ctxt, XML_ERR_ENTITYREF_SEMICOL_MISSING,
+		             "htmlParseEntityRef: expecting ';'\n",
+			     NULL, NULL);
 		*str = name;
 	    }
 	}
@@ -2503,18 +2430,16 @@ htmlParseAttValue(htmlParserCtxtPtr ctxt) {
         NEXT;
 	ret = htmlParseHTMLAttribute(ctxt, '"');
         if (CUR != '"') {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		ctxt->sax->error(ctxt->userData, "AttValue: ' expected\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
+	                 "AttValue: \" expected\n", NULL, NULL);
 	} else
 	    NEXT;
     } else if (CUR == '\'') {
         NEXT;
 	ret = htmlParseHTMLAttribute(ctxt, '\'');
         if (CUR != '\'') {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		ctxt->sax->error(ctxt->userData, "AttValue: ' expected\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
+	                 "AttValue: ' expected\n", NULL, NULL);
 	} else
 	    NEXT;
     } else {
@@ -2523,9 +2448,8 @@ htmlParseAttValue(htmlParserCtxtPtr ctxt) {
 	 */
 	ret = htmlParseHTMLAttribute(ctxt, 0);
 	if (ret == NULL) {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		ctxt->sax->error(ctxt->userData, "AttValue: no value found\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_WITHOUT_VALUE,
+	                 "AttValue: no value found\n", NULL, NULL);
 	}
     }
     return(ret);
@@ -2553,9 +2477,8 @@ htmlParseSystemLiteral(htmlParserCtxtPtr ctxt) {
 	while ((IS_CHAR((unsigned int) CUR)) && (CUR != '"'))
 	    NEXT;
 	if (!IS_CHAR((unsigned int) CUR)) {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, "Unfinished SystemLiteral\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED,
+			 "Unfinished SystemLiteral\n", NULL, NULL);
 	} else {
 	    ret = xmlStrndup(q, CUR_PTR - q);
 	    NEXT;
@@ -2566,18 +2489,15 @@ htmlParseSystemLiteral(htmlParserCtxtPtr ctxt) {
 	while ((IS_CHAR((unsigned int) CUR)) && (CUR != '\''))
 	    NEXT;
 	if (!IS_CHAR((unsigned int) CUR)) {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, "Unfinished SystemLiteral\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED,
+			 "Unfinished SystemLiteral\n", NULL, NULL);
 	} else {
 	    ret = xmlStrndup(q, CUR_PTR - q);
 	    NEXT;
         }
     } else {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData,
-	                     "SystemLiteral \" or ' expected\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_STARTED,
+	             " or ' expected\n", NULL, NULL);
     }
     
     return(ret);
@@ -2606,9 +2526,8 @@ htmlParsePubidLiteral(htmlParserCtxtPtr ctxt) {
 	q = CUR_PTR;
 	while (IS_PUBIDCHAR(CUR)) NEXT;
 	if (CUR != '"') {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, "Unfinished PubidLiteral\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED,
+	                 "Unfinished PubidLiteral\n", NULL, NULL);
 	} else {
 	    ret = xmlStrndup(q, CUR_PTR - q);
 	    NEXT;
@@ -2619,17 +2538,15 @@ htmlParsePubidLiteral(htmlParserCtxtPtr ctxt) {
 	while ((IS_PUBIDCHAR(CUR)) && (CUR != '\''))
 	    NEXT;
 	if (CUR != '\'') {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, "Unfinished PubidLiteral\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED,
+	                 "Unfinished PubidLiteral\n", NULL, NULL);
 	} else {
 	    ret = xmlStrndup(q, CUR_PTR - q);
 	    NEXT;
 	}
     } else {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, "SystemLiteral \" or ' expected\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_STARTED,
+	             "PubidLiteral \" or ' expected\n", NULL, NULL);
     }
     
     return(ret);
@@ -2708,10 +2625,8 @@ htmlParseScript(htmlParserCtxtPtr ctxt) {
 	cur = CUR;
     }
     if (!(IS_CHAR((unsigned int) cur))) {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData,
-		"Invalid char in CDATA 0x%X\n", cur);
-	ctxt->wellFormed = 0;
+	htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
+	                "Invalid char in CDATA 0x%X\n", cur);
 	NEXT;
     }
 
@@ -2824,36 +2739,29 @@ htmlParseExternalID(htmlParserCtxtPtr ctxt, xmlChar **publicID) {
 	 (UPP(4) == 'E') && (UPP(5) == 'M')) {
         SKIP(6);
 	if (!IS_BLANK(CUR)) {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		ctxt->sax->error(ctxt->userData,
-		    "Space required after 'SYSTEM'\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_SPACE_REQUIRED,
+	                 "Space required after 'SYSTEM'\n", NULL, NULL);
 	}
         SKIP_BLANKS;
 	URI = htmlParseSystemLiteral(ctxt);
 	if (URI == NULL) {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData,
-	          "htmlParseExternalID: SYSTEM, no URI\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_URI_REQUIRED,
+	                 "htmlParseExternalID: SYSTEM, no URI\n", NULL, NULL);
         }
     } else if ((UPPER == 'P') && (UPP(1) == 'U') &&
 	       (UPP(2) == 'B') && (UPP(3) == 'L') &&
 	       (UPP(4) == 'I') && (UPP(5) == 'C')) {
         SKIP(6);
 	if (!IS_BLANK(CUR)) {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		ctxt->sax->error(ctxt->userData,
-		    "Space required after 'PUBLIC'\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_SPACE_REQUIRED,
+	                 "Space required after 'PUBLIC'\n", NULL, NULL);
 	}
         SKIP_BLANKS;
 	*publicID = htmlParsePubidLiteral(ctxt);
 	if (*publicID == NULL) {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, 
-	          "htmlParseExternalID: PUBLIC, no Public Identifier\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_PUBID_REQUIRED,
+	                 "htmlParseExternalID: PUBLIC, no Public Identifier\n",
+			 NULL, NULL);
 	}
         SKIP_BLANKS;
         if ((CUR == '"') || (CUR == '\'')) {
@@ -2893,8 +2801,7 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
     SKIP(4);
     buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar));
     if (buf == NULL) {
-	xmlGenericError(xmlGenericErrorContext,
-		"malloc of %d byte failed\n", size);
+        htmlErrMemory(ctxt, "buffer allocation failed\n");
 	ctxt->instate = state;
 	return;
     }
@@ -2911,8 +2818,7 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
 	    size *= 2;
 	    buf = (xmlChar *) xmlRealloc(buf, size * sizeof(xmlChar));
 	    if (buf == NULL) {
-		xmlGenericError(xmlGenericErrorContext,
-			"realloc of %d byte failed\n", size);
+	        htmlErrMemory(ctxt, "growing buffer failed\n");
 		ctxt->instate = state;
 		return;
 	    }
@@ -2932,11 +2838,8 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
     }
     buf[len] = 0;
     if (!IS_CHAR(cur)) {
-	ctxt->errNo = XML_ERR_COMMENT_NOT_FINISHED;
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData,
-	                     "Comment not terminated \n<!--%.50s\n", buf);
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_COMMENT_NOT_FINISHED,
+	             "Comment not terminated \n<!--%.50s\n", buf, NULL);
 	xmlFree(buf);
     } else {
         NEXT;
@@ -2974,10 +2877,9 @@ htmlParseCharRef(htmlParserCtxtPtr ctxt) {
 	    else if ((CUR >= 'A') && (CUR <= 'F'))
 	        val = val * 16 + (CUR - 'A') + 10;
 	    else {
-	        if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData, 
-		         "htmlParseCharRef: invalid hexadecimal value\n");
-		ctxt->wellFormed = 0;
+	        htmlParseErr(ctxt, XML_ERR_INVALID_HEX_CHARREF,
+		             "htmlParseCharRef: invalid hexadecimal value\n",
+			     NULL, NULL);
 		return(0);
 	    }
 	    NEXT;
@@ -2990,10 +2892,9 @@ htmlParseCharRef(htmlParserCtxtPtr ctxt) {
 	    if ((CUR >= '0') && (CUR <= '9')) 
 	        val = val * 10 + (CUR - '0');
 	    else {
-	        if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData, 
-		         "htmlParseCharRef: invalid decimal value\n");
-		ctxt->wellFormed = 0;
+	        htmlParseErr(ctxt, XML_ERR_INVALID_DEC_CHARREF,
+		             "htmlParseCharRef: invalid decimal value\n",
+			     NULL, NULL);
 		return(0);
 	    }
 	    NEXT;
@@ -3001,9 +2902,8 @@ htmlParseCharRef(htmlParserCtxtPtr ctxt) {
 	if (CUR == ';')
 	    NEXT;
     } else {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, "htmlParseCharRef: invalid value\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_INVALID_CHARREF,
+	             "htmlParseCharRef: invalid value\n", NULL, NULL);
     }
     /*
      * Check the value IS_CHAR ...
@@ -3011,10 +2911,9 @@ htmlParseCharRef(htmlParserCtxtPtr ctxt) {
     if (IS_CHAR(val)) {
         return(val);
     } else {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, "htmlParseCharRef: invalid xmlChar value %d\n",
-	                     val);
-	ctxt->wellFormed = 0;
+	htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
+			"htmlParseCharRef: invalid xmlChar value %d\n",
+			val);
     }
     return(0);
 }
@@ -3048,9 +2947,9 @@ htmlParseDocTypeDecl(htmlParserCtxtPtr ctxt) {
      */
     name = htmlParseName(ctxt);
     if (name == NULL) {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, "htmlParseDocTypeDecl : no DOCTYPE name !\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+	             "htmlParseDocTypeDecl : no DOCTYPE name !\n",
+		     NULL, NULL);
     }
     /*
      * Check that upper(name) == "HTML" !!!!!!!!!!!!!
@@ -3068,9 +2967,8 @@ htmlParseDocTypeDecl(htmlParserCtxtPtr ctxt) {
      * We should be at the end of the DOCTYPE declaration.
      */
     if (CUR != '>') {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, "DOCTYPE improperly terminated\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_DOCTYPE_NOT_FINISHED,
+	             "DOCTYPE improperly terminated\n", NULL, NULL);
         /* We shouldn't try to resynchronize ... */
     }
     NEXT;
@@ -3118,9 +3016,8 @@ htmlParseAttribute(htmlParserCtxtPtr ctxt, xmlChar **value) {
     *value = NULL;
     name = htmlParseHTMLName(ctxt);
     if (name == NULL) {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, "error parsing attribute name\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+	             "error parsing attribute name\n", NULL, NULL);
         return(NULL);
     }
 
@@ -3219,10 +3116,9 @@ htmlCheckEncoding(htmlParserCtxtPtr ctxt, const xmlChar *attvalue) {
 		                       ctxt->input->buf->buffer,
 				       ctxt->input->buf->raw);
 	    if (nbchars < 0) {
-		ctxt->errNo = XML_ERR_INVALID_ENCODING;
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData, 
-		     "htmlCheckEncoding: encoder error\n");
+		htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
+		             "htmlCheckEncoding: encoder error\n",
+			     NULL, NULL);
 	    }
 	    ctxt->input->base =
 	    ctxt->input->cur = ctxt->input->buf->buffer->content;
@@ -3287,9 +3183,9 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
     const xmlChar *name;
     const xmlChar *attname;
     xmlChar *attvalue;
-    const xmlChar **atts = NULL;
+    const xmlChar **atts = ctxt->atts;
     int nbatts = 0;
-    int maxatts = 0;
+    int maxatts = ctxt->maxatts;
     int meta = 0;
     int i;
 
@@ -3299,10 +3195,9 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
     GROW;
     name = htmlParseHTMLName(ctxt);
     if (name == NULL) {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, 
-	     "htmlParseStartTag: invalid element name\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+	             "htmlParseStartTag: invalid element name\n",
+		     NULL, NULL);
 	/* Dump the bogus tag like browsers do */
 	while ((IS_CHAR((unsigned int) CUR)) && (CUR != '>'))
 	    NEXT;
@@ -3326,28 +3221,25 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
      * or any attempt to recurse body
      */
     if ((ctxt->nameNr > 0) && (xmlStrEqual(name, BAD_CAST"html"))) {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, 
-	     "htmlParseStartTag: misplaced <html> tag\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+	             "htmlParseStartTag: misplaced <html> tag\n",
+		     name, NULL);
 	return;
     }
     if ((ctxt->nameNr != 1) && 
 	(xmlStrEqual(name, BAD_CAST"head"))) {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, 
-	     "htmlParseStartTag: misplaced <head> tag\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+	             "htmlParseStartTag: misplaced <head> tag\n",
+		     name, NULL);
 	return;
     }
     if (xmlStrEqual(name, BAD_CAST"body")) {
 	int indx;
 	for (indx = 0;indx < ctxt->nameNr;indx++) {
 	    if (xmlStrEqual(ctxt->nameTab[indx], BAD_CAST"body")) {
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData, 
-		     "htmlParseStartTag: misplaced <body> tag\n");
-		ctxt->wellFormed = 0;
+		htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+		             "htmlParseStartTag: misplaced <body> tag\n",
+			     name, NULL);
 		return;
 	    }
 	}
@@ -3373,11 +3265,8 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
 	     */
 	    for (i = 0; i < nbatts;i += 2) {
 	        if (xmlStrEqual(atts[i], attname)) {
-		    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			ctxt->sax->error(ctxt->userData,
-			                 "Attribute %s redefined\n",
-			                 attname);
-		    ctxt->wellFormed = 0;
+		    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_REDEFINED,
+		                 "Attribute %s redefined\n", attname, NULL);
 		    if (attvalue != NULL)
 			xmlFree(attvalue);
 		    goto failed;
@@ -3388,24 +3277,32 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
 	     * Add the pair to atts
 	     */
 	    if (atts == NULL) {
-	        maxatts = 10;
-	        atts = (const xmlChar **) xmlMalloc(maxatts * sizeof(xmlChar *));
+	        maxatts = 22; /* allow for 10 attrs by default */
+	        atts = (const xmlChar **)
+		       xmlMalloc(maxatts * sizeof(xmlChar *));
 		if (atts == NULL) {
-		    xmlGenericError(xmlGenericErrorContext,
-			    "malloc of %ld byte failed\n",
-			    maxatts * (long)sizeof(xmlChar *));
-		    return;
+		    htmlErrMemory(ctxt, NULL);
+		    if (attvalue != NULL)
+			xmlFree(attvalue);
+		    goto failed;
 		}
+		ctxt->atts = atts;
+		ctxt->maxatts = maxatts;
 	    } else if (nbatts + 4 > maxatts) {
+	        const xmlChar **n;
+
 	        maxatts *= 2;
-	        atts = (const xmlChar **) xmlRealloc((void *) atts,
-			                             maxatts * sizeof(xmlChar *));
-		if (atts == NULL) {
-		    xmlGenericError(xmlGenericErrorContext,
-			    "realloc of %ld byte failed\n",
-			    maxatts * (long)sizeof(xmlChar *));
-		    return;
+	        n = (const xmlChar **) xmlRealloc((void *) atts,
+					     maxatts * sizeof(const xmlChar *));
+		if (n == NULL) {
+		    htmlErrMemory(ctxt, NULL);
+		    if (attvalue != NULL)
+			xmlFree(attvalue);
+		    goto failed;
 		}
+		atts = n;
+		ctxt->atts = atts;
+		ctxt->maxatts = maxatts;
 	    }
 	    atts[nbatts++] = attname;
 	    atts[nbatts++] = attvalue;
@@ -3413,6 +3310,8 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
 	    atts[nbatts + 1] = NULL;
 	}
 	else {
+	    if (attvalue != NULL)
+	        xmlFree(attvalue);
 	    /* Dump the bogus attribute string up to the next blank or
 	     * the end of the tag. */
 	    while ((IS_CHAR((unsigned int) CUR)) &&
@@ -3424,10 +3323,9 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
 failed:
 	SKIP_BLANKS;
         if (cons == ctxt->nbChars) {
-	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, 
-	         "htmlParseStartTag: problem parsing attributes\n");
-	    ctxt->wellFormed = 0;
+	    htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+	                 "htmlParseStartTag: problem parsing attributes\n",
+			 NULL, NULL);
 	    break;
 	}
     }
@@ -3442,18 +3340,18 @@ failed:
      * SAX: Start of Element !
      */
     htmlnamePush(ctxt, name);
-#ifdef DEBUG
-    xmlGenericError(xmlGenericErrorContext,"Start of element %s: pushed %s\n", name, ctxt->name);
-#endif    
-    if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL))
-        ctxt->sax->startElement(ctxt->userData, name, atts);
+    if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL)) {
+	if (nbatts != 0)
+            ctxt->sax->startElement(ctxt->userData, name, atts);
+	else
+            ctxt->sax->startElement(ctxt->userData, name, NULL);
+    }
 
     if (atts != NULL) {
         for (i = 1;i < nbatts;i += 2) {
 	    if (atts[i] != NULL)
 		xmlFree((xmlChar *) atts[i]);
 	}
-	xmlFree((void *) atts);
     }
 }
 
@@ -3480,10 +3378,8 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
     int i, ret;
 
     if ((CUR != '<') || (NXT(1) != '/')) {
-        if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-            ctxt->sax->error(ctxt->userData,
-                             "htmlParseEndTag: '</' not found\n");
-        ctxt->wellFormed = 0;
+        htmlParseErr(ctxt, XML_ERR_LTSLASH_REQUIRED,
+	             "htmlParseEndTag: '</' not found\n", NULL, NULL);
         return (0);
     }
     SKIP(2);
@@ -3497,9 +3393,8 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
      */
     SKIP_BLANKS;
     if ((!IS_CHAR((unsigned int) CUR)) || (CUR != '>')) {
-        if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-            ctxt->sax->error(ctxt->userData, "End tag : expected '>'\n");
-        ctxt->wellFormed = 0;
+        htmlParseErr(ctxt, XML_ERR_GT_REQUIRED,
+	             "End tag : expected '>'\n", NULL, NULL);
     } else
         NEXT;
 
@@ -3512,10 +3407,8 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
             break;
     }
     if (i < 0) {
-        if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-            ctxt->sax->error(ctxt->userData,
-                             "Unexpected end tag : %s\n", name);
-        ctxt->wellFormed = 0;
+        htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
+	             "Unexpected end tag : %s\n", name, NULL);
         return (0);
     }
 
@@ -3532,16 +3425,10 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
      * of the stack.
      */
     if (!xmlStrEqual(name, ctxt->name)) {
-#ifdef DEBUG
-        xmlGenericError(xmlGenericErrorContext,
-                        "End of tag %s: expecting %s\n", name, ctxt->name);
-#endif
         if ((ctxt->name != NULL) && (!xmlStrEqual(ctxt->name, name))) {
-            if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-                ctxt->sax->error(ctxt->userData,
-                                 "Opening and ending tag mismatch: %s and %s\n",
-                                 name, ctxt->name);
-            ctxt->wellFormed = 0;
+            htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
+	                 "Opening and ending tag mismatch: %s and %s\n",
+			 name, ctxt->name);
         }
     }
 
@@ -3552,17 +3439,7 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
     if ((oldname != NULL) && (xmlStrEqual(oldname, name))) {
         if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
             ctxt->sax->endElement(ctxt->userData, name);
-        oldname = htmlnamePop(ctxt);
-#ifdef DEBUG
-        if (oldname != NULL) {
-            xmlGenericError(xmlGenericErrorContext,
-                            "End of tag %s: popping out %s\n", name,
-                            oldname);
-        } else {
-            xmlGenericError(xmlGenericErrorContext,
-                            "End of tag %s: stack empty !!!\n", name);
-        }
-#endif
+        htmlnamePop(ctxt);
         ret = 1;
     } else {
         ret = 0;
@@ -3708,10 +3585,9 @@ htmlParseContent(htmlParserCtxtPtr ctxt) {
 		(UPP(4) == 'C') && (UPP(5) == 'T') &&
 		(UPP(6) == 'Y') && (UPP(7) == 'P') &&
 		(UPP(8) == 'E')) {
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData,
-				     "Misplaced DOCTYPE declaration\n");
-		ctxt->wellFormed = 0;
+		htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+		             "Misplaced DOCTYPE declaration\n",
+			     BAD_CAST "DOCTYPE" , NULL);
 		htmlParseDocTypeDecl(ctxt);
 	    }
 
@@ -3755,10 +3631,9 @@ htmlParseContent(htmlParserCtxtPtr ctxt) {
 
 	    if (cons == ctxt->nbChars) {
 		if (ctxt->node != NULL) {
-		    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			ctxt->sax->error(ctxt->userData,
-					 "detected an error in element content\n");
-		    ctxt->wellFormed = 0;
+		    htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		                 "detected an error in element content\n",
+				 NULL, NULL);
 		}
 		break;
 	    }
@@ -3799,17 +3674,6 @@ htmlParseElement(htmlParserCtxtPtr ctxt) {
     oldname = ctxt->name;
     htmlParseStartTag(ctxt);
     name = ctxt->name;
-#ifdef DEBUG
-    if (oldname == NULL)
-	xmlGenericError(xmlGenericErrorContext,
-		"Start of element %s\n", name);
-    else if (name == NULL)	
-	xmlGenericError(xmlGenericErrorContext,
-		"Start of element failed, was %s\n", oldname);
-    else	
-	xmlGenericError(xmlGenericErrorContext,
-		"Start of element %s, was %s\n", name, oldname);
-#endif
     if (((depth == ctxt->nameNr) && (xmlStrEqual(oldname, ctxt->name))) ||
         (name == NULL)) {
 	if (CUR == '>')
@@ -3822,10 +3686,8 @@ htmlParseElement(htmlParserCtxtPtr ctxt) {
      */
     info = htmlTagLookup(name);
     if (info == NULL) {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, "Tag %s invalid\n",
-			     name);
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_HTML_UNKNOWN_TAG,
+	             "Tag %s invalid\n", name, NULL);
     }
 
     /*
@@ -3835,31 +3697,22 @@ htmlParseElement(htmlParserCtxtPtr ctxt) {
         SKIP(2);
 	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
 	    ctxt->sax->endElement(ctxt->userData, name);
-	oldname = htmlnamePop(ctxt);
-#ifdef DEBUG
-        xmlGenericError(xmlGenericErrorContext,"End of tag the XML way: popping out %s\n", oldname);
-#endif
+	htmlnamePop(ctxt);
 	return;
     }
 
     if (CUR == '>') {
         NEXT;
     } else {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData,
-		             "Couldn't find end of Start Tag %s\n",
-	                     name);
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_GT_REQUIRED,
+	             "Couldn't find end of Start Tag %s\n", name, NULL);
 
 	/*
 	 * end of parsing of this node.
 	 */
 	if (xmlStrEqual(name, ctxt->name)) { 
 	    nodePop(ctxt);
-	    oldname = htmlnamePop(ctxt);
-#ifdef DEBUG
-	    xmlGenericError(xmlGenericErrorContext,"End of start tag problem: popping out %s\n", oldname);
-#endif
+	    htmlnamePop(ctxt);
 	}    
 
 	/*
@@ -3881,10 +3734,7 @@ htmlParseElement(htmlParserCtxtPtr ctxt) {
     if ((info != NULL) && (info->empty)) {
 	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
 	    ctxt->sax->endElement(ctxt->userData, name);
-	oldname = htmlnamePop(ctxt);
-#ifdef DEBUG
-	xmlGenericError(xmlGenericErrorContext,"End of empty tag %s : popping out %s\n", name, oldname);
-#endif
+	htmlnamePop(ctxt);
 	return;
     }
 
@@ -3950,9 +3800,8 @@ htmlParseDocument(htmlParserCtxtPtr ctxt) {
      */
     SKIP_BLANKS;
     if (CUR == 0) {
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, "Document is empty\n");
-	ctxt->wellFormed = 0;
+	htmlParseErr(ctxt, XML_ERR_DOCUMENT_EMPTY, 
+	             "Document is empty\n", NULL, NULL);
     }
 
     if ((ctxt->sax) && (ctxt->sax->startDocument) && (!ctxt->disableSAX))
@@ -4033,26 +3882,27 @@ htmlParseDocument(htmlParserCtxtPtr ctxt) {
  * @ctxt:  an HTML parser context
  *
  * Initialize a parser context
+ *
+ * Returns 0 in case of success and -1 in case of error
  */
 
-static void
+static int
 htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
 {
     htmlSAXHandler *sax;
 
-    if (ctxt == NULL) return;
+    if (ctxt == NULL) return(-1);
     memset(ctxt, 0, sizeof(htmlParserCtxt));
 
     ctxt->dict = xmlDictCreate();
     if (ctxt->dict == NULL) {
-        xmlGenericError(xmlGenericErrorContext,
-		"xmlInitParserCtxt: out of memory\n");
-	return;
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
+	return(-1);
     }
     sax = (htmlSAXHandler *) xmlMalloc(sizeof(htmlSAXHandler));
     if (sax == NULL) {
-        xmlGenericError(xmlGenericErrorContext,
-		"htmlInitParserCtxt: out of memory\n");
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
+	return(-1);
     }
     else
         memset(sax, 0, sizeof(htmlSAXHandler));
@@ -4061,12 +3911,11 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
     ctxt->inputTab = (htmlParserInputPtr *) 
                       xmlMalloc(5 * sizeof(htmlParserInputPtr));
     if (ctxt->inputTab == NULL) {
-        xmlGenericError(xmlGenericErrorContext,
-		"htmlInitParserCtxt: out of memory\n");
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
 	ctxt->inputNr = 0;
 	ctxt->inputMax = 0;
 	ctxt->input = NULL;
-	return;
+	return(-1);
     }
     ctxt->inputNr = 0;
     ctxt->inputMax = 5;
@@ -4079,15 +3928,14 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
     /* Allocate the Node stack */
     ctxt->nodeTab = (htmlNodePtr *) xmlMalloc(10 * sizeof(htmlNodePtr));
     if (ctxt->nodeTab == NULL) {
-        xmlGenericError(xmlGenericErrorContext,
-		"htmlInitParserCtxt: out of memory\n");
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
 	ctxt->nodeNr = 0;
 	ctxt->nodeMax = 0;
 	ctxt->node = NULL;
 	ctxt->inputNr = 0;
 	ctxt->inputMax = 0;
 	ctxt->input = NULL;
-	return;
+	return(-1);
     }
     ctxt->nodeNr = 0;
     ctxt->nodeMax = 10;
@@ -4096,8 +3944,7 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
     /* Allocate the Name stack */
     ctxt->nameTab = (const xmlChar **) xmlMalloc(10 * sizeof(xmlChar *));
     if (ctxt->nameTab == NULL) {
-        xmlGenericError(xmlGenericErrorContext,
-		"htmlInitParserCtxt: out of memory\n");
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
 	ctxt->nameNr = 0;
 	ctxt->nameMax = 10;
 	ctxt->name = NULL;
@@ -4107,7 +3954,7 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
 	ctxt->inputNr = 0;
 	ctxt->inputMax = 0;
 	ctxt->input = NULL;
-	return;
+	return(-1);
     }
     ctxt->nameNr = 0;
     ctxt->nameMax = 10;
@@ -4130,6 +3977,7 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
     ctxt->checkIndex = 0;
     ctxt->catalogs = NULL;
     xmlInitNodeInfoSeq(&ctxt->node_seq);
+    return(0);
 }
 
 /**
@@ -4161,12 +4009,14 @@ htmlNewParserCtxt(void)
 
     ctxt = (xmlParserCtxtPtr) xmlMalloc(sizeof(xmlParserCtxt));
     if (ctxt == NULL) {
-        xmlGenericError(xmlGenericErrorContext,
-		"xmlNewParserCtxt : cannot allocate context\n");
+        htmlErrMemory(NULL, "NewParserCtxt: out of memory\n");
 	return(NULL);
     }
     memset(ctxt, 0, sizeof(xmlParserCtxt));
-    htmlInitParserCtxt(ctxt);
+    if (htmlInitParserCtxt(ctxt) < 0) {
+        htmlFreeParserCtxt(ctxt);
+	return(NULL);
+    }
     return(ctxt);
 }
 
@@ -4249,9 +4099,9 @@ htmlCreateDocParserCtxt(xmlChar *cur, const char *encoding ATTRIBUTE_UNUSED) {
 	if (enc != XML_CHAR_ENCODING_ERROR) {
 	    xmlSwitchEncoding(ctxt, enc);
 	    if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) {
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData,
-			 "Unsupported encoding %s\n", encoding);
+		htmlParseErr(ctxt, XML_ERR_UNSUPPORTED_ENCODING,
+		             "Unsupported encoding %s\n", 
+			     (const xmlChar *) encoding, NULL);
 	    }
 	} else {
 	    /*
@@ -4261,10 +4111,9 @@ htmlCreateDocParserCtxt(xmlChar *cur, const char *encoding ATTRIBUTE_UNUSED) {
 	    if (handler != NULL) {
 		xmlSwitchToEncoding(ctxt, handler);
 	    } else {
-		ctxt->errNo = XML_ERR_UNSUPPORTED_ENCODING;
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData,
-			 "Unsupported encoding %s\n", encoding);
+		htmlParseErr(ctxt, XML_ERR_UNSUPPORTED_ENCODING,
+		             "Unsupported encoding %s\n",
+			     (const xmlChar *) encoding, NULL);
 	    }
 	}
     }
@@ -4684,19 +4533,6 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		oldname = ctxt->name;
 		htmlParseStartTag(ctxt);
 		name = ctxt->name;
-#ifdef DEBUG
-		if (oldname == NULL)
-		    xmlGenericError(xmlGenericErrorContext,
-			    "Start of element %s\n", name);
-		else if (name == NULL)	
-		    xmlGenericError(xmlGenericErrorContext,
-			    "Start of element failed, was %s\n",
-		            oldname);
-		else	
-		    xmlGenericError(xmlGenericErrorContext,
-			    "Start of element %s, was %s\n",
-		            name, oldname);
-#endif
 		if (((depth == ctxt->nameNr) &&
 		     (xmlStrEqual(oldname, ctxt->name))) ||
 		    (name == NULL)) {
@@ -4710,10 +4546,8 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		 */
 		info = htmlTagLookup(name);
 		if (info == NULL) {
-		    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			ctxt->sax->error(ctxt->userData, "Tag %s invalid\n",
-					 name);
-		    ctxt->wellFormed = 0;
+		    htmlParseErr(ctxt, XML_HTML_UNKNOWN_TAG,
+		                 "Tag %s invalid\n", name, NULL);
 		}
 
 		/*
@@ -4724,10 +4558,6 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		    if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
 			ctxt->sax->endElement(ctxt->userData, name);
 		    oldname = htmlnamePop(ctxt);
-#ifdef DEBUG
-		    xmlGenericError(xmlGenericErrorContext,"End of tag the XML way: popping out %s\n",
-		            oldname);
-#endif
 		    ctxt->instate = XML_PARSER_CONTENT;
 #ifdef DEBUG_PUSH
 		    xmlGenericError(xmlGenericErrorContext,
@@ -4739,11 +4569,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		if (CUR == '>') {
 		    NEXT;
 		} else {
-		    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			ctxt->sax->error(ctxt->userData, 
-			                 "Couldn't find end of Start Tag %s\n",
-					 name);
-		    ctxt->wellFormed = 0;
+		    htmlParseErr(ctxt, XML_ERR_GT_REQUIRED,
+		                 "Couldn't find end of Start Tag %s\n",
+				 name, NULL);
 
 		    /*
 		     * end of parsing of this node.
@@ -4751,10 +4579,6 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		    if (xmlStrEqual(name, ctxt->name)) { 
 			nodePop(ctxt);
 			oldname = htmlnamePop(ctxt);
-#ifdef DEBUG
-			xmlGenericError(xmlGenericErrorContext,
-			 "End of start tag problem: popping out %s\n", oldname);
-#endif
 		    }    
 
 		    ctxt->instate = XML_PARSER_CONTENT;
@@ -4772,9 +4596,6 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		    if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
 			ctxt->sax->endElement(ctxt->userData, name);
 		    oldname = htmlnamePop(ctxt);
-#ifdef DEBUG
-		    xmlGenericError(xmlGenericErrorContext,"End of empty tag %s : popping out %s\n", name, oldname);
-#endif
 		}
 		ctxt->instate = XML_PARSER_CONTENT;
 #ifdef DEBUG_PUSH
@@ -4854,10 +4675,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 			if ((!terminate) &&
 			    (htmlParseLookupSequence(ctxt, '>', 0, 0, 0) < 0))
 			    goto done;
-			if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			    ctxt->sax->error(ctxt->userData,
-				 "Misplaced DOCTYPE declaration\n");
-			ctxt->wellFormed = 0;
+			htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+			             "Misplaced DOCTYPE declaration\n",
+				     BAD_CAST "DOCTYPE" , NULL);
 			htmlParseDocTypeDecl(ctxt);
 		    } else if ((cur == '<') && (next == '!') &&
 			(in->cur[2] == '-') && (in->cur[3] == '-')) {
@@ -4919,10 +4739,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		}
 		if (cons == ctxt->nbChars) {
 		    if (ctxt->node != NULL) {
-			if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			    ctxt->sax->error(ctxt->userData,
-				 "detected an error in element content\n");
-			ctxt->wellFormed = 0;
+			htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			             "detected an error in element content\n",
+				     NULL, NULL);
 		    }
 		    NEXT;
 		    break;
@@ -4949,8 +4768,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 	        break;
             case XML_PARSER_CDATA_SECTION:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == CDATA\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == CDATA\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_CONTENT;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -4959,8 +4779,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		break;
             case XML_PARSER_DTD:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == DTD\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == DTD\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_CONTENT;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -4969,8 +4790,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		break;
             case XML_PARSER_COMMENT:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == COMMENT\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == COMMENT\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_CONTENT;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -4979,8 +4801,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		break;
             case XML_PARSER_PI:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == PI\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == PI\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_CONTENT;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -4989,8 +4812,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		break;
             case XML_PARSER_ENTITY_DECL:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == ENTITY_DECL\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == ENTITY_DECL\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_CONTENT;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -4999,8 +4823,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		break;
             case XML_PARSER_ENTITY_VALUE:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == ENTITY_VALUE\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == ENTITY_VALUE\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_CONTENT;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -5009,8 +4834,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		break;
             case XML_PARSER_ATTRIBUTE_VALUE:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == ATTRIBUTE_VALUE\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == ATTRIBUTE_VALUE\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_START_TAG;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -5019,8 +4845,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		break;
 	    case XML_PARSER_SYSTEM_LITERAL:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == XML_PARSER_SYSTEM_LITERAL\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		    "HPP: internal error, state == XML_PARSER_SYSTEM_LITERAL\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_CONTENT;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -5029,8 +4856,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		break;
 	    case XML_PARSER_IGNORE:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == XML_PARSER_IGNORE\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == XML_PARSER_IGNORE\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_CONTENT;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -5039,8 +4867,9 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		break;
 	    case XML_PARSER_PUBLIC_LITERAL:
-		xmlGenericError(xmlGenericErrorContext,
-			"HPP: internal error, state == XML_PARSER_LITERAL\n");
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == XML_PARSER_LITERAL\n",
+			     NULL, NULL);
 		ctxt->instate = XML_PARSER_CONTENT;
 		ctxt->checkIndex = 0;
 #ifdef DEBUG_PUSH
@@ -5082,7 +4911,7 @@ done:
 
 /**
  * htmlParseChunk:
- * @ctxt:  an XML parser context
+ * @ctxt:  an HTML parser context
  * @chunk:  an char array
  * @size:  the size in byte of the chunk
  * @terminate:  last chunk indicator
@@ -5119,8 +4948,8 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size,
 		    
 		nbchars = xmlCharEncInFunc(in->encoder, in->buffer, in->raw);
 		if (nbchars < 0) {
-		    xmlGenericError(xmlGenericErrorContext,
-				    "htmlParseChunk: encoder error\n");
+		    htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
+			         "encoder error\n", NULL, NULL);
 		    return(XML_ERR_INVALID_ENCODING);
 		}
 	    }
@@ -5178,13 +5007,11 @@ htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data,
     buf = xmlAllocParserInputBuffer(enc);
     if (buf == NULL) return(NULL);
 
-    ctxt = (htmlParserCtxtPtr) xmlMalloc(sizeof(htmlParserCtxt));
+    ctxt = htmlNewParserCtxt();
     if (ctxt == NULL) {
-	xmlFree(buf);
+	xmlFreeParserInputBuffer(buf);
 	return(NULL);
     }
-    memset(ctxt, 0, sizeof(htmlParserCtxt));
-    htmlInitParserCtxt(ctxt);
     if(enc==XML_CHAR_ENCODING_UTF8 || buf->encoder)
 	ctxt->charset=XML_CHAR_ENCODING_UTF8;
     if (sax != NULL) {
@@ -5325,13 +5152,10 @@ htmlCreateFileParserCtxt(const char *filename, const char *encoding)
     /* htmlCharEncoding enc; */
     xmlChar *content, *content_line = (xmlChar *) "charset=";
 
-    ctxt = (htmlParserCtxtPtr) xmlMalloc(sizeof(htmlParserCtxt));
+    ctxt = htmlNewParserCtxt();
     if (ctxt == NULL) {
-        xmlGenericError(xmlGenericErrorContext, "malloc failed\n");
 	return(NULL);
     }
-    memset(ctxt, 0, sizeof(htmlParserCtxt));
-    htmlInitParserCtxt(ctxt);
     canonicFilename = (char *) xmlCanonicPath((const xmlChar *) filename);
     if (canonicFilename == NULL) {
 	if (xmlDefaultSAXHandler.error != NULL) {
@@ -5573,7 +5397,7 @@ htmlNodeStatus(const htmlNodePtr node, int legacy) {
 
 /**
  * htmlCtxtReset:
- * @ctxt: an XML parser context
+ * @ctxt: an HTML parser context
  *
  * Reset a parser context
  */
diff --git a/Makefile.am b/Makefile.am
index a32d483c..709119c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -559,10 +559,10 @@ SAXtests : testSAX$(EXEEXT)
 	  if [ ! -d $$i ] ; then \
 	  if [ ! -f $(srcdir)/result/$$name.sax ] ; then \
 	      echo New test file $$name ; \
-	      $(CHECKER) $(top_builddir)/testSAX $$i > $(srcdir)/result/$$name.sax ; \
+	      $(CHECKER) $(top_builddir)/testSAX $$i > $(srcdir)/result/$$name.sax 2> /dev/null ; \
 	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	  else \
-	      log=`$(CHECKER) $(top_builddir)/testSAX $$i > result.$$name ; \
+	      log=`$(CHECKER) $(top_builddir)/testSAX $$i > result.$$name 2> /dev/null ; \
 	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	      diff $(srcdir)/result/$$name.sax result.$$name` ; \
 	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h
index 7e899f58..80a976c7 100644
--- a/include/libxml/xmlerror.h
+++ b/include/libxml/xmlerror.h
@@ -247,7 +247,9 @@ typedef enum {
     XML_WAR_UNKNOWN_VERSION,
     XML_WAR_LANG_VALUE,
     XML_WAR_NS_URI,
-    XML_WAR_NS_URI_RELATIVE
+    XML_WAR_NS_URI_RELATIVE,
+    XML_HTML_STRUCURE_ERROR,
+    XML_HTML_UNKNOWN_TAG
 } xmlParserErrors;
 
 /**
diff --git a/legacy.c b/legacy.c
index e0f533eb..6f86b958 100644
--- a/legacy.c
+++ b/legacy.c
@@ -17,6 +17,7 @@
 #include <libxml/entities.h>
 #include <libxml/SAX.h>
 #include <libxml/parserInternals.h>
+#include <libxml/HTMLparser.h>
 
 void xmlUpgradeOldNs(xmlDocPtr doc);
 
@@ -26,13 +27,49 @@ void xmlUpgradeOldNs(xmlDocPtr doc);
  *									*
  ************************************************************************/
 
+xmlChar *htmlDecodeEntities(htmlParserCtxtPtr ctxt, int len, xmlChar end,
+                            xmlChar end2, xmlChar end3);
+
+/**
+ * htmlDecodeEntities:
+ * @ctxt:  the parser context
+ * @len:  the len to decode (in bytes !), -1 for no size limit
+ * @end:  an end marker xmlChar, 0 if none
+ * @end2:  an end marker xmlChar, 0 if none
+ * @end3:  an end marker xmlChar, 0 if none
+ *
+ * Substitute the HTML entities by their value
+ *
+ * DEPRECATED !!!!
+ *
+ * Returns A newly allocated string with the substitution done. The caller
+ *      must deallocate it !
+ */
+xmlChar *
+htmlDecodeEntities(htmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED,
+                   int len ATTRIBUTE_UNUSED, xmlChar end ATTRIBUTE_UNUSED,
+                   xmlChar end2 ATTRIBUTE_UNUSED,
+                   xmlChar end3 ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "htmlDecodeEntities() deprecated function reached\n");
+        deprecated = 1;
+    }
+    return (NULL);
+}
+
 /**
  * xmlInitializePredefinedEntities:
  *
  * Set up the predefined entities.
  * Deprecated call
  */
-void xmlInitializePredefinedEntities(void) {
+void
+xmlInitializePredefinedEntities(void)
+{
 }
 
 /**
@@ -41,7 +78,9 @@ void xmlInitializePredefinedEntities(void) {
  * Cleanup up the predefined entities table.
  * Deprecated call
  */
-void xmlCleanupPredefinedEntities(void) {
+void
+xmlCleanupPredefinedEntities(void)
+{
 }
 
 static const char *xmlFeaturesList[] = {
@@ -101,19 +140,20 @@ static const char *xmlFeaturesList[] = {
  *            strings must not be deallocated
  */
 int
-xmlGetFeaturesList(int *len, const char **result) {
+xmlGetFeaturesList(int *len, const char **result)
+{
     int ret, i;
 
-    ret = sizeof(xmlFeaturesList)/sizeof(xmlFeaturesList[0]);
+    ret = sizeof(xmlFeaturesList) / sizeof(xmlFeaturesList[0]);
     if ((len == NULL) || (result == NULL))
-	return(ret);
+        return (ret);
     if ((*len < 0) || (*len >= 1000))
-	return(-1);
+        return (-1);
     if (*len > ret)
-	*len = ret;
-    for (i = 0;i < *len;i++)
-	result[i] = xmlFeaturesList[i];
-    return(ret);
+        *len = ret;
+    for (i = 0; i < *len; i++)
+        result[i] = xmlFeaturesList[i];
+    return (ret);
 }
 
 /**
@@ -127,44 +167,47 @@ xmlGetFeaturesList(int *len, const char **result) {
  * Returns -1 in case or error, 0 otherwise
  */
 int
-xmlGetFeature(xmlParserCtxtPtr ctxt, const char *name, void *result) {
+xmlGetFeature(xmlParserCtxtPtr ctxt, const char *name, void *result)
+{
     if ((ctxt == NULL) || (name == NULL) || (result == NULL))
-	return(-1);
+        return (-1);
 
     if (!strcmp(name, "validate")) {
-	*((int *) result) = ctxt->validate;
+        *((int *) result) = ctxt->validate;
     } else if (!strcmp(name, "keep blanks")) {
-	*((int *) result) = ctxt->keepBlanks;
+        *((int *) result) = ctxt->keepBlanks;
     } else if (!strcmp(name, "disable SAX")) {
-	*((int *) result) = ctxt->disableSAX;
+        *((int *) result) = ctxt->disableSAX;
     } else if (!strcmp(name, "fetch external entities")) {
-	*((int *) result) = ctxt->loadsubset;
+        *((int *) result) = ctxt->loadsubset;
     } else if (!strcmp(name, "substitute entities")) {
-	*((int *) result) = ctxt->replaceEntities;
+        *((int *) result) = ctxt->replaceEntities;
     } else if (!strcmp(name, "gather line info")) {
-	*((int *) result) = ctxt->record_info;
+        *((int *) result) = ctxt->record_info;
     } else if (!strcmp(name, "user data")) {
-	*((void **)result) = ctxt->userData;
+        *((void **) result) = ctxt->userData;
     } else if (!strcmp(name, "is html")) {
-	*((int *) result) = ctxt->html;
+        *((int *) result) = ctxt->html;
     } else if (!strcmp(name, "is standalone")) {
-	*((int *) result) = ctxt->standalone;
+        *((int *) result) = ctxt->standalone;
     } else if (!strcmp(name, "document")) {
-	*((xmlDocPtr *) result) = ctxt->myDoc;
+        *((xmlDocPtr *) result) = ctxt->myDoc;
     } else if (!strcmp(name, "is well formed")) {
-	*((int *) result) = ctxt->wellFormed;
+        *((int *) result) = ctxt->wellFormed;
     } else if (!strcmp(name, "is valid")) {
-	*((int *) result) = ctxt->valid;
+        *((int *) result) = ctxt->valid;
     } else if (!strcmp(name, "SAX block")) {
-	*((xmlSAXHandlerPtr *) result) = ctxt->sax;
+        *((xmlSAXHandlerPtr *) result) = ctxt->sax;
     } else if (!strcmp(name, "SAX function internalSubset")) {
         *((internalSubsetSAXFunc *) result) = ctxt->sax->internalSubset;
     } else if (!strcmp(name, "SAX function isStandalone")) {
         *((isStandaloneSAXFunc *) result) = ctxt->sax->isStandalone;
     } else if (!strcmp(name, "SAX function hasInternalSubset")) {
-        *((hasInternalSubsetSAXFunc *) result) = ctxt->sax->hasInternalSubset;
+        *((hasInternalSubsetSAXFunc *) result) =
+            ctxt->sax->hasInternalSubset;
     } else if (!strcmp(name, "SAX function hasExternalSubset")) {
-        *((hasExternalSubsetSAXFunc *) result) = ctxt->sax->hasExternalSubset;
+        *((hasExternalSubsetSAXFunc *) result) =
+            ctxt->sax->hasExternalSubset;
     } else if (!strcmp(name, "SAX function resolveEntity")) {
         *((resolveEntitySAXFunc *) result) = ctxt->sax->resolveEntity;
     } else if (!strcmp(name, "SAX function getEntity")) {
@@ -178,9 +221,11 @@ xmlGetFeature(xmlParserCtxtPtr ctxt, const char *name, void *result) {
     } else if (!strcmp(name, "SAX function elementDecl")) {
         *((elementDeclSAXFunc *) result) = ctxt->sax->elementDecl;
     } else if (!strcmp(name, "SAX function unparsedEntityDecl")) {
-        *((unparsedEntityDeclSAXFunc *) result) = ctxt->sax->unparsedEntityDecl;
+        *((unparsedEntityDeclSAXFunc *) result) =
+            ctxt->sax->unparsedEntityDecl;
     } else if (!strcmp(name, "SAX function setDocumentLocator")) {
-        *((setDocumentLocatorSAXFunc *) result) = ctxt->sax->setDocumentLocator;
+        *((setDocumentLocatorSAXFunc *) result) =
+            ctxt->sax->setDocumentLocator;
     } else if (!strcmp(name, "SAX function startDocument")) {
         *((startDocumentSAXFunc *) result) = ctxt->sax->startDocument;
     } else if (!strcmp(name, "SAX function endDocument")) {
@@ -194,9 +239,11 @@ xmlGetFeature(xmlParserCtxtPtr ctxt, const char *name, void *result) {
     } else if (!strcmp(name, "SAX function characters")) {
         *((charactersSAXFunc *) result) = ctxt->sax->characters;
     } else if (!strcmp(name, "SAX function ignorableWhitespace")) {
-        *((ignorableWhitespaceSAXFunc *) result) = ctxt->sax->ignorableWhitespace;
+        *((ignorableWhitespaceSAXFunc *) result) =
+            ctxt->sax->ignorableWhitespace;
     } else if (!strcmp(name, "SAX function processingInstruction")) {
-        *((processingInstructionSAXFunc *) result) = ctxt->sax->processingInstruction;
+        *((processingInstructionSAXFunc *) result) =
+            ctxt->sax->processingInstruction;
     } else if (!strcmp(name, "SAX function comment")) {
         *((commentSAXFunc *) result) = ctxt->sax->comment;
     } else if (!strcmp(name, "SAX function warning")) {
@@ -206,15 +253,16 @@ xmlGetFeature(xmlParserCtxtPtr ctxt, const char *name, void *result) {
     } else if (!strcmp(name, "SAX function fatalError")) {
         *((fatalErrorSAXFunc *) result) = ctxt->sax->fatalError;
     } else if (!strcmp(name, "SAX function getParameterEntity")) {
-        *((getParameterEntitySAXFunc *) result) = ctxt->sax->getParameterEntity;
+        *((getParameterEntitySAXFunc *) result) =
+            ctxt->sax->getParameterEntity;
     } else if (!strcmp(name, "SAX function cdataBlock")) {
         *((cdataBlockSAXFunc *) result) = ctxt->sax->cdataBlock;
     } else if (!strcmp(name, "SAX function externalSubset")) {
         *((externalSubsetSAXFunc *) result) = ctxt->sax->externalSubset;
     } else {
-	return(-1);
+        return (-1);
     }
-    return(0);
+    return (0);
 }
 
 /**
@@ -227,33 +275,35 @@ xmlGetFeature(xmlParserCtxtPtr ctxt, const char *name, void *result) {
  *
  * Returns -1 in case or error, 0 otherwise
  */
-int	
-xmlSetFeature(xmlParserCtxtPtr ctxt, const char *name, void *value) {
+int
+xmlSetFeature(xmlParserCtxtPtr ctxt, const char *name, void *value)
+{
     if ((ctxt == NULL) || (name == NULL) || (value == NULL))
-	return(-1);
+        return (-1);
 
     if (!strcmp(name, "validate")) {
-	int newvalidate = *((int *) value);
-	if ((!ctxt->validate) && (newvalidate != 0)) {
-	    if (ctxt->vctxt.warning == NULL)
-		ctxt->vctxt.warning = xmlParserValidityWarning;
-	    if (ctxt->vctxt.error == NULL)
-		ctxt->vctxt.error = xmlParserValidityError;
-	    ctxt->vctxt.nodeMax = 0;
-	}
+        int newvalidate = *((int *) value);
+
+        if ((!ctxt->validate) && (newvalidate != 0)) {
+            if (ctxt->vctxt.warning == NULL)
+                ctxt->vctxt.warning = xmlParserValidityWarning;
+            if (ctxt->vctxt.error == NULL)
+                ctxt->vctxt.error = xmlParserValidityError;
+            ctxt->vctxt.nodeMax = 0;
+        }
         ctxt->validate = newvalidate;
     } else if (!strcmp(name, "keep blanks")) {
         ctxt->keepBlanks = *((int *) value);
     } else if (!strcmp(name, "disable SAX")) {
         ctxt->disableSAX = *((int *) value);
     } else if (!strcmp(name, "fetch external entities")) {
-	ctxt->loadsubset = *((int *) value);
+        ctxt->loadsubset = *((int *) value);
     } else if (!strcmp(name, "substitute entities")) {
         ctxt->replaceEntities = *((int *) value);
     } else if (!strcmp(name, "gather line info")) {
         ctxt->record_info = *((int *) value);
     } else if (!strcmp(name, "user data")) {
-        ctxt->userData = *((void **)value);
+        ctxt->userData = *((void **) value);
     } else if (!strcmp(name, "is html")) {
         ctxt->html = *((int *) value);
     } else if (!strcmp(name, "is standalone")) {
@@ -271,9 +321,11 @@ xmlSetFeature(xmlParserCtxtPtr ctxt, const char *name, void *value) {
     } else if (!strcmp(name, "SAX function isStandalone")) {
         ctxt->sax->isStandalone = *((isStandaloneSAXFunc *) value);
     } else if (!strcmp(name, "SAX function hasInternalSubset")) {
-        ctxt->sax->hasInternalSubset = *((hasInternalSubsetSAXFunc *) value);
+        ctxt->sax->hasInternalSubset =
+            *((hasInternalSubsetSAXFunc *) value);
     } else if (!strcmp(name, "SAX function hasExternalSubset")) {
-        ctxt->sax->hasExternalSubset = *((hasExternalSubsetSAXFunc *) value);
+        ctxt->sax->hasExternalSubset =
+            *((hasExternalSubsetSAXFunc *) value);
     } else if (!strcmp(name, "SAX function resolveEntity")) {
         ctxt->sax->resolveEntity = *((resolveEntitySAXFunc *) value);
     } else if (!strcmp(name, "SAX function getEntity")) {
@@ -287,9 +339,11 @@ xmlSetFeature(xmlParserCtxtPtr ctxt, const char *name, void *value) {
     } else if (!strcmp(name, "SAX function elementDecl")) {
         ctxt->sax->elementDecl = *((elementDeclSAXFunc *) value);
     } else if (!strcmp(name, "SAX function unparsedEntityDecl")) {
-        ctxt->sax->unparsedEntityDecl = *((unparsedEntityDeclSAXFunc *) value);
+        ctxt->sax->unparsedEntityDecl =
+            *((unparsedEntityDeclSAXFunc *) value);
     } else if (!strcmp(name, "SAX function setDocumentLocator")) {
-        ctxt->sax->setDocumentLocator = *((setDocumentLocatorSAXFunc *) value);
+        ctxt->sax->setDocumentLocator =
+            *((setDocumentLocatorSAXFunc *) value);
     } else if (!strcmp(name, "SAX function startDocument")) {
         ctxt->sax->startDocument = *((startDocumentSAXFunc *) value);
     } else if (!strcmp(name, "SAX function endDocument")) {
@@ -303,9 +357,11 @@ xmlSetFeature(xmlParserCtxtPtr ctxt, const char *name, void *value) {
     } else if (!strcmp(name, "SAX function characters")) {
         ctxt->sax->characters = *((charactersSAXFunc *) value);
     } else if (!strcmp(name, "SAX function ignorableWhitespace")) {
-        ctxt->sax->ignorableWhitespace = *((ignorableWhitespaceSAXFunc *) value);
+        ctxt->sax->ignorableWhitespace =
+            *((ignorableWhitespaceSAXFunc *) value);
     } else if (!strcmp(name, "SAX function processingInstruction")) {
-        ctxt->sax->processingInstruction = *((processingInstructionSAXFunc *) value);
+        ctxt->sax->processingInstruction =
+            *((processingInstructionSAXFunc *) value);
     } else if (!strcmp(name, "SAX function comment")) {
         ctxt->sax->comment = *((commentSAXFunc *) value);
     } else if (!strcmp(name, "SAX function warning")) {
@@ -315,15 +371,16 @@ xmlSetFeature(xmlParserCtxtPtr ctxt, const char *name, void *value) {
     } else if (!strcmp(name, "SAX function fatalError")) {
         ctxt->sax->fatalError = *((fatalErrorSAXFunc *) value);
     } else if (!strcmp(name, "SAX function getParameterEntity")) {
-        ctxt->sax->getParameterEntity = *((getParameterEntitySAXFunc *) value);
+        ctxt->sax->getParameterEntity =
+            *((getParameterEntitySAXFunc *) value);
     } else if (!strcmp(name, "SAX function cdataBlock")) {
         ctxt->sax->cdataBlock = *((cdataBlockSAXFunc *) value);
     } else if (!strcmp(name, "SAX function externalSubset")) {
         ctxt->sax->externalSubset = *((externalSubsetSAXFunc *) value);
     } else {
-	return(-1);
+        return (-1);
     }
-    return(0);
+    return (0);
 }
 
 /**
@@ -666,17 +723,18 @@ xmlUpgradeOldNs(xmlDocPtr doc ATTRIBUTE_UNUSED)
  */
 const xmlChar *
 xmlEncodeEntities(xmlDocPtr doc ATTRIBUTE_UNUSED,
-                  const xmlChar *input ATTRIBUTE_UNUSED) {
+                  const xmlChar * input ATTRIBUTE_UNUSED)
+{
     static int warning = 1;
 
     if (warning) {
-	xmlGenericError(xmlGenericErrorContext,
-		"Deprecated API xmlEncodeEntities() used\n");
-	xmlGenericError(xmlGenericErrorContext,
-		"   change code to use xmlEncodeEntitiesReentrant()\n");
-	warning = 0;
+        xmlGenericError(xmlGenericErrorContext,
+                        "Deprecated API xmlEncodeEntities() used\n");
+        xmlGenericError(xmlGenericErrorContext,
+                        "   change code to use xmlEncodeEntitiesReentrant()\n");
+        warning = 0;
     }
-    return(NULL);
+    return (NULL);
 }
 
 /************************************************************************
@@ -705,7 +763,7 @@ const xmlChar *
 getPublicId(void *ctx)
 {
     DEPRECATED("getPublicId")
-    return(xmlSAX2GetPublicId(ctx));
+        return (xmlSAX2GetPublicId(ctx));
 }
 
 /**
@@ -722,7 +780,7 @@ const xmlChar *
 getSystemId(void *ctx)
 {
     DEPRECATED("getSystemId")
-    return(xmlSAX2GetSystemId(ctx)); 
+        return (xmlSAX2GetSystemId(ctx));
 }
 
 /**
@@ -738,7 +796,7 @@ int
 getLineNumber(void *ctx)
 {
     DEPRECATED("getLineNumber")
-    return(xmlSAX2GetLineNumber(ctx));
+        return (xmlSAX2GetLineNumber(ctx));
 }
 
 /**
@@ -754,7 +812,7 @@ int
 getColumnNumber(void *ctx)
 {
     DEPRECATED("getColumnNumber")
-    return(xmlSAX2GetColumnNumber(ctx));
+        return (xmlSAX2GetColumnNumber(ctx));
 }
 
 /**
@@ -770,7 +828,7 @@ int
 isStandalone(void *ctx)
 {
     DEPRECATED("isStandalone")
-    return(xmlSAX2IsStandalone(ctx));
+        return (xmlSAX2IsStandalone(ctx));
 }
 
 /**
@@ -786,7 +844,7 @@ int
 hasInternalSubset(void *ctx)
 {
     DEPRECATED("hasInternalSubset")
-    return(xmlSAX2HasInternalSubset(ctx));
+        return (xmlSAX2HasInternalSubset(ctx));
 }
 
 /**
@@ -802,7 +860,7 @@ int
 hasExternalSubset(void *ctx)
 {
     DEPRECATED("hasExternalSubset")
-    return(xmlSAX2HasExternalSubset(ctx));
+        return (xmlSAX2HasExternalSubset(ctx));
 }
 
 /**
@@ -816,11 +874,11 @@ hasExternalSubset(void *ctx)
  * DEPRECATED: use xmlSAX2InternalSubset()
  */
 void
-internalSubset(void *ctx, const xmlChar *name,
-	       const xmlChar *ExternalID, const xmlChar *SystemID)
+internalSubset(void *ctx, const xmlChar * name,
+               const xmlChar * ExternalID, const xmlChar * SystemID)
 {
     DEPRECATED("internalSubset")
-    xmlSAX2InternalSubset(ctx, name, ExternalID, SystemID);
+        xmlSAX2InternalSubset(ctx, name, ExternalID, SystemID);
 }
 
 /**
@@ -834,11 +892,11 @@ internalSubset(void *ctx, const xmlChar *name,
  * DEPRECATED: use xmlSAX2ExternalSubset()
  */
 void
-externalSubset(void *ctx, const xmlChar *name,
-	       const xmlChar *ExternalID, const xmlChar *SystemID)
+externalSubset(void *ctx, const xmlChar * name,
+               const xmlChar * ExternalID, const xmlChar * SystemID)
 {
     DEPRECATED("externalSubset")
-    xmlSAX2ExternalSubset(ctx, name, ExternalID, SystemID);
+        xmlSAX2ExternalSubset(ctx, name, ExternalID, SystemID);
 }
 
 /**
@@ -857,10 +915,11 @@ externalSubset(void *ctx, const xmlChar *name,
  * Returns the xmlParserInputPtr if inlined or NULL for DOM behaviour.
  */
 xmlParserInputPtr
-resolveEntity(void *ctx, const xmlChar *publicId, const xmlChar *systemId)
+resolveEntity(void *ctx, const xmlChar * publicId,
+              const xmlChar * systemId)
 {
     DEPRECATED("resolveEntity")
-    return(xmlSAX2ResolveEntity(ctx, publicId, systemId));
+        return (xmlSAX2ResolveEntity(ctx, publicId, systemId));
 }
 
 /**
@@ -874,10 +933,10 @@ resolveEntity(void *ctx, const xmlChar *publicId, const xmlChar *systemId)
  * Returns the xmlEntityPtr if found.
  */
 xmlEntityPtr
-getEntity(void *ctx, const xmlChar *name)
+getEntity(void *ctx, const xmlChar * name)
 {
     DEPRECATED("getEntity")
-    return(xmlSAX2GetEntity(ctx, name));
+        return (xmlSAX2GetEntity(ctx, name));
 }
 
 /**
@@ -891,10 +950,10 @@ getEntity(void *ctx, const xmlChar *name)
  * Returns the xmlEntityPtr if found.
  */
 xmlEntityPtr
-getParameterEntity(void *ctx, const xmlChar *name)
+getParameterEntity(void *ctx, const xmlChar * name)
 {
     DEPRECATED("getParameterEntity")
-    return(xmlSAX2GetParameterEntity(ctx, name));
+        return (xmlSAX2GetParameterEntity(ctx, name));
 }
 
 
@@ -911,11 +970,12 @@ getParameterEntity(void *ctx, const xmlChar *name)
  * DEPRECATED: use xmlSAX2EntityDecl()
  */
 void
-entityDecl(void *ctx, const xmlChar *name, int type,
-          const xmlChar *publicId, const xmlChar *systemId, xmlChar *content)
+entityDecl(void *ctx, const xmlChar * name, int type,
+           const xmlChar * publicId, const xmlChar * systemId,
+           xmlChar * content)
 {
     DEPRECATED("entityDecl")
-    xmlSAX2EntityDecl(ctx, name, type, publicId, systemId, content);
+        xmlSAX2EntityDecl(ctx, name, type, publicId, systemId, content);
 }
 
 /**
@@ -932,12 +992,13 @@ entityDecl(void *ctx, const xmlChar *name, int type,
  * DEPRECATED: use xmlSAX2AttributeDecl()
  */
 void
-attributeDecl(void *ctx, const xmlChar *elem, const xmlChar *fullname,
-              int type, int def, const xmlChar *defaultValue,
-	      xmlEnumerationPtr tree)
+attributeDecl(void *ctx, const xmlChar * elem, const xmlChar * fullname,
+              int type, int def, const xmlChar * defaultValue,
+              xmlEnumerationPtr tree)
 {
     DEPRECATED("attributeDecl")
-    xmlSAX2AttributeDecl(ctx, elem, fullname, type, def, defaultValue, tree);
+        xmlSAX2AttributeDecl(ctx, elem, fullname, type, def, defaultValue,
+                             tree);
 }
 
 /**
@@ -955,7 +1016,7 @@ elementDecl(void *ctx, const xmlChar * name, int type,
             xmlElementContentPtr content)
 {
     DEPRECATED("elementDecl")
-    xmlSAX2ElementDecl(ctx, name, type, content);
+        xmlSAX2ElementDecl(ctx, name, type, content);
 }
 
 /**
@@ -969,11 +1030,11 @@ elementDecl(void *ctx, const xmlChar * name, int type,
  * DEPRECATED: use xmlSAX2NotationDecl()
  */
 void
-notationDecl(void *ctx, const xmlChar *name,
-	     const xmlChar *publicId, const xmlChar *systemId)
+notationDecl(void *ctx, const xmlChar * name,
+             const xmlChar * publicId, const xmlChar * systemId)
 {
     DEPRECATED("notationDecl")
-    xmlSAX2NotationDecl(ctx, name, publicId, systemId);
+        xmlSAX2NotationDecl(ctx, name, publicId, systemId);
 }
 
 /**
@@ -988,12 +1049,13 @@ notationDecl(void *ctx, const xmlChar *name,
  * DEPRECATED: use xmlSAX2UnparsedEntityDecl()
  */
 void
-unparsedEntityDecl(void *ctx, const xmlChar *name,
-		   const xmlChar *publicId, const xmlChar *systemId,
-		   const xmlChar *notationName)
+unparsedEntityDecl(void *ctx, const xmlChar * name,
+                   const xmlChar * publicId, const xmlChar * systemId,
+                   const xmlChar * notationName)
 {
     DEPRECATED("unparsedEntityDecl")
-    xmlSAX2UnparsedEntityDecl(ctx, name, publicId, systemId, notationName);
+        xmlSAX2UnparsedEntityDecl(ctx, name, publicId, systemId,
+                                  notationName);
 }
 
 /**
@@ -1006,7 +1068,8 @@ unparsedEntityDecl(void *ctx, const xmlChar *name,
  * DEPRECATED
  */
 void
-setDocumentLocator(void *ctx ATTRIBUTE_UNUSED, xmlSAXLocatorPtr loc ATTRIBUTE_UNUSED)
+setDocumentLocator(void *ctx ATTRIBUTE_UNUSED,
+                   xmlSAXLocatorPtr loc ATTRIBUTE_UNUSED)
 {
     DEPRECATED("setDocumentLocator")
 }
@@ -1022,7 +1085,7 @@ void
 startDocument(void *ctx)
 {
     DEPRECATED("startDocument")
-    xmlSAX2StartDocument(ctx);
+        xmlSAX2StartDocument(ctx);
 }
 
 /**
@@ -1036,7 +1099,7 @@ void
 endDocument(void *ctx)
 {
     DEPRECATED("endDocument")
-    xmlSAX2EndDocument(ctx);
+        xmlSAX2EndDocument(ctx);
 }
 
 /**
@@ -1052,7 +1115,9 @@ endDocument(void *ctx)
  * DEPRECATED: use xmlSAX2Attribute()
  */
 void
-attribute(void *ctx ATTRIBUTE_UNUSED, const xmlChar *fullname ATTRIBUTE_UNUSED, const xmlChar *value ATTRIBUTE_UNUSED)
+attribute(void *ctx ATTRIBUTE_UNUSED,
+          const xmlChar * fullname ATTRIBUTE_UNUSED,
+          const xmlChar * value ATTRIBUTE_UNUSED)
 {
     DEPRECATED("attribute")
 }
@@ -1067,10 +1132,10 @@ attribute(void *ctx ATTRIBUTE_UNUSED, const xmlChar *fullname ATTRIBUTE_UNUSED,
  * DEPRECATED: use xmlSAX2StartElement()
  */
 void
-startElement(void *ctx, const xmlChar *fullname, const xmlChar **atts)
+startElement(void *ctx, const xmlChar * fullname, const xmlChar ** atts)
 {
     DEPRECATED("startElement")
-    xmlSAX2StartElement(ctx, fullname, atts);
+        xmlSAX2StartElement(ctx, fullname, atts);
 }
 
 /**
@@ -1082,10 +1147,10 @@ startElement(void *ctx, const xmlChar *fullname, const xmlChar **atts)
  * DEPRECATED: use xmlSAX2EndElement()
  */
 void
-endElement(void *ctx, const xmlChar *name ATTRIBUTE_UNUSED)
+endElement(void *ctx, const xmlChar * name ATTRIBUTE_UNUSED)
 {
     DEPRECATED("endElement")
-    xmlSAX2EndElement(ctx, name);
+        xmlSAX2EndElement(ctx, name);
 }
 
 /**
@@ -1097,10 +1162,10 @@ endElement(void *ctx, const xmlChar *name ATTRIBUTE_UNUSED)
  * DEPRECATED: use xmlSAX2Reference()
  */
 void
-reference(void *ctx, const xmlChar *name)
+reference(void *ctx, const xmlChar * name)
 {
     DEPRECATED("reference")
-    xmlSAX2Reference(ctx, name);
+        xmlSAX2Reference(ctx, name);
 }
 
 /**
@@ -1113,10 +1178,10 @@ reference(void *ctx, const xmlChar *name)
  * DEPRECATED: use xmlSAX2Characters()
  */
 void
-characters(void *ctx, const xmlChar *ch, int len)
+characters(void *ctx, const xmlChar * ch, int len)
 {
     DEPRECATED("characters")
-    xmlSAX2Characters(ctx, ch, len);
+        xmlSAX2Characters(ctx, ch, len);
 }
 
 /**
@@ -1130,7 +1195,9 @@ characters(void *ctx, const xmlChar *ch, int len)
  * DEPRECATED: use xmlSAX2IgnorableWhitespace()
  */
 void
-ignorableWhitespace(void *ctx ATTRIBUTE_UNUSED, const xmlChar *ch ATTRIBUTE_UNUSED, int len ATTRIBUTE_UNUSED)
+ignorableWhitespace(void *ctx ATTRIBUTE_UNUSED,
+                    const xmlChar * ch ATTRIBUTE_UNUSED,
+                    int len ATTRIBUTE_UNUSED)
 {
     DEPRECATED("ignorableWhitespace")
 }
@@ -1145,11 +1212,11 @@ ignorableWhitespace(void *ctx ATTRIBUTE_UNUSED, const xmlChar *ch ATTRIBUTE_UNUS
  * DEPRECATED: use xmlSAX2ProcessingInstruction()
  */
 void
-processingInstruction(void *ctx, const xmlChar *target,
-                      const xmlChar *data)
+processingInstruction(void *ctx, const xmlChar * target,
+                      const xmlChar * data)
 {
     DEPRECATED("processingInstruction")
-    xmlSAX2ProcessingInstruction(ctx, target, data);
+        xmlSAX2ProcessingInstruction(ctx, target, data);
 }
 
 /**
@@ -1162,7 +1229,9 @@ processingInstruction(void *ctx, const xmlChar *target,
  * DEPRECATED
  */
 void
-globalNamespace(void *ctx ATTRIBUTE_UNUSED, const xmlChar *href ATTRIBUTE_UNUSED, const xmlChar *prefix ATTRIBUTE_UNUSED)
+globalNamespace(void *ctx ATTRIBUTE_UNUSED,
+                const xmlChar * href ATTRIBUTE_UNUSED,
+                const xmlChar * prefix ATTRIBUTE_UNUSED)
 {
     DEPRECATED("globalNamespace")
 }
@@ -1177,7 +1246,8 @@ globalNamespace(void *ctx ATTRIBUTE_UNUSED, const xmlChar *href ATTRIBUTE_UNUSED
  */
 
 void
-setNamespace(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name ATTRIBUTE_UNUSED)
+setNamespace(void *ctx ATTRIBUTE_UNUSED,
+             const xmlChar * name ATTRIBUTE_UNUSED)
 {
     DEPRECATED("setNamespace")
 }
@@ -1196,7 +1266,7 @@ xmlNsPtr
 getNamespace(void *ctx ATTRIBUTE_UNUSED)
 {
     DEPRECATED("getNamespace")
-    return(NULL);
+        return (NULL);
 }
 
 /**
@@ -1212,10 +1282,11 @@ getNamespace(void *ctx ATTRIBUTE_UNUSED)
  */
 
 int
-checkNamespace(void *ctx ATTRIBUTE_UNUSED, xmlChar *namespace ATTRIBUTE_UNUSED)
+checkNamespace(void *ctx ATTRIBUTE_UNUSED,
+               xmlChar * namespace ATTRIBUTE_UNUSED)
 {
     DEPRECATED("checkNamespace")
-    return(0);
+        return (0);
 }
 
 /**
@@ -1228,7 +1299,9 @@ checkNamespace(void *ctx ATTRIBUTE_UNUSED, xmlChar *namespace ATTRIBUTE_UNUSED)
  * DEPRECATED
  */
 void
-namespaceDecl(void *ctx ATTRIBUTE_UNUSED, const xmlChar *href ATTRIBUTE_UNUSED, const xmlChar *prefix ATTRIBUTE_UNUSED)
+namespaceDecl(void *ctx ATTRIBUTE_UNUSED,
+              const xmlChar * href ATTRIBUTE_UNUSED,
+              const xmlChar * prefix ATTRIBUTE_UNUSED)
 {
     DEPRECATED("namespaceDecl")
 }
@@ -1242,10 +1315,10 @@ namespaceDecl(void *ctx ATTRIBUTE_UNUSED, const xmlChar *href ATTRIBUTE_UNUSED,
  * DEPRECATED: use xmlSAX2Comment()
  */
 void
-comment(void *ctx, const xmlChar *value)
+comment(void *ctx, const xmlChar * value)
 {
     DEPRECATED("comment")
-    xmlSAX2Comment(ctx, value);
+        xmlSAX2Comment(ctx, value);
 }
 
 /**
@@ -1258,11 +1331,10 @@ comment(void *ctx, const xmlChar *value)
  * DEPRECATED: use xmlSAX2CDataBlock()
  */
 void
-cdataBlock(void *ctx, const xmlChar *value, int len)
+cdataBlock(void *ctx, const xmlChar * value, int len)
 {
     DEPRECATED("cdataBlock")
-    xmlSAX2CDataBlock(ctx, value, len);
+        xmlSAX2CDataBlock(ctx, value, len);
 }
-
 #endif /* LIBXML_LEGACY_ENABLED */
 
diff --git a/parser.c b/parser.c
index 7197a44b..b3f2f11b 100644
--- a/parser.c
+++ b/parser.c
@@ -128,7 +128,6 @@ xmlParseBalancedChunkMemoryInternal(xmlParserCtxtPtr oldctxt,
  *									*
  ************************************************************************/
 
-
 /**
  * xmlErrMemory:
  * @ctxt:  an XML parser context
@@ -471,6 +470,32 @@ xmlFatalErrMsgInt(xmlParserCtxtPtr ctxt, xmlParserErrors error,
         ctxt->disableSAX = 1;
 }
 
+/**
+ * xmlFatalErrMsgStrIntStr:
+ * @ctxt:  an XML parser context
+ * @error:  the error number
+ * @msg:  the error message
+ * @str1:  an string info
+ * @val:  an integer value
+ * @str2:  an string info
+ *
+ * Handle a fatal parser error, i.e. violating Well-Formedness constraints
+ */
+static void
+xmlFatalErrMsgStrIntStr(xmlParserCtxtPtr ctxt, xmlParserErrors error,
+                  const char *msg, const xmlChar *str1, int val, 
+		  const xmlChar *str2)
+{
+    ctxt->errNo = error;
+    __xmlRaiseError(NULL, NULL,
+                    ctxt, NULL, XML_FROM_PARSER, error, XML_ERR_FATAL,
+                    NULL, 0, (const char *) str1, (const char *) str2,
+		    NULL, val, 0, msg, str1, val, str2);
+    ctxt->wellFormed = 0;
+    if (ctxt->recovery == 0)
+        ctxt->disableSAX = 1;
+}
+
 /**
  * xmlFatalErrMsgStr:
  * @ctxt:  an XML parser context
@@ -494,6 +519,26 @@ xmlFatalErrMsgStr(xmlParserCtxtPtr ctxt, xmlParserErrors error,
         ctxt->disableSAX = 1;
 }
 
+/**
+ * xmlErrMsgStr:
+ * @ctxt:  an XML parser context
+ * @error:  the error number
+ * @msg:  the error message
+ * @val:  a string value
+ *
+ * Handle a non fatal parser error
+ */
+static void
+xmlErrMsgStr(xmlParserCtxtPtr ctxt, xmlParserErrors error,
+                  const char *msg, const xmlChar * val)
+{
+    ctxt->errNo = error;
+    __xmlRaiseError(NULL, NULL, ctxt, NULL,
+                    XML_FROM_PARSER, error, XML_ERR_ERROR,
+                    NULL, 0, (const char *) val, NULL, NULL, 0, 0, msg,
+                    val);
+}
+
 /**
  * xmlNsErr:
  * @ctxt:  an XML parser context
@@ -1849,9 +1894,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
 		if (ent->content != NULL) {
 		    COPY_BUF(0,buffer,nbchars,ent->content[0]);
 		} else {
-		    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			ctxt->sax->error(ctxt->userData,
-			    "internal error entity has no content\n");
+		    xmlFatalErrMsg(ctxt, XML_ERR_INTERNAL_ERROR,
+			    "predefined entity has no content\n");
 		}
 	    } else if ((ent != NULL) && (ent->content != NULL)) {
 		xmlChar *rep;
@@ -4244,12 +4288,8 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
 
 		    uri = xmlParseURI((const char *) URI);
 		    if (uri == NULL) {
-			ctxt->errNo = XML_ERR_INVALID_URI;
-			if ((ctxt->sax != NULL) &&
-			    (!ctxt->disableSAX) &&
-			    (ctxt->sax->error != NULL))
-			    ctxt->sax->error(ctxt->userData,
-				        "Invalid URI: %s\n", URI);
+		        xmlErrMsgStr(ctxt, XML_ERR_INVALID_URI,
+				     "Invalid URI: %s\n", URI);
 			/*
 			 * This really ought to be a well formedness error
 			 * but the XML Core WG decided otherwise c.f. issue
@@ -4307,12 +4347,8 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
 
 		    uri = xmlParseURI((const char *)URI);
 		    if (uri == NULL) {
-			ctxt->errNo = XML_ERR_INVALID_URI;
-			if ((ctxt->sax != NULL) &&
-			    (!ctxt->disableSAX) &&
-			    (ctxt->sax->error != NULL))
-			    ctxt->sax->error(ctxt->userData,
-				        "Invalid URI: %s\n", URI);
+		        xmlErrMsgStr(ctxt, XML_ERR_INVALID_URI,
+				     "Invalid URI: %s\n", URI);
 			/*
 			 * This really ought to be a well formedness error
 			 * but the XML Core WG decided otherwise c.f. issue
@@ -5361,18 +5397,12 @@ xmlParseElementDecl(xmlParserCtxtPtr ctxt) {
 	     */
 	    if ((RAW == '%') && (ctxt->external == 0) &&
 	        (ctxt->inputNr == 1)) {
-		ctxt->errNo = XML_ERR_PEREF_IN_INT_SUBSET;
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData, 
+		xmlFatalErrMsg(ctxt, XML_ERR_PEREF_IN_INT_SUBSET,
 	  "PEReference: forbidden within markup decl in internal subset\n");
 	    } else {
-		ctxt->errNo = XML_ERR_ELEMCONTENT_NOT_STARTED;
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData, 
+		xmlFatalErrMsg(ctxt, XML_ERR_ELEMCONTENT_NOT_STARTED,
 		      "xmlParseElementDecl: 'EMPTY', 'ANY' or '(' expected\n");
             }
-	    ctxt->wellFormed = 0;
-	    if (ctxt->recovery == 0) ctxt->disableSAX = 1;
 	    return(-1);
 	}
 
@@ -5886,9 +5916,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
 			ctxt->depth--;
 		    } else {
 			ret = XML_ERR_ENTITY_PE_INTERNAL;
-			if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			    ctxt->sax->error(ctxt->userData,
-				"Internal: invalid entity type\n");
+			xmlErrMsgStr(ctxt, XML_ERR_INTERNAL_ERROR,
+				     "invalid entity type found\n", NULL);
 		    }
 		    if (ret == XML_ERR_ENTITY_LOOP) {
 			xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
@@ -6161,14 +6190,11 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) {
 			 (ctxt->hasPErefs == 0))) {
 			xmlFatalErrMsgStr(ctxt, XML_ERR_UNDECLARED_ENTITY,
 				 "Entity '%s' not defined\n", name);
-			ctxt->valid = 0;
 		    } else {
-			ctxt->errNo = XML_WAR_UNDECLARED_ENTITY;
-			if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			    ctxt->sax->error(ctxt->userData, 
+		        xmlErrMsgStr(ctxt, XML_WAR_UNDECLARED_ENTITY,
 				 "Entity '%s' not defined\n", name);
-			ctxt->valid = 0;
 		    }
+		    ctxt->valid = 0;
 		}
 
 		/*
@@ -6330,9 +6356,9 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) {
 			xmlFatalErrMsgStr(ctxt, XML_ERR_UNDECLARED_ENTITY,
 				 "Entity '%s' not defined\n", name);
 		    } else {
-			xmlWarningMsg(ctxt, XML_WAR_UNDECLARED_ENTITY,
+			xmlErrMsgStr(ctxt, XML_WAR_UNDECLARED_ENTITY,
 				      "Entity '%s' not defined\n",
-				      name, NULL);
+				      name);
 		    }
 		    /* TODO ? check regressions ctxt->valid = 0; */
 		}
@@ -6343,12 +6369,8 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) {
 		 * unparsed entity
 		 */
 		else if (ent->etype == XML_EXTERNAL_GENERAL_UNPARSED_ENTITY) {
-		    ctxt->errNo = XML_ERR_UNPARSED_ENTITY;
-		    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			ctxt->sax->error(ctxt->userData, 
+		    xmlFatalErrMsgStr(ctxt, XML_ERR_UNPARSED_ENTITY,
 			     "Entity reference to unparsed entity %s\n", name);
-		    ctxt->wellFormed = 0;
-		    if (ctxt->recovery == 0) ctxt->disableSAX = 1;
 		}
 
 		/*
@@ -6358,12 +6380,8 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) {
 		 */
 		else if ((ctxt->instate == XML_PARSER_ATTRIBUTE_VALUE) &&
 		         (ent->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY)) {
-		    ctxt->errNo = XML_ERR_ENTITY_IS_EXTERNAL;
-		    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			ctxt->sax->error(ctxt->userData, 
+		    xmlFatalErrMsgStr(ctxt, XML_ERR_ENTITY_IS_EXTERNAL,
 		     "Attribute references external entity '%s'\n", name);
-		    ctxt->wellFormed = 0;
-		    if (ctxt->recovery == 0) ctxt->disableSAX = 1;
 		}
 		/*
 		 * [ WFC: No < in Attribute Values ]
@@ -6376,12 +6394,9 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) {
 			 (!xmlStrEqual(ent->name, BAD_CAST "lt")) &&
 		         (ent->content != NULL) &&
 			 (xmlStrchr(ent->content, '<'))) {
-		    ctxt->errNo = XML_ERR_LT_IN_ATTRIBUTE;
-		    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			ctxt->sax->error(ctxt->userData, 
-	 "'<' in entity '%s' is not allowed in attributes values\n", name);
-		    ctxt->wellFormed = 0;
-		    if (ctxt->recovery == 0) ctxt->disableSAX = 1;
+		    xmlFatalErrMsgStr(ctxt, XML_ERR_LT_IN_ATTRIBUTE,
+		 "'<' in entity '%s' is not allowed in attributes values\n",
+	                              name);
 		}
 
 		/*
@@ -6391,12 +6406,9 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) {
 		    switch (ent->etype) {
 			case XML_INTERNAL_PARAMETER_ENTITY:
 			case XML_EXTERNAL_PARAMETER_ENTITY:
-			ctxt->errNo = XML_ERR_ENTITY_IS_PARAMETER;
-			if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-			    ctxt->sax->error(ctxt->userData, 
-		     "Attempt to reference the parameter entity '%s'\n", name);
-			ctxt->wellFormed = 0;
-			if (ctxt->recovery == 0) ctxt->disableSAX = 1;
+			    xmlFatalErrMsgStr(ctxt, XML_ERR_ENTITY_IS_PARAMETER,
+			 "Attempt to reference the parameter entity '%s'\n",
+			                      name);
 			break;
 			default:
 			break;
@@ -6820,7 +6832,7 @@ xmlParseAttribute(xmlParserCtxtPtr ctxt, xmlChar **value) {
     GROW;
     name = xmlParseName(ctxt);
     if (name == NULL) {
-	xmlFatalErrMsg(ctxt, XML_ERR_SPACE_REQUIRED,
+	xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 	               "error parsing attribute name\n");
         return(NULL);
     }
@@ -7049,7 +7061,7 @@ xmlParseEndTag1(xmlParserCtxtPtr ctxt, int line) {
 
     GROW;
     if ((RAW != '<') || (NXT(1) != '/')) {
-	xmlFatalErrMsg(ctxt, XML_ERR_SPACE_REQUIRED,
+	xmlFatalErrMsg(ctxt, XML_ERR_LTSLASH_REQUIRED,
 		       "xmlParseEndTag: '</' not found\n");
 	return;
     }
@@ -7074,20 +7086,10 @@ xmlParseEndTag1(xmlParserCtxtPtr ctxt, int line) {
      *
      */
     if (name != (xmlChar*)1) {
-	ctxt->errNo = XML_ERR_TAG_NAME_MISMATCH;
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) {
-	    if (name != NULL) {
-		ctxt->sax->error(ctxt->userData,
+        if (name == NULL) name = BAD_CAST "unparseable";
+        xmlFatalErrMsgStrIntStr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
 		     "Opening and ending tag mismatch: %s line %d and %s\n",
-		                 ctxt->name, line, name);
-            } else {
-		ctxt->sax->error(ctxt->userData,
-		     "Ending tag error for: %s line %d\n", ctxt->name, line);
-	    }
-
-	}     
-	ctxt->wellFormed = 0;
-	if (ctxt->recovery == 0) ctxt->disableSAX = 1;
+		                ctxt->name, line, name);
     }
 
     /*
@@ -8033,20 +8035,10 @@ xmlParseEndTag2(xmlParserCtxtPtr ctxt, const xmlChar *prefix,
      *
      */
     if (name != (xmlChar*)1) {
-	ctxt->errNo = XML_ERR_TAG_NAME_MISMATCH;
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) {
-	    if (name != NULL) {
-		ctxt->sax->error(ctxt->userData,
+        if (name == NULL) name = BAD_CAST "unparseable";
+        xmlFatalErrMsgStrIntStr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
 		     "Opening and ending tag mismatch: %s line %d and %s\n",
-		                 ctxt->name, line, name);
-            } else {
-		ctxt->sax->error(ctxt->userData,
-		     "Ending tag error for: %s line %d\n", ctxt->name, line);
-	    }
-
-	}     
-	ctxt->wellFormed = 0;
-	if (ctxt->recovery == 0) ctxt->disableSAX = 1;
+		                ctxt->name, line, name);
     }
 
     /*
@@ -8341,13 +8333,9 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
     if (RAW == '>') {
         NEXT1;
     } else {
-	ctxt->errNo = XML_ERR_GT_REQUIRED;
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData,
-	                     "Couldn't find end of Start Tag %s line %d\n",
-	                     name, line);
-	ctxt->wellFormed = 0;
-	if (ctxt->recovery == 0) ctxt->disableSAX = 1;
+        xmlFatalErrMsgStrIntStr(ctxt, XML_ERR_GT_REQUIRED,
+		     "Couldn't find end of Start Tag %s line %d\n",
+		                name, line, NULL);
 
 	/*
 	 * end of parsing of this node.
@@ -8376,12 +8364,10 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
      */
     xmlParseContent(ctxt);
     if (!IS_BYTE_CHAR(RAW)) {
-	ctxt->errNo = XML_ERR_TAG_NOT_FINISHED;
-	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData,
-	         "Premature end of data in tag %s line %d\n", name, line);
-	ctxt->wellFormed = 0;
-	if (ctxt->recovery == 0) ctxt->disableSAX = 1;
+        xmlFatalErrMsgStrIntStr(ctxt, XML_ERR_TAG_NOT_FINISHED,
+		     "Premature end of data in tag %s line %d\n"
+		     "Couldn't find end of Start Tag %s line %d\n",
+		                name, line, NULL);
 
 	/*
 	 * end of parsing of this node.
@@ -8649,9 +8635,7 @@ xmlParseEncodingDecl(xmlParserCtxtPtr ctxt) {
 	    if (handler != NULL) {
 		xmlSwitchToEncoding(ctxt, handler);
 	    } else {
-		ctxt->errNo = XML_ERR_UNSUPPORTED_ENCODING;
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData,
+		xmlFatalErrMsgStr(ctxt, XML_ERR_UNSUPPORTED_ENCODING,
 			"Unsupported encoding %s\n", encoding);
 		return(NULL);
 	    }
diff --git a/parserInternals.c b/parserInternals.c
index 8966d8ad..c07dd205 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -934,7 +934,7 @@ xmlNextChar(xmlParserCtxtPtr ctxt)
         (xmlParserInputGrow(ctxt->input, INPUT_CHUNK) <= 0))
         xmlPopInput(ctxt);
     return;
-  encoding_error:
+encoding_error:
     /*
      * If we detect an UTF8 error that probably mean that the
      * input encoding didn't get properly advertised in the
@@ -1045,7 +1045,7 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
 		    (ctxt->sax->error != NULL))
 		    ctxt->sax->error(ctxt->userData, 
 				     "Char 0x%X out of allowed range\n", val);
-		ctxt->errNo = XML_ERR_INVALID_ENCODING;
+		ctxt->errNo = XML_ERR_INVALID_CHAR;
 		ctxt->wellFormed = 0;
 		if (ctxt->recovery == 0) ctxt->disableSAX = 1;
 	    }    
diff --git a/result/HTML/doc2.htm.err b/result/HTML/doc2.htm.err
index 32ff4d8f..5ac09cd5 100644
--- a/result/HTML/doc2.htm.err
+++ b/result/HTML/doc2.htm.err
@@ -1,3 +1,3 @@
-./test/HTML/doc2.htm:10: error: Misplaced DOCTYPE declaration
+./test/HTML/doc2.htm:10: HTML parser error : Misplaced DOCTYPE declaration
 <!-- END Naviscope Javascript --><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Tra
                                  ^
diff --git a/result/HTML/doc3.htm.err b/result/HTML/doc3.htm.err
index 096ce780..1edc25b4 100644
--- a/result/HTML/doc3.htm.err
+++ b/result/HTML/doc3.htm.err
@@ -1,69 +1,70 @@
-./test/HTML/doc3.htm:10: error: Misplaced DOCTYPE declaration
+./test/HTML/doc3.htm:10: HTML parser error : Misplaced DOCTYPE declaration
 <!-- END Naviscope Javascript --><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN
                                  ^
-./test/HTML/doc3.htm:52: error: htmlParseEntityRef: expecting ';'
+./test/HTML/doc3.htm:52: HTML parser error : htmlParseEntityRef: expecting ';'
  href="http://ads.gamesquad.net/addclick.exe/adclick.cgi?REGION=game|tech|ent&id
                                                                                ^
-./test/HTML/doc3.htm:52: error: htmlParseEntityRef: expecting ';'
+./test/HTML/doc3.htm:52: HTML parser error : htmlParseEntityRef: expecting ';'
 _top"><img src="http://ads.gamesquad.net/addclick.exe/adcycle.cgi?group=52&media
                                                                                ^
-./test/HTML/doc3.htm:52: error: htmlParseEntityRef: expecting ';'
+./test/HTML/doc3.htm:52: HTML parser error : htmlParseEntityRef: expecting ';'
 ><img src="http://ads.gamesquad.net/addclick.exe/adcycle.cgi?group=52&media=1&id
                                                                                ^
-./test/HTML/doc3.htm:145: error: error parsing attribute name
+./test/HTML/doc3.htm:145: HTML parser error : error parsing attribute name
                         width=70 Gentus?.?></A><BR><A 
                                        ^
-./test/HTML/doc3.htm:148: error: Unexpected end tag : p
+./test/HTML/doc3.htm:148: HTML parser error : Unexpected end tag : p
   </P></TD></TR></TBODY></TABLE></CENTER></TD></TR></TBODY></TABLE></CENTER></P>
                                                                                ^
-./test/HTML/doc3.htm:236: error: Unexpected end tag : font
+./test/HTML/doc3.htm:236: HTML parser error : Unexpected end tag : font
             Specials<BR><BR></FONT></A><BR></FONT></A><B><FONT color=yellow 
                                                   ^
-./test/HTML/doc3.htm:236: error: Unexpected end tag : a
+./test/HTML/doc3.htm:236: HTML parser error : Unexpected end tag : a
             Specials<BR><BR></FONT></A><BR></FONT></A><B><FONT color=yellow 
                                                       ^
-./test/HTML/doc3.htm:747: error: htmlParseEntityRef: expecting ';'
+./test/HTML/doc3.htm:747: HTML parser error : htmlParseEntityRef: expecting ';'
 er=0 alt="Advertisement" src="http://ads.adflight.com/ad_static.asp?pid=2097&sid
                                                                                ^
-./test/HTML/doc3.htm:747: error: htmlParseEntityRef: expecting ';'
+./test/HTML/doc3.htm:747: HTML parser error : htmlParseEntityRef: expecting ';'
 Advertisement" src="http://ads.adflight.com/ad_static.asp?pid=2097&sid=1881&asid
                                                                                ^
-./test/HTML/doc3.htm:747: error: Unexpected end tag : li
+./test/HTML/doc3.htm:747: HTML parser error : Unexpected end tag : li
 light.com/ad_static.asp?pid=2097&sid=1881&asid=7708"></a></IFRAME></CENTER></LI>
                                                                                ^
-./test/HTML/doc3.htm:747: error: Unexpected end tag : font
+./test/HTML/doc3.htm:747: HTML parser error : Unexpected end tag : font
 om/ad_static.asp?pid=2097&sid=1881&asid=7708"></a></IFRAME></CENTER></LI></FONT>
                                                                                ^
-./test/HTML/doc3.htm:747: error: Unexpected end tag : p
+./test/HTML/doc3.htm:747: HTML parser error : Unexpected end tag : p
 =7708"></a></IFRAME></CENTER></LI></FONT></TD></TR></TBODY></TABLE></CENTER></P>
                                                                                ^
-./test/HTML/doc3.htm:772: error: Unexpected end tag : form
+./test/HTML/doc3.htm:772: HTML parser error : Unexpected end tag : form
             archive</A></FONT> </FORM></CENTER></TD></TR></TBODY></TABLE><!--			
                                       ^
-./test/HTML/doc3.htm:820: error: Unexpected end tag : a
+./test/HTML/doc3.htm:820: HTML parser error : Unexpected end tag : a
             </A></A></B><B></NOSCRIPT></B><B><!-- END GoTo.com Search Box --></B
                     ^
-./test/HTML/doc3.htm:820: error: Unexpected end tag : noscript
+./test/HTML/doc3.htm:820: HTML parser error : Unexpected end tag : noscript
             </A></A></B><B></NOSCRIPT></B><B><!-- END GoTo.com Search Box --></B
                                       ^
-./test/HTML/doc3.htm:826: error: Opening and ending tag mismatch: form and center
+ID submit already defined
+./test/HTML/doc3.htm:826: HTML parser error : Opening and ending tag mismatch: (null) and (null)
             </FORM><!-- Pricewatch Search Box --><A 
                    ^
-./test/HTML/doc3.htm:833: error: Unexpected end tag : p
+./test/HTML/doc3.htm:833: HTML parser error : Unexpected end tag : p
             Special<BR>Code:BP6-hd</FONT></A> </P></CENTER></TD></TR></TBODY></T
                                                   ^
-./test/HTML/doc3.htm:833: error: Opening and ending tag mismatch: center and td
+./test/HTML/doc3.htm:833: HTML parser error : Opening and ending tag mismatch: center and td
             Special<BR>Code:BP6-hd</FONT></A> </P></CENTER></TD></TR></TBODY></T
                                                            ^
-./test/HTML/doc3.htm:839: error: Unexpected end tag : p
+./test/HTML/doc3.htm:839: HTML parser error : Unexpected end tag : p
 width="100%">&nbsp;</TD></TR></TBODY></TABLE></P></CENTER></TR></TBODY></TABLE><
                                                  ^
-./test/HTML/doc3.htm:840: error: Unexpected end tag : td
+./test/HTML/doc3.htm:840: HTML parser error : Unexpected end tag : td
 <CENTER></CENTER></TD></TR><TR><TD COLSPAN="3" VALIGN="TOP" 
                       ^
-./test/HTML/doc3.htm:840: error: Unexpected end tag : tr
+./test/HTML/doc3.htm:840: HTML parser error : Unexpected end tag : tr
 <CENTER></CENTER></TD></TR><TR><TD COLSPAN="3" VALIGN="TOP" 
                            ^
-./test/HTML/doc3.htm:841: error: Unexpected end tag : table
+./test/HTML/doc3.htm:841: HTML parser error : Unexpected end tag : table
 HEIGHT="70">&nbsp;</TD> </TR></TABLE>
                                      ^
diff --git a/result/HTML/entities.html.err b/result/HTML/entities.html.err
index e9bfcfa2..180fa9f9 100644
--- a/result/HTML/entities.html.err
+++ b/result/HTML/entities.html.err
@@ -1,12 +1,12 @@
-./test/HTML/entities.html:1: error: htmlParseEntityRef: expecting ';'
+./test/HTML/entities.html:1: HTML parser error : htmlParseEntityRef: expecting ';'
 <p tst="a&amp;b" tst2="a&b" tst3="a & b">
                           ^
-./test/HTML/entities.html:1: error: htmlParseEntityRef: no name
+./test/HTML/entities.html:1: HTML parser error : htmlParseEntityRef: no name
 <p tst="a&amp;b" tst2="a&b" tst3="a & b">
                                      ^
-./test/HTML/entities.html:3: error: htmlParseEntityRef: expecting ';'
+./test/HTML/entities.html:3: HTML parser error : htmlParseEntityRef: expecting ';'
 a&b
    ^
-./test/HTML/entities.html:4: error: htmlParseEntityRef: no name
+./test/HTML/entities.html:4: HTML parser error : htmlParseEntityRef: no name
 a & b
    ^
diff --git a/result/HTML/fp40.htm.err b/result/HTML/fp40.htm.err
index 0ddb59f2..6ab388f5 100644
--- a/result/HTML/fp40.htm.err
+++ b/result/HTML/fp40.htm.err
@@ -1,3 +1,3 @@
-./test/HTML/fp40.htm:153: error: htmlParseEntityRef: no name
+./test/HTML/fp40.htm:153: HTML parser error : htmlParseEntityRef: no name
 technical articles from Microsoft's extensive Knowledge Base, FAQs, & troublesho
                                                                      ^
diff --git a/result/HTML/reg4.html.err b/result/HTML/reg4.html.err
index 10db868a..6515f70d 100644
--- a/result/HTML/reg4.html.err
+++ b/result/HTML/reg4.html.err
@@ -1,3 +1,3 @@
-./test/HTML/reg4.html:10: error: Unexpected end tag : p
+./test/HTML/reg4.html:10: HTML parser error : Unexpected end tag : p
 </p>
     ^
diff --git a/result/HTML/test3.html.err b/result/HTML/test3.html.err
index 3a7b7310..d967d1f4 100644
--- a/result/HTML/test3.html.err
+++ b/result/HTML/test3.html.err
@@ -1,12 +1,12 @@
-./test/HTML/test3.html:6: error: Unexpected end tag : p
+./test/HTML/test3.html:6: HTML parser error : Unexpected end tag : p
 </a><p><hr></p>
                ^
-./test/HTML/test3.html:13: error: Unexpected end tag : p
+./test/HTML/test3.html:13: HTML parser error : Unexpected end tag : p
 <p><hr></p>
            ^
-./test/HTML/test3.html:27: error: Opening and ending tag mismatch: h4 and b
+./test/HTML/test3.html:27: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 <h4><b>Links</h4></b>
                  ^
-./test/HTML/test3.html:27: error: Unexpected end tag : b
+./test/HTML/test3.html:27: HTML parser error : Unexpected end tag : b
 <h4><b>Links</h4></b>
                      ^
diff --git a/result/HTML/wired.html.err b/result/HTML/wired.html.err
index 0e96b39d..73779318 100644
--- a/result/HTML/wired.html.err
+++ b/result/HTML/wired.html.err
@@ -1,249 +1,249 @@
-./test/HTML/wired.html:6: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:6: HTML parser error : htmlParseEntityRef: expecting ';'
 <FORM METHOD=GET ACTION="http://nsads.hotwired.com/event.ng/Type=click&ProfileID
                                                                                ^
-./test/HTML/wired.html:6: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:6: HTML parser error : htmlParseEntityRef: expecting ';'
 D=GET ACTION="http://nsads.hotwired.com/event.ng/Type=click&ProfileID=9688&RunID
                                                                                ^
-./test/HTML/wired.html:6: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:6: HTML parser error : htmlParseEntityRef: expecting ';'
 N="http://nsads.hotwired.com/event.ng/Type=click&ProfileID=9688&RunID=14074&AdID
                                                                                ^
-./test/HTML/wired.html:6: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:6: HTML parser error : htmlParseEntityRef: expecting ';'
 s.hotwired.com/event.ng/Type=click&ProfileID=9688&RunID=14074&AdID=22584&GroupID
                                                                                ^
-./test/HTML/wired.html:6: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:6: HTML parser error : htmlParseEntityRef: expecting ';'
 com/event.ng/Type=click&ProfileID=9688&RunID=14074&AdID=22584&GroupID=1&FamilyID
                                                                                ^
-./test/HTML/wired.html:6: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:6: HTML parser error : htmlParseEntityRef: expecting ';'
 pe=click&ProfileID=9688&RunID=14074&AdID=22584&GroupID=1&FamilyID=2684&TagValues
                                                                                ^
-./test/HTML/wired.html:52: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:52: HTML parser error : htmlParseEntityRef: expecting ';'
 " align="RIGHT"><a href="http://nsads.hotwired.com/event.ng/Type=click&ProfileID
                                                                                ^
-./test/HTML/wired.html:52: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:52: HTML parser error : htmlParseEntityRef: expecting ';'
 GHT"><a href="http://nsads.hotwired.com/event.ng/Type=click&ProfileID=5597&RunID
                                                                                ^
-./test/HTML/wired.html:52: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:52: HTML parser error : htmlParseEntityRef: expecting ';'
 f="http://nsads.hotwired.com/event.ng/Type=click&ProfileID=5597&RunID=17167&AdID
                                                                                ^
-./test/HTML/wired.html:52: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:52: HTML parser error : htmlParseEntityRef: expecting ';'
 s.hotwired.com/event.ng/Type=click&ProfileID=5597&RunID=17167&AdID=22588&GroupID
                                                                                ^
-./test/HTML/wired.html:52: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:52: HTML parser error : htmlParseEntityRef: expecting ';'
 com/event.ng/Type=click&ProfileID=5597&RunID=17167&AdID=22588&GroupID=1&FamilyID
                                                                                ^
-./test/HTML/wired.html:52: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:52: HTML parser error : htmlParseEntityRef: expecting ';'
 pe=click&ProfileID=5597&RunID=17167&AdID=22588&GroupID=1&FamilyID=3228&TagValues
                                                                                ^
-./test/HTML/wired.html:70: error: Tag nobr invalid
+./test/HTML/wired.html:70: HTML parser error : Tag nobr invalid
 <td bgcolor="#FF0000" align="left" valign="center"><nobr><img src="http://static
                                                         ^
-./test/HTML/wired.html:89: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:89: HTML parser error : htmlParseEntityRef: expecting ';'
 on value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter
                                                                                ^
-./test/HTML/wired.html:89: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:89: HTML parser error : htmlParseEntityRef: expecting ';'
 d.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate
                                                                                ^
-./test/HTML/wired.html:89: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:89: HTML parser error : htmlParseEntityRef: expecting ';'
 ction=FilterSearch&Filter=docs_filter.hts&ResultTemplate=vignette.hts&Collection
                                                                                ^
-./test/HTML/wired.html:89: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:89: HTML parser error : htmlParseEntityRef: expecting ';'
 Filter=docs_filter.hts&ResultTemplate=vignette.hts&Collection=vignette&QueryMode
                                                                                ^
-./test/HTML/wired.html:89: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:89: HTML parser error : htmlParseEntityRef: expecting ';'
 ter.hts&ResultTemplate=vignette.hts&Collection=vignette&QueryMode=Internet&Query
                                                                                ^
-./test/HTML/wired.html:90: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:90: HTML parser error : htmlParseEntityRef: expecting ';'
 on value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter
                                                                                ^
-./test/HTML/wired.html:90: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:90: HTML parser error : htmlParseEntityRef: expecting ';'
 d.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate
                                                                                ^
-./test/HTML/wired.html:90: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:90: HTML parser error : htmlParseEntityRef: expecting ';'
 tion=FilterSearch&Filter=docs_filter.hts&ResultTemplate=webmonkey.hts&Collection
                                                                                ^
-./test/HTML/wired.html:90: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:90: HTML parser error : htmlParseEntityRef: expecting ';'
 lter=docs_filter.hts&ResultTemplate=webmonkey.hts&Collection=webmonkey&QueryMode
                                                                                ^
-./test/HTML/wired.html:90: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:90: HTML parser error : htmlParseEntityRef: expecting ';'
 r.hts&ResultTemplate=webmonkey.hts&Collection=webmonkey&QueryMode=Internet&Query
                                                                                ^
-./test/HTML/wired.html:91: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:91: HTML parser error : htmlParseEntityRef: expecting ';'
 ="http://search.hotwired.com/search97/s97.vts?collection=webmonkey_guides&Action
                                                                                ^
-./test/HTML/wired.html:91: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:91: HTML parser error : htmlParseEntityRef: expecting ';'
 ired.com/search97/s97.vts?collection=webmonkey_guides&Action=FilterSearch&filter
                                                                                ^
-./test/HTML/wired.html:91: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:91: HTML parser error : htmlParseEntityRef: expecting ';'
 ction=webmonkey_guides&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate
                                                                                ^
-./test/HTML/wired.html:91: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:91: HTML parser error : htmlParseEntityRef: expecting ';'
 ilterSearch&filter=docs_filter.hts&ResultTemplate=webmonkey_guides.hts&QueryMode
                                                                                ^
-./test/HTML/wired.html:91: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:91: HTML parser error : htmlParseEntityRef: expecting ';'
 ter=docs_filter.hts&ResultTemplate=webmonkey_guides.hts&QueryMode=Internet&Query
                                                                                ^
-./test/HTML/wired.html:92: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:92: HTML parser error : htmlParseEntityRef: expecting ';'
 on value="http://search.hotwired.com/search97/s97.vts?collection=hotwired&Action
                                                                                ^
-./test/HTML/wired.html:92: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:92: HTML parser error : htmlParseEntityRef: expecting ';'
 rch.hotwired.com/search97/s97.vts?collection=hotwired&Action=FilterSearch&filter
                                                                                ^
-./test/HTML/wired.html:92: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:92: HTML parser error : htmlParseEntityRef: expecting ';'
 ts?collection=hotwired&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate
                                                                                ^
-./test/HTML/wired.html:92: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:92: HTML parser error : htmlParseEntityRef: expecting ';'
 ilterSearch&filter=docs_filter.hts&ResultTemplate=hotwired_archive.hts&QueryMode
                                                                                ^
-./test/HTML/wired.html:92: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:92: HTML parser error : htmlParseEntityRef: expecting ';'
 ter=docs_filter.hts&ResultTemplate=hotwired_archive.hts&QueryMode=Internet&Query
                                                                                ^
-./test/HTML/wired.html:93: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:93: HTML parser error : htmlParseEntityRef: expecting ';'
 on value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter
                                                                                ^
-./test/HTML/wired.html:93: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:93: HTML parser error : htmlParseEntityRef: expecting ';'
 d.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate
                                                                                ^
-./test/HTML/wired.html:93: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:93: HTML parser error : htmlParseEntityRef: expecting ';'
 ction=FilterSearch&Filter=docs_filter.hts&ResultTemplate=magazine.hts&Collection
                                                                                ^
-./test/HTML/wired.html:93: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:93: HTML parser error : htmlParseEntityRef: expecting ';'
 Filter=docs_filter.hts&ResultTemplate=magazine.hts&Collection=magazine&QueryMode
                                                                                ^
-./test/HTML/wired.html:93: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:93: HTML parser error : htmlParseEntityRef: expecting ';'
 ter.hts&ResultTemplate=magazine.hts&Collection=magazine&QueryMode=Internet&Query
                                                                                ^
-./test/HTML/wired.html:94: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:94: HTML parser error : htmlParseEntityRef: expecting ';'
 on value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter
                                                                                ^
-./test/HTML/wired.html:94: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:94: HTML parser error : htmlParseEntityRef: expecting ';'
 d.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate
                                                                                ^
-./test/HTML/wired.html:94: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:94: HTML parser error : htmlParseEntityRef: expecting ';'
 tion=FilterSearch&Filter=docs_filter.hts&ResultTemplate=animation.hts&Collection
                                                                                ^
-./test/HTML/wired.html:94: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:94: HTML parser error : htmlParseEntityRef: expecting ';'
 lter=docs_filter.hts&ResultTemplate=animation.hts&Collection=animation&QueryMode
                                                                                ^
-./test/HTML/wired.html:94: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:94: HTML parser error : htmlParseEntityRef: expecting ';'
 r.hts&ResultTemplate=animation.hts&Collection=animation&QueryMode=Internet&Query
                                                                                ^
-./test/HTML/wired.html:95: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:95: HTML parser error : htmlParseEntityRef: expecting ';'
 option value="http://search.hotwired.com/search97/s97.vts?collection=suck&Action
                                                                                ^
-./test/HTML/wired.html:95: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:95: HTML parser error : htmlParseEntityRef: expecting ';'
 /search.hotwired.com/search97/s97.vts?collection=suck&Action=FilterSearch&filter
                                                                                ^
-./test/HTML/wired.html:95: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:95: HTML parser error : htmlParseEntityRef: expecting ';'
 97.vts?collection=suck&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate
                                                                                ^
-./test/HTML/wired.html:95: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:95: HTML parser error : htmlParseEntityRef: expecting ';'
 uck&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate=suck.hts&QueryMode
                                                                                ^
-./test/HTML/wired.html:95: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:95: HTML parser error : htmlParseEntityRef: expecting ';'
 erSearch&filter=docs_filter.hts&ResultTemplate=suck.hts&QueryMode=Internet&Query
                                                                                ^
-./test/HTML/wired.html:96: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:96: HTML parser error : htmlParseEntityRef: expecting ';'
 lue="http://search.hotwired.com/search97/s97.vts?collection=uber_hotwired&Action
                                                                                ^
-./test/HTML/wired.html:96: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:96: HTML parser error : htmlParseEntityRef: expecting ';'
 otwired.com/search97/s97.vts?collection=uber_hotwired&Action=FilterSearch&filter
                                                                                ^
-./test/HTML/wired.html:96: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:96: HTML parser error : htmlParseEntityRef: expecting ';'
 llection=uber_hotwired&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate
                                                                                ^
-./test/HTML/wired.html:96: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:96: HTML parser error : htmlParseEntityRef: expecting ';'
 n=FilterSearch&filter=docs_filter.hts&ResultTemplate=uber_hotwired.hts&QueryMode
                                                                                ^
-./test/HTML/wired.html:96: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:96: HTML parser error : htmlParseEntityRef: expecting ';'
 filter=docs_filter.hts&ResultTemplate=uber_hotwired.hts&QueryMode=Internet&Query
                                                                                ^
-./test/HTML/wired.html:97: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:97: HTML parser error : htmlParseEntityRef: expecting ';'
  <option value="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&O
                                                ^
-./test/HTML/wired.html:97: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:97: HTML parser error : htmlParseEntityRef: expecting ';'
  <option value="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&O
                                                     ^
-./test/HTML/wired.html:97: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:97: HTML parser error : htmlParseEntityRef: expecting ';'
  <option value="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&O
                                                            ^
-./test/HTML/wired.html:97: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:97: HTML parser error : htmlParseEntityRef: expecting ';'
  <option value="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&O
                                                                  ^
-./test/HTML/wired.html:97: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:97: HTML parser error : htmlParseEntityRef: expecting ';'
  <option value="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&O
                                                                        ^
-./test/HTML/wired.html:97: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:97: HTML parser error : htmlParseEntityRef: expecting ';'
  <option value="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&O
                                                                             ^
-./test/HTML/wired.html:97: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:97: HTML parser error : htmlParseEntityRef: expecting ';'
 option value="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&OPs
                                                                                ^
-./test/HTML/wired.html:97: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:97: HTML parser error : htmlParseEntityRef: expecting ';'
 lue="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&OPs=MDRTP&MT
                                                                                ^
-./test/HTML/wired.html:170: error: Unexpected end tag : form
+./test/HTML/wired.html:170: HTML parser error : Unexpected end tag : form
 	</tr>    </form>
 	                ^
-./test/HTML/wired.html:248: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:248: HTML parser error : htmlParseEntityRef: expecting ';'
 MG SRC="http://barnesandnoble.bfast.com/booklink/serve?sourceid=383471&is_search
                                                                                ^
-./test/HTML/wired.html:265: error: Unexpected end tag : form
+./test/HTML/wired.html:265: HTML parser error : Unexpected end tag : form
         </tr>  </form>
                       ^
-./test/HTML/wired.html:346: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:346: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 </td>
      ^
-./test/HTML/wired.html:374: error: htmlParseEntityRef: no name
+./test/HTML/wired.html:374: HTML parser error : htmlParseEntityRef: no name
 a, sans-serif"><b><a href="/news/commentarySection/0,1292,31926,00.html">Rants &
                                                                                ^
-./test/HTML/wired.html:374: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:374: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</font><br><br>  </td
                                                                                ^
-./test/HTML/wired.html:374: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:374: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</font><br><br>  </td
                                                                                ^
-./test/HTML/wired.html:402: error: Opening and ending tag mismatch: a and font
+./test/HTML/wired.html:402: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 w.vignette.com/" style="text-decoration:none"><font color="#000000">Vignette</a>
                                                                                ^
-./test/HTML/wired.html:407: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:407: HTML parser error : htmlParseEntityRef: expecting ';'
 ervlet/appservlet?from=/wired/sprint/&template=/security/security.html&SITE=
                                               ^
-./test/HTML/wired.html:407: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:407: HTML parser error : htmlParseEntityRef: expecting ';'
 ervlet/appservlet?from=/wired/sprint/&template=/security/security.html&SITE=
                                                                            ^
-./test/HTML/wired.html:408: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:408: HTML parser error : htmlParseEntityRef: expecting ';'
 wired.com&BANNER=Sprint" style="text-decoration:none"><font color="#000000">Spri
                 ^
-./test/HTML/wired.html:408: error: Opening and ending tag mismatch: a and font
+./test/HTML/wired.html:408: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 com&BANNER=Sprint" style="text-decoration:none"><font color="#000000">Sprint</a>
                                                                                ^
-./test/HTML/wired.html:408: error: End tag : expected '>'
+./test/HTML/wired.html:408: HTML parser error : End tag : expected '>'
 =Sprint" style="text-decoration:none"><font color="#000000">Sprint</a></i></font
                                                                                ^
-./test/HTML/wired.html:414: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 </td>
      ^
-./test/HTML/wired.html:414: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 </td>
      ^
-./test/HTML/wired.html:414: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 </td>
      ^
-./test/HTML/wired.html:414: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 </td>
      ^
-./test/HTML/wired.html:414: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 </td>
      ^
-./test/HTML/wired.html:414: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 </td>
      ^
-./test/HTML/wired.html:414: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 </td>
      ^
-./test/HTML/wired.html:414: error: Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null)
 </td>
      ^
-./test/HTML/wired.html:432: error: htmlParseEntityRef: expecting ';'
+./test/HTML/wired.html:432: HTML parser error : htmlParseEntityRef: expecting ';'
 href="http://www.lycos.com/news/flash/hitlerbunker.html?v=wn1015&lpv=1">Lycos</a
                                                                     ^