- From: poot <cvsmail@w3.org>
- Date: Fri, 12 Feb 2010 19:00:51 +0900 (JST)
- To: public-html-diffs@w3.org
mike: checkpointing
http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.165&r2=1.166&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -d -r1.385 -r1.386
--- Overview.html 12 Feb 2010 04:52:22 -0000 1.385
+++ Overview.html 12 Feb 2010 10:00:29 -0000 1.386
@@ -98,11 +98,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: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- schema.html 11 Feb 2010 14:23:38 -0000 1.11
+++ schema.html 12 Feb 2010 10:00:29 -0000 1.12
@@ -479,9 +479,9 @@
<div class='patternname' id='the-common.data.circle'><a href='#the-common.data.circle'>circle</a> =</div>
<span class='pattern' id='common.data.circle'>d:circle</span>
</div>
-<div class='define' id='common.data.polyline-define'>
- <div class='patternname' id='the-common.data.polyline'><a href='#the-common.data.polyline'>polyline</a> =</div>
- <span class='pattern' id='common.data.polyline'>d:polyline</span>
+<div class='define' id='common.data.polygon-define'>
+ <div class='patternname' id='the-common.data.polygon'><a href='#the-common.data.polygon'>polygon</a> =</div>
+ <span class='pattern' id='common.data.polygon'>d:polygon</span>
</div>
<div class='define' id='common-form.attrs.form-define'>
<div class='patternname' id='the-common-form.attrs.form'><a href='#the-common-form.attrs.form'>form</a> =</div>
@@ -2742,7 +2742,7 @@
<span class='pattern' id='area.attrs.coords.poly'><span class='type'>attribute </span>
<span class='name'>coords</span>
{<span class='model'>
- <a class='ref' href='#common.data.polyline' title='common.data.polyline'>polyline</a>
+ <a class='ref' href='#common.data.polygon' title='common.data.polygon'>polygon</a>
</span>}
</span>
</div>
Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- area.html 12 Feb 2010 04:52:22 -0000 1.45
+++ area.html 12 Feb 2010 10:00:29 -0000 1.46
@@ -114,7 +114,7 @@
on the image map is a circle.</dd>
<dt><a class="attribute-name" id="area.attrs.shape.poly" title="area.attrs.shape.poly" href="area.html#area.attrs.shape.poly">shape</a> = <span class="attr-values"> "poly" </span><span class="punc postfix &">&</span> <a class="attribute-name" id="area.attrs.coords.poly" title="area.attrs.coords.poly" href="area.html#area.attrs.coords.poly">coords</a> = <span class="attr-values"><span class="model">
- <a class="ref" href="datatypes.html#common.data.polyline" title="common.data.polyline">polyline</a>
+ <a class="ref" href="datatypes.html#common.data.polygon" title="common.data.polygon">polygon</a>
</span></span></dt>
<dd>Specifies that the shape of the area of this hyperlink
on the image map is a polygon.</dd>
Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- datatypes.html 12 Feb 2010 04:52:23 -0000 1.34
+++ datatypes.html 12 Feb 2010 10:00:29 -0000 1.35
@@ -505,17 +505,70 @@
<div id="common.data.rectangle" class="section">
<h2 class="common-subhead">9.32. <dfn id="common.data.rectangle">Rectangle</dfn> <a class="hash" href="#common.data.rectangle">#</a></h2>
<div class="content-models">
- </div>
+
+ <div class="datatype-desc">A comma-separated list of four
+ <a href="datatypes.html#common.data.integer">integers</a>, in exactly
+ the following order:
+ <ol>
+ <li>an
+ <a href="datatypes.html#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="datatypes.html#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="datatypes.html#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="datatypes.html#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>
+ </div>
</div>
<div id="common.data.circle" class="section">
<h2 class="common-subhead">9.33. <dfn id="common.data.circle">Circle</dfn> <a class="hash" href="#common.data.circle">#</a></h2>
<div class="content-models">
- </div>
+
+ <div class="datatype-desc">A comma-separated list of three
+ numbers, in exactly the following order:
+ <ol>
+ <li>an
+ <a href="datatypes.html#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="datatypes.html#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="datatypes.html#common.data.integer.non-negative">non-negative integer</a>,
+ representing the radius of the circle, in CSS
+ pixels</li>
+ </ol>
</div>
- <div id="common.data.polyline" class="section">
- <h2 class="common-subhead">9.34. <dfn id="common.data.polyline">Polyline</dfn> <a class="hash" href="#common.data.polyline">#</a></h2>
+ </div>
+ </div>
+ <div id="common.data.polygon" class="section">
+ <h2 class="common-subhead">9.34. <dfn id="common.data.polygon">Polygon</dfn> <a class="hash" href="#common.data.polygon">#</a></h2>
<div class="content-models">
- </div>
+
+ <div class="datatype-desc">A comma-separated list of at
+ least six
+ <a href="datatypes.html#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>
+ </div>
</div>
<div id="common.data.sandbox-allow-list" class="section">
<h2 class="common-subhead">9.35. <dfn id="common.data.sandbox-allow-list">Sandbox allow list</dfn> <a class="hash" href="#common.data.sandbox-allow-list">#</a></h2>
@@ -663,23 +716,19 @@
<h2 class="common-subhead">9.44. <dfn id="form.data.emailaddress">E-mail address</dfn> <a class="hash" href="#form.data.emailaddress">#</a></h2>
<div class="content-models">
- <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="references.html#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="datatypes.html#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="references.html#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="references.html#refsRFC5322">[RFC5322]</a>,
+ and
+ <dfn id="data-ldh-str" title="data-ldh-str">ldh-str</dfn>
+ is as defined in RFC 1034
+ <a href="references.html#refsRFC5322">[RFC1034]</a>.</p>
</div>
<div class="example">
<p>Examples:</p>
Index: references.html
===================================================================
RCS file: /sources/public/html5/markup/references.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- references.html 12 Feb 2010 04:52:26 -0000 1.17
+++ references.html 12 Feb 2010 10:00:29 -0000 1.18
@@ -14,6 +14,9 @@
<h2>A. References <a class="hash" href="#references">#</a> <a class="toc-bak" href="Overview.html#references-toc">T</a></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/">Unicode Technical Note #6: BOCU-1: Mime-Compatible
Unicode Compression</a></cite>.
@@ -53,6 +56,10 @@
Håkon Wium Lie, Tantek Çelik, Daniel Glazman, Anne van Kesteren.
W3C Working Draft. 15 September 2009.</dd>
<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">Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types</a></cite>.
@@ -67,15 +74,15 @@
<dd><cite><a href="http://tools.ietf.org/html/rfc3987">Internationalized Resource Identifiers (IRIs)</a></cite>.
M. Duerst, M. Suignard. January 2005.</dd>
<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.
Phillips, M. Davis. September 2006.</dd>
<dd><span class="references-note">(for examples of language
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/">Unicode Technical Standard #6: A Standard Compression
Scheme for Unicode </a></cite>.
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- spec.html 12 Feb 2010 07:56:04 -0000 1.165
+++ spec.html 12 Feb 2010 10:00:30 -0000 1.166
@@ -97,11 +97,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>
@@ -3044,7 +3044,7 @@
<dt>
<a class="attribute-name" id="area.attrs.shape.poly" title="area.attrs.shape.poly" href="#area.attrs.shape.poly">shape</a> = <span class="attr-values"> "poly" </span><span class="punc postfix &">&</span> <a class="attribute-name" id="area.attrs.coords.poly" title="area.attrs.coords.poly" href="#area.attrs.coords.poly">coords</a> = <span class="attr-values"><span class="model">
- <a class="ref" href="#common.data.polyline" title="common.data.polyline">polyline</a>
+ <a class="ref" href="#common.data.polygon" title="common.data.polygon">polygon</a>
</span></span>
</dt>
<dd>Specifies that the shape of the area of this hyperlink
@@ -18559,19 +18559,72 @@
<h2 class="common-subhead">9.32. <dfn id="common.data.rectangle">Rectangle</dfn> <a class="hash" href="#common.data.rectangle">#</a>
</h2>
<div class="content-models">
- </div>
+
+ <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>
+ </div>
</div>
<div id="common.data.circle" class="section">
<h2 class="common-subhead">9.33. <dfn id="common.data.circle">Circle</dfn> <a class="hash" href="#common.data.circle">#</a>
</h2>
<div class="content-models">
- </div>
+
+ <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>
+ </div>
</div>
- <div id="common.data.polyline" class="section">
- <h2 class="common-subhead">9.34. <dfn id="common.data.polyline">Polyline</dfn> <a class="hash" href="#common.data.polyline">#</a>
+ <div id="common.data.polygon" class="section">
+ <h2 class="common-subhead">9.34. <dfn id="common.data.polygon">Polygon</dfn> <a class="hash" href="#common.data.polygon">#</a>
</h2>
<div class="content-models">
- </div>
+
+ <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>
+ </div>
</div>
<div id="common.data.sandbox-allow-list" class="section">
<h2 class="common-subhead">9.35. <dfn id="common.data.sandbox-allow-list">Sandbox allow list</dfn> <a class="hash" href="#common.data.sandbox-allow-list">#</a>
@@ -18729,24 +18782,20 @@
</h2>
<div class="content-models">
- <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>
+ <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>
<pre><code>foo-bar.baz@example.com</code></pre>
@@ -18791,7 +18840,11 @@
<h2>A. References <a class="hash" href="#references">#</a> <a class="toc-bak" href="#references-toc">T</a>
</h2>
<dl>
-<dt><dfn id="refsBOCU1">[BOCU1]</dfn></dt>
+<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/">Unicode Technical Note #6: BOCU-1: Mime-Compatible
Unicode Compression</a></cite>.
@@ -18840,6 +18893,11 @@
Håkon Wium Lie, Tantek Çelik, Daniel Glazman, Anne van Kesteren.
W3C Working Draft. 15 September 2009.</dd>
<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>
@@ -18857,17 +18915,17 @@
<cite><a href="http://tools.ietf.org/html/rfc3987">Internationalized Resource Identifiers (IRIs)</a></cite>.
M. Duerst, M. Suignard. January 2005.</dd>
<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.
Phillips, M. Davis. September 2006.</dd>
<dd><span class="references-note">(for examples of language
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/">Unicode Technical Standard #6: A Standard Compression
Received on Friday, 12 February 2010 10:01:20 UTC