- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 12 Feb 2010 10:00:32 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv7960/src
Modified Files:
datatypes.html references.html status.html
Log Message:
checkpointing
Index: status.html
===================================================================
RCS file: /sources/public/html5/markup/src/status.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- status.html 12 Feb 2010 04:52:28 -0000 1.17
+++ status.html 12 Feb 2010 10:00:30 -0000 1.18
@@ -27,11 +27,11 @@
needed, additional document-conformance constraints and
usage admonitions for the element and its attributes (in
addition to those already documented in the
- <i>Content model</i>,
- <i>Attribute model</i>,
- <i>Tag omission</i>,
- and
- <i>Permitted contexts</i>
+ <i>Permitted content</i>,
+ <i>Permitted attributes</i>,
+ <i>Permitted parent elements</i>,
+ and
+ <i>Tag omission</i>
subsections).</dd>
</dl>
</div>
Index: references.html
===================================================================
RCS file: /sources/public/html5/markup/src/references.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- references.html 11 Feb 2010 17:09:58 -0000 1.14
+++ references.html 12 Feb 2010 10:00:30 -0000 1.15
@@ -2,6 +2,11 @@
xmlns="http://www.w3.org/1999/xhtml">
<h2>References</h2>
<dl>
+ <dt><dfn id="refsABNF">[ABNF]</dfn></dt>
+ <dd><cite><a
+ href="http://www.ietf.org/rfc/std/std68.txt"
+ >Augmented BNF for Syntax Specifications: ABNF</a></cite>.
+ D. Crocker, P. Overell. January 2008.</dd>
<dt><dfn id="refsBOCU1">[BOCU1]</dfn></dt>
<dd><cite><a
href="http://www.unicode.org/notes/tn6/"
@@ -66,6 +71,12 @@
<dd><span class="references-note" >(see in particular <a
href="http://www.w3.org/TR/2009/CR-css3-mediaqueries-20090915/#syntax"
>http://www.w3.org/TR/2009/CR-css3-mediaqueries-20090915/#syntax</a>)</span></dd>
+ <dt><dfn id="refsRFC1034">[RFC1034]</dfn></dt>
+ <dd><cite><a href="http://tools.ietf.org/html/rfc1034" >Internet
+ Message Format</a></cite>. P. Mockapetris. October 2008.</dd>
+ <dd><span class="references-note" >(see in particular <a
+ href="http://tools.ietf.org/html/rfc1034#section-3.5"
+ >http://tools.ietf.org/html/rfc1034#section-3.5</a></span></dd>
<dt><dfn id="refsRFC2046">[RFC2046]</dfn></dt>
<!-- * <dd><cite><a href="http://tools.ietf.org/html/rfc2046" -->
<dd><cite><a href="http://tools.ietf.org/html/rfc2046"
@@ -88,6 +99,12 @@
<dd><span class="references-note" >(see in particular <a
href="http://tools.ietf.org/html/rfc3987#section-2.2"
>http://tools.ietf.org/html/rfc3987#section-2.2</a>)</span></dd>
+ <dt><dfn id="refsRFC5322">[RFC5322]</dfn></dt>
+ <dd><cite><a href="http://tools.ietf.org/html/rfc5322" >Internet
+ Message Format</a></cite>. P. Resnick. October 2008.</dd>
+ <dd><span class="references-note" >(see in particular <a
+ href="http://tools.ietf.org/html/rfc5322#section-3.2.3"
+ >http://tools.ietf.org/html/rfc5322#section-3.2.3</a>)</span></dd>
<dt><dfn id="refsRFC5646">[RFC5646]</dfn></dt>
<dd><cite><a href="http://tools.ietf.org/html/rfc5646"
>Tags for Identifying Languages</a></cite>. A.
@@ -96,12 +113,6 @@
tags, see in particular <a
href="http://tools.ietf.org/html/rfc5646#appendix-A"
>http://tools.ietf.org/html/rfc5646#appendix-A</a>)</span></dd>
- <dt><dfn id="refsRFC5322">[RFC5322]</dfn></dt>
- <dd><cite><a href="http://tools.ietf.org/html/rfc5322" >Internet
- Message Format</a></cite>. P. Resnick. October 2008.</dd>
- <dd><span class="references-note" >(see in particular <a
- href="http://tools.ietf.org/html/rfc5322#section-3.2.3"
- >http://tools.ietf.org/html/rfc5322#section-3.2.3</a>)</span></dd>
<dt><dfn id="refsSCSU">[SCSU]</dfn></dt>
<dd><cite><a
href="http://www.unicode.org/unicode/reports/tr6/"
Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- datatypes.html 8 Feb 2010 06:49:36 -0000 1.36
+++ datatypes.html 12 Feb 2010 10:00:30 -0000 1.37
@@ -615,26 +615,19 @@
<dl><dt>emailaddress</dt>
<dd></dd>
<dd>
- <div class="datatype-desc">The following parts, in exactly
- the following order:
- <ol>
- <li>A
- <dfn
- id="data-dot-atom"
- title="data-dot-atom"
- >dot-atom</dfn>,
- as defined in RFC 5322
- <a href="#refsRFC5322">[RFC5322]</a>,
- with the additional constraint that the
- <i>CFWS</i> production is excluded everywhere.</li>
- <li>A
- "<code title="U+0040 COMMERCIAL AT">@</code>"
- character.</li>
- <li>A
- <a href="#data-dot-atom">dot-atom</a>,
- with the additional constraint that the
- <i>CFWS</i> production is excluded everywhere.</li>
- </ol>
+ <div class="datatype-desc">
+ <p>Any string that matches the following ABNF
+ <a href="#refsABNF">[ABNF]</a>
+ production:</p>
+ <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
+ <a href="#refsRFC5322">[RFC5322]</a>,
+ and
+ <dfn id="data-ldh-str" title="data-ldh-str">ldh-str</dfn>
+ is as defined in RFC 1034
+ <a href="#refsRFC5322">[RFC1034]</a>.</p>
</div>
<div class="example">
<p>Examples:</p>
@@ -699,4 +692,69 @@
</div>
</dd>
</dl>
+ <dl><dt>circle</dt>
+ <dd></dd>
+ <dd>
+ <div class="datatype-desc">A comma-separated list of three
+ numbers, in exactly the following order:
+ <ol>
+ <li>an
+ <a href="#common.data.integer">integer</a>
+ representing the distance in CSS pixels from the left
+ edge of the image to the center of the circle</li>
+ <li>an
+ <a href="#common.data.integer">integer</a>
+ representing the distance in CSS pixels from the top
+ edge of the image to the center of the circle</li>
+ <li>a
+ <a href="#common.data.integer.non-negative">non-negative integer</a>,
+ representing the radius of the circle, in CSS
+ pixels</li>
+ </ol>
+ </div>
+ </dd>
+ </dl>
+ <dl><dt>rectangle</dt>
+ <dd></dd>
+ <dd>
+ <div class="datatype-desc">A comma-separated list of four
+ <a href="#common.data.integer">integers</a>, in exactly
+ the following order:
+ <ol>
+ <li>an
+ <a href="#common.data.integer">integer</a>
+ representing the distance in CSS pixels from the left
+ edge of the image to the left side of the rectangle</li>
+ <li>an
+ <a href="#common.data.integer">integer</a>
+ representing the distance in CSS pixels from the top
+ edge of the image to the top side of the rectangle</li>
+ <li>an
+ <a href="#common.data.integer">integer</a>, greater than
+ the value of the first integer in this list,
+ representing the distance in CSS pixels from the left
+ edge of the image to the right side of the rectangle</li>
+ <li>an
+ <a href="#common.data.integer">integer</a>, greater than
+ the value of the second integer in this list,
+ representing the distance in CSS pixels from the top
+ edge of the image to the bottom side of the rectangle</li>
+ </ol>
+ </div>
+ </dd>
+ </dl>
+ <dl><dt>polygon</dt>
+ <dd></dd>
+ <dd>
+ <div class="datatype-desc">A comma-separated list of at
+ least six
+ <a href="#common.data.integer">integers</a>, with the
+ total number of integers in the list being even (that is,
+ six or eight or ten numbers, and so on). Each pair of
+ integers represents a coordinate, in CSS pixels, given as
+ the distances from, respectively, the left and the top of
+ the image; all the coordinates together represent the
+ points of the polygon, in order.</div>
+ </dd>
+ </dl>
</section>
Received on Friday, 12 February 2010 10:00:34 UTC