From e5eb09198d2a86dbb55ba63665a7bd7eb5fad19f Mon Sep 17 00:00:00 2001
From: Jim Derry <balthisar@gmail.com>
Date: Wed, 30 Aug 2017 20:01:44 -0400
Subject: [PATCH 1/5] Begin migration towards "one output function to rule them
 all." Consolidated the basic reporting functions that share the same
 signature. This also resulted in eliminating a string, and adding a new
 string to disambiguate between errors and warnings.

---
 include/tidyenum.h |   2 +-
 src/clean.c        |   2 +-
 src/language_en.h  |   6 +-
 src/language_fr.h  |   2 +-
 src/lexer.c        |  22 +--
 src/message.c      | 252 ++++++++++++-------------------
 src/message.h      |   3 -
 src/parser.c       | 362 ++++++++++++++++++++++-----------------------
 src/tags.c         |   2 +-
 src/tidylib.c      |  28 ++--
 10 files changed, 304 insertions(+), 377 deletions(-)

diff --git a/include/tidyenum.h b/include/tidyenum.h
index 58454fe..d21e1ca 100644
--- a/include/tidyenum.h
+++ b/include/tidyenum.h
@@ -260,7 +260,6 @@ extern "C" {
     FN(BAD_SURROGATE_TAIL)            \
     /* ReportWarning */               \
     FN(BAD_SUMMARY_HTML5)             \
-    FN(COERCE_TO_ENDTAG_WARN)         \
     FN(NESTED_EMPHASIS)               \
     FN(NESTED_QUOTATION)              \
     FN(OBSOLETE_ELEMENT)              \
@@ -271,6 +270,7 @@ extern "C" {
     FN(ELEMENT_NOT_EMPTY)             \
     FN(UNEXPECTED_END_OF_FILE)        \
     FN(UNEXPECTED_ENDTAG)             \
+    FN(UNEXPECTED_ENDTAG_ERR)         \
     FN(MOVED_STYLE_TO_HEAD)           \
     FN(FOUND_STYLE_IN_BODY)
     
diff --git a/src/clean.c b/src/clean.c
index 9ef3d8b..7b56f34 100644
--- a/src/clean.c
+++ b/src/clean.c
@@ -1986,7 +1986,7 @@ void TY_(CleanWord2000)( TidyDocImpl* doc, Node *node)
              * meaning this result would not ordinarily be displayed.
              */
             Node* next;
-            TY_(ReportError)(doc, NULL, node, PROPRIETARY_ELEMENT);
+            TY_(ReportNotice)(doc, NULL, node, PROPRIETARY_ELEMENT);
             DiscardContainer( doc, node, &next );
             node = next;
             continue;
diff --git a/src/language_en.h b/src/language_en.h
index 976acda..d597834 100644
--- a/src/language_en.h
+++ b/src/language_en.h
@@ -1891,17 +1891,17 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { BAD_SURROGATE_TAIL,           0,   "Leading (High) surrogate pair U+%04X, with no trailing (Low) entity, replaced with U+FFFD." }, /* ReportSurrogateError */
     
     { BAD_SUMMARY_HTML5,            0,   "The summary attribute on the %s element is obsolete in HTML5"            }, /* ReportWarning */
-    { COERCE_TO_ENDTAG_WARN,        0,   "<%s> is probably intended as </%s>"                                      }, /* ReportWarning */
     { NESTED_EMPHASIS,              0,   "nested emphasis %s"                                                      }, /* ReportWarning */
     { NESTED_QUOTATION,             0,   "nested q elements, possible typo."                                       }, /* ReportWarning */
     { OBSOLETE_ELEMENT,             0,   "replacing obsolete element %s with %s"                                   }, /* ReportWarning */
     { REMOVED_HTML5,                0,   "%s element removed from HTML5"                                           }, /* ReportWarning */
     { XML_DECLARATION_DETECTED,     0,   "An XML declaration was detected. Did you mean to use input-xml?"         }, /* ReportWarning */
     
-    { COERCE_TO_ENDTAG,             0,   "<%s> is probably intended as </%s>"                                      }, /* ReportError, ReportWarning */
+    { COERCE_TO_ENDTAG,             0,   "<%s> is probably intended as </%s>"                                      }, /* ReportWarning */
     { ELEMENT_NOT_EMPTY,            0,   "%s element not empty or not closed"                                      }, /* ReportError, ReportAttrError */
     { UNEXPECTED_END_OF_FILE,       0,   "unexpected end of file %s"                                               }, /* ReportError, ReportAttrError */
-    { UNEXPECTED_ENDTAG,            0,   "unexpected </%s>"                                                        }, /* ReportError, ReportFatal */
+    { UNEXPECTED_ENDTAG,            0,   "unexpected </%s>"                                                        }, /* ReportWarning */
+    { UNEXPECTED_ENDTAG_ERR,        0,   "unexpected </%s>"                                                        }, /* ReportError */
     { MOVED_STYLE_TO_HEAD,          0,   "moved <style> tag to <head>! fix-style-tags: no to avoid."               }, /* ReportWarning */
     { FOUND_STYLE_IN_BODY,          0,   "found <style> tag in <body>! fix-style-tags: yes to move."               }, /* ReportWarning */
 
diff --git a/src/language_fr.h b/src/language_fr.h
index 500dfee..b3ec0c3 100644
--- a/src/language_fr.h
+++ b/src/language_fr.h
@@ -874,7 +874,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "+FFFD."
     },
     { BAD_SUMMARY_HTML5,                             0, "L'attribut summary sur l'élément %s est obsolète avec HTML5"                                            },
-    { COERCE_TO_ENDTAG_WARN,                         0, "<%s> est probablement destiné à </%s>"                                                                  },
     { NESTED_EMPHASIS,                               0, "accentuation imbriquée %s"                                                                              },
     { NESTED_QUOTATION,                              0, "éléments \"q\" imbriqués, erreur typographique possible"                                                },
     { OBSOLETE_ELEMENT,                              0, "remplacement de l'élément obsolète %s par %s"                                                           },
@@ -884,6 +883,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { ELEMENT_NOT_EMPTY,                             0, "%s élément non vide ou non fermé"                                                                       },
     { UNEXPECTED_END_OF_FILE,                        0, "fin de fichier inattendue %s"                                                                           },
     { UNEXPECTED_ENDTAG,                             0, "</%s> inattendu"                                                                                        },
+    { UNEXPECTED_ENDTAG_ERR,                         0, "</%s> inattendu"                                                                                        },
 
 #if SUPPORT_ACCESSIBILITY_CHECKS
     { IMG_MISSING_ALT,                               0, "[1.1.1.1]: <img> texte manquant 'alt'."                                                                 },
diff --git a/src/lexer.c b/src/lexer.c
index 667d69c..6b1ac31 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -2454,7 +2454,7 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
                 if ((TY_(IsJavaScript)(container)) && cfgBool(doc, TidyEscapeScripts))
                 {
                     /* Issue #281 - only warn if adding the escape! */
-                    TY_(ReportError)(doc, NULL, NULL, BAD_CDATA_CONTENT);
+                    TY_(ReportNotice)(doc, NULL, NULL, BAD_CDATA_CONTENT);
 
                     for (i = lexer->lexsize; i > start-1; --i)
                         lexer->lexbuf[i] = lexer->lexbuf[i-1];
@@ -2472,7 +2472,7 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
         lexer->txtend = lexer->lexsize;
 
     if (c == EndOfStream)
-        TY_(ReportError)(doc, container, NULL, MISSING_ENDTAG_FOR );
+        TY_(ReportNotice)(doc, container, NULL, MISSING_ENDTAG_FOR );
 
 /* this was disabled for some reason... */
 #if 0
@@ -2764,7 +2764,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                             continue;
                         }
 
-                        TY_(ReportError)(doc, NULL, NULL, MALFORMED_COMMENT );
+                        TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_COMMENT );
                     }
                     else if (c == 'd' || c == 'D')
                     {
@@ -3013,9 +3013,9 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                            for older HTML, because it's not truly supported
                            by the standard, although Tidy will allow it. */
                         if ( (doc->lexer->doctype & VERS_HTML5) > 0 && TY_(elementIsAutonomousCustomFormat)( lexer->token->element ) )
-                            TY_(ReportFatal)( doc, NULL, lexer->token, UNKNOWN_ELEMENT_LOOKS_CUSTOM );
+                            TY_(ReportNotice)( doc, NULL, lexer->token, UNKNOWN_ELEMENT_LOOKS_CUSTOM );
                         else
-                            TY_(ReportFatal)( doc, NULL, lexer->token, UNKNOWN_ELEMENT );
+                            TY_(ReportNotice)( doc, NULL, lexer->token, UNKNOWN_ELEMENT );
                     }
                 }
                 else if ( !cfgBool(doc, TidyXmlTags) )
@@ -3048,7 +3048,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                 if (c == '>')
                 {
                     if (badcomment)
-                        TY_(ReportError)(doc, NULL, NULL, MALFORMED_COMMENT );
+                        TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_COMMENT );
 
                     /* do not store closing -- in lexbuf */
                     lexer->lexsize -= 2;
@@ -3163,7 +3163,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
 
                     if (c == EndOfStream)
                     {
-                        TY_(ReportError)(doc, NULL, NULL, UNEXPECTED_END_OF_FILE );
+                        TY_(ReportNotice)(doc, NULL, NULL, UNEXPECTED_END_OF_FILE );
                         TY_(UngetChar)(c, doc->docIn);
                         continue;
                     }
@@ -3474,7 +3474,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
     else if (lexer->state == LEX_COMMENT) /* comment */
     {
         if (c == EndOfStream)
-            TY_(ReportError)(doc, NULL, NULL, MALFORMED_COMMENT );
+            TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_COMMENT );
 
         lexer->txtend = lexer->lexsize;
         lexer->lexbuf[lexer->lexsize] = '\0';
@@ -4111,7 +4111,7 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
              !(TY_(IsUrl)(doc, name) && TY_(tmbstrncmp)(lexer->lexbuf+start, "javascript:", 11) == 0) &&
              !(TY_(tmbstrncmp)(lexer->lexbuf+start, "<xml ", 5) == 0)
            )
-            TY_(ReportFatal)( doc, NULL, NULL, SUSPECTED_MISSING_QUOTE ); 
+            TY_(ReportNotice)( doc, NULL, NULL, SUSPECTED_MISSING_QUOTE ); 
     }
 
     len = lexer->lexsize - start;
@@ -4383,7 +4383,7 @@ static Node *ParseDocTypeDecl(TidyDocImpl* doc)
 
                 if (!node->element || !IsValidXMLElemName(node->element))
                 {
-                    TY_(ReportError)(doc, NULL, NULL, MALFORMED_DOCTYPE);
+                    TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_DOCTYPE);
                     TY_(FreeNode)(doc, node);
                     return NULL;
                 }
@@ -4469,7 +4469,7 @@ static Node *ParseDocTypeDecl(TidyDocImpl* doc)
     }
 
     /* document type declaration not finished */
-    TY_(ReportError)(doc, NULL, NULL, MALFORMED_DOCTYPE);
+    TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_DOCTYPE);
     TY_(FreeNode)(doc, node);
     return NULL;
 }
diff --git a/src/message.c b/src/message.c
index f0e766a..cf3ab3b 100755
--- a/src/message.c
+++ b/src/message.c
@@ -209,18 +209,56 @@ static void messageOut( TidyMessageImpl *message )
 void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
 {
     TidyMessageImpl *message = NULL;
+    TidyMessageImpl *message2 = NULL; /* extra, when TidyShowWarnings */
     Node* rpt = ( element ? element : node );
     char nodedesc[256] = { 0 };
     char elemdesc[256] = { 0 };
+    uint versionEmitted, declared, version;
+    ctmbstr extra_string = NULL;
     ctmbstr tagtype;
     
     TagToString(node, nodedesc, sizeof(nodedesc));
 
     switch (code)
     {
+        case INSERTING_TAG:
+        case MISSING_STARTTAG:
+        case TOO_MANY_ELEMENTS:
+        case UNEXPECTED_ENDTAG:
+            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, node->element );
+            break;
+
+        case CANT_BE_NESTED:
+        case NOFRAMES_CONTENT:
+        case PROPRIETARY_ELEMENT:
+        case UNESCAPED_ELEMENT:
+        case USING_BR_INPLACE_OF:
+            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc );
+            break;
+
+        case ELEMENT_NOT_EMPTY:
+        case FOUND_STYLE_IN_BODY:
+        case ILLEGAL_NESTING:
+        case MOVED_STYLE_TO_HEAD:
         case TRIM_EMPTY_ELEMENT:
-            TagToString(element, elemdesc, sizeof(nodedesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc );
+        case UNEXPECTED_END_OF_FILE:
+            TagToString(element, elemdesc, sizeof(elemdesc));
+            message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc);
+            break;
+
+        case BAD_CDATA_CONTENT:
+        case BAD_COMMENT_CHARS:
+        case BAD_XML_COMMENT:
+        case CONTENT_AFTER_BODY:
+        case DOCTYPE_AFTER_TAGS:
+        case DTYPE_NOT_UPPER_CASE:
+        case INCONSISTENT_NAMESPACE:
+        case INCONSISTENT_VERSION:
+        case MALFORMED_COMMENT:
+        case MALFORMED_DOCTYPE:
+        case MISSING_TITLE_ELEMENT:
+        case NESTED_QUOTATION:
+            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning );
             break;
 
         case REPLACING_ELEMENT:
@@ -228,9 +266,51 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
             message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
             break;
 
+        case OBSOLETE_ELEMENT:
+        case REPLACING_UNEX_ELEMENT:
+            TagToString(element, elemdesc, sizeof(elemdesc));
+            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
+            break;
+
+        case MISSING_ENDTAG_FOR:
+            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element );
+            break;
+
+        case MISSING_ENDTAG_BEFORE:
+            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element, nodedesc );
+            break;
+            
+        case BAD_SUMMARY_HTML5:
+        case NESTED_EMPHASIS:
+        case REMOVED_HTML5:
+            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, nodedesc );
+            break;
+
+        case COERCE_TO_ENDTAG:
+        case NON_MATCHING_ENDTAG:
+            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, node->element, node->element );
+            break;
+
+        case ENCODING_IO_CONFLICT:
+        case MISSING_DOCTYPE:
+        case SPACE_PRECEDING_XMLDECL:
+        case XML_DECLARATION_DETECTED:
+            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning );
+            break;
+
+        case ELEMENT_VERS_MISMATCH_WARN:
+            versionEmitted = doc->lexer->versionEmitted;
+            declared = doc->lexer->doctype;
+            version = versionEmitted == 0 ? declared : versionEmitted;
+            extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
+            if (!extra_string)
+                extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
+            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, extra_string );
+            break;
+
         case CUSTOM_TAG_DETECTED:
             TagToString(element, elemdesc, sizeof(elemdesc));
-            
+
             switch ( cfg( doc, TidyUseCustomTags ) )
             {
                 case TidyCustomBlocklevel:
@@ -249,92 +329,6 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
             }
             message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyInfo, elemdesc, tagtype );
             break;
-		case MOVED_STYLE_TO_HEAD:
-		case FOUND_STYLE_IN_BODY:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc);
-            break;
-    }
-
-    messageOut( message );
-}
-
-
-void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code)
-{
-    TidyMessageImpl *message = NULL;
-    Node* rpt = (element ? element : node);
-    char nodedesc[256] = { 0 };
-    char elemdesc[256] = { 0 };
-
-    TagToString(node, nodedesc, sizeof(nodedesc));
-
-    switch (code)
-    {
-        case NESTED_QUOTATION:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning );
-            break;
-
-        case OBSOLETE_ELEMENT:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
-            break;
-
-        case NESTED_EMPHASIS:
-        case REMOVED_HTML5:
-        case BAD_SUMMARY_HTML5:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, nodedesc );
-            break;
-        case COERCE_TO_ENDTAG_WARN:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, node->element, node->element );
-            break;
-        case XML_DECLARATION_DETECTED:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning );
-            break;
-    }
-
-    messageOut( message );
-}
-
-
-void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
-{
-    TidyMessageImpl *message = NULL;
-    TidyMessageImpl *message2 = NULL; /* extra, when TidyShowWarnings */
-    char nodedesc[ 256 ] = {0};
-    char elemdesc[ 256 ] = {0};
-    Node* rpt = ( element ? element : node );
-    uint versionEmitted, declared, version;
-    ctmbstr extra_string = NULL;
-
-    TagToString(node, nodedesc, sizeof(nodedesc));
-
-    switch ( code )
-    {
-        case MISSING_STARTTAG:
-        case UNEXPECTED_ENDTAG:
-        case TOO_MANY_ELEMENTS:
-        case INSERTING_TAG:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, node->element );
-            break;
-
-        case USING_BR_INPLACE_OF:
-        case CANT_BE_NESTED:
-        case PROPRIETARY_ELEMENT:
-        case UNESCAPED_ELEMENT:
-        case NOFRAMES_CONTENT:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc );
-            break;
-
-        case ELEMENT_VERS_MISMATCH_WARN:
-            versionEmitted = doc->lexer->versionEmitted;
-            declared = doc->lexer->doctype;
-            version = versionEmitted == 0 ? declared : versionEmitted;
-            extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
-            if (!extra_string)
-                extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, extra_string );
-            break;
 
         case ELEMENT_VERS_MISMATCH_ERROR:
             versionEmitted = doc->lexer->versionEmitted;
