[html5] r6031 - [e] (0) remove CONTROLLER and TT markers Fixing http://www.w3.org/Bugs/Public/sh [...]

whatwg at whatwg.org whatwg at whatwg.org
Tue Apr 26 12:31:44 PDT 2011


Author: ianh
Date: 2011-04-26 12:31:42 -0700 (Tue, 26 Apr 2011)
New Revision: 6031

Modified:
   complete.html
   index
   source
Log:
[e] (0) remove CONTROLLER and TT markers
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=9452

Modified: complete.html
===================================================================
--- complete.html	2011-04-25 23:18:11 UTC (rev 6030)
+++ complete.html	2011-04-26 19:31:42 UTC (rev 6031)
@@ -239,7 +239,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 25 April 2011</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 26 April 2011</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -8638,9 +8638,7 @@
            attribute <a href=#function>Function</a> <a href=#handler-onchange title=handler-onchange>onchange</a>;
            attribute <a href=#function>Function</a> <a href=#handler-onclick title=handler-onclick>onclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-oncontextmenu title=handler-oncontextmenu>oncontextmenu</a>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-oncuechange title=handler-oncuechange>oncuechange</a>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-ondblclick title=handler-ondblclick>ondblclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondrag title=handler-ondrag>ondrag</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondragend title=handler-ondragend>ondragend</a>;
@@ -9818,9 +9816,7 @@
            attribute <a href=#function>Function</a> <a href=#handler-onchange title=handler-onchange>onchange</a>;
            attribute <a href=#function>Function</a> <a href=#handler-onclick title=handler-onclick>onclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-oncontextmenu title=handler-oncontextmenu>oncontextmenu</a>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-oncuechange title=handler-oncuechange>oncuechange</a>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-ondblclick title=handler-ondblclick>ondblclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondrag title=handler-ondrag>ondrag</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondragend title=handler-ondragend>ondragend</a>;
@@ -9924,9 +9920,7 @@
    <li><code title=handler-onchange><a href=#handler-onchange>onchange</a></code></li>
    <li><code title=handler-onclick><a href=#handler-onclick>onclick</a></code></li>
    <li><code title=handler-oncontextmenu><a href=#handler-oncontextmenu>oncontextmenu</a></code></li>
-<!--KEEP-END w3c-html--><!--TT-->
    <li><code title=handler-oncuechange><a href=#handler-oncuechange>oncuechange</a></code></li>
-<!--KEEP-START w3c-html--><!--TT-->
    <li><code title=handler-ondblclick><a href=#handler-ondblclick>ondblclick</a></code></li>
    <li><code title=handler-ondrag><a href=#handler-ondrag>ondrag</a></code></li>
    <li><code title=handler-ondragend><a href=#handler-ondragend>ondragend</a></code></li>
@@ -25190,14 +25184,10 @@
    <dd>Where <a href=#embedded-content>embedded content</a> is expected.</dd>
    <dt>Content model:</dt>
    <dd>If the element has a <code title=attr-media-src><a href=#attr-media-src>src</a></code> attribute:
-<!--KEEP-END w3c-html--><!--TT-->
  zero or more <code><a href=#the-track-element>track</a></code> elements, then
-<!--KEEP-START w3c-html--><!--TT-->
  <a href=#transparent>transparent</a>, but with no <a href=#media-element>media element</a> descendants.</dd>
    <dd>If the element does not have a <code title=attr-media-src><a href=#attr-media-src>src</a></code> attribute: zero or more <code><a href=#the-source-element>source</a></code> elements, then
-<!--KEEP-END w3c-html--><!--TT-->
  zero or more <code><a href=#the-track-element>track</a></code> elements, then
-<!--KEEP-START w3c-html--><!--TT-->
  <a href=#transparent>transparent</a>, but with no <a href=#media-element>media element</a> descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
@@ -25205,7 +25195,7 @@
    <dd><code title=attr-video-poster><a href=#attr-video-poster>poster</a></code></dd>
    <dd><code title=attr-media-preload><a href=#attr-media-preload>preload</a></code></dd>
    <dd><code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code></dd>
-<!--CONTROLLER-->   <dd><code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code></dd><!--CONTROLLER-->
+   <dd><code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code></dd>
    <dd><code title=attr-media-loop><a href=#attr-media-loop>loop</a></code></dd>
    <dd><code title=attr-media-muted><a href=#attr-media-muted>muted</a></code></dd>
    <dd><code title=attr-media-controls><a href=#attr-media-controls>controls</a></code></dd>
@@ -25244,9 +25234,7 @@
   with associated audio data.</p>
 
   <p>The <code title=attr-media-src><a href=#attr-media-src>src</a></code>, <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>, <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>,
   <code title=attr-media-muted><a href=#attr-media-muted>muted</a></code>, and <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code> attributes are <a href=#media-element-attributes title="media element attributes">the attributes common to all media
   elements</a>.</p>
@@ -25349,14 +25337,12 @@
   particular playback position is defined by the video stream's
   format.</p>
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>The <code><a href=#video>video</a></code> element also <a href=#represents>represents</a> any
   <a href=#text-track-cue title="text track cue">text track cues</a> whose
   <a href=#text-track-cue-active-flag>text track cue active flag</a> is set and whose
   <a href=#text-track>text track</a> is in the <a href=#text-track-showing title="text track
   showing">showing</a> or <a href=#text-track-showing-by-default title="text track showing by
   default">showing by default</a> modes.</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p>In addition to the above, the user agent may provide messages to
   the user (such as "buffering", "no video loaded", "error", or more
@@ -25531,21 +25517,17 @@
    <dd>Where <a href=#embedded-content>embedded content</a> is expected.</dd>
    <dt>Content model:</dt>
    <dd>If the element has a <code title=attr-media-src><a href=#attr-media-src>src</a></code> attribute: 
-<!--KEEP-END w3c-html--><!--TT-->
 zero or more <code><a href=#the-track-element>track</a></code> elements, then 
-<!--KEEP-START w3c-html--><!--TT-->
 <a href=#transparent>transparent</a>, but with no <a href=#media-element>media element</a> descendants.</dd>
    <dd>If the element does not have a <code title=attr-media-src><a href=#attr-media-src>src</a></code> attribute: one or more <code><a href=#the-source-element>source</a></code> elements, then
-<!--KEEP-END w3c-html--><!--TT-->
  zero or more <code><a href=#the-track-element>track</a></code> elements, then
-<!--KEEP-START w3c-html--><!--TT-->
  <a href=#transparent>transparent</a>, but with no <a href=#media-element>media element</a> descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-media-src><a href=#attr-media-src>src</a></code></dd>
    <dd><code title=attr-media-preload><a href=#attr-media-preload>preload</a></code></dd>
    <dd><code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code></dd>
-<!--CONTROLLER-->   <dd><code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code></dd><!--CONTROLLER-->
+   <dd><code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code></dd>
    <dd><code title=attr-media-loop><a href=#attr-media-loop>loop</a></code></dd>
    <dd><code title=attr-media-muted><a href=#attr-media-muted>muted</a></code></dd>
    <dd><code title=attr-media-controls><a href=#attr-media-controls>controls</a></code></dd>
@@ -25593,9 +25575,7 @@
   whose <a href=#media-data>media data</a> is ostensibly audio data.</p>
 
   <p>The <code title=attr-media-src><a href=#attr-media-src>src</a></code>, <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>, <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>,
-<!--CONTROLLER-->
   <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>,
   <code title=attr-media-muted><a href=#attr-media-muted>muted</a></code>, and <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code> attributes are <a href=#media-element-attributes title="media element attributes">the attributes common to all media
   elements</a>.</p>
@@ -25678,9 +25658,7 @@
    <dd>None.</dd>
    <dt>Contexts in which this element can be used:</dt>
    <dd>As a child of a <a href=#media-element>media element</a>, before any <a href=#flow-content>flow content</a>
-<!--KEEP-END w3c-html--><!--TT-->
  or <code><a href=#the-track-element>track</a></code> elements.</dd>
-<!--KEEP-START w3c-html--><!--TT-->
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -25863,9 +25841,6 @@
 
 
 
-<!--KEEP-END w3c-html--><!--TT-->
-<!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
-
   <h4 id=the-track-element><span class=secno>4.8.9 </span>The <dfn><code>track</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
@@ -26040,8 +26015,6 @@
 
   </div>
 
-<!--</div>-->
-<!--KEEP-START w3c-html--><!--TT-->
 
 
   <h4 id=media-elements><span class=secno>4.8.10 </span>Media elements</h4>
@@ -26094,31 +26067,26 @@
            attribute boolean <a href=#dom-media-loop title=dom-media-loop>loop</a>;
   void <a href=#dom-media-play title=dom-media-play>play</a>();
   void <a href=#dom-media-pause title=dom-media-pause>pause</a>();
-<!--CONTROLLER-->
+
   // media controller
            attribute <span>DOMString</span> <a href=#dom-media-mediagroup title=dom-media-mediaGroup>mediaGroup</a>;
-           attribute <a href=#mediacontroller>MediaController</a> <a href=#dom-media-controller title=dom-media-controller>controller</a>;<!--CONTROLLER-->
+           attribute <a href=#mediacontroller>MediaController</a> <a href=#dom-media-controller title=dom-media-controller>controller</a>;
 
   // controls
            attribute boolean <a href=#dom-media-controls title=dom-media-controls>controls</a>;
            attribute double <a href=#dom-media-volume title=dom-media-volume>volume</a>;
            attribute boolean <a href=#dom-media-muted title=dom-media-muted>muted</a>;
            attribute boolean <a href=#dom-media-defaultmuted title=dom-media-defaultMuted>defaultMuted</a>;
-<!--KEEP-END w3c-html--><!--TT-->
+
   // tracks
-<!--CONTROLLER-->
   readonly attribute <a href=#multipletracklist>MultipleTrackList</a> <a href=#dom-media-audiotracks title=dom-media-audioTracks>audioTracks</a>;
   readonly attribute <a href=#exclusivetracklist>ExclusiveTrackList</a> <a href=#dom-media-videotracks title=dom-media-videoTracks>videoTracks</a>;
-<!--CONTROLLER-->
   readonly attribute <a href=#texttrack>TextTrack</a>[] <a href=#dom-media-texttracks title=dom-media-textTracks>textTracks</a>;
   <a href=#mutabletexttrack>MutableTextTrack</a> <a href=#dom-media-addtexttrack title=dom-media-addTextTrack>addTextTrack</a>(in DOMString kind, in optional DOMString label, in optional DOMString language);
-<!--KEEP-START w3c-html--><!--TT-->
 };</pre>
 
   <p>The <dfn id=media-element-attributes>media element attributes</dfn>, <code title=attr-media-src><a href=#attr-media-src>src</a></code>, <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>, <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>,
   <code title=attr-media-muted><a href=#attr-media-muted>muted</a></code>, and <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code>, apply to all <a href=#media-element title="media element">media elements</a>. They are defined in
   this section.</p>
@@ -26165,7 +26133,6 @@
   resource</dfn> is used to refer to the complete set of media data,
   e.g. the complete video file, or complete audio file.</p>
 
-<!--CONTROLLER-->
   <p>A <a href=#media-resource>media resource</a> can have multiple audio and video
   tracks. For the purposes of a <a href=#media-element>media element</a>, the video
   data of the <a href=#media-resource>media resource</a> is only that of the
@@ -26174,7 +26141,6 @@
   mixing all the currently enabled tracks (if any) given by the
   element's <code title=dom-media-audioTracks><a href=#dom-media-audiotracks>audioTracks</a></code>
   attribute.</p>
-<!--CONTROLLER-->
 
   <p class=note>Both <code><a href=#audio>audio</a></code> and <code><a href=#video>video</a></code>
   elements can be used for both audio and video. The main difference
@@ -26542,10 +26508,8 @@
      <li><p>Set the <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
      <code title=dom-media-NETWORK_EMPTY><a href=#dom-media-network_empty>NETWORK_EMPTY</a></code>.</li>
 
-<!--KEEP-END w3c-html--><!--TT-->
      <li><p><a href="#forget-the-media-element's-media-resource-specific-text-tracks">Forget the media element's media-resource-specific
      text tracks</a>.</li>
-<!--KEEP-START w3c-html--><!--TT-->
 
      <li><p>If <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is
      not set to <code title=dom-media-HAVE_NOTHING><a href=#dom-media-have_nothing>HAVE_NOTHING</a></code>, then set it
@@ -26693,10 +26657,8 @@
        attribute to a new <code><a href=#mediaerror>MediaError</a></code> object whose <code title=dom-MediaError-code><a href=#dom-mediaerror-code>code</a></code> attribute is set to
        <code title=dom-MediaError-MEDIA_ERR_SRC_NOT_SUPPORTED><a href=#dom-mediaerror-media_err_src_not_supported>MEDIA_ERR_SRC_NOT_SUPPORTED</a></code>.</li>
 
-<!--KEEP-END w3c-html--><!--TT-->
        <li><p><a href="#forget-the-media-element's-media-resource-specific-text-tracks">Forget the media element's media-resource-specific
        text tracks</a>.</li>
-<!--KEEP-START w3c-html--><!--TT-->
 
        <li><p>Set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
        the <a href=#dom-media-network_no_source title=dom-media-NETWORK_NO_SOURCE>NETWORK_NO_SOURCE</a>
@@ -26813,10 +26775,8 @@
      <a href=#synchronous-section>synchronous section</a> has ended. (Steps in <a href=#synchronous-section title="synchronous section">synchronous sections</a> are
      marked with ⌛.)</li>
 
-<!--KEEP-END w3c-html--><!--TT-->
      <li><p>⌛ <a href="#forget-the-media-element's-media-resource-specific-text-tracks">Forget the media element's
      media-resource-specific text tracks</a>.</li>
-<!--KEEP-START w3c-html--><!--TT-->
 
      <li><p>⌛ <i title="">Find next candidate</i>: Let <var title="">candidate</var> be null.</li>
 
@@ -26982,9 +26942,7 @@
      data</a> has been fetched to determine the duration of the
      <a href=#media-resource>media resource</a>, its dimensions, and other
      metadata,
-<!--KEEP-END w3c-html--><!--TT-->
      and once <a href=#the-text-tracks-are-ready>the text tracks are ready</a>
-<!--KEEP-START w3c-html--><!--TT-->
      </dt>
 
      <dd>
@@ -27066,7 +27024,6 @@
 
        </li>
 
-<!--CONTROLLER-->
        <li><p>If either the <a href=#media-resource>media resource</a> or the address
        of the <var title="">current media resource</var> indicate a
        particular set of audio or video tracks to enable, then the
@@ -27096,7 +27053,6 @@
        the media controller to that time if it's not already past it.
        (So if there are several, you'll jump the media controller to
        the furthest one in the timeline.) -->
-<!--CONTROLLER-->
 
        <li>
 
@@ -27276,7 +27232,6 @@
      </dd>
 
 
-<!--KEEP-END w3c-html--><!--TT-->
      <dt id=found-a-media-resource-specific-timed-track>If the <a href=#media-resource>media resource</a> is found to declare a <a href=#media-resource-specific-text-track>media-resource-specific text track</a> that the user agent supports</dt>
 
      <dd>
@@ -27294,7 +27249,6 @@
       interface.</p>
 
      </dd>
-<!--KEEP-START w3c-html--><!--TT-->
 
     </dl><p>When the <a href=#networking-task-source>networking task source</a> has <a href=#queue-a-task title="queue a task">queued</a> the last <a href=#concept-task title=concept-task>task</a> as part of <a href=#fetch title=fetch>fetching</a> the <a href=#media-resource>media resource</a>
     (i.e. once the download has completed), if the fetching process
@@ -27446,9 +27400,7 @@
 
     <p>Will throw an <code><a href=#invalid_state_err>INVALID_STATE_ERR</a></code> exception if there
     is no selected <a href=#media-resource>media resource</a>
-<!--CONTROLLER-->
     or if there is a <a href=#current-media-controller>current media controller</a>.
-<!--CONTROLLER-->
     Will throw an
     <code><a href=#index_size_err>INDEX_SIZE_ERR</a></code> exception if the given time is not
     within the ranges to which the user agent can seek.</p>
@@ -27545,11 +27497,9 @@
   resource</a>-dependent, but it should approximate the user's wall
   clock.</p>
 
-<!--CONTROLLER-->
   <p class=note>All the <a href=#media-element title="media element">media
   elements</a> that share <a href=#current-media-controller>current media controller</a> use
   the same clock for their <a href=#media-timeline>media timeline</a>.</p>
