[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 git-svn-id: http://svn.whatwg.org/webapps@7528 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Nov 23, 2012 · e806798 · e806798
1 parent dd2184a
commit e806798
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 10 deletions.
diff --git a/complete.html b/complete.html
@@ -29040,8 +29040,18 @@ <h4 id=the-track-element><span class=secno>4.8.9 </span>The <dfn><code>track</co
   <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>
@@ -100644,7 +100654,7 @@ <h3 id=unstyled-xml-documents><span class=secno>14.9 </span>Unstyled XML documen
   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>

diff --git a/index b/index
@@ -29040,8 +29040,18 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
   <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>
@@ -100644,7 +100654,7 @@ if (s = prompt('What is your name?')) {
   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>

diff --git a/source b/source
@@ -31412,9 +31412,28 @@ interface <dfn>HTMLAudioElement</dfn> : <span>HTMLMediaElement</span> {};</pre>
   <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">
 
@@ -117817,7 +117836,7 @@ if (s = prompt('What is your name?')) {
   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>