- From: poot <cvsmail@w3.org>
- Date: Tue, 16 Jun 2009 02:16:31 +0900 (JST)
- To: public-html-diffs@w3.org
h:tml; fixed placement of attribute descriptions for command and button
elements
http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.314&r2=1.315&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- Overview.html 15 Jun 2009 05:57:14 -0000 1.314
+++ Overview.html 15 Jun 2009 17:16:09 -0000 1.315
@@ -9,7 +9,7 @@
<body>
<div class="head">
<h1>HTML 5: The Markup Language</h1>
-<h2>Editor’s Draft <em>15 June 2009</em>
+<h2>Editor’s Draft <em>16 June 2009</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -42,7 +42,7 @@
<p>
- This document is the 15 June 2009 Editor’s Draft of
+ This document is the 16 June 2009 Editor’s Draft of
<cite>HTML 5: The Markup Language</cite>.
</p>
<p>
@@ -646,17 +646,14 @@
<li id="shared-attributes-toc">
<a href="shared-attributes.html#shared-attributes">9. Other shared attributes</a>
<ul>
-<li id="common-command-attrs-toc">
-<a href="shared-attributes.html#common-command-attrs">9.1. Command attributes</a>
-</li>
<li id="common-media-attrs-toc">
-<a href="shared-attributes.html#common-media-attrs">9.2. Media attributes</a>
+<a href="shared-attributes.html#common-media-attrs">9.1. Media attributes</a>
</li>
<li id="shared-hyperlink-attrs-toc">
-<a href="shared-attributes.html#shared-hyperlink-attrs">9.3. Hyperlink attributes</a>
+<a href="shared-attributes.html#shared-hyperlink-attrs">9.2. Hyperlink attributes</a>
</li>
<li id="common-form-attrs-toc">
-<a href="shared-attributes.html#common-form-attrs">9.4. Form attributes</a>
+<a href="shared-attributes.html#common-form-attrs">9.3. Form attributes</a>
</li>
</ul>
</li>
Index: command.command.html
===================================================================
RCS file: /sources/public/html5/markup/command.command.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- command.command.html 3 May 2009 15:59:40 -0000 1.4
+++ command.command.html 15 Jun 2009 17:16:10 -0000 1.5
@@ -32,7 +32,9 @@
<div class="attr-content-models">
<p><a href="command.command.html#command.command.attrs">command.command.attrs</a> = <span class="pattern" id="command.command.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
& <a class="ref" href="command.command.html#command.command.attrs.type" title="command.command.attrs.type">type</a>?
- & <a class="ref" href="shared-attributes.html#common-command.attrs">common-command.attrs</a></span></p></div></div>
+ & <a class="ref" href="command.command.html#command.command.attrs.label" title="command.command.attrs.label">label</a>?
+ & <a class="ref" href="command.command.html#command.command.attrs.icon" title="command.command.attrs.icon">icon</a>?
+ & <a class="ref" href="command.command.html#command.command.attrs.disabled" title="command.command.attrs.disabled">disabled</a>?</span></p></div></div>
<div class="no-number no-toc" id="command.command-attributes">
<h2 class="element-subhead">Element-specific attributes <a class="hash" href="#command.command-attributes">#</a></h2>
<dl class="attr-defs">
@@ -40,6 +42,18 @@
<dd>Specifies that its <a href="command.html#command" class="element">command</a> element is a
command with an associated action.</dd>
+ <dt><a class="attribute-name" id="command.command.attrs.label" title="command.command.attrs.label" href="command.command.html#command.command.attrs.label">label</a><span class="attr-values"> = string </span> </dt>
+ <dd>The name of the command, as shown to the user.</dd>
+
+ <dt><a class="attribute-name" id="command.command.attrs.icon" title="command.command.attrs.icon" href="command.command.html#command.command.attrs.icon">icon</a><span class="attr-values"> =
+ <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
+ </span> </dt>
+ <dd>A URL for an image that represents the command.</dd>
+
+ <dt><a class="attribute-name" id="command.command.attrs.disabled" title="command.command.attrs.disabled" href="command.command.html#command.command.attrs.disabled">disabled</a><span class="attr-values"> = "disabled" | "" </span> </dt>
+ <dd>Specifies that the command is not currently
+ available.</dd>
+
</dl></div>
<div class="no-number no-toc" id="command.command-tags">
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- schema.html 15 Jun 2009 13:20:24 -0000 1.102
+++ schema.html 15 Jun 2009 17:16:10 -0000 1.103
@@ -6110,7 +6110,9 @@
<div class='patternname' id='the-command.command.attrs'><a href='#the-command.command.attrs'>command.command.attrs</a> =</div>
<span class='pattern' id='command.command.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
& <a class='ref' href='#command.command.attrs.type'>command.command.attrs.type</a>?
- & <a class='ref' href='#common-command.attrs'>common-command.attrs</a></span>
+ & <a class='ref' href='#command.command.attrs.label'>command.command.attrs.label</a>?
+ & <a class='ref' href='#command.command.attrs.icon'>command.command.attrs.icon</a>?
+ & <a class='ref' href='#command.command.attrs.disabled'>command.command.attrs.disabled</a>?</span>
</div>
<div class='define' id='command.command.attrs.type-define'>
<div class='patternname' id='the-command.command.attrs.type'><a href='#the-command.command.attrs.type'>command.command.attrs.type</a> =</div>
@@ -6119,6 +6121,29 @@
{<span class='model'> d:string "command" </span>}
</span>
</div>
+<div class='define' id='command.command.attrs.label-define'>
+ <div class='patternname' id='the-command.command.attrs.label'><a href='#the-command.command.attrs.label'>command.command.attrs.label</a> =</div>
+ <span class='pattern' id='command.command.attrs.label'><span class='type'>attribute </span>
+ <span class='name'>label</span>
+ {<span class='model'> string </span>}
+ </span>
+</div>
+<div class='define' id='command.command.attrs.icon-define'>
+ <div class='patternname' id='the-command.command.attrs.icon'><a href='#the-command.command.attrs.icon'>command.command.attrs.icon</a> =</div>
+ <span class='pattern' id='command.command.attrs.icon'><span class='type'>attribute </span>
+ <span class='name'>icon</span>
+ {<span class='model'>
+ <a class='ref' href='#common.data.uri'>common.data.uri</a>
+ </span>}
+ </span>
+</div>
+<div class='define' id='command.command.attrs.disabled-define'>
+ <div class='patternname' id='the-command.command.attrs.disabled'><a href='#the-command.command.attrs.disabled'>command.command.attrs.disabled</a> =</div>
+ <span class='pattern' id='command.command.attrs.disabled'><span class='type'>attribute </span>
+ <span class='name'>disabled</span>
+ {<span class='model'> d:string "disabled" | d:string "" </span>}
+ </span>
+</div>
<div class='define' id='command.elem-define'>
<div class='patternname' id='the-command.elem'><a href='#the-command.elem'>command.elem</a> =</div>
<span class='pattern' id='command.elem'><a class='ref' href='#command.command.elem'>command.command.elem</a>
@@ -6143,7 +6168,9 @@
& (<a class='ref' href='#command.radio.attrs.type'>command.radio.attrs.type</a>
& <a class='ref' href='#command.radio.attrs.radiogroup'>command.radio.attrs.radiogroup</a>
& <a class='ref' href='#command.radio.attrs.checked'>command.radio.attrs.checked</a>?)
- & <a class='ref' href='#common-command.attrs'>common-command.attrs</a></span>
+ & <a class='ref' href='#command.radio.attrs.label'>command.radio.attrs.label</a>?
+ & <a class='ref' href='#command.radio.attrs.icon'>command.radio.attrs.icon</a>?
+ & <a class='ref' href='#command.radio.attrs.disabled'>command.radio.attrs.disabled</a>?</span>
</div>
<div class='define' id='command.radio.attrs.type-define'>
<div class='patternname' id='the-command.radio.attrs.type'><a href='#the-command.radio.attrs.type'>command.radio.attrs.type</a> =</div>
@@ -6166,6 +6193,29 @@
{<span class='model'> d:string "checked" | d:string "" </span>}
</span>
</div>
+<div class='define' id='command.radio.attrs.label-define'>
+ <div class='patternname' id='the-command.radio.attrs.label'><a href='#the-command.radio.attrs.label'>command.radio.attrs.label</a> =</div>
+ <span class='pattern' id='command.radio.attrs.label'><span class='type'>attribute </span>
+ <span class='name'>label</span>
+ {<span class='model'> string </span>}
+ </span>
+</div>
+<div class='define' id='command.radio.attrs.icon-define'>
+ <div class='patternname' id='the-command.radio.attrs.icon'><a href='#the-command.radio.attrs.icon'>command.radio.attrs.icon</a> =</div>
+ <span class='pattern' id='command.radio.attrs.icon'><span class='type'>attribute </span>
+ <span class='name'>icon</span>
+ {<span class='model'>
+ <a class='ref' href='#common.data.uri'>common.data.uri</a>
+ </span>}
+ </span>
+</div>
+<div class='define' id='command.radio.attrs.disabled-define'>
+ <div class='patternname' id='the-command.radio.attrs.disabled'><a href='#the-command.radio.attrs.disabled'>command.radio.attrs.disabled</a> =</div>
+ <span class='pattern' id='command.radio.attrs.disabled'><span class='type'>attribute </span>
+ <span class='name'>disabled</span>
+ {<span class='model'> d:string "disabled" | d:string "" </span>}
+ </span>
+</div>
<div class='define' id='command.checkbox.elem-define'>
<span class='comment'>## State or option that can be toggled: <command type='checkbox'></span>
@@ -6183,7 +6233,9 @@
<span class='pattern' id='command.checkbox.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
& (<a class='ref' href='#command.checkbox.attrs.type'>command.checkbox.attrs.type</a>
& <a class='ref' href='#command.checkbox.attrs.checked'>command.checkbox.attrs.checked</a>?)
- & <a class='ref' href='#common-command.attrs'>common-command.attrs</a></span>
+ & <a class='ref' href='#command.checkbox.attrs.label'>command.checkbox.attrs.label</a>?
+ & <a class='ref' href='#command.checkbox.attrs.icon'>command.checkbox.attrs.icon</a>?
+ & <a class='ref' href='#command.checkbox.attrs.disabled'>command.checkbox.attrs.disabled</a>?</span>
</div>
<div class='define' id='command.checkbox.attrs.type-define'>
<div class='patternname' id='the-command.checkbox.attrs.type'><a href='#the-command.checkbox.attrs.type'>command.checkbox.attrs.type</a> =</div>
@@ -6199,31 +6251,25 @@
{<span class='model'> d:string "checked" | d:string "" </span>}
</span>
</div>
-<div class='define' id='common-command.attrs-define'>
- <div class='patternname' id='the-common-command.attrs'><a href='#the-common-command.attrs'>common-command.attrs</a> =</div>
- <span class='pattern' id='common-command.attrs'><a class='ref' href='#command.attrs.label'>command.attrs.label</a>?
- & <a class='ref' href='#command.attrs.icon'>command.attrs.icon</a>?
- & <a class='ref' href='#command.attrs.disabled'>command.attrs.disabled</a>?</span>
-</div>
-<div class='define' id='command.attrs.label-define'>
- <div class='patternname' id='the-command.attrs.label'><a href='#the-command.attrs.label'>command.attrs.label</a> =</div>
- <span class='pattern' id='command.attrs.label'><span class='type'>attribute </span>
+<div class='define' id='command.checkbox.attrs.label-define'>
+ <div class='patternname' id='the-command.checkbox.attrs.label'><a href='#the-command.checkbox.attrs.label'>command.checkbox.attrs.label</a> =</div>
+ <span class='pattern' id='command.checkbox.attrs.label'><span class='type'>attribute </span>
<span class='name'>label</span>
{<span class='model'> string </span>}
</span>
</div>
-<div class='define' id='command.attrs.icon-define'>
- <div class='patternname' id='the-command.attrs.icon'><a href='#the-command.attrs.icon'>command.attrs.icon</a> =</div>
- <span class='pattern' id='command.attrs.icon'><span class='type'>attribute </span>
+<div class='define' id='command.checkbox.attrs.icon-define'>
+ <div class='patternname' id='the-command.checkbox.attrs.icon'><a href='#the-command.checkbox.attrs.icon'>command.checkbox.attrs.icon</a> =</div>
+ <span class='pattern' id='command.checkbox.attrs.icon'><span class='type'>attribute </span>
<span class='name'>icon</span>
{<span class='model'>
<a class='ref' href='#common.data.uri'>common.data.uri</a>
</span>}
</span>
</div>
-<div class='define' id='command.attrs.disabled-define'>
- <div class='patternname' id='the-command.attrs.disabled'><a href='#the-command.attrs.disabled'>command.attrs.disabled</a> =</div>
- <span class='pattern' id='command.attrs.disabled'><span class='type'>attribute </span>
+<div class='define' id='command.checkbox.attrs.disabled-define'>
+ <div class='patternname' id='the-command.checkbox.attrs.disabled'><a href='#the-command.checkbox.attrs.disabled'>command.checkbox.attrs.disabled</a> =</div>
+ <span class='pattern' id='command.checkbox.attrs.disabled'><span class='type'>attribute </span>
<span class='name'>disabled</span>
{<span class='model'> d:string "disabled" | d:string "" </span>}
</span>
Index: command.radio.html
===================================================================
RCS file: /sources/public/html5/markup/command.radio.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- command.radio.html 3 May 2009 15:59:40 -0000 1.4
+++ command.radio.html 15 Jun 2009 17:16:10 -0000 1.5
@@ -34,7 +34,9 @@
& (<a class="ref" href="command.radio.html#command.radio.attrs.type" title="command.radio.attrs.type">type</a>
& <a class="ref" href="command.radio.html#command.radio.attrs.radiogroup" title="command.radio.attrs.radiogroup">radiogroup</a>
& <a class="ref" href="command.radio.html#command.radio.attrs.checked" title="command.radio.attrs.checked">checked</a>?)
- & <a class="ref" href="shared-attributes.html#common-command.attrs">common-command.attrs</a></span></p></div></div>
+ & <a class="ref" href="command.radio.html#command.radio.attrs.label" title="command.radio.attrs.label">label</a>?
+ & <a class="ref" href="command.radio.html#command.radio.attrs.icon" title="command.radio.attrs.icon">icon</a>?
+ & <a class="ref" href="command.radio.html#command.radio.attrs.disabled" title="command.radio.attrs.disabled">disabled</a>?</span></p></div></div>
<div class="no-number no-toc" id="command.radio-attributes">
<h2 class="element-subhead">Element-specific attributes <a class="hash" href="#command.radio-attributes">#</a></h2>
<dl class="attr-defs">
@@ -49,6 +51,18 @@
<dt><a class="attribute-name" id="command.radio.attrs.checked" title="command.radio.attrs.checked" href="command.radio.html#command.radio.attrs.checked">checked</a><span class="attr-values"> = "checked" | "" </span> </dt>
<dd>Specifies that the command is selected.</dd>
+ <dt><a class="attribute-name" id="command.radio.attrs.label" title="command.radio.attrs.label" href="command.radio.html#command.radio.attrs.label">label</a><span class="attr-values"> = string </span> </dt>
+ <dd>The name of the command, as shown to the user.</dd>
+
+ <dt><a class="attribute-name" id="command.radio.attrs.icon" title="command.radio.attrs.icon" href="command.radio.html#command.radio.attrs.icon">icon</a><span class="attr-values"> =
+ <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
+ </span> </dt>
+ <dd>A URL for an image that represents the command.</dd>
+
+ <dt><a class="attribute-name" id="command.radio.attrs.disabled" title="command.radio.attrs.disabled" href="command.radio.html#command.radio.attrs.disabled">disabled</a><span class="attr-values"> = "disabled" | "" </span> </dt>
+ <dd>Specifies that the command is not currently
+ available.</dd>
+
</dl></div>
<div class="no-number no-toc" id="command.radio-tags">
Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- li.html 3 May 2009 15:59:42 -0000 1.4
+++ li.html 15 Jun 2009 17:16:10 -0000 1.5
@@ -49,7 +49,7 @@
<dt><a class="attribute-name" id="oli.attrs.value" title="oli.attrs.value" href="li.html#oli.attrs.value">value</a><span class="attr-values"> =
<a class="ref" href="datatypes.html#common.data.integer" title="common.data.integer">integer</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The ordinal value of the list item.</dd>
</dl></div>
Index: command.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/command.checkbox.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- command.checkbox.html 3 May 2009 15:59:40 -0000 1.4
+++ command.checkbox.html 15 Jun 2009 17:16:10 -0000 1.5
@@ -33,7 +33,9 @@
<p><a href="command.checkbox.html#command.checkbox.attrs">command.checkbox.attrs</a> = <span class="pattern" id="command.checkbox.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
& (<a class="ref" href="command.checkbox.html#command.checkbox.attrs.type" title="command.checkbox.attrs.type">type</a>
& <a class="ref" href="command.checkbox.html#command.checkbox.attrs.checked" title="command.checkbox.attrs.checked">checked</a>?)
- & <a class="ref" href="shared-attributes.html#common-command.attrs">common-command.attrs</a></span></p></div></div>
+ & <a class="ref" href="command.checkbox.html#command.checkbox.attrs.label" title="command.checkbox.attrs.label">label</a>?
+ & <a class="ref" href="command.checkbox.html#command.checkbox.attrs.icon" title="command.checkbox.attrs.icon">icon</a>?
+ & <a class="ref" href="command.checkbox.html#command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled">disabled</a>?</span></p></div></div>
<div class="no-number no-toc" id="command.checkbox-attributes">
<h2 class="element-subhead">Element-specific attributes <a class="hash" href="#command.checkbox-attributes">#</a></h2>
<dl class="attr-defs">
@@ -44,6 +46,18 @@
<dt><a class="attribute-name" id="command.checkbox.attrs.checked" title="command.checkbox.attrs.checked" href="command.checkbox.html#command.checkbox.attrs.checked">checked</a><span class="attr-values"> = "checked" | "" </span> </dt>
<dd>Specifies that the command is selected.</dd>
+ <dt><a class="attribute-name" id="command.checkbox.attrs.label" title="command.checkbox.attrs.label" href="command.checkbox.html#command.checkbox.attrs.label">label</a><span class="attr-values"> = string </span> </dt>
+ <dd>The name of the command, as shown to the user.</dd>
+
+ <dt><a class="attribute-name" id="command.checkbox.attrs.icon" title="command.checkbox.attrs.icon" href="command.checkbox.html#command.checkbox.attrs.icon">icon</a><span class="attr-values"> =
+ <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
+ </span> </dt>
+ <dd>A URL for an image that represents the command.</dd>
+
+ <dt><a class="attribute-name" id="command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled" href="command.checkbox.html#command.checkbox.attrs.disabled">disabled</a><span class="attr-values"> = "disabled" | "" </span> </dt>
+ <dd>Specifies that the command is not currently
+ available.</dd>
+
</dl></div>
<div class="no-number no-toc" id="command.checkbox-tags">
Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- schema.rnc 15 Jun 2009 13:20:24 -0000 1.89
+++ schema.rnc 15 Jun 2009 17:16:10 -0000 1.90
@@ -2195,8 +2195,16 @@
command.command.elem =
element command { empty & command.command.attrs }
command.command.attrs =
- common.attrs & command.command.attrs.type? & common-command.attrs
+ common.attrs
+ & command.command.attrs.type?
+ & command.command.attrs.label?
+ & command.command.attrs.icon?
+ & command.command.attrs.disabled?
command.command.attrs.type = attribute type { d:string "command" }
+ command.command.attrs.label = attribute label { string }
+ command.command.attrs.icon = attribute icon { common.data.uri }
+ command.command.attrs.disabled =
+ attribute disabled { d:string "disabled" | d:string "" }
command.elem =
command.command.elem | command.radio.elem | command.checkbox.elem
@@ -2207,11 +2215,17 @@
& (command.radio.attrs.type
& command.radio.attrs.radiogroup
& command.radio.attrs.checked?)
- & common-command.attrs
+ & command.radio.attrs.label?
+ & command.radio.attrs.icon?
+ & command.radio.attrs.disabled?
command.radio.attrs.type = attribute type { d:string "radio" }
command.radio.attrs.radiogroup = attribute radiogroup { string }
command.radio.attrs.checked =
attribute checked { d:string "checked" | d:string "" }
+ command.radio.attrs.label = attribute label { string }
+ command.radio.attrs.icon = attribute icon { common.data.uri }
+ command.radio.attrs.disabled =
+ attribute disabled { d:string "disabled" | d:string "" }
## State or option that can be toggled: <command type='checkbox'>
command.checkbox.elem =
@@ -2219,17 +2233,15 @@
command.checkbox.attrs =
common.attrs
& (command.checkbox.attrs.type & command.checkbox.attrs.checked?)
- & common-command.attrs
+ & command.checkbox.attrs.label?
+ & command.checkbox.attrs.icon?
+ & command.checkbox.attrs.disabled?
command.checkbox.attrs.type = attribute type { d:string "checkbox" }
command.checkbox.attrs.checked =
attribute checked { d:string "checked" | d:string "" }
- common-command.attrs =
- command.attrs.label?
- & command.attrs.icon?
- & command.attrs.disabled?
- command.attrs.label = attribute label { string }
- command.attrs.icon = attribute icon { common.data.uri }
- command.attrs.disabled =
+ command.checkbox.attrs.label = attribute label { string }
+ command.checkbox.attrs.icon = attribute icon { common.data.uri }
+ command.checkbox.attrs.disabled =
attribute disabled { d:string "disabled" | d:string "" }
## User-agent command: <bb>
Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- patch-schema 15 Jun 2009 13:20:24 -0000 1.59
+++ patch-schema 15 Jun 2009 17:16:10 -0000 1.60
@@ -1,3 +1,107 @@
+Index: schema/applications.rnc
+===================================================================
+--- schema/applications.rnc (revision 436)
++++ schema/applications.rnc (working copy)
+@@ -114,12 +114,26 @@
+ command.command.attrs =
+ ( common.attrs
+ & command.command.attrs.type?
+- & common-command.attrs
++ & command.command.attrs.label?
++ & command.command.attrs.icon?
++ & command.command.attrs.disabled?
+ )
+ command.command.attrs.type =
+ attribute type {
+ w:string "command"
+ }
++ command.command.attrs.label =
++ attribute label {
++ string
++ }
++ command.command.attrs.icon =
++ attribute icon {
++ common.data.uri
++ }
++ command.command.attrs.disabled =
++ attribute disabled {
++ w:string "disabled" | w:string ""
++ }
+ command.elem = command.command.elem
+
+ ## Selection of one item from a list of items: <command type='radio'>
+@@ -132,7 +146,9 @@
+ & command.radio.attrs.radiogroup #REVISIT taking liberties here
+ & command.radio.attrs.checked?
+ )
+- & common-command.attrs
++ & command.radio.attrs.label?
++ & command.radio.attrs.icon?
++ & command.radio.attrs.disabled?
+ )
+ command.radio.attrs.type =
+ attribute type {
+@@ -146,6 +162,18 @@
+ attribute checked {
+ w:string "checked" | w:string ""
+ }
++ command.radio.attrs.label =
++ attribute label {
++ string
++ }
++ command.radio.attrs.icon =
++ attribute icon {
++ common.data.uri
++ }
++ command.radio.attrs.disabled =
++ attribute disabled {
++ w:string "disabled" | w:string ""
++ }
+ command.elem |= command.radio.elem
+
+ ## State or option that can be toggled: <command type='checkbox'>
+@@ -157,7 +185,9 @@
+ & ( command.checkbox.attrs.type
+ & command.checkbox.attrs.checked?
+ )
+- & common-command.attrs
++ & command.checkbox.attrs.label?
++ & command.checkbox.attrs.icon?
++ & command.checkbox.attrs.disabled?
+ )
+ command.checkbox.attrs.type =
+ attribute type {
+@@ -167,25 +197,20 @@
+ attribute checked {
+ w:string "checked" | w:string ""
+ }
+- command.elem |= command.checkbox.elem
+-
+- common-command.attrs =
+- ( command.attrs.label?
+- & command.attrs.icon?
+- & command.attrs.disabled?
+- )
+- command.attrs.label =
++ command.checkbox.attrs.label =
+ attribute label {
+ string
+ }
+- command.attrs.icon =
++ command.checkbox.attrs.icon =
+ attribute icon {
+ common.data.uri
+ }
+- command.attrs.disabled =
++ command.checkbox.attrs.disabled =
+ attribute disabled {
+ w:string "disabled" | w:string ""
+ }
++ command.elem |= command.checkbox.elem
++
+ command.inner =
+ ( empty )
+
Index: schema/revision.rnc
===================================================================
--- schema/revision.rnc (revision 436)
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- spec.html 15 Jun 2009 13:20:24 -0000 1.34
+++ spec.html 15 Jun 2009 17:16:10 -0000 1.35
@@ -9,7 +9,7 @@
<body>
<div class="head">
<h1>HTML 5: The Markup Language</h1>
-<h2>Editor’s Draft <em>15 June 2009</em>
+<h2>Editor’s Draft <em>16 June 2009</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -41,7 +41,7 @@
<p>
- This document is the 15 June 2009 Editor’s Draft of
+ This document is the 16 June 2009 Editor’s Draft of
<cite>HTML 5: The Markup Language</cite>.
</p>
<p>
@@ -645,17 +645,14 @@
<li id="shared-attributes-toc">
<a href="#shared-attributes">9. Other shared attributes</a>
<ul>
-<li id="common-command-attrs-toc">
-<a href="#common-command-attrs">9.1. Command attributes</a>
-</li>
<li id="common-media-attrs-toc">
-<a href="#common-media-attrs">9.2. Media attributes</a>
+<a href="#common-media-attrs">9.1. Media attributes</a>
</li>
<li id="shared-hyperlink-attrs-toc">
-<a href="#shared-hyperlink-attrs">9.3. Hyperlink attributes</a>
+<a href="#shared-hyperlink-attrs">9.2. Hyperlink attributes</a>
</li>
<li id="common-form-attrs-toc">
-<a href="#common-form-attrs">9.4. Form attributes</a>
+<a href="#common-form-attrs">9.3. Form attributes</a>
</li>
</ul>
</li>
@@ -3203,7 +3200,8 @@
<dt>
<a class="attribute-name" id="button.submit.attrs.value" title="button.submit.attrs.value" href="#button.submit.attrs.value">value</a><span class="attr-values"> = string </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The value part of the name/value pair associated with
+ this button for the purposes of form submission.</dd>
</dl>
</div>
@@ -3291,7 +3289,8 @@
<dt>
<a class="attribute-name" id="button.reset.attrs.value" title="button.reset.attrs.value" href="#button.reset.attrs.value">value</a><span class="attr-values"> = string </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The value part of the name/value pair associated with
+ this button for the purposes of form submission.</dd>
</dl>
</div>
@@ -3379,7 +3378,8 @@
<dt>
<a class="attribute-name" id="button.button.attrs.value" title="button.button.attrs.value" href="#button.button.attrs.value">value</a><span class="attr-values"> = string </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The value part of the name/value pair associated with
+ this button for the purposes of form submission.</dd>
</dl>
</div>
@@ -3892,7 +3892,9 @@
<div class="attr-content-models">
<p><a href="#command.command.attrs">command.command.attrs</a> = <span class="pattern" id="command.command.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
& <a class="ref" href="#command.command.attrs.type" title="command.command.attrs.type">type</a>?
- & <a class="ref" href="#common-command.attrs">common-command.attrs</a></span></p>
+ & <a class="ref" href="#command.command.attrs.label" title="command.command.attrs.label">label</a>?
+ & <a class="ref" href="#command.command.attrs.icon" title="command.command.attrs.icon">icon</a>?
+ & <a class="ref" href="#command.command.attrs.disabled" title="command.command.attrs.disabled">disabled</a>?</span></p>
</div>
</div>
<div class="no-number no-toc" id="command.command-attributes">
@@ -3904,6 +3906,21 @@
<dd>Specifies that its <a href="#command" class="element">command</a> element is a
command with an associated action.</dd>
+ <dt>
+<a class="attribute-name" id="command.command.attrs.label" title="command.command.attrs.label" href="#command.command.attrs.label">label</a><span class="attr-values"> = string </span> </dt>
+ <dd>The name of the command, as shown to the user.</dd>
+
+ <dt>
+<a class="attribute-name" id="command.command.attrs.icon" title="command.command.attrs.icon" href="#command.command.attrs.icon">icon</a><span class="attr-values"> =
+ <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
+ </span> </dt>
+ <dd>A URL for an image that represents the command.</dd>
+
+ <dt>
+<a class="attribute-name" id="command.command.attrs.disabled" title="command.command.attrs.disabled" href="#command.command.attrs.disabled">disabled</a><span class="attr-values"> = "disabled" | "" </span> </dt>
+ <dd>Specifies that the command is not currently
+ available.</dd>
+
</dl>
</div>
@@ -3965,7 +3982,9 @@
& (<a class="ref" href="#command.radio.attrs.type" title="command.radio.attrs.type">type</a>
& <a class="ref" href="#command.radio.attrs.radiogroup" title="command.radio.attrs.radiogroup">radiogroup</a>
& <a class="ref" href="#command.radio.attrs.checked" title="command.radio.attrs.checked">checked</a>?)
- & <a class="ref" href="#common-command.attrs">common-command.attrs</a></span></p>
+ & <a class="ref" href="#command.radio.attrs.label" title="command.radio.attrs.label">label</a>?
+ & <a class="ref" href="#command.radio.attrs.icon" title="command.radio.attrs.icon">icon</a>?
+ & <a class="ref" href="#command.radio.attrs.disabled" title="command.radio.attrs.disabled">disabled</a>?</span></p>
</div>
</div>
<div class="no-number no-toc" id="command.radio-attributes">
@@ -3986,6 +4005,21 @@
<a class="attribute-name" id="command.radio.attrs.checked" title="command.radio.attrs.checked" href="#command.radio.attrs.checked">checked</a><span class="attr-values"> = "checked" | "" </span> </dt>
<dd>Specifies that the command is selected.</dd>
+ <dt>
+<a class="attribute-name" id="command.radio.attrs.label" title="command.radio.attrs.label" href="#command.radio.attrs.label">label</a><span class="attr-values"> = string </span> </dt>
+ <dd>The name of the command, as shown to the user.</dd>
+
+ <dt>
+<a class="attribute-name" id="command.radio.attrs.icon" title="command.radio.attrs.icon" href="#command.radio.attrs.icon">icon</a><span class="attr-values"> =
+ <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
+ </span> </dt>
+ <dd>A URL for an image that represents the command.</dd>
+
+ <dt>
+<a class="attribute-name" id="command.radio.attrs.disabled" title="command.radio.attrs.disabled" href="#command.radio.attrs.disabled">disabled</a><span class="attr-values"> = "disabled" | "" </span> </dt>
+ <dd>Specifies that the command is not currently
+ available.</dd>
+
</dl>
</div>
@@ -4046,7 +4080,9 @@
<p><a href="#command.checkbox.attrs">command.checkbox.attrs</a> = <span class="pattern" id="command.checkbox.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
& (<a class="ref" href="#command.checkbox.attrs.type" title="command.checkbox.attrs.type">type</a>
& <a class="ref" href="#command.checkbox.attrs.checked" title="command.checkbox.attrs.checked">checked</a>?)
- & <a class="ref" href="#common-command.attrs">common-command.attrs</a></span></p>
+ & <a class="ref" href="#command.checkbox.attrs.label" title="command.checkbox.attrs.label">label</a>?
+ & <a class="ref" href="#command.checkbox.attrs.icon" title="command.checkbox.attrs.icon">icon</a>?
+ & <a class="ref" href="#command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled">disabled</a>?</span></p>
</div>
</div>
<div class="no-number no-toc" id="command.checkbox-attributes">
@@ -4062,6 +4098,21 @@
<a class="attribute-name" id="command.checkbox.attrs.checked" title="command.checkbox.attrs.checked" href="#command.checkbox.attrs.checked">checked</a><span class="attr-values"> = "checked" | "" </span> </dt>
<dd>Specifies that the command is selected.</dd>
+ <dt>
+<a class="attribute-name" id="command.checkbox.attrs.label" title="command.checkbox.attrs.label" href="#command.checkbox.attrs.label">label</a><span class="attr-values"> = string </span> </dt>
+ <dd>The name of the command, as shown to the user.</dd>
+
+ <dt>
+<a class="attribute-name" id="command.checkbox.attrs.icon" title="command.checkbox.attrs.icon" href="#command.checkbox.attrs.icon">icon</a><span class="attr-values"> =
+ <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
+ </span> </dt>
+ <dd>A URL for an image that represents the command.</dd>
+
+ <dt>
+<a class="attribute-name" id="command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled" href="#command.checkbox.attrs.disabled">disabled</a><span class="attr-values"> = "disabled" | "" </span> </dt>
+ <dd>Specifies that the command is not currently
+ available.</dd>
+
</dl>
</div>
@@ -9339,7 +9390,7 @@
<a class="attribute-name" id="oli.attrs.value" title="oli.attrs.value" href="#oli.attrs.value">value</a><span class="attr-values"> =
<a class="ref" href="#common.data.integer" title="common.data.integer">integer</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The ordinal value of the list item.</dd>
</dl>
</div>
@@ -14007,35 +14058,8 @@
<div id="shared-attributes" class="section">
<h2>9. Other shared attributes <a class="hash" href="#shared-attributes">#</a> <a class="toc-bak" href="#shared-attributes-toc">T</a>
</h2>
-<div id="common-command-attrs" class="section">
- <h2>9.1. Command attributes <a class="hash" href="#common-command-attrs">#</a> <a class="toc-bak" href="#common-command-attrs-toc">T</a>
-</h2>
- <div class="content-model">
-<span class="common-pattern-name"><dfn id="common-command.attrs">common-command.attrs</dfn></span> = <a class="ref" href="#command.attrs.label" title="command.attrs.label">label</a>?
- & <a class="ref" href="#command.attrs.icon" title="command.attrs.icon">icon</a>?
- & <a class="ref" href="#command.attrs.disabled" title="command.attrs.disabled">disabled</a>? <a class="hash" href="#common-command.attrs">#</a>
- </div>
- <div class="no-number no-toc">
- <dl class="attr-defs">
-<dt>
-<a class="attribute-name" id="command.attrs.label" title="command.attrs.label" href="#command.attrs.label">label</a><span class="attr-values"> = string </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
-
- <dt>
-<a class="attribute-name" id="command.attrs.icon" title="command.attrs.icon" href="#command.attrs.icon">icon</a><span class="attr-values"> =
- <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
- </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
-
- <dt>
-<a class="attribute-name" id="command.attrs.disabled" title="command.attrs.disabled" href="#command.attrs.disabled">disabled</a><span class="attr-values"> = "disabled" | "" </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
-
- </dl>
-</div>
- </div>
- <div id="common-media-attrs" class="section">
- <h2>9.2. Media attributes <a class="hash" href="#common-media-attrs">#</a> <a class="toc-bak" href="#common-media-attrs-toc">T</a>
+<div id="common-media-attrs" class="section">
+ <h2>9.1. Media attributes <a class="hash" href="#common-media-attrs">#</a> <a class="toc-bak" href="#common-media-attrs-toc">T</a>
</h2>
<div class="content-model">
<span class="common-pattern-name"><dfn id="media.attrs">media.attrs</dfn></span> = <a class="ref" href="#media.attrs.autoplay" title="media.attrs.autoplay">autoplay</a>?
@@ -14073,7 +14097,7 @@
</div>
</div>
<div id="shared-hyperlink-attrs" class="section">
- <h2>9.3. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="#shared-hyperlink-attrs-toc">T</a>
+ <h2>9.2. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="#shared-hyperlink-attrs-toc">T</a>
</h2>
<dl class="attr-defs">
<dt>
@@ -14132,7 +14156,7 @@
</dl>
</div>
<div id="common-form-attrs" class="section">
- <h2>9.4. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="#common-form-attrs-toc">T</a>
+ <h2>9.3. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="#common-form-attrs-toc">T</a>
</h2>
<div class="content-model">
<span class="common-pattern-name"><dfn id="common-form.attrs">common-form.attrs</dfn></span> = (<a class="ref" href="#common-form.attrs.name" title="common-form.attrs.name">name</a>?
Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- button.button.html 30 May 2009 11:38:55 -0000 1.5
+++ button.button.html 15 Jun 2009 17:16:10 -0000 1.6
@@ -44,7 +44,8 @@
additional semantics.</dd>
<dt><a class="attribute-name" id="button.button.attrs.value" title="button.button.attrs.value" href="button.button.html#button.button.attrs.value">value</a><span class="attr-values"> = string </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The value part of the name/value pair associated with
+ this button for the purposes of form submission.</dd>
</dl></div>
Index: button.reset.html
===================================================================
RCS file: /sources/public/html5/markup/button.reset.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- button.reset.html 30 May 2009 11:38:55 -0000 1.5
+++ button.reset.html 15 Jun 2009 17:16:10 -0000 1.6
@@ -44,7 +44,8 @@
resetting a form.</dd>
<dt><a class="attribute-name" id="button.reset.attrs.value" title="button.reset.attrs.value" href="button.reset.html#button.reset.attrs.value">value</a><span class="attr-values"> = string </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The value part of the name/value pair associated with
+ this button for the purposes of form submission.</dd>
</dl></div>
Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/button.submit.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- button.submit.html 30 May 2009 11:38:55 -0000 1.5
+++ button.submit.html 15 Jun 2009 17:16:10 -0000 1.6
@@ -49,7 +49,8 @@
submitting a form.</dd>
<dt><a class="attribute-name" id="button.submit.attrs.value" title="button.submit.attrs.value" href="button.submit.html#button.submit.attrs.value">value</a><span class="attr-values"> = string </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The value part of the name/value pair associated with
+ this button for the purposes of form submission.</dd>
</dl></div>
Index: shared-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/shared-attributes.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- shared-attributes.html 30 May 2009 11:38:55 -0000 1.4
+++ shared-attributes.html 15 Jun 2009 17:16:10 -0000 1.5
@@ -12,30 +12,8 @@
<span class="nav-next"><a href="datatypes.html">datatypes »</a></span>
</div>
<div id="shared-attributes" class="section">
- <h2>9. Other shared attributes <a class="hash" href="#shared-attributes">#</a> <a class="toc-bak" href="Overview.html#shared-attributes-toc">T</a></h2><div id="common-command-attrs" class="section">
- <h2>9.1. Command attributes <a class="hash" href="#common-command-attrs">#</a> <a class="toc-bak" href="Overview.html#common-command-attrs-toc">T</a></h2>
- <div class="content-model"><span class="common-pattern-name"><dfn id="common-command.attrs">common-command.attrs</dfn></span> = <a class="ref" href="shared-attributes.html#command.attrs.label" title="command.attrs.label">label</a>?
- & <a class="ref" href="shared-attributes.html#command.attrs.icon" title="command.attrs.icon">icon</a>?
- & <a class="ref" href="shared-attributes.html#command.attrs.disabled" title="command.attrs.disabled">disabled</a>? <a class="hash" href="shared-attributes.html#common-command.attrs">#</a>
- </div>
- <div class="no-number no-toc">
- <dl class="attr-defs">
- <dt><a class="attribute-name" id="command.attrs.label" title="command.attrs.label" href="shared-attributes.html#command.attrs.label">label</a><span class="attr-values"> = string </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
-
- <dt><a class="attribute-name" id="command.attrs.icon" title="command.attrs.icon" href="shared-attributes.html#command.attrs.icon">icon</a><span class="attr-values"> =
- <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
- </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
-
- <dt><a class="attribute-name" id="command.attrs.disabled" title="command.attrs.disabled" href="shared-attributes.html#command.attrs.disabled">disabled</a><span class="attr-values"> = "disabled" | "" </span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
-
- </dl>
- </div>
- </div>
- <div id="common-media-attrs" class="section">
- <h2>9.2. Media attributes <a class="hash" href="#common-media-attrs">#</a> <a class="toc-bak" href="Overview.html#common-media-attrs-toc">T</a></h2>
+ <h2>9. Other shared attributes <a class="hash" href="#shared-attributes">#</a> <a class="toc-bak" href="Overview.html#shared-attributes-toc">T</a></h2><div id="common-media-attrs" class="section">
+ <h2>9.1. Media attributes <a class="hash" href="#common-media-attrs">#</a> <a class="toc-bak" href="Overview.html#common-media-attrs-toc">T</a></h2>
<div class="content-model"><span class="common-pattern-name"><dfn id="media.attrs">media.attrs</dfn></span> = <a class="ref" href="shared-attributes.html#media.attrs.autoplay" title="media.attrs.autoplay">autoplay</a>?
& <a class="ref" href="shared-attributes.html#media.attrs.autobuffer" title="media.attrs.autobuffer">autobuffer</a>?
& <a class="ref" href="shared-attributes.html#media.attrs.controls" title="media.attrs.controls">controls</a>?
@@ -66,7 +44,7 @@
</div>
</div>
<div id="shared-hyperlink-attrs" class="section">
- <h2>9.3. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="Overview.html#shared-hyperlink-attrs-toc">T</a></h2>
+ <h2>9.2. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="Overview.html#shared-hyperlink-attrs-toc">T</a></h2>
<dl class="attr-defs"><dt><dfn class="attribute-name" id="shared-hyperlink.attrs.href" title="shared-hyperlink.attrs.href">href</dfn><span class="attr-values"> =
<a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
</span><a class="hash" href="shared-attributes.html#shared-hyperlink.attrs.href">#</a></dt><dd><dd>A URL that provides the <dfn id="destination">destination resource</dfn> of the
@@ -96,7 +74,7 @@
</dl>
</div>
<div id="common-form-attrs" class="section">
- <h2>9.4. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="Overview.html#common-form-attrs-toc">T</a></h2>
+ <h2>9.3. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="Overview.html#common-form-attrs-toc">T</a></h2>
<div class="content-model"><span class="common-pattern-name"><dfn id="common-form.attrs">common-form.attrs</dfn></span> = (<a class="ref" href="shared-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
& <a class="ref" href="shared-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?)
& <a class="ref" href="shared-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>? <a class="hash" href="shared-attributes.html#common-form.attrs">#</a>
Received on Monday, 15 June 2009 17:17:07 UTC