- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 30 Mar 2010 09:45:23 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv26887
Modified Files:
embed.html iframe.html input.image.html object.html
patch-schema schema.html spec.html video.html
Log Message:
fixed datatypes of some remaining height/width attributes to allow zero (they had been incorrectly restricted to being greater than zero); this affects iframe, embed, object, video, and input/@type=image (thx=Maciej)
Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- iframe.html 29 Mar 2010 18:46:41 -0000 1.58
+++ iframe.html 30 Mar 2010 09:45:20 -0000 1.59
@@ -65,14 +65,14 @@
<dt>
<a class="attribute-name" id="iframe.attrs.width" title="iframe.attrs.width" href="iframe.html#iframe.attrs.width">width</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the <a href="iframe.html#iframe">iframe</a>, in CSS
pixels.</dd>
<dt>
<a class="attribute-name" id="iframe.attrs.height" title="iframe.attrs.height" href="iframe.html#iframe.attrs.height">height</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the <a href="iframe.html#iframe">iframe</a>, in CSS
pixels.</dd>
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- schema.html 29 Mar 2010 20:43:58 -0000 1.17
+++ schema.html 30 Mar 2010 09:45:20 -0000 1.18
@@ -2170,7 +2170,7 @@
<span class='pattern' id='embed.attrs.height'><span class='type'>attribute </span>
<span class='name'>height</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
@@ -2179,7 +2179,7 @@
<span class='pattern' id='embed.attrs.width'><span class='type'>attribute </span>
<span class='name'>width</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
@@ -2353,7 +2353,7 @@
<span class='pattern' id='object.attrs.height'><span class='type'>attribute </span>
<span class='name'>height</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
@@ -2362,7 +2362,7 @@
<span class='pattern' id='object.attrs.width'><span class='type'>attribute </span>
<span class='name'>width</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
@@ -2467,7 +2467,7 @@
<span class='pattern' id='iframe.attrs.height'><span class='type'>attribute </span>
<span class='name'>height</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
@@ -2476,7 +2476,7 @@
<span class='pattern' id='iframe.attrs.width'><span class='type'>attribute </span>
<span class='name'>width</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
@@ -3744,7 +3744,7 @@
<span class='pattern' id='video.attrs.height'><span class='type'>attribute </span>
<span class='name'>height</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
@@ -3753,7 +3753,7 @@
<span class='pattern' id='video.attrs.width'><span class='type'>attribute </span>
<span class='name'>width</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
@@ -5267,7 +5267,7 @@
<span class='pattern' id='input.image.attrs.height'><span class='type'>attribute </span>
<span class='name'>height</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
@@ -5276,7 +5276,7 @@
<span class='pattern' id='input.image.attrs.width'><span class='type'>attribute </span>
<span class='name'>width</span>
{<span class='model'>
- <a class='ref' href='#common.data.integer.positive' title='common.data.integer.positive'>integer.positive</a>
+ <a class='ref' href='#common.data.integer.non-negative' title='common.data.integer.non-negative'>integer.non-negative</a>
</span>}
</span>
</div>
Index: object.html
===================================================================
RCS file: /sources/public/html5/markup/object.html,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- object.html 29 Mar 2010 18:46:41 -0000 1.55
+++ object.html 30 Mar 2010 09:45:20 -0000 1.56
@@ -77,13 +77,13 @@
<dt>
<a class="attribute-name" id="object.attrs.height" title="object.attrs.height" href="object.html#object.attrs.height">height</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the object, in CSS pixels.</dd>
<dt>
<a class="attribute-name" id="object.attrs.width" title="object.attrs.width" href="object.html#object.attrs.width">width</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the object, in CSS pixels.</dd>
Index: embed.html
===================================================================
RCS file: /sources/public/html5/markup/embed.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- embed.html 29 Mar 2010 18:46:40 -0000 1.47
+++ embed.html 30 Mar 2010 09:45:20 -0000 1.48
@@ -61,13 +61,13 @@
<dt>
<a class="attribute-name" id="embed.attrs.height" title="embed.attrs.height" href="embed.html#embed.attrs.height">height</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the embedded content, in CSS pixels.</dd>
<dt>
<a class="attribute-name" id="embed.attrs.width" title="embed.attrs.width" href="embed.html#embed.attrs.width">width</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the embedded content, in CSS pixels.</dd>
Index: input.image.html
===================================================================
RCS file: /sources/public/html5/markup/input.image.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- input.image.html 29 Mar 2010 15:07:58 -0000 1.48
+++ input.image.html 30 Mar 2010 09:45:20 -0000 1.49
@@ -84,13 +84,13 @@
<dt>
<a class="attribute-name" id="input.image.attrs.height" title="input.image.attrs.height" href="input.image.html#input.image.attrs.height">height</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the image, in CSS pixels.</dd>
<dt>
<a class="attribute-name" id="input.image.attrs.width" title="input.image.attrs.width" href="input.image.html#input.image.attrs.width">width</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the image, in CSS pixels.</dd>
Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- patch-schema 29 Mar 2010 20:43:58 -0000 1.90
+++ patch-schema 30 Mar 2010 09:45:20 -0000 1.91
@@ -1,6 +1,6 @@
Index: schema/revision.rnc
===================================================================
---- schema/revision.rnc (revision 543)
+--- schema/revision.rnc (revision 544)
+++ schema/revision.rnc (working copy)
@@ -2,17 +2,6 @@
## RELAX NG Schema for HTML 5: Revision Annotations #
@@ -62,7 +62,7 @@
del.inner.phrasing =
Index: schema/web-forms.rnc
===================================================================
---- schema/web-forms.rnc (revision 543)
+--- schema/web-forms.rnc (revision 544)
+++ schema/web-forms.rnc (working copy)
@@ -9,6 +9,7 @@
common-form.attrs =
@@ -170,7 +170,7 @@
Index: schema/tables.rnc
===================================================================
---- schema/tables.rnc (revision 543)
+--- schema/tables.rnc (revision 544)
+++ schema/tables.rnc (working copy)
@@ -157,38 +157,6 @@
tr.inner =
@@ -276,7 +276,7 @@
( common.inner.flow )
Index: schema/embed.rnc
===================================================================
---- schema/embed.rnc (revision 543)
+--- schema/embed.rnc (revision 544)
+++ schema/embed.rnc (working copy)
@@ -248,7 +248,7 @@
}
@@ -400,7 +400,7 @@
# }
Index: schema/media.rnc
===================================================================
---- schema/media.rnc (revision 543)
+--- schema/media.rnc (revision 544)
+++ schema/media.rnc (working copy)
@@ -4,32 +4,6 @@
## RELAX NG Schema for HTML 5: Advanced Embedded Content #
@@ -488,7 +488,7 @@
common.data.uri
@@ -92,12 +73,20 @@
attribute width {
- common.data.integer.positive
+ common.data.integer.non-negative
}
+ video.attrs.src =
+ attribute src {
@@ -556,7 +556,7 @@
Index: schema/phrase.rnc
===================================================================
---- schema/phrase.rnc (revision 543)
+--- schema/phrase.rnc (revision 544)
+++ schema/phrase.rnc (working copy)
@@ -13,13 +13,12 @@
a.attrs =
@@ -650,7 +650,7 @@
em.elem =
Index: schema/web-forms2.rnc
===================================================================
---- schema/web-forms2.rnc (revision 543)
+--- schema/web-forms2.rnc (revision 544)
+++ schema/web-forms2.rnc (working copy)
@@ -6,9 +6,6 @@
@@ -702,7 +702,7 @@
attribute autocomplete {
Index: schema/meta.rnc
===================================================================
---- schema/meta.rnc (revision 543)
+--- schema/meta.rnc (revision 544)
+++ schema/meta.rnc (working copy)
@@ -101,7 +101,7 @@
title.attrs =
@@ -880,7 +880,7 @@
+ common.elem.metadata |= meta.http-equiv.content-type.elem
Index: schema/applications.rnc
===================================================================
---- schema/applications.rnc (revision 543)
+--- schema/applications.rnc (revision 544)
+++ schema/applications.rnc (working copy)
@@ -4,18 +4,6 @@
## RELAX NG Schema for HTML 5: Web Application Features #
@@ -1009,7 +1009,7 @@
## Menu: <menu>
Index: schema/core-scripting.rnc
===================================================================
---- schema/core-scripting.rnc (revision 543)
+--- schema/core-scripting.rnc (revision 544)
+++ schema/core-scripting.rnc (working copy)
@@ -52,9 +52,9 @@
string
@@ -1047,7 +1047,7 @@
attribute onabort { string }
Index: schema/common.rnc
===================================================================
---- schema/common.rnc (revision 543)
+--- schema/common.rnc (revision 544)
+++ schema/common.rnc (working copy)
@@ -38,16 +38,16 @@
common.attr.anything =
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- spec.html 29 Mar 2010 20:43:58 -0000 1.208
+++ spec.html 30 Mar 2010 09:45:20 -0000 1.209
@@ -5998,13 +5998,13 @@
<dt>
<a class="attribute-name" id="embed.attrs.height" title="embed.attrs.height" href="#embed.attrs.height">height</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the embedded content, in CSS pixels.</dd>
<dt>
<a class="attribute-name" id="embed.attrs.width" title="embed.attrs.width" href="#embed.attrs.width">width</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the embedded content, in CSS pixels.</dd>
@@ -7645,14 +7645,14 @@
<dt>
<a class="attribute-name" id="iframe.attrs.width" title="iframe.attrs.width" href="#iframe.attrs.width">width</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the <a href="#iframe">iframe</a>, in CSS
pixels.</dd>
<dt>
<a class="attribute-name" id="iframe.attrs.height" title="iframe.attrs.height" href="#iframe.attrs.height">height</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the <a href="#iframe">iframe</a>, in CSS
pixels.</dd>
@@ -9491,13 +9491,13 @@
<dt>
<a class="attribute-name" id="input.image.attrs.height" title="input.image.attrs.height" href="#input.image.attrs.height">height</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the image, in CSS pixels.</dd>
<dt>
<a class="attribute-name" id="input.image.attrs.width" title="input.image.attrs.width" href="#input.image.attrs.width">width</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the image, in CSS pixels.</dd>
@@ -13917,13 +13917,13 @@
<dt>
<a class="attribute-name" id="object.attrs.height" title="object.attrs.height" href="#object.attrs.height">height</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the object, in CSS pixels.</dd>
<dt>
<a class="attribute-name" id="object.attrs.width" title="object.attrs.width" href="#object.attrs.width">width</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the object, in CSS pixels.</dd>
@@ -17790,13 +17790,13 @@
<dt>
<a class="attribute-name" id="video.attrs.height" title="video.attrs.height" href="#video.attrs.height">height</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the video, in CSS pixels.</dd>
<dt>
<a class="attribute-name" id="video.attrs.width" title="video.attrs.width" href="#video.attrs.width">width</a> = <span class="attr-values">
- <a href="#common.data.integer.positive">positive integer</a>
+ <a href="#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the video, in CSS pixels.</dd>
Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- video.html 29 Mar 2010 20:43:59 -0000 1.57
+++ video.html 30 Mar 2010 09:45:20 -0000 1.58
@@ -122,13 +122,13 @@
<dt>
<a class="attribute-name" id="video.attrs.height" title="video.attrs.height" href="video.html#video.attrs.height">height</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The height of the video, in CSS pixels.</dd>
<dt>
<a class="attribute-name" id="video.attrs.width" title="video.attrs.width" href="video.html#video.attrs.width">width</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.integer.positive">positive integer</a>
+ <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>
</span> </dt>
<dd>The width of the video, in CSS pixels.</dd>
Received on Tuesday, 30 March 2010 09:45:25 UTC