- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 01 Aug 2010 06:36:55 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv5640/src
Modified Files:
attributes.html datatypes.html
Log Message:
include selected datatype/microsyntax descriptions at point of use, along with attribute descriptions, and reworked some individual datatype descriptions
Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- datatypes.html 31 Jul 2010 08:13:16 -0000 1.49
+++ datatypes.html 1 Aug 2010 06:36:53 -0000 1.50
@@ -2,11 +2,10 @@
xmlns="http://www.w3.org/1999/xhtml">
<section id="data-string-def" class="no-toc">
<h2 class="common-subhead"><dfn id="data-string">String</dfn></h2>
- <div class="datatype-desc">
- <p>For the purposes of this document, a
+ <div class="datatype-desc">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>
+ <a href="#normal-character-data">normal character data</a>.
<p>The <a href="#syntax-attributes">Attributes</a> section of
this document describes additional restrictions on strings in
attribute values — in particular, restrictions for the
@@ -102,12 +101,11 @@
<li>any
<a href="#case-insensitive">case-insensitive match</a>
for one of the following literal strings:
- <ul>
- <li><code>_blank</code></li>
- <li><code>_self</code></li>
- <li><code>_parent</code></li>
- <li><code>_top</code></li>
- </ul>
+ "<code>_blank</code>",
+ "<code>_self</code>",
+ "<code>_parent</code>",
+ or
+ "<code>_top</code>".
</li>
</ul>
</div>
@@ -142,11 +140,13 @@
<dd>
<div class="datatype-desc">A valid
<dfn id="id-reference">ID reference</dfn>
- to an element of type <i>type</i> is a string
+ to an element of type
+ <var>type</var>
+ 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>
+ <var>type</var>.</div>
</dd>
</dl>
<dl><dt>idrefs</dt>
@@ -155,7 +155,7 @@
<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>
+ <a href="#id-reference">ID reference</a>.</div>
</dd>
</dl>
<dl><dt>name</dt>
@@ -181,13 +181,15 @@
valid
<dfn id="hash-name-reference">hash-name reference</dfn>
to an element of
- type <i>type</i> is a string that starts with a
+ type
+ <var>type</var>
+ is a string that starts with a
"<code title="U+0023 NUMBER SIGN">#</code>"
character, followed by a string which
exactly matches the value of the
<code class="attribute">name</code>
attribute of an element in the document with type
- <i>type</i>.</div>
+ <var>type</var>.</div>
</dd>
</dl>
<dl><dt>integer</dt>
@@ -223,7 +225,7 @@
<dl><dt>float</dt>
<dd></dd>
<dd>
- <div class="datatype-desc">A float consists of the following
+ <div class="datatype-desc">A floating-point number consists of the following
parts, in exactly the following order:
<ol>
<li>Optionally, the first character may be a
@@ -266,7 +268,7 @@
<dd></dd>
<dd>
<div class="datatype-desc">A
- <a href="#common.data.float.non-negative">non-negative float</a>,
+ <a href="#common.data.float.non-negative">non-negative floating-point number</a>,
with the following restriction:
<ul>
<li><a href="#must-requirement">must</a>
@@ -279,7 +281,7 @@
<dd></dd>
<dd>
<div class="datatype-desc">A
- <a href="#common.data.float">float</a>,
+ <a href="#common.data.float">floating-point number</a>,
with the following restriction:
<ul>
<li>the first character may not be a
@@ -297,7 +299,7 @@
id="date-time"
title="date-time"
>date-time</dfn>,
- as defined in RFC 3339
+ as defined in
<a href="#refsRFC3339">[RFC3339]</a>,
with these additional qualifications:
<ul>
@@ -306,9 +308,10 @@
<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>
+ <li>a
+ <var class="defined-elsewhere">date-fullyear</var>
+ is defined as
+ four or more digits representing a number greater than 0</li>
</ul>
</div>
</dd>
@@ -325,9 +328,9 @@
<dd>
<div class="datatype-desc">Any one of the following:
<ul>
- <li><a href="#form.data.date">date</a></li>
- <li><a href="#form.data.time">time</a></li>
- <li><a href="#common.data.datetime">datetime</a></li>
+ <li><a href="#form.data.date">a date</a></li>
+ <li><a href="#form.data.time">a time</a></li>
+ <li><a href="#common.data.datetime">a date and time</a></li>
</ul>
</div>
</dd>
@@ -389,7 +392,7 @@
<dd>
<div class="datatype-desc">An
<dfn id="data.iri">IRI</dfn>,
- as defined in RFC 3987
+ as defined in
<a href="#refsRFC3987">[RFC3987]</a>.</div>
</dd>
<dd>
@@ -430,14 +433,13 @@
id="mime-media-type"
title="mime-media-type"
>MIME media type</dfn>,
- as defined in RFC 2046
+ as defined in
<a href="#refsRFC2046">[RFC2046]</a>.</div> </dd>
</dl>
<dl><dt>charset</dt>
<dd></dd>
<dd>
- <div class="datatype-desc">
- <p>For documents in the
+ <div class="datatype-desc">For documents in the
<a href="#html-syntax">HTML syntax</a>:
a
<a href="#case-insensitive">case-insensitive match</a>
@@ -453,7 +455,7 @@
if there is one; or if none of the <code>Alias</code>
fields are so labeled, a
<a href="#case-insensitive">case-insensitive match</a>
- for a <code>Name</code> field in the registry.</p>
+ for a <code>Name</code> field in the registry.
<p>For documents in the <a href="#xml-syntax">XML
syntax</a>, any
<a href="#case-insensitive">case-insensitive match</a>
@@ -535,7 +537,7 @@
id="language-tag"
title="language-tag"
>language tag</dfn>,
- as defined in BCP 47
+ as defined in
<a href="#refsBCP47">[BCP47]</a>.</div>
</dd>
</dl>
@@ -577,8 +579,10 @@
<dd>
<div class="datatype-desc">A regular expression that
<a href="#must-requirement">must</a>
- match the JavaScript <i>Pattern</i> production <a
- href="#refsECMA262">[ECMA262]</a>.</div>
+ match the JavaScript
+ <var class="defined-elsewhere">Pattern</var>
+ production
+ <a href="#refsECMA262">[ECMA262]</a>.</div>
</dd>
</dl>
<dl><dt>datetime-local</dt>
@@ -608,12 +612,10 @@
id="full-date"
title="full-date"
>full-date</dfn>,
- as defined in RFC 3339
+ as defined in
<a href="#refsRFC3339">[RFC3339]</a>,
- with the additional qualification that the year component
- is a
- <a href="#data-date-fullyear">date-fullyear</a>
- as described in this reference.</div>
+ with the additional qualification that the year component is
+ four or more digits representing a number greater than 0.</div>
<div class="example">
<p>Example:</p>
<pre><code>1996-12-19</code></pre>
@@ -626,14 +628,13 @@
<div class="datatype-desc">The following parts, in exactly the
following order:
<ol>
- <li>A <a href="#data-date-fullyear">date-fullyear</a>.</li>
+ <li>Four or more digits representing a number greater than 0.</li>
<li>The literal string "<code>-</code>".</li>
- <li>A
- <dfn
- id="data-date-month"
- title="data-date-month">date-month</dfn>, as defined in
- RFC 3339
- <a href="#refsRFC3339">[RFC3339]</a>.</li>
+ <li>Two digits, representing the month
+ <var>month</var>,
+ in the range 1 ≤
+ <var>month</var>,
+ ≤ 12.</li>
</ol>
</div>
<div class="example">
@@ -648,17 +649,27 @@
<div class="datatype-desc">The following parts, in exactly
the following order:
<ol>
- <li>A
- <a href="#data-date-fullyear">date-fullyear</a>.</li>
+ <li>Four or more digits representing year
+ <var>year</var>,
+ where
+ <var>year</var>
+ > 0.</li>
<li>The literal string
"<code>-W</code>".</li>
- <li>A
- <dfn
- id="data-date-week"
- title="data-date-week"
- >date-week</dfn>,
- as defined in RFC 3339
- <a href="#refsRFC3339">[RFC3339]</a>.</li>
+ <li>Two digits, representing the week
+ <var>week</var>,
+ in the range
+ 1 ≤
+ <var>week</var>
+ ≤
+ <var>maxweek</var>,
+ where
+ <var>maxweek</var>
+ is either
+ <code>52</code>
+ or
+ <code>53</code>,
+ depending on the particular year.</li>
</ol>
</div>
</dd>
@@ -677,7 +688,7 @@
id="partial-time"
title="partial-time"
>partial-time</dfn>,
- as defined in RFC 3339
+ as defined in
<a href="#refsRFC3339">[RFC3339]</a>.</div>
</dd>
<dd>
@@ -691,18 +702,18 @@
<dl><dt>emailaddress</dt>
<dd></dd>
<dd>
- <div class="datatype-desc">
- <p>Any string that matches the following ABNF
+ <div class="datatype-desc">Any string that matches the
+ following
<a href="#refsABNF">[ABNF]</a>
- production:</p>
+ production:
<pre><code>1*( atext / "." ) "@" ldh-str 1*( "." ldh-str )</code></pre>
<p>…where
- <dfn id="data-atext" title="data-atext">atext</dfn>
- is as defined in RFC 5322
+ <var class="defined-elsewhere">atext</var>
+ is as defined in
<a href="#refsRFC5322">[RFC5322]</a>,
and
- <dfn id="data-ldh-str" title="data-ldh-str">ldh-str</dfn>
- is as defined in RFC 1034
+ <var class="defined-elsewhere">ldh-str</var>
+ is as defined in
<a href="#refsRFC1034">[RFC1034]</a>.</p>
</div>
<div class="example">
@@ -738,8 +749,8 @@
</ol>
</div>
<div class="note">
- <p>This datatype does not allow color keywords (for
- example, strings such as “red” or “green”).</p>
+ <p>Color keywords (for example, strings such as “red” or “green”)
+ are not allowed.</p>
</div>
</dd>
</dl>
@@ -761,12 +772,11 @@
<dl><dt>sandbox-allow-list</dt>
<dd></dd>
<dd>
- <div class="datatype-desc">
- <p>An
+ <div class="datatype-desc">An
<a href="#data-unordered-tokens">unordered set of unique space-separated tokens</a>,
each of which is a
<a href="#case-insensitive">case-insensitive match</a>
- for one of the following literal strings:</p>
+ for one of the following literal strings:
<ul>
<li>"<code>allow-forms</code>"</li>
<li>"<code>allow-scripts</code>"</li>
Index: attributes.html
===================================================================
RCS file: /sources/public/html5/markup/src/attributes.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- attributes.html 30 Jul 2010 10:34:16 -0000 1.23
+++ attributes.html 1 Aug 2010 06:36:53 -0000 1.24
@@ -37,9 +37,9 @@
</dl>
<dl>
<dt id="common.attrs.contextmenu" class="new">contextmenu</dt>
- <dd>An
- <a href="#id-reference">ID reference</a>
- to a
+ <dd>The value of the
+ <span class="attribute">id</span>
+ attribute on the
<a href="#menu" class="element">menu</a>
with which to associate the element as a
<dfn
@@ -148,9 +148,9 @@
</dl>
<dl>
<dt id="common-form.attrs.form" class="new">form</dt>
- <dd>An
- <a href="#id-reference">ID reference</a>
- to a
+ <dd>The value of the
+ <span class="attribute">id</span>
+ attribute on the
<a href="#form">form</a>
with which to associate the element.</dd>
</dl>
@@ -183,9 +183,9 @@
</dl>
<dl>
<dt id="input.attrs.list" class="new">list</dt>
- <dd>An
- <a href="#id-reference">ID reference</a>
- to a
+ <dd>The value of the
+ <span class="attribute">id</span>
+ attribute on the
<a href="#datalist" class="element">datalist</a>
with which to associate the element.</dd>
</dl>
Received on Sunday, 1 August 2010 06:36:57 UTC