[html5] r7528 - [c] (1) Make the <track default> element restrictions make more sense Fixing htt [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2012-11-22 23:46:51 -0800 (Thu, 22 Nov 2012)
New Revision: 7528

Modified:
   complete.html
   index
   source
Log:
[c] (1) Make the <track default> element restrictions make more sense
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=17877
Affected topics: HTML, Rendering

Modified: complete.html
===================================================================
--- complete.html	2012-11-23 00:04:06 UTC (rev 7527)
+++ complete.html	2012-11-23 07:46:51 UTC (rev 7528)
@@ -29040,9 +29040,19 @@
   <p>The <dfn id=attr-track-default title=attr-track-default><code>default</code></dfn>
   attribute, if specified, indicates that the track is to be enabled
   if the user's preferences do not indicate that another track would
-  be more appropriate. There must not be more than one
-  <code><a href=#the-track-element>track</a></code> element with the same parent node with the <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute specified.</p>
+  be more appropriate.</p>
 
+  <p>Each <a href=#media-element>media element</a> must have no more than one <code><a href=#the-track-element>track</a></code> element child
+  whose <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code> attribute is in the <a href=#attr-track-kind-subtitles title=attr-track-kind-subtitles>subtitles</a> or <a href=#attr-track-kind-captions title=attr-track-kind-captions>captions</a> state and whose <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute is specified.</p>
+
+  <p>Each <a href=#media-element>media element</a> must have no more than one <code><a href=#the-track-element>track</a></code> element child
+  whose <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code> attribute is in the <a href=#attr-track-kind-descriptions title=attr-track-kind-descriptions>description</a> state and whose <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute is specified.</p>
+
+  <p>Each <a href=#media-element>media element</a> must have no more than one <code><a href=#the-track-element>track</a></code> element child
+  whose <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code> attribute is in the <a href=#attr-track-kind-chapters title=attr-track-kind-chapters>chapters</a> state and whose <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute is specified.</p>
+
+  <p class=note>There is no limit on the number of <code><a href=#the-track-element>track</a></code> elements whose <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code> attribute is in the <a href=#attr-track-kind-metadata title=attr-track-kind-metadata>metadata</a> state and whose <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute is specified.</p>
+
   <dl class=domintro><dt><var title="">track</var> . <code title=dom-track-readyState><a href=#dom-track-readystate>readyState</a></code></dt>
    <dd>
     <p>Returns the <a href=#text-track-readiness-state>text track readiness state</a>,
@@ -100644,7 +100654,7 @@
   styled document.</p>
 
   <p class=note>If a <code><a href=#document>Document</a></code> stops being an <a href=#unstyled-document>unstyled document</a>, then the
-  conditions above stop applying, and thes a user agent following these requirements will switch to
+  conditions above stop applying, and thus a user agent following these requirements will switch to
   using the regular CSS rendering.</p>
 
   </div>

Modified: index
===================================================================
--- index	2012-11-23 00:04:06 UTC (rev 7527)
+++ index	2012-11-23 07:46:51 UTC (rev 7528)
@@ -29040,9 +29040,19 @@
   <p>The <dfn id=attr-track-default title=attr-track-default><code>default</code></dfn>
   attribute, if specified, indicates that the track is to be enabled
   if the user's preferences do not indicate that another track would
-  be more appropriate. There must not be more than one
-  <code><a href=#the-track-element>track</a></code> element with the same parent node with the <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute specified.</p>
+  be more appropriate.</p>
 
+  <p>Each <a href=#media-element>media element</a> must have no more than one <code><a href=#the-track-element>track</a></code> element child
+  whose <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code> attribute is in the <a href=#attr-track-kind-subtitles title=attr-track-kind-subtitles>subtitles</a> or <a href=#attr-track-kind-captions title=attr-track-kind-captions>captions</a> state and whose <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute is specified.</p>
+
+  <p>Each <a href=#media-element>media element</a> must have no more than one <code><a href=#the-track-element>track</a></code> element child
+  whose <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code> attribute is in the <a href=#attr-track-kind-descriptions title=attr-track-kind-descriptions>description</a> state and whose <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute is specified.</p>
+
+  <p>Each <a href=#media-element>media element</a> must have no more than one <code><a href=#the-track-element>track</a></code> element child
+  whose <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code> attribute is in the <a href=#attr-track-kind-chapters title=attr-track-kind-chapters>chapters</a> state and whose <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute is specified.</p>
+
+  <p class=note>There is no limit on the number of <code><a href=#the-track-element>track</a></code> elements whose <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code> attribute is in the <a href=#attr-track-kind-metadata title=attr-track-kind-metadata>metadata</a> state and whose <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute is specified.</p>
+
   <dl class=domintro><dt><var title="">track</var> . <code title=dom-track-readyState><a href=#dom-track-readystate>readyState</a></code></dt>
    <dd>
     <p>Returns the <a href=#text-track-readiness-state>text track readiness state</a>,
@@ -100644,7 +100654,7 @@
   styled document.</p>
 
   <p class=note>If a <code><a href=#document>Document</a></code> stops being an <a href=#unstyled-document>unstyled document</a>, then the
-  conditions above stop applying, and thes a user agent following these requirements will switch to
+  conditions above stop applying, and thus a user agent following these requirements will switch to
   using the regular CSS rendering.</p>
 
   </div>

Modified: source
===================================================================
--- source	2012-11-23 00:04:06 UTC (rev 7527)
+++ source	2012-11-23 07:46:51 UTC (rev 7528)
@@ -31412,10 +31412,29 @@
   <p>The <dfn title="attr-track-default"><code>default</code></dfn>
   attribute, if specified, indicates that the track is to be enabled
   if the user's preferences do not indicate that another track would
-  be more appropriate. There must not be more than one
-  <code>track</code> element with the same parent node with the <code
-  title="attr-track-default">default</code> attribute specified.</p>
+  be more appropriate.</p>
 
+  <p>Each <span>media element</span> must have no more than one <code>track</code> element child
+  whose <code title="attr-track-kind">kind</code> attribute is in the <span
+  title="attr-track-kind-subtitles">subtitles</span> or <span
+  title="attr-track-kind-captions">captions</span> state and whose <code
+  title="attr-track-default">default</code> attribute is specified.</p>
+
+  <p>Each <span>media element</span> must have no more than one <code>track</code> element child
+  whose <code title="attr-track-kind">kind</code> attribute is in the <span
+  title="attr-track-kind-descriptions">description</span> state and whose <code
+  title="attr-track-default">default</code> attribute is specified.</p>
+
+  <p>Each <span>media element</span> must have no more than one <code>track</code> element child
+  whose <code title="attr-track-kind">kind</code> attribute is in the <span
+  title="attr-track-kind-chapters">chapters</span> state and whose <code
+  title="attr-track-default">default</code> attribute is specified.</p>
+
+  <p class="note">There is no limit on the number of <code>track</code> elements whose <code
+  title="attr-track-kind">kind</code> attribute is in the <span
+  title="attr-track-kind-metadata">metadata</span> state and whose <code
+  title="attr-track-default">default</code> attribute is specified.</p>
+
   <dl class="domintro">
 
    <dt><var title="">track</var> . <code title="dom-track-readyState">readyState</code></dt>
@@ -117817,7 +117836,7 @@
   styled document.</p>
 
   <p class="note">If a <code>Document</code> stops being an <span>unstyled document</span>, then the
-  conditions above stop applying, and thes a user agent following these requirements will switch to
+  conditions above stop applying, and thus a user agent following these requirements will switch to
   using the regular CSS rendering.</p>
 
   </div>