- From: poot <cvsmail@w3.org>
- Date: Tue, 03 May 2011 16:06:05 -0400
- To: public-html-diffs@w3.org
hixie: xref (whatwg r6055)
http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.4860&r2=1.4861&f=h
http://html5.org/tools/web-apps-tracker?from=6054&to=6055
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4860
retrieving revision 1.4861
diff -u -d -r1.4860 -r1.4861
--- Overview.html 3 May 2011 19:54:08 -0000 1.4860
+++ Overview.html 3 May 2011 20:01:33 -0000 1.4861
@@ -10696,7 +10696,7 @@
<p>In either case, the algorithm must be invoked with the string
being assigned into the <code title="dom-innerHTML"><a href="#dom-innerhtml">innerHTML</a></code> attribute as the <var title="">input</var>. If the node is an <code><a href="#element">Element</a></code>
- node, then, in addition, that element must be passed as the <var title="">context</var> element.</p>
+ node, then, in addition, that element must be passed as the <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element.</p>
<p>If this raises an exception, then abort these steps.</p>
@@ -10826,7 +10826,7 @@
parsing algorithm</a>.</p>
<p>In either case, the algorithm must be invoked with the string
- being assigned into the <code title="dom-outerHTML"><a href="#dom-outerhtml">outerHTML</a></code> attribute as the <var title="">input</var>, and <var title="">parent</var> as the <var title="">context</var> element.</p>
+ being assigned into the <code title="dom-outerHTML"><a href="#dom-outerhtml">outerHTML</a></code> attribute as the <var title="">input</var>, and <var title="">parent</var> as the <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element.</p>
<p>If this raises an exception, then abort these steps.</p>
@@ -10953,8 +10953,7 @@
documents">XML document</a>: Invoke the <a href="#xml-fragment-parsing-algorithm">XML fragment
parsing algorithm</a>.</p>
- <p>In either case, the algorithm must be invoked with <var title="">text</var> as the <var title="">input</var>, and <var title="">destination</var> as the <var title="">context</var>
- element.</p>
+ <p>In either case, the algorithm must be invoked with <var title="">text</var> as the <var title="">input</var>, and <var title="">destination</var> as the <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element.</p>
<p>If this raises an exception, then abort these steps.</p>
@@ -13630,10 +13629,13 @@
<dd><p>The <code><a href="#the-noscript-element">noscript</a></code> element must contain only text,
except that invoking the <a href="#html-fragment-parsing-algorithm">HTML fragment parsing
algorithm</a> with
- the <code><a href="#the-noscript-element">noscript</a></code> element as the <var title="">context</var> element and the text contents as the <var title="">input</var> must result in a list of nodes that consists
- only of <code><a href="#the-link-element">link</a></code>, <code><a href="#the-style-element">style</a></code>, and
- <code><a href="#the-meta-element">meta</a></code> elements that would be conforming if they were
- children of the <code><a href="#the-noscript-element">noscript</a></code> element, and no <a href="#parse-error" title="parse error">parse errors</a>.</dd>
+ the <code><a href="#the-noscript-element">noscript</a></code> element as the <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element and the
+ text contents as the <var title="">input</var> must result in a
+ list of nodes that consists only of <code><a href="#the-link-element">link</a></code>,
+ <code><a href="#the-style-element">style</a></code>, and <code><a href="#the-meta-element">meta</a></code> elements that would be
+ conforming if they were children of the <code><a href="#the-noscript-element">noscript</a></code>
+ element, and no <a href="#parse-error" title="parse error">parse
+ errors</a>.</dd>
<dt>Outside of <code><a href="#the-head-element">head</a></code> elements, if <a href="#concept-n-noscript" title="concept-n-noscript">scripting is disabled</a> for the
<code><a href="#the-noscript-element">noscript</a></code> element</dt>
@@ -20010,11 +20012,11 @@
documents</a>, the allowed content model of <code><a href="#the-iframe-element">iframe</a></code>
elements is text, except that invoking the <a href="#html-fragment-parsing-algorithm">HTML fragment
parsing algorithm</a> with the <code><a href="#the-iframe-element">iframe</a></code> element as the
- <var title="">context</var> element and the text contents as the
- <var title="">input</var> must result in a list of nodes that are
- all <a href="#phrasing-content">phrasing content</a>, with no <a href="#parse-error" title="parse
- error">parse errors</a> having occurred, with no
- <code><a href="#the-script-element">script</a></code> elements being anywhere in the list or as
+ <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element and
+ the text contents as the <var title="">input</var> must result in a
+ list of nodes that are all <a href="#phrasing-content">phrasing content</a>, with no
+ <a href="#parse-error" title="parse error">parse errors</a> having occurred, with
+ no <code><a href="#the-script-element">script</a></code> elements being anywhere in the list or as
descendants of elements in the list, and with all the elements in
the list (including their descendants) being themselves
conforming.<p>The <code><a href="#the-iframe-element">iframe</a></code> element must be empty in <a href="#xml-documents">XML
@@ -55135,7 +55137,8 @@
<li><i>Loop</i>: If <var title="">node</var> is the first node in
the stack of open elements, then set <var title="">last</var> to
- true and set <var title="">node</var> to the <var title="">context</var> element. (<a href="#fragment-case">fragment case</a>)</li>
+ true and set <var title="">node</var> to the <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element.
+ (<a href="#fragment-case">fragment case</a>)</li>
<li>If <var title="">node</var> is a <code><a href="#the-select-element">select</a></code> element,
then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-inselect" title="insertion mode: in select">in select</a>" and abort these
@@ -62028,18 +62031,19 @@
<p>The following steps form the <dfn id="html-fragment-parsing-algorithm">HTML fragment parsing
algorithm</dfn>. The algorithm optionally takes as input an
- <code><a href="#element">Element</a></code> node, referred to as the <var title="">context</var> element, which gives the context for the
- parser, as well as <var title="">input</var>, a string to parse, and
- returns a list of zero or more nodes.</p>
+ <code><a href="#element">Element</a></code> node, referred to as the <dfn id="concept-frag-parse-context" title="concept-frag-parse-context"><var>context</var></dfn> element,
+ which gives the context for the parser, as well as <var title="">input</var>, a string to parse, and returns a list of zero
+ or more nodes.</p>
<p class="note">Parts marked <dfn id="fragment-case">fragment case</dfn> in algorithms
in the parser section are parts that only occur if the parser was
- created for the purposes of this algorithm (and with a <var title="">context</var> element). The algorithms have been annotated
- with such markings for informational purposes only; such markings
- have no normative weight. If it is possible for a condition
- described as a <a href="#fragment-case">fragment case</a> to occur even when the
- parser wasn't created for the purposes of handling this algorithm,
- then that is an error in the specification.</p>
+ created for the purposes of this algorithm (and with a <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element). The
+ algorithms have been annotated with such markings for informational
+ purposes only; such markings have no normative weight. If it is
+ possible for a condition described as a <a href="#fragment-case">fragment case</a>
+ to occur even when the parser wasn't created for the purposes of
+ handling this algorithm, then that is an error in the
+ specification.</p>
<ol><li>
@@ -62050,14 +62054,15 @@
<li>
- <p>If there is a <var title="">context</var> element, and the
- <code><a href="#document">Document</a></code> of the <var title="">context</var> element
- is in <a href="#quirks-mode">quirks mode</a>, then let the <code><a href="#document">Document</a></code>
- be in <a href="#quirks-mode">quirks mode</a>. Otherwise, if there is a <var title="">context</var> element, and the <code><a href="#document">Document</a></code> of
- the <var title="">context</var> element is in <a href="#limited-quirks-mode">limited-quirks
- mode</a>, then let the <code><a href="#document">Document</a></code> be in
- <a href="#limited-quirks-mode">limited-quirks mode</a>. Otherwise, leave the
- <code><a href="#document">Document</a></code> in <a href="#no-quirks-mode">no-quirks mode</a>.</p>
+ <p>If there is a <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element, and the
+ <code><a href="#document">Document</a></code> of the <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element is in
+ <a href="#quirks-mode">quirks mode</a>, then let the <code><a href="#document">Document</a></code> be in
+ <a href="#quirks-mode">quirks mode</a>. Otherwise, if there is a <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element, and the
+ <code><a href="#document">Document</a></code> of the <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element is in
+ <a href="#limited-quirks-mode">limited-quirks mode</a>, then let the
+ <code><a href="#document">Document</a></code> be in <a href="#limited-quirks-mode">limited-quirks mode</a>.
+ Otherwise, leave the <code><a href="#document">Document</a></code> in <a href="#no-quirks-mode">no-quirks
+ mode</a>.</p>
</li>
@@ -62070,8 +62075,8 @@
<li>
- <p>If there is a <var title="">context</var> element, run these
- substeps:</p>
+ <p>If there is a <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element, run
+ these substeps:</p>
<ol><li>
@@ -62150,16 +62155,17 @@
<p><a href="#reset-the-insertion-mode-appropriately" title="reset the insertion mode appropriately">Reset the
parser's insertion mode appropriately</a>.</p>
- <p class="note">The parser will reference the <var title="">context</var> element as part of that algorithm.</p>
+ <p class="note">The parser will reference the <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element as part
+ of that algorithm.</p>
</li>
<li>
- <p>Set the parser's <a href="#form-element-pointer"><code>form</code> element pointer</a>
- to the nearest node to the <var title="">context</var> element
- that is a <code><a href="#the-form-element">form</a></code> element (going straight up the
- ancestor chain, and including the element itself, if it is a
+ <p>Set the parser's <a href="#form-element-pointer"><code>form</code> element
+ pointer</a> to the nearest node to the <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element that is
+ a <code><a href="#the-form-element">form</a></code> element (going straight up the ancestor
+ chain, and including the element itself, if it is a
<code><a href="#the-form-element">form</a></code> element), or, if there is no such
<code><a href="#the-form-element">form</a></code> element, to null.</p>
@@ -62185,8 +62191,8 @@
<li>
- <p>If there is a <var title="">context</var> element, return the
- child nodes of <var title="">root</var>, in <a href="#tree-order">tree
+ <p>If there is a <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element, return
+ the child nodes of <var title="">root</var>, in <a href="#tree-order">tree
order</a>.</p>
<p>Otherwise, return the children of the <code><a href="#document">Document</a></code>
@@ -62424,11 +62430,11 @@
<h3 id="parsing-xhtml-fragments"><span class="secno">9.4 </span>Parsing XHTML fragments</h3>
- <p>The <dfn id="xml-fragment-parsing-algorithm">XML fragment parsing algorithm</dfn> either returns
- a <code><a href="#document">Document</a></code> or raises a <code><a href="#syntax_err">SYNTAX_ERR</a></code>
- exception. Given a string <var title="">input</var> and an optional
- context element <var title="">context</var>, the algorithm is as
- follows:</p>
+ <p>The <dfn id="xml-fragment-parsing-algorithm">XML fragment parsing algorithm</dfn> either returns a
+ <code><a href="#document">Document</a></code> or raises a <code><a href="#syntax_err">SYNTAX_ERR</a></code> exception.
+ Given a string <var title="">input</var> and an optional context
+ element <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var>, the
+ algorithm is as follows:</p>
<ol><li>
@@ -62438,12 +62444,12 @@
<li>
- <p>If there is a <var title="">context</var> element, <a href="#feed-the-parser">feed
- the parser</a> just created the string corresponding to the
- start tag of that element, declaring all the namespace prefixes
- that are in scope on that element in the DOM, as well as declaring
- the default namespace (if any) that is in scope on that element in
- the DOM.</p>
+ <p>If there is a <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element,
+ <a href="#feed-the-parser">feed the parser</a> just created the string corresponding
+ to the start tag of that element, declaring all the namespace
+ prefixes that are in scope on that element in the DOM, as well as
+ declaring the default namespace (if any) that is in scope on that
+ element in the DOM.</p>
<p>A namespace prefix is in scope if the DOM Core <code title="">lookupNamespaceURI()</code> method on the element would
return a non-null value for that prefix.</p>
@@ -62452,10 +62458,9 @@
<code title="">isDefaultNamespace()</code> method on the element
would return true.</p>
- <p class="note">If there is a <var title="">context</var> element,
- no <code title="">DOCTYPE</code> is passed to the parser, and
- therefore no external subset is referenced, and therefore no
- entities will be recognized.</p>
+ <p class="note">If there is a <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element, no <code title="">DOCTYPE</code> is passed to the parser, and therefore no
+ external subset is referenced, and therefore no entities will be
+ recognized.</p>
</li>
@@ -62467,9 +62472,9 @@
<li>
- <p>If there is a <var title="">context</var> element, <a href="#feed-the-parser">feed
- the parser</a> just created the string corresponding to the
- end tag of that element.</p>
+ <p>If there is a <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element,
+ <a href="#feed-the-parser">feed the parser</a> just created the string corresponding
+ to the end tag of that element.</p>
</li>
@@ -62483,8 +62488,8 @@
<li>
- <p>If there is a <var title="">context</var> element, then return
- the child nodes of the root element of the resulting
+ <p>If there is a <var title="concept-frag-parse-context"><a href="#concept-frag-parse-context">context</a></var> element, then
+ return the child nodes of the root element of the resulting
<code><a href="#document">Document</a></code>, in <a href="#tree-order">tree order</a>.</p>
<p>Otherwise, return the children of the <code><a href="#document">Document</a></code>
Received on Tuesday, 3 May 2011 20:06:07 UTC