- From: poot <cvsmail@w3.org>
- Date: Fri, 5 Feb 2010 17:17:54 +0900 (JST)
- To: public-html-diffs@w3.org
mike: checkpointing http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.152&r2=1.153&f=h =================================================================== RCS file: /sources/public/html5/markup/input.email.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.email.html 5 Feb 2010 06:18:59 -0000 1.34 +++ input.email.html 5 Feb 2010 08:17:23 -0000 1.35 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.email-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.email-content-model">#</a></h2><div class="content-models"> - <div id="input.email-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.email.html#input.email.attrs">input.email.attrs</a> - </p> + <div id="input.email-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.email-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.email-attr-mdl">#</a></h2> Index: input.month.html =================================================================== RCS file: /sources/public/html5/markup/input.month.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- input.month.html 5 Feb 2010 06:18:59 -0000 1.35 +++ input.month.html 5 Feb 2010 08:17:23 -0000 1.36 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.month-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.month-content-model">#</a></h2><div class="content-models"> - <div id="input.month-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.month.html#input.month.attrs">input.month.attrs</a> - </p> + <div id="input.month-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.month-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.month-attr-mdl">#</a></h2> Index: input.range.html =================================================================== RCS file: /sources/public/html5/markup/input.range.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- input.range.html 5 Feb 2010 06:19:00 -0000 1.35 +++ input.range.html 5 Feb 2010 08:17:23 -0000 1.36 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.range-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.range-content-model">#</a></h2><div class="content-models"> - <div id="input.range-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.range.html#input.range.attrs">input.range.attrs</a> - </p> + <div id="input.range-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.range-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.range-attr-mdl">#</a></h2> Index: audio.html =================================================================== RCS file: /sources/public/html5/markup/audio.html,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- audio.html 5 Feb 2010 06:18:58 -0000 1.42 +++ audio.html 5 Feb 2010 08:17:23 -0000 1.43 @@ -23,14 +23,14 @@ <div id="audio-mdls"> <p class="elem-mdl"> - <span class="agroupof"><span>one </span><a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a><span> element</span>, + <span class="agroupof"><span>a </span><a class="ref attribute" href="audio.html#audio.attrs.src">src</a><span> attribute</span>, <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="source.html#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> <a href="terminology.html#flow-content">flow content</a> </p><div class="postfix or">or</div> <p class="elem-mdl"> - <span class="agroupof"><span>one </span><a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a><span> element</span>, + <span class="agroupof"><span>a </span><a class="ref attribute" href="audio.html#audio.attrs.src">src</a><span> attribute</span>, <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="source.html#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> <a href="terminology.html#phrasing-content">phrasing content</a> @@ -43,7 +43,7 @@ <span class="postfix intermixed">&</span> <a class="ref" href="audio.html#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a> <span class="postfix intermixed">&</span> <a class="ref" href="audio.html#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a> <span class="postfix intermixed">&</span> <a class="ref" href="audio.html#audio.attrs.controls" title="audio.attrs.controls">controls</a> - <span class="postfix intermixed">&</span> <a class="ref" href="audio.html#audio.attrs.loop" title="audio.attrs.loop">loop</a> </span></p></div></div> + <span class="postfix intermixed">&</span> <a class="ref" href="audio.html#audio.attrs.loop" title="audio.attrs.loop">loop</a> </span><span class="postfix intermixed">&</span> <a href="audio.html#audio.attrs.src">src</a></p></div></div> <div class="no-number no-toc" id="audio-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#audio-attributes">#</a></h2> <dl class="attr-defs"> Index: input.button.html =================================================================== RCS file: /sources/public/html5/markup/input.button.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- input.button.html 5 Feb 2010 06:18:59 -0000 1.33 +++ input.button.html 5 Feb 2010 08:17:23 -0000 1.34 @@ -22,10 +22,7 @@ <div class="no-number no-toc" id="input.button-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.button-content-model">#</a></h2><div class="content-models"> - <div id="input.button-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.button.html#input.button.attrs">input.button.attrs</a> - </p> + <div id="input.button-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.button-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.button-attr-mdl">#</a></h2> Index: syntax.html =================================================================== RCS file: /sources/public/html5/markup/syntax.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- syntax.html 29 Jan 2010 00:09:11 -0000 1.31 +++ syntax.html 5 Feb 2010 08:17:24 -0000 1.32 @@ -294,6 +294,7 @@ <code><a href="hr.html#hr">hr</a></code>, <code><a href="img.html#img">img</a></code>, <code><a href="input.html#input">input</a></code>, + <code><a href="keygen.html#keygen">keygen</a></code>, <code><a href="link.html#link">link</a></code>, <code><a href="meta.html#meta">meta</a></code>, <code><a href="param.html#param">param</a></code>, Index: input.text.html =================================================================== RCS file: /sources/public/html5/markup/input.text.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.text.html 5 Feb 2010 06:19:00 -0000 1.34 +++ input.text.html 5 Feb 2010 08:17:24 -0000 1.35 @@ -22,10 +22,7 @@ <div class="no-number no-toc" id="input.text-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.text-content-model">#</a></h2><div class="content-models"> - <div id="input.text-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.text.html#input.text.attrs">input.text.attrs</a> - </p> + <div id="input.text-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.text-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.text-attr-mdl">#</a></h2> Index: input.checkbox.html =================================================================== RCS file: /sources/public/html5/markup/input.checkbox.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- input.checkbox.html 5 Feb 2010 06:18:59 -0000 1.33 +++ input.checkbox.html 5 Feb 2010 08:17:23 -0000 1.34 @@ -22,10 +22,7 @@ <div class="no-number no-toc" id="input.checkbox-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.checkbox-content-model">#</a></h2><div class="content-models"> - <div id="input.checkbox-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.checkbox.html#input.checkbox.attrs">input.checkbox.attrs</a> - </p> + <div id="input.checkbox-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.checkbox-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.checkbox-attr-mdl">#</a></h2> Index: input.tel.html =================================================================== RCS file: /sources/public/html5/markup/input.tel.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.tel.html 5 Feb 2010 06:19:00 -0000 1.34 +++ input.tel.html 5 Feb 2010 08:17:24 -0000 1.35 @@ -22,10 +22,7 @@ <div class="no-number no-toc" id="input.tel-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.tel-content-model">#</a></h2><div class="content-models"> - <div id="input.tel-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.tel.html#input.tel.attrs">input.tel.attrs</a> - </p> + <div id="input.tel-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.tel-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.tel-attr-mdl">#</a></h2> Index: input.number.html =================================================================== RCS file: /sources/public/html5/markup/input.number.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- input.number.html 5 Feb 2010 06:18:59 -0000 1.35 +++ input.number.html 5 Feb 2010 08:17:23 -0000 1.36 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.number-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.number-content-model">#</a></h2><div class="content-models"> - <div id="input.number-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.number.html#input.number.attrs">input.number.attrs</a> - </p> + <div id="input.number-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.number-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.number-attr-mdl">#</a></h2> Index: input.datetime.html =================================================================== RCS file: /sources/public/html5/markup/input.datetime.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.datetime.html 5 Feb 2010 06:18:59 -0000 1.34 +++ input.datetime.html 5 Feb 2010 08:17:23 -0000 1.35 @@ -24,10 +24,7 @@ <div class="no-number no-toc" id="input.datetime-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.datetime-content-model">#</a></h2><div class="content-models"> - <div id="input.datetime-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.datetime.html#input.datetime.attrs">input.datetime.attrs</a> - </p> + <div id="input.datetime-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.datetime-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.datetime-attr-mdl">#</a></h2> Index: input.password.html =================================================================== RCS file: /sources/public/html5/markup/input.password.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.password.html 5 Feb 2010 06:18:59 -0000 1.34 +++ input.password.html 5 Feb 2010 08:17:23 -0000 1.35 @@ -22,10 +22,7 @@ <div class="no-number no-toc" id="input.password-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.password-content-model">#</a></h2><div class="content-models"> - <div id="input.password-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.password.html#input.password.attrs">input.password.attrs</a> - </p> + <div id="input.password-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.password-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.password-attr-mdl">#</a></h2> Index: input.time.html =================================================================== RCS file: /sources/public/html5/markup/input.time.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- input.time.html 5 Feb 2010 06:19:00 -0000 1.35 +++ input.time.html 5 Feb 2010 08:17:24 -0000 1.36 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.time-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.time-content-model">#</a></h2><div class="content-models"> - <div id="input.time-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.time.html#input.time.attrs">input.time.attrs</a> - </p> + <div id="input.time-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.time-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.time-attr-mdl">#</a></h2> Index: input.color.html =================================================================== RCS file: /sources/public/html5/markup/input.color.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- input.color.html 5 Feb 2010 06:18:59 -0000 1.35 +++ input.color.html 5 Feb 2010 08:17:23 -0000 1.36 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.color-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.color-content-model">#</a></h2><div class="content-models"> - <div id="input.color-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.color.html#input.color.attrs">input.color.attrs</a> - </p> + <div id="input.color-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.color-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.color-attr-mdl">#</a></h2> Index: input.image.html =================================================================== RCS file: /sources/public/html5/markup/input.image.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.image.html 5 Feb 2010 06:18:59 -0000 1.34 +++ input.image.html 5 Feb 2010 08:17:23 -0000 1.35 @@ -25,10 +25,7 @@ <div class="no-number no-toc" id="input.image-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.image-content-model">#</a></h2><div class="content-models"> - <div id="input.image-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.image.html#input.image.attrs">input.image.attrs</a> - </p> + <div id="input.image-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.image-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.image-attr-mdl">#</a></h2> Index: input.file.html =================================================================== RCS file: /sources/public/html5/markup/input.file.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- input.file.html 5 Feb 2010 06:18:59 -0000 1.32 +++ input.file.html 5 Feb 2010 08:17:23 -0000 1.33 @@ -24,10 +24,7 @@ <div class="no-number no-toc" id="input.file-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.file-content-model">#</a></h2><div class="content-models"> - <div id="input.file-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.file.html#input.file.attrs">input.file.attrs</a> - </p> + <div id="input.file-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.file-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.file-attr-mdl">#</a></h2> Index: input.radio.html =================================================================== RCS file: /sources/public/html5/markup/input.radio.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.radio.html 5 Feb 2010 06:18:59 -0000 1.34 +++ input.radio.html 5 Feb 2010 08:17:23 -0000 1.35 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.radio-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.radio-content-model">#</a></h2><div class="content-models"> - <div id="input.radio-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.radio.html#input.radio.attrs">input.radio.attrs</a> - </p> + <div id="input.radio-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.radio-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.radio-attr-mdl">#</a></h2> Index: input.reset.html =================================================================== RCS file: /sources/public/html5/markup/input.reset.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.reset.html 5 Feb 2010 06:19:00 -0000 1.34 +++ input.reset.html 5 Feb 2010 08:17:23 -0000 1.35 @@ -22,10 +22,7 @@ <div class="no-number no-toc" id="input.reset-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.reset-content-model">#</a></h2><div class="content-models"> - <div id="input.reset-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.reset.html#input.reset.attrs">input.reset.attrs</a> - </p> + <div id="input.reset-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.reset-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.reset-attr-mdl">#</a></h2> Index: input.datetime-local.html =================================================================== RCS file: /sources/public/html5/markup/input.datetime-local.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.datetime-local.html 5 Feb 2010 06:18:59 -0000 1.34 +++ input.datetime-local.html 5 Feb 2010 08:17:23 -0000 1.35 @@ -24,10 +24,7 @@ <div class="no-number no-toc" id="input.datetime-local-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.datetime-local-content-model">#</a></h2><div class="content-models"> - <div id="input.datetime-local-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs">input.datetime-local.attrs</a> - </p> + <div id="input.datetime-local-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.datetime-local-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.datetime-local-attr-mdl">#</a></h2> Index: input.hidden.html =================================================================== RCS file: /sources/public/html5/markup/input.hidden.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.hidden.html 5 Feb 2010 06:18:59 -0000 1.34 +++ input.hidden.html 5 Feb 2010 08:17:23 -0000 1.35 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.hidden-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.hidden-content-model">#</a></h2><div class="content-models"> - <div id="input.hidden-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.hidden.html#input.hidden.attrs">input.hidden.attrs</a> - </p> + <div id="input.hidden-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.hidden-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.hidden-attr-mdl">#</a></h2> Index: style.css =================================================================== RCS file: /sources/public/html5/markup/style.css,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- style.css 5 Feb 2010 06:19:01 -0000 1.93 +++ style.css 5 Feb 2010 08:17:24 -0000 1.94 @@ -42,12 +42,19 @@ padding-left: 1em; } +#form .attr-content-models, +#input\.email .attr-content-models, #object .attr-content-models, #textarea .attr-content-models { line-height: 200%; } +#area .attr-content-models +{ + line-height: 300%; +} + .attr-content-models, .attr-defs { margin-top: 4px; @@ -658,12 +665,31 @@ #command .elem-mdl::first-letter, #button .elem-mdl::first-letter, +#base .permitted-parents::first-letter, +#body .permitted-parents::first-letter, +#caption .permitted-parents::first-letter, +#col .permitted-parents::first-letter, +#dd .permitted-parents::first-letter, +#dt .permitted-parents::first-letter, +#colgroup .permitted-parents::first-letter, +#figcaption .permitted-parents::first-letter, +#head .permitted-parents::first-letter, +#legend .permitted-parents::first-letter, +#li .permitted-parents::first-letter, +#optgroup .permitted-parents::first-letter, +#option .permitted-parents::first-letter, +#param .permitted-parents::first-letter, +#rp .permitted-parents::first-letter, +#rt .permitted-parents::first-letter, +#source .permitted-parents::first-letter, +#summary .permitted-parents::first-letter, #tbody .permitted-parents::first-letter, #td .permitted-parents::first-letter, #tfoot .permitted-parents::first-letter, #thead .permitted-parents::first-letter, #th .permitted-parents::first-letter, -#tr .permitted-parents::first-letter +#tr .permitted-parents::first-letter, +#title .permitted-parents::first-letter { text-transform: none; } @@ -683,28 +709,52 @@ } #input .elem-mdl > *:last-child:after, +#input .elem-mdl > *:last-child:after, #table .elem-mdl > *:last-child:after, #dl .elem-mdl > *:last-child:after, #figure .elem-mdl > *:last-child:after, #hgroup .elem-mdl > *:last-child:after, #ruby .elem-mdl > *:last-child:after, +#tr .elem-mdl > *:last-child:after, #noscript .elem-mdl > *:last-child:after, +#base .permitted-parents > *:last-child:after, +#body .permitted-parents > *:last-child:after, +#caption .permitted-parents > *:last-child:after, +#col .permitted-parents > *:last-child:after, +#colgroup .permitted-parents > *:last-child:after, +#dd .permitted-parents > *:last-child:after, +#dt .permitted-parents > *:last-child:after, +#figcaption .permitted-parents > *:last-child:after, +#head .permitted-parents > *:last-child:after, +#legend .permitted-parents > *:last-child:after, +#li .permitted-parents > *:last-child:after, +#optgroup .permitted-parents > *:last-child:after, +#option .permitted-parents > *:last-child:after, +#param .permitted-parents > *:last-child:after, +#rp .permitted-parents > *:last-child:after, +#rt .permitted-parents > *:last-child:after, +#source .permitted-parents > *:last-child:after, +#summary .permitted-parents > *:last-child:after, #tbody .permitted-parents > *:last-child:after, #td .permitted-parents > *:last-child:after, #tfoot .permitted-parents > *:last-child:after, #th .permitted-parents > *:last-child:after, #thead .permitted-parents > *:last-child:after, -#tr .permitted-parents > *:last-child:after +#tr .permitted-parents > *:last-child:after, +#title .permitted-parents > *:last-child:after { content: ""; } #area-attr-mdl, +#audio-content-model, #dl-content-model, #figure-content-model, #table-content-model, #hgroup-content-model, +#tr-content-model, #ruby-content-model, +#video-content-model, #noscript-content-model { line-height: 200%; @@ -748,7 +798,8 @@ { margin-right: 10%; } -#table-mdls > .elem-mdl > .agroupof { +#table-mdls > .elem-mdl > .agroupof +{ background-color: inherit; display: block; padding: 2px; @@ -762,3 +813,18 @@ box-shadow: none; } +#label .agroupof { + background-color: inherit; + padding: 0px; + border: none; + -webkit-border-radius: none; + -webkit-box-shadow: none; + -moz-border-radius: none; + -moz-box-shadow: none; + border-radius: none; + box-shadow: none; +} + +#label .agroupof + * { + padding-left: 0px; +} Index: input.search.html =================================================================== RCS file: /sources/public/html5/markup/input.search.html,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- input.search.html 5 Feb 2010 06:19:00 -0000 1.37 +++ input.search.html 5 Feb 2010 08:17:23 -0000 1.38 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.search-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.search-content-model">#</a></h2><div class="content-models"> - <div id="input.search-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.search.html#input.search.attrs">input.search.attrs</a> - </p> + <div id="input.search-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.search-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.search-attr-mdl">#</a></h2> Index: spec.html =================================================================== RCS file: /sources/public/html5/markup/spec.html,v retrieving revision 1.152 retrieving revision 1.153 diff -u -d -r1.152 -r1.153 --- spec.html 5 Feb 2010 06:19:01 -0000 1.152 +++ spec.html 5 Feb 2010 08:17:24 -0000 1.153 @@ -1311,6 +1311,7 @@ <code><a href="#hr">hr</a></code>, <code><a href="#img">img</a></code>, <code><a href="#input">input</a></code>, + <code><a href="#keygen">keygen</a></code>, <code><a href="#link">link</a></code>, <code><a href="#meta">meta</a></code>, <code><a href="#param">param</a></code>, @@ -3189,7 +3190,7 @@ <div id="audio-mdls"> <p class="elem-mdl"> - <span class="agroupof"><span>one </span><a class="ref" href="#audio.attrs.src">audio.attrs.src</a><span> element</span>, + <span class="agroupof"><span>a </span><a class="ref attribute" href="#audio.attrs.src">src</a><span> attribute</span>, <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> <a href="#flow-content">flow content</a> <a class="ref" href="#audio.attrs">audio.attrs</a> @@ -3197,7 +3198,7 @@ <div class="postfix or">or</div> <p class="elem-mdl"> - <span class="agroupof"><span>one </span><a class="ref" href="#audio.attrs.src">audio.attrs.src</a><span> element</span>, + <span class="agroupof"><span>a </span><a class="ref attribute" href="#audio.attrs.src">src</a><span> attribute</span>, <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> <a href="#phrasing-content">phrasing content</a> <a class="ref" href="#audio.attrs">audio.attrs</a> @@ -3213,7 +3214,7 @@ <span class="postfix intermixed">&</span> <a class="ref" href="#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a> <span class="postfix intermixed">&</span> <a class="ref" href="#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a> <span class="postfix intermixed">&</span> <a class="ref" href="#audio.attrs.controls" title="audio.attrs.controls">controls</a> - <span class="postfix intermixed">&</span> <a class="ref" href="#audio.attrs.loop" title="audio.attrs.loop">loop</a> </span></p> + <span class="postfix intermixed">&</span> <a class="ref" href="#audio.attrs.loop" title="audio.attrs.loop">loop</a> </span><span class="postfix intermixed">&</span> <a href="#audio.attrs.src">src</a></p> </div> </div> <div class="no-number no-toc" id="audio-attributes"> @@ -7288,9 +7289,7 @@ <div class="content-models"> <div id="input.text-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.text.attrs">input.text.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -7394,9 +7393,7 @@ <div class="content-models"> <div id="input.password-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.password.attrs">input.password.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -7500,9 +7497,7 @@ <div class="content-models"> <div id="input.checkbox-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.checkbox.attrs">input.checkbox.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -7601,9 +7596,7 @@ <div class="content-models"> <div id="input.radio-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.radio.attrs">input.radio.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -7701,9 +7694,7 @@ <div class="content-models"> <div id="input.button-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.button.attrs">input.button.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -7799,9 +7790,7 @@ <div class="content-models"> <div id="input.submit-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.submit.attrs">input.submit.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -7902,9 +7891,7 @@ <div class="content-models"> <div id="input.reset-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.reset.attrs">input.reset.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -8002,9 +7989,7 @@ <div class="content-models"> <div id="input.file-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.file.attrs">input.file.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -8106,9 +8091,7 @@ <div class="content-models"> <div id="input.hidden-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.hidden.attrs">input.hidden.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -8207,9 +8190,7 @@ <div class="content-models"> <div id="input.image-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.image.attrs">input.image.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -8339,9 +8320,7 @@ <div class="content-models"> <div id="input.datetime-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.datetime.attrs">input.datetime.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -8463,9 +8442,7 @@ <div class="content-models"> <div id="input.datetime-local-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.datetime-local.attrs">input.datetime-local.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -8586,9 +8563,7 @@ <div class="content-models"> <div id="input.date-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.date.attrs">input.date.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -8709,9 +8684,7 @@ <div class="content-models"> <div id="input.month-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.month.attrs">input.month.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -8832,9 +8805,7 @@ <div class="content-models"> <div id="input.time-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.time.attrs">input.time.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -8956,9 +8927,7 @@ <div class="content-models"> <div id="input.week-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.week.attrs">input.week.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -9079,9 +9048,7 @@ <div class="content-models"> <div id="input.number-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.number.attrs">input.number.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -9202,9 +9169,7 @@ <div class="content-models"> <div id="input.range-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.range.attrs">input.range.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -9323,9 +9288,7 @@ <div class="content-models"> <div id="input.email-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.email.attrs">input.email.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -9441,9 +9404,7 @@ <div class="content-models"> <div id="input.url-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.url.attrs">input.url.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -9552,9 +9513,7 @@ <div class="content-models"> <div id="input.search-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.search.attrs">input.search.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -9659,9 +9618,7 @@ <div class="content-models"> <div id="input.tel-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.tel.attrs">input.tel.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -9767,9 +9724,7 @@ <div class="content-models"> <div id="input.color-mdls"> - <p class="elem-mdl"> - <a class="ref" href="#input.color.attrs">input.color.attrs</a> - </p> +<p class="elem-mdl"><span>empty (<a href="#void-element">void element</a>)</span></p> </div> </div> </div> @@ -14837,7 +14792,7 @@ <div id="video-mdls"> <p class="elem-mdl"> - <span class="agroupof"><span>one </span><a class="ref" href="#video.attrs.src">video.attrs.src</a><span> element</span>, + <span class="agroupof"><span>a </span><a class="ref attribute" href="#video.attrs.src">src</a><span> attribute</span>, <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> <a href="#flow-content">flow content</a> <a class="ref" href="#video.attrs">video.attrs</a> @@ -14845,7 +14800,7 @@ <div class="postfix or">or</div> <p class="elem-mdl"> - <span class="agroupof"><span>one </span><a class="ref" href="#video.attrs.src">video.attrs.src</a><span> element</span>, + <span class="agroupof"><span>a </span><a class="ref attribute" href="#video.attrs.src">src</a><span> attribute</span>, <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> <a href="#phrasing-content">phrasing content</a> <a class="ref" href="#video.attrs">video.attrs</a> @@ -14864,7 +14819,7 @@ <span class="postfix intermixed">&</span> <a class="ref" href="#video.attrs.loop" title="video.attrs.loop">loop</a> <span class="postfix intermixed">&</span> <a class="ref" href="#video.attrs.poster" title="video.attrs.poster">poster</a> <span class="postfix intermixed">&</span> <a class="ref" href="#video.attrs.height" title="video.attrs.height">height</a> - <span class="postfix intermixed">&</span> <a class="ref" href="#video.attrs.width" title="video.attrs.width">width</a> </span></p> + <span class="postfix intermixed">&</span> <a class="ref" href="#video.attrs.width" title="video.attrs.width">width</a> </span><span class="postfix intermixed">&</span> <a href="#video.attrs.src">src</a></p> </div> </div> <div class="no-number no-toc" id="video-attributes"> Index: input.week.html =================================================================== RCS file: /sources/public/html5/markup/input.week.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- input.week.html 5 Feb 2010 06:19:00 -0000 1.35 +++ input.week.html 5 Feb 2010 08:17:24 -0000 1.36 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.week-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.week-content-model">#</a></h2><div class="content-models"> - <div id="input.week-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.week.html#input.week.attrs">input.week.attrs</a> - </p> + <div id="input.week-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.week-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.week-attr-mdl">#</a></h2> Index: video.html =================================================================== RCS file: /sources/public/html5/markup/video.html,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- video.html 5 Feb 2010 06:19:02 -0000 1.39 +++ video.html 5 Feb 2010 08:17:24 -0000 1.40 @@ -23,14 +23,14 @@ <div id="video-mdls"> <p class="elem-mdl"> - <span class="agroupof"><span>one </span><a class="ref" href="video.html#video.attrs.src">video.attrs.src</a><span> element</span>, + <span class="agroupof"><span>a </span><a class="ref attribute" href="video.html#video.attrs.src">src</a><span> attribute</span>, <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="source.html#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> <a href="terminology.html#flow-content">flow content</a> </p><div class="postfix or">or</div> <p class="elem-mdl"> - <span class="agroupof"><span>one </span><a class="ref" href="video.html#video.attrs.src">video.attrs.src</a><span> element</span>, + <span class="agroupof"><span>a </span><a class="ref attribute" href="video.html#video.attrs.src">src</a><span> attribute</span>, <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="source.html#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> <a href="terminology.html#phrasing-content">phrasing content</a> @@ -46,7 +46,7 @@ <span class="postfix intermixed">&</span> <a class="ref" href="video.html#video.attrs.loop" title="video.attrs.loop">loop</a> <span class="postfix intermixed">&</span> <a class="ref" href="video.html#video.attrs.poster" title="video.attrs.poster">poster</a> <span class="postfix intermixed">&</span> <a class="ref" href="video.html#video.attrs.height" title="video.attrs.height">height</a> - <span class="postfix intermixed">&</span> <a class="ref" href="video.html#video.attrs.width" title="video.attrs.width">width</a> </span></p></div></div> + <span class="postfix intermixed">&</span> <a class="ref" href="video.html#video.attrs.width" title="video.attrs.width">width</a> </span><span class="postfix intermixed">&</span> <a href="video.html#video.attrs.src">src</a></p></div></div> <div class="no-number no-toc" id="video-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#video-attributes">#</a></h2> <dl class="attr-defs"> Index: input.submit.html =================================================================== RCS file: /sources/public/html5/markup/input.submit.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.submit.html 5 Feb 2010 06:19:00 -0000 1.34 +++ input.submit.html 5 Feb 2010 08:17:24 -0000 1.35 @@ -22,10 +22,7 @@ <div class="no-number no-toc" id="input.submit-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.submit-content-model">#</a></h2><div class="content-models"> - <div id="input.submit-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.submit.html#input.submit.attrs">input.submit.attrs</a> - </p> + <div id="input.submit-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.submit-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.submit-attr-mdl">#</a></h2> Index: input.date.html =================================================================== RCS file: /sources/public/html5/markup/input.date.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- input.date.html 5 Feb 2010 06:18:59 -0000 1.34 +++ input.date.html 5 Feb 2010 08:17:23 -0000 1.35 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.date-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.date-content-model">#</a></h2><div class="content-models"> - <div id="input.date-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.date.html#input.date.attrs">input.date.attrs</a> - </p> + <div id="input.date-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.date-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.date-attr-mdl">#</a></h2> Index: input.url.html =================================================================== RCS file: /sources/public/html5/markup/input.url.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- input.url.html 5 Feb 2010 06:19:00 -0000 1.35 +++ input.url.html 5 Feb 2010 08:17:24 -0000 1.36 @@ -23,10 +23,7 @@ <div class="no-number no-toc" id="input.url-content-model"> <h2 class="element-subhead">Permitted content <a class="hash" href="#input.url-content-model">#</a></h2><div class="content-models"> - <div id="input.url-mdls"> - <p class="elem-mdl"> - <a class="ref" href="input.url.html#input.url.attrs">input.url.attrs</a> - </p> + <div id="input.url-mdls"><p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span></p> </div> </div></div><div class="no-number no-toc" id="input.url-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.url-attr-mdl">#</a></h2>
Received on Friday, 5 February 2010 08:18:25 UTC