- From: poot <cvsmail@w3.org>
- Date: Thu, 1 Apr 2010 14:46:13 +0900 (JST)
- To: public-html-diffs@w3.org
mike: correctly document the allowed values for the preload attribute
(thx=Simon)
http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.207&r2=1.208&f=h
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- audio.html 29 Mar 2010 18:46:39 -0000 1.57
+++ audio.html 29 Mar 2010 20:43:58 -0000 1.58
@@ -72,10 +72,29 @@
<dt>
<a class="attribute-name" id="audio.attrs.preload" title="audio.attrs.preload" href="audio.html#audio.attrs.preload">preload</a> = <span class="attr-values">
- "preload" <span class="postfix or">or</span> "" <span class="attr-qualifier">(empty string)</span> <span class="postfix or">or</span> <a href="syntax.html#syntax-attr-empty">empty</a>
+ "none"
+ <span class="postfix or">or</span> "metadata"
+ <span class="postfix or">or</span> "auto"
+ <span class="postfix or">or</span> "" <span class="attr-qualifier">(empty string)</span> <span class="postfix or">or</span> <a href="syntax.html#syntax-attr-empty">empty</a>
</span> </dt>
- <dd>Instructs the UA that downloading the entire audio
- stream optimistically is considered worthwhile.</dd>
+ <dd>Represents a hint to the UA about whether optimistic
+ downloading of the audio stream itself or its
+ metadata is considered worthwhile.
+ <ul>
+<li>"<span class="attr-values">none</span>": Hints to the UA that the user
+ is not expected to need the video, or that minimizing
+ unnecessary traffic is desirable.</li>
+ <li>"<span class="attr-values">metadata</span>": Hints to the UA
+ that the user is not expected to need the audio stream,
+ but that fetching its metadata (duration and so on) is
+ desirable.</li>
+ <li>"<span class="attr-values">auto</span>": Hints to the UA that
+ optimistically downloading the entire audio stream is
+ considered desirable.</li>
+ </ul>
+ Specifying the empty string is equivalent to specifying
+ the value "<span class="attr-values">auto</span>".
+ </dd>
<dt>
<a class="attribute-name" id="audio.attrs.controls" title="audio.attrs.controls" href="audio.html#audio.attrs.controls">controls</a> = <span class="attr-values">
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- schema.html 26 Mar 2010 11:31:18 -0000 1.16
+++ schema.html 29 Mar 2010 20:43:58 -0000 1.17
@@ -3704,7 +3704,10 @@
<span class='pattern' id='video.attrs.preload'><span class='type'>attribute </span>
<span class='name'>preload</span>
{<span class='model'>
- d:string "preload" <span class='postfix or'>or</span> d:string ""
+ d:string "none"
+ <span class='postfix or'>or</span> d:string "metadata"
+ <span class='postfix or'>or</span> d:string "auto"
+ <span class='postfix or'>or</span> d:string ""
</span>}
</span>
</div>
@@ -3818,7 +3821,10 @@
<span class='pattern' id='audio.attrs.preload'><span class='type'>attribute </span>
<span class='name'>preload</span>
{<span class='model'>
- d:string "preload" <span class='postfix or'>or</span> d:string ""
+ d:string "none"
+ <span class='postfix or'>or</span> d:string "metadata"
+ <span class='postfix or'>or</span> d:string "auto"
+ <span class='postfix or'>or</span> d:string ""
</span>}
</span>
</div>
Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/menu.html,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- menu.html 29 Mar 2010 18:46:41 -0000 1.55
+++ menu.html 29 Mar 2010 20:43:58 -0000 1.56
@@ -53,15 +53,15 @@
<span class="postfix or">or</span> "context"
</span> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span>
</dt>
- <dd>The kind of menu being declared. The attribute has three states:
+ <dd>The kind of menu being declared.
<ul>
-<li>If the <code>context</code> keyword is specified,
- the element is declaring a context menu.</li>
- <li>If the <code>toolbar</code> keyword is specified,
- the element is declaring a tool bar.</li>
- <li>If the attribute is omitted, the element is a list of
- commands that is neither declaring a context menu nor
- defining a tool bar.</li>
+<li>"<span class="attr-values">toolbar</span>":
+ Indicates that the element represents a tool bar.</li>
+ <li>"<span class="attr-values">context</span>":
+ Indicates that the element represents a context menu.</li>
+ <li>If the attribute is omitted, the element represents
+ a list of commands that is neither a context menu nor a
+ tool bar.</li>
</ul>
</dd>
Index: style.css
===================================================================
RCS file: /sources/public/html5/markup/style.css,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- style.css 29 Mar 2010 15:08:00 -0000 1.109
+++ style.css 29 Mar 2010 20:43:59 -0000 1.110
@@ -932,6 +932,7 @@
font-size: 80%;
font-weight: bold;
text-decoration: none;
+ font-family: serif;
}
.spec-link a {
text-decoration: none;
Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- patch-schema 26 Mar 2010 11:31:18 -0000 1.89
+++ patch-schema 29 Mar 2010 20:43:58 -0000 1.90
@@ -1,6 +1,6 @@
Index: schema/revision.rnc
===================================================================
---- schema/revision.rnc (revision 540)
+--- schema/revision.rnc (revision 543)
+++ 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 540)
+--- schema/web-forms.rnc (revision 543)
+++ 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 540)
+--- schema/tables.rnc (revision 543)
+++ 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 540)
+--- schema/embed.rnc (revision 543)
+++ schema/embed.rnc (working copy)
@@ -248,7 +248,7 @@
}
@@ -400,7 +400,7 @@
# }
Index: schema/media.rnc
===================================================================
---- schema/media.rnc (revision 540)
+--- schema/media.rnc (revision 543)
+++ schema/media.rnc (working copy)
@@ -4,32 +4,6 @@
## RELAX NG Schema for HTML 5: Advanced Embedded Content #
@@ -421,7 +421,7 @@
- }
- media.attrs.preload =
- attribute preload {
-- w:string "preload" | w:string ""
+- w:string "none" | w:string "metadata" | w:string "auto" | w:string ""
- }
- media.attrs.controls =
- attribute controls {
@@ -473,7 +473,7 @@
+ }
+ video.attrs.preload =
+ attribute preload {
-+ w:string "preload" | w:string ""
++ w:string "none" | w:string "metadata" | w:string "auto" | w:string ""
+ }
+ video.attrs.controls =
+ attribute controls {
@@ -525,7 +525,7 @@
+ }
+ audio.attrs.preload =
+ attribute preload {
-+ w:string "preload" | w:string ""
++ w:string "none" | w:string "metadata" | w:string "auto" | w:string ""
+ }
+ audio.attrs.controls =
+ attribute controls {
@@ -556,7 +556,7 @@
Index: schema/phrase.rnc
===================================================================
---- schema/phrase.rnc (revision 540)
+--- schema/phrase.rnc (revision 543)
+++ 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 540)
+--- schema/web-forms2.rnc (revision 543)
+++ schema/web-forms2.rnc (working copy)
@@ -6,9 +6,6 @@
@@ -702,7 +702,7 @@
attribute autocomplete {
Index: schema/meta.rnc
===================================================================
---- schema/meta.rnc (revision 540)
+--- schema/meta.rnc (revision 543)
+++ 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 540)
+--- schema/applications.rnc (revision 543)
+++ 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 540)
+--- schema/core-scripting.rnc (revision 543)
+++ 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 540)
+--- schema/common.rnc (revision 543)
+++ 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.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- spec.html 29 Mar 2010 18:46:42 -0000 1.207
+++ spec.html 29 Mar 2010 20:43:58 -0000 1.208
@@ -3359,10 +3359,29 @@
<dt>
<a class="attribute-name" id="audio.attrs.preload" title="audio.attrs.preload" href="#audio.attrs.preload">preload</a> = <span class="attr-values">
- "preload" <span class="postfix or">or</span> "" <span class="attr-qualifier">(empty string)</span> <span class="postfix or">or</span> <a href="#syntax-attr-empty">empty</a>
+ "none"
+ <span class="postfix or">or</span> "metadata"
+ <span class="postfix or">or</span> "auto"
+ <span class="postfix or">or</span> "" <span class="attr-qualifier">(empty string)</span> <span class="postfix or">or</span> <a href="#syntax-attr-empty">empty</a>
</span> </dt>
- <dd>Instructs the UA that downloading the entire audio
- stream optimistically is considered worthwhile.</dd>
+ <dd>Represents a hint to the UA about whether optimistic
+ downloading of the audio stream itself or its
+ metadata is considered worthwhile.
+ <ul>
+<li>"<span class="attr-values">none</span>": Hints to the UA that the user
+ is not expected to need the video, or that minimizing
+ unnecessary traffic is desirable.</li>
+ <li>"<span class="attr-values">metadata</span>": Hints to the UA
+ that the user is not expected to need the audio stream,
+ but that fetching its metadata (duration and so on) is
+ desirable.</li>
+ <li>"<span class="attr-values">auto</span>": Hints to the UA that
+ optimistically downloading the entire audio stream is
+ considered desirable.</li>
+ </ul>
+ Specifying the empty string is equivalent to specifying
+ the value "<span class="attr-values">auto</span>".
+ </dd>
<dt>
<a class="attribute-name" id="audio.attrs.controls" title="audio.attrs.controls" href="#audio.attrs.controls">controls</a> = <span class="attr-values">
@@ -12805,15 +12824,15 @@
<span class="postfix or">or</span> "context"
</span> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span>
</dt>
- <dd>The kind of menu being declared. The attribute has three states:
+ <dd>The kind of menu being declared.
<ul>
-<li>If the <code>context</code> keyword is specified,
- the element is declaring a context menu.</li>
- <li>If the <code>toolbar</code> keyword is specified,
- the element is declaring a tool bar.</li>
- <li>If the attribute is omitted, the element is a list of
- commands that is neither declaring a context menu nor
- defining a tool bar.</li>
+<li>"<span class="attr-values">toolbar</span>":
+ Indicates that the element represents a tool bar.</li>
+ <li>"<span class="attr-values">context</span>":
+ Indicates that the element represents a context menu.</li>
+ <li>If the attribute is omitted, the element represents
+ a list of commands that is neither a context menu nor a
+ tool bar.</li>
</ul>
</dd>
@@ -17723,11 +17742,29 @@
<dt>
<a class="attribute-name" id="video.attrs.preload" title="video.attrs.preload" href="#video.attrs.preload">preload</a> = <span class="attr-values">
- "preload" <span class="postfix or">or</span> "" <span class="attr-qualifier">(empty string)</span> <span class="postfix or">or</span> <a href="#syntax-attr-empty">empty</a>
+ "none"
+ <span class="postfix or">or</span> "metadata"
+ <span class="postfix or">or</span> "auto"
+ <span class="postfix or">or</span> "" <span class="attr-qualifier">(empty string)</span> <span class="postfix or">or</span> <a href="#syntax-attr-empty">empty</a>
</span> </dt>
- <dd>Instructs the UA that the author believes that
- downloading the entire video optimistically will be
- worthwhile.</dd>
+ <dd>Represents a hint to the UA about whether optimistic
+ downloading of the video itself or its metadata is
+ considered worthwhile.
+ <ul>
+<li>"<span class="attr-values">none</span>": Hints to the UA that the user
+ is not expected to need the video, or that minimizing
+ unnecessary traffic is desirable.</li>
+ <li>"<span class="attr-values">metadata</span>": Hints to the UA
+ that the user is not expected to need the video,
+ but that fetching its metadata (dimensions, first frame,
+ track list, duration, and so on) is desirable.</li>
+ <li>"<span class="attr-values">auto</span>": Hints to the UA that
+ optimistically downloading the entire video is
+ considered desirable.</li>
+ </ul>
+ Specifying the empty string is equivalent to specifying
+ the value "<span class="attr-values">auto</span>".
+ </dd>
<dt>
<a class="attribute-name" id="video.attrs.controls" title="video.attrs.controls" href="#video.attrs.controls">controls</a> = <span class="attr-values">
Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- video.html 29 Mar 2010 18:46:43 -0000 1.56
+++ video.html 29 Mar 2010 20:43:59 -0000 1.57
@@ -74,11 +74,29 @@
<dt>
<a class="attribute-name" id="video.attrs.preload" title="video.attrs.preload" href="video.html#video.attrs.preload">preload</a> = <span class="attr-values">
- "preload" <span class="postfix or">or</span> "" <span class="attr-qualifier">(empty string)</span> <span class="postfix or">or</span> <a href="syntax.html#syntax-attr-empty">empty</a>
+ "none"
+ <span class="postfix or">or</span> "metadata"
+ <span class="postfix or">or</span> "auto"
+ <span class="postfix or">or</span> "" <span class="attr-qualifier">(empty string)</span> <span class="postfix or">or</span> <a href="syntax.html#syntax-attr-empty">empty</a>
</span> </dt>
- <dd>Instructs the UA that the author believes that
- downloading the entire video optimistically will be
- worthwhile.</dd>
+ <dd>Represents a hint to the UA about whether optimistic
+ downloading of the video itself or its metadata is
+ considered worthwhile.
+ <ul>
+<li>"<span class="attr-values">none</span>": Hints to the UA that the user
+ is not expected to need the video, or that minimizing
+ unnecessary traffic is desirable.</li>
+ <li>"<span class="attr-values">metadata</span>": Hints to the UA
+ that the user is not expected to need the video,
+ but that fetching its metadata (dimensions, first frame,
+ track list, duration, and so on) is desirable.</li>
+ <li>"<span class="attr-values">auto</span>": Hints to the UA that
+ optimistically downloading the entire video is
+ considered desirable.</li>
+ </ul>
+ Specifying the empty string is equivalent to specifying
+ the value "<span class="attr-values">auto</span>".
+ </dd>
<dt>
<a class="attribute-name" id="video.attrs.controls" title="video.attrs.controls" href="video.html#video.attrs.controls">controls</a> = <span class="attr-values">
Received on Thursday, 1 April 2010 05:46:44 UTC