@@ -346,54 +340,11 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, nodedesc, extra_string );
             break;
 
-        case MISSING_TITLE_ELEMENT:
-        case INCONSISTENT_VERSION:
-        case MALFORMED_DOCTYPE:
-        case CONTENT_AFTER_BODY:
-        case MALFORMED_COMMENT:
-        case BAD_COMMENT_CHARS:
-        case BAD_XML_COMMENT:
-        case BAD_CDATA_CONTENT:
-        case INCONSISTENT_NAMESPACE:
-        case DOCTYPE_AFTER_TAGS:
-        case DTYPE_NOT_UPPER_CASE:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning );
-            break;
-
-        case COERCE_TO_ENDTAG:
-        case NON_MATCHING_ENDTAG:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, node->element, node->element );
-            break;
-
-        case UNEXPECTED_ENDTAG_IN:
         case TOO_MANY_ELEMENTS_IN:
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, node->element, node->element );
             message2 = TY_(tidyMessageCreateWithNode)(doc, node, PREVIOUS_LOCATION, TidyInfo, element->element );
             break;
 
-        case ENCODING_IO_CONFLICT:
-        case MISSING_DOCTYPE:
-        case SPACE_PRECEDING_XMLDECL:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning );
-            break;
-
-        case TRIM_EMPTY_ELEMENT:
-        case ILLEGAL_NESTING:
-        case UNEXPECTED_END_OF_FILE:
-        case ELEMENT_NOT_EMPTY:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc );
-            break;
-
-
-        case MISSING_ENDTAG_FOR:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element );
-            break;
-
-        case MISSING_ENDTAG_BEFORE:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element, nodedesc );
-            break;
-
         case DISCARDING_UNEXPECTED:
             /* Force error if in a bad form, or
              Issue #166 - repeated <main> element
@@ -405,35 +356,9 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, element->element );
             message2 = TY_(tidyMessageCreateWithNode)(doc, element, PREVIOUS_LOCATION, TidyInfo, element->element );
             break;
-            
-        case REPLACING_UNEX_ELEMENT:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
-            break;
-        case REMOVED_HTML5:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyError, nodedesc );
-            break;
-    }
 
-    messageOut( message );
-
-    /* Although the callback is always executed for message2, it's only
-       added to the output sink TidyShowWarnings is enabled. */
-    if (cfgBool( doc, TidyShowWarnings ))
-        messageOut( message2 );
-}
-
-
-void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code)
-{
-    TidyMessageImpl *message = NULL;
-    char nodedesc[ 256 ] = {0};
-    Node* rpt = ( element ? element : node );
-
-    switch ( code )
-    {
-        case SUSPECTED_MISSING_QUOTE:
         case DUPLICATE_FRAMESET:
+        case SUSPECTED_MISSING_QUOTE:
             message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyError );
             break;
 
@@ -447,12 +372,17 @@ void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code)
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, node->element, element->element );
             break;
 
-        case UNEXPECTED_ENDTAG:  /* generated by XML docs */
+        case UNEXPECTED_ENDTAG_ERR:  /* generated by XML docs */
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, node->element );
             break;
-    }
+        }
 
     messageOut( message );
+
+    /* Although the callback is always executed for message2, it's only
+     added to the output sink TidyShowWarnings is enabled. */
+    if (cfgBool( doc, TidyShowWarnings ))
+        messageOut( message2 );
 }
 
 
diff --git a/src/message.h b/src/message.h
index 82a3622..9a0f06d 100644
--- a/src/message.h
+++ b/src/message.h
@@ -49,9 +49,6 @@ ctmbstr TY_(tidyLibraryVersion)(void);
 
 
 void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code);
-void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code);
-void TY_(ReportError)(TidyDocImpl* doc, Node* element, Node* node, uint code);
-void TY_(ReportFatal)(TidyDocImpl* doc, Node* element, Node* node, uint code);
 
 
 /** @} */
diff --git a/src/parser.c b/src/parser.c
index f2c1009..fe47a46 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -86,9 +86,9 @@ void TY_(CoerceNode)(TidyDocImpl* doc, Node *node, TidyTagId tid, Bool obsolete,
     Node* tmp = TY_(InferredTag)(doc, tag->id);
 
     if (obsolete)
-        TY_(ReportWarning)(doc, node, tmp, OBSOLETE_ELEMENT);
+        TY_(ReportNotice)(doc, node, tmp, OBSOLETE_ELEMENT);
     else if (unexpected)
-        TY_(ReportError)(doc, node, tmp, REPLACING_UNEX_ELEMENT);
+        TY_(ReportNotice)(doc, node, tmp, REPLACING_UNEX_ELEMENT);
     else
         TY_(ReportNotice)(doc, node, tmp, REPLACING_ELEMENT);
 
@@ -783,12 +783,12 @@ static void InsertDocType( TidyDocImpl* doc, Node *element, Node *doctype )
     Node* existing = TY_(FindDocType)( doc );
     if ( existing )
     {
-        TY_(ReportError)(doc, element, doctype, DISCARDING_UNEXPECTED );
+        TY_(ReportNotice)(doc, element, doctype, DISCARDING_UNEXPECTED );
         TY_(FreeNode)( doc, doctype );
     }
     else
     {
-        TY_(ReportError)(doc, element, doctype, DOCTYPE_AFTER_TAGS );
+        TY_(ReportNotice)(doc, element, doctype, DOCTYPE_AFTER_TAGS );
         while ( !nodeIsHTML(element) )
             element = element->parent;
         TY_(InsertNodeBeforeElement)( element, doctype );
@@ -807,7 +807,7 @@ static void MoveToHead( TidyDocImpl* doc, Node *element, Node *node )
 
     if ( TY_(nodeIsElement)(node) )
     {
-        TY_(ReportError)(doc, element, node, TAG_NOT_ALLOWED_IN );
+        TY_(ReportNotice)(doc, element, node, TAG_NOT_ALLOWED_IN );
 
         head = TY_(FindHEAD)(doc);
         assert(head != NULL);
@@ -819,7 +819,7 @@ static void MoveToHead( TidyDocImpl* doc, Node *element, Node *node )
     }
     else
     {
-        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node );
     }
 }
@@ -880,7 +880,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
 
     if ( nodeIsFORM(element) && 
          DescendantOf(element, TidyTag_FORM) )
-        TY_(ReportError)(doc, element, NULL, ILLEGAL_NESTING );
+        TY_(ReportNotice)(doc, element, NULL, ILLEGAL_NESTING );
 
     /*
      InlineDup() asks the lexer to insert inline emphasis tags
@@ -962,7 +962,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
         if ( nodeIsHTML(node) || nodeIsHEAD(node) || nodeIsBODY(node) )
         {
             if ( TY_(nodeIsElement)(node) )
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -972,7 +972,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
         {
             if (node->tag == NULL)
             {
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
                 TY_(FreeNode)( doc, node );
                 continue;
             }
@@ -1012,7 +1012,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                     if (node->tag == parent->tag)
                     {
                         if (!(element->tag->model & CM_OPT))
-                            TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                            TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_BEFORE );
 
                         TY_(UngetToken)( doc );
 
@@ -1093,7 +1093,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
             }
 
             /* otherwise discard it */
-            TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+            TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -1108,7 +1108,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
             }
 
             /* otherwise discard it */
-            TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+            TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -1116,7 +1116,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
         /* ignore unknown start/end tags */
         if ( node->tag == NULL )
         {
-            TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+            TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -1139,7 +1139,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 if ( nodeIsFORM(node) )
                     BadForm( doc );
 
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
                 TY_(FreeNode)( doc, node );
                 continue;
             }
@@ -1167,7 +1167,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                      nodeIsOPTGROUP(node) ||
                      nodeIsOPTION(node) )
                 {
-                    TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                    TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
                     TY_(FreeNode)( doc, node );  /* DSR - 27Apr02 avoid memory leak */
                     continue;
                 }
@@ -1214,7 +1214,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 if ( lexer->excludeBlocks )
                 {
                     if ( !TY_(nodeHasCM)(element, CM_OPT) )
-                        TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                        TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_BEFORE );
 
                     TY_(UngetToken)( doc );
 
@@ -1248,14 +1248,14 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 {
                     if ( nodeIsTD(node) )
                     {
-                        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                        TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
                         TY_(FreeNode)( doc, node );
                         continue;
                     }
 
                     if ( nodeIsTH(node) )
                     {
-                        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                        TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
                         TY_(FreeNode)( doc, node );
                         node = element->parent;
                         TidyDocFree(doc, node->element);
@@ -1266,7 +1266,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 }
 
                 if ( !TY_(nodeHasCM)(element, CM_OPT) && !element->implicit )
-                    TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                    TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_BEFORE );
 
                 TY_(UngetToken)( doc );
 
@@ -1354,7 +1354,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 && cfgBool(doc, TidyCoerceEndTags) )
             {
                 node->type = EndTag;
-                TY_(ReportError)(doc, element, node, COERCE_TO_ENDTAG);
+                TY_(ReportNotice)(doc, element, node, COERCE_TO_ENDTAG);
                 TY_(UngetToken)( doc );
                 continue;
             }
@@ -1363,7 +1363,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
             {
                 TY_(UngetToken)( doc );
             }
-            TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE);
+            TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_BEFORE);
 
             if (!(mode & Preformatted))
                 TrimSpaces(doc, element);
@@ -1406,7 +1406,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
             TY_(InsertNodeAtEnd)(element, node);
             
             if (node->implicit)
-                TY_(ReportError)(doc, element, node, INSERTING_TAG );
+                TY_(ReportNotice)(doc, element, node, INSERTING_TAG );
 
             /* Issue #212 - WHY is this hard coded to 'IgnoreWhitespace' while an 
                effort has been made above to set a 'MixedContent' mode in some cases?
@@ -1419,13 +1419,13 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
         if (node->type == EndTag)
             TY_(PopInline)( doc, node );  /* if inline end tag */
 
-        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+        TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
         TY_(FreeNode)( doc, node );
         continue;
     }
 
     if (!(element->tag->model & CM_OPT))
-        TY_(ReportError)(doc, element, node, MISSING_ENDTAG_FOR);
+        TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_FOR);
 
     if (element->tag->model & CM_OBJECT)
     {
@@ -1561,7 +1561,7 @@ void TY_(ParseNamespace)(TidyDocImpl* doc, Node *basenode, GetTokenMode mode)
                 {
                     /* n->implicit = yes; */
                     n->closed = yes;
-                    TY_(ReportError)(doc, n->parent, n, MISSING_ENDTAG_BEFORE);
+                    TY_(ReportNotice)(doc, n->parent, n, MISSING_ENDTAG_BEFORE);
                 }
 
                 /* Issue #369 - Since 'assert' is DEBUG only, and there are
@@ -1599,8 +1599,8 @@ void TY_(ParseNamespace)(TidyDocImpl* doc, Node *basenode, GetTokenMode mode)
             else
             {
                 /* unmatched close tag: report an error and discard */
-                /* TY_(ReportError)(doc, parent, node, NON_MATCHING_ENDTAG); Issue #308 - Seems wrong warning! */
-                TY_(ReportError)(doc, parent, node, DISCARDING_UNEXPECTED);
+                /* TY_(ReportNotice)(doc, parent, node, NON_MATCHING_ENDTAG); Issue #308 - Seems wrong warning! */
+                TY_(ReportNotice)(doc, parent, node, DISCARDING_UNEXPECTED);
                 assert(parent);
                 /* assert(parent->tag != node->tag); Issue #308 - Seems would always be true! */
                 TY_(FreeNode)( doc, node); /* Issue #308 - Discard unexpected end tag memory */
@@ -1630,7 +1630,7 @@ void TY_(ParseNamespace)(TidyDocImpl* doc, Node *basenode, GetTokenMode mode)
         }
     }
 
-    TY_(ReportError)(doc, basenode->parent, basenode, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, basenode->parent, basenode, MISSING_ENDTAG_FOR);
 }
 
 
@@ -1763,14 +1763,14 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 && TY_(nodeIsText)(element->last)
                 && !TY_(TextNodeEndWithSpace)(doc->lexer, element->last) )
             {
-                TY_(ReportWarning)(doc, element, node, COERCE_TO_ENDTAG_WARN);
+                TY_(ReportNotice)(doc, element, node, COERCE_TO_ENDTAG);
                 node->type = EndTag;
                 TY_(UngetToken)(doc);
                 continue;
             }
 
             if (node->attributes == NULL || element->attributes == NULL)
-                TY_(ReportWarning)(doc, element, node, NESTED_EMPHASIS);
+                TY_(ReportNotice)(doc, element, node, NESTED_EMPHASIS);
         }
         else if ( TY_(IsPushed)(doc, node) && node->type == StartTag && 
                   nodeIsQ(node) )
@@ -1781,7 +1781,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             \*/
             if (TY_(HTMLVersion)(doc) != HT50) 
             {
-                TY_(ReportWarning)(doc, element, node, NESTED_QUOTATION);
+                TY_(ReportNotice)(doc, element, node, NESTED_QUOTATION);
             }
         }
 
@@ -1810,7 +1810,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         {
             if ( TY_(nodeIsElement)(node) )
             {
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED );
                 TY_(FreeNode)( doc, node );
                 continue;
             }
@@ -1858,7 +1858,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         /* ignore unknown and PARAM tags */
         if ( node->tag == NULL || nodeIsPARAM(node) )
         {
-            TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -1905,7 +1905,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                        <b>bold <i>bold and italic</b> italics</i> */
                     if ( TY_(SwitchInline)( doc, element, node ) )
                     {
-                        TY_(ReportError)(doc, element, node, NON_MATCHING_ENDTAG);
+                        TY_(ReportNotice)(doc, element, node, NON_MATCHING_ENDTAG);
                         TY_(UngetToken)( doc ); /* put this back */
                         TY_(InlineDup1)( doc, NULL, element ); /* dupe the <i>, after </b> */
                         if (!(mode & Preformatted))
@@ -1923,12 +1923,12 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 {
                     if ( nodeIsA(node) && node->tag != element->tag )
                     {
-                       TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                       TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_BEFORE );
                        TY_(UngetToken)( doc );
                     }
                     else
                     {
-                        TY_(ReportError)(doc, element, node, NON_MATCHING_ENDTAG);
+                        TY_(ReportNotice)(doc, element, node, NON_MATCHING_ENDTAG);
                         TY_(FreeNode)( doc, node);
                     }
 
@@ -1942,7 +1942,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 }
 
                 /* if parent is <a> then discard unexpected inline end tag */
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }  /* special case </tr> etc. for stuff moved in front of table */
@@ -1965,12 +1965,12 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
 
             if ( node->tag == element->tag )
             {
-                TY_(ReportError)(doc, element, node, NON_MATCHING_ENDTAG );
+                TY_(ReportNotice)(doc, element, node, NON_MATCHING_ENDTAG );
                 TY_(FreeNode)( doc, node);
             }
             else
             {
-                TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_BEFORE );
                 TY_(UngetToken)( doc );
             }
 
@@ -2001,14 +2001,14 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 && cfgBool(doc, TidyCoerceEndTags) )
             {
                 node->type = EndTag;
-                TY_(ReportError)(doc, element, node, COERCE_TO_ENDTAG);
+                TY_(ReportNotice)(doc, element, node, COERCE_TO_ENDTAG);
                 /* TY_(PopInline)( doc, node ); */
                 TY_(UngetToken)( doc );
                 continue;
             }
 
             TY_(UngetToken)( doc );
