[html5] r5295 - [giow] (2) <meta charset> should only work for ASCII-compatible encodings. Fixin [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2010-08-16 12:27:55 -0700 (Mon, 16 Aug 2010)
New Revision: 5295

Modified:
   complete.html
   index
   source
Log:
[giow] (2) <meta charset> should only work for ASCII-compatible encodings.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=10260

Modified: complete.html
===================================================================
--- complete.html	2010-08-16 19:07:22 UTC (rev 5294)
+++ complete.html	2010-08-16 19:27:55 UTC (rev 5295)
@@ -82281,11 +82281,11 @@
     <p><a href=#acknowledge-self-closing-flag title="acknowledge self-closing flag">Acknowledge the
     token's <i>self-closing flag</i></a>, if it is set.</p>
 
-    <p id=meta-charset-during-parse>If the element has a <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute, and its
-    value is a supported encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
-    currently <i>tentative</i>, then <a href=#change-the-encoding>change the
-    encoding</a> to the encoding given by the value of the
-    <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute.</p>
+    <p id=meta-charset-during-parse>If the element has a <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute, and its value
+    is either a supported <a href=#ascii-compatible-character-encoding>ASCII-compatible character
+    encoding</a> or a UTF-16 encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
+    <i>tentative</i>, then <a href=#change-the-encoding>change the encoding</a> to the
+    encoding given by the value of the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute.</p>
 
     <p>Otherwise, if the element has an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute whose
     value is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the

Modified: index
===================================================================
--- index	2010-08-16 19:07:22 UTC (rev 5294)
+++ index	2010-08-16 19:27:55 UTC (rev 5295)
@@ -75383,11 +75383,11 @@
     <p><a href=#acknowledge-self-closing-flag title="acknowledge self-closing flag">Acknowledge the
     token's <i>self-closing flag</i></a>, if it is set.</p>
 
-    <p id=meta-charset-during-parse>If the element has a <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute, and its
-    value is a supported encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
-    currently <i>tentative</i>, then <a href=#change-the-encoding>change the
-    encoding</a> to the encoding given by the value of the
-    <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute.</p>
+    <p id=meta-charset-during-parse>If the element has a <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute, and its value
+    is either a supported <a href=#ascii-compatible-character-encoding>ASCII-compatible character
+    encoding</a> or a UTF-16 encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
+    <i>tentative</i>, then <a href=#change-the-encoding>change the encoding</a> to the
+    encoding given by the value of the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute.</p>
 
     <p>Otherwise, if the element has an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute whose
     value is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the

Modified: source
===================================================================
--- source	2010-08-16 19:07:22 UTC (rev 5294)
+++ source	2010-08-16 19:27:55 UTC (rev 5295)
@@ -93971,12 +93971,13 @@
     token's <i>self-closing flag</i></span>, if it is set.</p>
 
     <p id="meta-charset-during-parse">If the element has a <code
-    title="attr-meta-charset">charset</code> attribute, and its
-    value is a supported encoding, and the <span
-    title="concept-encoding-confidence">confidence</span> is
-    currently <i>tentative</i>, then <span>change the
-    encoding</span> to the encoding given by the value of the
-    <code title="attr-meta-charset">charset</code> attribute.</p>
+    title="attr-meta-charset">charset</code> attribute, and its value
+    is either a supported <span>ASCII-compatible character
+    encoding</span> or a UTF-16 encoding, and the <span
+    title="concept-encoding-confidence">confidence</span> is currently
+    <i>tentative</i>, then <span>change the encoding</span> to the
+    encoding given by the value of the <code
+    title="attr-meta-charset">charset</code> attribute.</p>
 
     <p>Otherwise, if the element has an <code
     title="attr-meta-http-equiv">http-equiv</code> attribute whose