- From: poot <cvsmail@w3.org>
- Date: Fri, 08 Apr 2011 18:14:52 -0400
- To: public-html-diffs@w3.org
hixie: apply wg decision (whatwg r5979)
http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.4806&r2=1.4807&f=h
http://html5.org/tools/web-apps-tracker?from=5978&to=5979
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4806
retrieving revision 1.4807
diff -u -d -r1.4806 -r1.4807
--- Overview.html 8 Apr 2011 21:35:48 -0000 1.4806
+++ Overview.html 8 Apr 2011 22:12:26 -0000 1.4807
@@ -575,7 +575,8 @@
<ol>
<li><a href="#concept-http-equivalent"><span class="secno">2.7.1 </span>Protocol concepts</a></li>
<li><a href="#encrypted-http-and-related-security-concerns"><span class="secno">2.7.2 </span>Encrypted HTTP and related security concerns</a></li>
- <li><a href="#content-type-sniffing"><span class="secno">2.7.3 </span>Determining the type of a resource</a></ol></li>
+ <li><a href="#content-type-sniffing"><span class="secno">2.7.3 </span>Determining the type of a resource</a></li>
+ <li><a href="#extracting-encodings-from-meta-elements"><span class="secno">2.7.4 </span>Extracting encodings from <code>meta</code> elements</a></ol></li>
<li><a href="#common-dom-interfaces"><span class="secno">2.8 </span>Common DOM interfaces</a>
<ol>
<li><a href="#reflecting-content-attributes-in-idl-attributes"><span class="secno">2.8.1 </span>Reflecting content attributes in IDL attributes</a></li>
@@ -6027,9 +6028,12 @@
occur. For more details, see the Media Type Sniffing
specification. <a href="#refsMIMESNIFF">[MIMESNIFF]</a></p>
- <p>The <dfn id="algorithm-for-extracting-an-encoding-from-a-content-type">algorithm for extracting an encoding from a
- Content-Type</dfn>, given a string <var title="">s</var>, is as
- follows. It either returns an encoding or nothing.</p>
+
+ <h4 id="extracting-encodings-from-meta-elements"><span class="secno">2.7.4 </span>Extracting encodings from <code><a href="#meta">meta</a></code> elements</h4>
+
+ <p>The <dfn id="algorithm-for-extracting-an-encoding-from-a-meta-element">algorithm for extracting an encoding from a
+ <code>meta</code> element</dfn>, given a string <var title="">s</var>, is as follows. It either returns an encoding or
+ nothing.</p>
<ol><!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html --><li><p>Let <var title="">position</var> be a pointer into <var title="">s</var>, initially pointing at the start of the
string.</li>
@@ -6071,13 +6075,14 @@
</dl></li>
- </ol><p class="note">This requirement is a <a href="#willful-violation">willful violation</a>
- of the HTTP specification (for example, HTTP doesn't allow the use
- of single quotes and requires supporting a backslash-escape
- mechanism that is not supported by this algorithm<!-- not to mention
- not having any rules for error-handling, which is of course why
- we're having to define it ourselves -->), motivated by the need for
- backwards compatibility with legacy content. <a href="#refsHTTP">[HTTP]</a></p>
+ </ol><p class="note">This algorithm is distinct from those in the HTTP
+ specification (for example, HTTP doesn't allow the use of single
+ quotes and requires supporting a backslash-escape mechanism that is
+ not supported by this algorithm<!-- not to mention not having any
+ rules for error-handling, which is of course why we're having to
+ define it ourselves -->). While the algorithm is used in contexts
+ that, historically, were related to HTTP, the syntax as supported by
+ implementations diverged some time ago. <a href="#refsHTTP">[HTTP]</a></p>
</div><h3 id="common-dom-interfaces"><span class="secno">2.8 </span>Common DOM interfaces</h3><h4 id="reflecting-content-attributes-in-idl-attributes"><span class="secno">2.8.1 </span>Reflecting content attributes in IDL attributes</h4><p>Some IDL attributes are defined to <dfn id="reflect">reflect</dfn> a
particular content attribute. This means that on getting, the IDL
@@ -55144,11 +55149,13 @@
<dt>If the attribute's name is "<code title="">content</code>"</dt>
- <dd><p>Apply the <a href="#algorithm-for-extracting-an-encoding-from-a-content-type">algorithm for extracting an encoding
- from a Content-Type</a>, giving the attribute's value as
- the string to parse. If an encoding is returned, and if
- <var title="">charset</var> is still set to null, let <var title="">charset</var> be the encoding returned, and set
- <var title="">need pragma</var> to true.</dd>
+ <dd><p>Apply the <a href="#algorithm-for-extracting-an-encoding-from-a-meta-element">algorithm for extracting an encoding
+ from a <code>meta</code> element</a>, giving the
+ attribute's value as the string to parse. If an encoding is
+ returned, and if <var title="">charset</var> is still set
+ to null, let <var title="">charset</var> be the encoding
+ returned, and set <var title="">need pragma</var> to
+ true.</dd>
<dt>If the attribute's name is "<code title="">charset</code>"</dt>
@@ -59123,10 +59130,10 @@
value is an <a href="#ascii-case-insensitive">ASCII case-insensitive</a> match for the
string "<code title="">Content-Type</code>", and the element has a
<code title="attr-meta-content"><a href="#attr-meta-content">content</a></code> attribute, and
- applying the <a href="#algorithm-for-extracting-an-encoding-from-a-content-type">algorithm for extracting an encoding from a
- Content-Type</a> to that attribute's value returns 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
+ applying the <a href="#algorithm-for-extracting-an-encoding-from-a-meta-element">algorithm for extracting an encoding from a
+ <code>meta</code> element</a> to that attribute's value returns
+ 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
extracted encoding.</p>
Received on Friday, 8 April 2011 22:14:53 UTC