Move the self-closing-tag warning to the TreeBuilder code

src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java

@@ -710,18 +710,6 @@ private boolean isAstralPrivateUse(int c) {
         note("xhtml1", "Unquoted attribute value.");
     }
 
-    @Override
-    protected void noteSelfClosingTag() throws SAXException {
-        note("html-strict",
-                "Self-closing tag syntax in text/html documents is widely"
-                        + " discouraged; it’s unnecessary and interacts badly"
-                        + " with other HTML features (e.g., unquoted attribute"
-                        + " values). If you’re using a tool that injects"
-                        + " self-closing tag syntax into all void elements,"
-                        + " without any option to prevent it from doing so,"
-                        + " then consider switching to a different tool.");
-    }
-
     /**
      * Sets the transitionHandler.
      *

src/nu/validator/htmlparser/impl/Tokenizer.java

@@ -2292,7 +2292,6 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                              * flag of the current tag token. Emit the current
                              * tag token.
                              */
-                            noteSelfClosingTag();
                             state = transition(state, emitCurrentTagToken(true, pos), reconsume, pos);
                             if (shouldSuspend) {
                                 break stateloop;
@@ -7588,9 +7587,6 @@ protected void noteAttributeWithoutValue() throws SAXException {
     protected void noteUnquotedAttributeValue() throws SAXException {
     }
 
-    protected void noteSelfClosingTag() throws SAXException {
-    }
-
     /**
      * Sets the encodingDeclarationHandler.
      *

src/nu/validator/htmlparser/impl/TreeBuilder.java

@@ -438,6 +438,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
 
     private boolean reportingDoctype = true;
 
+    private HashMap<String, String> errorProfileMap = null;
+
     private XmlViolationPolicy namePolicy = XmlViolationPolicy.ALTER_INFOSET;
 
     private final Map<String, LocatorImpl> idLocations = new HashMap<String, LocatorImpl>();
@@ -1458,6 +1460,17 @@ public final void startTag(ElementName elementName,
         flushCharacters();
 
         // [NOCPP[
+        if (contextNamespace == "http://www.w3.org/1999/xhtml" &&
+                selfClosing && errorProfileMap != null &&
+                errorProfileMap.get("html-strict") != null) {
+            warn("Self-closing tag syntax in text/html documents is widely"
+                    + " discouraged; it’s unnecessary and interacts badly"
+                    + " with other HTML features (e.g., unquoted attribute"
+                    + " values). If you’re using a tool that injects"
+                    + " self-closing tag syntax into all void elements,"
+                    + " without any option to prevent it from doing so,"
+                    + " then consider switching to a different tool.");
+        }
         if (errorHandler != null) {
             // ID uniqueness
             @IdType String id = attributes.getId();
@@ -5818,6 +5831,15 @@ public void setNamePolicy(XmlViolationPolicy namePolicy) {
         this.namePolicy = namePolicy;
     }
 
+    /**
+     * Sets the errorProfile.
+     *
+     * @param errorProfile
+     */
+    public void setErrorProfile(HashMap<String, String> errorProfileMap) {
+        this.errorProfileMap = errorProfileMap;
+    }
+
     /**
      * Sets the documentModeHandler.
      *

src/nu/validator/htmlparser/sax/HtmlParser.java

@@ -199,6 +199,7 @@ private void lazyInit() {
             this.treeBuilder.setScriptingEnabled(scriptingEnabled);
             this.treeBuilder.setReportingDoctype(reportingDoctype);
             this.treeBuilder.setNamePolicy(namePolicy);
+            this.treeBuilder.setErrorProfile(errorProfileMap);
             if (saxStreamer != null) {
                 saxStreamer.setContentHandler(contentHandler == null ? new DefaultHandler()
                         : contentHandler);