-            TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE);
+            TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_BEFORE);
             /* TY_(PopInline)( doc, element ); */
 
             if (!(mode & Preformatted))
@@ -2027,12 +2027,12 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             {
                 if (!TY_(nodeIsElement)(node))
                 {
-                    TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                    TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
 
-                TY_(ReportError)(doc, element, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, element, node, TAG_NOT_ALLOWED_IN);
 
                 /* insert center as parent if heading is empty */
                 if (element->content == NULL)
@@ -2056,12 +2056,12 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             {
                 if ( !TY_(nodeIsElement)(node) )
                 {
-                    TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                    TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
 
-                TY_(ReportError)(doc, element, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, element, node, TAG_NOT_ALLOWED_IN);
 
                 /* insert hr before heading if heading is empty */
                 if (element->content == NULL)
@@ -2089,12 +2089,12 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 Node *dd;
                 if ( !TY_(nodeIsElement)(node) )
                 {
-                    TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                    TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
 
-                TY_(ReportError)(doc, element, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, element, node, TAG_NOT_ALLOWED_IN);
                 dd = TY_(InferredTag)(doc, TidyTag_DD);
 
                 /* insert hr within dd before dt if dt is empty */
@@ -2131,7 +2131,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 if (node->tag == parent->tag)
                 {
                     if (!(element->tag->model & CM_OPT) && !element->implicit)
-                        TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE);
+                        TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_BEFORE);
 
                     if( TY_(IsPushedLast)( doc, element, node ) ) 
                         TY_(PopInline)( doc, element );
@@ -2163,7 +2163,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         {
             if ( !TY_(nodeIsElement)(node) )
             {
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -2172,7 +2172,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 TY_(ConstrainVersion)( doc, ~VERS_HTML5 );
             } else
             if (!(element->tag->model & CM_OPT))
-                TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE);
+                TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_BEFORE);
 
             if (node->tag->model & CM_HEAD && !(node->tag->model & CM_BLOCK))
             {
@@ -2216,7 +2216,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         if (TY_(nodeIsElement)(node))
         {
             if (node->implicit)
-                TY_(ReportError)(doc, element, node, INSERTING_TAG);
+                TY_(ReportNotice)(doc, element, node, INSERTING_TAG);
 
             /* trim white space before <br> */
             if ( nodeIsBR(node) )
@@ -2228,13 +2228,13 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, element, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node );
         continue;
     }
 
     if (!(element->tag->model & CM_OPT))
-        TY_(ReportError)(doc, element, node, MISSING_ENDTAG_FOR);
+        TY_(ReportNotice)(doc, element, node, MISSING_ENDTAG_FOR);
 
 #if !defined(NDEBUG) && defined(_MSC_VER)
     in_parse_inline--;
@@ -2252,7 +2252,7 @@ void TY_(ParseEmpty)(TidyDocImpl* doc, Node *element, GetTokenMode mode)
         {
             if ( !(node->type == EndTag && node->tag == element->tag) )
             {
-                /* TY_(ReportError)(doc, element, node, ELEMENT_NOT_EMPTY); */
+                /* TY_(ReportNotice)(doc, element, node, ELEMENT_NOT_EMPTY); */
                 TY_(UngetToken)( doc );
             }
             else
@@ -2290,12 +2290,12 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
         {
             TY_(UngetToken)( doc );
             node = TY_(InferredTag)(doc, TidyTag_DT);
-            TY_(ReportError)(doc, list, node, MISSING_STARTTAG);
+            TY_(ReportNotice)(doc, list, node, MISSING_STARTTAG);
         }
 
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, list, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2310,7 +2310,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
             if ( nodeIsFORM(node) )
             {
                 BadForm( doc );
-                TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, list, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node );
                 continue;
             }
@@ -2328,7 +2328,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
                 }
                 if (node->tag == parent->tag)
                 {
-                    TY_(ReportError)(doc, list, node, MISSING_ENDTAG_BEFORE);
+                    TY_(ReportNotice)(doc, list, node, MISSING_ENDTAG_BEFORE);
 
                     TY_(UngetToken)( doc );
                     return;
@@ -2336,7 +2336,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
             }
             if (discardIt)
             {
-                TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, list, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -2389,7 +2389,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
 
             if (!(node->tag->model & (CM_BLOCK | CM_INLINE)))
             {
-                TY_(ReportError)(doc, list, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, list, node, TAG_NOT_ALLOWED_IN);
                 return;
             }
 
@@ -2398,12 +2398,12 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
                 return;
 
             node = TY_(InferredTag)(doc, TidyTag_DD);
-            TY_(ReportError)(doc, list, node, MISSING_STARTTAG);
+            TY_(ReportNotice)(doc, list, node, MISSING_STARTTAG);
         }
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, list, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2413,7 +2413,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
         ParseTag( doc, node, IgnoreWhitespace);
     }
 
-    TY_(ReportError)(doc, list, node, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, list, node, MISSING_ENDTAG_FOR);
 }
 
 static Bool FindLastLI( Node *list, Node **lastli )
@@ -2471,7 +2471,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
 
         if (node->type != TextNode && node->tag == NULL)
         {
-            TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, list, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2500,14 +2500,14 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
             if ( nodeIsFORM(node) )
             {
                 BadForm( doc );
-                TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, list, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node );
                 continue;
             }
 
             if (TY_(nodeHasCM)(node,CM_INLINE))
             {
-                TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, list, node, DISCARDING_UNEXPECTED);
                 TY_(PopInline)( doc, node );
                 TY_(FreeNode)( doc, node);
                 continue;
@@ -2523,7 +2523,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
                     break;
                 if (node->tag == parent->tag)
                 {
-                    TY_(ReportError)(doc, list, node, MISSING_ENDTAG_BEFORE);
+                    TY_(ReportNotice)(doc, list, node, MISSING_ENDTAG_BEFORE);
                     TY_(UngetToken)( doc );
 #if !defined(NDEBUG) && defined(_MSC_VER)
                     in_parse_list--;
@@ -2533,7 +2533,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
                 }
             }
 
-            TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, list, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2557,7 +2557,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
 
             if (TY_(nodeHasCM)(node,CM_BLOCK) && lexer->excludeBlocks)
             {
-                TY_(ReportError)(doc, list, node, MISSING_ENDTAG_BEFORE);
+                TY_(ReportNotice)(doc, list, node, MISSING_ENDTAG_BEFORE);
 #if !defined(NDEBUG) && defined(_MSC_VER)
                 in_parse_list--;
                 SPRTF("Exit ParseList 4 %d... No End Tag\n",in_parse_list);
@@ -2584,7 +2584,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
             {
                 /* Create a node for error reporting */
                 node = TY_(InferredTag)(doc, TidyTag_LI);
-                TY_(ReportError)(doc, list, node, MISSING_STARTTAG );
+                TY_(ReportNotice)(doc, list, node, MISSING_STARTTAG );
                 TY_(FreeNode)( doc, node);
                 node = lastli;
             }
@@ -2600,7 +2600,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
                                        ? "list-style: none; display: inline"
                                        : "list-style: none" 
                                        );
-                TY_(ReportError)(doc, list, node, MISSING_STARTTAG );
+                TY_(ReportNotice)(doc, list, node, MISSING_STARTTAG );
                 TY_(InsertNodeAtEnd)(list,node);
             }
         }
@@ -2608,7 +2608,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
         ParseTag( doc, node, IgnoreWhitespace);
     }
 
-    TY_(ReportError)(doc, list, node, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, list, node, MISSING_ENDTAG_FOR);
 #if !defined(NDEBUG) && defined(_MSC_VER)
     in_parse_list--;
     SPRTF("Exit ParseList 6 %d... missing end tag\n",in_parse_list);
@@ -2651,7 +2651,7 @@ static void FixEmptyRow(TidyDocImpl* doc, Node *row)
     {
         cell = TY_(InferredTag)(doc, TidyTag_TD);
         TY_(InsertNodeAtEnd)(row, cell);
-        TY_(ReportError)(doc, row, cell, MISSING_STARTTAG);
+        TY_(ReportNotice)(doc, row, cell, MISSING_STARTTAG);
     }
 }
 
@@ -2700,14 +2700,14 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
                 if ( nodeIsFORM(node) )
                     BadForm( doc );
 
