- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 26 Jul 2010 04:06:28 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv3707/src
Modified Files:
attributes.html datatypes.html
Log Message:
make the Datatypes section a bit more user-friendly, and better aligned with the HTML5 spec; particularly, definition of "ID reference" and various sets of tokens
Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- datatypes.html 25 Jun 2010 05:32:27 -0000 1.45
+++ datatypes.html 26 Jul 2010 04:06:26 -0000 1.46
@@ -1,11 +1,9 @@
<section
xmlns="http://www.w3.org/1999/xhtml">
<section id="data-string-def" class="no-toc">
- <h2><dfn id="data-string">String</dfn></h2>
- <p>For any attribute definition in this document that
- references the
- <a href="#data-string">string</a>
- datatype, a
+ <h2 class="common-subhead"><dfn id="data-string">String</dfn></h2>
+ <div class="datatype-desc">
+ <p>For the purposes of this document, a
<a href="#data-string">string</a>
is defined as
<a href="#normal-character-data">normal character data</a>.</p>
@@ -21,27 +19,32 @@
<li><a
href="#attr-value-double-quoted">double-quoted attribute values</a></li>
</ul>
+ </div>
</section>
<section id="data-token-def" class="no-toc">
- <h2><dfn id="data-token">Token</dfn></h2>
- <p>For any attribute definition in this document that
- references the
- <a href="#data-token">token</a>
- datatype, a
- <a href="#data-token">token</a>
- is defined
- as a <a href="#data-string">string</a> that does not contain
- any <a href="#space">space characters</a>.</p>
+ <h2 class="common-subhead"><dfn id="data-token">Token</dfn></h2>
+ <div class="datatype-desc">A
+ <a href="#data-string">string</a>
+ that does not contain any
+ <a href="#space">space characters</a>.</div>
</section>
<dl><dt>tokens</dt>
<dd></dd>
<dd>
<div class="datatype-desc">A
- <a href="#space">space</a>-separated list of zero or more
+ <a href="#space">space</a>-separated set of zero or more
<a href="#data-token">token</a>
instances.</div>
</dd>
</dl>
+ <dl><dt>unordered-tokens</dt>
+ <dd></dd>
+ <dd>
+ <div class="datatype-desc">A
+ <a href="#common.data.tokens">set of space-separated tokens</a>
+ in which none of the tokens are duplicated.</div>
+ </dd>
+ </dl>
<dl><dt>tokens.comma-separated</dt>
<dd><code class="regexp">[^,]+(,[^,]+)*</code></dd>
</dl>
@@ -101,37 +104,34 @@
not contain any
<a href="#space">space characters</a></li>
</ul>
- <p class="note">Previous versions of HTML placed greater
- restrictions on the content of
- <a href="#common.data.id">ID</a>
- values (for example, they did not permit
- <a href="#common.data.id">ID</a>
- values to begin with a number).</p>
</div>
+ <p class="note">Previous versions of HTML placed greater
+ restrictions on the content of
+ <a href="#common.data.id">ID</a>
+ values (for example, they did not permit
+ <a href="#common.data.id">ID</a>
+ values to begin with a number).</p>
</dd>
</dl>
<dl><dt>idref</dt>
<dd></dd>
<dd>
- <div class="datatype-desc">Any
- <a href="#data-string">string</a>,
- with the following restrictions:
- <ul>
- <li><a href="#must-requirement">must</a>
- be at least one character long</li>
- <li><a href="#must-requirement">must</a>
- not contain any
- <a href="#space">space characters</a></li>
- </ul>
- </div>
+ <div class="datatype-desc">A valid
+ <dfn id="id-reference">ID reference</dfn>
+ to an element of type <i>type</i> is a string
+ that exactly matches the value of the
+ <code class="attribute">id</code>
+ attribute of an element in the document with type
+ <i>type</i>.</div>
</dd>
</dl>
<dl><dt>idrefs</dt>
<dd></dd>
<dd>
- <div class="datatype-desc">A
- <a href="#space">space</a>-separated list of one or more
- <a href="#common.data.idref">IDREF</a> instances.</div>
+ <div class="datatype-desc">An
+ <a href="#data-unordered-tokens">unordered set of unique space-separated tokens</a>,
+ each of which is an
+ <a href="#id-reference">id reference</a>.</div>
</dd>
</dl>
<dl><dt>name</dt>
@@ -155,7 +155,7 @@
<dd>
<div class="datatype-desc">A
valid
- <dfn id="hash-name">hash-name reference</dfn>
+ <dfn id="hash-name-reference">hash-name reference</dfn>
to an element of
type <i>type</i> is a string that starts with a
"<code title="U+0023 NUMBER SIGN">#</code>"
@@ -275,17 +275,18 @@
>date-time</dfn>,
as defined in RFC 3339
<a href="#refsRFC3339">[RFC3339]</a>,
- with these additional qualifications:</div>
- <ul>
- <li>the literal letters <code>T</code> and
- <code>Z</code> in the date/time syntax
- <a href="#must-requirement">must</a>
- always be
- uppercase</li>
- <li>a <dfn id="data-date-fullyear">date-fullyear</dfn> is
- defined as four or more digits representing a number
- greater than 0</li>
- </ul>
+ with these additional qualifications:
+ <ul>
+ <li>the literal letters <code>T</code> and
+ <code>Z</code> in the date/time syntax
+ <a href="#must-requirement">must</a>
+ always be
+ uppercase</li>
+ <li>a <dfn id="data-date-fullyear">date-fullyear</dfn> is
+ defined as four or more digits representing a number
+ greater than 0</li>
+ </ul>
+ </div>
</dd>
<dd>
<div class="example">
@@ -317,13 +318,13 @@
>IRI-reference</dfn>,
as defined in RFC 3987
<a href="#refsRFC3987">[RFC3987]</a>.
- <p class="note">The empty string is a valid
- <a href="#data.iri-ref">IRI-reference</a>,
- so the empty string is allowed as the value of any
- attribute for which this reference lists
- <a href="#common.data.uri">URI</a>
- as the allowed datatype.</p>
</div>
+ <p class="note">The empty string is a valid
+ <a href="#data.iri-ref">IRI-reference</a>,
+ so the empty string is allowed as the value of any
+ attribute for which this reference lists
+ <a href="#common.data.uri">URI</a>
+ as the allowed datatype.</p>
</dd>
<dd>
<div class="example">
@@ -336,7 +337,7 @@
<dd></dd>
<dd>
<div class="datatype-desc">A
- <a href="#space">space</a>-separated list of zero or more
+ <a href="#space">space</a>-separated set of zero or more
<a href="#data.iri-ref">IRI-reference</a> instances.</div>
</dd>
</dl>
Index: attributes.html
===================================================================
RCS file: /sources/public/html5/markup/src/attributes.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- attributes.html 22 Jul 2010 05:48:27 -0000 1.21
+++ attributes.html 26 Jul 2010 04:06:26 -0000 1.22
@@ -37,7 +37,9 @@
</dl>
<dl>
<dt id="common.attrs.contextmenu" class="new">contextmenu</dt>
- <dd>Identifies a
+ <dd>An
+ <a href="#id-reference">ID reference</a>
+ to a
<a href="#menu" class="element">menu</a>
with which to associate the element as a
<dfn
@@ -146,7 +148,9 @@
</dl>
<dl>
<dt id="common-form.attrs.form" class="new">form</dt>
- <dd>Identifies a
+ <dd>An
+ <a href="#id-reference">ID reference</a>
+ to a
<a href="#form">form</a>
with which to associate the element.</dd>
</dl>
@@ -177,7 +181,9 @@
</dl>
<dl>
<dt id="input.attrs.list" class="new">list</dt>
- <dd>Identifies a
+ <dd>An
+ <a href="#id-reference">ID reference</a>
+ to a
<a href="#datalist" class="element">datalist</a>
with which to associate the element.</dd>
</dl>
Received on Monday, 26 July 2010 04:06:30 UTC