- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 21 Jan 2011 02:46:40 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv11366
Modified Files:
spec.html states-of-the-type-attribute.html the-end.html
Log Message:
Clarify the 'escaping a string' algorithm by expanding it into a full explanation. (whatwg r5797)
[updated by splitter]
Index: the-end.html
===================================================================
RCS file: /sources/public/html5/spec/the-end.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- the-end.html 12 Jan 2011 03:46:48 -0000 1.32
+++ the-end.html 21 Jan 2011 02:46:37 -0000 1.33
@@ -1034,15 +1034,7 @@
<li><p>The result of the algorithm is the string <var title="">s</var>.</p></li>
- </ol><p><dfn id="escapingString">Escaping a string</dfn> (for the
- purposes of the algorithm above) consists of replacing any
- occurrences of the "<code title="">&</code>" character by the
- string "<code title="">&amp;</code>", any occurrences of the
- U+00A0 NO-BREAK SPACE character by the string "<code title="">&nbsp;</code>", and, if the algorithm was invoked in
- the <i>attribute mode</i>, any occurrences of the "<code title="">"</code>" character by the string "<code title="">&quot;</code>", or if it was not, any occurrences of
- the "<code title=""><</code>" character by the string "<code title="">&lt;</code>", any occurrences of the "<code title="">></code>" character by the string "<code title="">&gt;</code>".</p>
-
- <p class="note">Entity reference nodes are <a href="infrastructure.html#entity-references">assumed to be expanded</a> by the user
+ </ol><p class="note">Entity reference nodes are <a href="infrastructure.html#entity-references">assumed to be expanded</a> by the user
agent, and are therefore not covered in the algorithm above.</p>
<p class="note">It is possible that the output of this algorithm, if
@@ -1062,8 +1054,24 @@
<a href="syntax.html#syntax-start-tag" title="syntax-start-tag">start tag</a> would imply the end
tag for the <code><a href="grouping-content.html#the-p-element">p</a></code>).</p>
+ <p><dfn id="escapingString">Escaping a string</dfn> (for the
+ purposes of the algorithm above) consists of running the following
+ steps:</p>
- <h3 id="parsing-html-fragments"><span class="secno">8.4 </span>Parsing HTML fragments</h3>
+ <ol><li><p>Replace any occurrence of the "<code title="">&</code>"
+ character by the string "<code title="">&amp;</code>".</p></li>
+
+ <li><p>Replace any occurrences of the U+00A0 NO-BREAK SPACE
+ character by the string "<code title="">&nbsp;</code>".</p></li>
+
+ <li><p>If the algorithm was invoked in the <i>attribute mode</i>,
+ replace any occurrences of the "<code title="">"</code>"
+ character by the string "<code title="">&quot;</code>".</p></li>
+
+ <li><p>If the algorithm was <em>not</em> invoked in the
+ <i>attribute mode</i>, replace any occurrences of the "<code title=""><</code>" character by the string "<code title="">&lt;</code>", and any occurrences of the "<code title="">></code>" character by the string "<code title="">&gt;</code>".</p></li>
+
+ </ol><h3 id="parsing-html-fragments"><span class="secno">8.4 </span>Parsing HTML fragments</h3>
<p>The following steps form the <dfn id="html-fragment-parsing-algorithm">HTML fragment parsing
algorithm</dfn>. The algorithm optionally takes as input an
Index: states-of-the-type-attribute.html
===================================================================
RCS file: /sources/public/html5/spec/states-of-the-type-attribute.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- states-of-the-type-attribute.html 12 Jan 2011 03:46:47 -0000 1.30
+++ states-of-the-type-attribute.html 21 Jan 2011 02:46:37 -0000 1.31
@@ -849,7 +849,7 @@
</dd>
</dl><p>A <dfn id="valid-e-mail-address">valid e-mail address</dfn> is a string that matches the
- ABNF production <code title="">1*( atext / "." ) "@" ldh-str 1*( "." ldh-str )</code>
+ ABNF production <code title="">1*( atext / "." ) "@" ldh-str *( "." ldh-str )</code>
where <code title="">atext</code> is defined in RFC 5322 section
3.2.3, and <code title="">ldh-str</code> is defined in RFC 1034
section 3.5. <a href="references.html#refsABNF">[ABNF]</a> <a href="references.html#refsRFC5322">[RFC5322]</a> <a href="references.html#refsRFC1034">[RFC1034]</a></p><!-- Domain syntax based on
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1378
retrieving revision 1.1379
diff -u -d -r1.1378 -r1.1379
--- spec.html 21 Jan 2011 00:46:38 -0000 1.1378
+++ spec.html 21 Jan 2011 02:46:37 -0000 1.1379
@@ -329,7 +329,7 @@
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
- <h2 class="no-num no-toc" id="editor-s-draft-20-january-2011">Editor's Draft 20 January 2011</h2>
+ <h2 class="no-num no-toc" id="editor-s-draft-21-january-2011">Editor's Draft 21 January 2011</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -351,7 +351,7 @@
<a href="Overview.html">single page HTML</a>,
<a href="spec.html">multipage HTML</a>,
<a href="author/">web developer edition</a>.
-This is revision 1.4656.
+This is revision 1.4658.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
© 2010 <a href="http://www.w3.org/"><abbr title="World Wide
@@ -464,7 +464,7 @@
Group</a> is the W3C working group responsible for this
specification's progress along the W3C Recommendation
track.
- This specification is the 20 January 2011 Editor's Draft.
+ This specification is the 21 January 2011 Editor's Draft.
</p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- required patent boilerplate --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
Received on Friday, 21 January 2011 02:46:42 UTC