-                TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, row, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
 
             if ( nodeIsTD(node) || nodeIsTH(node) )
             {
-                TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, row, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -2720,7 +2720,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
         /* discard unknown tags */
         if (node->tag == NULL && node->type != TextNode)
         {
-            TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, row, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2728,7 +2728,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
         /* discard unexpected <table> element */
         if ( nodeIsTABLE(node) )
         {
-            TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, row, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2742,7 +2742,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, row, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2758,13 +2758,13 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
             {
                 TY_(UngetToken)( doc );
                 node = TY_(InferredTag)(doc, TidyTag_TD);
-                TY_(ReportError)(doc, row, node, MISSING_STARTTAG);
+                TY_(ReportNotice)(doc, row, node, MISSING_STARTTAG);
             }
             else if ( TY_(nodeIsText)(node)
                       || TY_(nodeHasCM)(node, CM_BLOCK | CM_INLINE) )
             {
                 MoveBeforeTable( doc, row, node );
-                TY_(ReportError)(doc, row, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, row, node, TAG_NOT_ALLOWED_IN);
                 lexer->exiled = yes;
                 exclude_state = lexer->excludeBlocks;
                 lexer->excludeBlocks = no;
@@ -2778,7 +2778,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
             }
             else if (node->tag->model & CM_HEAD)
             {
-                TY_(ReportError)(doc, row, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, row, node, TAG_NOT_ALLOWED_IN);
                 MoveToHead( doc, row, node);
                 continue;
             }
@@ -2786,7 +2786,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
 
         if ( !(nodeIsTD(node) || nodeIsTH(node)) )
         {
-            TY_(ReportError)(doc, row, node, TAG_NOT_ALLOWED_IN);
+            TY_(ReportNotice)(doc, row, node, TAG_NOT_ALLOWED_IN);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2843,7 +2843,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
         /* discard unknown tags */
         if (node->tag == NULL && node->type != TextNode)
         {
-            TY_(ReportError)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2860,13 +2860,13 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
             {
                 TY_(UngetToken)( doc );
                 node = TY_(InferredTag)(doc, TidyTag_TR);
-                TY_(ReportError)(doc, rowgroup, node, MISSING_STARTTAG);
+                TY_(ReportNotice)(doc, rowgroup, node, MISSING_STARTTAG);
             }
             else if ( TY_(nodeIsText)(node)
                       || TY_(nodeHasCM)(node, CM_BLOCK|CM_INLINE) )
             {
                 MoveBeforeTable( doc, rowgroup, node );
-                TY_(ReportError)(doc, rowgroup, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, rowgroup, node, TAG_NOT_ALLOWED_IN);
                 lexer->exiled = yes;
 
                 if (node->type != TextNode)
@@ -2877,7 +2877,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
             }
             else if (node->tag->model & CM_HEAD)
             {
-                TY_(ReportError)(doc, rowgroup, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, rowgroup, node, TAG_NOT_ALLOWED_IN);
                 MoveToHead(doc, rowgroup, node);
                 continue;
             }
@@ -2894,14 +2894,14 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
                 if ( nodeIsFORM(node) )
                     BadForm( doc );
 
-                TY_(ReportError)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
 
             if ( nodeIsTR(node) || nodeIsTD(node) || nodeIsTH(node) )
             {
-                TY_(ReportError)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -2933,7 +2933,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2941,7 +2941,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
         if ( !nodeIsTR(node) )
         {
             node = TY_(InferredTag)(doc, TidyTag_TR);
-            TY_(ReportError)(doc, rowgroup, node, MISSING_STARTTAG);
+            TY_(ReportNotice)(doc, rowgroup, node, MISSING_STARTTAG);
             TY_(UngetToken)( doc );
         }
 
@@ -2977,7 +2977,7 @@ void TY_(ParseColGroup)(TidyDocImpl* doc, Node *colgroup, GetTokenMode ARG_UNUSE
             if ( nodeIsFORM(node) )
             {
                 BadForm( doc );
-                TY_(ReportError)(doc, colgroup, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, colgroup, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -3007,7 +3007,7 @@ void TY_(ParseColGroup)(TidyDocImpl* doc, Node *colgroup, GetTokenMode ARG_UNUSE
         /* discard unknown tags */
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, colgroup, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, colgroup, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -3020,7 +3020,7 @@ void TY_(ParseColGroup)(TidyDocImpl* doc, Node *colgroup, GetTokenMode ARG_UNUSE
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, colgroup, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, colgroup, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -3064,7 +3064,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
                  * this second <table>
                  */
                 TY_(UngetToken)(doc);
-                TY_(ReportError)(doc, table, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, table, node, TAG_NOT_ALLOWED_IN);
             }
             lexer->istackbase = istackbase;
             table->closed = yes;
@@ -3082,7 +3082,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
         /* discard unknown tags */
         if (node->tag == NULL && node->type != TextNode)
         {
-            TY_(ReportError)(doc, table, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, table, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -3095,12 +3095,12 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             {
                 TY_(UngetToken)( doc );
                 node = TY_(InferredTag)(doc, TidyTag_TR);
-                TY_(ReportError)(doc, table, node, MISSING_STARTTAG);
+                TY_(ReportNotice)(doc, table, node, MISSING_STARTTAG);
             }
             else if ( TY_(nodeIsText)(node) ||TY_(nodeHasCM)(node,CM_BLOCK|CM_INLINE) )
             {
                 TY_(InsertNodeBeforeElement)(table, node);
-                TY_(ReportError)(doc, table, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, table, node, TAG_NOT_ALLOWED_IN);
                 lexer->exiled = yes;
 
                 if (node->type != TextNode) 
@@ -3125,7 +3125,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             if ( nodeIsFORM(node) )
             {
                 BadForm( doc );
-                TY_(ReportError)(doc, table, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, table, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -3134,7 +3134,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             if ( TY_(nodeHasCM)(node, CM_TABLE|CM_ROW) ||
                  TY_(nodeHasCM)(node, CM_BLOCK|CM_INLINE) )
             {
-                TY_(ReportError)(doc, table, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, table, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -3145,7 +3145,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             {
                 if (node->tag == parent->tag)
                 {
-                    TY_(ReportError)(doc, table, node, MISSING_ENDTAG_BEFORE );
+                    TY_(ReportNotice)(doc, table, node, MISSING_ENDTAG_BEFORE );
                     TY_(UngetToken)( doc );
                     lexer->istackbase = istackbase;
 #if !defined(NDEBUG) && defined(_MSC_VER)
@@ -3160,7 +3160,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
         if (!(node->tag->model & CM_TABLE))
         {
             TY_(UngetToken)( doc );
-            TY_(ReportError)(doc, table, node, TAG_NOT_ALLOWED_IN);
+            TY_(ReportNotice)(doc, table, node, TAG_NOT_ALLOWED_IN);
             lexer->istackbase = istackbase;
 #if !defined(NDEBUG) && defined(_MSC_VER)
             in_parse_table--;
@@ -3177,11 +3177,11 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
         }
 
         /* discard unexpected text nodes and end tags */
-        TY_(ReportError)(doc, table, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, table, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, table, node, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, table, node, MISSING_ENDTAG_FOR);
     lexer->istackbase = istackbase;
 #if !defined(NDEBUG) && defined(_MSC_VER)
     in_parse_table--;
@@ -3220,7 +3220,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
         {
             if (nodeIsBODY(node) || nodeIsHTML(node))
             {
-                TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, pre, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)(doc, node);
                 continue;
             }
@@ -3230,7 +3230,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
             }
             else
             {
-                TY_(ReportError)(doc, pre, node, MISSING_ENDTAG_BEFORE );
+                TY_(ReportNotice)(doc, pre, node, MISSING_ENDTAG_BEFORE );
                 TY_(UngetToken)( doc );
             }
             pre->closed = yes;
@@ -3250,7 +3250,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
 
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, pre, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)(doc, node);
             continue;
         }
@@ -3272,7 +3272,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
                   return;
                }
 
-               TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+               TY_(ReportNotice)(doc, pre, node, DISCARDING_UNEXPECTED);
                TY_(FreeNode)(doc, node);
                continue;
             }
@@ -3282,7 +3282,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
             {
                 if (!doc->lexer->exiled)
                     /* No missing close warning if exiled. */
-                    TY_(ReportError)(doc, pre, node, MISSING_ENDTAG_BEFORE);
+                    TY_(ReportNotice)(doc, pre, node, MISSING_ENDTAG_BEFORE);
 
                 TY_(UngetToken)(doc);
                 return;
@@ -3326,11 +3326,11 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
               Todo: discarding </p> is abviously a bug, it should be replaced by <br>.
             */
             TY_(InsertNodeAfterElement)(pre, node);
-            TY_(ReportError)(doc, pre, node, MISSING_ENDTAG_BEFORE);
+            TY_(ReportNotice)(doc, pre, node, MISSING_ENDTAG_BEFORE);
             ParseTag(doc, node, IgnoreWhitespace);
 
             newnode = TY_(InferredTag)(doc, TidyTag_PRE);
-            TY_(ReportError)(doc, pre, newnode, INSERTING_TAG);
+            TY_(ReportNotice)(doc, pre, newnode, INSERTING_TAG);
             pre = newnode;
             TY_(InsertNodeAfterElement)(node, pre);
 
@@ -3341,7 +3341,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
         {
             if (node->type == StartTag)
             {
-                TY_(ReportError)(doc, pre, node, USING_BR_INPLACE_OF);
+                TY_(ReportNotice)(doc, pre, node, USING_BR_INPLACE_OF);
 
                 /* trim white space before <p> in <pre>*/
                 TrimSpaces(doc, pre);
@@ -3353,7 +3353,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
             }
             else
             {
-                TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, pre, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
             }
             continue;
@@ -3371,11 +3371,11 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, pre, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, pre, node, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, pre, node, MISSING_ENDTAG_FOR);
 }
 
 void TY_(ParseOptGroup)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(mode))
@@ -3403,7 +3403,7 @@ void TY_(ParseOptGroup)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
              (nodeIsOPTION(node) || nodeIsOPTGROUP(node)) )
         {
             if ( nodeIsOPTGROUP(node) )
-                TY_(ReportError)(doc, field, node, CANT_BE_NESTED);
+                TY_(ReportNotice)(doc, field, node, CANT_BE_NESTED);
 
             TY_(InsertNodeAtEnd)(field, node);
             ParseTag(doc, node, MixedContent);
@@ -3411,7 +3411,7 @@ void TY_(ParseOptGroup)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, field, node, DISCARDING_UNEXPECTED );
+        TY_(ReportNotice)(doc, field, node, DISCARDING_UNEXPECTED );
         TY_(FreeNode)( doc, node);
     }
 }
@@ -3462,11 +3462,11 @@ void TY_(ParseSelect)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(mod
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, field, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, field, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, field, node, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, field, node, MISSING_ENDTAG_FOR);
 #if !defined(NDEBUG) && defined(_MSC_VER)
     in_parse_select--;
     SPRTF("Exit ParseSelect 2 %d...\n",in_parse_select);
@@ -3519,11 +3519,11 @@ void TY_(ParseDatalist)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, field, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, field, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, field, node, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, field, node, MISSING_ENDTAG_FOR);
 #if !defined(NDEBUG) && defined(_MSC_VER)
     in_parse_datalist--;
     SPRTF("Exit ParseDatalist 2 %d...\n",in_parse_datalist);
@@ -3582,14 +3582,14 @@ void TY_(ParseText)(TidyDocImpl* doc, Node *field, GetTokenMode mode)
             && node->tag->model & CM_INLINE
             && !(node->tag->model & CM_FIELD)) /* #487283 - fix by Lee Passey 25 Jan 02 */
         {
-            TY_(ReportError)(doc, field, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, field, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
 
         /* terminate element on other tags */
         if (!(field->tag->model & CM_OPT))
-            TY_(ReportError)(doc, field, node, MISSING_ENDTAG_BEFORE);
+            TY_(ReportNotice)(doc, field, node, MISSING_ENDTAG_BEFORE);
 
         TY_(UngetToken)( doc );
         TrimSpaces(doc, field);
@@ -3597,7 +3597,7 @@ void TY_(ParseText)(TidyDocImpl* doc, Node *field, GetTokenMode mode)
     }
 
     if (!(field->tag->model & CM_OPT))
-        TY_(ReportError)(doc, field, node, MISSING_ENDTAG_FOR);
+        TY_(ReportNotice)(doc, field, node, MISSING_ENDTAG_FOR);
 }
 
 
@@ -3609,7 +3609,7 @@ void TY_(ParseTitle)(TidyDocImpl* doc, Node *title, GetTokenMode ARG_UNUSED(mode
         if (node->tag == title->tag && node->type == StartTag
             && cfgBool(doc, TidyCoerceEndTags) )
         {
-            TY_(ReportError)(doc, title, node, COERCE_TO_ENDTAG);
+            TY_(ReportNotice)(doc, title, node, COERCE_TO_ENDTAG);
             node->type = EndTag;
             TY_(UngetToken)( doc );
             continue;
@@ -3645,19 +3645,19 @@ void TY_(ParseTitle)(TidyDocImpl* doc, Node *title, GetTokenMode ARG_UNUSED(mode
         /* discard unknown tags */
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, title, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, title, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
 
         /* pushback unexpected tokens */
-        TY_(ReportError)(doc, title, node, MISSING_ENDTAG_BEFORE);
+        TY_(ReportNotice)(doc, title, node, MISSING_ENDTAG_BEFORE);
         TY_(UngetToken)( doc );
         TrimSpaces(doc, title);
         return;
     }
 
-    TY_(ReportError)(doc, title, node, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, title, node, MISSING_ENDTAG_FOR);
 }
 
 /*
@@ -3682,7 +3682,7 @@ void TY_(ParseScript)(TidyDocImpl* doc, Node *script, GetTokenMode ARG_UNUSED(mo
     else
     {
         /* handle e.g. a document like "<script>" */
-        TY_(ReportError)(doc, script, NULL, MISSING_ENDTAG_FOR);
+        TY_(ReportNotice)(doc, script, NULL, MISSING_ENDTAG_FOR);
         return;
     }
 
@@ -3691,7 +3691,7 @@ void TY_(ParseScript)(TidyDocImpl* doc, Node *script, GetTokenMode ARG_UNUSED(mo
     if (!(node && node->type == EndTag && node->tag &&
         node->tag->id == script->tag->id))
     {
-        TY_(ReportError)(doc, script, node, MISSING_ENDTAG_FOR);
+        TY_(ReportNotice)(doc, script, node, MISSING_ENDTAG_FOR);
 
         if (node)
             TY_(UngetToken)(doc);
@@ -3746,7 +3746,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
         /* find and discard <html> in <head> elements */
         if ((node->tag == head->tag || nodeIsHTML(node)) && node->type == StartTag)
         {
-            TY_(ReportError)(doc, head, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, head, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)(doc, node);
             continue;
         }
@@ -3760,7 +3760,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
             if (!cfgBool( doc, TidyOmitOptionalTags ) &&
                 !showingBodyOnly(doc) )
             {
-                TY_(ReportError)(doc, head, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, head, node, TAG_NOT_ALLOWED_IN);
             }
             TY_(UngetToken)( doc );
             break;
@@ -3769,7 +3769,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
         if (node->type == ProcInsTag && node->element &&
             TY_(tmbstrcmp)(node->element, "xml-stylesheet") == 0)
         {
-            TY_(ReportError)(doc, head, node, TAG_NOT_ALLOWED_IN);
+            TY_(ReportNotice)(doc, head, node, TAG_NOT_ALLOWED_IN);
             TY_(InsertNodeBeforeElement)(TY_(FindHTML)(doc), node);
             continue;
         }
@@ -3787,7 +3787,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
         /* discard unknown tags */
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, head, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, head, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -3801,7 +3801,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
         {
             /* #545067 Implicit closing of head broken - warn only for XHTML input */
             if ( lexer->isvoyager )
-                TY_(ReportError)(doc, head, node, TAG_NOT_ALLOWED_IN );
+                TY_(ReportNotice)(doc, head, node, TAG_NOT_ALLOWED_IN );
             TY_(UngetToken)( doc );
             break;
         }
@@ -3813,7 +3813,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
                 ++HasTitle;
 
                 if (HasTitle > 1)
-                    TY_(ReportError)(doc, head, node,
+                    TY_(ReportNotice)(doc, head, node,
                                      head ?
                                      TOO_MANY_ELEMENTS_IN : TOO_MANY_ELEMENTS);
             }
@@ -3822,7 +3822,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
                 ++HasBase;
 
                 if (HasBase > 1)
-                    TY_(ReportError)(doc, head, node,
+                    TY_(ReportNotice)(doc, head, node,
                                      head ?
                                      TOO_MANY_ELEMENTS_IN : TOO_MANY_ELEMENTS);
             }
@@ -3876,7 +3876,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
         }
 
         /* discard unexpected text nodes and end tags */
-        TY_(ReportError)(doc, head, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, head, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 #if !defined(NDEBUG) && defined(_MSC_VER)
@@ -3944,7 +3944,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         /* find and discard multiple <body> elements */
         if (node->tag == body->tag && node->type == StartTag)
         {
-            TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, body, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)(doc, node);
             continue;
         }
@@ -3953,7 +3953,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         if ( nodeIsHTML(node) )
         {
             if (TY_(nodeIsElement)(node) || lexer->seenEndHtml) 
-                TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, body, node, DISCARDING_UNEXPECTED);
             else
                 lexer->seenEndHtml = 1;
 
@@ -3966,7 +3966,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
                node->type == EndTag   ||
                node->type == StartEndTag ) )
         {
-            TY_(ReportError)(doc, body, node, CONTENT_AFTER_BODY );
+            TY_(ReportNotice)(doc, body, node, CONTENT_AFTER_BODY );
         }
 
         if ( node->tag == body->tag && node->type == EndTag )
@@ -4024,7 +4024,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         if ( lexer->seenEndBody == 1 && !iswhitenode )
         {
             ++lexer->seenEndBody;
-            TY_(ReportError)(doc, body, node, CONTENT_AFTER_BODY);
+            TY_(ReportNotice)(doc, body, node, CONTENT_AFTER_BODY);
         }
 #endif
 
@@ -4061,7 +4061,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         /* discard unknown  and PARAM tags */
         if ( node->tag == NULL || nodeIsPARAM(node) )
         {
-            TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, body, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -4080,7 +4080,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         {
             /* avoid this error message being issued twice */
             if (!(node->tag->model & CM_HEAD))
-                TY_(ReportError)(doc, body, node, TAG_NOT_ALLOWED_IN);
+                TY_(ReportNotice)(doc, body, node, TAG_NOT_ALLOWED_IN);
 
             if (node->tag->model & CM_HTML)
             {
@@ -4172,7 +4172,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
                 if ( TY_(FindNodeById)(doc, TidyTag_MAIN) )
                 {
                     doc->badForm |= flg_BadMain; /* this is an ERROR in format */
-                    TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+                    TY_(ReportNotice)(doc, body, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
@@ -4206,7 +4206,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
             }
 
             if (node->implicit)
-                TY_(ReportError)(doc, body, node, INSERTING_TAG);
+                TY_(ReportNotice)(doc, body, node, INSERTING_TAG);
 
             TY_(InsertNodeAtEnd)(body, node);
             ParseTag(doc, node, mode);
@@ -4214,7 +4214,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, body, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 #if !defined(NDEBUG) && defined(_MSC_VER)
@@ -4248,12 +4248,12 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
             TrimSpaces(doc, noframes);
             if (node->type == EndTag)
             {
-                TY_(ReportError)(doc, noframes, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, noframes, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);       /* Throw it away */
             }
             else
             {
-                TY_(ReportError)(doc, noframes, node, MISSING_ENDTAG_BEFORE);
+                TY_(ReportNotice)(doc, noframes, node, MISSING_ENDTAG_BEFORE);
                 TY_(UngetToken)( doc );
             }
             return;
@@ -4262,7 +4262,7 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
         if ( nodeIsHTML(node) )
         {
             if (TY_(nodeIsElement)(node))
-                TY_(ReportError)(doc, noframes, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, noframes, node, DISCARDING_UNEXPECTED);
 
             TY_(FreeNode)( doc, node);
             continue;
@@ -4295,7 +4295,7 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
             {
                 if ( body == NULL )
                 {
-                    TY_(ReportError)(doc, noframes, node, DISCARDING_UNEXPECTED);
+                    TY_(ReportNotice)(doc, noframes, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
@@ -4303,7 +4303,7 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
                 {
                     TY_(UngetToken)( doc );
                     node = TY_(InferredTag)(doc, TidyTag_P);
-                    TY_(ReportError)(doc, noframes, node, CONTENT_AFTER_BODY );
+                    TY_(ReportNotice)(doc, noframes, node, CONTENT_AFTER_BODY );
                 }
                 TY_(InsertNodeAtEnd)( body, node );
             }
@@ -4312,7 +4312,7 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
                 TY_(UngetToken)( doc );
                 node = TY_(InferredTag)(doc, TidyTag_BODY);
                 if ( cfgBool(doc, TidyXmlOut) )
-                    TY_(ReportError)(doc, noframes, node, INSERTING_TAG);
+                    TY_(ReportNotice)(doc, noframes, node, INSERTING_TAG);
                 TY_(InsertNodeAtEnd)( noframes, node );
             }
 
@@ -4321,11 +4321,11 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
         }
 
         /* discard unexpected end tags */
-        TY_(ReportError)(doc, noframes, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, noframes, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, noframes, node, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, noframes, node, MISSING_ENDTAG_FOR);
 }
 
 void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSED(mode))
@@ -4354,7 +4354,7 @@ void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSE
 
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, frameset, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, frameset, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue; 
         }
@@ -4372,7 +4372,7 @@ void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSE
         {
             TY_(UngetToken)( doc );
             node = TY_(InferredTag)(doc, TidyTag_NOFRAMES);
-            TY_(ReportError)(doc, frameset, node, INSERTING_TAG);
+            TY_(ReportNotice)(doc, frameset, node, INSERTING_TAG);
         }
 
         if (node->type == StartTag && (node->tag->model & CM_FRAMES))
@@ -4395,11 +4395,11 @@ void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSE
            doc->badAccess |= BA_INVALID_LINK_NOFRAMES;
 #endif
 
-        TY_(ReportError)(doc, frameset, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, frameset, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, frameset, node, MISSING_ENDTAG_FOR);
+    TY_(ReportNotice)(doc, frameset, node, MISSING_ENDTAG_FOR);
 }
 
 void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
@@ -4428,7 +4428,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
 
         if (node->tag == html->tag && node->type == EndTag)
         {
-            TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, html, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -4436,7 +4436,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         /* find and discard multiple <html> elements */
         if (node->tag == html->tag && node->type == StartTag)
         {
-            TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, html, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)(doc, node);
             continue;
         }
@@ -4476,7 +4476,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         if (node->tag == html->tag)
         {
             if (node->type != StartTag && frameset == NULL)
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, html, node, DISCARDING_UNEXPECTED);
 
             TY_(FreeNode)( doc, node);
             continue;
@@ -4491,7 +4491,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         {
             if (node->type != StartTag)
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -4506,7 +4506,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
                     {
                         noframes = TY_(InferredTag)(doc, TidyTag_NOFRAMES);
                         TY_(InsertNodeAtEnd)(frameset, noframes);
-                        TY_(ReportError)(doc, html, noframes, INSERTING_TAG);
+                        TY_(ReportNotice)(doc, html, noframes, INSERTING_TAG);
                     }
                     else
                     {
@@ -4528,13 +4528,13 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         {
             if (node->type != StartTag)
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
 
             if (frameset != NULL)
-                TY_(ReportFatal)(doc, html, node, DUPLICATE_FRAMESET);
+                TY_(ReportNotice)(doc, html, node, DUPLICATE_FRAMESET);
             else
                 frameset = node;
 
@@ -4559,14 +4559,14 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         {
             if (node->type != StartTag)
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
 
             if (frameset == NULL)
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 node = TY_(InferredTag)(doc, TidyTag_BODY);
                 break;
@@ -4595,7 +4595,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
             /* discard illegal frame element following a frameset */
             if ( frameset != NULL && nodeIsFRAME(node) )
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)(doc, node);
                 continue;
             }
@@ -4614,7 +4614,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
             }
             else
             {
-                TY_(ReportError)(doc, html, node, NOFRAMES_CONTENT);
+                TY_(ReportNotice)(doc, html, node, NOFRAMES_CONTENT);
                 if (noframes->type == StartEndTag)
                     noframes->type = StartTag;
             }
@@ -4628,7 +4628,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         /* Issue #132 - disable inserting BODY tag warning
            BUT only if NOT --show-body-only yes */
         if (!showingBodyOnly(doc))
-            TY_(ReportError)(doc, html, node, INSERTING_TAG );
+            TY_(ReportNotice)(doc, html, node, INSERTING_TAG );
         TY_(ConstrainVersion)(doc, ~VERS_FRAMESET);
         break;
     }
@@ -4787,13 +4787,13 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
 
             if (TY_(FindXmlDecl)(doc) && doc->root.content)
             {
-                TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)(doc, node);
                 continue;
             }
             if (node->line > 1 || node->column != 1)
             {
-                TY_(ReportError)(doc, &doc->root, node, SPACE_PRECEDING_XMLDECL);
+                TY_(ReportNotice)(doc, &doc->root, node, SPACE_PRECEDING_XMLDECL);
             }
         }
 #ifdef AUTO_INPUT_ENCODING
@@ -4826,7 +4826,7 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
             }
             else
             {
-                TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
             }
             continue;
@@ -4834,7 +4834,7 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+            TY_(ReportNotice)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -4878,7 +4878,7 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
         {
             ulong dtmode = cfg( doc, TidyDoctypeMode );
             if ((dtmode != TidyDoctypeOmit) && !showingBodyOnly(doc))
-                TY_(ReportError)(doc, NULL, NULL, MISSING_DOCTYPE);
+                TY_(ReportNotice)(doc, NULL, NULL, MISSING_DOCTYPE);
             if ((dtmode != TidyDoctypeAuto) && (dtmode != TidyDoctypeHtml5))
             {
                 /*\
@@ -4913,7 +4913,7 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
         /* #72, avoid MISSING_TITLE_ELEMENT if show-body-only (but allow InsertNodeAtEnd to avoid new warning) */
         if (!showingBodyOnly(doc))
         {
-            TY_(ReportError)(doc, head, NULL, MISSING_TITLE_ELEMENT);
+            TY_(ReportNotice)(doc, head, NULL, MISSING_TITLE_ELEMENT);
         }
         TY_(InsertNodeAtEnd)(head, TY_(InferredTag)(doc, TidyTag_TITLE));
     }
@@ -4990,9 +4990,9 @@ static void ParseXMLElement(TidyDocImpl* doc, Node *element, GetTokenMode mode)
         if (node->type == EndTag)
         {
             if (element)
-                TY_(ReportFatal)(doc, element, node, UNEXPECTED_ENDTAG_IN);
+                TY_(ReportNotice)(doc, element, node, UNEXPECTED_ENDTAG_IN);
             else
-                TY_(ReportFatal)(doc, element, node, UNEXPECTED_ENDTAG);
+                TY_(ReportNotice)(doc, element, node, UNEXPECTED_ENDTAG_ERR);
 
             TY_(FreeNode)( doc, node);
             continue;
@@ -5055,7 +5055,7 @@ void TY_(ParseXMLDocument)(TidyDocImpl* doc)
         /* discard unexpected end tags */
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, NULL, node, UNEXPECTED_ENDTAG);
+            TY_(ReportNotice)(doc, NULL, node, UNEXPECTED_ENDTAG);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -5073,7 +5073,7 @@ void TY_(ParseXMLDocument)(TidyDocImpl* doc)
             }
             else
             {
-                TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+                TY_(ReportNotice)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
             }
             continue;
@@ -5093,7 +5093,7 @@ void TY_(ParseXMLDocument)(TidyDocImpl* doc)
             continue;
         }
 
-        TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+        TY_(ReportNotice)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
diff --git a/src/tags.c b/src/tags.c
index 36a372c..ef03c5b 100644
--- a/src/tags.c
+++ b/src/tags.c
@@ -990,7 +990,7 @@ void CheckTABLE( TidyDocImpl* doc, Node *node )
         if (HasSummary && isHTML5)
         {
             /* #210 - has summary, and is HTML5, then report obsolete */
-            TY_(ReportWarning)(doc, node, node, BAD_SUMMARY_HTML5);
+            TY_(ReportNotice)(doc, node, node, BAD_SUMMARY_HTML5);
         } 
         else if (!HasSummary && !isHTML5) 
         {
diff --git a/src/tidylib.c b/src/tidylib.c
index a8852ee..6325a75 100755
--- a/src/tidylib.c
+++ b/src/tidylib.c
@@ -1640,7 +1640,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_ABBR, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
             }
         } else
         if ( nodeIsAPPLET(node) ) {
@@ -1651,7 +1651,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_OBJECT, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
             }
         } else
         if ( nodeIsBASEFONT(node) ) {
@@ -1664,7 +1664,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
              * - For now just report a warning
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
         } else
         if ( nodeIsBIG(node) ) {
             /* big: CSS equivalent 'font-size:larger'
@@ -1686,7 +1686,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_SPAN, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
             }
         } else
         if ( nodeIsCENTER(node) ) {
@@ -1697,7 +1697,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
              * see: static Bool Center2Div( TidyDocImpl* doc, Node *node, Node **pnode)
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
         } else
         if ( nodeIsDIR(node) ) {
             /* dir: replace by <ul>
@@ -1705,7 +1705,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
              * Should this be CHANGED???
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
         } else
         if ( nodeIsFONT(node) ) {
             /* Tidy already handles this -
@@ -1714,13 +1714,13 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
              * done in Bool Font2Span( TidyDocImpl* doc, Node *node, Node **pnode ) (I think?)
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
         } else
         if (( nodesIsFRAME(node) ) || ( nodeIsFRAMESET(node) ) || ( nodeIsNOFRAMES(node) )) {
             /* YOW: What to do here?????? Maybe <iframe>????
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
         } else
         if ( nodeIsSTRIKE(node) ) {
             /* strike: CSS equivalent 'text-decoration:line-through'
@@ -1731,7 +1731,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_SPAN, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
             }
         } else
         if ( nodeIsTT(node) ) {
@@ -1745,14 +1745,14 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_SPAN, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
             }
         } else
             if (TY_(nodeIsElement)(node)) {
                 if (node->tag) {
                     if ( (!(node->tag->versions & VERS_HTML5) && !(node->tag->versions & VERS_PROPRIETARY)) || (inRemovedInfo(node->tag->id)) ) {
                         if ( !already_strict )
-                            TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                            TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
                     }
                 }
             }
@@ -1805,7 +1805,7 @@ void TY_(CheckHTMLTagsAttribsVersions)( TidyDocImpl* doc, Node* node )
                 /* Version mismatches take priority. */
                 if ( check_versions && !(node->tag->versions & version) )
                 {
-                    TY_(ReportError)(doc, NULL, node, tagReportType );
+                    TY_(ReportNotice)(doc, NULL, node, tagReportType );
                 }
                 /* If it's not mismatched, it could still be proprietary. */
                 else if ( node->tag->versions & VERS_PROPRIETARY )
@@ -1825,7 +1825,7 @@ void TY_(CheckHTMLTagsAttribsVersions)( TidyDocImpl* doc, Node* node )
 
                         if ( (htmlIs5 && !tagLooksCustom) || !htmlIs5 )
                         {
-                            TY_(ReportError)(doc, NULL, node, PROPRIETARY_ELEMENT );
+                            TY_(ReportNotice)(doc, NULL, node, PROPRIETARY_ELEMENT );
                         }
 
                         if ( nodeIsLAYER(node) )
@@ -2140,7 +2140,7 @@ int         tidyDocCleanAndRepair( TidyDocImpl* doc )
 
         if ( !doc->lexer->isvoyager && doc->xmlDetected )
         {
-            TY_(ReportWarning)(doc, NULL, TY_(FindXmlDecl)(doc), XML_DECLARATION_DETECTED );
+            TY_(ReportNotice)(doc, NULL, TY_(FindXmlDecl)(doc), XML_DECLARATION_DETECTED );
 
         }
     }

From 5cd2603a68f30a17dcf2689a998eec883d87b9db Mon Sep 17 00:00:00 2001
From: Jim Derry <balthisar@gmail.com>
Date: Wed, 30 Aug 2017 20:04:03 -0400
Subject: [PATCH 2/5] Version bumped to 5.5.35 to reflect internal-only API
 change.

---
 version.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.txt b/version.txt
index 103f97e..24b3582 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
-5.5.34
-2017.08.28
+5.5.35
+2017.08.30

From e1cbafd647df566829a7c24d6c7b2f3dfc744c2a Mon Sep 17 00:00:00 2001
From: Jim Derry <balthisar@gmail.com>
Date: Thu, 31 Aug 2017 10:44:16 -0400
Subject: [PATCH 3/5] Handle message outlook properly in messageOut().

---
 src/message.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/message.c b/src/message.c
index cf3ab3b..7354654 100755
--- a/src/message.c
+++ b/src/message.c
@@ -167,6 +167,12 @@ static void messageOut( TidyMessageImpl *message )
         go = go & (cfgBool(doc, TidyShowInfo) == yes);
     }
 
+    /* If suppressing TidyWarning on Reports, suppress them. */
+    if ( message->level == TidyWarning )
+    {
+        go = go & (cfgBool(doc, TidyShowWarnings) == yes);
+    }
+
     /* If we're TidyQuiet and handling TidyDialogue, then suppress. */
     if ( cfgBool(doc, TidyQuiet) )
     {
@@ -378,11 +384,7 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
         }
 
     messageOut( message );
-
-    /* Although the callback is always executed for message2, it's only
-     added to the output sink TidyShowWarnings is enabled. */
-    if (cfgBool( doc, TidyShowWarnings ))
-        messageOut( message2 );
+    messageOut( message2 );
 }
 
 

From 38814f9e3b2c136af0926c686027916cac1f082e Mon Sep 17 00:00:00 2001
From: Jim Derry <balthisar@gmail.com>
Date: Thu, 31 Aug 2017 10:57:54 -0400
Subject: [PATCH 4/5] Sort message labels for simpler inventorying.

---
 src/message.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/message.c b/src/message.c
index 7354654..8538124 100755
--- a/src/message.c
+++ b/src/message.c
@@ -424,10 +424,10 @@ void TY_(ReportAttrError)(TidyDocImpl* doc, Node *node, AttVal *av, uint code)
 
     switch (code)
     {
-        case MISSING_ATTR_VALUE:
-        case XML_ATTRIBUTE_VALUE:
-        case PROPRIETARY_ATTRIBUTE:
         case JOINING_ATTRIBUTE:
+        case MISSING_ATTR_VALUE:
+        case PROPRIETARY_ATTRIBUTE:
+        case XML_ATTRIBUTE_VALUE:
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, name );
             break;
 
@@ -453,31 +453,31 @@ void TY_(ReportAttrError)(TidyDocImpl* doc, Node *node, AttVal *av, uint code)
 
         case BAD_ATTRIBUTE_VALUE:
         case BAD_ATTRIBUTE_VALUE_REPLACED:
-        case INVALID_ATTRIBUTE:
         case INSERTING_AUTO_ATTRIBUTE:
+        case INVALID_ATTRIBUTE:
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, name, value );
             break;
 
-        case UNEXPECTED_QUOTEMARK:
-        case MISSING_QUOTEMARK:
-        case ID_NAME_MISMATCH:
         case BACKSLASH_IN_URI:
+        case ESCAPED_ILLEGAL_URI:
         case FIXED_BACKSLASH:
+        case ID_NAME_MISMATCH:
         case ILLEGAL_URI_CODEPOINT:
         case ILLEGAL_URI_REFERENCE:
-        case ESCAPED_ILLEGAL_URI:
-        case NEWLINE_IN_URI:
-        case WHITE_IN_URI:
-        case UNEXPECTED_GT:
         case INVALID_XML_ID:
+        case MISSING_QUOTEMARK:
+        case NEWLINE_IN_URI:
         case UNEXPECTED_EQUALSIGN:
+        case UNEXPECTED_GT:
+        case UNEXPECTED_QUOTEMARK:
+        case WHITE_IN_URI:
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc );
             break;
 
-        case XML_ID_SYNTAX:
-        case PROPRIETARY_ATTR_VALUE:
         case ANCHOR_NOT_UNIQUE:
         case ATTR_VALUE_NOT_LCASE:
+        case PROPRIETARY_ATTR_VALUE:
+        case XML_ID_SYNTAX:
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, value );
             break;
 