-<!--CONTROLLER-->
 
   <p><a href=#media-element title="media element">Media elements</a> have a
   <dfn id=current-playback-position>current playback position</dfn>, which must initially (i.e. in
@@ -27560,11 +27510,9 @@
   <p>The <dfn id=dom-media-currenttime title=dom-media-currentTime><code>currentTime</code></dfn>
   attribute must, on getting, return the <a href=#current-playback-position>current playback
   position</a>, expressed in seconds. On setting,
-<!--CONTROLLER-->
   if the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, then it must throw an
   <code><a href=#invalid_state_err>INVALID_STATE_ERR</a></code> exception; otherwise,
-<!--CONTROLLER-->
   the user agent
   must <a href=#dom-media-seek title=dom-media-seek>seek</a> to the new value
   (which might raise an exception).</p>
@@ -27655,11 +27603,9 @@
   indicates that the <a href=#media-element>media element</a> is to seek back to the
   start of the <a href=#media-resource>media resource</a> upon reaching the end.</p>
 
-<!--CONTROLLER-->
   <p>The <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code> attribute has no
   effect while the element has a <a href=#current-media-controller>current media
   controller</a>.</p>
-<!--CONTROLLER-->
 
   <div class=impl>
 
@@ -27712,10 +27658,8 @@
    will no longer raise an exception when seeking. No <a href=#media-data>media
    data</a> is available for the immediate <a href=#current-playback-position>current playback
    position</a>.
-<!--KEEP-END w3c-html--><!--TT-->
    The <a href=#text-track title="text track">text tracks</a>
    are <a href=#the-text-tracks-are-ready title="the text tracks are ready">ready</a>.
-<!--KEEP-START w3c-html--><!--TT-->
    </dd>
 
    <dt><dfn id=dom-media-have_current_data title=dom-media-HAVE_CURRENT_DATA><code>HAVE_CURRENT_DATA</code></dfn> (numeric value 2)</dt>
@@ -27872,12 +27816,10 @@
 
     </dl></li>
 
-<!--CONTROLLER-->
    <li><p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
    controller</a>, then <a href=#report-the-controller-state>report the controller state</a>
    for the <a href=#media-element>media element</a>'s <a href=#current-media-controller>current media
    controller</a>.</li>
-<!--CONTROLLER-->
 
   </ol></div>
 
@@ -27954,13 +27896,11 @@
     normal playback mode, it is expected that the rate of playback
     will be returned to the default rate of playback.</p>
 
-<!--CONTROLLER-->
     <p>When the element has a <a href=#current-media-controller>current media controller</a>,
     the <code title=dom-media-defaultPlaybackRate><a href=#dom-media-defaultplaybackrate>defaultPlaybackRate</a></code>
     attribute is ignored and the <a href=#current-media-controller>current media
     controller</a>'s <code title=dom-MediaController-defaultPlaybackRate><a href=#dom-mediacontroller-defaultplaybackrate>defaultPlaybackRate</a></code>
     is used instead.</p>
-<!--CONTROLLER-->
 
    </dd>
 
@@ -27972,13 +27912,11 @@
 
     <p>Can be set, to change the rate of playback.</p>
 
-<!--CONTROLLER-->
     <p>When the element has a <a href=#current-media-controller>current media controller</a>,
     the <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code>
     attribute is ignored and the <a href=#current-media-controller>current media
     controller</a>'s <code title=dom-MediaController-playbackRate><a href=#dom-mediacontroller-playbackrate>playbackRate</a></code> is
     used instead.</p>
-<!--CONTROLLER-->
 
    </dd>
 
@@ -28029,11 +27967,9 @@
   playing</dfn> when its <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code>
   attribute is false, the element has not <a href=#ended-playback>ended playback</a>,
   playback has not <a href=#stopped-due-to-errors>stopped due to errors</a>, 
-<!--CONTROLLER-->
   the element either has no <a href=#current-media-controller>current media controller</a> or
   has a <a href=#current-media-controller>current media controller</a> but is not <a href=#blocked-on-its-media-controller>blocked
   on its media controller</a>,
-<!--CONTROLLER-->
   and the element is not a <a href=#blocked-media-element>blocked media element</a>.</p>
 
   <p>A <a href=#media-element>media element</a> is said to have <dfn id=ended-playback>ended
@@ -28052,14 +27988,10 @@
      <li>The <a href=#direction-of-playback>direction of playback</a> is forwards, and
 
      <li>
-<!--CONTROLLER-->
      Either
-<!--CONTROLLER-->
      the <a href=#media-element>media element</a> does not have a <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code> attribute specified,
-<!--CONTROLLER-->
      or the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
      controller</a>.
-<!--CONTROLLER-->
 
     </ul><p>Or:
 
@@ -28089,7 +28021,6 @@
   the user agent has reached a point in the <a href=#media-resource>media
   resource</a> where the user has to make a selection for the
   resource to continue.
-<!--CONTROLLER-->
   If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a> when this happens, then the user agent must
   <a href=#report-the-controller-state>report the controller state</a> for the <a href=#media-element>media
@@ -28099,7 +28030,6 @@
   to resume, the user agent must similarly <a href=#report-the-controller-state>report the controller
   state</a> for the <a href=#media-element>media element</a>'s <a href=#current-media-controller>current
   media controller</a>.
-<!--CONTROLLER-->
   </p>
 
   <p>It is possible for a <a href=#media-element>media element</a> to have both
@@ -28123,9 +28053,7 @@
   steps:</p>
 
   <ol><li><p>If the <a href=#media-element>media element</a> has a <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code> attribute specified
-<!--CONTROLLER-->
    and does not have a <a href=#current-media-controller>current media controller</a>,
-<!--CONTROLLER-->
    then <a href=#dom-media-seek title=dom-media-seek>seek</a> to the <a href=#earliest-possible-position>earliest
    possible position</a> of the <a href=#media-resource>media resource</a> and
    abort these steps.</li> <!-- v2/v3: We should fire a 'looping'
@@ -28168,9 +28096,7 @@
 
   <p>The <dfn id=dom-media-playbackrate title=dom-media-playbackRate><code>playbackRate</code></dfn>
   attribute gives the <a href=#effective-playback-rate>effective playback rate</a>
-<!--CONTROLLER-->
   (assuming there is no <a href=#current-media-controller>current media controller</a> overriding it),
-<!--CONTROLLER-->
   which is the speed at which the <a href=#media-resource>media resource</a> plays,
   as a multiple of its intrinsic speed. If it is not equal to the
   <code title=dom-media-defaultPlaybackRate><a href=#dom-media-defaultplaybackrate>defaultPlaybackRate</a></code>,
@@ -28179,10 +28105,8 @@
   getting it must return the last value it was set to, or 1.0 if it
   hasn't yet been set; on setting the attribute must be set to the new
   value, and the playback will change speed
-<!--CONTROLLER-->
   (if the element is <a href=#potentially-playing>potentially playing</a> and there is no
   <a href=#current-media-controller>current media controller</a>).</p>
-<!--CONTROLLER-->
 
   <p id=rateUpdate>When the <code title=dom-media-defaultPlaybackRate><a href=#dom-media-defaultplaybackrate>defaultPlaybackRate</a></code> or
   <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code> attributes
@@ -28192,14 +28116,12 @@
   event</a> named <code title=event-media-ratechange><a href=#event-media-ratechange>ratechange</a></code> at the <a href=#media-element>media
   element</a>.</p>
 
-<!--CONTROLLER-->
   <p class=note>The <code title=dom-media-defaultPlaybackRate><a href=#dom-media-defaultplaybackrate>defaultPlaybackRate</a></code> and
   <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code> attributes
   have no effect when the <a href=#media-element>media element</a> has a
   <a href=#current-media-controller>current media controller</a>; the namesake attributes on
   the <code><a href=#mediacontroller>MediaController</a></code> object are used instead in that
   situation.</p>
-<!--CONTROLLER-->
 
   <hr><p>The <dfn id=dom-media-played title=dom-media-played><code>played</code></dfn>
   attribute must return a new static <a href=#normalized-timeranges-object>normalized
@@ -28220,10 +28142,8 @@
 
     <p>If the <a href=#ended-playback title="ended playback">playback has ended</a>
     and the <a href=#direction-of-playback>direction of playback</a> is forwards,
-<!--CONTROLLER-->
     and the <a href=#media-element>media element</a> does not have a <a href=#current-media-controller>current
     media controller</a>,
-<!--CONTROLLER-->
     <a href=#dom-media-seek title=dom-media-seek>seek</a> to the <a href=#earliest-possible-position>earliest
     possible position</a> of the <a href=#media-resource>media resource</a>.</p>
 
@@ -28235,11 +28155,9 @@
 
    </li>
 
-<!--CONTROLLER-->
    <li><p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current
    media controller</a>, then <a href=#bring-the-media-element-up-to-speed-with-its-new-media-controller>bring the media element up
    to speed with its new media controller</a>.</p>
-<!--CONTROLLER-->
 
    <li>
 
@@ -28275,12 +28193,10 @@
    <li><p>Set the <a href=#media-element>media element</a>'s <a href=#autoplaying-flag>autoplaying
    flag</a> to false.</li>
 
-<!--CONTROLLER-->
    <li><p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
    controller</a>, then <a href=#report-the-controller-state>report the controller state</a>
    for the <a href=#media-element>media element</a>'s <a href=#current-media-controller>current media
    controller</a>.</li>
-<!--CONTROLLER-->
 
   </ol><hr><p>When the <dfn id=dom-media-pause title=dom-media-pause><code>pause()</code></dfn>
   method is invoked, and when the user agent is required to pause the
@@ -28310,27 +28226,21 @@
 
     </ol></li>
 
-<!--CONTROLLER-->
    <li><p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
    controller</a>, then <a href=#report-the-controller-state>report the controller state</a>
    for the <a href=#media-element>media element</a>'s <a href=#current-media-controller>current media
    controller</a>.</li>
-<!--CONTROLLER-->
 
   </ol><hr><p>The
-<!--CONTROLLER-->
   <dfn id=effective-playback-rate>effective playback rate</dfn> is not necessarily the element's
   <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code>. When a
   <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, its <a href=#effective-playback-rate>effective playback rate</a> is the
   <code><a href=#mediacontroller>MediaController</a></code>'s <a href=#media-controller-playback-rate>media controller playback
   rate</a>. Otherwise, the
-<!--CONTROLLER-->
   <a href=#effective-playback-rate>effective playback rate</a> is just the element's <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code>.
-<!--CONTROLLER-->
   Thus, the <a href=#current-media-controller>current media controller</a> overrides the
   <a href=#media-element>media element</a>.
-<!--CONTROLLER-->
   </p>
 
   <p>If the <a href=#effective-playback-rate>effective playback rate</a> is positive or zero,
@@ -28375,14 +28285,12 @@
   element is in a state where no further audio could ever be played by
   that element may the element be garbage collected.</p>
 
-<!--CONTROLLER-->
   <p class=note>It is possible for an element to which no explicit
   references exist to play audio, even if such an element is not still
   actively playing: for instance, it could have a <a href=#current-media-controller>current media
   controller</a> that still has references and can still be
   unpaused, or it could be unpaused but stalled waiting for content to
   buffer.</p>
-<!--CONTROLLER-->
 
   <hr><p>When the <a href=#current-playback-position>current playback position</a> of a <a href=#media-element>media
   element</a> changes (e.g. due to playback or seeking), the user
@@ -28390,14 +28298,12 @@
   position</a> changes while the steps are running, then the user
   agent must wait for the steps to complete, and then must immediately
   rerun the steps.
-<!--KEEP-END w3c-html--><!--TT-->
   (These steps are thus run as often as possible or needed — if
   one iteration takes a long time, this can cause certain <a href=#text-track-cue title="text track cue">cues</a> to be skipped over as the user
   agent rushes ahead to "catch up".)
-<!--KEEP-START w3c-html--><!--TT-->
   </p>
 
-  <ol><!--KEEP-END w3c-html--><!--TT--><li><p>Let <var title="">current cues</var> be an ordered list of
+  <ol><li><p>Let <var title="">current cues</var> be an ordered list of
    <a href=#text-track-cue title="text track cue">cues</a>, initialized to contain
    all the <a href=#text-track-cue title="text track cue">cues</a> of all the <a href=#text-track-hidden title="text track hidden">hidden</a>, <a href=#text-track-showing title="text track
    showing">showing</a>, or <a href=#text-track-showing-by-default title="text track showing by
@@ -28416,7 +28322,6 @@
    tracks</a> of the <a href=#media-element>media element</a> that are not
    present in <var title="">current cues</var>, also in <a href=#text-track-cue-order>text
    track cue order</a>.</li>
-<!--KEEP-START w3c-html--><!--TT-->
 
    <li><p>If the time was reached through the usual monotonic increase
    of the <a href=#current-playback-position>current playback position</a> during normal
@@ -28436,7 +28341,6 @@
    not any more frequent than the user agent can comfortably handle
    while decoding the video.</li>
 
-<!--KEEP-END w3c-html--><!--TT-->
    <li><p>If all of the <a href=#text-track-cue title="text track cue">cues</a> in
    <var title="">current cues</var> have their <a href=#text-track-cue-active-flag>text track cue
    active flag</a> set, and none of the <a href=#text-track-cue title="text track
@@ -28504,14 +28408,12 @@
    display of WebVTT text tracks</a>.
 <!--TTVTT-->
    </li>
-<!--KEEP-START w3c-html--><!--TT-->
 
-  </ol><!--KEEP-END w3c-html--><!--TT--><p>For the purposes of the algorithm above, a <a href=#text-track-cue>text track
+  </ol><p>For the purposes of the algorithm above, a <a href=#text-track-cue>text track
   cue</a> is considered to be part of a <a href=#text-track>text track</a>
   only if it is listed in the <a href=#text-track-list-of-cues>text track list of cues</a>,
   not merely if it is associated with the <a href=#text-track>text
   track</a>.</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p class=note>If the <a href=#media-element>media element</a>'s
   <code><a href=#document>Document</a></code> stops being a <a href=#fully-active>fully active</a>
@@ -28687,16 +28589,13 @@
   the user agent must act as if the algorithm for <a href=#dom-media-seek title=dom-media-seek>seeking</a> was used whenever the
   <a href=#current-playback-position>current playback position</a> changes in a discontinuous
   fashion (so that the relevant events fire).
-<!--CONTROLLER-->
   If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, then the user agent must <a href=#seek-the-media-controller>seek the media
   controller</a> appropriately instead.
-<!--CONTROLLER-->
   </p>
 
   </div>
 
-<!--CONTROLLER-->
 
   <h5 id=media-resources-with-multiple-media-tracks><span class=secno>4.8.10.10 </span>Media resources with multiple media tracks</h5>
 
@@ -29826,11 +29725,8 @@
    <audio src="movie.vid#track=Descriptions" mediagroup=main autoduck></audio>
 -->
 
-<!--CONTROLLER-->
 
 
-<!--KEEP-END w3c-html--><!--TT-->
-<!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
   <h5 id=timed-text-tracks><span class=secno>4.8.10.12 </span>Timed text tracks</h5>
 
   <h6 id=text-track-model><span class=secno>4.8.10.12.1 </span>Text track model</h6>
@@ -30593,6 +30489,7 @@
 
 
 <!--TTVTT-->
+<div data-component="other Hixie drafts (editor: Ian Hickson)">
   <div class=impl>
 
   <h6 id=guidelines-for-exposing-cues-in-various-formats-as-text-track-cues><span class=secno>4.8.10.12.4 </span><dfn>Guidelines for exposing cues</dfn> in various formats as
@@ -30651,6 +30548,7 @@
    </dd>
 
   </dl></div>
+</div>
 <!--TTVTT-->
 
 
@@ -31432,10 +31330,10 @@
    <tbody><tr><td><dfn id=handler-texttrackcue-onenter title=handler-TextTrackCue-onenter><code>onenter</code></dfn> <td> <code title=event-enter>enter</code>
     <tr><td><dfn id=handler-texttrackcue-onexit title=handler-TextTrackCue-onexit><code>onexit</code></dfn> <td> <code title=event-exit>exit</code>
   </table></div>
-<!--KEEP-START w3c-html--><!--TT-->
 
 <!--TTVTT-->
 
+<div data-component="other Hixie drafts (editor: Ian Hickson)">
   <h5 id=webvtt-0><span class=secno>4.8.10.13 </span>WebVTT</h5>
 
   <p>The <dfn id=webvtt>WebVTT</dfn> format (Web Video Text Tracks) is a
@@ -33085,11 +32983,10 @@
 
   </div>
 
-<!--</div>-->
+</div>
 
 <!--TTVTT-->
 
-
   <h5 id=user-interface><span class=secno>4.8.10.14 </span>User interface</h5>
 
   <p>The <dfn id=attr-media-controls title=attr-media-controls><code>controls</code></dfn>
@@ -33110,7 +33007,6 @@
   the user (e.g. full-screen video or in an independent resizable
   window). Other controls may also be made available.</p>
 
-<!--CONTROLLER-->
   <p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, then the user agent should expose audio tracks
   from all the <a href=#slaved-media-elements>slaved media elements</a> (although avoiding
@@ -33121,7 +33017,6 @@
   should use the element's <code title=attr-title><a href=#the-title-attribute>title</a></code>
   attribute, if any, as the name (or as part of the name) of that
   track.</p>
-<!--CONTROLLER-->
 
   <p>Even when the attribute is absent, however, user agents may
   provide controls to affect playback of the media resource
@@ -33133,15 +33028,12 @@
   <p>Where possible (specifically, for starting, stopping, pausing,
   and unpausing playback, for seeking, for changing the rate of
   playback, for fast-forwarding or rewinding,
-<!--KEEP-END w3c-html--><!--TT-->
   for listing, enabling, and disabling text tracks,
-<!--KEEP-START w3c-html--><!--TT-->
   and for muting or changing the volume of the audio), user interface
   features exposed by the user agent must be implemented in terms of
   the DOM API described above, so that, e.g., all the same events
   fire.</p>
 
-<!--CONTROLLER-->
   <p>When a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, the user agent's user interface for pausing and
   unpausing playback, for seeking, for changing the rate of playback,
@@ -33149,42 +33041,34 @@
   volume of audio of the entire group must be implemented in terms of
   the <code><a href=#mediacontroller>MediaController</a></code> API exposed on that <a href=#current-media-controller>current
   media controller</a>.</p>
-<!--CONTROLLER-->
 
   <p>The "play" function in the user agent's interface must set the
   <code title="">playbackRate</code> attribute to the value of the
   <code title="">defaultPlaybackRate</code> attribute before invoking
   the <code title="">play()</code> method.
-<!--CONTROLLER-->
   When a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, the attributes and method with those names on
   that <code><a href=#mediacontroller>MediaController</a></code> object must be used. Otherwise,
   the attributes and method with those names on the <a href=#media-element>media
   element</a> itself must be used.
-<!--CONTROLLER-->
   </p>
 
   <p>Features such as fast-forward or rewind must be implemented by
   only changing the <code title="">playbackRate</code> attribute (and
   not the <code title="">defaultPlaybackRate</code> attribute).
-<!--CONTROLLER-->
   Again, when a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, the attributes with those names on that
   <code><a href=#mediacontroller>MediaController</a></code> object must be used; otherwise, the
   attributes with those names on the <a href=#media-element>media element</a> itself
   must be used.
-<!--CONTROLLER-->
   </p>
 
-<!--CONTROLLER-->
   <p>When a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, and all the <a href=#slaved-media-elements>slaved media elements</a> of
   that <code><a href=#mediacontroller>MediaController</a></code> are paused, the user agent should
   unpause all the <a href=#slaved-media-elements>slaved media elements</a> when the user
   invokes a user agent interface control for beginning playback.</p>
-<!--CONTROLLER-->
 
-<!--CONTROLLER-->
   <p>When a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, seeking must be implemented in terms of the <code title=dom-MediaController-seek>seek()</code> method on that
   <code><a href=#mediacontroller>MediaController</a></code> object. Otherwise, the user agent must
@@ -33198,9 +33082,7 @@
   element</a> without affecting the <code><a href=#mediacontroller>MediaController</a></code>,
   but such features are considered relatively advanced and unlikely to
   be useful to most users.
-<!--CONTROLLER-->
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>For the purposes of listing chapters in the <a href=#media-resource>media
   resource</a>, only <a href=#text-track title="text track">text tracks</a>
   in the <a href=#media-element>media element</a>'s <a href=#list-of-text-tracks>list of text
@@ -33211,7 +33093,6 @@
   track</a> represents a chapter starting at the cue's <a href=#text-track-cue-start-time title="text track cue start time">start time</a>. The name of
   the chapter is the <a href=#text-track-cue-text>text track cue text</a>, interpreted
   literally.</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p>The <dfn id=dom-media-controls title=dom-media-controls><code>controls</code></dfn>
   IDL attribute must <a href=#reflect>reflect</a> the content attribute of the
@@ -33279,23 +33160,19 @@
    attribute is true, the element's <a href=#effective-media-volume>effective media
    volume</a> is zero. Abort these steps.</li>
 
-<!--CONTROLLER-->
    <li><p>If the element has a <a href=#current-media-controller>current media controller</a>
    and that <code><a href=#mediacontroller>MediaController</a></code> object's <a href=#media-controller-mute-override>media
    controller mute override</a> is true, the element's
    <a href=#effective-media-volume>effective media volume</a> is zero. Abort these
    steps.</li>
-<!--CONTROLLER-->
 
    <li><p>Let <var title="">volume</var> be the value of the element's
    <code title=dom-media-volume><a href=#dom-media-volume>volume</a></code> attribute.</li>
 
-<!--CONTROLLER-->
    <li><p>If the element has a <a href=#current-media-controller>current media controller</a>,
    multiply <var title="">volume</var> by that
    <code><a href=#mediacontroller>MediaController</a></code> object's <a href=#media-controller-volume-multiplier>media controller volume
    multiplier</a>.</li>
-<!--CONTROLLER-->
 
    <li><p>The element's <a href=#effective-media-volume>effective media volume</a> is <var title="">volume</var>, interpreted relative to the range 0.0 to
    1.0, with 0.0 being silent, and 1.0 being the loudest setting,
@@ -33462,9 +33339,7 @@
    <tbody><tr><td><dfn id=event-media-loadedmetadata title=event-media-loadedmetadata><code>loadedmetadata</code></dfn>
      <td><code><a href=#event>Event</a></code>
      <td>The user agent has just determined the duration and dimensions of the <a href=#media-resource>media resource</a>
-<!--KEEP-END w3c-html--><!--TT-->
  and <a href=#the-text-tracks-are-ready>the text tracks are ready</a>.
-<!--KEEP-START w3c-html--><!--TT-->
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to <code title=dom-media-HAVE_METADATA><a href=#dom-media-have_metadata>HAVE_METADATA</a></code> or greater for the first time.
     <tr><td><dfn id=event-media-loadeddata title=event-media-loadeddata><code>loadeddata</code></dfn>
      <td><code><a href=#event>Event</a></code>
@@ -33482,17 +33357,13 @@
      <td><code><a href=#event>Event</a></code>
      <td>Playback is ready to start after having been paused or delayed due to lack of <a href=#media-data>media data</a>.
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to or greater than <code title=dom-media-HAVE_FUTURE_DATA><a href=#dom-media-have_future_data>HAVE_FUTURE_DATA</a></code> and <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false, or <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is newly false and <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is equal to or greater than <code title=dom-media-HAVE_FUTURE_DATA><a href=#dom-media-have_future_data>HAVE_FUTURE_DATA</a></code>. Even if this event fires, the element might still not be <a href=#potentially-playing>potentially playing</a>, e.g. if
-<!--CONTROLLER-->
      the element is <a href=#blocked-on-its-media-controller>blocked on its media controller</a> (e.g. because the <a href=#current-media-controller>current media controller</a> is paused, or another <a href=#slaved-media-elements title="slaved media elements">slaved media element</a> is stalled somehow, or because the <a href=#media-resource>media resource</a> has no data corresponding to the <a href=#media-controller-position>media controller position</a>), or
-<!--CONTROLLER-->
      the element is <a href=#paused-for-user-interaction>paused for user interaction</a>.
     <tr><td><dfn id=event-media-waiting title=event-media-waiting><code>waiting</code></dfn>
      <td><code><a href=#event>Event</a></code>
      <td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is equal to or less than <code title=dom-media-HAVE_CURRENT_DATA><a href=#dom-media-have_current_data>HAVE_CURRENT_DATA</a></code>, and <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false. Either <code title=dom-media-seeking><a href=#dom-media-seeking>seeking</a></code> is true, or the <a href=#current-playback-position>current playback position</a> is not contained in any of the ranges in <code title=dom-media-buffered><a href=#dom-media-buffered>buffered</a></code>. It is possible for playback to stop for other reasons without <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> being false, but those reasons do not fire this event (and when those situations resolve, a separate <code title=event-media-playing><a href=#event-media-playing>playing</a></code> event is not fired either): e.g.
-<!--CONTROLLER-->
      the element is newly <a href=#blocked-on-its-media-controller>blocked on its media controller</a>, or
-<!--CONTROLLER-->
      <a href=#ended-playback title="ended playback">playback ended</a>, or playback <a href=#stopped-due-to-errors>stopped due to errors</a>, or the element has <a href=#paused-for-user-interaction>paused for user interaction</a>.
    <tbody><tr><td><dfn id=event-media-seeking title=event-media-seeking><code>seeking</code></dfn>
      <td><code><a href=#event>Event</a></code>
@@ -33531,7 +33402,7 @@
      <td><code><a href=#event>Event</a></code>
      <td>Either the <code title=dom-media-volume><a href=#dom-media-volume>volume</a></code> attribute or the <code title=dom-media-muted><a href=#dom-media-muted>muted</a></code> attribute has changed. Fired after the relevant attribute's setter has returned.
      <td>
-  </table><!--CONTROLLER--><p>The following events fire on <code><a href=#mediacontroller>MediaController</a></code> objects:</p>
+  </table><p>The following events fire on <code><a href=#mediacontroller>MediaController</a></code> objects:</p>
 
   <table><thead><tr><th>Event name
      <th>Interface
@@ -33580,7 +33451,7 @@
     <tr><td><dfn id=event-mediacontroller-volumechange title=event-MediaController-volumechange><code>volumechange</code></dfn>
      <td><code><a href=#event>Event</a></code>
      <td>Either the <code title=dom-MediaController-volume><a href=#dom-mediacontroller-volume>volume</a></code> attribute or the <code title=dom-MediaController-muted><a href=#dom-mediacontroller-muted>muted</a></code> attribute has just been updated.
-  </table><!--CONTROLLER--><div class=impl>
+  </table><div class=impl>
 
   <h5 id=security-and-privacy-considerations><span class=secno>4.8.10.17 </span>Security and privacy considerations</h5>
 
@@ -33690,14 +33561,12 @@
   buffer everything and allow the user to seek through the earlier
   material, pause it, play it forwards and backwards, etc.</p>
 
-<!--CONTROLLER-->
   <p>When multiple tracks are synchronised with a
   <code><a href=#mediacontroller>MediaController</a></code>, it is possible for scripts to add and
   remove media elements from the <code><a href=#mediacontroller>MediaController</a></code>'s list
   of <a href=#slaved-media-elements>slaved media elements</a>, even while these tracks are
   playing. How smoothly the media plays back in such situations is
   another quality-of-implementation issue.</p>
-<!--CONTROLLER-->
 
   <hr><p>When a <a href=#media-element>media element</a> that is paused is <a href=#remove-an-element-from-a-document title="remove an element from a document">removed from a
   document</a> and not reinserted before the next time the
@@ -60256,9 +60125,7 @@
            attribute <a href=#function>Function</a> <a href=#handler-onchange title=handler-onchange>onchange</a>;
            attribute <a href=#function>Function</a> <a href=#handler-onclick title=handler-onclick>onclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-oncontextmenu title=handler-oncontextmenu>oncontextmenu</a>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-oncuechange title=handler-oncuechange>oncuechange</a>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-ondblclick title=handler-ondblclick>ondblclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondrag title=handler-ondrag>ondrag</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondragend title=handler-ondragend>ondragend</a>;
@@ -66926,9 +66793,7 @@
     <tr><td><dfn id=handler-onchange title=handler-onchange><code>onchange</code></dfn> <td> <code title=event-change>change</code> <!-- widely used -->
     <tr><td><dfn id=handler-onclick title=handler-onclick><code>onclick</code></dfn> <td> <code title=event-click><a href=#event-click>click</a></code> <!-- widely used -->
     <tr><td><dfn id=handler-oncontextmenu title=handler-oncontextmenu><code>oncontextmenu</code></dfn> <td> <code title=event-contextmenu>contextmenu</code> <!-- widely used -->
-<!--KEEP-END w3c-html--><!--TT-->
     <tr><td><dfn id=handler-oncuechange title=handler-oncuechange><code>oncuechange</code></dfn> <td> <code title=event-cuechange>cuechange</code>
-<!--KEEP-START w3c-html--><!--TT-->
     <tr><td><dfn id=handler-ondblclick title=handler-ondblclick><code>ondblclick</code></dfn> <td> <code title=event-dblclick>dblclick</code> <!-- widely used -->
     <tr><td><dfn id=handler-ondrag title=handler-ondrag><code>ondrag</code></dfn> <td> <code title=event-drag><a href=#event-drag>drag</a></code>
     <tr><td><dfn id=handler-ondragend title=handler-ondragend><code>ondragend</code></dfn> <td> <code title=event-dragend><a href=#event-dragend>dragend</a></code>
@@ -90189,7 +90054,6 @@
   the <code><a href=#video>video</a></code> element itself, and is expected to be
   centered in the <code><a href=#video>video</a></code> element.</p>
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>Any subtitles or captions are expected to be overlayed directly
   on top of their <code><a href=#video>video</a></code> element, as defined by the
   relevant rendering rules; for <a href=#webvtt>WebVTT</a>, those are the
@@ -90203,7 +90067,6 @@
   track showing by default">showing by default</a> (e.g., for <a href=#text-track title="text track">text tracks</a> based on
   <a href=#webvtt>WebVTT</a>, the <a href=#rules-for-updating-the-display-of-webvtt-text-tracks>rules for updating the display of
   WebVTT text tracks</a>).</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p class=note>Resizing <code><a href=#video>video</a></code> and <code><a href=#the-canvas-element>canvas</a></code>
   elements does not interrupt video playback or clear the canvas.</p>
@@ -90218,8 +90081,6 @@
   </div>
 
 
-<!--KEEP-END w3c-html--><!--TT-->
-<!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
   <div class=impl>
 
   <h4 id=timed-text-tracks-0><span class=secno>15.3.2 </span>Timed text tracks</h4>
@@ -90228,6 +90089,7 @@
   module once an editor is found to run with it.</p>
 
 
+
   <h5 id=webvtt-cue-text-rendering-rules><span class=secno>15.3.2.1 </span><dfn>WebVTT cue text rendering rules</dfn></h5>
 
   <p>The <dfn id=rules-for-updating-the-display-of-webvtt-text-tracks>rules for updating the display of WebVTT text
@@ -91033,8 +90895,7 @@
 
   </div>
 
-<!--</div>-->
-<!--KEEP-START w3c-html--><!--TT-->
+<!--TTVTT-->
 
 
 
@@ -94360,7 +94221,7 @@
   <code><a href=#text/ping>text/ping</a></code> resources.</p>
 <!--PING-->
 
-<!--TT-->
+<!--TTVTT-->
 <div data-component="other Hixie drafts (editor: Ian Hickson)">
   <h3 id=text/vtt><span class=secno>17.6 </span><dfn><code>text/vtt</code></dfn></h3>
 
@@ -94439,7 +94300,7 @@
   </dl><p>Fragment identifiers have no meaning with
   <code><a href=#text/vtt>text/vtt</a></code> resources.</p>
 </div>
-<!--TT-->
+<!--TTVTT-->
 
 <!--MD-->
 
@@ -94736,7 +94597,7 @@
          <code title=attr-media-src><a href=#attr-media-src>src</a></code>;
          <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>;
          <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>;
-<!--CONTROLLER-->         <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>;<!--CONTROLLER-->
+         <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>;
          <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>;
          <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code></td>
      <td><code><a href=#htmlaudioelement>HTMLAudioElement</a></code></td>
@@ -95727,7 +95588,7 @@
          <code><a href=#the-td-element>td</a></code></td>
      <td><a href=#global-attributes title="global attributes">globals</a></td>
      <td><code><a href=#htmltablerowelement>HTMLTableRowElement</a></code></td>
-    </tr><!--KEEP-END w3c-html--><!--TT--><tr><th><code><a href=#the-track-element>track</a></code></th>
+    <tr><th><code><a href=#the-track-element>track</a></code></th>
      <td>Timed text track</td>
      <td>none</td>
      <td><code><a href=#audio>audio</a></code>;
@@ -95740,7 +95601,7 @@
          <code title=attr-track-src><a href=#attr-track-src>src</a></code>;
          <code title=attr-track-srclang><a href=#attr-track-srclang>srclang</a></code></td>
      <td><code><a href=#htmltrackelement>HTMLTrackElement</a></code></td>
-    </tr><!--KEEP-START w3c-html--><!--TT--><tr><th><code><a href=#the-u-element>u</a></code></th>
+    <tr><th><code><a href=#the-u-element>u</a></code></th>
      <td>Keywords</td>
      <td><a href=#flow-content title="Flow content">flow</a>;
          <a href=#phrasing-content title="Phrasing content">phrasing</a></td>
@@ -95777,7 +95638,7 @@
          <code title=attr-video-poster><a href=#attr-video-poster>poster</a></code>;
          <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>;
          <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>;
-<!--CONTROLLER-->         <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>;<!--CONTROLLER-->
+         <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>;
          <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>;
          <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code>;
          <code title=attr-dim-width><a href=#attr-dim-width>width</a></code>;
@@ -96424,7 +96285,6 @@
      <td> <code title=attr-keygen-keytype><a href=#attr-keygen-keytype>keygen</a></code>
      <td> The type of cryptographic key to generate
      <td> <a href=#attribute-text>Text</a>*
-<!--KEEP-END w3c-html--><!--TT-->
     <tr><th> <code title="">kind</code>
      <td> <code title=attr-track-kind><a href=#attr-track-kind>track</a></code>
      <td> The type of text track
@@ -96433,15 +96293,12 @@
           "<code title=attr-track-kind-descriptions><a href=#attr-track-kind-descriptions>descriptions</a></code>";
           "<code title=attr-track-kind-chapters><a href=#attr-track-kind-chapters>chapters</a></code>";
           "<code title=attr-track-kind-metadata><a href=#attr-track-kind-metadata>metadata</a></code>"
-<!--KEEP-START w3c-html--><!--TT-->
     <tr><th> <code title="">label</code>
      <td> <code title=attr-command-label><a href=#attr-command-label>command</a></code>;
           <code title=attr-menu-label><a href=#attr-menu-label>menu</a></code>;
           <code title=attr-optgroup-label><a href=#attr-optgroup-label>optgroup</a></code>;
           <code title=attr-option-label><a href=#attr-option-label>option</a></code>;
-<!--KEEP-END w3c-html--><!--TT-->
           <code title=attr-track-label><a href=#attr-track-label>track</a></code>
-<!--KEEP-START w3c-html--><!--TT-->
      <td> User-visible label
      <td> <a href=#attribute-text>Text</a>
     <tr><th> <code title="">lang</code>
@@ -96487,13 +96344,11 @@
           <code title=attr-style-media><a href=#attr-style-media>style</a></code>
      <td> Applicable media
      <td> <a href=#valid-media-query>Valid media query</a>
-<!--CONTROLLER-->
     <tr><th> <code title="">mediagroup</code>
      <td> <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>audio</a></code>;
           <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>video</a></code>
      <td> Groups <a href=#media-element title="media element">media elements</a> together with an implicit <code><a href=#mediacontroller>MediaController</a></code>
      <td> <a href=#attribute-text>Text</a>
-<!--CONTROLLER-->
     <tr><th> <code title="">method</code>
      <td> <code title=attr-fs-method><a href=#attr-fs-method>form</a></code>
      <td> HTTP method to use for <a href=#form-submission>form submission</a>
@@ -96678,9 +96533,7 @@
           <code title=attr-input-src><a href=#attr-input-src>input</a></code>;
           <code title=attr-script-src><a href=#attr-script-src>script</a></code>;
           <code title=attr-source-src><a href=#attr-source-src>source</a></code>;
-<!--KEEP-END w3c-html--><!--TT-->
           <code title=attr-track-src><a href=#attr-track-src>track</a></code>;
-<!--KEEP-START w3c-html--><!--TT-->
           <code title=attr-media-src><a href=#attr-media-src>video</a></code>
      <td> Address of the resource
      <td> <a href=#valid-non-empty-url-potentially-surrounded-by-spaces>Valid non-empty URL potentially surrounded by spaces</a>
@@ -96688,12 +96541,10 @@
      <td> <code title=attr-iframe-srcdoc><a href=#attr-iframe-srcdoc>iframe</a></code>
      <td> A document to render in the <code><a href=#the-iframe-element>iframe</a></code>
      <td> The source of <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a>*
-<!--KEEP-END w3c-html--><!--TT-->
     <tr><th> <code title="">srclang</code>
      <td> <code title=attr-track-srclang><a href=#attr-track-srclang>track</a></code>
      <td> Language of the text track
      <td> Valid BCP 47 language tag
-<!--KEEP-START w3c-html--><!--TT-->
     <tr><th> <code title="">start</code>
      <td> <code title=attr-ol-start><a href=#attr-ol-start>ol</a></code>
      <td> <a href=#ordinal-value>Ordinal value</a> of the first item
@@ -96883,12 +96734,11 @@
      <td> <a href=#handler-oncontextmenu title=handler-oncontextmenu>HTML elements</a>
      <td> <code title=event-contextmenu>contextmenu</code> event handler
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-<!--KEEP-END w3c-html--><!--TT-->
+
     <tr><th id=ix-handler-oncuechange> <code title="">oncuechange</code>
      <td> <a href=#handler-oncuechange title=handler-oncuechange>HTML elements</a>
      <td> <code title=event-cuechange>cuechange</code> event handler
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-<!--KEEP-START w3c-html--><!--TT-->
 
     <tr><th id=ix-handler-ondblclick> <code title="">ondblclick</code>
      <td> <a href=#handler-ondblclick title=handler-ondblclick>HTML elements</a>
@@ -97528,10 +97378,8 @@
     <tr><td> <code><a href=#the-tr-element>tr</a></code>
      <td> <code><a href=#htmltablerowelement>HTMLTableRowElement</a></code> : <code><a href=#htmlelement>HTMLElement</a></code>
 
-<!--KEEP-END w3c-html--><!--TT-->
     <tr><td> <code><a href=#the-track-element>track</a></code>
      <td> <code><a href=#htmltrackelement>HTMLTrackElement</a></code> : <code><a href=#htmlelement>HTMLElement</a></code>
-<!--KEEP-START w3c-html--><!--TT-->
 
     <tr><td> <code><a href=#the-u-element>u</a></code>
      <td> <code><a href=#htmlelement>HTMLElement</a></code>
@@ -98800,12 +98648,10 @@
   microdata feature.</p>
 <!--MD-->
 
-<!--TT-->
   <p>Thanks to the SubRip community, including in particular Zuggy and
   ai4spam, for their work on the SubRip software program whose SRT
   file format was used as the basis for the WebVTT text track file
   format.</p>
-<!--TT-->
 
   <div class=impl>
 

Modified: index
===================================================================
--- index	2011-04-25 23:18:11 UTC (rev 6030)
+++ index	2011-04-26 19:31:42 UTC (rev 6031)
@@ -243,7 +243,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 25 April 2011</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 26 April 2011</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -1340,7 +1340,7 @@
 
   <ul class=brief><li>The <code><a href=#peerconnection>PeerConnection</a></code> API and related video-conferencing features.</li> <!--PEERCONTROLLER-->
    <li>The <code title=attr-hyperlink-ping><a href=#ping>ping</a></code> attribute and related <a href=#hyperlink-auditing>hyperlink auditing</a> features.</li> <!--PING-->
-   <li>The <a href=#webvtt>WebVTT</a> format and some <a href=#text-track>text track</a> API features.</li> <!--TT--> <!--TTVTT-->
+   <li>The <a href=#webvtt>WebVTT</a> format and some <a href=#text-track>text track</a> API features.</li> <!--TTVTT-->
    <li>Rules for <a href=#atom>converting HTML to Atom</a>.</li> <!--MD-->
    <li>The <code title=dom-document-cssElementMap><a href=#dom-document-csselementmap>cssElementMap</a></code> feature for defining <span title="CSS element reference identifier">CSS element reference identifiers</span>.</li> <!--CSSREF-->
    <li>An experimental <code><a href=#undomanager>UndoManager</a></code> interface.</li><!--UNDO-->
@@ -8658,9 +8658,7 @@
            attribute <a href=#function>Function</a> <a href=#handler-onchange title=handler-onchange>onchange</a>;
            attribute <a href=#function>Function</a> <a href=#handler-onclick title=handler-onclick>onclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-oncontextmenu title=handler-oncontextmenu>oncontextmenu</a>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-oncuechange title=handler-oncuechange>oncuechange</a>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-ondblclick title=handler-ondblclick>ondblclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondrag title=handler-ondrag>ondrag</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondragend title=handler-ondragend>ondragend</a>;
@@ -9838,9 +9836,7 @@
            attribute <a href=#function>Function</a> <a href=#handler-onchange title=handler-onchange>onchange</a>;
            attribute <a href=#function>Function</a> <a href=#handler-onclick title=handler-onclick>onclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-oncontextmenu title=handler-oncontextmenu>oncontextmenu</a>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-oncuechange title=handler-oncuechange>oncuechange</a>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-ondblclick title=handler-ondblclick>ondblclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondrag title=handler-ondrag>ondrag</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondragend title=handler-ondragend>ondragend</a>;
@@ -9944,9 +9940,7 @@
    <li><code title=handler-onchange><a href=#handler-onchange>onchange</a></code></li>
    <li><code title=handler-onclick><a href=#handler-onclick>onclick</a></code></li>
    <li><code title=handler-oncontextmenu><a href=#handler-oncontextmenu>oncontextmenu</a></code></li>
-<!--KEEP-END w3c-html--><!--TT-->
    <li><code title=handler-oncuechange><a href=#handler-oncuechange>oncuechange</a></code></li>
-<!--KEEP-START w3c-html--><!--TT-->
    <li><code title=handler-ondblclick><a href=#handler-ondblclick>ondblclick</a></code></li>
    <li><code title=handler-ondrag><a href=#handler-ondrag>ondrag</a></code></li>
    <li><code title=handler-ondragend><a href=#handler-ondragend>ondragend</a></code></li>
@@ -25213,14 +25207,10 @@
    <dd>Where <a href=#embedded-content>embedded content</a> is expected.</dd>
    <dt>Content model:</dt>
    <dd>If the element has a <code title=attr-media-src><a href=#attr-media-src>src</a></code> attribute:
-<!--KEEP-END w3c-html--><!--TT-->
  zero or more <code><a href=#the-track-element>track</a></code> elements, then
-<!--KEEP-START w3c-html--><!--TT-->
  <a href=#transparent>transparent</a>, but with no <a href=#media-element>media element</a> descendants.</dd>
    <dd>If the element does not have a <code title=attr-media-src><a href=#attr-media-src>src</a></code> attribute: zero or more <code><a href=#the-source-element>source</a></code> elements, then
-<!--KEEP-END w3c-html--><!--TT-->
  zero or more <code><a href=#the-track-element>track</a></code> elements, then
-<!--KEEP-START w3c-html--><!--TT-->
  <a href=#transparent>transparent</a>, but with no <a href=#media-element>media element</a> descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
@@ -25228,7 +25218,7 @@
    <dd><code title=attr-video-poster><a href=#attr-video-poster>poster</a></code></dd>
    <dd><code title=attr-media-preload><a href=#attr-media-preload>preload</a></code></dd>
    <dd><code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code></dd>
-<!--CONTROLLER-->   <dd><code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code></dd><!--CONTROLLER-->
+   <dd><code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code></dd>
    <dd><code title=attr-media-loop><a href=#attr-media-loop>loop</a></code></dd>
    <dd><code title=attr-media-muted><a href=#attr-media-muted>muted</a></code></dd>
    <dd><code title=attr-media-controls><a href=#attr-media-controls>controls</a></code></dd>
@@ -25267,9 +25257,7 @@
   with associated audio data.</p>
 
   <p>The <code title=attr-media-src><a href=#attr-media-src>src</a></code>, <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>, <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>,
   <code title=attr-media-muted><a href=#attr-media-muted>muted</a></code>, and <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code> attributes are <a href=#media-element-attributes title="media element attributes">the attributes common to all media
   elements</a>.</p>
@@ -25372,14 +25360,12 @@
   particular playback position is defined by the video stream's
   format.</p>
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>The <code><a href=#video>video</a></code> element also <a href=#represents>represents</a> any
   <a href=#text-track-cue title="text track cue">text track cues</a> whose
   <a href=#text-track-cue-active-flag>text track cue active flag</a> is set and whose
   <a href=#text-track>text track</a> is in the <a href=#text-track-showing title="text track
   showing">showing</a> or <a href=#text-track-showing-by-default title="text track showing by
   default">showing by default</a> modes.</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p>In addition to the above, the user agent may provide messages to
   the user (such as "buffering", "no video loaded", "error", or more
@@ -25554,21 +25540,17 @@
    <dd>Where <a href=#embedded-content>embedded content</a> is expected.</dd>
    <dt>Content model:</dt>
    <dd>If the element has a <code title=attr-media-src><a href=#attr-media-src>src</a></code> attribute: 
-<!--KEEP-END w3c-html--><!--TT-->
 zero or more <code><a href=#the-track-element>track</a></code> elements, then 
-<!--KEEP-START w3c-html--><!--TT-->
 <a href=#transparent>transparent</a>, but with no <a href=#media-element>media element</a> descendants.</dd>
    <dd>If the element does not have a <code title=attr-media-src><a href=#attr-media-src>src</a></code> attribute: one or more <code><a href=#the-source-element>source</a></code> elements, then
-<!--KEEP-END w3c-html--><!--TT-->
  zero or more <code><a href=#the-track-element>track</a></code> elements, then
-<!--KEEP-START w3c-html--><!--TT-->
  <a href=#transparent>transparent</a>, but with no <a href=#media-element>media element</a> descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-media-src><a href=#attr-media-src>src</a></code></dd>
    <dd><code title=attr-media-preload><a href=#attr-media-preload>preload</a></code></dd>
    <dd><code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code></dd>
-<!--CONTROLLER-->   <dd><code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code></dd><!--CONTROLLER-->
+   <dd><code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code></dd>
    <dd><code title=attr-media-loop><a href=#attr-media-loop>loop</a></code></dd>
    <dd><code title=attr-media-muted><a href=#attr-media-muted>muted</a></code></dd>
    <dd><code title=attr-media-controls><a href=#attr-media-controls>controls</a></code></dd>
@@ -25616,9 +25598,7 @@
   whose <a href=#media-data>media data</a> is ostensibly audio data.</p>
 
   <p>The <code title=attr-media-src><a href=#attr-media-src>src</a></code>, <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>, <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>,
-<!--CONTROLLER-->
   <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>,
   <code title=attr-media-muted><a href=#attr-media-muted>muted</a></code>, and <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code> attributes are <a href=#media-element-attributes title="media element attributes">the attributes common to all media
   elements</a>.</p>
@@ -25701,9 +25681,7 @@
    <dd>None.</dd>
    <dt>Contexts in which this element can be used:</dt>
    <dd>As a child of a <a href=#media-element>media element</a>, before any <a href=#flow-content>flow content</a>
-<!--KEEP-END w3c-html--><!--TT-->
  or <code><a href=#the-track-element>track</a></code> elements.</dd>
-<!--KEEP-START w3c-html--><!--TT-->
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -25886,9 +25864,6 @@
 
 
 
-<!--KEEP-END w3c-html--><!--TT-->
-<!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
-
   <h4 id=the-track-element><span class=secno>4.8.9 </span>The <dfn><code>track</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
@@ -26063,8 +26038,6 @@
 
   </div>
 
-<!--</div>-->
-<!--KEEP-START w3c-html--><!--TT-->
 
 
   <h4 id=media-elements><span class=secno>4.8.10 </span>Media elements</h4>
@@ -26117,31 +26090,26 @@
            attribute boolean <a href=#dom-media-loop title=dom-media-loop>loop</a>;
   void <a href=#dom-media-play title=dom-media-play>play</a>();
   void <a href=#dom-media-pause title=dom-media-pause>pause</a>();
-<!--CONTROLLER-->
+
   // media controller
            attribute <span>DOMString</span> <a href=#dom-media-mediagroup title=dom-media-mediaGroup>mediaGroup</a>;
-           attribute <a href=#mediacontroller>MediaController</a> <a href=#dom-media-controller title=dom-media-controller>controller</a>;<!--CONTROLLER-->
+           attribute <a href=#mediacontroller>MediaController</a> <a href=#dom-media-controller title=dom-media-controller>controller</a>;
 
   // controls
            attribute boolean <a href=#dom-media-controls title=dom-media-controls>controls</a>;
            attribute double <a href=#dom-media-volume title=dom-media-volume>volume</a>;
            attribute boolean <a href=#dom-media-muted title=dom-media-muted>muted</a>;
            attribute boolean <a href=#dom-media-defaultmuted title=dom-media-defaultMuted>defaultMuted</a>;
-<!--KEEP-END w3c-html--><!--TT-->
+
   // tracks
-<!--CONTROLLER-->
   readonly attribute <a href=#multipletracklist>MultipleTrackList</a> <a href=#dom-media-audiotracks title=dom-media-audioTracks>audioTracks</a>;
   readonly attribute <a href=#exclusivetracklist>ExclusiveTrackList</a> <a href=#dom-media-videotracks title=dom-media-videoTracks>videoTracks</a>;
-<!--CONTROLLER-->
   readonly attribute <a href=#texttrack>TextTrack</a>[] <a href=#dom-media-texttracks title=dom-media-textTracks>textTracks</a>;
   <a href=#mutabletexttrack>MutableTextTrack</a> <a href=#dom-media-addtexttrack title=dom-media-addTextTrack>addTextTrack</a>(in DOMString kind, in optional DOMString label, in optional DOMString language);
-<!--KEEP-START w3c-html--><!--TT-->
 };</pre>
 
   <p>The <dfn id=media-element-attributes>media element attributes</dfn>, <code title=attr-media-src><a href=#attr-media-src>src</a></code>, <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>, <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>, 
-<!--CONTROLLER-->
   <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>,
   <code title=attr-media-muted><a href=#attr-media-muted>muted</a></code>, and <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code>, apply to all <a href=#media-element title="media element">media elements</a>. They are defined in
   this section.</p>
@@ -26188,7 +26156,6 @@
   resource</dfn> is used to refer to the complete set of media data,
   e.g. the complete video file, or complete audio file.</p>
 
-<!--CONTROLLER-->
   <p>A <a href=#media-resource>media resource</a> can have multiple audio and video
   tracks. For the purposes of a <a href=#media-element>media element</a>, the video
   data of the <a href=#media-resource>media resource</a> is only that of the
@@ -26197,7 +26164,6 @@
   mixing all the currently enabled tracks (if any) given by the
   element's <code title=dom-media-audioTracks><a href=#dom-media-audiotracks>audioTracks</a></code>
   attribute.</p>
-<!--CONTROLLER-->
 
   <p class=note>Both <code><a href=#audio>audio</a></code> and <code><a href=#video>video</a></code>
   elements can be used for both audio and video. The main difference
@@ -26565,10 +26531,8 @@
      <li><p>Set the <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
      <code title=dom-media-NETWORK_EMPTY><a href=#dom-media-network_empty>NETWORK_EMPTY</a></code>.</li>
 
-<!--KEEP-END w3c-html--><!--TT-->
      <li><p><a href="#forget-the-media-element's-media-resource-specific-text-tracks">Forget the media element's media-resource-specific
      text tracks</a>.</li>
-<!--KEEP-START w3c-html--><!--TT-->
 
      <li><p>If <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is
      not set to <code title=dom-media-HAVE_NOTHING><a href=#dom-media-have_nothing>HAVE_NOTHING</a></code>, then set it
@@ -26716,10 +26680,8 @@
        attribute to a new <code><a href=#mediaerror>MediaError</a></code> object whose <code title=dom-MediaError-code><a href=#dom-mediaerror-code>code</a></code> attribute is set to
        <code title=dom-MediaError-MEDIA_ERR_SRC_NOT_SUPPORTED><a href=#dom-mediaerror-media_err_src_not_supported>MEDIA_ERR_SRC_NOT_SUPPORTED</a></code>.</li>
 
-<!--KEEP-END w3c-html--><!--TT-->
        <li><p><a href="#forget-the-media-element's-media-resource-specific-text-tracks">Forget the media element's media-resource-specific
        text tracks</a>.</li>
-<!--KEEP-START w3c-html--><!--TT-->
 
        <li><p>Set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
        the <a href=#dom-media-network_no_source title=dom-media-NETWORK_NO_SOURCE>NETWORK_NO_SOURCE</a>
@@ -26836,10 +26798,8 @@
      <a href=#synchronous-section>synchronous section</a> has ended. (Steps in <a href=#synchronous-section title="synchronous section">synchronous sections</a> are
      marked with ⌛.)</li>
 
-<!--KEEP-END w3c-html--><!--TT-->
      <li><p>⌛ <a href="#forget-the-media-element's-media-resource-specific-text-tracks">Forget the media element's
      media-resource-specific text tracks</a>.</li>
-<!--KEEP-START w3c-html--><!--TT-->
 
      <li><p>⌛ <i title="">Find next candidate</i>: Let <var title="">candidate</var> be null.</li>
 
@@ -27005,9 +26965,7 @@
      data</a> has been fetched to determine the duration of the
      <a href=#media-resource>media resource</a>, its dimensions, and other
      metadata,
-<!--KEEP-END w3c-html--><!--TT-->
      and once <a href=#the-text-tracks-are-ready>the text tracks are ready</a>
-<!--KEEP-START w3c-html--><!--TT-->
      </dt>
 
      <dd>
@@ -27089,7 +27047,6 @@
 
        </li>
 
-<!--CONTROLLER-->
        <li><p>If either the <a href=#media-resource>media resource</a> or the address
        of the <var title="">current media resource</var> indicate a
        particular set of audio or video tracks to enable, then the
@@ -27119,7 +27076,6 @@
        the media controller to that time if it's not already past it.
        (So if there are several, you'll jump the media controller to
        the furthest one in the timeline.) -->
-<!--CONTROLLER-->
 
        <li>
 
@@ -27299,7 +27255,6 @@
      </dd>
 
 
-<!--KEEP-END w3c-html--><!--TT-->
      <dt id=found-a-media-resource-specific-timed-track>If the <a href=#media-resource>media resource</a> is found to declare a <a href=#media-resource-specific-text-track>media-resource-specific text track</a> that the user agent supports</dt>
 
      <dd>
@@ -27317,7 +27272,6 @@
       interface.</p>
 
      </dd>
-<!--KEEP-START w3c-html--><!--TT-->
 
     </dl><p>When the <a href=#networking-task-source>networking task source</a> has <a href=#queue-a-task title="queue a task">queued</a> the last <a href=#concept-task title=concept-task>task</a> as part of <a href=#fetch title=fetch>fetching</a> the <a href=#media-resource>media resource</a>
     (i.e. once the download has completed), if the fetching process
@@ -27469,9 +27423,7 @@
 
     <p>Will throw an <code><a href=#invalid_state_err>INVALID_STATE_ERR</a></code> exception if there
     is no selected <a href=#media-resource>media resource</a>
-<!--CONTROLLER-->
     or if there is a <a href=#current-media-controller>current media controller</a>.
-<!--CONTROLLER-->
     Will throw an
     <code><a href=#index_size_err>INDEX_SIZE_ERR</a></code> exception if the given time is not
     within the ranges to which the user agent can seek.</p>
@@ -27568,11 +27520,9 @@
   resource</a>-dependent, but it should approximate the user's wall
   clock.</p>
 
-<!--CONTROLLER-->
   <p class=note>All the <a href=#media-element title="media element">media
   elements</a> that share <a href=#current-media-controller>current media controller</a> use
   the same clock for their <a href=#media-timeline>media timeline</a>.</p>
-<!--CONTROLLER-->
 
   <p><a href=#media-element title="media element">Media elements</a> have a
   <dfn id=current-playback-position>current playback position</dfn>, which must initially (i.e. in
@@ -27583,11 +27533,9 @@
   <p>The <dfn id=dom-media-currenttime title=dom-media-currentTime><code>currentTime</code></dfn>
   attribute must, on getting, return the <a href=#current-playback-position>current playback
   position</a>, expressed in seconds. On setting,
-<!--CONTROLLER-->
   if the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, then it must throw an
   <code><a href=#invalid_state_err>INVALID_STATE_ERR</a></code> exception; otherwise,
-<!--CONTROLLER-->
   the user agent
   must <a href=#dom-media-seek title=dom-media-seek>seek</a> to the new value
   (which might raise an exception).</p>
@@ -27678,11 +27626,9 @@
   indicates that the <a href=#media-element>media element</a> is to seek back to the
   start of the <a href=#media-resource>media resource</a> upon reaching the end.</p>
 
-<!--CONTROLLER-->
   <p>The <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code> attribute has no
   effect while the element has a <a href=#current-media-controller>current media
   controller</a>.</p>
-<!--CONTROLLER-->
 
   <div class=impl>
 
@@ -27735,10 +27681,8 @@
    will no longer raise an exception when seeking. No <a href=#media-data>media
    data</a> is available for the immediate <a href=#current-playback-position>current playback
    position</a>.
-<!--KEEP-END w3c-html--><!--TT-->
    The <a href=#text-track title="text track">text tracks</a>
    are <a href=#the-text-tracks-are-ready title="the text tracks are ready">ready</a>.
-<!--KEEP-START w3c-html--><!--TT-->
    </dd>
 
    <dt><dfn id=dom-media-have_current_data title=dom-media-HAVE_CURRENT_DATA><code>HAVE_CURRENT_DATA</code></dfn> (numeric value 2)</dt>
@@ -27895,12 +27839,10 @@
 
     </dl></li>
 
-<!--CONTROLLER-->
    <li><p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
    controller</a>, then <a href=#report-the-controller-state>report the controller state</a>
    for the <a href=#media-element>media element</a>'s <a href=#current-media-controller>current media
    controller</a>.</li>
-<!--CONTROLLER-->
 
   </ol></div>
 
@@ -27977,13 +27919,11 @@
     normal playback mode, it is expected that the rate of playback
     will be returned to the default rate of playback.</p>
 
-<!--CONTROLLER-->
     <p>When the element has a <a href=#current-media-controller>current media controller</a>,
     the <code title=dom-media-defaultPlaybackRate><a href=#dom-media-defaultplaybackrate>defaultPlaybackRate</a></code>
     attribute is ignored and the <a href=#current-media-controller>current media
     controller</a>'s <code title=dom-MediaController-defaultPlaybackRate><a href=#dom-mediacontroller-defaultplaybackrate>defaultPlaybackRate</a></code>
     is used instead.</p>
-<!--CONTROLLER-->
 
    </dd>
 
@@ -27995,13 +27935,11 @@
 
     <p>Can be set, to change the rate of playback.</p>
 
-<!--CONTROLLER-->
     <p>When the element has a <a href=#current-media-controller>current media controller</a>,
     the <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code>
     attribute is ignored and the <a href=#current-media-controller>current media
     controller</a>'s <code title=dom-MediaController-playbackRate><a href=#dom-mediacontroller-playbackrate>playbackRate</a></code> is
     used instead.</p>
-<!--CONTROLLER-->
 
    </dd>
 
@@ -28052,11 +27990,9 @@
   playing</dfn> when its <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code>
   attribute is false, the element has not <a href=#ended-playback>ended playback</a>,
   playback has not <a href=#stopped-due-to-errors>stopped due to errors</a>, 
-<!--CONTROLLER-->
   the element either has no <a href=#current-media-controller>current media controller</a> or
   has a <a href=#current-media-controller>current media controller</a> but is not <a href=#blocked-on-its-media-controller>blocked
   on its media controller</a>,
-<!--CONTROLLER-->
   and the element is not a <a href=#blocked-media-element>blocked media element</a>.</p>
 
   <p>A <a href=#media-element>media element</a> is said to have <dfn id=ended-playback>ended
@@ -28075,14 +28011,10 @@
      <li>The <a href=#direction-of-playback>direction of playback</a> is forwards, and
 
      <li>
-<!--CONTROLLER-->
      Either
-<!--CONTROLLER-->
      the <a href=#media-element>media element</a> does not have a <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code> attribute specified,
-<!--CONTROLLER-->
      or the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
      controller</a>.
-<!--CONTROLLER-->
 
     </ul><p>Or:
 
@@ -28112,7 +28044,6 @@
   the user agent has reached a point in the <a href=#media-resource>media
   resource</a> where the user has to make a selection for the
   resource to continue.
-<!--CONTROLLER-->
   If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a> when this happens, then the user agent must
   <a href=#report-the-controller-state>report the controller state</a> for the <a href=#media-element>media
@@ -28122,7 +28053,6 @@
   to resume, the user agent must similarly <a href=#report-the-controller-state>report the controller
   state</a> for the <a href=#media-element>media element</a>'s <a href=#current-media-controller>current
   media controller</a>.
-<!--CONTROLLER-->
   </p>
 
   <p>It is possible for a <a href=#media-element>media element</a> to have both
@@ -28146,9 +28076,7 @@
   steps:</p>
 
   <ol><li><p>If the <a href=#media-element>media element</a> has a <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code> attribute specified
-<!--CONTROLLER-->
    and does not have a <a href=#current-media-controller>current media controller</a>,
-<!--CONTROLLER-->
    then <a href=#dom-media-seek title=dom-media-seek>seek</a> to the <a href=#earliest-possible-position>earliest
    possible position</a> of the <a href=#media-resource>media resource</a> and
    abort these steps.</li> <!-- v2/v3: We should fire a 'looping'
@@ -28191,9 +28119,7 @@
 
   <p>The <dfn id=dom-media-playbackrate title=dom-media-playbackRate><code>playbackRate</code></dfn>
   attribute gives the <a href=#effective-playback-rate>effective playback rate</a>
-<!--CONTROLLER-->
   (assuming there is no <a href=#current-media-controller>current media controller</a> overriding it),
-<!--CONTROLLER-->
   which is the speed at which the <a href=#media-resource>media resource</a> plays,
   as a multiple of its intrinsic speed. If it is not equal to the
   <code title=dom-media-defaultPlaybackRate><a href=#dom-media-defaultplaybackrate>defaultPlaybackRate</a></code>,
@@ -28202,10 +28128,8 @@
   getting it must return the last value it was set to, or 1.0 if it
   hasn't yet been set; on setting the attribute must be set to the new
   value, and the playback will change speed
-<!--CONTROLLER-->
   (if the element is <a href=#potentially-playing>potentially playing</a> and there is no
   <a href=#current-media-controller>current media controller</a>).</p>
-<!--CONTROLLER-->
 
   <p id=rateUpdate>When the <code title=dom-media-defaultPlaybackRate><a href=#dom-media-defaultplaybackrate>defaultPlaybackRate</a></code> or
   <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code> attributes
@@ -28215,14 +28139,12 @@
   event</a> named <code title=event-media-ratechange><a href=#event-media-ratechange>ratechange</a></code> at the <a href=#media-element>media
   element</a>.</p>
 
-<!--CONTROLLER-->
   <p class=note>The <code title=dom-media-defaultPlaybackRate><a href=#dom-media-defaultplaybackrate>defaultPlaybackRate</a></code> and
   <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code> attributes
   have no effect when the <a href=#media-element>media element</a> has a
   <a href=#current-media-controller>current media controller</a>; the namesake attributes on
   the <code><a href=#mediacontroller>MediaController</a></code> object are used instead in that
   situation.</p>
-<!--CONTROLLER-->
 
   <hr><p>The <dfn id=dom-media-played title=dom-media-played><code>played</code></dfn>
   attribute must return a new static <a href=#normalized-timeranges-object>normalized
@@ -28243,10 +28165,8 @@
 
     <p>If the <a href=#ended-playback title="ended playback">playback has ended</a>
     and the <a href=#direction-of-playback>direction of playback</a> is forwards,
-<!--CONTROLLER-->
     and the <a href=#media-element>media element</a> does not have a <a href=#current-media-controller>current
     media controller</a>,
-<!--CONTROLLER-->
     <a href=#dom-media-seek title=dom-media-seek>seek</a> to the <a href=#earliest-possible-position>earliest
     possible position</a> of the <a href=#media-resource>media resource</a>.</p>
 
@@ -28258,11 +28178,9 @@
 
    </li>
 
-<!--CONTROLLER-->
    <li><p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current
    media controller</a>, then <a href=#bring-the-media-element-up-to-speed-with-its-new-media-controller>bring the media element up
    to speed with its new media controller</a>.</p>
-<!--CONTROLLER-->
 
    <li>
 
@@ -28298,12 +28216,10 @@
    <li><p>Set the <a href=#media-element>media element</a>'s <a href=#autoplaying-flag>autoplaying
    flag</a> to false.</li>
 
-<!--CONTROLLER-->
    <li><p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
    controller</a>, then <a href=#report-the-controller-state>report the controller state</a>
    for the <a href=#media-element>media element</a>'s <a href=#current-media-controller>current media
    controller</a>.</li>
-<!--CONTROLLER-->
 
   </ol><hr><p>When the <dfn id=dom-media-pause title=dom-media-pause><code>pause()</code></dfn>
   method is invoked, and when the user agent is required to pause the
@@ -28333,27 +28249,21 @@
 
     </ol></li>
 
-<!--CONTROLLER-->
    <li><p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
    controller</a>, then <a href=#report-the-controller-state>report the controller state</a>
    for the <a href=#media-element>media element</a>'s <a href=#current-media-controller>current media
    controller</a>.</li>
-<!--CONTROLLER-->
 
   </ol><hr><p>The
-<!--CONTROLLER-->
   <dfn id=effective-playback-rate>effective playback rate</dfn> is not necessarily the element's
   <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code>. When a
   <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, its <a href=#effective-playback-rate>effective playback rate</a> is the
   <code><a href=#mediacontroller>MediaController</a></code>'s <a href=#media-controller-playback-rate>media controller playback
   rate</a>. Otherwise, the
-<!--CONTROLLER-->
   <a href=#effective-playback-rate>effective playback rate</a> is just the element's <code title=dom-media-playbackRate><a href=#dom-media-playbackrate>playbackRate</a></code>.
-<!--CONTROLLER-->
   Thus, the <a href=#current-media-controller>current media controller</a> overrides the
   <a href=#media-element>media element</a>.
-<!--CONTROLLER-->
   </p>
 
   <p>If the <a href=#effective-playback-rate>effective playback rate</a> is positive or zero,
@@ -28398,14 +28308,12 @@
   element is in a state where no further audio could ever be played by
   that element may the element be garbage collected.</p>
 
-<!--CONTROLLER-->
   <p class=note>It is possible for an element to which no explicit
   references exist to play audio, even if such an element is not still
   actively playing: for instance, it could have a <a href=#current-media-controller>current media
   controller</a> that still has references and can still be
   unpaused, or it could be unpaused but stalled waiting for content to
   buffer.</p>
-<!--CONTROLLER-->
 
   <hr><p>When the <a href=#current-playback-position>current playback position</a> of a <a href=#media-element>media
   element</a> changes (e.g. due to playback or seeking), the user
@@ -28413,14 +28321,12 @@
   position</a> changes while the steps are running, then the user
   agent must wait for the steps to complete, and then must immediately
   rerun the steps.
-<!--KEEP-END w3c-html--><!--TT-->
   (These steps are thus run as often as possible or needed — if
   one iteration takes a long time, this can cause certain <a href=#text-track-cue title="text track cue">cues</a> to be skipped over as the user
   agent rushes ahead to "catch up".)
-<!--KEEP-START w3c-html--><!--TT-->
   </p>
 
-  <ol><!--KEEP-END w3c-html--><!--TT--><li><p>Let <var title="">current cues</var> be an ordered list of
+  <ol><li><p>Let <var title="">current cues</var> be an ordered list of
    <a href=#text-track-cue title="text track cue">cues</a>, initialized to contain
    all the <a href=#text-track-cue title="text track cue">cues</a> of all the <a href=#text-track-hidden title="text track hidden">hidden</a>, <a href=#text-track-showing title="text track
    showing">showing</a>, or <a href=#text-track-showing-by-default title="text track showing by
@@ -28439,7 +28345,6 @@
    tracks</a> of the <a href=#media-element>media element</a> that are not
    present in <var title="">current cues</var>, also in <a href=#text-track-cue-order>text
    track cue order</a>.</li>
-<!--KEEP-START w3c-html--><!--TT-->
 
    <li><p>If the time was reached through the usual monotonic increase
    of the <a href=#current-playback-position>current playback position</a> during normal
@@ -28459,7 +28364,6 @@
    not any more frequent than the user agent can comfortably handle
    while decoding the video.</li>
 
-<!--KEEP-END w3c-html--><!--TT-->
    <li><p>If all of the <a href=#text-track-cue title="text track cue">cues</a> in
    <var title="">current cues</var> have their <a href=#text-track-cue-active-flag>text track cue
    active flag</a> set, and none of the <a href=#text-track-cue title="text track
@@ -28527,14 +28431,12 @@
    display of WebVTT text tracks</a>.
 <!--TTVTT-->
    </li>
-<!--KEEP-START w3c-html--><!--TT-->
 
-  </ol><!--KEEP-END w3c-html--><!--TT--><p>For the purposes of the algorithm above, a <a href=#text-track-cue>text track
+  </ol><p>For the purposes of the algorithm above, a <a href=#text-track-cue>text track
   cue</a> is considered to be part of a <a href=#text-track>text track</a>
   only if it is listed in the <a href=#text-track-list-of-cues>text track list of cues</a>,
   not merely if it is associated with the <a href=#text-track>text
   track</a>.</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p class=note>If the <a href=#media-element>media element</a>'s
   <code><a href=#document>Document</a></code> stops being a <a href=#fully-active>fully active</a>
@@ -28710,16 +28612,13 @@
   the user agent must act as if the algorithm for <a href=#dom-media-seek title=dom-media-seek>seeking</a> was used whenever the
   <a href=#current-playback-position>current playback position</a> changes in a discontinuous
   fashion (so that the relevant events fire).
-<!--CONTROLLER-->
   If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, then the user agent must <a href=#seek-the-media-controller>seek the media
   controller</a> appropriately instead.
-<!--CONTROLLER-->
   </p>
 
   </div>
 
-<!--CONTROLLER-->
 
   <h5 id=media-resources-with-multiple-media-tracks><span class=secno>4.8.10.10 </span>Media resources with multiple media tracks</h5>
 
@@ -29849,11 +29748,8 @@
    <audio src="movie.vid#track=Descriptions" mediagroup=main autoduck></audio>
 -->
 
-<!--CONTROLLER-->
 
 
-<!--KEEP-END w3c-html--><!--TT-->
-<!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
   <h5 id=timed-text-tracks><span class=secno>4.8.10.12 </span>Timed text tracks</h5>
 
   <h6 id=text-track-model><span class=secno>4.8.10.12.1 </span>Text track model</h6>
@@ -30616,6 +30512,7 @@
 
 
 <!--TTVTT-->
+<div data-component="other Hixie drafts (editor: Ian Hickson)">
   <div class=impl>
 
   <h6 id=guidelines-for-exposing-cues-in-various-formats-as-text-track-cues><span class=secno>4.8.10.12.4 </span><dfn>Guidelines for exposing cues</dfn> in various formats as
@@ -30674,6 +30571,7 @@
    </dd>
 
   </dl></div>
+</div>
 <!--TTVTT-->
 
 
@@ -31455,10 +31353,10 @@
    <tbody><tr><td><dfn id=handler-texttrackcue-onenter title=handler-TextTrackCue-onenter><code>onenter</code></dfn> <td> <code title=event-enter>enter</code>
     <tr><td><dfn id=handler-texttrackcue-onexit title=handler-TextTrackCue-onexit><code>onexit</code></dfn> <td> <code title=event-exit>exit</code>
   </table></div>
-<!--KEEP-START w3c-html--><!--TT-->
 
 <!--TTVTT-->
 
+<div data-component="other Hixie drafts (editor: Ian Hickson)">
   <h5 id=webvtt-0><span class=secno>4.8.10.13 </span>WebVTT</h5>
 
   <p>The <dfn id=webvtt>WebVTT</dfn> format (Web Video Text Tracks) is a
@@ -33108,11 +33006,10 @@
 
   </div>
 
-<!--</div>-->
+</div>
 
 <!--TTVTT-->
 
-
   <h5 id=user-interface><span class=secno>4.8.10.14 </span>User interface</h5>
 
   <p>The <dfn id=attr-media-controls title=attr-media-controls><code>controls</code></dfn>
@@ -33133,7 +33030,6 @@
   the user (e.g. full-screen video or in an independent resizable
   window). Other controls may also be made available.</p>
 
-<!--CONTROLLER-->
   <p>If the <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, then the user agent should expose audio tracks
   from all the <a href=#slaved-media-elements>slaved media elements</a> (although avoiding
@@ -33144,7 +33040,6 @@
   should use the element's <code title=attr-title><a href=#the-title-attribute>title</a></code>
   attribute, if any, as the name (or as part of the name) of that
   track.</p>
-<!--CONTROLLER-->
 
   <p>Even when the attribute is absent, however, user agents may
   provide controls to affect playback of the media resource
@@ -33156,15 +33051,12 @@
   <p>Where possible (specifically, for starting, stopping, pausing,
   and unpausing playback, for seeking, for changing the rate of
   playback, for fast-forwarding or rewinding,
-<!--KEEP-END w3c-html--><!--TT-->
   for listing, enabling, and disabling text tracks,
-<!--KEEP-START w3c-html--><!--TT-->
   and for muting or changing the volume of the audio), user interface
   features exposed by the user agent must be implemented in terms of
   the DOM API described above, so that, e.g., all the same events
   fire.</p>
 
-<!--CONTROLLER-->
   <p>When a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, the user agent's user interface for pausing and
   unpausing playback, for seeking, for changing the rate of playback,
@@ -33172,42 +33064,34 @@
   volume of audio of the entire group must be implemented in terms of
   the <code><a href=#mediacontroller>MediaController</a></code> API exposed on that <a href=#current-media-controller>current
   media controller</a>.</p>
-<!--CONTROLLER-->
 
   <p>The "play" function in the user agent's interface must set the
   <code title="">playbackRate</code> attribute to the value of the
   <code title="">defaultPlaybackRate</code> attribute before invoking
   the <code title="">play()</code> method.
-<!--CONTROLLER-->
   When a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, the attributes and method with those names on
   that <code><a href=#mediacontroller>MediaController</a></code> object must be used. Otherwise,
   the attributes and method with those names on the <a href=#media-element>media
   element</a> itself must be used.
-<!--CONTROLLER-->
   </p>
 
   <p>Features such as fast-forward or rewind must be implemented by
   only changing the <code title="">playbackRate</code> attribute (and
   not the <code title="">defaultPlaybackRate</code> attribute).
-<!--CONTROLLER-->
   Again, when a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, the attributes with those names on that
   <code><a href=#mediacontroller>MediaController</a></code> object must be used; otherwise, the
   attributes with those names on the <a href=#media-element>media element</a> itself
   must be used.
-<!--CONTROLLER-->
   </p>
 
-<!--CONTROLLER-->
   <p>When a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, and all the <a href=#slaved-media-elements>slaved media elements</a> of
   that <code><a href=#mediacontroller>MediaController</a></code> are paused, the user agent should
   unpause all the <a href=#slaved-media-elements>slaved media elements</a> when the user
   invokes a user agent interface control for beginning playback.</p>
-<!--CONTROLLER-->
 
-<!--CONTROLLER-->
   <p>When a <a href=#media-element>media element</a> has a <a href=#current-media-controller>current media
   controller</a>, seeking must be implemented in terms of the <code title=dom-MediaController-seek>seek()</code> method on that
   <code><a href=#mediacontroller>MediaController</a></code> object. Otherwise, the user agent must
@@ -33221,9 +33105,7 @@
   element</a> without affecting the <code><a href=#mediacontroller>MediaController</a></code>,
   but such features are considered relatively advanced and unlikely to
   be useful to most users.
-<!--CONTROLLER-->
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>For the purposes of listing chapters in the <a href=#media-resource>media
   resource</a>, only <a href=#text-track title="text track">text tracks</a>
   in the <a href=#media-element>media element</a>'s <a href=#list-of-text-tracks>list of text
@@ -33234,7 +33116,6 @@
   track</a> represents a chapter starting at the cue's <a href=#text-track-cue-start-time title="text track cue start time">start time</a>. The name of
   the chapter is the <a href=#text-track-cue-text>text track cue text</a>, interpreted
   literally.</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p>The <dfn id=dom-media-controls title=dom-media-controls><code>controls</code></dfn>
   IDL attribute must <a href=#reflect>reflect</a> the content attribute of the
@@ -33302,23 +33183,19 @@
    attribute is true, the element's <a href=#effective-media-volume>effective media
    volume</a> is zero. Abort these steps.</li>
 
-<!--CONTROLLER-->
    <li><p>If the element has a <a href=#current-media-controller>current media controller</a>
    and that <code><a href=#mediacontroller>MediaController</a></code> object's <a href=#media-controller-mute-override>media
    controller mute override</a> is true, the element's
    <a href=#effective-media-volume>effective media volume</a> is zero. Abort these
    steps.</li>
-<!--CONTROLLER-->
 
    <li><p>Let <var title="">volume</var> be the value of the element's
    <code title=dom-media-volume><a href=#dom-media-volume>volume</a></code> attribute.</li>
 
-<!--CONTROLLER-->
    <li><p>If the element has a <a href=#current-media-controller>current media controller</a>,
    multiply <var title="">volume</var> by that
    <code><a href=#mediacontroller>MediaController</a></code> object's <a href=#media-controller-volume-multiplier>media controller volume
    multiplier</a>.</li>
-<!--CONTROLLER-->
 
    <li><p>The element's <a href=#effective-media-volume>effective media volume</a> is <var title="">volume</var>, interpreted relative to the range 0.0 to
    1.0, with 0.0 being silent, and 1.0 being the loudest setting,
@@ -33485,9 +33362,7 @@
    <tbody><tr><td><dfn id=event-media-loadedmetadata title=event-media-loadedmetadata><code>loadedmetadata</code></dfn>
      <td><code><a href=#event>Event</a></code>
      <td>The user agent has just determined the duration and dimensions of the <a href=#media-resource>media resource</a>
-<!--KEEP-END w3c-html--><!--TT-->
  and <a href=#the-text-tracks-are-ready>the text tracks are ready</a>.
-<!--KEEP-START w3c-html--><!--TT-->
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to <code title=dom-media-HAVE_METADATA><a href=#dom-media-have_metadata>HAVE_METADATA</a></code> or greater for the first time.
     <tr><td><dfn id=event-media-loadeddata title=event-media-loadeddata><code>loadeddata</code></dfn>
      <td><code><a href=#event>Event</a></code>
@@ -33505,17 +33380,13 @@
      <td><code><a href=#event>Event</a></code>
      <td>Playback is ready to start after having been paused or delayed due to lack of <a href=#media-data>media data</a>.
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to or greater than <code title=dom-media-HAVE_FUTURE_DATA><a href=#dom-media-have_future_data>HAVE_FUTURE_DATA</a></code> and <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false, or <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is newly false and <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is equal to or greater than <code title=dom-media-HAVE_FUTURE_DATA><a href=#dom-media-have_future_data>HAVE_FUTURE_DATA</a></code>. Even if this event fires, the element might still not be <a href=#potentially-playing>potentially playing</a>, e.g. if
-<!--CONTROLLER-->
      the element is <a href=#blocked-on-its-media-controller>blocked on its media controller</a> (e.g. because the <a href=#current-media-controller>current media controller</a> is paused, or another <a href=#slaved-media-elements title="slaved media elements">slaved media element</a> is stalled somehow, or because the <a href=#media-resource>media resource</a> has no data corresponding to the <a href=#media-controller-position>media controller position</a>), or
-<!--CONTROLLER-->
      the element is <a href=#paused-for-user-interaction>paused for user interaction</a>.
     <tr><td><dfn id=event-media-waiting title=event-media-waiting><code>waiting</code></dfn>
      <td><code><a href=#event>Event</a></code>
      <td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is equal to or less than <code title=dom-media-HAVE_CURRENT_DATA><a href=#dom-media-have_current_data>HAVE_CURRENT_DATA</a></code>, and <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false. Either <code title=dom-media-seeking><a href=#dom-media-seeking>seeking</a></code> is true, or the <a href=#current-playback-position>current playback position</a> is not contained in any of the ranges in <code title=dom-media-buffered><a href=#dom-media-buffered>buffered</a></code>. It is possible for playback to stop for other reasons without <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> being false, but those reasons do not fire this event (and when those situations resolve, a separate <code title=event-media-playing><a href=#event-media-playing>playing</a></code> event is not fired either): e.g.
-<!--CONTROLLER-->
      the element is newly <a href=#blocked-on-its-media-controller>blocked on its media controller</a>, or
-<!--CONTROLLER-->
      <a href=#ended-playback title="ended playback">playback ended</a>, or playback <a href=#stopped-due-to-errors>stopped due to errors</a>, or the element has <a href=#paused-for-user-interaction>paused for user interaction</a>.
    <tbody><tr><td><dfn id=event-media-seeking title=event-media-seeking><code>seeking</code></dfn>
      <td><code><a href=#event>Event</a></code>
@@ -33554,7 +33425,7 @@
      <td><code><a href=#event>Event</a></code>
      <td>Either the <code title=dom-media-volume><a href=#dom-media-volume>volume</a></code> attribute or the <code title=dom-media-muted><a href=#dom-media-muted>muted</a></code> attribute has changed. Fired after the relevant attribute's setter has returned.
      <td>
-  </table><!--CONTROLLER--><p>The following events fire on <code><a href=#mediacontroller>MediaController</a></code> objects:</p>
+  </table><p>The following events fire on <code><a href=#mediacontroller>MediaController</a></code> objects:</p>
 
   <table><thead><tr><th>Event name
      <th>Interface
@@ -33603,7 +33474,7 @@
     <tr><td><dfn id=event-mediacontroller-volumechange title=event-MediaController-volumechange><code>volumechange</code></dfn>
      <td><code><a href=#event>Event</a></code>
      <td>Either the <code title=dom-MediaController-volume><a href=#dom-mediacontroller-volume>volume</a></code> attribute or the <code title=dom-MediaController-muted><a href=#dom-mediacontroller-muted>muted</a></code> attribute has just been updated.
-  </table><!--CONTROLLER--><div class=impl>
+  </table><div class=impl>
 
   <h5 id=security-and-privacy-considerations><span class=secno>4.8.10.17 </span>Security and privacy considerations</h5>
 
@@ -33713,14 +33584,12 @@
   buffer everything and allow the user to seek through the earlier
   material, pause it, play it forwards and backwards, etc.</p>
 
-<!--CONTROLLER-->
   <p>When multiple tracks are synchronised with a
   <code><a href=#mediacontroller>MediaController</a></code>, it is possible for scripts to add and
   remove media elements from the <code><a href=#mediacontroller>MediaController</a></code>'s list
   of <a href=#slaved-media-elements>slaved media elements</a>, even while these tracks are
   playing. How smoothly the media plays back in such situations is
   another quality-of-implementation issue.</p>
-<!--CONTROLLER-->
 
   <hr><p>When a <a href=#media-element>media element</a> that is paused is <a href=#remove-an-element-from-a-document title="remove an element from a document">removed from a
   document</a> and not reinserted before the next time the
@@ -60279,9 +60148,7 @@
            attribute <a href=#function>Function</a> <a href=#handler-onchange title=handler-onchange>onchange</a>;
            attribute <a href=#function>Function</a> <a href=#handler-onclick title=handler-onclick>onclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-oncontextmenu title=handler-oncontextmenu>oncontextmenu</a>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-oncuechange title=handler-oncuechange>oncuechange</a>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <a href=#function>Function</a> <a href=#handler-ondblclick title=handler-ondblclick>ondblclick</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondrag title=handler-ondrag>ondrag</a>;
            attribute <a href=#function>Function</a> <a href=#handler-ondragend title=handler-ondragend>ondragend</a>;
@@ -66969,9 +66836,7 @@
     <tr><td><dfn id=handler-onchange title=handler-onchange><code>onchange</code></dfn> <td> <code title=event-change>change</code> <!-- widely used -->
     <tr><td><dfn id=handler-onclick title=handler-onclick><code>onclick</code></dfn> <td> <code title=event-click><a href=#event-click>click</a></code> <!-- widely used -->
     <tr><td><dfn id=handler-oncontextmenu title=handler-oncontextmenu><code>oncontextmenu</code></dfn> <td> <code title=event-contextmenu>contextmenu</code> <!-- widely used -->
-<!--KEEP-END w3c-html--><!--TT-->
     <tr><td><dfn id=handler-oncuechange title=handler-oncuechange><code>oncuechange</code></dfn> <td> <code title=event-cuechange>cuechange</code>
-<!--KEEP-START w3c-html--><!--TT-->
     <tr><td><dfn id=handler-ondblclick title=handler-ondblclick><code>ondblclick</code></dfn> <td> <code title=event-dblclick>dblclick</code> <!-- widely used -->
     <tr><td><dfn id=handler-ondrag title=handler-ondrag><code>ondrag</code></dfn> <td> <code title=event-drag><a href=#event-drag>drag</a></code>
     <tr><td><dfn id=handler-ondragend title=handler-ondragend><code>ondragend</code></dfn> <td> <code title=event-dragend><a href=#event-dragend>dragend</a></code>
@@ -86165,7 +86030,6 @@
   the <code><a href=#video>video</a></code> element itself, and is expected to be
   centered in the <code><a href=#video>video</a></code> element.</p>
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>Any subtitles or captions are expected to be overlayed directly
   on top of their <code><a href=#video>video</a></code> element, as defined by the
   relevant rendering rules; for <a href=#webvtt>WebVTT</a>, those are the
@@ -86179,7 +86043,6 @@
   track showing by default">showing by default</a> (e.g., for <a href=#text-track title="text track">text tracks</a> based on
   <a href=#webvtt>WebVTT</a>, the <a href=#rules-for-updating-the-display-of-webvtt-text-tracks>rules for updating the display of
   WebVTT text tracks</a>).</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p class=note>Resizing <code><a href=#video>video</a></code> and <code><a href=#the-canvas-element>canvas</a></code>
   elements does not interrupt video playback or clear the canvas.</p>
@@ -86194,8 +86057,6 @@
   </div>
 
 
-<!--KEEP-END w3c-html--><!--TT-->
-<!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
   <div class=impl>
 
   <h4 id=timed-text-tracks-0><span class=secno>13.3.2 </span>Timed text tracks</h4>
@@ -86204,6 +86065,7 @@
   module once an editor is found to run with it.</p>
 
 
+
   <h5 id=webvtt-cue-text-rendering-rules><span class=secno>13.3.2.1 </span><dfn>WebVTT cue text rendering rules</dfn></h5>
 
   <p>The <dfn id=rules-for-updating-the-display-of-webvtt-text-tracks>rules for updating the display of WebVTT text
@@ -87009,8 +86871,7 @@
 
   </div>
 
-<!--</div>-->
-<!--KEEP-START w3c-html--><!--TT-->
+<!--TTVTT-->
 
 
 
@@ -90336,7 +90197,7 @@
   <code><a href=#text/ping>text/ping</a></code> resources.</p>
 <!--PING-->
 
-<!--TT-->
+<!--TTVTT-->
 <div data-component="other Hixie drafts (editor: Ian Hickson)">
   <h3 id=text/vtt><span class=secno>15.6 </span><dfn><code>text/vtt</code></dfn></h3>
 
@@ -90415,7 +90276,7 @@
   </dl><p>Fragment identifiers have no meaning with
   <code><a href=#text/vtt>text/vtt</a></code> resources.</p>
 </div>
-<!--TT-->
+<!--TTVTT-->
 
 <!--MD-->
 
@@ -90712,7 +90573,7 @@
          <code title=attr-media-src><a href=#attr-media-src>src</a></code>;
          <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>;
          <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>;
-<!--CONTROLLER-->         <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>;<!--CONTROLLER-->
+         <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>;
          <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>;
          <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code></td>
      <td><code><a href=#htmlaudioelement>HTMLAudioElement</a></code></td>
@@ -91703,7 +91564,7 @@
          <code><a href=#the-td-element>td</a></code></td>
      <td><a href=#global-attributes title="global attributes">globals</a></td>
      <td><code><a href=#htmltablerowelement>HTMLTableRowElement</a></code></td>
-    </tr><!--KEEP-END w3c-html--><!--TT--><tr><th><code><a href=#the-track-element>track</a></code></th>
+    <tr><th><code><a href=#the-track-element>track</a></code></th>
      <td>Timed text track</td>
      <td>none</td>
      <td><code><a href=#audio>audio</a></code>;
@@ -91716,7 +91577,7 @@
          <code title=attr-track-src><a href=#attr-track-src>src</a></code>;
          <code title=attr-track-srclang><a href=#attr-track-srclang>srclang</a></code></td>
      <td><code><a href=#htmltrackelement>HTMLTrackElement</a></code></td>
-    </tr><!--KEEP-START w3c-html--><!--TT--><tr><th><code><a href=#the-u-element>u</a></code></th>
+    <tr><th><code><a href=#the-u-element>u</a></code></th>
      <td>Keywords</td>
      <td><a href=#flow-content title="Flow content">flow</a>;
          <a href=#phrasing-content title="Phrasing content">phrasing</a></td>
@@ -91753,7 +91614,7 @@
          <code title=attr-video-poster><a href=#attr-video-poster>poster</a></code>;
          <code title=attr-media-preload><a href=#attr-media-preload>preload</a></code>;
          <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code>;
-<!--CONTROLLER-->         <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>;<!--CONTROLLER-->
+         <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>mediagroup</a></code>;
          <code title=attr-media-loop><a href=#attr-media-loop>loop</a></code>;
          <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code>;
          <code title=attr-dim-width><a href=#attr-dim-width>width</a></code>;
@@ -92400,7 +92261,6 @@
      <td> <code title=attr-keygen-keytype><a href=#attr-keygen-keytype>keygen</a></code>
      <td> The type of cryptographic key to generate
      <td> <a href=#attribute-text>Text</a>*
-<!--KEEP-END w3c-html--><!--TT-->
     <tr><th> <code title="">kind</code>
      <td> <code title=attr-track-kind><a href=#attr-track-kind>track</a></code>
      <td> The type of text track
@@ -92409,15 +92269,12 @@
           "<code title=attr-track-kind-descriptions><a href=#attr-track-kind-descriptions>descriptions</a></code>";
           "<code title=attr-track-kind-chapters><a href=#attr-track-kind-chapters>chapters</a></code>";
           "<code title=attr-track-kind-metadata><a href=#attr-track-kind-metadata>metadata</a></code>"
-<!--KEEP-START w3c-html--><!--TT-->
     <tr><th> <code title="">label</code>
      <td> <code title=attr-command-label><a href=#attr-command-label>command</a></code>;
           <code title=attr-menu-label><a href=#attr-menu-label>menu</a></code>;
           <code title=attr-optgroup-label><a href=#attr-optgroup-label>optgroup</a></code>;
           <code title=attr-option-label><a href=#attr-option-label>option</a></code>;
-<!--KEEP-END w3c-html--><!--TT-->
           <code title=attr-track-label><a href=#attr-track-label>track</a></code>
-<!--KEEP-START w3c-html--><!--TT-->
      <td> User-visible label
      <td> <a href=#attribute-text>Text</a>
     <tr><th> <code title="">lang</code>
@@ -92463,13 +92320,11 @@
           <code title=attr-style-media><a href=#attr-style-media>style</a></code>
      <td> Applicable media
      <td> <a href=#valid-media-query>Valid media query</a>
-<!--CONTROLLER-->
     <tr><th> <code title="">mediagroup</code>
      <td> <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>audio</a></code>;
           <code title=attr-media-mediagroup><a href=#attr-media-mediagroup>video</a></code>
      <td> Groups <a href=#media-element title="media element">media elements</a> together with an implicit <code><a href=#mediacontroller>MediaController</a></code>
      <td> <a href=#attribute-text>Text</a>
-<!--CONTROLLER-->
     <tr><th> <code title="">method</code>
      <td> <code title=attr-fs-method><a href=#attr-fs-method>form</a></code>
      <td> HTTP method to use for <a href=#form-submission>form submission</a>
@@ -92654,9 +92509,7 @@
           <code title=attr-input-src><a href=#attr-input-src>input</a></code>;
           <code title=attr-script-src><a href=#attr-script-src>script</a></code>;
           <code title=attr-source-src><a href=#attr-source-src>source</a></code>;
-<!--KEEP-END w3c-html--><!--TT-->
           <code title=attr-track-src><a href=#attr-track-src>track</a></code>;
-<!--KEEP-START w3c-html--><!--TT-->
           <code title=attr-media-src><a href=#attr-media-src>video</a></code>
      <td> Address of the resource
      <td> <a href=#valid-non-empty-url-potentially-surrounded-by-spaces>Valid non-empty URL potentially surrounded by spaces</a>
@@ -92664,12 +92517,10 @@
      <td> <code title=attr-iframe-srcdoc><a href=#attr-iframe-srcdoc>iframe</a></code>
      <td> A document to render in the <code><a href=#the-iframe-element>iframe</a></code>
      <td> The source of <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a>*
-<!--KEEP-END w3c-html--><!--TT-->
     <tr><th> <code title="">srclang</code>
      <td> <code title=attr-track-srclang><a href=#attr-track-srclang>track</a></code>
      <td> Language of the text track
      <td> Valid BCP 47 language tag
-<!--KEEP-START w3c-html--><!--TT-->
     <tr><th> <code title="">start</code>
      <td> <code title=attr-ol-start><a href=#attr-ol-start>ol</a></code>
      <td> <a href=#ordinal-value>Ordinal value</a> of the first item
@@ -92859,12 +92710,11 @@
      <td> <a href=#handler-oncontextmenu title=handler-oncontextmenu>HTML elements</a>
      <td> <code title=event-contextmenu>contextmenu</code> event handler
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-<!--KEEP-END w3c-html--><!--TT-->
+
     <tr><th id=ix-handler-oncuechange> <code title="">oncuechange</code>
      <td> <a href=#handler-oncuechange title=handler-oncuechange>HTML elements</a>
      <td> <code title=event-cuechange>cuechange</code> event handler
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-<!--KEEP-START w3c-html--><!--TT-->
 
     <tr><th id=ix-handler-ondblclick> <code title="">ondblclick</code>
      <td> <a href=#handler-ondblclick title=handler-ondblclick>HTML elements</a>
@@ -93504,10 +93354,8 @@
     <tr><td> <code><a href=#the-tr-element>tr</a></code>
      <td> <code><a href=#htmltablerowelement>HTMLTableRowElement</a></code> : <code><a href=#htmlelement>HTMLElement</a></code>
 
-<!--KEEP-END w3c-html--><!--TT-->
     <tr><td> <code><a href=#the-track-element>track</a></code>
      <td> <code><a href=#htmltrackelement>HTMLTrackElement</a></code> : <code><a href=#htmlelement>HTMLElement</a></code>
-<!--KEEP-START w3c-html--><!--TT-->
 
     <tr><td> <code><a href=#the-u-element>u</a></code>
      <td> <code><a href=#htmlelement>HTMLElement</a></code>
@@ -94936,12 +94784,10 @@
   microdata feature.</p>
 <!--MD-->
 
-<!--TT-->
   <p>Thanks to the SubRip community, including in particular Zuggy and
   ai4spam, for their work on the SubRip software program whose SRT
   file format was used as the basis for the WebVTT text track file
   format.</p>
-<!--TT-->
 
   <div class=impl>
 

Modified: source
===================================================================
--- source	2011-04-25 23:18:11 UTC (rev 6030)
+++ source	2011-04-26 19:31:42 UTC (rev 6031)
@@ -72,7 +72,7 @@
   <ul class="brief">
    <li>The <code>PeerConnection</code> API and related video-conferencing features.</li> <!--PEERCONTROLLER-->
    <li>The <code title="attr-hyperlink-ping">ping</code> attribute and related <span>hyperlink auditing</span> features.</li> <!--PING-->
-   <li>The <span>WebVTT</span> format and some <span>text track</span> API features.</li> <!--TT--> <!--TTVTT-->
+   <li>The <span>WebVTT</span> format and some <span>text track</span> API features.</li> <!--TTVTT-->
    <li>Rules for <a href="#atom">converting HTML to Atom</a>.</li> <!--MD-->
    <li>The <code title="dom-document-cssElementMap">cssElementMap</code> feature for defining <span title="CSS element reference identifier">CSS element reference identifiers</span>.</li> <!--CSSREF-->
    <li>An experimental <code>UndoManager</code> interface.</li><!--UNDO-->
@@ -8680,9 +8680,7 @@
            attribute <span>Function</span> <span title="handler-onchange">onchange</span>;
            attribute <span>Function</span> <span title="handler-onclick">onclick</span>;
            attribute <span>Function</span> <span title="handler-oncontextmenu">oncontextmenu</span>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <span>Function</span> <span title="handler-oncuechange">oncuechange</span>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <span>Function</span> <span title="handler-ondblclick">ondblclick</span>;
            attribute <span>Function</span> <span title="handler-ondrag">ondrag</span>;
            attribute <span>Function</span> <span title="handler-ondragend">ondragend</span>;
@@ -10078,9 +10076,7 @@
            attribute <span>Function</span> <span title="handler-onchange">onchange</span>;
            attribute <span>Function</span> <span title="handler-onclick">onclick</span>;
            attribute <span>Function</span> <span title="handler-oncontextmenu">oncontextmenu</span>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <span>Function</span> <span title="handler-oncuechange">oncuechange</span>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <span>Function</span> <span title="handler-ondblclick">ondblclick</span>;
            attribute <span>Function</span> <span title="handler-ondrag">ondrag</span>;
            attribute <span>Function</span> <span title="handler-ondragend">ondragend</span>;
@@ -10190,9 +10186,7 @@
    <li><code title="handler-onchange">onchange</code></li>
    <li><code title="handler-onclick">onclick</code></li>
    <li><code title="handler-oncontextmenu">oncontextmenu</code></li>
-<!--KEEP-END w3c-html--><!--TT-->
    <li><code title="handler-oncuechange">oncuechange</code></li>
-<!--KEEP-START w3c-html--><!--TT-->
    <li><code title="handler-ondblclick">ondblclick</code></li>
    <li><code title="handler-ondrag">ondrag</code></li>
    <li><code title="handler-ondragend">ondragend</code></li>
@@ -27183,14 +27177,10 @@
    <dd>Where <span>embedded content</span> is expected.</dd>
    <dt>Content model:</dt>
    <dd>If the element has a <code title="attr-media-src">src</code> attribute:
-<!--KEEP-END w3c-html--><!--TT-->
  zero or more <code>track</code> elements, then
-<!--KEEP-START w3c-html--><!--TT-->
  <span>transparent</span>, but with no <span>media element</span> descendants.</dd>
    <dd>If the element does not have a <code title="attr-media-src">src</code> attribute: zero or more <code>source</code> elements, then
-<!--KEEP-END w3c-html--><!--TT-->
  zero or more <code>track</code> elements, then
-<!--KEEP-START w3c-html--><!--TT-->
  <span>transparent</span>, but with no <span>media element</span> descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
@@ -27198,7 +27188,7 @@
    <dd><code title="attr-video-poster">poster</code></dd>
    <dd><code title="attr-media-preload">preload</code></dd>
    <dd><code title="attr-media-autoplay">autoplay</code></dd>
-<!--END w3c-html--><!--CONTROLLER-->   <dd><code title="attr-media-mediagroup">mediagroup</code></dd><!--START w3c-html--><!--CONTROLLER-->
+   <dd><code title="attr-media-mediagroup">mediagroup</code></dd>
    <dd><code title="attr-media-loop">loop</code></dd>
    <dd><code title="attr-media-muted">muted</code></dd>
    <dd><code title="attr-media-controls">controls</code></dd>
@@ -27241,9 +27231,7 @@
   <p>The <code title="attr-media-src">src</code>, <code
   title="attr-media-preload">preload</code>, <code
   title="attr-media-autoplay">autoplay</code>, 
-<!--END w3c-html--><!--CONTROLLER-->
   <code title="attr-media-mediagroup">mediagroup</code>, 
-<!--START w3c-html--><!--CONTROLLER-->
   <code title="attr-media-loop">loop</code>,
   <code title="attr-media-muted">muted</code>, and <code
   title="attr-media-controls">controls</code> attributes are <span
@@ -27361,14 +27349,12 @@
   particular playback position is defined by the video stream's
   format.</p>
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>The <code>video</code> element also <span>represents</span> any
   <span title="text track cue">text track cues</span> whose
   <span>text track cue active flag</span> is set and whose
   <span>text track</span> is in the <span title="text track
   showing">showing</span> or <span title="text track showing by
   default">showing by default</span> modes.</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p>In addition to the above, the user agent may provide messages to
   the user (such as "buffering", "no video loaded", "error", or more
@@ -27564,21 +27550,17 @@
    <dd>Where <span>embedded content</span> is expected.</dd>
    <dt>Content model:</dt>
    <dd>If the element has a <code title="attr-media-src">src</code> attribute: 
-<!--KEEP-END w3c-html--><!--TT-->
 zero or more <code>track</code> elements, then 
-<!--KEEP-START w3c-html--><!--TT-->
 <span>transparent</span>, but with no <span>media element</span> descendants.</dd>
    <dd>If the element does not have a <code title="attr-media-src">src</code> attribute: one or more <code>source</code> elements, then
-<!--KEEP-END w3c-html--><!--TT-->
  zero or more <code>track</code> elements, then
-<!--KEEP-START w3c-html--><!--TT-->
  <span>transparent</span>, but with no <span>media element</span> descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-media-src">src</code></dd>
    <dd><code title="attr-media-preload">preload</code></dd>
    <dd><code title="attr-media-autoplay">autoplay</code></dd>
-<!--END w3c-html--><!--CONTROLLER-->   <dd><code title="attr-media-mediagroup">mediagroup</code></dd><!--START w3c-html--><!--CONTROLLER-->
+   <dd><code title="attr-media-mediagroup">mediagroup</code></dd>
    <dd><code title="attr-media-loop">loop</code></dd>
    <dd><code title="attr-media-muted">muted</code></dd>
    <dd><code title="attr-media-controls">controls</code></dd>
@@ -27630,9 +27612,7 @@
   <p>The <code title="attr-media-src">src</code>, <code
   title="attr-media-preload">preload</code>, <code
   title="attr-media-autoplay">autoplay</code>, 
-<!--END w3c-html--><!--CONTROLLER-->
   <code title="attr-media-mediagroup">mediagroup</code>,
-<!--START w3c-html--><!--CONTROLLER-->
   <code title="attr-media-loop">loop</code>,
   <code title="attr-media-muted">muted</code>, and <code
   title="attr-media-controls">controls</code> attributes are <span
@@ -27730,9 +27710,7 @@
    <dd>None.</dd>
    <dt>Contexts in which this element can be used:</dt>
    <dd>As a child of a <span>media element</span>, before any <span>flow content</span>
-<!--KEEP-END w3c-html--><!--TT-->
  or <code>track</code> elements.</dd>
-<!--KEEP-START w3c-html--><!--TT-->
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -27934,9 +27912,6 @@
 
 
 
-<!--KEEP-END w3c-html--><!--TT-->
-<!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
-
   <h4>The <dfn><code>track</code></dfn> element</h4>
 
   <dl class="element">
@@ -28142,8 +28117,6 @@
 
   </div>
 
-<!--</div>-->
-<!--KEEP-START w3c-html--><!--TT-->
 
 
   <h4>Media elements</h4>
@@ -28196,34 +28169,29 @@
            attribute boolean <span title="dom-media-loop">loop</span>;
   void <span title="dom-media-play">play</span>();
   void <span title="dom-media-pause">pause</span>();
-<!--END w3c-html--><!--CONTROLLER-->
+
   // media controller
            attribute <span>DOMString</span> <span title="dom-media-mediaGroup">mediaGroup</span>;
-           attribute <span>MediaController</span> <span title="dom-media-controller">controller</span>;<!--START w3c-html--><!--CONTROLLER-->
+           attribute <span>MediaController</span> <span title="dom-media-controller">controller</span>;
 
   // controls
            attribute boolean <span title="dom-media-controls">controls</span>;
            attribute double <span title="dom-media-volume">volume</span>;
            attribute boolean <span title="dom-media-muted">muted</span>;
            attribute boolean <span title="dom-media-defaultMuted">defaultMuted</span>;
-<!--KEEP-END w3c-html--><!--TT-->
+
   // tracks
-<!--END w3c-html--><!--CONTROLLER-->
   readonly attribute <span>MultipleTrackList</span> <span title="dom-media-audioTracks">audioTracks</span>;
   readonly attribute <span>ExclusiveTrackList</span> <span title="dom-media-videoTracks">videoTracks</span>;
-<!--START w3c-html--><!--CONTROLLER-->
   readonly attribute <span>TextTrack</span>[] <span title="dom-media-textTracks">textTracks</span>;
   <span>MutableTextTrack</span> <span title="dom-media-addTextTrack">addTextTrack</span>(in DOMString kind, in optional DOMString label, in optional DOMString language);
-<!--KEEP-START w3c-html--><!--TT-->
 };</pre>
 
   <p>The <dfn>media element attributes</dfn>, <code
   title="attr-media-src">src</code>, <code
   title="attr-media-preload">preload</code>, <code
   title="attr-media-autoplay">autoplay</code>, 
-<!--END w3c-html--><!--CONTROLLER-->
   <code title="attr-media-mediagroup">mediagroup</code>, 
-<!--START w3c-html--><!--CONTROLLER-->
   <code title="attr-media-loop">loop</code>,
   <code title="attr-media-muted">muted</code>, and <code
   title="attr-media-controls">controls</code>, apply to all <span
@@ -28272,7 +28240,6 @@
   resource</dfn> is used to refer to the complete set of media data,
   e.g. the complete video file, or complete audio file.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p>A <span>media resource</span> can have multiple audio and video
   tracks. For the purposes of a <span>media element</span>, the video
   data of the <span>media resource</span> is only that of the
@@ -28282,7 +28249,6 @@
   mixing all the currently enabled tracks (if any) given by the
   element's <code title="dom-media-audioTracks">audioTracks</code>
   attribute.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <p class="note">Both <code>audio</code> and <code>video</code>
   elements can be used for both audio and video. The main difference
@@ -28717,10 +28683,8 @@
      <code
      title="dom-media-NETWORK_EMPTY">NETWORK_EMPTY</code>.</p></li>
 
-<!--KEEP-END w3c-html--><!--TT-->
      <li><p><span>Forget the media element's media-resource-specific
      text tracks</span>.</p></li>
-<!--KEEP-START w3c-html--><!--TT-->
 
      <li><p>If <code title="dom-media-readyState">readyState</code> is
      not set to <code
@@ -28905,10 +28869,8 @@
        <code
        title="dom-MediaError-MEDIA_ERR_SRC_NOT_SUPPORTED">MEDIA_ERR_SRC_NOT_SUPPORTED</code>.</p></li>
 
-<!--KEEP-END w3c-html--><!--TT-->
        <li><p><span>Forget the media element's media-resource-specific
        text tracks</span>.</p></li>
-<!--KEEP-START w3c-html--><!--TT-->
 
        <li><p>Set the element's <code
        title="dom-media-networkState">networkState</code> attribute to
@@ -29058,10 +29020,8 @@
      title="synchronous section">synchronous sections</span> are
      marked with &#x231B;.)</p></li>
 
-<!--KEEP-END w3c-html--><!--TT-->
      <li><p>&#x231B; <span>Forget the media element's
      media-resource-specific text tracks</span>.</p></li>
-<!--KEEP-START w3c-html--><!--TT-->
 
      <li><p>&#x231B; <i title="">Find next candidate</i>: Let <var
      title="">candidate</var> be null.</p></li>
@@ -29258,9 +29218,7 @@
      data</span> has been fetched to determine the duration of the
      <span>media resource</span>, its dimensions, and other
      metadata,
-<!--KEEP-END w3c-html--><!--TT-->
      and once <span>the text tracks are ready</span>
-<!--KEEP-START w3c-html--><!--TT-->
      </dt>
 
      <dd>
@@ -29356,7 +29314,6 @@
 
        </li>
 
-<!--END w3c-html--><!--CONTROLLER-->
        <li><p>If either the <span>media resource</span> or the address
        of the <var title="">current media resource</var> indicate a
        particular set of audio or video tracks to enable, then the
@@ -29388,7 +29345,6 @@
        the media controller to that time if it's not already past it.
        (So if there are several, you'll jump the media controller to
        the furthest one in the timeline.) -->
-<!--START w3c-html--><!--CONTROLLER-->
 
        <li>
 
@@ -29610,7 +29566,6 @@
      </dd>
 
 
-<!--KEEP-END w3c-html--><!--TT-->
      <dt id="found-a-media-resource-specific-timed-track">If the <span>media resource</span> is found to declare a <span>media-resource-specific text track</span> that the user agent supports</dt>
 
      <dd>
@@ -29628,7 +29583,6 @@
       interface.</p>
 
      </dd>
-<!--KEEP-START w3c-html--><!--TT-->
 
     </dl>
 
@@ -29817,9 +29771,7 @@
 
     <p>Will throw an <code>INVALID_STATE_ERR</code> exception if there
     is no selected <span>media resource</span>
-<!--END w3c-html--><!--CONTROLLER-->
     or if there is a <span>current media controller</span>.
-<!--START w3c-html--><!--CONTROLLER-->
     Will throw an
     <code>INDEX_SIZE_ERR</code> exception if the given time is not
     within the ranges to which the user agent can seek.</p>
@@ -29921,11 +29873,9 @@
   resource</span>-dependent, but it should approximate the user's wall
   clock.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p class="note">All the <span title="media element">media
   elements</span> that share <span>current media controller</span> use
   the same clock for their <span>media timeline</span>.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <p><span title="media element">Media elements</span> have a
   <dfn>current playback position</dfn>, which must initially (i.e. in
@@ -29937,11 +29887,9 @@
   title="dom-media-currentTime"><code>currentTime</code></dfn>
   attribute must, on getting, return the <span>current playback
   position</span>, expressed in seconds. On setting,
-<!--END w3c-html--><!--CONTROLLER-->
   if the <span>media element</span> has a <span>current media
   controller</span>, then it must throw an
   <code>INVALID_STATE_ERR</code> exception; otherwise,
-<!--START w3c-html--><!--CONTROLLER-->
   the user agent
   must <span title="dom-media-seek">seek</span> to the new value
   (which might raise an exception).</p>
@@ -30047,11 +29995,9 @@
   indicates that the <span>media element</span> is to seek back to the
   start of the <span>media resource</span> upon reaching the end.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p>The <code title="attr-media-loop">loop</code> attribute has no
   effect while the element has a <span>current media
   controller</span>.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <div class="impl">
 
@@ -30111,10 +30057,8 @@
    will no longer raise an exception when seeking. No <span>media
    data</span> is available for the immediate <span>current playback
    position</span>.
-<!--KEEP-END w3c-html--><!--TT-->
    The <span title="text track">text tracks</span>
    are <span title="the text tracks are ready">ready</span>.
-<!--KEEP-START w3c-html--><!--TT-->
    </dd>
 
    <dt><dfn title="dom-media-HAVE_CURRENT_DATA"><code>HAVE_CURRENT_DATA</code></dfn> (numeric value 2)</dt>
@@ -30306,12 +30250,10 @@
 
    </li>
 
-<!--END w3c-html--><!--CONTROLLER-->
    <li><p>If the <span>media element</span> has a <span>current media
    controller</span>, then <span>report the controller state</span>
    for the <span>media element</span>'s <span>current media
    controller</span>.</p></li>
-<!--START w3c-html--><!--CONTROLLER-->
 
   </ol>
 
@@ -30397,7 +30339,6 @@
     normal playback mode, it is expected that the rate of playback
     will be returned to the default rate of playback.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
     <p>When the element has a <span>current media controller</span>,
     the <code
     title="dom-media-defaultPlaybackRate">defaultPlaybackRate</code>
@@ -30405,7 +30346,6 @@
     controller</span>'s <code
     title="dom-MediaController-defaultPlaybackRate">defaultPlaybackRate</code>
     is used instead.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
    </dd>
 
@@ -30417,14 +30357,12 @@
 
     <p>Can be set, to change the rate of playback.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
     <p>When the element has a <span>current media controller</span>,
     the <code title="dom-media-playbackRate">playbackRate</code>
     attribute is ignored and the <span>current media
     controller</span>'s <code
     title="dom-MediaController-playbackRate">playbackRate</code> is
     used instead.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
    </dd>
 
@@ -30478,11 +30416,9 @@
   playing</dfn> when its <code title="dom-media-paused">paused</code>
   attribute is false, the element has not <span>ended playback</span>,
   playback has not <span>stopped due to errors</span>, 
-<!--END w3c-html--><!--CONTROLLER-->
   the element either has no <span>current media controller</span> or
   has a <span>current media controller</span> but is not <span>blocked
   on its media controller</span>,
-<!--START w3c-html--><!--CONTROLLER-->
   and the element is not a <span>blocked media element</span>.</p>
 
   <p>A <span>media element</span> is said to have <dfn>ended
@@ -30507,15 +30443,11 @@
      <li>The <span>direction of playback</span> is forwards, and
 
      <li>
-<!--END w3c-html--><!--CONTROLLER-->
      Either
-<!--START w3c-html--><!--CONTROLLER-->
      the <span>media element</span> does not have a <code
      title="attr-media-loop">loop</code> attribute specified,
-<!--END w3c-html--><!--CONTROLLER-->
      or the <span>media element</span> has a <span>current media
      controller</span>.
-<!--START w3c-html--><!--CONTROLLER-->
 
     </ul>
 
@@ -30557,7 +30489,6 @@
   the user agent has reached a point in the <span>media
   resource</span> where the user has to make a selection for the
   resource to continue.
-<!--END w3c-html--><!--CONTROLLER-->
   If the <span>media element</span> has a <span>current media
   controller</span> when this happens, then the user agent must
   <span>report the controller state</span> for the <span>media
@@ -30567,7 +30498,6 @@
   to resume, the user agent must similarly <span>report the controller
   state</span> for the <span>media element</span>'s <span>current
   media controller</span>.
-<!--START w3c-html--><!--CONTROLLER-->
   </p>
 
   <p>It is possible for a <span>media element</span> to have both
@@ -30597,9 +30527,7 @@
 
    <li><p>If the <span>media element</span> has a <code
    title="attr-media-loop">loop</code> attribute specified
-<!--END w3c-html--><!--CONTROLLER-->
    and does not have a <span>current media controller</span>,
-<!--START w3c-html--><!--CONTROLLER-->
    then <span title="dom-media-seek">seek</span> to the <span>earliest
    possible position</span> of the <span>media resource</span> and
    abort these steps.</p></li> <!-- v2/v3: We should fire a 'looping'
@@ -30656,9 +30584,7 @@
   <p>The <dfn
   title="dom-media-playbackRate"><code>playbackRate</code></dfn>
   attribute gives the <span>effective playback rate</span>
-<!--END w3c-html--><!--CONTROLLER-->
   (assuming there is no <span>current media controller</span> overriding it),
-<!--START w3c-html--><!--CONTROLLER-->
   which is the speed at which the <span>media resource</span> plays,
   as a multiple of its intrinsic speed. If it is not equal to the
   <code
@@ -30668,10 +30594,8 @@
   getting it must return the last value it was set to, or 1.0 if it
   hasn't yet been set; on setting the attribute must be set to the new
   value, and the playback will change speed
-<!--END w3c-html--><!--CONTROLLER-->
   (if the element is <span>potentially playing</span> and there is no
   <span>current media controller</span>).</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <p id="rateUpdate">When the <code
   title="dom-media-defaultPlaybackRate">defaultPlaybackRate</code> or
@@ -30683,7 +30607,6 @@
   title="event-media-ratechange">ratechange</code> at the <span>media
   element</span>.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p class="note">The <code
   title="dom-media-defaultPlaybackRate">defaultPlaybackRate</code> and
   <code title="dom-media-playbackRate">playbackRate</code> attributes
@@ -30691,7 +30614,6 @@
   <span>current media controller</span>; the namesake attributes on
   the <code>MediaController</code> object are used instead in that
   situation.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <hr>
 
@@ -30721,10 +30643,8 @@
 
     <p>If the <span title="ended playback">playback has ended</span>
     and the <span>direction of playback</span> is forwards,
-<!--END w3c-html--><!--CONTROLLER-->
     and the <span>media element</span> does not have a <span>current
     media controller</span>,
-<!--START w3c-html--><!--CONTROLLER-->
     <span title="dom-media-seek">seek</span> to the <span>earliest
     possible position</span> of the <span>media resource</span>.</p>
 
@@ -30737,11 +30657,9 @@
 
    </li>
 
-<!--END w3c-html--><!--CONTROLLER-->
    <li><p>If the <span>media element</span> has a <span>current
    media controller</span>, then <span>bring the media element up
    to speed with its new media controller</span>.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
    <li>
 
@@ -30788,12 +30706,10 @@
    <li><p>Set the <span>media element</span>'s <span>autoplaying
    flag</span> to false.</p></li>
 
-<!--END w3c-html--><!--CONTROLLER-->
    <li><p>If the <span>media element</span> has a <span>current media
    controller</span>, then <span>report the controller state</span>
    for the <span>media element</span>'s <span>current media
    controller</span>.</p></li>
-<!--START w3c-html--><!--CONTROLLER-->
 
   </ol>
 
@@ -30839,32 +30755,26 @@
 
    </li>
 
-<!--END w3c-html--><!--CONTROLLER-->
    <li><p>If the <span>media element</span> has a <span>current media
    controller</span>, then <span>report the controller state</span>
    for the <span>media element</span>'s <span>current media
    controller</span>.</p></li>
-<!--START w3c-html--><!--CONTROLLER-->
 
   </ol>
 
   <hr>
 
   <p>The
-<!--END w3c-html--><!--CONTROLLER-->
   <dfn>effective playback rate</dfn> is not necessarily the element's
   <code title="dom-media-playbackRate">playbackRate</code>. When a
   <span>media element</span> has a <span>current media
   controller</span>, its <span>effective playback rate</span> is the
   <code>MediaController</code>'s <span>media controller playback
   rate</span>. Otherwise, the
-<!--START w3c-html--><!--CONTROLLER-->
   <span>effective playback rate</span> is just the element's <code
   title="dom-media-playbackRate">playbackRate</code>.
-<!--END w3c-html--><!--CONTROLLER-->
   Thus, the <span>current media controller</span> overrides the
   <span>media element</span>.
-<!--START w3c-html--><!--CONTROLLER-->
   </p>
 
   <p>If the <span>effective playback rate</span> is positive or zero,
@@ -30910,14 +30820,12 @@
   element is in a state where no further audio could ever be played by
   that element may the element be garbage collected.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p class="note">It is possible for an element to which no explicit
   references exist to play audio, even if such an element is not still
   actively playing: for instance, it could have a <span>current media
   controller</span> that still has references and can still be
   unpaused, or it could be unpaused but stalled waiting for content to
   buffer.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <hr>
 
@@ -30927,17 +30835,14 @@
   position</span> changes while the steps are running, then the user
   agent must wait for the steps to complete, and then must immediately
   rerun the steps.
-<!--KEEP-END w3c-html--><!--TT-->
   (These steps are thus run as often as possible or needed — if
   one iteration takes a long time, this can cause certain <span
   title="text track cue">cues</span> to be skipped over as the user
   agent rushes ahead to "catch up".)
-<!--KEEP-START w3c-html--><!--TT-->
   </p>
 
   <ol>
 
-<!--KEEP-END w3c-html--><!--TT-->
    <li><p>Let <var title="">current cues</var> be an ordered list of
    <span title="text track cue">cues</span>, initialized to contain
    all the <span title="text track cue">cues</span> of all the <span
@@ -30961,7 +30866,6 @@
    tracks</span> of the <span>media element</span> that are not
    present in <var title="">current cues</var>, also in <span>text
    track cue order</span>.</p></li>
-<!--KEEP-START w3c-html--><!--TT-->
 
    <li><p>If the time was reached through the usual monotonic increase
    of the <span>current playback position</span> during normal
@@ -30983,7 +30887,6 @@
    not any more frequent than the user agent can comfortably handle
    while decoding the video.</p></li>
 
-<!--KEEP-END w3c-html--><!--TT-->
    <li><p>If all of the <span title="text track cue">cues</span> in
    <var title="">current cues</var> have their <span>text track cue
    active flag</span> set, and none of the <span title="text track
@@ -31060,17 +30963,14 @@
    display of WebVTT text tracks</span>.
 <!--START w3c-html--><!--TTVTT-->
    </p></li>
-<!--KEEP-START w3c-html--><!--TT-->
 
   </ol>
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>For the purposes of the algorithm above, a <span>text track
   cue</span> is considered to be part of a <span>text track</span>
   only if it is listed in the <span>text track list of cues</span>,
   not merely if it is associated with the <span>text
   track</span>.</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p class="note">If the <span>media element</span>'s
   <code>Document</code> stops being a <span>fully active</span>
@@ -31274,16 +31174,13 @@
   title="dom-media-seek">seeking</span> was used whenever the
   <span>current playback position</span> changes in a discontinuous
   fashion (so that the relevant events fire).
-<!--END w3c-html--><!--CONTROLLER-->
   If the <span>media element</span> has a <span>current media
   controller</span>, then the user agent must <span>seek the media
   controller</span> appropriately instead.
-<!--START w3c-html--><!--CONTROLLER-->
   </p>
 
   </div>
 
-<!--END w3c-html--><!--CONTROLLER-->
 
   <h5>Media resources with multiple media tracks</h5>
 
@@ -32561,11 +32458,8 @@
    <audio src="movie.vid#track=Descriptions" mediagroup=main autoduck></audio>
 -->
 
-<!--START w3c-html--><!--CONTROLLER-->
 
 
-<!--KEEP-END w3c-html--><!--TT-->
-<!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
   <h5>Timed text tracks</h5>
 
   <h6>Text track model</h6>
@@ -33429,6 +33323,7 @@
 
 
 <!--END w3c-html--><!--TTVTT-->
+<div data-component="other Hixie drafts (editor: Ian Hickson)">
   <div class="impl">
 
   <h6><dfn>Guidelines for exposing cues</dfn> in various formats as
@@ -33491,6 +33386,7 @@
   </dl>
 
   </div>
+</div>
 <!--START w3c-html--><!--TTVTT-->
 
 
@@ -34388,10 +34284,10 @@
   </table>
 
   </div>
-<!--KEEP-START w3c-html--><!--TT-->
 
 <!--END w3c-html--><!--TTVTT-->
 <!--START webvtt-->
+<div data-component="other Hixie drafts (editor: Ian Hickson)">
   <h5>WebVTT</h5>
 
   <p>The <dfn>WebVTT</dfn> format (Web Video Text Tracks) is a
@@ -36403,11 +36299,10 @@
 
   </div>
 
-<!--</div>-->
+</div>
 <!--END webvtt-->
 <!--START w3c-html--><!--TTVTT-->
 
-
   <h5>User interface</h5>
 
   <p>The <dfn title="attr-media-controls"><code>controls</code></dfn>
@@ -36429,7 +36324,6 @@
   the user (e.g. full-screen video or in an independent resizable
   window). Other controls may also be made available.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p>If the <span>media element</span> has a <span>current media
   controller</span>, then the user agent should expose audio tracks
   from all the <span>slaved media elements</span> (although avoiding
@@ -36440,7 +36334,6 @@
   should use the element's <code title="attr-title">title</code>
   attribute, if any, as the name (or as part of the name) of that
   track.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <p>Even when the attribute is absent, however, user agents may
   provide controls to affect playback of the media resource
@@ -36452,15 +36345,12 @@
   <p>Where possible (specifically, for starting, stopping, pausing,
   and unpausing playback, for seeking, for changing the rate of
   playback, for fast-forwarding or rewinding,
-<!--KEEP-END w3c-html--><!--TT-->
   for listing, enabling, and disabling text tracks,
-<!--KEEP-START w3c-html--><!--TT-->
   and for muting or changing the volume of the audio), user interface
   features exposed by the user agent must be implemented in terms of
   the DOM API described above, so that, e.g., all the same events
   fire.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p>When a <span>media element</span> has a <span>current media
   controller</span>, the user agent's user interface for pausing and
   unpausing playback, for seeking, for changing the rate of playback,
@@ -36468,42 +36358,34 @@
   volume of audio of the entire group must be implemented in terms of
   the <code>MediaController</code> API exposed on that <span>current
   media controller</span>.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <p>The "play" function in the user agent's interface must set the
   <code title="">playbackRate</code> attribute to the value of the
   <code title="">defaultPlaybackRate</code> attribute before invoking
   the <code title="">play()</code> method.
-<!--END w3c-html--><!--CONTROLLER-->
   When a <span>media element</span> has a <span>current media
   controller</span>, the attributes and method with those names on
   that <code>MediaController</code> object must be used. Otherwise,
   the attributes and method with those names on the <span>media
   element</span> itself must be used.
-<!--START w3c-html--><!--CONTROLLER-->
   </p>
 
   <p>Features such as fast-forward or rewind must be implemented by
   only changing the <code title="">playbackRate</code> attribute (and
   not the <code title="">defaultPlaybackRate</code> attribute).
-<!--END w3c-html--><!--CONTROLLER-->
   Again, when a <span>media element</span> has a <span>current media
   controller</span>, the attributes with those names on that
   <code>MediaController</code> object must be used; otherwise, the
   attributes with those names on the <span>media element</span> itself
   must be used.
-<!--START w3c-html--><!--CONTROLLER-->
   </p>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p>When a <span>media element</span> has a <span>current media
   controller</span>, and all the <span>slaved media elements</span> of
   that <code>MediaController</code> are paused, the user agent should
   unpause all the <span>slaved media elements</span> when the user
   invokes a user agent interface control for beginning playback.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p>When a <span>media element</span> has a <span>current media
   controller</span>, seeking must be implemented in terms of the <code
   title="dom-MediaController-seek">seek()</code> method on that
@@ -36518,9 +36400,7 @@
   element</span> without affecting the <code>MediaController</code>,
   but such features are considered relatively advanced and unlikely to
   be useful to most users.
-<!--START w3c-html--><!--CONTROLLER-->
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>For the purposes of listing chapters in the <span>media
   resource</span>, only <span title="text track">text tracks</span>
   in the <span>media element</span>'s <span>list of text
@@ -36533,7 +36413,6 @@
   title="text track cue start time">start time</span>. The name of
   the chapter is the <span>text track cue text</span>, interpreted
   literally.</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p>The <dfn title="dom-media-controls"><code>controls</code></dfn>
   IDL attribute must <span>reflect</span> the content attribute of the
@@ -36611,23 +36490,19 @@
    attribute is true, the element's <span>effective media
    volume</span> is zero. Abort these steps.</p></li>
 
-<!--END w3c-html--><!--CONTROLLER-->
    <li><p>If the element has a <span>current media controller</span>
    and that <code>MediaController</code> object's <span>media
    controller mute override</span> is true, the element's
    <span>effective media volume</span> is zero. Abort these
    steps.</p></li>
-<!--START w3c-html--><!--CONTROLLER-->
 
    <li><p>Let <var title="">volume</var> be the value of the element's
    <code title="dom-media-volume">volume</code> attribute.</p></li>
 
-<!--END w3c-html--><!--CONTROLLER-->
    <li><p>If the element has a <span>current media controller</span>,
    multiply <var title="">volume</var> by that
    <code>MediaController</code> object's <span>media controller volume
    multiplier</span>.</p></li>
-<!--START w3c-html--><!--CONTROLLER-->
 
    <li><p>The element's <span>effective media volume</span> is <var
    title="">volume</var>, interpreted relative to the range 0.0 to
@@ -36827,9 +36702,7 @@
      <td><dfn title="event-media-loadedmetadata"><code>loadedmetadata</code></dfn>
      <td><code>Event</code>
      <td>The user agent has just determined the duration and dimensions of the <span>media resource</span>
-<!--KEEP-END w3c-html--><!--TT-->
  and <span>the text tracks are ready</span>.
-<!--KEEP-START w3c-html--><!--TT-->
      <td><code title="dom-media-readyState">readyState</code> is newly equal to <code title="dom-media-HAVE_METADATA">HAVE_METADATA</code> or greater for the first time.
     <tr>
      <td><dfn title="event-media-loadeddata"><code>loadeddata</code></dfn>
@@ -36851,18 +36724,14 @@
      <td><code>Event</code>
      <td>Playback is ready to start after having been paused or delayed due to lack of <span>media data</span>.
      <td><code title="dom-media-readyState">readyState</code> is newly equal to or greater than <code title="dom-media-HAVE_FUTURE_DATA">HAVE_FUTURE_DATA</code> and <code title="dom-media-paused">paused</code> is false, or <code title="dom-media-paused">paused</code> is newly false and <code title="dom-media-readyState">readyState</code> is equal to or greater than <code title="dom-media-HAVE_FUTURE_DATA">HAVE_FUTURE_DATA</code>. Even if this event fires, the element might still not be <span>potentially playing</span>, e.g. if
-<!--END w3c-html--><!--CONTROLLER-->
      the element is <span>blocked on its media controller</span> (e.g. because the <span>current media controller</span> is paused, or another <span title="slaved media elements">slaved media element</span> is stalled somehow, or because the <span>media resource</span> has no data corresponding to the <span>media controller position</span>), or
-<!--START w3c-html--><!--CONTROLLER-->
      the element is <span>paused for user interaction</span>.
     <tr>
      <td><dfn title="event-media-waiting"><code>waiting</code></dfn>
      <td><code>Event</code>
      <td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
      <td><code title="dom-media-readyState">readyState</code> is equal to or less than <code title="dom-media-HAVE_CURRENT_DATA">HAVE_CURRENT_DATA</code>, and <code title="dom-media-paused">paused</code> is false. Either <code title="dom-media-seeking">seeking</code> is true, or the <span>current playback position</span> is not contained in any of the ranges in <code title="dom-media-buffered">buffered</code>. It is possible for playback to stop for other reasons without <code title="dom-media-paused">paused</code> being false, but those reasons do not fire this event (and when those situations resolve, a separate <code title="event-media-playing">playing</code> event is not fired either): e.g.
-<!--END w3c-html--><!--CONTROLLER-->
      the element is newly <span>blocked on its media controller</span>, or
-<!--START w3c-html--><!--CONTROLLER-->
      <span title="ended playback">playback ended</span>, or playback <span>stopped due to errors</span>, or the element has <span>paused for user interaction</span>.
    <tbody>
     <tr>
@@ -36914,7 +36783,6 @@
      <td>
   </table>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p>The following events fire on <code>MediaController</code> objects:</p>
 
   <table>
@@ -36984,7 +36852,6 @@
      <td><code>Event</code>
      <td>Either the <code title="dom-MediaController-volume">volume</code> attribute or the <code title="dom-MediaController-muted">muted</code> attribute has just been updated.
   </table>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <div class="impl">
 
@@ -37102,14 +36969,12 @@
   buffer everything and allow the user to seek through the earlier
   material, pause it, play it forwards and backwards, etc.</p>
 
-<!--END w3c-html--><!--CONTROLLER-->
   <p>When multiple tracks are synchronised with a
   <code>MediaController</code>, it is possible for scripts to add and
   remove media elements from the <code>MediaController</code>'s list
   of <span>slaved media elements</span>, even while these tracks are
   playing. How smoothly the media plays back in such situations is
   another quality-of-implementation issue.</p>
-<!--START w3c-html--><!--CONTROLLER-->
 
   <hr>
 
@@ -68561,9 +68426,7 @@
            attribute <span>Function</span> <span title="handler-onchange">onchange</span>;
            attribute <span>Function</span> <span title="handler-onclick">onclick</span>;
            attribute <span>Function</span> <span title="handler-oncontextmenu">oncontextmenu</span>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <span>Function</span> <span title="handler-oncuechange">oncuechange</span>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <span>Function</span> <span title="handler-ondblclick">ondblclick</span>;
            attribute <span>Function</span> <span title="handler-ondrag">ondrag</span>;
            attribute <span>Function</span> <span title="handler-ondragend">ondragend</span>;
@@ -76295,9 +76158,7 @@
     <tr><td><dfn title="handler-onchange"><code>onchange</code></dfn> <td> <code title="event-change">change</code> <!-- widely used -->
     <tr><td><dfn title="handler-onclick"><code>onclick</code></dfn> <td> <code title="event-click">click</code> <!-- widely used -->
     <tr><td><dfn title="handler-oncontextmenu"><code>oncontextmenu</code></dfn> <td> <code title="event-contextmenu">contextmenu</code> <!-- widely used -->
-<!--KEEP-END w3c-html--><!--TT-->
     <tr><td><dfn title="handler-oncuechange"><code>oncuechange</code></dfn> <td> <code title="event-cuechange">cuechange</code>
-<!--KEEP-START w3c-html--><!--TT-->
     <tr><td><dfn title="handler-ondblclick"><code>ondblclick</code></dfn> <td> <code title="event-dblclick">dblclick</code> <!-- widely used -->
     <tr><td><dfn title="handler-ondrag"><code>ondrag</code></dfn> <td> <code title="event-drag">drag</code>
     <tr><td><dfn title="handler-ondragend"><code>ondragend</code></dfn> <td> <code title="event-dragend">dragend</code>
@@ -102284,7 +102145,6 @@
   the <code>video</code> element itself, and is expected to be
   centered in the <code>video</code> element.</p>
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>Any subtitles or captions are expected to be overlayed directly
   on top of their <code>video</code> element, as defined by the
   relevant rendering rules; for <span>WebVTT</span>, those are the
@@ -102301,7 +102161,6 @@
   title="text track">text tracks</span> based on
   <span>WebVTT</span>, the <span>rules for updating the display of
   WebVTT text tracks</span>).</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p class="note">Resizing <code>video</code> and <code>canvas</code>
   elements does not interrupt video playback or clear the canvas.</p>
@@ -102318,8 +102177,6 @@
   </div>
 
 
-<!--KEEP-END w3c-html--><!--TT-->
-<!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
   <div class="impl">
 
   <h4>Timed text tracks</h4>
@@ -102328,6 +102185,7 @@
   module once an editor is found to run with it.</p>
 
 <!--START webvtt-->
+
   <h5><dfn>WebVTT cue text rendering rules</dfn></h5>
 
   <p>The <dfn>rules for updating the display of WebVTT text
@@ -103290,14 +103148,13 @@
   Object</span> <var title="">c</var>.</p>
 
   </div>
-<!--END webvtt-->
-<!--</div>-->
-<!--KEEP-START w3c-html--><!--TT-->
 
+<!--END webvtt--><!--TTVTT-->
 
 
 
 
+
   <div class="impl">
 
   <h4>Images</h4>
@@ -107159,7 +107016,7 @@
   <code>text/ping</code> resources.</p>
 <!--START w3c-html--><!--PING-->
 
-<!--END w3c-html--><!--TT-->
+<!--END w3c-html--><!--TTVTT-->
 <div data-component="other Hixie drafts (editor: Ian Hickson)">
   <h3><dfn><code>text/vtt</code></dfn></h3>
 
@@ -107245,7 +107102,7 @@
   <p>Fragment identifiers have no meaning with
   <code>text/vtt</code> resources.</p>
 </div>
-<!--START w3c-html--><!--TT-->
+<!--START w3c-html--><!--TTVTT-->
 
 <!--END w3c-html--><!--MD--><!--START microdata-->
 
@@ -107594,7 +107451,7 @@
          <code title="attr-media-src">src</code>;
          <code title="attr-media-preload">preload</code>;
          <code title="attr-media-autoplay">autoplay</code>;
-<!--END w3c-html--><!--CONTROLLER-->         <code title="attr-media-mediagroup">mediagroup</code>;<!--START w3c-html--><!--CONTROLLER-->
+         <code title="attr-media-mediagroup">mediagroup</code>;
          <code title="attr-media-loop">loop</code>;
          <code title="attr-media-controls">controls</code></td>
      <td><code>HTMLAudioElement</code></td>
@@ -108857,7 +108714,6 @@
      <td><code>HTMLTableRowElement</code></td>
     </tr>
 
-<!--KEEP-END w3c-html--><!--TT-->
     <tr>
      <th><code>track</code></th>
      <td>Timed text track</td>
@@ -108873,7 +108729,6 @@
          <code title="attr-track-srclang">srclang</code></td>
      <td><code>HTMLTrackElement</code></td>
     </tr>
-<!--KEEP-START w3c-html--><!--TT-->
 
     <tr>
      <th><code>u</code></th>
@@ -108922,7 +108777,7 @@
          <code title="attr-video-poster">poster</code>;
          <code title="attr-media-preload">preload</code>;
          <code title="attr-media-autoplay">autoplay</code>;
-<!--END w3c-html--><!--CONTROLLER-->         <code title="attr-media-mediagroup">mediagroup</code>;<!--START w3c-html--><!--CONTROLLER-->
+         <code title="attr-media-mediagroup">mediagroup</code>;
          <code title="attr-media-loop">loop</code>;
          <code title="attr-media-controls">controls</code>;
          <code title="attr-dim-width">width</code>;
@@ -109661,7 +109516,6 @@
      <td> <code title="attr-keygen-keytype">keygen</code>
      <td> The type of cryptographic key to generate
      <td> <a href="#attribute-text">Text</a>*
-<!--KEEP-END w3c-html--><!--TT-->
     <tr>
      <th> <code title="">kind</code>
      <td> <code title="attr-track-kind">track</code>
@@ -109671,16 +109525,13 @@
           "<code title="attr-track-kind-descriptions">descriptions</code>";
           "<code title="attr-track-kind-chapters">chapters</code>";
           "<code title="attr-track-kind-metadata">metadata</code>"
-<!--KEEP-START w3c-html--><!--TT-->
     <tr>
      <th> <code title="">label</code>
      <td> <code title="attr-command-label">command</code>;
           <code title="attr-menu-label">menu</code>;
           <code title="attr-optgroup-label">optgroup</code>;
           <code title="attr-option-label">option</code>;
-<!--KEEP-END w3c-html--><!--TT-->
           <code title="attr-track-label">track</code>
-<!--KEEP-START w3c-html--><!--TT-->
      <td> User-visible label
      <td> <a href="#attribute-text">Text</a>
     <tr>
@@ -109735,14 +109586,12 @@
           <code title="attr-style-media">style</code>
      <td> Applicable media
      <td> <span>Valid media query</span>
-<!--END w3c-html--><!--CONTROLLER-->
     <tr>
      <th> <code title="">mediagroup</code>
      <td> <code title="attr-media-mediagroup">audio</code>;
           <code title="attr-media-mediagroup">video</code>
      <td> Groups <span title="media element">media elements</span> together with an implicit <code>MediaController</code>
      <td> <a href="#attribute-text">Text</a>
-<!--START w3c-html--><!--CONTROLLER-->
     <tr>
      <th> <code title="">method</code>
      <td> <code title="attr-fs-method">form</code>
@@ -109964,9 +109813,7 @@
           <code title="attr-input-src">input</code>;
           <code title="attr-script-src">script</code>;
           <code title="attr-source-src">source</code>;
-<!--KEEP-END w3c-html--><!--TT-->
           <code title="attr-track-src">track</code>;
-<!--KEEP-START w3c-html--><!--TT-->
           <code title="attr-media-src">video</code>
      <td> Address of the resource
      <td> <span>Valid non-empty URL potentially surrounded by spaces</span>
@@ -109975,13 +109822,11 @@
      <td> <code title="attr-iframe-srcdoc">iframe</code>
      <td> A document to render in the <code>iframe</code>
      <td> The source of <span>an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</span>*
-<!--KEEP-END w3c-html--><!--TT-->
     <tr>
      <th> <code title="">srclang</code>
      <td> <code title="attr-track-srclang">track</code>
      <td> Language of the text track
      <td> Valid BCP 47 language tag
-<!--KEEP-START w3c-html--><!--TT-->
     <tr>
      <th> <code title="">start</code>
      <td> <code title="attr-ol-start">ol</code>
@@ -110216,13 +110061,12 @@
      <td> <span title="handler-oncontextmenu">HTML elements</span>
      <td> <code title="event-contextmenu">contextmenu</code> event handler
      <td> <span title="event handler content attributes">Event handler content attribute</span>
-<!--KEEP-END w3c-html--><!--TT-->
+
     <tr>
      <th id="ix-handler-oncuechange"> <code title="">oncuechange</code>
      <td> <span title="handler-oncuechange">HTML elements</span>
      <td> <code title="event-cuechange">cuechange</code> event handler
      <td> <span title="event handler content attributes">Event handler content attribute</span>
-<!--KEEP-START w3c-html--><!--TT-->
 
     <tr>
      <th id="ix-handler-ondblclick"> <code title="">ondblclick</code>
@@ -111032,11 +110876,9 @@
      <td> <code>tr</code>
      <td> <code>HTMLTableRowElement</code> : <code>HTMLElement</code>
 
-<!--KEEP-END w3c-html--><!--TT-->
     <tr>
      <td> <code>track</code>
      <td> <code>HTMLTrackElement</code> : <code>HTMLElement</code>
-<!--KEEP-START w3c-html--><!--TT-->
 
     <tr>
      <td> <code>u</code>
@@ -112707,12 +112549,10 @@
   microdata feature.</p>
 <!--START w3c-html--><!--MD-->
 
-<!--END w3c-html--><!--TT-->
   <p>Thanks to the SubRip community, including in particular Zuggy and
   ai4spam, for their work on the SubRip software program whose SRT
   file format was used as the basis for the WebVTT text track file
   format.</p>
-<!--START w3c-html--><!--TT-->
 
   <div class="impl">
 




More information about the Commit-Watchers mailing list