[html5] r7701 - [giow] (3) Revert part of r5545 because bz changed his mind and this matches rea [...]
whatwg at whatwg.org
whatwg at whatwg.org
Wed Feb 6 15:10:55 PST 2013
Author: ianh
Date: 2013-02-06 15:10:54 -0800 (Wed, 06 Feb 2013)
New Revision: 7701
Modified:
complete.html
index
source
Log:
[giow] (3) Revert part of r5545 because bz changed his mind and this matches reality better. :-)
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=19623
Affected topics: HTML
Modified: complete.html
===================================================================
--- complete.html 2013-02-06 23:06:23 UTC (rev 7700)
+++ complete.html 2013-02-06 23:10:54 UTC (rev 7701)
@@ -15396,15 +15396,7 @@
<p>To obtain the Unicode string, the user agent run the following steps:</p>
- <ol><li><p>If the resource's <a href=#content-type title=Content-Type>Content Type metadata</a>, if any,
- specifies a character encoding, and the user agent supports that encoding, then let <var title="">character encoding</var> be that encoding, and jump to the bottom step in this
- series of steps.</li>
-
- <li><p>If the algorithm above set <var><a href="#the-script-block's-character-encoding">the script block's character encoding</a></var>, then
- let <var title="">character encoding</var> be that encoding, and jump to the bottom step
- in this series of steps.</li>
-
- <li><p>For each of the rows in the following table, starting with the first one and going
+ <ol><li><p>For each of the rows in the following table, starting with the first one and going
down, if the file has as many or more bytes available than the number of bytes in the
first column, and the first bytes of the file match the bytes given in the first column,
then set <var title="">character encoding</var> to the encoding given in the cell in the
@@ -15435,6 +15427,14 @@
</li>
+ <li><p>If the resource's <a href=#content-type title=Content-Type>Content Type metadata</a>, if any,
+ specifies a character encoding, and the user agent supports that encoding, then let <var title="">character encoding</var> be that encoding, and jump to the bottom step in this
+ series of steps.</li>
+
+ <li><p>If the algorithm above set <var><a href="#the-script-block's-character-encoding">the script block's character encoding</a></var>, then
+ let <var title="">character encoding</var> be that encoding, and jump to the bottom step
+ in this series of steps.</li>
+
<li><p>Let <var title="">character encoding</var> be <var><a href="#the-script-block's-fallback-character-encoding">the script block's fallback
character encoding</a></var>.</li>
Modified: index
===================================================================
--- index 2013-02-06 23:06:23 UTC (rev 7700)
+++ index 2013-02-06 23:10:54 UTC (rev 7701)
@@ -15396,15 +15396,7 @@
<p>To obtain the Unicode string, the user agent run the following steps:</p>
- <ol><li><p>If the resource's <a href=#content-type title=Content-Type>Content Type metadata</a>, if any,
- specifies a character encoding, and the user agent supports that encoding, then let <var title="">character encoding</var> be that encoding, and jump to the bottom step in this
- series of steps.</li>
-
- <li><p>If the algorithm above set <var><a href="#the-script-block's-character-encoding">the script block's character encoding</a></var>, then
- let <var title="">character encoding</var> be that encoding, and jump to the bottom step
- in this series of steps.</li>
-
- <li><p>For each of the rows in the following table, starting with the first one and going
+ <ol><li><p>For each of the rows in the following table, starting with the first one and going
down, if the file has as many or more bytes available than the number of bytes in the
first column, and the first bytes of the file match the bytes given in the first column,
then set <var title="">character encoding</var> to the encoding given in the cell in the
@@ -15435,6 +15427,14 @@
</li>
+ <li><p>If the resource's <a href=#content-type title=Content-Type>Content Type metadata</a>, if any,
+ specifies a character encoding, and the user agent supports that encoding, then let <var title="">character encoding</var> be that encoding, and jump to the bottom step in this
+ series of steps.</li>
+
+ <li><p>If the algorithm above set <var><a href="#the-script-block's-character-encoding">the script block's character encoding</a></var>, then
+ let <var title="">character encoding</var> be that encoding, and jump to the bottom step
+ in this series of steps.</li>
+
<li><p>Let <var title="">character encoding</var> be <var><a href="#the-script-block's-fallback-character-encoding">the script block's fallback
character encoding</a></var>.</li>
Modified: source
===================================================================
--- source 2013-02-06 23:06:23 UTC (rev 7700)
+++ source 2013-02-06 23:10:54 UTC (rev 7701)
@@ -16117,15 +16117,6 @@
<ol>
- <li><p>If the resource's <span title="Content-Type">Content Type metadata</span>, if any,
- specifies a character encoding, and the user agent supports that encoding, then let <var
- title="">character encoding</var> be that encoding, and jump to the bottom step in this
- series of steps.</p></li>
-
- <li><p>If the algorithm above set <var>the script block's character encoding</var>, then
- let <var title="">character encoding</var> be that encoding, and jump to the bottom step
- in this series of steps.</p></li>
-
<li><p>For each of the rows in the following table, starting with the first one and going
down, if the file has as many or more bytes available than the number of bytes in the
first column, and the first bytes of the file match the bytes given in the first column,
@@ -16167,6 +16158,15 @@
</li>
+ <li><p>If the resource's <span title="Content-Type">Content Type metadata</span>, if any,
+ specifies a character encoding, and the user agent supports that encoding, then let <var
+ title="">character encoding</var> be that encoding, and jump to the bottom step in this
+ series of steps.</p></li>
+
+ <li><p>If the algorithm above set <var>the script block's character encoding</var>, then
+ let <var title="">character encoding</var> be that encoding, and jump to the bottom step
+ in this series of steps.</p></li>
+
<li><p>Let <var title="">character encoding</var> be <var>the script block's fallback
character encoding</var>.</p></li>
More information about the Commit-Watchers
mailing list