[html5] r1221 - /
whatwg at whatwg.org
whatwg at whatwg.org
Wed Feb 13 20:21:32 PST 2008
Author: ianh
Date: 2008-02-13 20:21:28 -0800 (Wed, 13 Feb 2008)
New Revision: 1221
Modified:
index
source
Log:
[e] (0) rename the content-type state pragma for <meta http-equiv>
Modified: index
===================================================================
--- index 2008-02-14 03:46:55 UTC (rev 1220)
+++ index 2008-02-14 04:21:28 UTC (rev 1221)
@@ -7337,19 +7337,19 @@
<dd>If the <code title=attr-meta-charset><a
href="#charset0">charset</a></code> attribute is present, or if the
- element is in the <a href="#content-type4"
+ element is in the <a href="#encoding"
title=attr-meta-http-equiv-content-type>Content-Type state</a>: as the
first element in a <code><a href="#head">head</a></code> element.
<dd>If the <code title=attr-meta-http-equiv><a
href="#http-equiv0">http-equiv</a></code> attribute is present, and the
- element is not in the <a href="#content-type4"
+ element is not in the <a href="#encoding"
title=attr-meta-http-equiv-content-type>Content-Type state</a>: in a
<code><a href="#head">head</a></code> element.
<dd>If the <code title=attr-meta-http-equiv><a
href="#http-equiv0">http-equiv</a></code> attribute is present, and the
- element is not in the <a href="#content-type4"
+ element is not in the <a href="#encoding"
title=attr-meta-http-equiv-content-type>Content-Type state</a>: in a
<code><a href="#noscript">noscript</a></code> element that is a child of
a <code><a href="#head">head</a></code> element.
@@ -7605,8 +7605,8 @@
-->
<tr>
- <td><a href="#content-type4"
- title=attr-meta-http-equiv-content-type>Content-Type</a>
+ <td><a href="#encoding" title=attr-meta-http-equiv-content-type>Encoding
+ declaration</a>
<td><code title="">Content-Type</code> <!-- <td>Non-conforming -->
<!--
@@ -7679,11 +7679,11 @@
algorithm appropriate for that state, as described in the following list:
<dl>
- <dt><dfn id=content-type4
- title=attr-meta-http-equiv-content-type>Content-Type</dfn>
+ <dt><dfn id=encoding title=attr-meta-http-equiv-content-type>Encoding
+ declaration</dfn>
<dd>
- <p>The <a href="#content-type4"
+ <p>The <a href="#encoding"
title=attr-meta-http-equiv-content-type>Content-Type state's</a>
requirements are all handled by the parsing section of the
specification. The state is just an alternative form of setting the
@@ -7691,17 +7691,17 @@
href="#charset">a character encoding declaration</a>.</p>
<p>For <code><a href="#meta0">meta</a></code> elements in the <a
- href="#content-type4"
- title=attr-meta-http-equiv-content-type>Content-Type state</a>, the
- <code title=attr-meta-content><a href="#content0">content</a></code>
- attribute must have a value consisting of the literal string "<code
- title="">text/html;</code>", optionally followed by a single U+0020
- SPACE character, followed by the literal string "<code
- title="">charset=</code>", followed by the character encoding name of <a
- href="#charset">the character encoding declaration</a>.</p>
+ href="#encoding" title=attr-meta-http-equiv-content-type>Content-Type
+ state</a>, the <code title=attr-meta-content><a
+ href="#content0">content</a></code> attribute must have a value
+ consisting of the literal string "<code title="">text/html;</code>",
+ optionally followed by a single U+0020 SPACE character, followed by the
+ literal string "<code title="">charset=</code>", followed by the
+ character encoding name of <a href="#charset">the character encoding
+ declaration</a>.</p>
<p>If the document contains a <code><a href="#meta0">meta</a></code>
- element in the <a href="#content-type4"
+ element in the <a href="#encoding"
title=attr-meta-http-equiv-content-type>Content-Type state</a> then that
element must be the first element in the document's <code><a
href="#head">head</a></code> element, and the document must not contain
@@ -7709,7 +7709,7 @@
title=attr-meta-charset><a href="#charset0">charset</a></code> attribute
present.</p>
- <p>The <a href="#content-type4"
+ <p>The <a href="#encoding"
title=attr-meta-http-equiv-content-type>Content-Type state</a> may be
used in <a href="#html5" title=HTML5>HTML documents</a> only, elements
in that state must not be used in <a href="#xhtml5" title=XHTML>XML
@@ -7891,7 +7891,7 @@
<!-- XXX next three paragraphs maybe should move to "writing html" section -->
<p>If the document does not start with a BOM, and if its encoding is not
- explicitly given by <a href="#content-type9"
+ explicitly given by <a href="#content-type8"
title=Content-Type>Content-Type metadata</a>, then the character encoding
used must be a superset of US-ASCII (specifically, ANSI_X3.4-1968) for
bytes in the range 0x09 - 0x0D, 0x20, 0x21, 0x22, 0x26, 0x27, 0x2C - 0x3F,
@@ -8118,7 +8118,7 @@
the <code title=attr-style-type><a href="#type1">type</a></code> content
attribute's value, or <code title="">text/css</code> if that is omitted.
For <code><a href="#link">link</a></code> elements, this is the <a
- href="#content-type9" title=Content-Type>Content-Type metadata of the
+ href="#content-type8" title=Content-Type>Content-Type metadata of the
specified resource</a>.
<dt>The location (<code title=dom-stylesheet-href>href</code> DOM
@@ -12687,7 +12687,7 @@
the <code><a href="#img">img</a></code> element.
<p>The remote server's response metadata (e.g. an HTTP 404 status code, or
- <a href="#content-type9" title=Content-Type>associated Content-Type
+ <a href="#content-type8" title=Content-Type>associated Content-Type
headers</a>) must be ignored when determining whether the resource
obtained is a valid image or not.
@@ -12953,7 +12953,7 @@
title=attr-embed-type><a href="#type4">type</a></code> attribute is the
<span>content's type</span>.
- <li>Otherwise, if the specified resource has <a href="#content-type9"
+ <li>Otherwise, if the specified resource has <a href="#content-type8"
title=Content-Type>explicit Content-Type metadata</a>, then that is the
<span>content's type</span>.
@@ -13099,10 +13099,10 @@
the same mechanism as for browsing contexts?</p>
<dl class=switch>
- <dt>If the resource has <a href="#content-type9"
+ <dt>If the resource has <a href="#content-type8"
title=Content-Type>associated Content-Type metadata</a>
- <dd>The type is the type specified in <a href="#content-type9"
+ <dd>The type is the type specified in <a href="#content-type8"
title=Content-Type>the resource's Content-Type metadata</a>.
<dt>Otherwise, if the <code title=attr-object-type><a
@@ -25951,13 +25951,13 @@
HTTP 204 No Content response.
<p>Otherwise, the URI must be treated in a manner equivalent to an HTTP
- resource with a 200 OK response whose <a href="#content-type9"
+ resource with a 200 OK response whose <a href="#content-type8"
title=Content-Type>Content-Type metadata</a> is <code
title="">text/html</code> and whose response body is the dereference
by-product, converted to a string value.
<p class=note>Certain contexts, in particular <code><a
- href="#img">img</a></code> elements, ignore the <a href="#content-type9"
+ href="#img">img</a></code> elements, ignore the <a href="#content-type8"
title=Content-Type>Content-Type metadata</a>.
<div class=example>
@@ -28988,7 +28988,7 @@
<li>
<p>If the document's out-of-band metadata (e.g. HTTP headers), not
- counting any <a href="#content-type9" title=Content-Type>type
+ counting any <a href="#content-type8" title=Content-Type>type
information</a> (such as the Content-Type HTTP header), requires some
sort of processing that will not affect the browsing context, then
perform that processing and abort these steps.</p>
@@ -29150,7 +29150,7 @@
characters for use in the <span>tokeniser</span><!-- XXX xref
-->. This
process relies, in part, on character encoding information found in the
- real <a href="#content-type9" title=Content-Type>Content-Type metadata</a>
+ real <a href="#content-type8" title=Content-Type>Content-Type metadata</a>
of the resource; the "sniffed type" is not used for this purpose.</p>
<!-- next two paragraphs are nearly identical to the navigate-text
section, keep them in sync -->
@@ -29477,20 +29477,20 @@
</table>
<p>...then jump to the <em title="content-type sniffing: text or
- binary"><a href="#content-type5">text or binary</a></em> section below.</p>
+ binary"><a href="#content-type4">text or binary</a></em> section below.</p>
<li>
<p>Let <var title="">official type</var> be the type given by the <a
- href="#content-type9" title=Content-Type>Content-Type metadata</a> for
+ href="#content-type8" title=Content-Type>Content-Type metadata</a> for
the resource (in lowercase<!-- XXX ASCII case folding -->, ignoring any
parameters). If there is no such type, jump to the <em
title="content-type sniffing: unknown type"><a
- href="#content-type6">unknown type</a></em> step below.
+ href="#content-type5">unknown type</a></em> step below.
<li>
<p>If <var title="">official type</var> is "unknown/unknown" or
"application/unknown", jump to the <em title="content-type sniffing:
- unknown type"><a href="#content-type6">unknown type</a></em> step below.</p>
+ unknown type"><a href="#content-type5">unknown type</a></em> step below.</p>
<!-- In a study looking at many billions of pages whose first five
characters were "<HTML", "unknown/unknown" was used to label
documents about once for every 5000 pages labelled "text/html", and
@@ -29511,12 +29511,12 @@
<p>If <var title="">official type</var> is an image type supported by the
user agent (e.g. "image/png", "image/gif", "image/jpeg", etc), then jump
to the <em title="content-type sniffing: image"><a
- href="#content-type7">images</a></em> section below.
+ href="#content-type6">images</a></em> section below.
<li>
<p>If <var title="">official type</var> is "text/html", then jump to the
<em title="content-type sniffing: feed or html"><a
- href="#content-type8">feed or HTML</a></em> section below.
+ href="#content-type7">feed or HTML</a></em> section below.
<li>
<p>Otherwise, the sniffed type of the resource is <var title="">official
@@ -29524,7 +29524,7 @@
</ol>
<h4 id=content-type0><span class=secno>4.9.1 </span><dfn
- id=content-type5>Content-Type sniffing: text or binary</dfn></h4>
+ id=content-type4>Content-Type sniffing: text or binary</dfn></h4>
<ol>
<li>
@@ -29614,7 +29614,7 @@
</ul>
<h4 id=content-type1><span class=secno>4.9.2 </span><dfn
- id=content-type6>Content-Type sniffing: unknown type</dfn></h4>
+ id=content-type5>Content-Type sniffing: unknown type</dfn></h4>
<ol>
<li>
@@ -29719,7 +29719,7 @@
</dl>
<li>
- <p>As a last-ditch effort, jump to the <a href="#content-type5"
+ <p>As a last-ditch effort, jump to the <a href="#content-type4"
title="content-type sniffing: text or binary">text or binary</a>
section.
</ol>
@@ -29866,7 +29866,7 @@
then a user agent detects it as HTML anyway and allows script to execute).
<h4 id=content-type2><span class=secno>4.9.3 </span><dfn
- id=content-type7>Content-Type sniffing: image</dfn></h4>
+ id=content-type6>Content-Type sniffing: image</dfn></h4>
<p>If the first bytes of the file match one of the byte sequences in the
first columns of the following table, then the sniffed type of the
@@ -29928,7 +29928,7 @@
<var title="">official type</var>.
<h4 id=content-type3><span class=secno>4.9.4 </span><dfn
- id=content-type8>Content-Type sniffing: feed or HTML</dfn></h4>
+ id=content-type7>Content-Type sniffing: feed or HTML</dfn></h4>
<!-- mostly based on:
http://blogs.msdn.com/rssteam/articles/PublishersGuide.aspx
http://lxr.mozilla.org/seamonkey/source/browser/components/feeds/src/nsFeedSniffer.cpp#192
@@ -30099,7 +30099,7 @@
<h4 id=content-type><span class=secno>4.9.5 </span>Content-Type metadata</h4>
- <p>What explicit <dfn id=content-type9 title=Content-Type>Content-Type
+ <p>What explicit <dfn id=content-type8 title=Content-Type>Content-Type
metadata</dfn> is associated with the resource (the resource's type
information) depends on the protocol that was used to fetch the resource.
@@ -35206,7 +35206,7 @@
domain</a>, the semantics of the Access-Control HTTP header must be
followed. <a href="#refsACCESSCONTROL">[ACCESSCONTROL]</a>
- <p>HTTP 200 OK responses with a <a href="#content-type9">Content-Type</a>
+ <p>HTTP 200 OK responses with a <a href="#content-type8">Content-Type</a>
header specifying the type <code>application/x-dom-event-stream</code>
that are either from <a href="#domain0">the document's domain</a> or
explicitly allowed by the Access-Control HTTP headers must be processed
@@ -35223,7 +35223,7 @@
five seconds.
<p>HTTP 200 OK responses that have a <a
- href="#content-type9">Content-Type</a> other than
+ href="#content-type8">Content-Type</a> other than
<code>application/x-dom-event-stream</code> (or some other supported
type), and HTTP responses whose Access-Control headers indicate that the
resource are not to be used, must be ignored and must prevent the user
@@ -37561,10 +37561,10 @@
reinvoked to perform a parse of the document with the real encoding.
<p id=documentEncoding>User agents must use the following algorithm (the
- <dfn id=encoding>encoding sniffing algorithm</dfn>) to determine the
+ <dfn id=encoding0>encoding sniffing algorithm</dfn>) to determine the
character encoding to use when decoding a document in the first pass. This
algorithm takes as input any out-of-band metadata available to the user
- agent (e.g. the <a href="#content-type9" title=Content-Type>Content-Type
+ agent (e.g. the <a href="#content-type8" title=Content-Type>Content-Type
metadata</a> of the document) and all the bytes available so far, and
returns an encoding and a <dfn id=confidence
title=concept-encoding-confidence>confidence</dfn>. The confidence is
@@ -38065,9 +38065,9 @@
<p>When the parser requires the user agent to <dfn id=change>change the
encoding</dfn>, it must run the following steps. This might happen if the
- <a href="#encoding">encoding sniffing algorithm</a> described above failed
- to find an encoding, or if it found an encoding that was not the actual
- encoding of the file.
+ <a href="#encoding0">encoding sniffing algorithm</a> described above
+ failed to find an encoding, or if it found an encoding that was not the
+ actual encoding of the file.
<ol>
<li>If the new encoding is UTF-16, change it to UTF-8.
@@ -38077,7 +38077,7 @@
href="#confidence" title=concept-encoding-confidence>confidence</a> to
<i>confident</i> and abort these steps. This happens when the encoding
information found in the file matches what the <a
- href="#encoding">encoding sniffing algorithm</a> determined to be the
+ href="#encoding0">encoding sniffing algorithm</a> determined to be the
encoding, and in the second pass through the parser if the first pass
found that the encoding sniffing algorithm described in the earlier
section failed to find the right encoding.
@@ -38092,7 +38092,7 @@
<li>Otherwise, <a href="#navigate">navigate</a> to the document again,
with <a href="#replacement">replacement enabled</a>, but this time skip
- the <a href="#encoding">encoding sniffing algorithm</a> and instead just
+ the <a href="#encoding0">encoding sniffing algorithm</a> and instead just
set the encoding to the new encoding and the <a href="#confidence"
title=concept-encoding-confidence>confidence</a> to <i>confident</i>.
Whenever possible, this should be done without actually contacting the
Modified: source
===================================================================
--- source 2008-02-14 03:46:55 UTC (rev 1220)
+++ source 2008-02-14 04:21:28 UTC (rev 1221)
@@ -6078,7 +6078,7 @@
<td>Non-conforming [ XXX but maybe we should make this an alternative to <html lang="">? ]
-->
<tr>
- <td><span title="attr-meta-http-equiv-content-type">Content-Type</span>
+ <td><span title="attr-meta-http-equiv-content-type">Encoding declaration</span>
<td><code title="">Content-Type</code>
<!-- <td>Non-conforming -->
<!--
@@ -6149,7 +6149,7 @@
<dl>
- <dt><dfn title="attr-meta-http-equiv-content-type">Content-Type</dfn>
+ <dt><dfn title="attr-meta-http-equiv-content-type">Encoding declaration</dfn>
<dd>
More information about the Commit-Watchers
mailing list