[html5] r952 - /
whatwg at whatwg.org
whatwg at whatwg.org
Thu Jun 21 22:53:52 PDT 2007
Author: ianh
Date: 2007-06-21 22:51:14 -0700 (Thu, 21 Jun 2007)
New Revision: 952
Modified:
index
source
Log:
[eacgiwt] (2) Allow <meta http-equiv> in <noscript>; fix the infinite loop with <noscript></body>.
Modified: index
===================================================================
--- index 2007-06-22 05:19:01 UTC (rev 951)
+++ index 2007-06-22 05:51:14 UTC (rev 952)
@@ -7215,6 +7215,11 @@
<dd>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: in a
+ <code><a href="#noscript">noscript</a></code> element that is a child of
+ a <code><a href="#head">head</a></code> element.
+
<dt>Content model:
<dd>Empty.
@@ -7297,6 +7302,14 @@
title=attr-meta-content><a href="#content0">content</a></code> attribute,
then the value part of the metadata name/value pair is the empty string.
+ <p>If a <code><a href="#meta0">meta</a></code> element has the <code
+ title=attr-meta-http-equiv><a href="#http-equiv0">http-equiv</a></code>
+ attribute specified, it must be either in a <code><a
+ href="#head">head</a></code> element or in a <code><a
+ href="#noscript">noscript</a></code> element that itself is in a <code><a
+ href="#head">head</a></code> element. Otherwise, it must be in a <code><a
+ href="#head">head</a></code> element.
+
<p>The DOM attributes <dfn id=name0
title=dom-meta-name><code>name</code></dfn> and <dfn id=content1
title=dom-meta-content><code>content</code></dfn> must <a
@@ -19147,8 +19160,9 @@
<dd>When <a href="#scripting1">scripting is disabled</a>, in a <code><a
href="#head">head</a></code> element: in any order, zero or more <code><a
- href="#link">link</a></code> elements and zero or more <code><a
- href="#style">style</a></code> elements.
+ href="#link">link</a></code> elements, zero or more <code><a
+ href="#style">style</a></code> elements, and zero or more <code><a
+ href="#meta0">meta</a></code> elements.
<dd>When <a href="#scripting1">scripting is disabled</a>, not in a
<code><a href="#head">head</a></code> element: <a
@@ -19183,16 +19197,17 @@
<p>In a <code><a href="#head">head</a></code> element, if <a
href="#scripting1">scripting is disabled</a>, then the content model of a
<code><a href="#noscript">noscript</a></code> element must contain only
- <code><a href="#link">link</a></code> and <code><a
- href="#style">style</a></code> elements. If <a
- href="#scripting2">scripting is enabled</a>, then the content model of a
- <code><a href="#noscript">noscript</a></code> element is text, except that
- invoking the <span>HTML fragment parsing algorithm with the <code><a
- href="#noscript">noscript</a></code> element as the <var
+ <code><a href="#link">link</a></code>, <code><a
+ href="#style">style</a></code>, and <code><a href="#meta0">meta</a></code>
+ elements. If <a href="#scripting2">scripting is enabled</a>, then the
+ content model of a <code><a href="#noscript">noscript</a></code> element
+ is text, except that invoking the <span>HTML fragment parsing algorithm
+ with the <code><a href="#noscript">noscript</a></code> element as the <var
title="">context</var> and the text contents as the <var
title="">input</var> must result in a list of nodes that consists only of
- <code><a href="#link">link</a></code> and <code><a
- href="#style">style</a></code> elements.</span>
+ <code><a href="#link">link</a></code>, <code><a
+ href="#style">style</a></code>, and <code><a href="#meta0">meta</a></code>
+ elements.</span>
<p>Outside of <code><a href="#head">head</a></code> elements, if <a
href="#scripting1">scripting is disabled</a>, then the content model of a
@@ -36427,15 +36442,20 @@
<dt>A comment token
- <dt>A start tag whose tag name is one of: "head", "link", "style"
+ <dt>A start tag whose tag name is one of: "link", "meta", "style"
- <dt>Any other end tag
-
<dd>
<p>Process the token as if the <a href="#insertion0">insertion
mode</a> had been "<a href="#in-head" title="insertion mode: in
head">in head</a>".</p>
+ <dt>A start tag whose tag name is one of: "head", "noscript"
+
+ <dt>Any other end tag
+
+ <dd>
+ <p><a href="#parse">Parse error</a>. Ignore the token.</p>
+
<dt>Anything else
<dd>
Modified: source
===================================================================
--- source 2007-06-22 05:19:01 UTC (rev 951)
+++ source 2007-06-22 05:51:14 UTC (rev 952)
@@ -5832,6 +5832,7 @@
<dl class="element">
<dt>Contexts in which this element may be used:</dt>
<dd>In a <code>head</code> element.</dd>
+ <dd>If the <code title="attr-meta-http-equiv">http-equiv</code> attribute is present: in a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
<dt>Content model:</dt>
<dd>Empty.</dd>
<dt>Element-specific attributes:</dt>
@@ -5899,6 +5900,12 @@
then the value part of the metadata name/value pair is the empty
string.</p>
+ <p>If a <code>meta</code> element has the <code
+ title="attr-meta-http-equiv">http-equiv</code> attribute specified,
+ it must be either in a <code>head</code> element or in a
+ <code>noscript</code> element that itself is in a <code>head</code>
+ element. Otherwise, it must be in a <code>head</code> element.</p>
+
<p>The DOM attributes <dfn
title="dom-meta-name"><code>name</code></dfn> and <dfn
title="dom-meta-content"><code>content</code></dfn> must
@@ -16958,7 +16965,7 @@
<dd>Where <span>block-level elements</span> are expected in <span>HTML documents</span>, if there are no ancestor <code>noscript</code> elements.</dd>
<dd>Where <span>inline-level content</span> is expected in <span>HTML documents</span>, if there are no ancestor <code>noscript</code> elements.</dd>
<dt>Content model:</dt>
- <dd>When <span>scripting is disabled</span>, in a <code>head</code> element: in any order, zero or more <code>link</code> elements and zero or more <code>style</code> elements.</dd>
+ <dd>When <span>scripting is disabled</span>, in a <code>head</code> element: in any order, zero or more <code>link</code> elements, zero or more <code>style</code> elements, and zero or more <code>meta</code> elements.</dd>
<dd>When <span>scripting is disabled</span>, not in a <code>head</code> element: <span>transparent</span>, but there must be no <code>noscript</code> element descendants.</dd>
<dd>When <span>scripting is enabled</span>: text that conforms to the requirements given in the prose.</dd>
<dt>Element-specific attributes:</dt>
@@ -16981,14 +16988,15 @@
<p>In a <code>head</code> element, if <span>scripting is
disabled</span>, then the content model of a <code>noscript</code>
- element must contain only <code>link</code> and <code>style</code>
- elements. If <span>scripting is enabled</span>, then the content
- model of a <code>noscript</code> element is text, except that
- invoking the <span>HTML fragment parsing algorithm</code> with the
- <code>noscript</code> element as the <var title="">context</var> and
- the text contents as the <var title="">input</var> must result in a
- list of nodes that consists only of <code>link</code> and
- <code>style</code> elements.</p>
+ element must contain only <code>link</code>, <code>style</code>, and
+ <code>meta</code> elements. If <span>scripting is enabled</span>,
+ then the content model of a <code>noscript</code> element is text,
+ except that invoking the <span>HTML fragment parsing
+ algorithm</code> with the <code>noscript</code> element as the <var
+ title="">context</var> and the text contents as the <var
+ title="">input</var> must result in a list of nodes that consists
+ only of <code>link</code>, <code>style</code>, and <code>meta</code>
+ elements.</p>
<p>Outside of <code>head</code> elements, if <span>scripting is
disabled</span>, then the content model of a <code>noscript</code>
@@ -33596,14 +33604,19 @@
TABULATION, U+000C FORM FEED (FF), <!--U+000D CARRIAGE RETURN (CR),-->
or U+0020 SPACE</dt>
<dt>A comment token</dt>
- <dt>A start tag whose tag name is one of: "head", "link", "style"</dt>
- <dt>Any other end tag</dt>
+ <dt>A start tag whose tag name is one of: "link", "meta", "style"</dt>
<dd>
<p>Process the token as if the <span>insertion mode</span> had
been "<span title="insertion mode: in head">in
head</span>".</p>
</dd>
+ <dt>A start tag whose tag name is one of: "head", "noscript"</dt>
+ <dt>Any other end tag</dt>
+ <dd>
+ <p><span>Parse error</span>. Ignore the token.</p>
+ </dd>
+
<dt>Anything else</dt>
<dd>
<p><span>Parse error</span>. Act as if an end tag with the tag
More information about the Commit-Watchers
mailing list