From 2c82cfa23b4ea5ec4c6c5acce95e6930ee1d7075 Mon Sep 17 00:00:00 2001
From: Jim Derry <balthisar@gmail.com>
Date: Thu, 31 Aug 2017 12:55:32 -0400
Subject: [PATCH 5/5] Inventoried current error strings, and removed/commented
 out several:   - BAD_COMMENT_CHARS   - BAD_XML_COMMENT   -
 DTYPE_NOT_UPPER_CASE   - ENCODING_IO_CONFLICT   - INCONSISTENT_NAMESPACE   -
 INCONSISTENT_VERSION   - INDICATE_CHANGES_IN_LANGUAGE   - UNESCAPED_ELEMENT  
 - XML_ATTRIBUTE_VALUE Re-sorted new tidy options. All tests passing. Bump
 version to reflect strings that are externally accessible to API.

---
 include/tidyenum.h                      | 39 +++++++---------
 localize/translations/language_en_gb.po | 62 +++----------------------
 localize/translations/language_es.po    | 62 +++----------------------
 localize/translations/language_es_mx.po | 62 +++----------------------
 localize/translations/language_fr.po    | 62 +++----------------------
 localize/translations/language_zh_cn.po | 62 +++----------------------
 localize/translations/tidy.pot          | 62 +++----------------------
 src/access.c                            | 15 ------
 src/config.c                            |  2 +-
 src/language_en.h                       | 12 -----
 src/language_fr.h                       | 12 -----
 src/message.c                           |  8 ----
 version.txt                             |  4 +-
 13 files changed, 56 insertions(+), 408 deletions(-)

