[html5] r8109 - [ac] (2) Allow any label for referencing encodings, not just the official name A [...]
whatwg at whatwg.org
whatwg at whatwg.org
Wed Jul 31 13:33:17 PDT 2013
Author: ianh
Date: 2013-07-31 13:33:16 -0700 (Wed, 31 Jul 2013)
New Revision: 8109
Modified:
complete.html
index
source
Log:
[ac] (2) Allow any label for referencing encodings, not just the official name
Affected topics: HTML
Modified: complete.html
===================================================================
--- complete.html 2013-07-31 20:16:42 UTC (rev 8108)
+++ complete.html 2013-07-31 20:33:16 UTC (rev 8109)
@@ -13429,11 +13429,12 @@
<a href=#character-encoding-declaration>character encoding declaration</a>. <span class=impl>This state's user agent
requirements are all handled by the parsing section of the specification.</span></p>
+<!--CLEANUP-->
<p>For <code><a href=#the-meta-element>meta</a></code> elements with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code>
attribute in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration
state</a>, the <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute must have a value
that is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for a string that consists of: the literal
- string "<code title="">text/html;</code>", optionally followed by any number of <a href=#space-character title="space character">space characters</a>, followed by the literal string "<code title="">charset=</code>", followed by the <a href=#encoding-name title="encoding name">name</a> of the <a href=#encoding title=encoding>character encoding</a> of the <a href=#character-encoding-declaration>character encoding
+ string "<code title="">text/html;</code>", optionally followed by any number of <a href=#space-character title="space character">space characters</a>, followed by the literal string "<code title="">charset=</code>", followed by aone of the <a href=#encoding-label title="encoding label">labels</a> of the <a href=#encoding title=encoding>character encoding</a> of the <a href=#character-encoding-declaration>character encoding
declaration</a>.</p>
<p>A document must not contain both a <code><a href=#the-meta-element>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a> and a
@@ -13712,7 +13713,7 @@
encoding declarations</a>:</p>
<ul><li>The character encoding name given must be an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for
- the <a href=#encoding-name title="encoding name">name</a> of the <a href=#encoding title=encoding>character
+ one of the <a href=#encoding-label title="encoding label">labels</a> of the <a href=#encoding title=encoding>character
encoding</a> used to serialize the file. <a href=#refsENCODING>[ENCODING]</a></li>
<li>The character encoding declaration must be serialized without the use of <a href=#syntax-charref title=syntax-charref>character references</a> or character escapes of any kind.</li>
@@ -14273,8 +14274,8 @@
<p>The <dfn id=attr-script-charset title=attr-script-charset><code>charset</code></dfn> attribute gives the character
encoding of the external script resource. The attribute must not be specified if the <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute is not present. If the attribute is set, its value
- must be an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the <a href=#encoding-name title="encoding
- name">name</a> of an <a href=#encoding>encoding</a>, and must specify the same <a href=#encoding>encoding</a> as
+ must be an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for one of the <a href=#encoding-label title="encoding
+ label">labels</a> of an <a href=#encoding>encoding</a>, and must specify the same <a href=#encoding>encoding</a> as
the <code title="">charset</code> parameter of the <a href=#content-type title=Content-Type>Content-Type
metadata</a> of the external file, if any. <a href=#refsENCODING>[ENCODING]</a></p>
@@ -44422,7 +44423,7 @@
character encodings that are to be used for the submission. If specified, the value must be an
<a href=#ordered-set-of-unique-space-separated-tokens>ordered set of unique space-separated tokens</a> that are <a href=#ascii-case-insensitive>ASCII
case-insensitive</a>, and each token must be an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for
- the <a href=#encoding-name title="encoding name">name</a> of an <a href=#ascii-compatible-character-encoding>ASCII-compatible character
+ one of the <a href=#encoding-label title="encoding label">labels</a> of an <a href=#ascii-compatible-character-encoding>ASCII-compatible character
encoding</a>. <a href=#refsENCODING>[ENCODING]</a></p>
<p>The <dfn id=attr-form-name title=attr-form-name><code>name</code></dfn> attribute represents the
@@ -56239,6 +56240,7 @@
<li>
+<!--CLEANUP-->
<p>If the algorithm was invoked with an explicit character
encoding, let the selected character encoding be that encoding.
(This algorithm is used by other specifications, which provide an
@@ -56261,6 +56263,7 @@
<li>
+<!--CLEANUP-->
<p>For each entry in the <var title="">form data set</var>,
perform these substeps:</p>
@@ -56338,6 +56341,7 @@
<h5 id=plain-text-form-data><span class=secno>4.10.22.8 </span>Plain text form data</h5>
+<!--CLEANUP-->
<div class=impl>
<p>The <dfn id=text/plain-encoding-algorithm><code title="">text/plain</code> encoding
@@ -99006,10 +99010,11 @@
<dd>
<dl><dt><code title="">charset</code></dt>
<dd>
+<!--CLEANUP-->
<p>The <code title="">charset</code> parameter may be provided to definitively specify the
<a href="#document's-character-encoding">document's character encoding</a>, overriding any <a href=#character-encoding-declaration title="character encoding
declaration">character encoding declarations</a> in the document. The parameter's value
- must be the <a href=#encoding-name title="encoding name">name</a> of the <a href=#encoding title=encoding>character
+ must be one of the <a href=#encoding-label title="encoding label">labels</a> of the <a href=#encoding title=encoding>character
encoding</a> used to serialize the file. <a href=#refsENCODING>[ENCODING]</a></p>
</dd>
</dl></dd>
@@ -101282,7 +101287,7 @@
<tr><th> <code title="">accept-charset</code>
<td> <code title=attr-form-accept-charset><a href=#attr-form-accept-charset>form</a></code>
<td> Character encodings to use for <a href=#form-submission>form submission</a>
- <td> <a href=#ordered-set-of-unique-space-separated-tokens>Ordered set of unique space-separated tokens</a>, <a href=#ascii-case-insensitive>ASCII case-insensitive</a>, consisting of <a href=#encoding-name title="encoding name">names</a> of <a href=#ascii-compatible-character-encoding title="ASCII-compatible character encoding">ASCII-compatible character encodings</a>*
+ <td> <a href=#ordered-set-of-unique-space-separated-tokens>Ordered set of unique space-separated tokens</a>, <a href=#ascii-case-insensitive>ASCII case-insensitive</a>, consisting of <a href=#encoding-label title="encoding label">labels</a> of <a href=#ascii-compatible-character-encoding title="ASCII-compatible character encoding">ASCII-compatible character encodings</a>*
<tr><th> <code title="">accesskey</code>
<td> <a href=#the-accesskey-attribute title=attr-accesskey>HTML elements</a>
<td> Keyboard shortcut to activate or focus element
@@ -101335,11 +101340,11 @@
<tr><th> <code title="">charset</code>
<td> <code title=attr-meta-charset><a href=#attr-meta-charset>meta</a></code>
<td> <a href=#character-encoding-declaration>Character encoding declaration</a>
- <td> <a href=#encoding-name>Encoding name</a>*
+ <td> <a href=#encoding-label>Encoding label</a>*
<tr><th> <code title="">charset</code>
<td> <code title=attr-script-charset><a href=#attr-script-charset>script</a></code>
<td> Character encoding of the external script resource
- <td> <a href=#encoding-name>Encoding name</a>*
+ <td> <a href=#encoding-label>Encoding label</a>*
<tr><th> <code title="">checked</code>
<td> <code title=attr-menuitem-checked><a href=#attr-menuitem-checked>menuitem</a></code>;
<code title=attr-input-checked><a href=#attr-input-checked>input</a></code>
Modified: index
===================================================================
--- index 2013-07-31 20:16:42 UTC (rev 8108)
+++ index 2013-07-31 20:33:16 UTC (rev 8109)
@@ -13429,11 +13429,12 @@
<a href=#character-encoding-declaration>character encoding declaration</a>. <span class=impl>This state's user agent
requirements are all handled by the parsing section of the specification.</span></p>
+<!--CLEANUP-->
<p>For <code><a href=#the-meta-element>meta</a></code> elements with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code>
attribute in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration
state</a>, the <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute must have a value
that is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for a string that consists of: the literal
- string "<code title="">text/html;</code>", optionally followed by any number of <a href=#space-character title="space character">space characters</a>, followed by the literal string "<code title="">charset=</code>", followed by the <a href=#encoding-name title="encoding name">name</a> of the <a href=#encoding title=encoding>character encoding</a> of the <a href=#character-encoding-declaration>character encoding
+ string "<code title="">text/html;</code>", optionally followed by any number of <a href=#space-character title="space character">space characters</a>, followed by the literal string "<code title="">charset=</code>", followed by aone of the <a href=#encoding-label title="encoding label">labels</a> of the <a href=#encoding title=encoding>character encoding</a> of the <a href=#character-encoding-declaration>character encoding
declaration</a>.</p>
<p>A document must not contain both a <code><a href=#the-meta-element>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a> and a
@@ -13712,7 +13713,7 @@
encoding declarations</a>:</p>
<ul><li>The character encoding name given must be an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for
- the <a href=#encoding-name title="encoding name">name</a> of the <a href=#encoding title=encoding>character
+ one of the <a href=#encoding-label title="encoding label">labels</a> of the <a href=#encoding title=encoding>character
encoding</a> used to serialize the file. <a href=#refsENCODING>[ENCODING]</a></li>
<li>The character encoding declaration must be serialized without the use of <a href=#syntax-charref title=syntax-charref>character references</a> or character escapes of any kind.</li>
@@ -14273,8 +14274,8 @@
<p>The <dfn id=attr-script-charset title=attr-script-charset><code>charset</code></dfn> attribute gives the character
encoding of the external script resource. The attribute must not be specified if the <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute is not present. If the attribute is set, its value
- must be an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the <a href=#encoding-name title="encoding
- name">name</a> of an <a href=#encoding>encoding</a>, and must specify the same <a href=#encoding>encoding</a> as
+ must be an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for one of the <a href=#encoding-label title="encoding
+ label">labels</a> of an <a href=#encoding>encoding</a>, and must specify the same <a href=#encoding>encoding</a> as
the <code title="">charset</code> parameter of the <a href=#content-type title=Content-Type>Content-Type
metadata</a> of the external file, if any. <a href=#refsENCODING>[ENCODING]</a></p>
@@ -44422,7 +44423,7 @@
character encodings that are to be used for the submission. If specified, the value must be an
<a href=#ordered-set-of-unique-space-separated-tokens>ordered set of unique space-separated tokens</a> that are <a href=#ascii-case-insensitive>ASCII
case-insensitive</a>, and each token must be an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for
- the <a href=#encoding-name title="encoding name">name</a> of an <a href=#ascii-compatible-character-encoding>ASCII-compatible character
+ one of the <a href=#encoding-label title="encoding label">labels</a> of an <a href=#ascii-compatible-character-encoding>ASCII-compatible character
encoding</a>. <a href=#refsENCODING>[ENCODING]</a></p>
<p>The <dfn id=attr-form-name title=attr-form-name><code>name</code></dfn> attribute represents the
@@ -56239,6 +56240,7 @@
<li>
+<!--CLEANUP-->
<p>If the algorithm was invoked with an explicit character
encoding, let the selected character encoding be that encoding.
(This algorithm is used by other specifications, which provide an
@@ -56261,6 +56263,7 @@
<li>
+<!--CLEANUP-->
<p>For each entry in the <var title="">form data set</var>,
perform these substeps:</p>
@@ -56338,6 +56341,7 @@
<h5 id=plain-text-form-data><span class=secno>4.10.22.8 </span>Plain text form data</h5>
+<!--CLEANUP-->
<div class=impl>
<p>The <dfn id=text/plain-encoding-algorithm><code title="">text/plain</code> encoding
@@ -99006,10 +99010,11 @@
<dd>
<dl><dt><code title="">charset</code></dt>
<dd>
+<!--CLEANUP-->
<p>The <code title="">charset</code> parameter may be provided to definitively specify the
<a href="#document's-character-encoding">document's character encoding</a>, overriding any <a href=#character-encoding-declaration title="character encoding
declaration">character encoding declarations</a> in the document. The parameter's value
- must be the <a href=#encoding-name title="encoding name">name</a> of the <a href=#encoding title=encoding>character
+ must be one of the <a href=#encoding-label title="encoding label">labels</a> of the <a href=#encoding title=encoding>character
encoding</a> used to serialize the file. <a href=#refsENCODING>[ENCODING]</a></p>
</dd>
</dl></dd>
@@ -101282,7 +101287,7 @@
<tr><th> <code title="">accept-charset</code>
<td> <code title=attr-form-accept-charset><a href=#attr-form-accept-charset>form</a></code>
<td> Character encodings to use for <a href=#form-submission>form submission</a>
- <td> <a href=#ordered-set-of-unique-space-separated-tokens>Ordered set of unique space-separated tokens</a>, <a href=#ascii-case-insensitive>ASCII case-insensitive</a>, consisting of <a href=#encoding-name title="encoding name">names</a> of <a href=#ascii-compatible-character-encoding title="ASCII-compatible character encoding">ASCII-compatible character encodings</a>*
+ <td> <a href=#ordered-set-of-unique-space-separated-tokens>Ordered set of unique space-separated tokens</a>, <a href=#ascii-case-insensitive>ASCII case-insensitive</a>, consisting of <a href=#encoding-label title="encoding label">labels</a> of <a href=#ascii-compatible-character-encoding title="ASCII-compatible character encoding">ASCII-compatible character encodings</a>*
<tr><th> <code title="">accesskey</code>
<td> <a href=#the-accesskey-attribute title=attr-accesskey>HTML elements</a>
<td> Keyboard shortcut to activate or focus element
@@ -101335,11 +101340,11 @@
<tr><th> <code title="">charset</code>
<td> <code title=attr-meta-charset><a href=#attr-meta-charset>meta</a></code>
<td> <a href=#character-encoding-declaration>Character encoding declaration</a>
- <td> <a href=#encoding-name>Encoding name</a>*
+ <td> <a href=#encoding-label>Encoding label</a>*
<tr><th> <code title="">charset</code>
<td> <code title=attr-script-charset><a href=#attr-script-charset>script</a></code>
<td> Character encoding of the external script resource
- <td> <a href=#encoding-name>Encoding name</a>*
+ <td> <a href=#encoding-label>Encoding label</a>*
<tr><th> <code title="">checked</code>
<td> <code title=attr-menuitem-checked><a href=#attr-menuitem-checked>menuitem</a></code>;
<code title=attr-input-checked><a href=#attr-input-checked>input</a></code>
Modified: source
===================================================================
--- source 2013-07-31 20:16:42 UTC (rev 8108)
+++ source 2013-07-31 20:33:16 UTC (rev 8109)
@@ -13791,13 +13791,14 @@
<span>character encoding declaration</span>. <span class="impl">This state's user agent
requirements are all handled by the parsing section of the specification.</span></p>
+<!--CLEANUP-->
<p>For <code>meta</code> elements with an <code title="attr-meta-http-equiv">http-equiv</code>
attribute in the <span title="attr-meta-http-equiv-content-type">Encoding declaration
state</span>, the <code title="attr-meta-content">content</code> attribute must have a value
that is an <span>ASCII case-insensitive</span> match for a string that consists of: the literal
string "<code title="">text/html;</code>", optionally followed by any number of <span
title="space character">space characters</span>, followed by the literal string "<code
- title="">charset=</code>", followed by the <span title="encoding name">name</span> of the <span
+ title="">charset=</code>", followed by aone of the <span title="encoding label">labels</span> of the <span
title="encoding">character encoding</span> of the <span>character encoding
declaration</span>.</p>
@@ -14129,7 +14130,7 @@
<ul>
<li>The character encoding name given must be an <span>ASCII case-insensitive</span> match for
- the <span title="encoding name">name</span> of the <span title="encoding">character
+ one of the <span title="encoding label">labels</span> of the <span title="encoding">character
encoding</span> used to serialize the file. <a href="#refsENCODING">[ENCODING]</a></li>
<li>The character encoding declaration must be serialized without the use of <span
@@ -14725,8 +14726,8 @@
<p>The <dfn title="attr-script-charset"><code>charset</code></dfn> attribute gives the character
encoding of the external script resource. The attribute must not be specified if the <code
title="attr-script-src">src</code> attribute is not present. If the attribute is set, its value
- must be an <span>ASCII case-insensitive</span> match for the <span title="encoding
- name">name</span> of an <span>encoding</span>, and must specify the same <span>encoding</span> as
+ must be an <span>ASCII case-insensitive</span> match for one of the <span title="encoding
+ label">labels</span> of an <span>encoding</span>, and must specify the same <span>encoding</span> as
the <code title="">charset</code> parameter of the <span title="Content-Type">Content-Type
metadata</span> of the external file, if any. <a href="#refsENCODING">[ENCODING]</a></p>
@@ -48620,7 +48621,7 @@
character encodings that are to be used for the submission. If specified, the value must be an
<span>ordered set of unique space-separated tokens</span> that are <span>ASCII
case-insensitive</span>, and each token must be an <span>ASCII case-insensitive</span> match for
- the <span title="encoding name">name</span> of an <span>ASCII-compatible character
+ one of the <span title="encoding label">labels</span> of an <span>ASCII-compatible character
encoding</span>. <a href="#refsENCODING">[ENCODING]</a></p>
<p>The <dfn title="attr-form-name"><code>name</code></dfn> attribute represents the
@@ -62159,6 +62160,7 @@
<li>
+<!--CLEANUP-->
<p>If the algorithm was invoked with an explicit character
encoding, let the selected character encoding be that encoding.
(This algorithm is used by other specifications, which provide an
@@ -62183,6 +62185,7 @@
<li>
+<!--CLEANUP-->
<p>For each entry in the <var title="">form data set</var>,
perform these substeps:</p>
@@ -62273,6 +62276,7 @@
<h5>Plain text form data</h5>
+<!--CLEANUP-->
<div class="impl">
<p>The <dfn><code title="">text/plain</code> encoding
@@ -110617,10 +110621,11 @@
<dl>
<dt><code title="">charset</code></dt>
<dd>
+<!--CLEANUP-->
<p>The <code title="">charset</code> parameter may be provided to definitively specify the
<span>document's character encoding</span>, overriding any <span title="character encoding
declaration">character encoding declarations</span> in the document. The parameter's value
- must be the <span title="encoding name">name</span> of the <span title="encoding">character
+ must be one of the <span title="encoding label">labels</span> of the <span title="encoding">character
encoding</span> used to serialize the file. <a href="#refsENCODING">[ENCODING]</a></p>
</dd>
</dl>
@@ -113317,7 +113322,7 @@
<th> <code title="">accept-charset</code>
<td> <code title="attr-form-accept-charset">form</code>
<td> Character encodings to use for <span>form submission</span>
- <td> <span>Ordered set of unique space-separated tokens</span>, <span>ASCII case-insensitive</span>, consisting of <span title="encoding name">names</span> of <span title="ASCII-compatible character encoding">ASCII-compatible character encodings</span>*
+ <td> <span>Ordered set of unique space-separated tokens</span>, <span>ASCII case-insensitive</span>, consisting of <span title="encoding label">labels</span> of <span title="ASCII-compatible character encoding">ASCII-compatible character encodings</span>*
<tr>
<th> <code title="">accesskey</code>
<td> <span title="attr-accesskey">HTML elements</span>
@@ -113381,12 +113386,12 @@
<th> <code title="">charset</code>
<td> <code title="attr-meta-charset">meta</code>
<td> <span>Character encoding declaration</span>
- <td> <span>Encoding name</span>*
+ <td> <span>Encoding label</span>*
<tr>
<th> <code title="">charset</code>
<td> <code title="attr-script-charset">script</code>
<td> Character encoding of the external script resource
- <td> <span>Encoding name</span>*
+ <td> <span>Encoding label</span>*
<tr>
<th> <code title="">checked</code>
<td> <code title="attr-menuitem-checked">menuitem</code>;
More information about the Commit-Watchers
mailing list