Drop “actual HTML encoding”-related code

This change removes all code related to checking and using the “actual
HTML encoding”, which no longer corresponds to current spec requirements.

Author: sideshowbarker

src/nu/validator/htmlparser/extra/ChardetSniffer.java

@@ -74,10 +74,6 @@ public static void main(String[] args) {
     public void Notify(String charsetName) {
         try {
             Encoding enc = Encoding.forName(charsetName);
-            Encoding actual = enc.getActualHtmlEncoding();
-            if (actual != null) {
-                enc = actual;
-            }
             returnValue = enc;
         } catch (UnsupportedCharsetException e) {
             returnValue = null;

src/nu/validator/htmlparser/extra/IcuDetectorSniffer.java

@@ -53,10 +53,6 @@ public Encoding sniff() throws IOException {
             detector.setText(this);
             CharsetMatch match = detector.detect();
             Encoding enc = Encoding.forName(match.getName());
-            Encoding actual = enc.getActualHtmlEncoding();
-            if (actual != null) {
-                enc = actual;
-            }
             if (enc != Encoding.WINDOWS1252 //
                     && enc != Encoding.UTF16BE && enc != Encoding.UTF16LE) {
                 return enc;

src/nu/validator/htmlparser/io/Driver.java

@@ -497,15 +497,10 @@ protected Encoding whineAboutEncodingAndReturnActual(String encoding,
                     + encoding
                     + "\u201D is not widely supported. Better interoperability may be achieved by using \u201CUTF-8\u201D.");
         }
-        Encoding actual = cs.getActualHtmlEncoding();
-        if (actual == null) {
-            return cs;
-        } else {
-            tokenizer.warn("Using \u201C" + actual.getCanonName()
-                    + "\u201D instead of the declared encoding \u201C"
-                    + encoding + "\u201D.");
-            return actual;
+        if (!canonName.equals(encoding)) {
+            tokenizer.err(Encoding.msgNotPreferredName(encoding, canonName));
         }
+        return cs;
     }
 
     private class ReparseException extends SAXException {

src/nu/validator/htmlparser/io/Encoding.java

@@ -310,8 +310,6 @@ public class Encoding {
 
     private final boolean likelyEbcdic;
 
-    private Encoding actualHtmlEncoding = null;
-
     static {
         Set<Encoding> encodings = new HashSet<Encoding>();
 
@@ -345,46 +343,6 @@ asciiSuperset, isObscure(name),
         UTF16BE = forName("utf-16be");
         UTF16LE = forName("utf-16le");
         WINDOWS1252 = forName("windows-1252");
-        try {
-            forName("iso-8859-1").actualHtmlEncoding = forName("windows-1252");
-        } catch (UnsupportedCharsetException e) {
-        }
-        try {
-            forName("iso-8859-9").actualHtmlEncoding = forName("windows-1254");
-        } catch (UnsupportedCharsetException e) {
-        }
-        try {
-            forName("iso-8859-11").actualHtmlEncoding = forName("windows-874");
-        } catch (UnsupportedCharsetException e) {
-        }
-        try {
-            forName("x-iso-8859-11").actualHtmlEncoding = forName("windows-874");
-        } catch (UnsupportedCharsetException e) {
-        }
-        try {
-            forName("tis-620").actualHtmlEncoding = forName("windows-874");
-        } catch (UnsupportedCharsetException e) {
-        }
-        try {
-            forName("gb_2312-80").actualHtmlEncoding = forName("gbk");
-        } catch (UnsupportedCharsetException e) {
-        }
-        try {
-            forName("gb2312").actualHtmlEncoding = forName("gbk");
-        } catch (UnsupportedCharsetException e) {
-        }
-        try {
-            encodingByLabel.put("x-x-big5", forName("big5"));
-        } catch (UnsupportedCharsetException e) {
-        }
-        try {
-            encodingByLabel.put("euc-kr", forName("windows-949"));
-        } catch (UnsupportedCharsetException e) {
-        }
-        try {
-            encodingByLabel.put("ks_c_5601-1987", forName("windows-949"));
-        } catch (UnsupportedCharsetException e) {
-        }
     }
 
     private static boolean isObscure(String lowerCasePreferredIanaName) {
@@ -551,15 +509,6 @@ public CharsetEncoder newEncoder() {
         return charset.newEncoder();
     }
 
-    /**
-     * Returns the actualHtmlEncoding.
-     * 
-     * @return the actualHtmlEncoding
-     */
-    public Encoding getActualHtmlEncoding() {
-        return actualHtmlEncoding;
-    }
-
     protected static String msgLegacyEncoding(String name) {
         return "Legacy encoding \u201C" + name + "\u201D used. Documents must"
                 + " use UTF-8.";

src/nu/validator/htmlparser/io/MetaSniffer.java

@@ -191,8 +191,8 @@ protected boolean tryCharset(String encoding) throws SAXException {
                 } else if (cs.isObscure()) {
                     warn("The character encoding \u201C" + encoding + "\u201D is not widely supported. Better interoperability may be achieved by using \u201CUTF-8\u201D.");
                 }
-                Encoding actual = cs.getActualHtmlEncoding();
-                if (actual == null) {
+                if (!cs.getCanonName().equals(encoding)) {
+                    err(Encoding.msgNotCanonicalName(encoding, canonName));
                     this.characterEncoding = cs;
                 } else {
                     warn("Using \u201C" + actual.getCanonName() + "\u201D instead of the declared encoding \u201C" + encoding + "\u201D.");