diff --git a/include/tidyenum.h b/include/tidyenum.h
index d21e1ca..e38a63e 100644
--- a/include/tidyenum.h
+++ b/include/tidyenum.h
@@ -192,7 +192,6 @@ extern "C" {
     FN(UNEXPECTED_GT)                 \
     FN(UNEXPECTED_QUOTEMARK)          \
     FN(WHITE_IN_URI)                  \
-    FN(XML_ATTRIBUTE_VALUE)           \
     FN(XML_ID_SYNTAX)                 \
     /* ReportEncodingError */         \
     FN(INVALID_NCR)                   \
@@ -210,19 +209,13 @@ extern "C" {
     FN(UNKNOWN_ENTITY)                \
     /* ReportError */                 \
     FN(BAD_CDATA_CONTENT)             \
-    FN(BAD_COMMENT_CHARS)             \
-    FN(BAD_XML_COMMENT)               \
     FN(CANT_BE_NESTED)                \
     FN(CONTENT_AFTER_BODY)            \
     FN(DISCARDING_UNEXPECTED)         \
     FN(DOCTYPE_AFTER_TAGS)            \
-    FN(DTYPE_NOT_UPPER_CASE)          \
     FN(ELEMENT_VERS_MISMATCH_ERROR)   \
     FN(ELEMENT_VERS_MISMATCH_WARN)    \
-    FN(ENCODING_IO_CONFLICT)          \
     FN(ILLEGAL_NESTING)               \
-    FN(INCONSISTENT_NAMESPACE)        \
-    FN(INCONSISTENT_VERSION)          \
     FN(INSERTING_TAG)                 \
     FN(MALFORMED_COMMENT)             \
     FN(MALFORMED_DOCTYPE)             \
@@ -240,7 +233,6 @@ extern "C" {
     FN(TAG_NOT_ALLOWED_IN)            \
     FN(TOO_MANY_ELEMENTS_IN)          \
     FN(TOO_MANY_ELEMENTS)             \
-    FN(UNESCAPED_ELEMENT)             \
     FN(USING_BR_INPLACE_OF)           \
     /* ReportFatal */                 \
     FN(DUPLICATE_FRAMESET)            \
@@ -275,19 +267,22 @@ extern "C" {
     FN(FOUND_STYLE_IN_BODY)
     
 
-/** These are report messages added by Tidy's accessibility module. */
+/** These are report messages added by Tidy's accessibility module. 
+ ** Note that commented out items don't have checks for them at this time,
+ ** and it was probably intended that some test would eventually be written.
+ */
 #define FOREACH_ACCESS_MSG(FN)                                          \
 /** [1.1.1.1] */     FN(IMG_MISSING_ALT)                                \
 /** [1.1.1.2] */     FN(IMG_ALT_SUSPICIOUS_FILENAME)                    \
 /** [1.1.1.3] */     FN(IMG_ALT_SUSPICIOUS_FILE_SIZE)                   \
 /** [1.1.1.4] */     FN(IMG_ALT_SUSPICIOUS_PLACEHOLDER)                 \
 /** [1.1.1.10] */    FN(IMG_ALT_SUSPICIOUS_TOO_LONG)                    \
-/** [1.1.1.11] */    FN(IMG_MISSING_ALT_BULLET)                         \
-/** [1.1.1.12] */    FN(IMG_MISSING_ALT_H_RULE)                         \
+/** [1.1.1.11] */    /* FN(IMG_MISSING_ALT_BULLET) */                   \
+/** [1.1.1.12] */    /* FN(IMG_MISSING_ALT_H_RULE) */                   \
 /** [1.1.2.1] */     FN(IMG_MISSING_LONGDESC_DLINK)                     \
 /** [1.1.2.2] */     FN(IMG_MISSING_DLINK)                              \
 /** [1.1.2.3] */     FN(IMG_MISSING_LONGDESC)                           \
-/** [1.1.2.5] */     FN(LONGDESC_NOT_REQUIRED)                          \
+/** [1.1.2.5] */     /* FN(LONGDESC_NOT_REQUIRED) */                    \
 /** [1.1.3.1] */     FN(IMG_BUTTON_MISSING_ALT)                         \
 /** [1.1.4.1] */     FN(APPLET_MISSING_ALT)                             \
 /** [1.1.5.1] */     FN(OBJECT_MISSING_ALT)                             \
@@ -323,7 +318,7 @@ extern "C" {
 /** [3.6.1.1] */     FN(LIST_USAGE_INVALID_UL)                          \
 /** [3.6.1.2] */     FN(LIST_USAGE_INVALID_OL)                          \
 /** [3.6.1.4] */     FN(LIST_USAGE_INVALID_LI)                          \
-/** [4.1.1.1] */     FN(INDICATE_CHANGES_IN_LANGUAGE)                   \
+/** [4.1.1.1] */     /* FN(INDICATE_CHANGES_IN_LANGUAGE) */             \
 /** [4.3.1.1] */     FN(LANGUAGE_NOT_IDENTIFIED)                        \
 /** [4.3.1.1] */     FN(LANGUAGE_INVALID)                               \
 /** [5.1.2.1] */     FN(DATA_TABLE_MISSING_HEADERS)                     \
@@ -377,11 +372,11 @@ extern "C" {
 /** [9.3.1.6] */     FN(SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE)   \
 /** [10.1.1.1] */    FN(NEW_WINDOWS_REQUIRE_WARNING_NEW)                \
 /** [10.1.1.2] */    FN(NEW_WINDOWS_REQUIRE_WARNING_BLANK)              \
-/** [10.2.1.1] */    FN(LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT)         \
-/** [10.2.1.2] */    FN(LABEL_NEEDS_REPOSITIONING_AFTER_INPUT)          \
-/** [10.4.1.1] */    FN(FORM_CONTROL_REQUIRES_DEFAULT_TEXT)             \
-/** [10.4.1.2] */    FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL)         \
-/** [10.4.1.3] */    FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES)       \
+/** [10.2.1.1] */    /* FN(LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT) */   \
+/** [10.2.1.2] */    /* FN(LABEL_NEEDS_REPOSITIONING_AFTER_INPUT) */    \
+/** [10.4.1.1] */    /* FN(FORM_CONTROL_REQUIRES_DEFAULT_TEXT) */       \
+/** [10.4.1.2] */    /* FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL) */   \
+/** [10.4.1.3] */    /* FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES) */ \
 /** [11.2.1.1] */    FN(REPLACE_DEPRECATED_HTML_APPLET)                 \
 /** [11.2.1.2] */    FN(REPLACE_DEPRECATED_HTML_BASEFONT)               \
 /** [11.2.1.3] */    FN(REPLACE_DEPRECATED_HTML_CENTER)                 \
@@ -402,10 +397,10 @@ extern "C" {
 /** [13.1.1.2] */    FN(LINK_TEXT_MISSING)                              \
 /** [13.1.1.3] */    FN(LINK_TEXT_TOO_LONG)                             \
 /** [13.1.1.4] */    FN(LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE)            \
-/** [13.1.1.5] */    FN(LINK_TEXT_NOT_MEANINGFUL_MORE)                  \
-/** [13.1.1.6] */    FN(LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS)           \
+/** [13.1.1.5] */    /* FN(LINK_TEXT_NOT_MEANINGFUL_MORE) */            \
+/** [13.1.1.6] */    /* FN(LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS) */     \
 /** [13.2.1.1] */    FN(METADATA_MISSING)                               \
-/** [13.2.1.2] */    FN(METADATA_MISSING_LINK)                          \
+/** [13.2.1.2] */    /* FN(METADATA_MISSING_LINK) */                    \
 /** [13.2.1.3] */    FN(METADATA_MISSING_REDIRECT_AUTOREFRESH)          \
 /** [13.10.1.1] */   FN(SKIPOVER_ASCII_ART)
 
@@ -629,6 +624,7 @@ typedef enum
     TidySkipNested,              /**< Skip nested tags in script and style CDATA */
     TidySortAttributes,          /**< Sort attributes */
     TidyStrictTagsAttr,          /**< Ensure tags and attributes match output HTML version */
+    TidyStyleTags,               /**< Move style to head */
     TidyTabSize,                 /**< Expand tabs to n spaces */
     TidyUpperCaseAttrs,          /**< Output attributes in upper not lower case */
     TidyUpperCaseTags,           /**< Output tags in upper not lower case */
@@ -650,7 +646,6 @@ typedef enum
     TidyXmlPIs,                  /**< If set to yes PIs must end with ?> */
     TidyXmlSpace,                /**< If set to yes adds xml:space attr as needed */
     TidyXmlTags,                 /**< Treat input as XML */
-    TidyStyleTags,               /**< Move sytle to head */
     N_TIDY_OPTIONS               /**< Must be last */
 } TidyOptionId;
 
diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po
index c6b36e5..a20d980 100644
--- a/localize/translations/language_en_gb.po
+++ b/localize/translations/language_en_gb.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-08-28 10:04:30\n"
+"PO-Revision-Date: 2017-08-31 12:54:04\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2265,11 +2265,6 @@ msgctxt "WHITE_IN_URI"
 msgid "%s discarding whitespace in URI reference"
 msgstr ""
 
-#, c-format
-msgctxt "XML_ATTRIBUTE_VALUE"
-msgid "%s has XML attribute \"%s\""
-msgstr ""
-
 #, c-format
 msgctxt "XML_ID_SYNTAX"
 msgid "%s ID \"%s\" uses XML ID syntax"
@@ -2332,14 +2327,6 @@ msgctxt "BAD_CDATA_CONTENT"
 msgid "'<' + '/' + letter not allowed here"
 msgstr ""
 
-msgctxt "BAD_COMMENT_CHARS"
-msgid "expecting -- or >"
-msgstr ""
-
-msgctxt "BAD_XML_COMMENT"
-msgid "XML comments can't contain --"
-msgstr ""
-
 #, c-format
 msgctxt "CANT_BE_NESTED"
 msgid "%s can't be nested"
@@ -2358,10 +2345,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
 msgid "<!DOCTYPE> isn't allowed after elements"
 msgstr ""
 
-msgctxt "DTYPE_NOT_UPPER_CASE"
-msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
-msgstr ""
-
 #, c-format
 msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
 msgid "%s element not available in %s"
@@ -2372,23 +2355,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
 msgid "%s element not available in %s"
 msgstr ""
 
-msgctxt "ENCODING_IO_CONFLICT"
-msgid "Output encoding does not work with standard output"
-msgstr ""
-
 #, c-format
 msgctxt "ILLEGAL_NESTING"
 msgid "%s shouldn't be nested"
 msgstr ""
 
-msgctxt "INCONSISTENT_NAMESPACE"
-msgid "HTML namespace doesn't match content"
-msgstr ""
-
-msgctxt "INCONSISTENT_VERSION"
-msgid "HTML DOCTYPE doesn't match content"
-msgstr ""
-
 #, c-format
 msgctxt "INSERTING_TAG"
 msgid "inserting implicit <%s>"
@@ -2469,11 +2440,6 @@ msgctxt "TOO_MANY_ELEMENTS"
 msgid "too many %s elements"
 msgstr ""
 
-#, c-format
-msgctxt "UNESCAPED_ELEMENT"
-msgid "unescaped %s in pre content"
-msgstr ""
-
 #, c-format
 msgctxt "USING_BR_INPLACE_OF"
 msgid "using <br> in place of %s"
@@ -2539,11 +2505,6 @@ msgctxt "BAD_SUMMARY_HTML5"
 msgid "The summary attribute on the %s element is obsolete in HTML5"
 msgstr ""
 
-#, c-format
-msgctxt "COERCE_TO_ENDTAG_WARN"
-msgid "<%s> is probably intended as </%s>"
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"
@@ -2587,6 +2548,11 @@ msgctxt "UNEXPECTED_ENDTAG"
 msgid "unexpected </%s>"
 msgstr ""
 
+#, c-format
+msgctxt "UNEXPECTED_ENDTAG_ERR"
+msgid "unexpected </%s>"
+msgstr ""
+
 msgctxt "MOVED_STYLE_TO_HEAD"
 msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
 msgstr ""
@@ -2767,10 +2733,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
 msgid "[3.6.1.4]: list usage invalid <li>."
 msgstr ""
 
-msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
-msgid "[4.1.1.1]: indicate changes in language."
-msgstr ""
-
 msgctxt "LANGUAGE_NOT_IDENTIFIED"
 msgid "[4.3.1.1]: language not identified."
 msgstr ""
@@ -2983,18 +2945,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
 msgid "[10.1.1.2]: new windows require warning (_blank)."
 msgstr ""
 
-msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
-msgid "[10.4.1.1]: form control requires default text."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
-msgid "[10.4.1.2]: form control default text invalid (null)."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
-msgid "[10.4.1.3]: form control default text invalid (spaces)."
-msgstr ""
-
 msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
 msgid "[11.2.1.1]: replace deprecated html <applet>."
 msgstr ""
diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po
index a8e3db5..24b64b4 100644
--- a/localize/translations/language_es.po
+++ b/localize/translations/language_es.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-08-28 10:04:30\n"
+"PO-Revision-Date: 2017-08-31 12:54:04\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2209,11 +2209,6 @@ msgctxt "WHITE_IN_URI"
 msgid "%s discarding whitespace in URI reference"
 msgstr ""
 
-#, c-format
-msgctxt "XML_ATTRIBUTE_VALUE"
-msgid "%s has XML attribute \"%s\""
-msgstr ""
-
 #, c-format
 msgctxt "XML_ID_SYNTAX"
 msgid "%s ID \"%s\" uses XML ID syntax"
@@ -2276,14 +2271,6 @@ msgctxt "BAD_CDATA_CONTENT"
 msgid "'<' + '/' + letter not allowed here"
 msgstr ""
 
-msgctxt "BAD_COMMENT_CHARS"
-msgid "expecting -- or >"
-msgstr ""
-
-msgctxt "BAD_XML_COMMENT"
-msgid "XML comments can't contain --"
-msgstr ""
-
 #, c-format
 msgctxt "CANT_BE_NESTED"
 msgid "%s can't be nested"
@@ -2302,10 +2289,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
 msgid "<!DOCTYPE> isn't allowed after elements"
 msgstr ""
 
-msgctxt "DTYPE_NOT_UPPER_CASE"
-msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
-msgstr ""
-
 #, c-format
 msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
 msgid "%s element not available in %s"
@@ -2316,23 +2299,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
 msgid "%s element not available in %s"
 msgstr ""
 
-msgctxt "ENCODING_IO_CONFLICT"
-msgid "Output encoding does not work with standard output"
-msgstr ""
-
 #, c-format
 msgctxt "ILLEGAL_NESTING"
 msgid "%s shouldn't be nested"
 msgstr ""
 
-msgctxt "INCONSISTENT_NAMESPACE"
-msgid "HTML namespace doesn't match content"
-msgstr ""
-
-msgctxt "INCONSISTENT_VERSION"
-msgid "HTML DOCTYPE doesn't match content"
-msgstr ""
-
 #, c-format
 msgctxt "INSERTING_TAG"
 msgid "inserting implicit <%s>"
@@ -2413,11 +2384,6 @@ msgctxt "TOO_MANY_ELEMENTS"
 msgid "too many %s elements"
 msgstr ""
 
-#, c-format
-msgctxt "UNESCAPED_ELEMENT"
-msgid "unescaped %s in pre content"
-msgstr ""
-
 #, c-format
 msgctxt "USING_BR_INPLACE_OF"
 msgid "using <br> in place of %s"
@@ -2483,11 +2449,6 @@ msgctxt "BAD_SUMMARY_HTML5"
 msgid "The summary attribute on the %s element is obsolete in HTML5"
 msgstr ""
 
-#, c-format
-msgctxt "COERCE_TO_ENDTAG_WARN"
-msgid "<%s> is probably intended as </%s>"
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"
@@ -2531,6 +2492,11 @@ msgctxt "UNEXPECTED_ENDTAG"
 msgid "unexpected </%s>"
 msgstr ""
 
+#, c-format
+msgctxt "UNEXPECTED_ENDTAG_ERR"
+msgid "unexpected </%s>"
+msgstr ""
+
 msgctxt "MOVED_STYLE_TO_HEAD"
 msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
 msgstr ""
@@ -2711,10 +2677,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
 msgid "[3.6.1.4]: list usage invalid <li>."
 msgstr ""
 
-msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
-msgid "[4.1.1.1]: indicate changes in language."
-msgstr ""
-
 msgctxt "LANGUAGE_NOT_IDENTIFIED"
 msgid "[4.3.1.1]: language not identified."
 msgstr ""
@@ -2927,18 +2889,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
 msgid "[10.1.1.2]: new windows require warning (_blank)."
 msgstr ""
 
-msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
-msgid "[10.4.1.1]: form control requires default text."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
-msgid "[10.4.1.2]: form control default text invalid (null)."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
-msgid "[10.4.1.3]: form control default text invalid (spaces)."
-msgstr ""
-
 msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
 msgid "[11.2.1.1]: replace deprecated html <applet>."
 msgstr ""
diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po
index 8c3d57b..b6cce03 100644
--- a/localize/translations/language_es_mx.po
+++ b/localize/translations/language_es_mx.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-08-28 10:04:30\n"
+"PO-Revision-Date: 2017-08-31 12:54:04\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2204,11 +2204,6 @@ msgctxt "WHITE_IN_URI"
 msgid "%s discarding whitespace in URI reference"
 msgstr ""
 
-#, c-format
-msgctxt "XML_ATTRIBUTE_VALUE"
-msgid "%s has XML attribute \"%s\""
-msgstr ""
-
 #, c-format
 msgctxt "XML_ID_SYNTAX"
 msgid "%s ID \"%s\" uses XML ID syntax"
@@ -2271,14 +2266,6 @@ msgctxt "BAD_CDATA_CONTENT"
 msgid "'<' + '/' + letter not allowed here"
 msgstr ""
 
-msgctxt "BAD_COMMENT_CHARS"
-msgid "expecting -- or >"
-msgstr ""
-
-msgctxt "BAD_XML_COMMENT"
-msgid "XML comments can't contain --"
-msgstr ""
-
 #, c-format
 msgctxt "CANT_BE_NESTED"
 msgid "%s can't be nested"
@@ -2297,10 +2284,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
 msgid "<!DOCTYPE> isn't allowed after elements"
 msgstr ""
 
-msgctxt "DTYPE_NOT_UPPER_CASE"
-msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
-msgstr ""
-
 #, c-format
 msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
 msgid "%s element not available in %s"
@@ -2311,23 +2294,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
 msgid "%s element not available in %s"
 msgstr ""
 
-msgctxt "ENCODING_IO_CONFLICT"
-msgid "Output encoding does not work with standard output"
-msgstr ""
-
 #, c-format
 msgctxt "ILLEGAL_NESTING"
 msgid "%s shouldn't be nested"
 msgstr ""
 
-msgctxt "INCONSISTENT_NAMESPACE"
-msgid "HTML namespace doesn't match content"
-msgstr ""
-
-msgctxt "INCONSISTENT_VERSION"
-msgid "HTML DOCTYPE doesn't match content"
-msgstr ""
-
 #, c-format
 msgctxt "INSERTING_TAG"
 msgid "inserting implicit <%s>"
@@ -2408,11 +2379,6 @@ msgctxt "TOO_MANY_ELEMENTS"
 msgid "too many %s elements"
 msgstr ""
 
-#, c-format
-msgctxt "UNESCAPED_ELEMENT"
-msgid "unescaped %s in pre content"
-msgstr ""
-
 #, c-format
 msgctxt "USING_BR_INPLACE_OF"
 msgid "using <br> in place of %s"
@@ -2478,11 +2444,6 @@ msgctxt "BAD_SUMMARY_HTML5"
 msgid "The summary attribute on the %s element is obsolete in HTML5"
 msgstr ""
 
-#, c-format
-msgctxt "COERCE_TO_ENDTAG_WARN"
-msgid "<%s> is probably intended as </%s>"
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"
@@ -2526,6 +2487,11 @@ msgctxt "UNEXPECTED_ENDTAG"
 msgid "unexpected </%s>"
 msgstr ""
 
+#, c-format
+msgctxt "UNEXPECTED_ENDTAG_ERR"
+msgid "unexpected </%s>"
+msgstr ""
+
 msgctxt "MOVED_STYLE_TO_HEAD"
 msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
 msgstr ""
@@ -2706,10 +2672,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
 msgid "[3.6.1.4]: list usage invalid <li>."
 msgstr ""
 
-msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
-msgid "[4.1.1.1]: indicate changes in language."
-msgstr ""
-
 msgctxt "LANGUAGE_NOT_IDENTIFIED"
 msgid "[4.3.1.1]: language not identified."
 msgstr ""
@@ -2922,18 +2884,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
 msgid "[10.1.1.2]: new windows require warning (_blank)."
 msgstr ""
 
-msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
-msgid "[10.4.1.1]: form control requires default text."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
-msgid "[10.4.1.2]: form control default text invalid (null)."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
-msgid "[10.4.1.3]: form control default text invalid (spaces)."
-msgstr ""
-
 msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
 msgid "[11.2.1.1]: replace deprecated html <applet>."
 msgstr ""
diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po
index 4e6f5c2..9f32532 100644
--- a/localize/translations/language_fr.po
+++ b/localize/translations/language_fr.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-08-28 10:04:31\n"
+"PO-Revision-Date: 2017-08-31 12:54:04\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2645,11 +2645,6 @@ msgctxt "WHITE_IN_URI"
 msgid "%s discarding whitespace in URI reference"
 msgstr "%s rejet des espaces dans la référence URI"
 
-#, c-format
-msgctxt "XML_ATTRIBUTE_VALUE"
-msgid "%s has XML attribute \"%s\""
-msgstr "%s a un attribut XML \"%s\""
-
 #, c-format
 msgctxt "XML_ID_SYNTAX"
 msgid "%s ID \"%s\" uses XML ID syntax"
@@ -2712,14 +2707,6 @@ msgctxt "BAD_CDATA_CONTENT"
 msgid "'<' + '/' + letter not allowed here"
 msgstr "'<' + '/' + lettres non permises ici"
 
-msgctxt "BAD_COMMENT_CHARS"
-msgid "expecting -- or >"
-msgstr "attendu -- ou >"
-
-msgctxt "BAD_XML_COMMENT"
-msgid "XML comments can't contain --"
-msgstr "les commentaires XML ne peuvent pas contenir --"
-
 #, c-format
 msgctxt "CANT_BE_NESTED"
 msgid "%s can't be nested"
@@ -2738,10 +2725,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
 msgid "<!DOCTYPE> isn't allowed after elements"
 msgstr "<!DOCTYPE> n'est pas autorisée après les éléments"
 
-msgctxt "DTYPE_NOT_UPPER_CASE"
-msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
-msgstr "SYSTEM, PUBLIC, W3C, DTD, EN doivent être en majuscules"
-
 #, c-format
 msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
 msgid "%s element not available in %s"
@@ -2752,23 +2735,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
 msgid "%s element not available in %s"
 msgstr "%s élément non disponible dans %s"
 
-msgctxt "ENCODING_IO_CONFLICT"
-msgid "Output encoding does not work with standard output"
-msgstr "Encodage de sortie non fonctionnel avec la sortie standard"
-
 #, c-format
 msgctxt "ILLEGAL_NESTING"
 msgid "%s shouldn't be nested"
 msgstr "%s ne doit pas être imbriqué"
 
-msgctxt "INCONSISTENT_NAMESPACE"
-msgid "HTML namespace doesn't match content"
-msgstr "l'espace de nom HTML ne correspond pas au contenu"
-
-msgctxt "INCONSISTENT_VERSION"
-msgid "HTML DOCTYPE doesn't match content"
-msgstr "La déclaration DOCTYPE HTML ne correspond pas au contenu"
-
 #, c-format
 msgctxt "INSERTING_TAG"
 msgid "inserting implicit <%s>"
@@ -2849,11 +2820,6 @@ msgctxt "TOO_MANY_ELEMENTS"
 msgid "too many %s elements"
 msgstr "trop d'éléments %s"
 
-#, c-format
-msgctxt "UNESCAPED_ELEMENT"
-msgid "unescaped %s in pre content"
-msgstr "%s non échappé dans le contenu pre"
-
 #, c-format
 msgctxt "USING_BR_INPLACE_OF"
 msgid "using <br> in place of %s"
@@ -2923,11 +2889,6 @@ msgctxt "BAD_SUMMARY_HTML5"
 msgid "The summary attribute on the %s element is obsolete in HTML5"
 msgstr "L'attribut summary sur l'élément %s est obsolète avec HTML5"
 
-#, c-format
-msgctxt "COERCE_TO_ENDTAG_WARN"
-msgid "<%s> is probably intended as </%s>"
-msgstr "<%s> est probablement destiné à </%s>"
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"
@@ -2971,6 +2932,11 @@ msgctxt "UNEXPECTED_ENDTAG"
 msgid "unexpected </%s>"
 msgstr "</%s> inattendu"
 
+#, c-format
+msgctxt "UNEXPECTED_ENDTAG_ERR"
+msgid "unexpected </%s>"
+msgstr "</%s> inattendu"
+
 msgctxt "MOVED_STYLE_TO_HEAD"
 msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
 msgstr ""
@@ -3153,10 +3119,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
 msgid "[3.6.1.4]: list usage invalid <li>."
 msgstr "[3.6.1.4]: usage non valide de liste <li>."
 
-msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
-msgid "[4.1.1.1]: indicate changes in language."
-msgstr "[4.1.1.1]: indique des changements dans le langage."
-
 msgctxt "LANGUAGE_NOT_IDENTIFIED"
 msgid "[4.3.1.1]: language not identified."
 msgstr "[4.3.1.1]: langage non identifié."
@@ -3369,18 +3331,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
 msgid "[10.1.1.2]: new windows require warning (_blank)."
 msgstr "[10.1.1.2]: les nouvelles fenêtres nécessitent un avertissement (_blank)."
 
-msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
-msgid "[10.4.1.1]: form control requires default text."
-msgstr "[10.4.1.1]: les contrôles de formulaires nécessitent un texte par défaut."
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
-msgid "[10.4.1.2]: form control default text invalid (null)."
-msgstr "[10.4.1.2]: texte par défaut du contrôle de formulaire non valide (null)."
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
-msgid "[10.4.1.3]: form control default text invalid (spaces)."
-msgstr "[10.4.1.3]: texte par défaut du contrôle de formulaire non valide (espaces)."
-
 msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
 msgid "[11.2.1.1]: replace deprecated html <applet>."
 msgstr "[11.2.1.1]: remplacer l'élément HTML déprécié <applet>."
diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po
index e8244f2..59131b8 100644
--- a/localize/translations/language_zh_cn.po
+++ b/localize/translations/language_zh_cn.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-08-28 10:04:31\n"
+"PO-Revision-Date: 2017-08-31 12:54:05\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2198,11 +2198,6 @@ msgctxt "WHITE_IN_URI"
 msgid "%s discarding whitespace in URI reference"
 msgstr ""
 
-#, c-format
-msgctxt "XML_ATTRIBUTE_VALUE"
-msgid "%s has XML attribute \"%s\""
-msgstr ""
-
 #, c-format
 msgctxt "XML_ID_SYNTAX"
 msgid "%s ID \"%s\" uses XML ID syntax"
@@ -2265,14 +2260,6 @@ msgctxt "BAD_CDATA_CONTENT"
 msgid "'<' + '/' + letter not allowed here"
 msgstr ""
 
-msgctxt "BAD_COMMENT_CHARS"
-msgid "expecting -- or >"
-msgstr ""
-
-msgctxt "BAD_XML_COMMENT"
-msgid "XML comments can't contain --"
-msgstr ""
-
 #, c-format
 msgctxt "CANT_BE_NESTED"
 msgid "%s can't be nested"
@@ -2291,10 +2278,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
 msgid "<!DOCTYPE> isn't allowed after elements"
 msgstr ""
 
-msgctxt "DTYPE_NOT_UPPER_CASE"
-msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
-msgstr ""
-
 #, c-format
 msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
 msgid "%s element not available in %s"
@@ -2305,23 +2288,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
 msgid "%s element not available in %s"
 msgstr ""
 
-msgctxt "ENCODING_IO_CONFLICT"
-msgid "Output encoding does not work with standard output"
-msgstr ""
-
 #, c-format
 msgctxt "ILLEGAL_NESTING"
 msgid "%s shouldn't be nested"
 msgstr ""
 
-msgctxt "INCONSISTENT_NAMESPACE"
-msgid "HTML namespace doesn't match content"
-msgstr ""
-
-msgctxt "INCONSISTENT_VERSION"
-msgid "HTML DOCTYPE doesn't match content"
-msgstr ""
-
 #, c-format
 msgctxt "INSERTING_TAG"
 msgid "inserting implicit <%s>"
@@ -2402,11 +2373,6 @@ msgctxt "TOO_MANY_ELEMENTS"
 msgid "too many %s elements"
 msgstr ""
 
-#, c-format
-msgctxt "UNESCAPED_ELEMENT"
-msgid "unescaped %s in pre content"
-msgstr ""
-
 #, c-format
 msgctxt "USING_BR_INPLACE_OF"
 msgid "using <br> in place of %s"
@@ -2472,11 +2438,6 @@ msgctxt "BAD_SUMMARY_HTML5"
 msgid "The summary attribute on the %s element is obsolete in HTML5"
 msgstr ""
 
-#, c-format
-msgctxt "COERCE_TO_ENDTAG_WARN"
-msgid "<%s> is probably intended as </%s>"
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"
@@ -2520,6 +2481,11 @@ msgctxt "UNEXPECTED_ENDTAG"
 msgid "unexpected </%s>"
 msgstr ""
 
+#, c-format
+msgctxt "UNEXPECTED_ENDTAG_ERR"
+msgid "unexpected </%s>"
+msgstr ""
+
 msgctxt "MOVED_STYLE_TO_HEAD"
 msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
 msgstr ""
@@ -2700,10 +2666,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
 msgid "[3.6.1.4]: list usage invalid <li>."
 msgstr ""
 
-msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
-msgid "[4.1.1.1]: indicate changes in language."
-msgstr ""
-
 msgctxt "LANGUAGE_NOT_IDENTIFIED"
 msgid "[4.3.1.1]: language not identified."
 msgstr ""
@@ -2916,18 +2878,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
 msgid "[10.1.1.2]: new windows require warning (_blank)."
 msgstr ""
 
-msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
-msgid "[10.4.1.1]: form control requires default text."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
-msgid "[10.4.1.2]: form control default text invalid (null)."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
-msgid "[10.4.1.3]: form control default text invalid (spaces)."
-msgstr ""
-
 msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
 msgid "[11.2.1.1]: replace deprecated html <applet>."
 msgstr ""
diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot
index bce7f97..db2ff58 100644
--- a/localize/translations/tidy.pot
+++ b/localize/translations/tidy.pot
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-28 10:04:30\n"
+"POT-Creation-Date: 2017-08-31 12:54:04\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2200,11 +2200,6 @@ msgctxt "WHITE_IN_URI"
 msgid "%s discarding whitespace in URI reference"
 msgstr ""
 
-#, c-format
-msgctxt "XML_ATTRIBUTE_VALUE"
-msgid "%s has XML attribute \"%s\""
-msgstr ""
-
 #, c-format
 msgctxt "XML_ID_SYNTAX"
 msgid "%s ID \"%s\" uses XML ID syntax"
@@ -2267,14 +2262,6 @@ msgctxt "BAD_CDATA_CONTENT"
 msgid "'<' + '/' + letter not allowed here"
 msgstr ""
 
-msgctxt "BAD_COMMENT_CHARS"
-msgid "expecting -- or >"
-msgstr ""
-
-msgctxt "BAD_XML_COMMENT"
-msgid "XML comments can't contain --"
-msgstr ""
-
 #, c-format
 msgctxt "CANT_BE_NESTED"
 msgid "%s can't be nested"
@@ -2293,10 +2280,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
 msgid "<!DOCTYPE> isn't allowed after elements"
 msgstr ""
 
-msgctxt "DTYPE_NOT_UPPER_CASE"
-msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
-msgstr ""
-
 #, c-format
 msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
 msgid "%s element not available in %s"
@@ -2307,23 +2290,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
 msgid "%s element not available in %s"
 msgstr ""
 
-msgctxt "ENCODING_IO_CONFLICT"
-msgid "Output encoding does not work with standard output"
-msgstr ""
-
 #, c-format
 msgctxt "ILLEGAL_NESTING"
 msgid "%s shouldn't be nested"
 msgstr ""
 
-msgctxt "INCONSISTENT_NAMESPACE"
-msgid "HTML namespace doesn't match content"
-msgstr ""
-
-msgctxt "INCONSISTENT_VERSION"
-msgid "HTML DOCTYPE doesn't match content"
-msgstr ""
-
 #, c-format
 msgctxt "INSERTING_TAG"
 msgid "inserting implicit <%s>"
@@ -2404,11 +2375,6 @@ msgctxt "TOO_MANY_ELEMENTS"
 msgid "too many %s elements"
 msgstr ""
 
-#, c-format
-msgctxt "UNESCAPED_ELEMENT"
-msgid "unescaped %s in pre content"
-msgstr ""
-
 #, c-format
 msgctxt "USING_BR_INPLACE_OF"
 msgid "using <br> in place of %s"
@@ -2474,11 +2440,6 @@ msgctxt "BAD_SUMMARY_HTML5"
 msgid "The summary attribute on the %s element is obsolete in HTML5"
 msgstr ""
 
-#, c-format
-msgctxt "COERCE_TO_ENDTAG_WARN"
-msgid "<%s> is probably intended as </%s>"
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"
@@ -2522,6 +2483,11 @@ msgctxt "UNEXPECTED_ENDTAG"
 msgid "unexpected </%s>"
 msgstr ""
 
+#, c-format
+msgctxt "UNEXPECTED_ENDTAG_ERR"
+msgid "unexpected </%s>"
+msgstr ""
+
 msgctxt "MOVED_STYLE_TO_HEAD"
 msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
 msgstr ""
@@ -2702,10 +2668,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
 msgid "[3.6.1.4]: list usage invalid <li>."
 msgstr ""
 
-msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
-msgid "[4.1.1.1]: indicate changes in language."
-msgstr ""
-
 msgctxt "LANGUAGE_NOT_IDENTIFIED"
 msgid "[4.3.1.1]: language not identified."
 msgstr ""
@@ -2918,18 +2880,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
 msgid "[10.1.1.2]: new windows require warning (_blank)."
 msgstr ""
 
-msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
-msgid "[10.4.1.1]: form control requires default text."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
-msgid "[10.4.1.2]: form control default text invalid (null)."
-msgstr ""
-
-msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
-msgid "[10.4.1.3]: form control default text invalid (spaces)."
-msgstr ""
-
 msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
 msgid "[11.2.1.1]: replace deprecated html <applet>."
 msgstr ""
diff --git a/src/access.c b/src/access.c
index ac3b9aa..ed253cc 100644
--- a/src/access.c
+++ b/src/access.c
@@ -3312,21 +3312,6 @@ void TY_(AccessibilityChecks)( TidyDocImpl* doc )
     /* Check to see if any list elements are found within the document */
     CheckForListElements( doc, &doc->root );
 
-    /* Checks for natural language change */
-    /* Must contain more than 3 words of text in the document
-    **
-    ** CPR - Not sure what intent is here, but this 
-    ** routine has nothing to do with changes in language.
-    ** It seems like a bad idea to emit this message for
-    ** every document with _more_ than 3 words!
-
-    if ( WordCount(doc, &doc->root) > 3 )
-    {
-        TY_(ReportAccessWarning)( doc, node, INDICATE_CHANGES_IN_LANGUAGE);
-    }
-    */
-
-
     /* Recursively apply all remaining checks to 
     ** each node in document.
     */
diff --git a/src/config.c b/src/config.c
index 6acb350..e4484dc 100644
--- a/src/config.c
+++ b/src/config.c
@@ -291,6 +291,7 @@ static const TidyOptionImpl option_defs[] =
     { TidySkipNested,              MU, "skip-nested",                 BL, yes,             ParsePickList,     &boolPicks          }, /* 1642186 - Issue #65 */
     { TidySortAttributes,          PP, "sort-attributes",             IN, TidySortAttrNone,ParsePickList,     &sorterPicks        },
     { TidyStrictTagsAttr,          MU, "strict-tags-attributes",      BL, no,              ParsePickList,     &boolPicks          }, /* 20160209 - Issue #350 */
+    { TidyStyleTags,               MU, "fix-style-tags",              BL, yes,             ParsePickList,     &boolPicks          },
     { TidyTabSize,                 PP, "tab-size",                    IN, 8,               ParseInt,          NULL                },
     { TidyUpperCaseAttrs,          MU, "uppercase-attributes",        IN, TidyUppercaseNo, ParsePickList,     &attributeCasePicks },
     { TidyUpperCaseTags,           MU, "uppercase-tags",              BL, no,              ParsePickList,     &boolPicks          },
@@ -312,7 +313,6 @@ static const TidyOptionImpl option_defs[] =
     { TidyXmlPIs,                  MU, "assume-xml-procins",          BL, no,              ParsePickList,     &boolPicks          },
     { TidyXmlSpace,                MU, "add-xml-space",               BL, no,              ParsePickList,     &boolPicks          },
     { TidyXmlTags,                 MU, "input-xml",                   BL, no,              ParsePickList,     &boolPicks          },
-    { TidyStyleTags,               MU, "fix-style-tags",              BL, yes,             ParsePickList,     &boolPicks          },
     { N_TIDY_OPTIONS,              XX, NULL,                          XY, 0,               NULL,              NULL                }
 };
 
diff --git a/src/language_en.h b/src/language_en.h
index d597834..915d398 100644
--- a/src/language_en.h
+++ b/src/language_en.h
@@ -1823,7 +1823,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { UNEXPECTED_GT,                0,   "%s missing '>' for end of tag"                                           }, /* ReportAttrError */
     { UNEXPECTED_QUOTEMARK,         0,   "%s unexpected or duplicate quote mark"                                   }, /* ReportAttrError */
     { WHITE_IN_URI,                 0,   "%s discarding whitespace in URI reference"                               }, /* ReportAttrError */
-    { XML_ATTRIBUTE_VALUE,          0,   "%s has XML attribute \"%s\""                                             }, /* ReportAttrError */
     { XML_ID_SYNTAX,                0,   "%s ID \"%s\" uses XML ID syntax"                                         }, /* ReportAttrError */
     
     { INVALID_NCR,                  0,   "%s invalid numeric character reference %s"                               }, /* ReportEncodingError */
@@ -1841,19 +1840,13 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { UNKNOWN_ENTITY,               0,   "unescaped & or unknown entity \"%s\""                                    }, /* ReportEntityError */
     
     { BAD_CDATA_CONTENT,            0,   "'<' + '/' + letter not allowed here"                                     }, /* ReportError */
-    { BAD_COMMENT_CHARS,            0,   "expecting -- or >"                                                       }, /* ReportError */
-    { BAD_XML_COMMENT,              0,   "XML comments can't contain --"                                           }, /* ReportError */
     { CANT_BE_NESTED,               0,   "%s can't be nested"                                                      }, /* ReportError */
     { CONTENT_AFTER_BODY,           0,   "content occurs after end of body"                                        }, /* ReportError */
     { DISCARDING_UNEXPECTED,        0,   "discarding unexpected %s"                                                }, /* ReportError */
     { DOCTYPE_AFTER_TAGS,           0,   "<!DOCTYPE> isn't allowed after elements"                                 }, /* ReportError */
-    { DTYPE_NOT_UPPER_CASE,         0,   "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"                         }, /* ReportError */
     { ELEMENT_VERS_MISMATCH_ERROR,  0,   "%s element not available in %s"                                          }, /* ReportError */
     { ELEMENT_VERS_MISMATCH_WARN,   0,   "%s element not available in %s"                                          }, /* ReportError */
-    { ENCODING_IO_CONFLICT,         0,   "Output encoding does not work with standard output"                      }, /* ReportError */
     { ILLEGAL_NESTING,              0,   "%s shouldn't be nested"                                                  }, /* ReportError */
-    { INCONSISTENT_NAMESPACE,       0,   "HTML namespace doesn't match content"                                    }, /* ReportError */
-    { INCONSISTENT_VERSION,         0,   "HTML DOCTYPE doesn't match content"                                      }, /* ReportError */
     { INSERTING_TAG,                0,   "inserting implicit <%s>"                                                 }, /* ReportError */
     { MALFORMED_COMMENT,            0,   "adjacent hyphens within comment"                                         }, /* ReportError */
     { MALFORMED_DOCTYPE,            0,   "discarding malformed <!DOCTYPE>"                                         }, /* ReportError */
@@ -1871,7 +1864,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { TAG_NOT_ALLOWED_IN,           0,   "%s isn't allowed in <%s> elements"                                       }, /* ReportError */
     { TOO_MANY_ELEMENTS_IN,         0,   "too many %s elements in <%s>"                                            }, /* ReportError */
     { TOO_MANY_ELEMENTS,            0,   "too many %s elements"                                                    }, /* ReportError */
-    { UNESCAPED_ELEMENT,            0,   "unescaped %s in pre content"                                             }, /* ReportError */
     { USING_BR_INPLACE_OF,          0,   "using <br> in place of %s"                                               }, /* ReportError */
     
     { DUPLICATE_FRAMESET,           0,   "repeated FRAMESET element"                                               }, /* ReportFatal */
@@ -1953,7 +1945,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { LIST_USAGE_INVALID_UL,                         0,   "[3.6.1.1]: list usage invalid <ul>."                                      },
     { LIST_USAGE_INVALID_OL,                         0,   "[3.6.1.2]: list usage invalid <ol>."                                      },
     { LIST_USAGE_INVALID_LI,                         0,   "[3.6.1.4]: list usage invalid <li>."                                      },
-    { INDICATE_CHANGES_IN_LANGUAGE,                  0,   "[4.1.1.1]: indicate changes in language."                                 },
     { LANGUAGE_NOT_IDENTIFIED,                       0,   "[4.3.1.1]: language not identified."                                      },
     { LANGUAGE_INVALID,                              0,   "[4.3.1.2]: language attribute invalid."                                   },
     { DATA_TABLE_MISSING_HEADERS,                    0,   "[5.1.2.1]: data <table> missing row/column headers (all)."                },
@@ -2007,9 +1998,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE,  0,   "[9.3.1.6]: <script> not keyboard accessible (onMouseMove)."               },
     { NEW_WINDOWS_REQUIRE_WARNING_NEW,               0,   "[10.1.1.1]: new windows require warning (_new)."                          },
     { NEW_WINDOWS_REQUIRE_WARNING_BLANK,             0,   "[10.1.1.2]: new windows require warning (_blank)."                        },
-    { FORM_CONTROL_REQUIRES_DEFAULT_TEXT,            0,   "[10.4.1.1]: form control requires default text."                          },
-    { FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL,        0,   "[10.4.1.2]: form control default text invalid (null)."                    },
-    { FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES,      0,   "[10.4.1.3]: form control default text invalid (spaces)."                  },
     { REPLACE_DEPRECATED_HTML_APPLET,                0,   "[11.2.1.1]: replace deprecated html <applet>."                            },
     { REPLACE_DEPRECATED_HTML_BASEFONT,              0,   "[11.2.1.2]: replace deprecated html <basefont>."                          },
     { REPLACE_DEPRECATED_HTML_CENTER,                0,   "[11.2.1.3]: replace deprecated html <center>."                            },
diff --git a/src/language_fr.h b/src/language_fr.h
index b3ec0c3..527a812 100644
--- a/src/language_fr.h
+++ b/src/language_fr.h
@@ -809,7 +809,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { UNEXPECTED_GT,                                 0, "%s symbole '>' manquant pour la fin de balise"                                                          },
     { UNEXPECTED_QUOTEMARK,                          0, "%s guillemet double inattendu ou dupliqué"                                                              },
     { WHITE_IN_URI,                                  0, "%s rejet des espaces dans la référence URI"                                                             },
-    { XML_ATTRIBUTE_VALUE,                           0, "%s a un attribut XML \"%s\""                                                                            },
     { XML_ID_SYNTAX,                                 0, "%s ID « %s » utilise la syntaxe XML ID"                                                                 },
     { INVALID_NCR,                                   0, "%s référence de caractère numérique non valide %s"                                                      },
     { INVALID_SGML_CHARS,                            0, "%s code de caractère non valide %s"                                                                     },
@@ -823,19 +822,13 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { UNESCAPED_AMPERSAND,                           0, "symbole & non échappé qui devrait être écrit &amp;"                                                     },
     { UNKNOWN_ENTITY,                                0, "symbole & non échappé ou entité inconnue « %s »"                                                        },
     { BAD_CDATA_CONTENT,                             0, "'<' + '/' + lettres non permises ici"                                                                   },
-    { BAD_COMMENT_CHARS,                             0, "attendu -- ou >"                                                                                        },
-    { BAD_XML_COMMENT,                               0, "les commentaires XML ne peuvent pas contenir --"                                                        },
     { CANT_BE_NESTED,                                0, "%s ne peut pas être imbriqué"                                                                           },
     { CONTENT_AFTER_BODY,                            0, "contenu trouvé après la fin de body"                                                                    },
     { DISCARDING_UNEXPECTED,                         0, "inhibition de valeur inattendue %s"                                                                     },
     { DOCTYPE_AFTER_TAGS,                            0, "<!DOCTYPE> n'est pas autorisée après les éléments"                                                      },
-    { DTYPE_NOT_UPPER_CASE,                          0, "SYSTEM, PUBLIC, W3C, DTD, EN doivent être en majuscules"                                                },
     { ELEMENT_VERS_MISMATCH_ERROR,                   0, "%s élément non disponible dans %s"                                                                      },
     { ELEMENT_VERS_MISMATCH_WARN,                    0, "%s élément non disponible dans %s"                                                                      },
-    { ENCODING_IO_CONFLICT,                          0, "Encodage de sortie non fonctionnel avec la sortie standard"                                             },
     { ILLEGAL_NESTING,                               0, "%s ne doit pas être imbriqué"                                                                           },
-    { INCONSISTENT_NAMESPACE,                        0, "l'espace de nom HTML ne correspond pas au contenu"                                                      },
-    { INCONSISTENT_VERSION,                          0, "La déclaration DOCTYPE HTML ne correspond pas au contenu"                                               },
     { INSERTING_TAG,                                 0, "insertion implicite de <%s>"                                                                            },
     { MALFORMED_COMMENT,                             0, "tirets adjacents dans un commentaire"                                                                   },
     { MALFORMED_DOCTYPE,                             0, "inhibition de la <!DOCTYPE> mal formée"                                                                 },
@@ -853,7 +846,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TAG_NOT_ALLOWED_IN,                            0, "%s n'est pas permis dans les éléments <%s>"                                                             },
     { TOO_MANY_ELEMENTS_IN,                          0, "trop d'éléments %s dans <%s>"                                                                           },
     { TOO_MANY_ELEMENTS,                             0, "trop d'éléments %s"                                                                                     },
-    { UNESCAPED_ELEMENT,                             0, "%s non échappé dans le contenu pre"                                                                     },
     { USING_BR_INPLACE_OF,                           0, "utilisation de <br> à la place de %s"                                                                   },
     { DUPLICATE_FRAMESET,                            0, "élément répété FRAMESET"                                                                                },
     { SUSPECTED_MISSING_QUOTE,                       0, "absence de guillemet pour la valeur d'attribut"                                                         },
@@ -932,7 +924,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { LIST_USAGE_INVALID_UL,                         0, "[3.6.1.1]: Usage non valide de liste <ul>."                                                             },
     { LIST_USAGE_INVALID_OL,                         0, "[3.6.1.2]: usage non valide de liste <ol>."                                                             },
     { LIST_USAGE_INVALID_LI,                         0, "[3.6.1.4]: usage non valide de liste <li>."                                                             },
-    { INDICATE_CHANGES_IN_LANGUAGE,                  0, "[4.1.1.1]: indique des changements dans le langage."                                                    },
     { LANGUAGE_NOT_IDENTIFIED,                       0, "[4.3.1.1]: langage non identifié."                                                                      },
     { LANGUAGE_INVALID,                              0, "[4.3.1.2]: attribut de langage non valide."                                                             },
     { DATA_TABLE_MISSING_HEADERS,                    0, "[5.1.2.1]: data <table> absence d'entêtes rangée/colonne (tous)."                                       },
@@ -986,9 +977,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE,  0, "[9.3.1.6]: <script> non accessible par le clavier (onMouseMove)."                                       },
     { NEW_WINDOWS_REQUIRE_WARNING_NEW,               0, "[10.1.1.1]: les nouvelles fenêtres nécessitent un avertissement (_new)."                                },
     { NEW_WINDOWS_REQUIRE_WARNING_BLANK,             0, "[10.1.1.2]: les nouvelles fenêtres nécessitent un avertissement (_blank)."                              },
-    { FORM_CONTROL_REQUIRES_DEFAULT_TEXT,            0, "[10.4.1.1]: les contrôles de formulaires nécessitent un texte par défaut."                              },
-    { FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL,        0, "[10.4.1.2]: texte par défaut du contrôle de formulaire non valide (null)."                              },
-    { FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES,      0, "[10.4.1.3]: texte par défaut du contrôle de formulaire non valide (espaces)."                           },
     { REPLACE_DEPRECATED_HTML_APPLET,                0, "[11.2.1.1]: remplacer l'élément HTML déprécié <applet>."                                                },
     { REPLACE_DEPRECATED_HTML_BASEFONT,              0, "[11.2.1.2]: remplacer l'élément HTML déprécié <basefont>."                                              },
     { REPLACE_DEPRECATED_HTML_CENTER,                0, "[11.2.1.3]: remplacer l'élément HTML déprécié <center>."                                                },
diff --git a/src/message.c b/src/message.c
index 8538124..c03fcf0 100755
--- a/src/message.c
+++ b/src/message.c
@@ -237,7 +237,6 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
         case CANT_BE_NESTED:
         case NOFRAMES_CONTENT:
         case PROPRIETARY_ELEMENT:
-        case UNESCAPED_ELEMENT:
         case USING_BR_INPLACE_OF:
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc );
             break;
@@ -253,13 +252,8 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
             break;
 
         case BAD_CDATA_CONTENT:
-        case BAD_COMMENT_CHARS:
-        case BAD_XML_COMMENT:
         case CONTENT_AFTER_BODY:
         case DOCTYPE_AFTER_TAGS:
-        case DTYPE_NOT_UPPER_CASE:
-        case INCONSISTENT_NAMESPACE:
-        case INCONSISTENT_VERSION:
         case MALFORMED_COMMENT:
         case MALFORMED_DOCTYPE:
         case MISSING_TITLE_ELEMENT:
@@ -297,7 +291,6 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
             message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, node->element, node->element );
             break;
 
-        case ENCODING_IO_CONFLICT:
         case MISSING_DOCTYPE:
         case SPACE_PRECEDING_XMLDECL:
         case XML_DECLARATION_DETECTED:
@@ -427,7 +420,6 @@ void TY_(ReportAttrError)(TidyDocImpl* doc, Node *node, AttVal *av, uint code)
         case JOINING_ATTRIBUTE:
         case MISSING_ATTR_VALUE:
         case PROPRIETARY_ATTRIBUTE:
-        case XML_ATTRIBUTE_VALUE:
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, name );
             break;
 
diff --git a/version.txt b/version.txt
index 24b3582..267faf3 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
-5.5.35
-2017.08.30
+5.5.36
+2017.08.31