RubyGems - watir-webdriver - Versions diffs - 0.1.7 → 0.1.8 - Mend

watir-webdriver 0.1.7 → 0.1.8

Files changed (21) hide show

data/Gemfile +2 -0
data/Rakefile +0 -7
data/lib/watir-webdriver.rb +0 -1
data/lib/watir-webdriver/browser.rb +22 -5
data/lib/watir-webdriver/elements/button.rb +0 -9
data/lib/watir-webdriver/elements/checkbox.rb +0 -8
data/lib/watir-webdriver/elements/file_field.rb +0 -8
data/lib/watir-webdriver/elements/frame.rb +55 -63
data/lib/watir-webdriver/elements/generated.rb +2 -1
data/lib/watir-webdriver/elements/input.rb +0 -14
data/lib/watir-webdriver/elements/radio.rb +0 -7
data/lib/watir-webdriver/elements/text_field.rb +0 -10
data/lib/watir-webdriver/version.rb +1 -1
data/spec/browser_spec.rb +23 -4
data/spec/html/wait.html +1 -1
data/spec/spec_helper.rb +7 -0
data/spec/wait_spec.rb +35 -21
data/support/html5.html +1430 -835
data/watir-webdriver.gemspec +3 -3
metadata +5 -16
data/lib/watir-webdriver/core_ext/string.rb +0 -22

data/support/html5.html CHANGED Viewed

@@ -1,7 +1,7 @@
-<!--  downloaded from http://www.whatwg.org/specs/web-apps/current-work/ on 2010-11-11 11:33:07 +0100 -->
+<!--  downloaded from http://www.whatwg.org/specs/web-apps/current-work/ on 2010-12-19 01:46:50 +0100 -->
 <!DOCTYPE html><html lang=en-US-x-hixie><title>HTML5 (including next generation additions still in development)</title><script>
    var loadTimer = new Date();
-   var current_revision = "r" + "$Revision: 5678 $".substr(11);
+   var current_revision = "r" + "$Revision: 5720 $".substr(11);
    current_revision = current_revision.substr(0, current_revision.length - 2);
    var last_known_revision = current_revision;
    function getCookie(name) {
@@ -199,7 +199,9 @@
   </style><style>
    .domintro:before { display: table; margin: -1em -0.5em -0.5em auto; width: auto; content: 'This box is non-normative. Implementation requirements are given below this box.'; color: black; font-style: italic; border: solid 2px; background: white; padding: 0 0.25em; }
   </style><link href=data:text/css, id=complete rel=stylesheet title="Complete specification"><link href=data:text/css,.impl%20{%20display:%20none;%20}%0Ahtml%20{%20border:%20solid%20yellow;%20}%20.domintro:before%20{%20display:%20none;%20} id=author rel="alternate stylesheet" title="Author documentation only"><link href=data:text/css,.impl%20{%20background:%20%23FFEEEE;%20}%20.domintro:before%20{%20background:%20%23FFEEEE;%20} id=highlight rel="alternate stylesheet" title="Highlight implementation requirements"><link href=status.css rel=stylesheet><script>
+   var startedInit = 0;
    function init() {
+     startedInit = 1;
      if (location.search == '?slow-browser')
        return;
      var configUI = document.createElement('div');
@@ -215,11 +217,16 @@
      if (getCookie('profile') == '1')
        document.getElementsByTagName('h2')[0].textContent += '; load: ' + (new Date() - loadTimer) + 'ms';
    }
+   if (document.documentElement.className == "")
+     setTimeout(function () {
+       if (!startedInit)
+         showAlert("Too slow? Try reading the multipage copy of the spec instead:", "http://whatwg.org/html");
+     }, 5000);
   </script><body class=draft onload=init()>
   <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>HTML5 (including next generation additions still in development)</h1>
-    <h2 class="no-num no-toc">Draft Standard &mdash; 11 November 2010</h2>
+    <h2 class="no-num no-toc">Draft Standard &mdash; 16 December 2010</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>-->
@@ -376,9 +383,10 @@
      <li><a href=#domsettabletokenlist-0><span class=secno>2.8.4 </span>DOMSettableTokenList</a></li>
      <li><a href=#safe-passing-of-structured-data><span class=secno>2.8.5 </span>Safe passing of structured data</a></li>
      <li><a href=#domstringmap-0><span class=secno>2.8.6 </span>DOMStringMap</a></li>
-     <li><a href=#dom-feature-strings><span class=secno>2.8.7 </span>DOM feature strings</a></li>
-     <li><a href=#exceptions><span class=secno>2.8.8 </span>Exceptions</a></li>
-     <li><a href=#garbage-collection><span class=secno>2.8.9 </span>Garbage collection</a></ol></li>
+     <li><a href=#domelementmap-0><span class=secno>2.8.7 </span>DOMElementMap</a></li>
+     <li><a href=#dom-feature-strings><span class=secno>2.8.8 </span>DOM feature strings</a></li>
+     <li><a href=#exceptions><span class=secno>2.8.9 </span>Exceptions</a></li>
+     <li><a href=#garbage-collection><span class=secno>2.8.10 </span>Garbage collection</a></ol></li>
    <li><a href=#namespaces><span class=secno>2.9 </span>Namespaces</a></ol></li>
  <li><a href=#dom><span class=secno>3 </span>Semantics, structure, and APIs of HTML documents</a>
   <ol>
@@ -569,7 +577,7 @@
        <li><a href=#the-ready-states><span class=secno>4.8.10.7 </span>The ready states</a></li>
        <li><a href=#playing-the-media-resource><span class=secno>4.8.10.8 </span>Playing the media resource</a></li>
        <li><a href=#seeking><span class=secno>4.8.10.9 </span>Seeking</a></li>
-       <li><a href=#timed-tracks><span class=secno>4.8.10.10 </span>Timed tracks</a>
+       <li><a href=#text-timed-tracks><span class=secno>4.8.10.10 </span>Text timed tracks</a>
         <ol>
          <li><a href=#timed-track-model><span class=secno>4.8.10.10.1 </span>Timed track model</a></li>
          <li><a href=#sourcing-in-band-timed-tracks><span class=secno>4.8.10.10.2 </span>Sourcing in-band timed tracks</a></li>
@@ -1176,7 +1184,7 @@
    <li><a href=#replaced-elements><span class=secno>12.3 </span>Replaced elements</a>
     <ol>
      <li><a href=#embedded-content-2><span class=secno>12.3.1 </span>Embedded content</a></li>
-     <li><a href=#timed-tracks-0><span class=secno>12.3.2 </span>Timed tracks</a>
+     <li><a href=#timed-tracks><span class=secno>12.3.2 </span>Timed tracks</a>
       <ol>
        <li><a href=#websrt-cue-text-rendering-rules><span class=secno>12.3.2.1 </span>WebSRT cue text rendering rules</a></li>
        <li><a href=#applying-css-properties-to-websrt-node-objects><span class=secno>12.3.2.2 </span>Applying CSS properties to WebSRT Node Objects</a></li>
@@ -1299,10 +1307,11 @@
   beyond HTML5 (and that are therefore not included in the W3C version
   of HTML5) currently consist of:</p>
-  <ul class=brief><li>The <code><a href=#devices>device</a></code> element.</li>
-   <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>
-   <li>The <a href=#timed-track>timed track</a> model for <a href=#media-element title="media element">media elements</a>, the <a href=#websrt>WebSRT</a> format, and related features.</li>
-   <li>Rules for <a href=#atom>converting HTML to Atom</a>.</li>
+  <ul class=brief><li>The <code><a href=#devices>device</a></code> element.</li> <!--DEVICE-->
+   <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=#websrt>WebSRT</a> format and some <a href=#timed-track>timed track</a> API features.</li> <!--TT--> <!--TTSRT-->
+   <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-->
   </ul><p>Features that are part of HTML (and this specification) but that
   are currently published as separate specifications as well, and are
   not included in the W3C HTML5 specification, consist of:</p>
@@ -2659,6 +2668,9 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   subresources</a>; other resources, e.g. fonts or backgrounds, are
   not.</p>
+  <p>The term <dfn id=data-protocol title="data protocol"><code title="">data:</code>
+  URL</dfn> refers to <a href=#url title=URL>URLs</a> that use the <code title="">data:</code> scheme. <a href=#refsRFC2397>[RFC2397]</a></p>
   <h4 id=xml><span class=secno>2.1.2 </span>XML</h4>
@@ -5897,15 +5909,18 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
      </li>
-     <li><p>If there is no <code><a href=#the-base-element>base</a></code> element that is both a
-     child of <a href=#the-head-element>the <code>head</code> element</a> and has an
-     <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute, then the
-     <a href=#document-base-url>document base URL</a> is <var title="">fallback base
-     url</var>.</li>
+     <li><p>If the <code><a href=#document>Document</a></code> is <a href=#an-iframe-srcdoc-document>an
+     <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a>, then
+     let <var title="">fallback base url</var> be the <a href=#document-base-url>document
+     base URL</a> of the <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing
+     context</a>'s <a href=#browsing-context-container>browsing context container</a>'s
+     <code><a href=#document>Document</a></code> instead.</li>
-     <li><p>Otherwise, let <var title="">url</var> be the value of the
-     <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute of the first
-     such element.</li>
+     <li><p>If there is no <code><a href=#the-base-element>base</a></code> element that has an <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute, then the
+     <a href=#document-base-url>document base URL</a> is <var title="">fallback base
+     url</var>. Otherwise, let <var title="">url</var> be the value of
+     the <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute of the
+     first such element.</li>
      <li><p><a href=#resolve-a-url title="resolve a URL">Resolve</a> <var title="">url</var> relative to <var title="">fallback base
      url</var> (thus, the <code><a href=#the-base-element>base</a></code> <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute isn't affected by
@@ -6289,10 +6304,8 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   <ol><li>
-    <p>Generate the <i>address of the resource from which Request-URIs
-    are obtained</i> as required by HTTP for the <code title=http-referer>Referer</code> (sic) header from <a href="#the-document's-current-address">the
-    document's current address</a> of the appropriate
-    <code><a href=#document>Document</a></code> as given by the following list. <a href=#refsHTTP>[HTTP]</a></p>
+    <p>Let <var title="">document</var> be the appropriate
+    <code><a href=#document>Document</a></code> as given by the following list:</p>
     <dl class=switch><dt>When <a href=#navigate title=navigate>navigating</a></dt>
@@ -6308,7 +6321,26 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
      <dd>The <a href=#entry-script>entry script</a>'s <a href="#script's-document" title="script's
      document">document</a>.</dd>
-    </dl><p>Remove any <a href=#url-fragment title=url-fragment>&lt;fragment&gt;</a>
+    </dl></li>
+   <li>
+    <p>While <var title="">document</var> is is <a href=#an-iframe-srcdoc-document>an
+    <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code>
+    document</a>, let <var title="">document</var> be <var title="">document</var>'s <a href=#browsing-context>browsing context</a>'s
+    <a href=#browsing-context-container>browsing context container</a>'s <code><a href=#document>Document</a></code>
+    instead.</p>
+   </li>
+   <li>
+    <p>Generate the <i>address of the resource from which Request-URIs
+    are obtained</i> as required by HTTP for the <code title=http-referer>Referer</code> (sic) header from <a href="#the-document's-current-address">the
+    document's current address</a> of <var title="">document</var>.
+    <a href=#refsHTTP>[HTTP]</a></p>
+    <p>Remove any <a href=#url-fragment title=url-fragment>&lt;fragment&gt;</a>
     component from the generated <i>address of the resource from which
     Request-URIs are obtained</i>.</p> <!-- RFC2616 says "The URI MUST
     NOT include a fragment." (section 14.36) -->
@@ -7854,7 +7886,57 @@ interface <dfn id=propertynodelist>PropertyNodeList</dfn> : <a href=#nodelist>No
   </div>
-  <h4 id=dom-feature-strings><span class=secno>2.8.7 </span>DOM feature strings</h4>
+<!--CSSREF-->
+  <h4 id=domelementmap-0><span class=secno>2.8.7 </span>DOMElementMap</h4>
+  <p>The <code><a href=#domelementmap>DOMElementMap</a></code> interface represents a set of
+  name-element mappings. It exposes these using the scripting
+  language's native mechanisms for property access.</p>
+  <div class=impl>
+  <p>When a <code><a href=#domelementmap>DOMElementMap</a></code> object is instantiated, it is
+  associated with three algorithms, one for getting the list of
+  name-element mappings, one for mapping a name to a certain element,
+  and one for deleting mappings by name.</p>
+  <pre class=idl>interface <dfn id=domelementmap>DOMElementMap</dfn> {
+  <a href=#dom-domelementmap-nameditem title=dom-DOMElementMap-namedItem>getter</a> DOMString (in DOMString name);
+  <a href=#dom-domelementmap-setitem title=dom-DOMElementMap-setItem>setter</a> void (in DOMString name, in <a href=#element>Element</a> value);
+  <a href=#dom-domelementmap-additem title=dom-DOMElementMap-addItem>creator</a> void (in DOMString name, in <a href=#element>Element</a> value);
+  <a href=#dom-domelementmap-removeitem title=dom-DOMElementMap-removeItem>deleter</a> void (in DOMString name);
+};</pre>
+  <p>The <a href=#supported-property-names>supported property names</a> on a
+  <code><a href=#domelementmap>DOMElementMap</a></code> object at any instant are the names for
+  each mapping returned from the algorithm for getting the list of
+  name-element mappings at that instant.</p>
+  <p>To <dfn id=dom-domelementmap-nameditem title=dom-DOMElementMap-namedItem>determine the value
+  of a named property</dfn> <var title="">name</var> in a
+  <code><a href=#domelementmap>DOMElementMap</a></code>, the user agent must return the element
+  component of the name-element mapping whose name component is <var title="">name</var> in the list returned by the algorithm for
+  getting the list of name-element mappings.</p>
+  <p>To set the value of a <dfn id=dom-domelementmap-additem title=dom-DOMElementMap-addItem>new</dfn> or <dfn id=dom-domelementmap-setitem title=dom-DOMElementMap-setItem>existing</dfn> named property <var title="">name</var> to value <var title="">value</var>, the
+  algorithm for mapping a name to a certain element must be run,
+  passing <var title="">name</var> as the name <var title="">value</var> as the element.</p>
+  <p>To <dfn id=dom-domelementmap-removeitem title=dom-DOMElementMap-removeItem>delete an existing
+  named property</dfn> <var title="">name</var>, the algorithm for
+  deleting mappings must be run, passing <var title="">name</var> as
+  the name component of the mapping to be deleted.</p>
+  <p class=note>The <code><a href=#domelementmap>DOMElementMap</a></code> interface definition
+  here is only intended for JavaScript environments. Other language
+  bindings will need to define how <code><a href=#domelementmap>DOMElementMap</a></code> is to be
+  implemented for those languages.</p>
+  </div>
+<!--CSSREF-->
+  <h4 id=dom-feature-strings><span class=secno>2.8.8 </span>DOM feature strings</h4>
   <p>DOM3 Core defines mechanisms for checking for interface support,
   and for obtaining implementations of interfaces, using <a href=http://www.w3.org/TR/DOM-Level-3-Core/core.html#DOMFeatures>feature
@@ -7876,7 +7958,7 @@ interface <dfn id=propertynodelist>PropertyNodeList</dfn> : <a href=#nodelist>No
   </div>
-  <h4 id=exceptions><span class=secno>2.8.8 </span>Exceptions</h4>
+  <h4 id=exceptions><span class=secno>2.8.9 </span>Exceptions</h4>
   <p>The following are <code><a href=#domexception>DOMException</a></code> codes. <a href=#refsDOMCORE>[DOMCORE]</a></p>
@@ -7923,7 +8005,7 @@ interface <dfn id=propertynodelist>PropertyNodeList</dfn> : <a href=#nodelist>No
   <div class=impl>
-  <h4 id=garbage-collection><span class=secno>2.8.9 </span>Garbage collection</h4>
+  <h4 id=garbage-collection><span class=secno>2.8.10 </span>Garbage collection</h4>
   <p>There is an <dfn id=implied-strong-reference>implied strong reference</dfn> from any IDL
   attribute that returns a pre-existing object to that object.</p>
@@ -7996,9 +8078,26 @@ interface <dfn id=propertynodelist>PropertyNodeList</dfn> : <a href=#nodelist>No
   <a href=#html-documents title="HTML documents">HTML document</a> or an <a href=#xml-documents title="XML documents">XML document</a> affects the behavior of
   certain APIs and the case-sensitivity of some selectors.</p>
+  <p>Each <code><a href=#document>Document</a></code> object has a <dfn id=reload-override-flag>reload override
+  flag</dfn> that is originally unset. The flag is set by the <code title=dom-document-open><a href=#dom-document-open>document.open()</a></code> and <code title=dom-document-open><a href=#dom-document-open>document.write()</a></code> methods in certain
+  situations. When the flag is set, the <code><a href=#document>Document</a></code> also has
+  a <dfn id=reload-override-buffer>reload override buffer</dfn> which is a Unicode string that
+  is used as the source of the document when it is reloaded.</p>
+  <p>When the user agent is to perform <dfn id=an-overridden-reload>an overridden
+  reload</dfn>, it must act as follows:</p>
-  <h4 id=documents-in-the-dom><span class=secno>3.1.1 </span>Documents in the DOM</h4>
+  <ol><li><p>Let <var title="">source</var> be the value of the
+   <a href=#browsing-context>browsing context</a>'s <a href=#active-document>active document</a>'s
+   <a href=#reload-override-buffer>reload override buffer</a>.</li>
+   <li><p><a href=#navigate>Navigate</a><!--DONAV reload after d.open()--> the
+   <a href=#browsing-context>browsing context</a> to a resource whose source is <var title="">source</var>. When the <a href=#navigate>navigate</a> algorithm
+   creates a <code><a href=#document>Document</a></code> object for this purpose, set that
+   <code><a href=#document>Document</a></code>'s <a href=#reload-override-flag>reload override flag</a> and set
+   its <a href=#reload-override-buffer>reload override buffer</a> to <var title="">source</var>.</li>
+  </ol><h4 id=documents-in-the-dom><span class=secno>3.1.1 </span>Documents in the DOM</h4>
   <p>All <code><a href=#document>Document</a></code> objects (in user agents implementing
   this specification) <span class=impl>must</span> also implement
@@ -8048,6 +8147,7 @@ interface <dfn id=htmldocument>HTMLDocument</dfn> {
   NodeList <a href=#dom-document-getelementsbyname title=dom-document-getElementsByName>getElementsByName</a>(in DOMString elementName);
   NodeList <a href=#dom-document-getelementsbyclassname title=dom-document-getElementsByClassName>getElementsByClassName</a>(in DOMString classNames);
 <!--MD-->  NodeList <a href=#dom-document-getitems title=dom-document-getItems>getItems</a>(in optional DOMString typeNames); // <a href=#microdata>microdata</a> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION--><!--MD-->
+<!--CSSREF-->  readonly attribute <a href=#domelementmap>DOMElementMap</a> <a href=#dom-document-csselementmap title=dom-document-cssElementMap>cssElementMap</a>;<!--CSSREF-->
   // <a href=#dynamic-markup-insertion>dynamic markup insertion</a>
            attribute DOMString <a href=#dom-innerhtml title=dom-innerHTML>innerHTML</a>;
@@ -8215,19 +8315,20 @@ interface <dfn id=htmldocument>HTMLDocument</dfn> {
   attribute represents the cookies of the resource from which the
   <code><a href=#document>Document</a></code> was created.</p>
-  <p>Some <code><a href=#document>Document</a></code> objects are <dfn id=cookie-free-document-object title="cookie-free
-  Document object">cookie-free <code>Document</code>
-  objects</dfn>. Any <code><a href=#document>Document</a></code> object created by the <code title="">createDocument()</code> or <code title=dom-DOMHTMLImplementation-createHTMLDocument><a href=#dom-domhtmlimplementation-createhtmldocument>createHTMLDocument()</a></code>
-  factory methods is a <a href=#cookie-free-document-object>cookie-free <code>Document</code>
-  object</a>. Any <code><a href=#document>Document</a></code> whose <a href="#the-document's-address" title="the
-  document's address">address</a> does not use a server-based
-  naming authority is a <a href=#cookie-free-document-object>cookie-free <code>Document</code>
-  object</a>. Other specifications can also define
-  <code><a href=#document>Document</a></code> objects as being <a href=#cookie-free-document-object title="cookie-free
-  Document object">cookie-free <code>Document</code>
-  objects</a>.</p>
-  <p id=sandboxCookies>On getting, if the document is a
+  <p>A <code><a href=#document>Document</a></code> object that falls into one of the
+  following conditions is a <dfn id=cookie-free-document-object>cookie-free <code>Document</code>
+  object</dfn>:</p>
+  <ul><li>A <code><a href=#document>Document</a></code> that has no <a href=#browsing-context>browsing
+   context</a>.</li>
+   <li>A <code><a href=#document>Document</a></code> whose <a href="#the-document's-address" title="the document's
+   address">address</a> does not use a server-based naming
+   authority.</li>
+  </ul><!--Other specifications can also define <code>Document</code>
+  objects as being <span title="cookie-free Document
+  object">cookie-free <code>Document</code> objects</span>.--><p id=sandboxCookies>On getting, if the document is a
   <a href=#cookie-free-document-object>cookie-free <code>Document</code> object</a>, then the user
   agent must return the empty string. Otherwise, if the
   <code><a href=#document>Document</a></code>'s <a href=#origin>origin</a> is not a
@@ -8720,6 +8821,83 @@ interface <dfn id=htmldocument>HTMLDocument</dfn> {
 > optional tag name.
 -->
+<!--CSSREF-->
+  <hr><dl class=domintro><dt><var title="">element</var> . <code title=dom-document-cssElementMap><a href=#dom-document-csselementmap>cssElementMap</a></code></dt>
+   <dd>
+    <p>Returns a <code><a href=#domelementmap>DOMElementMap</a></code> object for the
+    <code><a href=#document>Document</a></code> representing the current <span title="CSS
+    element reference identifier">CSS element reference
+    identifiers</span>.</p>
+   </dd>
+  </dl><div class=impl>
+  <p>The <dfn id=dom-document-csselementmap title=dom-document-cssElementMap><code>cssElementMap</code></dfn>
+  IDL attribute allows authors to define <span title="CSS element
+  reference identifier">CSS element reference identifiers</span>,
+  which are used in certain CSS features to override the normal <a href=#concept-id title=concept-id>ID</a>-based mapping. <a href=#refsCSSIMAGES>[CSSIMAGES]</a></p>
+  <p>When a <code><a href=#document>Document</a></code> is created, it must be associated
+  with an initially-empty <dfn id=css-id-overrides-list>CSS ID overrides list</dfn>, which
+  consists of a list of mappings each of which consists of a string
+  name mapped to an <code><a href=#element>Element</a></code> node.</p>
+  <p>Each entry in the <a href=#css-id-overrides-list>CSS ID overrides list</a>, while it is
+  in the list, defines a <span>CSS element reference identifier</span>
+  mapping the given name to the given <code><a href=#element>Element</a></code>. <a href=#refsCSSIMAGES>[CSSIMAGES]</a></p>
+  <p>On getting, the <code title=dom-document-cssElementMap><a href=#dom-document-csselementmap>cssElementMap</a></code> IDL
+  attribute must return a <code><a href=#domelementmap>DOMElementMap</a></code> object,
+  associated with the following algorithms, which expose the current
+  mappings:</p>
+  <dl><dt>The algorithm for getting the list of name-element mappings</dt>
+   <dd>
+    <p>Return the <code><a href=#document>Document</a></code>'s <a href=#css-id-overrides-list>CSS ID overrides
+    list</a>, maintaining the order in which the entries were
+    originally added to the list.</p>
+   </dd>
+   <dt>The algorithm for for mapping a name to a certain element</dt>
+   <dd>
+    <p>Let <var title="">name</var> be the name passed to the
+    algorithm and <var title="">element</var> be the
+    <code><a href=#element>Element</a></code> passed to the algorithm.</p>
+    <p>If <var title="">element</var> is null, run the algorithm for
+    deleting mappings by name, passing it <var title="">name</var>.</p>
+    <p>Otherwise, if there is an entry in the <code><a href=#document>Document</a></code>'s
+    <a href=#css-id-overrides-list>CSS ID overrides list</a> whose name is <var title="">name</var>, replace its current value with <var title="">element</var>.</p>
+    <p>Otherwise, add a mapping to the <code><a href=#document>Document</a></code>'s
+    <a href=#css-id-overrides-list>CSS ID overrides list</a> whose name is <var title="">name</var> and whose element is <var title="">element</var>.</p>
+   </dd>
+   <dt>The algorithm for deleting mappings by name</dt>
+   <dd>
+    <p>If there is an entry in the <code><a href=#document>Document</a></code>'s <a href=#css-id-overrides-list>CSS
+    ID overrides list</a> whose name is the name passed to this
+    algorithm, remove it. This also undefines the <span>CSS element
+    reference identifier</span> for that name. <a href=#refsCSSIMAGES>[CSSIMAGES]</a></p>
+   </dd>
+  </dl><p>The same object must be returned each time.</p>
+  </div>
+<!--CSSREF-->
   <div class=impl>
   <hr><p>The <code><a href=#htmldocument>HTMLDocument</a></code> interface <span title="support
@@ -9691,7 +9869,8 @@ Transport Protocol"&gt;HTTP&lt;/abbr&gt; today.&lt;/p&gt;</pre>
       element that is a descendant of the element whose <a href=#the-directionality title="the directionality">directionality</a> is being
       determined and that is either:</p>
-      <ul class=brief><li>A <code><a href=#script>script</a></code> element.
+      <ul class=brief><li>A <code><a href=#the-bdi-element>bdi</a></code> element.
+       <li>A <code><a href=#script>script</a></code> element.
        <li>A <code><a href=#the-style-element>style</a></code> element.
        <li>An element with a <code title=attr-dir><a href=#the-dir-attribute>dir</a></code> attribute in a defined state.
       </ul></li>
@@ -11151,7 +11330,7 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
   overridden. The following table lists these elements<span class=impl> and their <span>implicit ARIA semantics</span></span>,
   along with the restrictions that apply to those elements. Each
   language feature (element or attribute) in a cell in the first
-  column implies, unless otherwise overriden, the ARIA semantic (role,
+  column implies, unless otherwise overridden, the ARIA semantic (role,
   state, or property) given in the cell in the second column of the
   same row, but this semantic may be overridden under the conditions
   listed in the cell in the third column of that row. In addition, any
@@ -11630,6 +11809,10 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
    <li><p>Change the <a href="#document's-character-encoding">document's character encoding</a> to
    UTF-8.</li>
+   <li><p>Set the <code><a href=#document>Document</a></code> object's <a href=#reload-override-flag>reload override
+   flag</a> and set the <code><a href=#document>Document</a></code>'s <a href=#reload-override-buffer>reload
+   override buffer</a> to the empty string.</li>
    <li><p>Change <a href="#the-document's-address">the document's address</a> to the
    <a href=#entry-script>entry script</a>'s <a href="#script's-document" title="script's
    document">document</a>'s <a href="#the-document's-address" title="the document's
@@ -11823,10 +12006,10 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
    <li>
-    <p>If the <a href=#insertion-point>insertion point</a> is undefined, the <code title=dom-document-open><a href=#dom-document-open>open()</a></code> method must be called
-    (with no arguments) on the <code title=Document><a href=#document>document</a></code>
-    object. If the user <a href=#refused-to-allow-the-document-to-be-unloaded>refused to allow the document to be
-    unloaded</a>, then these steps must be aborted. Otherwise, the
+    <p>If the <a href=#insertion-point>insertion point</a> is undefined, call the
+    <code title=dom-document-open><a href=#dom-document-open>open()</a></code> method on the <code title=Document><a href=#document>document</a></code> object (with no arguments). If
+    the user <a href=#refused-to-allow-the-document-to-be-unloaded>refused to allow the document to be
+    unloaded</a>, then abort these steps. Otherwise, the
     <a href=#insertion-point>insertion point</a> will point at just before the end of
     the (empty) <a href=#the-input-stream>input stream</a>.</p>
@@ -11834,28 +12017,30 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
    <li>
-    <p>The string consisting of the concatenation of all the arguments
-    to the method must be inserted into the <a href=#the-input-stream>input stream</a>
-    just before the <a href=#insertion-point>insertion point</a>.</p>
+    <p>Insert the string consisting of the concatenation of all the
+    arguments to the method into the <a href=#the-input-stream>input stream</a> just
+    before the <a href=#insertion-point>insertion point</a>.</p>
    </li>
    <li>
-    <p>If there is a <a href=#pending-parsing-blocking-script>pending parsing-blocking script</a>, then the
-    method must now return without further processing of the
-    <a href=#the-input-stream>input stream</a>.</p>
+    <p>If the <code><a href=#document>Document</a></code> object's <a href=#reload-override-flag>reload override
+    flag</a> is set, then append the string consisting of the
+    concatenation of all the arguments to the method to the
+    <code><a href=#document>Document</a></code>'s <a href=#reload-override-buffer>reload override buffer</a>.</p>
    </li>
    <li>
-    <p>Otherwise, the tokenizer must process the characters that were
-    inserted, one at a time, processing resulting tokens as they are
-    emitted, and stopping when the tokenizer reaches the insertion
-    point or when the processing of the tokenizer is aborted by the
-    tree construction stage (this can happen if a <code><a href=#script>script</a></code>
-    end tag token is emitted by the tokenizer).
+    <p>If there is no <a href=#pending-parsing-blocking-script>pending parsing-blocking script</a>,
+    have the tokenizer process the characters that were inserted, one
+    at a time, processing resulting tokens as they are emitted, and
+    stopping when the tokenizer reaches the insertion point or when
+    the processing of the tokenizer is aborted by the tree
+    construction stage (this can happen if a <code><a href=#script>script</a></code> end
+    tag token is emitted by the tokenizer).
     <p class=note>If the <code title=dom-document-write><a href=#dom-document-write>document.write()</a></code> method was
     called from script executing inline (i.e. executing because the
@@ -11867,7 +12052,7 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
    <li>
-    <p>Finally, the method must return.</p>
+    <p>Finally, return from the method.</p>
    </li>
@@ -13366,7 +13551,7 @@ gave me some of the songs they wrote. I love sharing my music.&lt;/p&gt;
      <td><code title="">refresh</code>
      <td>
     <tr class=impl><td><a href=#attr-meta-http-equiv-set-cookie title=attr-meta-http-equiv-set-cookie>Cookie setter</a>
-     <td><code title="">Set-Cookie</code>
+     <td><code title="">set-cookie</code>
      <td>Non-conforming
   </table><!--
 DATA: According to Henri's validator stats, here are common
@@ -13639,17 +13824,15 @@ people expect to have work and what is necessary.
        <code><a href=#meta>meta</a></code> element's <code><a href=#document>Document</a></code>'s
        <a href=#browsing-context>browsing context</a> did not have the <a href=#sandboxed-automatic-features-browsing-context-flag>sandboxed
        automatic features browsing context flag</a> set when the
-       <code><a href=#document>Document</a></code> was created, the user agent <a href=#navigate title=navigate>navigates</a> the <code><a href=#document>Document</a></code>'s
-       <a href=#browsing-context>browsing context</a> to <var title="">url</var>, with
-       <a href=#replacement-enabled>replacement enabled</a>, and with the
-       <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a> as the
-       <a href=#source-browsing-context>source browsing context</a>.</li>
+       <code><a href=#document>Document</a></code> was created, the user agent <a href=#navigate title=navigate>navigates</a><!--DONAV meta refresh--> the
+       <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a> to <var title="">url</var>, with <a href=#replacement-enabled>replacement enabled</a>, and
+       with the <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a>
+       as the <a href=#source-browsing-context>source browsing context</a>.</li>
        <li><p>Provide the user with an interface that, when selected,
-       <a href=#navigate title=navigate>navigates</a> a <a href=#browsing-context>browsing
-       context</a> to <var title="">url</var>, with the document's
-       browsing context as the <a href=#source-browsing-context>source browsing
-       context</a>.</li>
+       <a href=#navigate title=navigate>navigates</a><!--DONAV meta
+       refresh--> a <a href=#browsing-context>browsing context</a> to <var title="">url</var>, with the document's browsing context as the
+       <a href=#source-browsing-context>source browsing context</a>.</li>
        <li><p>Do nothing.</li>
@@ -22189,8 +22372,8 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
   <p>The <dfn id=attr-iframe-srcdoc title=attr-iframe-srcdoc><code>srcdoc</code></dfn>
   attribute gives the content of the page that the <a href=#nested-browsing-context>nested
-  browsing context</a> is to contain.  The value of the attribute
-  in is <dfn id=an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</dfn>.</p>
+  browsing context</a> is to contain. The value of the attribute is
+  the source of <dfn id=an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</dfn>.</p>
   <p>For <code><a href=#the-iframe-element>iframe</a></code> elements in <a href=#html-documents>HTML documents</a>,
   the attribute, if present, must have a value using <a href=#syntax>the HTML
@@ -22231,14 +22414,14 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
   first time.</p>
   <p>Whenever an <code><a href=#the-iframe-element>iframe</a></code> element with a <a href=#nested-browsing-context>nested
-  browsing context</a> has its <code title=attr-iframe-srcdoc><a href=#attr-iframe-srcdoc>srcdoc</a></code> attribute set or changed,
-  the user agent must <a href=#process-the-iframe-attributes>process the <code>iframe</code>
+  browsing context</a> has its <code title=attr-iframe-srcdoc><a href=#attr-iframe-srcdoc>srcdoc</a></code> attribute set, changed, or
+  removed, the user agent must <a href=#process-the-iframe-attributes>process the <code>iframe</code>
   attributes</a>.</p>
   <p>Similarly, whenever an <code><a href=#the-iframe-element>iframe</a></code> element with a
   <a href=#nested-browsing-context>nested browsing context</a> but with no <code title=attr-iframe-srcdoc><a href=#attr-iframe-srcdoc>srcdoc</a></code> attribute specified has its
-  <code title=attr-iframe-src><a href=#attr-iframe-src>src</a></code> attribute set or changed,
-  the user agent must <a href=#process-the-iframe-attributes>process the <code>iframe</code>
+  <code title=attr-iframe-src><a href=#attr-iframe-src>src</a></code> attribute set, changed, or
+  removed, the user agent must <a href=#process-the-iframe-attributes>process the <code>iframe</code>
   attributes</a>.</p> <!-- It doesn't happen when the base URL is
   changed, though. -->
@@ -22249,11 +22432,14 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
   <dl class=switch><dt>If the <code title=attr-iframe-srcdoc><a href=#attr-iframe-srcdoc>srcdoc</a></code> attribute
    is specified</dt>
-   <dd><p><a href=#navigate>Navigate</a> the element's <a href=#browsing-context>browsing
-   context</a> to a resource whose <a href=#content-type>Content-Type</a> is
-   <code><a href=#text/html>text/html</a></code>, whose <a href=#url>URL</a> is
-   <code><a href=#about:srcdoc>about:srcdoc</a></code>, and whose data consists of the value of
-   the attribute.</dd>
+   <dd><p><a href=#navigate>Navigate</a><!--DONAV iframe--> the element's
+   <a href=#browsing-context>browsing context</a> to a resource whose
+   <a href=#content-type>Content-Type</a> is <code><a href=#text/html>text/html</a></code>, whose
+   <a href=#url>URL</a> is <code><a href=#about:srcdoc>about:srcdoc</a></code>, and whose data
+   consists of the value of the attribute. The resulting
+   <code><a href=#document>Document</a></code> must be considered <a href=#an-iframe-srcdoc-document>an
+   <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code>
+   document</a>.</dd>
    <dt>If the <code title=attr-iframe-src><a href=#attr-iframe-src>src</a></code>
    attribute is specified but the <code title=attr-iframe-srcdoc><a href=#attr-iframe-srcdoc>srcdoc</a></code> attribute is not</dt>
@@ -22277,8 +22463,8 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
      first time, <code><a href=#about:blank>about:blank</a></code> is loaded
      normally.)</li>
-     <li><p><a href=#navigate>Navigate</a> the element's <a href=#browsing-context>browsing
-     context</a> to the resulting <a href=#absolute-url>absolute
+     <li><p><a href=#navigate>Navigate</a><!--DONAV iframe--> the element's
+     <a href=#browsing-context>browsing context</a> to the resulting <a href=#absolute-url>absolute
      URL</a>.</li>
     </ol><p><i>Empty</i>: When the steps above require the user agent to
@@ -22378,15 +22564,15 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
  &lt;/footer&gt;
  &lt;article&gt;
   &lt;footer&gt; At &lt;time pubdate&gt;2009-08-21T23:35Z&lt;/time&gt;, &lt;a href="/users/ch"&gt;ch&lt;/a&gt; writes: &lt;/footer&gt;
-  &lt;iframe seamless sandbox="allow-same-origin" srcdoc="&lt;p&gt;did you get a cover picture yet?"&gt;&lt;/iframe&gt;
+  &lt;iframe seamless sandbox srcdoc="&lt;p&gt;did you get a cover picture yet?"&gt;&lt;/iframe&gt;
  &lt;/article&gt;
  &lt;article&gt;
   &lt;footer&gt; At &lt;time pubdate&gt;2009-08-21T23:44Z&lt;/time&gt;, &lt;a href="/users/cap"&gt;cap&lt;/a&gt; writes: &lt;/footer&gt;
-  &lt;iframe seamless sandbox="allow-same-origin" srcdoc="&lt;p&gt;Yeah, you can see it &lt;a href=&amp;quot;/gallery?mode=cover&amp;amp;amp;page=1&amp;quot;&gt;in my gallery&lt;/a&gt;."&gt;&lt;/iframe&gt;
+  &lt;iframe seamless sandbox srcdoc="&lt;p&gt;Yeah, you can see it &lt;a href=&amp;quot;/gallery?mode=cover&amp;amp;amp;page=1&amp;quot;&gt;in my gallery&lt;/a&gt;."&gt;&lt;/iframe&gt;
  &lt;/article&gt;
  &lt;article&gt;
   &lt;footer&gt; At &lt;time pubdate&gt;2009-08-21T23:58Z&lt;/time&gt;, &lt;a href="/users/ch"&gt;ch&lt;/a&gt; writes: &lt;/footer&gt;
-  &lt;iframe seamless sandbox="allow-same-origin" srcdoc="&lt;p&gt;hey that's earl's table.
+  &lt;iframe seamless sandbox srcdoc="&lt;p&gt;hey that's earl's table.
 &lt;p&gt;you should get earl&amp;amp;amp;me on the next cover."&gt;&lt;/iframe&gt;
  &lt;/article&gt;</pre>
@@ -22796,8 +22982,10 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
   document, or the <a href=#browsing-context>browsing context</a>'s <a href=#active-document>active
   document</a>'s <em><a href="#the-document's-address" title="the document's
   address">address</a></em> has the <a href=#same-origin>same origin</a> as the
-  <code><a href=#the-iframe-element>iframe</a></code> element's document, the following requirements
-  apply:</span></p>
+  <code><a href=#the-iframe-element>iframe</a></code> element's document, or the <a href=#browsing-context>browsing
+  context</a>'s <a href=#active-document>active document</a> is <a href=#an-iframe-srcdoc-document>an
+  <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code>
+  document</a>, the following requirements apply:</span></p>
   <div class=impl>
@@ -22863,7 +23051,7 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
     <p>User agents should, in general, act as if the <a href=#active-document>active
     document</a> of the <code><a href=#the-iframe-element>iframe</a></code>'s <a href=#nested-browsing-context>nested browsing
     context</a> was part of the document that the
-    <code><a href=#the-iframe-element>iframe</a></code> is in.</p>
+    <code><a href=#the-iframe-element>iframe</a></code> is in, if any.</p>
     <p class=example>For example if the user agent supports listing
     all the links in a document, links in "seamlessly" nested
@@ -23725,12 +23913,12 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
         <p>If the <a href=#url>URL</a> of the given resource is not
         <code><a href=#about:blank>about:blank</a></code>, the element's <a href=#nested-browsing-context>nested browsing
-        context</a> must then be <a href=#navigate title=navigate>navigated</a> to that resource, with
-        <a href=#replacement-enabled>replacement enabled</a>, and with the
+        context</a> must then be <a href=#navigate title=navigate>navigated</a><!--DONAV object--> to that
+        resource, with <a href=#replacement-enabled>replacement enabled</a>, and with the
         <code><a href=#the-object-element>object</a></code> element's document's <a href=#browsing-context>browsing
-        context</a> as the <a href=#source-browsing-context>source browsing
-        context</a>. (The <code title=attr-object-data><a href=#attr-object-data>data</a></code> attribute of the
-        <code><a href=#the-object-element>object</a></code> element doesn't get updated if the
+        context</a> as the <a href=#source-browsing-context>source browsing context</a>.
+        (The <code title=attr-object-data><a href=#attr-object-data>data</a></code> attribute of
+        the <code><a href=#the-object-element>object</a></code> element doesn't get updated if the
         browsing context gets further navigated to other
         locations.)</p>
@@ -24212,7 +24400,8 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
   <a href=#timed-track-cue title="timed track cue">timed track cues</a> whose
   <a href=#timed-track-cue-active-flag>timed track cue active flag</a> is set and whose
   <a href=#timed-track>timed track</a> is in the <a href=#timed-track-showing title="timed track
-  showing">showing</a> mode.</p>
+  showing">showing</a> or <a href=#timed-track-showing-by-default title="timed 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
@@ -24725,23 +24914,25 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-track-kind><a href=#attr-track-kind>kind</a></code></dd>
    <dd><code title=attr-track-src><a href=#attr-track-src>src</a></code></dd>
-   <dd><code title=attr-track-charset><a href=#attr-track-charset>charset</a></code></dd>
    <dd><code title=attr-track-srclang><a href=#attr-track-srclang>srclang</a></code></dd>
    <dd><code title=attr-track-label><a href=#attr-track-label>label</a></code></dd>
+   <dd><code title=attr-track-default><a href=#attr-track-default>default</a></code></dd>
    <dt>DOM interface:</dt>
    <dd>
 <pre class=idl>interface <dfn id=htmltrackelement>HTMLTrackElement</dfn> : <a href=#htmlelement>HTMLElement</a> {
            attribute DOMString <a href=#dom-track-kind title=dom-track-kind>kind</a>;
            attribute DOMString <a href=#dom-track-src title=dom-track-src>src</a>;
-           attribute DOMString <a href=#dom-track-charset title=dom-track-charset>charset</a>;
            attribute DOMString <a href=#dom-track-srclang title=dom-track-srclang>srclang</a>;
            attribute DOMString <a href=#dom-track-label title=dom-track-label>label</a>;
+           attribute boolean <a href=#dom-track-default title=dom-track-default>default</a>;
   readonly attribute <a href=#timedtrack>TimedTrack</a> <a href=#dom-track-track title=dom-track-track>track</a>;
 };</pre>
    </dd>
   </dl><p>The <code><a href=#the-track-element>track</a></code> element allows authors to specify explicit
-  external <a href=#timed-track title="timed track">timed tracks</a> for <a href=#media-element title="media element">media elements</a>. It does not <a href=#represents title=represents>represent</a> anything on its own.</p>
+  external text-based <a href=#timed-track title="timed track">timed tracks</a>
+  for <a href=#media-element title="media element">media elements</a>. It does not
+  <a href=#represents title=represents>represent</a> anything on its own.</p>
   <p>The <dfn id=attr-track-kind title=attr-track-kind><code>kind</code></dfn>
   attribute is an <a href=#enumerated-attribute>enumerated attribute</a>. The following
@@ -24754,19 +24945,29 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
      <th>Brief description
    <tbody><tr><td><dfn id=attr-track-kind-keyword-subtitles title=attr-track-kind-keyword-subtitles><code>subtitles</code></dfn>
      <td><dfn id=attr-track-kind-subtitles title=attr-track-kind-subtitles>Subtitles</dfn>
-     <td>Transcription or translation of the dialogue, suitable for when the sound is available but not understood (e.g. because the user does not understand the language of the <a href=#media-resource>media resource</a>'s soundtrack).
+     <td>
+      <p>Transcription or translation of the dialogue, suitable for when the sound is available but not understood (e.g. because the user does not understand the language of the <a href=#media-resource>media resource</a>'s soundtrack).
+      <p>Displayed over the video.
     <tr><td><dfn id=attr-track-kind-keyword-captions title=attr-track-kind-keyword-captions><code>captions</code></dfn>
      <td><dfn id=attr-track-kind-captions title=attr-track-kind-captions>Captions</dfn>
-     <td>Transcription or translation of the dialogue, sound effects, relevant musical cues, and other relevant audio information, suitable for when the soundtrack is unavailable (e.g. because it is muted or because the user is deaf).
+     <td>
+      <p>Transcription or translation of the dialogue, sound effects, relevant musical cues, and other relevant audio information, suitable for when the soundtrack is unavailable (e.g. because it is muted or because the user is deaf).
+      <p>Displayed over the video; labeled as appropriate for the hard-of-hearing.
     <tr><td><dfn id=attr-track-kind-keyword-descriptions title=attr-track-kind-keyword-descriptions><code>descriptions</code></dfn>
      <td><dfn id=attr-track-kind-descriptions title=attr-track-kind-descriptions>Descriptions</dfn>
-     <td>Textual descriptions of the video component of the <a href=#media-resource>media resource</a>, intended for audio synthesis when the visual component is unavailable (e.g. because the user is interacting with the application without a screen while driving, or because the user is blind).
+     <td>
+      <p>Textual descriptions of the video component of the <a href=#media-resource>media resource</a>, intended for audio synthesis when the visual component is unavailable (e.g. because the user is interacting with the application without a screen while driving, or because the user is blind).
+      <p>Synthesized as separate audio track.
     <tr><td><dfn id=attr-track-kind-keyword-chapters title=attr-track-kind-keyword-chapters><code>chapters</code></dfn>
      <td><dfn id=attr-track-kind-chapters title=attr-track-kind-chapters>Chapters</dfn>
-     <td>Chapter titles, intended to be used for navigating the <a href=#media-resource>media resource</a>.
+     <td>
+      <p>Chapter titles, intended to be used for navigating the <a href=#media-resource>media resource</a>.
+      <p>Displayed as an interactive list in the user agent's interface.
     <tr><td><dfn id=attr-track-kind-keyword-metadata title=attr-track-kind-keyword-metadata><code>metadata</code></dfn>
      <td><dfn id=attr-track-kind-metadata title=attr-track-kind-metadata>Metadata</dfn>
-     <td>Tracks intended for use from script.
+     <td>
+      <p>Tracks intended for use from script.
+      <p>Not displayed by the user agent.
   </table><p>The attribute may be omitted. The <i>missing value default</i> is
   the <a href=#attr-track-kind-subtitles title=attr-track-kind-subtitles>subtitles</a> state.</p>
@@ -24787,18 +24988,12 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
   </div>
+<!--TTSRT-->
   <p>If the elements's <a href=#track-url>track URL</a> identifies a
   <a href=#websrt>WebSRT</a> resource, and the element's <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code> attribute is not in the <a href=#attr-track-kind-metadata title=attr-track-kind-metadata>metadata</a> state, then the
   <a href=#websrt>WebSRT</a> file must be a <a href=#websrt-file-using-cue-text>WebSRT file using cue
   text</a>.</p>
-  <p>If the elements's <a href=#track-url>track URL</a> identifies a
-  <a href=#websrt>WebSRT</a> resource, then the <dfn id=attr-track-charset title=attr-track-charset><code>charset</code></dfn> attribute may
-  be specified. If the attribute is set, its value must be a valid
-  character encoding name, must be an <a href=#ascii-case-insensitive>ASCII
-  case-insensitive</a> match for the <a href=#preferred-mime-name>preferred MIME
-  name</a> for that encoding, and must match the character encoding
-  of the <a href=#websrt>WebSRT</a> file. <a href=#refsIANACHARSET>[IANACHARSET]</a></p>
+<!--TTSRT-->
   <p>The <dfn id=attr-track-srclang title=attr-track-srclang><code>srclang</code></dfn>
   attribute gives the language of the timed track data. The value must
@@ -24841,6 +25036,12 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
   </div>
+  <p>The <dfn id=attr-track-default title=attr-track-default><code>default</code></dfn>
+  attribute, if specified, indicates that the track is to be enabled
+  if the user's preferences do not indicate that another track would
+  be more appropriate. There must not be more than one
+  <code><a href=#the-track-element>track</a></code> element with the same parent node with the <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute specified.</p>
   <dl class=domintro><dt><var title="">track</var> . <code title=dom-track-track><a href=#dom-track-track>track</a></code></dt>
    <dd>
@@ -24856,11 +25057,11 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
   <a href=#timed-track>timed track</a>'s corresponding <code><a href=#timedtrack>TimedTrack</a></code>
   object.</p>
-  <p>The <dfn id=dom-track-src title=dom-track-src><code>src</code></dfn>, <dfn id=dom-track-charset title=dom-track-charset><code>charset</code></dfn>, <dfn id=dom-track-srclang title=dom-track-srclang><code>srclang</code></dfn>, and <dfn id=dom-track-label title=dom-track-label><code>label</code></dfn> IDL attributes must
-  <a href=#reflect>reflect</a> the respective content attributes of the same
-  name. The <dfn id=dom-track-kind title=dom-track-kind><code>kind</code></dfn> IDL
-  attributemust <a href=#reflect>reflect</a> the content attribute of the same
-  name, <a href=#limited-to-only-known-values>limited to only known values</a>.</p>
+  <p>The <dfn id=dom-track-src title=dom-track-src><code>src</code></dfn>, <dfn id=dom-track-srclang title=dom-track-srclang><code>srclang</code></dfn>, <dfn id=dom-track-label title=dom-track-label><code>label</code></dfn>, and <dfn id=dom-track-default title=dom-track-default><code>default</code></dfn> IDL attributes
+  must <a href=#reflect>reflect</a> the respective content attributes of the
+  same name. The <dfn id=dom-track-kind title=dom-track-kind><code>kind</code></dfn>
+  IDL attribute must <a href=#reflect>reflect</a> the content attribute of the
+  same name, <a href=#limited-to-only-known-values>limited to only known values</a>.</p>
   </div>
@@ -26557,14 +26758,15 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     <p>If the <a href=#autoplaying-flag>autoplaying flag</a> is true, and the <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> attribute is true, and the
     <a href=#media-element>media element</a> has an <code title=attr-media-autoplay><a href=#attr-media-autoplay>autoplay</a></code> attribute specified,
-    and the <a href=#media-element>media element</a> is in a <code><a href=#document>Document</a></code>
-    whose <a href=#browsing-context>browsing context</a> did not have the
-    <a href=#sandboxed-automatic-features-browsing-context-flag>sandboxed automatic features browsing context flag</a>
-    set when the <code><a href=#document>Document</a></code> was created, then the user
-    agent may also set the <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> attribute to false,
+    and the <a href=#media-element>media element</a>'s <code><a href=#document>Document</a></code>'s
+    <a href=#browsing-context>browsing context</a> did not have the <a href=#sandboxed-automatic-features-browsing-context-flag>sandboxed
+    automatic features browsing context flag</a> set when the
+    <code><a href=#document>Document</a></code> was created, then the user agent may also
+    set the <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> attribute to
+    false, <a href=#queue-a-task>queue a task</a> to <a href=#fire-a-simple-event>fire a simple
+    event</a> named <code title=event-media-play><a href=#event-media-play>play</a></code>, and
     <a href=#queue-a-task>queue a task</a> to <a href=#fire-a-simple-event>fire a simple event</a>
-    named <code title=event-media-play><a href=#event-media-play>play</a></code>, and <a href=#queue-a-task>queue
-    a task</a> to <a href=#fire-a-simple-event>fire a simple event</a> named <code title=event-media-playing><a href=#event-media-playing>playing</a></code>.</p>
+    named <code title=event-media-playing><a href=#event-media-playing>playing</a></code>.</p>
     <p class=note>User agents are not required to autoplay, and it
     is suggested that user agents honor user preferences on the
@@ -26976,8 +27178,9 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
   <ol><!--KEEP-END w3c-html--><!--TT--><li><p>Let <var title="">current cues</var> be an ordered list of
    <a href=#timed-track-cue title="timed track cue">cues</a>, initialized to contain
-   all the <a href=#timed-track-cue title="timed track cue">cues</a> of all the <a href=#timed-track-hidden title="timed track hidden">hidden</a> or <a href=#timed-track-showing title="timed
-   track showing">showing</a> <a href=#timed-track title="timed track">timed
+   all the <a href=#timed-track-cue title="timed track cue">cues</a> of all the <a href=#timed-track-hidden title="timed track hidden">hidden</a>, <a href=#timed-track-showing title="timed track
+   showing">showing</a>, or <a href=#timed-track-showing-by-default title="timed track showing by
+   default">showing by default</a> <a href=#timed-track title="timed track">timed
    tracks</a> of the <a href=#media-element>media element</a> (not the <a href=#timed-track-disabled title="timed track disabled">disabled</a> ones) whose <a href=#timed-track-cue-start-time title="timed track cue start time">start times</a> are less than
    or equal to the <a href=#current-playback-position>current playback position</a> and whose
    <a href=#timed-track-cue-end-time title="timed track cue end time">end times</a> are greater
@@ -26986,8 +27189,9 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
    <li><p>Let <var title="">other cues</var> be an ordered list of
    <a href=#timed-track-cue title="timed track cue">cues</a>, initialized to contain
-   all the <a href=#timed-track-cue title="timed track cue">cues</a> of <a href=#timed-track-hidden title="timed track hidden">hidden</a> and <a href=#timed-track-showing title="timed
-   track showing">showing</a> <a href=#timed-track title="timed track">timed
+   all the <a href=#timed-track-cue title="timed track cue">cues</a> of <a href=#timed-track-hidden title="timed track hidden">hidden</a>, <a href=#timed-track-showing title="timed track
+   showing">showing</a>, and <a href=#timed-track-showing-by-default title="timed track showing by
+   default">showing by default</a> <a href=#timed-track title="timed track">timed
    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=#timed-track-cue-order>timed
    track cue order</a>.</li>
@@ -27071,9 +27275,14 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
    <li><p>Run the <a href=#rules-for-updating-the-timed-track-rendering>rules for updating the timed track
    rendering</a> of each of the <a href=#timed-track title="timed track">timed
-   tracks</a> in <var title="">affected tracks</var> that are <a href=#timed-track-showing title="timed track showing">showing</a> (e.g., for <a href=#timed-track title="timed track">timed tracks</a> based on
-   <a href=#websrt>WebSRT</a>, the <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules for updating the display of
-   WebSRT timed tracks</a>).</li>
+   tracks</a> in <var title="">affected tracks</var> that are <a href=#timed-track-showing title="timed track showing">showing</a> or <a href=#timed-track-showing-by-default title="timed
+   track showing by default">showing by default</a>.
+<!--TTSRT-->
+   For example, for <a href=#timed-track title="timed track">timed tracks</a>
+   based on <a href=#websrt>WebSRT</a>, the <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules for updating the
+   display of WebSRT timed tracks</a>.
+<!--TTSRT-->
+   </li>
 <!--KEEP-START w3c-html--><!--TT-->
   </ol><!--KEEP-END w3c-html--><!--TT--><p>For the purposes of the algorithm above, a <a href=#timed-track-cue>timed track
@@ -27241,7 +27450,7 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
 <!--KEEP-END w3c-html--><!--TT-->
 <!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
-  <h5 id=timed-tracks><span class=secno>4.8.10.10 </span>Timed tracks</h5>
+  <h5 id=text-timed-tracks><span class=secno>4.8.10.10 </span>Text timed tracks</h5>
   <h6 id=timed-track-model><span class=secno>4.8.10.10.1 </span>Timed track model</h6>
@@ -27398,8 +27607,9 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
      </dd>
      <dt><dfn id=timed-track-showing title="timed track showing">Showing</dfn>
+     <dt><dfn id=timed-track-showing-by-default title="timed track showing by default">Showing by default</dfn>
-     <dd>
+     </dt><dd>
       <p>Indicates that the timed track is active. If no attempt has
       yet been made to obtain the track's cues, the user agent will
@@ -27415,6 +27625,13 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
       user can navigate to any point in the <a href=#media-resource>media
       resource</a> by selecting a cue.</p>
+      <p>The <a href=#timed-track-showing-by-default title="timed track showing by default">showing by
+      default</a> state is used in conjunction with the <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute on
+      <code><a href=#the-track-element>track</a></code> elements to indicate that the timed track was
+      enabled due to that attribute. This allows the user agent to
+      override the state if a later track is discovered that is more
+      appropriate per the user's preferences.</p>
      </dd>
     </dl></dd>
@@ -27425,14 +27642,18 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     <p>A list of <a href=#timed-track-cue title="timed track cue">timed track
     cues</a>, along with <dfn id=rules-for-updating-the-timed-track-rendering>rules for updating the timed track
-    rendering</dfn> (e.g., for <a href=#websrt>WebSRT</a>, the <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules
-    for updating the display of WebSRT timed tracks</a>).</p>
+    rendering</dfn>.
+<!--TTSRT-->
+    For example, for <a href=#websrt>WebSRT</a>, the <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules for updating
+    the display of WebSRT timed tracks</a>.
+<!--TTSRT-->
+    </p>
     <p>The <a href=#timed-track-list-of-cues title="timed track list of cues">list of cues of a
     timed track</a> can change dynamically, either because the
     <a href=#timed-track>timed track</a> has <a href=#timed-track-not-loaded title="timed track not
     loaded">not yet been loaded</a> or is still <a href=#timed-track-loading title="timed
-    track loading">loading</a>, or because the the <a href=#timed-track>timed
+    track loading">loading</a>, or because the <a href=#timed-track>timed
     track</a> corresponds to a <code><a href=#mutabletimedtrack>MutableTimedTrack</a></code>
     object, whose API allows individual cues can be added or removed
     dynamically.</p>
@@ -27497,6 +27718,7 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     consecutive lines displayed to the right of each other<!-- used for
     mongolian -->).</p>
+<!--TTSRT-->
     <p>If the <a href=#timed-track-cue-writing-direction title="timed track cue writing direction">writing
     direction</a> is <a href=#timed-track-cue-horizontal-writing-direction title="timed track cue horizontal
     writing direction">horizontal</a>, then <a href=#timed-track-cue-line-position title="timed
@@ -27511,9 +27733,11 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     video, and <a href=#timed-track-cue-text-position title="timed track cue text position">text
     position</a> and <a href=#timed-track-cue-size title="timed track cue size">size</a>
     percentages are relative to the height of the video.</p>
+<!--TTSRT-->
    </dd>
+<!--TTSRT-->
    <dt><dfn id=timed-track-cue-snap-to-lines-flag title="timed track cue snap-to-lines flag">A snap-to-lines flag</dfn>
    <dd>
     <p>A boolean indicating whether the <a href=#timed-track-cue-line-position title="timed track cue
@@ -27541,6 +27765,7 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     by the <a href=#timed-track-cue-writing-direction title="timed track cue writing direction">writing
     direction</a>.</p>
    </dd>
+<!--TTSRT-->
    <dt><dfn id=timed-track-cue-size title="timed track cue size">A size</dfn>
    <dd>
@@ -27550,6 +27775,7 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     track cue writing direction">writing direction</a>.</p>
    </dd>
+<!--TTSRT-->
    <dt><dfn id=timed-track-cue-alignment title="timed track cue alignment">An alignment</dfn>
    <dd>
     <p>An alignment for the text of each line of the cue, either <dfn id=timed-track-cue-start-alignment title="timed track cue start alignment">start alignment</dfn> (the
@@ -27561,11 +27787,7 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     depends on the Unicode bidirectional algorithm and the <a href=#timed-track-cue-writing-direction title="timed track cue writing direction">writing
     direction</a>. <a href=#refsBIDI>[BIDI]</a></p>
    </dd>
-   <dt><dfn id=timed-track-cue-voice-identifier title="timed track cue voice identifier">A voice identifier</dfn>
-   <dd>
-    <p>A string identifying the voice with which the cue is associated.</p>
-   </dd>
+<!--TTSRT-->
    <dt><dfn id=timed-track-cue-text title="timed track cue text">The text of the cue</dfn>
    <dd>
@@ -27600,14 +27822,17 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     disabled">disabled</a>; and whenever the <a href=#media-element>media
     element</a>'s <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is changed back to
     <code title=dom-media-HAVE_NOTHING><a href=#dom-media-have_nothing>HAVE_NOTHING</a></code>. When the
-    flag is unset in this way for one or more cues in <a href=#timed-track title="timed track">timed tracks</a> that were <a href=#timed-track-showing title="timed track showing">showing</a> prior to the relevant
-    incident, the user agent must, after having unset the flag for all
-    the affected cues, apply the <a href=#rules-for-updating-the-timed-track-rendering>rules for updating the timed
-    track rendering</a> of those <a href=#timed-track title="timed track">timed
-    tracks</a> (e.g., for <a href=#timed-track title="timed track">timed
-    tracks</a> based on <a href=#websrt>WebSRT</a>, the <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules for
-    updating the display of WebSRT timed tracks</a>).</p>
+    flag is unset in this way for one or more cues in <a href=#timed-track title="timed track">timed tracks</a> that were <a href=#timed-track-showing title="timed track showing">showing</a> or <a href=#timed-track-showing-by-default title="timed
+    track showing by default">showing by default</a> prior to the
+    relevant incident, the user agent must, after having unset the
+    flag for all the affected cues, apply the <a href=#rules-for-updating-the-timed-track-rendering>rules for updating
+    the timed track rendering</a> of those <a href=#timed-track title="timed
+    track">timed tracks</a>.
+<!--TTSRT-->
+    For example, for <a href=#timed-track title="timed track">timed tracks</a>
+    based on <a href=#websrt>WebSRT</a>, the <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules for updating the
+    display of WebSRT timed tracks</a>.</p>
+<!--TTSRT-->
    </dd>
    <dt>The <dfn id=timed-track-cue-display-state title="timed track cue display state">display state</dfn>
@@ -27812,6 +28037,30 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
    <dd>
     <p>Let the <a href=#timed-track-mode>timed track mode</a> be <a href=#timed-track-showing title="timed
     track showing">showing</a>.</p>
+    <p>If there is a <a href=#timed-track>timed track</a> in the <a href=#media-element>media
+    element</a>'s <a href=#list-of-timed-tracks>list of timed tracks</a> whose
+    <a href=#timed-track-mode>timed track mode</a> is <a href=#timed-track-showing-by-default title="timed track showing
+    by default">showing by default</a>, the user agent must
+    furthermore change <em>that</em> <a href=#timed-track>timed track</a>'s
+    <a href=#timed-track-mode>timed track mode</a> to <a href=#timed-track-hidden title="timed track
+    hidden">hidden</a>.</p> <!-- so that we still get events and
+    stuff: we can expect authors to forget that default doesn't mean
+    that it'll always be turned on, and that they'll still rely on
+    events firing even if it doesn't show -->
+   </dd>
+   <dt>If the <code><a href=#the-track-element>track</a></code> element has a <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute specified, and
+   there is no other <a href=#timed-track>timed track</a> in the <a href=#media-element>media
+   element</a>'s <a href=#list-of-timed-tracks>list of timed tracks</a> whose
+   <a href=#timed-track-mode>timed track mode</a> is <a href=#timed-track-showing title="timed track
+   showing">showing</a> or <a href=#timed-track-showing-by-default title="timed track
+   showing by default">showing by default</a></dt>
+   <dd>
+    <p>Let the <a href=#timed-track-mode>timed track mode</a> be <a href=#timed-track-showing-by-default title="timed
+    track showing by default">showing by default</a>.</p>
    </dd>
    <dt>Otherwise</dt>
@@ -27823,18 +28072,20 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
   </dl><p>When a <a href=#timed-track>timed track</a> corresponding to a
   <code><a href=#the-track-element>track</a></code> element is created with <a href=#timed-track-mode>timed track
-  mode</a> set to <a href=#timed-track-hidden title="timed track hidden">hidden</a> or
-  <a href=#timed-track-showing title="timed track showing">showing</a>, and when a
-  <a href=#timed-track>timed track</a> corresponding to a <code><a href=#the-track-element>track</a></code>
-  element is created with <a href=#timed-track-mode>timed track mode</a> set to <a href=#timed-track-disabled title="timed track disabled">disabled</a> and subsequently
-  changes its <a href=#timed-track-mode>timed track mode</a> to <a href=#timed-track-hidden title="timed
-  track hidden">hidden</a> or <a href=#timed-track-showing title="timed track
-  showing">showing</a> for the first time, the user agent must
-  immediately and synchronously run the following algorithm. This
-  algorithm interacts closely with the <a href=#event-loop>event loop</a>
-  mechanism; in particular, it has a <a href=#synchronous-section>synchronous section</a>
-  (which is triggered as part of the <a href=#event-loop>event loop</a>
-  algorithm). The step in that section is marked with &#8987;.</p>
+  mode</a> set to <a href=#timed-track-hidden title="timed track hidden">hidden</a>,
+  <a href=#timed-track-showing title="timed track showing">showing</a>, or <a href=#timed-track-showing-by-default title="timed track showing by default">showing by default</a>,
+  and when a <a href=#timed-track>timed track</a> corresponding to a
+  <code><a href=#the-track-element>track</a></code> element is created with <a href=#timed-track-mode>timed track
+  mode</a> set to <a href=#timed-track-disabled title="timed track
+  disabled">disabled</a> and subsequently changes its <a href=#timed-track-mode>timed
+  track mode</a> to <a href=#timed-track-hidden title="timed track hidden">hidden</a>,
+  <a href=#timed-track-showing title="timed track showing">showing</a>, or <a href=#timed-track-showing-by-default title="timed track showing by default">showing by default</a> for
+  the first time, the user agent must immediately and synchronously
+  run the following algorithm. This algorithm interacts closely with
+  the <a href=#event-loop>event loop</a> mechanism; in particular, it has a
+  <a href=#synchronous-section>synchronous section</a> (which is triggered as part of the
+  <a href=#event-loop>event loop</a> algorithm). The step in that section is
+  marked with &#8987;.</p>
   <ol><li><p>Set the <a href=#timed-track-readiness-state>timed track readiness state</a> to <a href=#timed-track-loading title="timed track loading">loading</a>.</li>
@@ -27867,13 +28118,12 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     unsupported (this causes the load to fail, as described below). If
     a type is obtained, and represents a supported timed track format,
     then the resource's data must be passed to the appropriate parser
-    (e.g. the <a href=#websrt-parser>WebSRT parser</a> if the <a href=#content-type title=Content-Type>Content Type metadata</a> is
-    <code><a href=#text/srt>text/srt</a></code>) as it is received, with the <a href=#timed-track-list-of-cues>timed
-    track list of cues</a> being used for that parser's output. If
-    the <code><a href=#the-track-element>track</a></code> element has a <code title=attr-track-charset><a href=#attr-track-charset>charset</a></code> attribute that specifies
-    a supported character encoding, then that encoding must be given
-    to the parser as a character encoding override. Otherwise the
-    parser must use its default character encoding behavior.</p>
+<!--TTSRT-->
+    (e.g. the <a href=#websrt-parser>WebSRT parser</a> if the <a href=#content-type title=Content-Type>Content Type metadata</a> is
+    <code><a href=#text/srt>text/srt</a></code>)
+<!--TTSRT-->
+    as it is received, with the <a href=#timed-track-list-of-cues>timed
+    track list of cues</a> being used for that parser's output.</p>
     <p>If the <a href=#fetch title=fetch>fetching algorithm</a> fails for
     any reason (network error, the server returns an error code, a
@@ -27902,12 +28152,14 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     <ul><li>the <a href=#track-url>track URL</a> changes so that it is no longer
      equal to <var title="">URL</var>, while the <a href=#timed-track-mode>timed track
      mode</a> is set to <a href=#timed-track-hidden title="timed track
-     hidden">hidden</a> or <a href=#timed-track-showing title="timed track
-     showing">showing</a>; or</li>
+     hidden">hidden</a>, <a href=#timed-track-showing title="timed track
+     showing">showing</a>, or <a href=#timed-track-showing-by-default title="timed track showing by
+     default">showing by default</a>; or</li>
-     <li>the <a href=#timed-track-mode>timed track mode</a> changes to <a href=#timed-track-hidden title="timed track hidden">hidden</a> or <a href=#timed-track-showing title="timed
-     track showing">showing</a>, while the <a href=#track-url>track URL</a> is
-     not equal to <var title="">URL</var></li>
+     <li>the <a href=#timed-track-mode>timed track mode</a> changes to <a href=#timed-track-hidden title="timed track hidden">hidden</a>, <a href=#timed-track-showing title="timed
+     track showing">showing</a>, or <a href=#timed-track-showing-by-default title="timed track
+     showing by default">showing by default</a>, while the
+     <a href=#track-url>track URL</a> is not equal to <var title="">URL</var></li>
     </ul><p>...then the user agent must run the following steps:</p>
@@ -27932,8 +28184,9 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
    <li><p><i>Monitoring</i>: Wait until the <a href=#track-url>track URL</a> is
    no longer equal to <var title="">URL</var>, at the same time as the
    <a href=#timed-track-mode>timed track mode</a> is set to <a href=#timed-track-hidden title="timed track
-   hidden">hidden</a> or <a href=#timed-track-showing title="timed track
-   showing">showing</a>.</li>
+   hidden">hidden</a>, <a href=#timed-track-showing title="timed track
+   showing">showing</a>, or <a href=#timed-track-showing-by-default title="timed track showing by
+   default">showing by default</a>.</li>
    <li><p>Wait until the <a href=#timed-track-readiness-state>timed track readiness state</a> is
    no longer set to <a href=#timed-track-loading title="timed track
@@ -27958,6 +28211,7 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
   </ol></div>
+<!--TTSRT-->
   <div class=impl>
   <h6 id=guidelines-for-exposing-cues-in-various-formats-as-timed-track-cues><span class=secno>4.8.10.10.4 </span><dfn>Guidelines for exposing cues</dfn> in various formats as
@@ -28008,23 +28262,15 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
    <dt>The <a href=#timed-track-cue-size>timed track cue size</a>
    <dt>The <a href=#timed-track-cue-alignment>timed track cue alignment</a>
    </dt></dt></dt><dd>
-    <p>If the the format uses a rendering and positioning model for
+    <p>If the format uses a rendering and positioning model for
     cues that can be largely simulated using the <a href=#websrt-cue-text-rendering-rules>WebSRT cue text
     rendering rules</a>, then these should be set to the values
     that would give the same effect for <a href=#websrt>WebSRT</a>
     cues. Otherwise, they should be set to zero.</p>
    </dd>
-   <dt>The <a href=#timed-track-cue-voice-identifier>timed track cue voice identifier</a>
-   <dd>
-    <p>Should be set to the empty string if the format has no
-    obvious analogue to cue voices. The <a href=#timed-track-cue-voice-identifier>timed track cue voice
-    identifier</a> may be set to strings that cannot be expressed
-    using <a href=#websrt>WebSRT</a>, if the format supports voices that do
-    not correspond to the voices used by WebSRT.</p>
-   </dd>
   </dl></div>
+<!--TTSRT-->
   <h6 id=timed-track-api><span class=secno>4.8.10.10.5 </span>Timed track API</h6>
@@ -28129,13 +28375,13 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
      <dd>
       <p>The <a href=#timed-track-disabled>timed track disabled</a> mode.</p>
      </dd>
-     <dt><code><a href=#timedtrack>TimedTrack</a></code> . <code title=dom-TimedTrack-HIDDEN><a href=#dom-timedtrack-hidden>HIDDEN</a></code> (0)</dt>
+     <dt><code><a href=#timedtrack>TimedTrack</a></code> . <code title=dom-TimedTrack-HIDDEN><a href=#dom-timedtrack-hidden>HIDDEN</a></code> (1)</dt>
      <dd>
       <p>The <a href=#timed-track-hidden>timed track hidden</a> mode.</p>
      </dd>
-     <dt><code><a href=#timedtrack>TimedTrack</a></code> . <code title=dom-TimedTrack-SHOWING><a href=#dom-timedtrack-showing>SHOWING</a></code> (0)</dt>
+     <dt><code><a href=#timedtrack>TimedTrack</a></code> . <code title=dom-TimedTrack-SHOWING><a href=#dom-timedtrack-showing>SHOWING</a></code> (2)</dt>
      <dd>
-      <p>The <a href=#timed-track-showing>timed track showing</a> mode.</p>
+      <p>The <a href=#timed-track-showing>timed track showing</a> and <a href=#timed-track-showing-by-default title="timed track showing by default">showing by default</a> modes.</p>
      </dd>
     </dl><p>Can be set, to change the mode.</p>
    </dd>
@@ -28192,7 +28438,7 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
    <dt><dfn id=dom-timedtrack-hidden title=dom-TimedTrack-HIDDEN><code>HIDDEN</code></dfn> (numeric value 1)</dt>
    <dd>The <a href=#timed-track-hidden>timed track hidden</a> mode.</dd>
    <dt><dfn id=dom-timedtrack-showing title=dom-TimedTrack-SHOWING><code>SHOWING</code></dfn> (numeric value 2)</dt>
-   <dd>The <a href=#timed-track-showing>timed track showing</a> mode.</dd>
+   <dd>The <a href=#timed-track-showing>timed track showing</a> and <a href=#timed-track-showing-by-default title="timed track showing by default">showing by default</a> modes.</dd>
   </dl><p>On setting, if the new value is not either 0, 1, or 2, the user
   agent must throw an <code><a href=#invalid_access_err>INVALID_ACCESS_ERR</a></code>
   exception. Otherwise, if the new value isn't equal to what the
@@ -28227,6 +28473,12 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     track</a> that the <code><a href=#timedtrack>TimedTrack</a></code> object represents to
     the <a href=#timed-track-showing>timed track showing</a> mode.</p>
+    <p class=note>If the mode had been <a href=#timed-track-showing-by-default title="timed track
+    showing by default">showing by default</a>, this will change it
+    to <a href=#timed-track-showing title="timed track showing">showing</a>, even though
+    the value of <code title=dom-TimedTrack-mode><a href=#dom-timedtrack-mode>mode</a></code> would
+    appear not to change.</p>
    </dd>
   </dl><p>If the <a href=#timed-track-mode>timed track mode</a> of the <a href=#timed-track>timed
@@ -28328,10 +28580,13 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
     <a href=#timed-track-readiness-state>timed track readiness state</a> to the <a href=#timed-track-loaded>timed track
     loaded</a> state, its <a href=#timed-track-mode>timed track mode</a> to the
     <a href=#timed-track-hidden>timed track hidden</a> mode, and its <a href=#timed-track-list-of-cues>timed track
-    list of cues</a> to an empty list, associated with the
+    list of cues</a> to an empty list.
+<!--TTSRT-->
+    Associate the <a href=#timed-track-list-of-cues>timed track list of cues</a> with the
     <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules for updating the display of WebSRT timed tracks</a>
-    as its <a href=#rules-for-updating-the-timed-track-rendering>rules for updating the timed track
-    rendering</a>.</p>
+    as its <a href=#rules-for-updating-the-timed-track-rendering>rules for updating the timed track rendering</a>.
+<!--TTSRT-->
+    </p>
    </li>
@@ -28479,7 +28734,10 @@ window.onbeforeunload = function () {
   </div>
-  <hr><pre class=idl>[<a href=#dom-timedtrackcue title=dom-TimedTrackCue>Constructor</a>(in DOMString id, in double startTime, in double endTime, in DOMString text, in optional DOMString settings, in optional DOMString voice, in optional boolean pauseOnExit)]
+  <hr><pre class=idl>
+<!--TTSRT-->
+[<a href=#dom-timedtrackcue title=dom-TimedTrackCue>Constructor</a>(in DOMString id, in double startTime, in double endTime, in DOMString text, in optional DOMString settings, in optional boolean pauseOnExit)]
+<!--TTSRT-->
 interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   readonly attribute <a href=#timedtrack>TimedTrack</a> <a href=#dom-timedtrackcue-track title=dom-TimedTrackCue-track>track</a>;
   readonly attribute DOMString <a href=#dom-timedtrackcue-id title=dom-TimedTrackCue-id>id</a>;
@@ -28488,14 +28746,15 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   readonly attribute double <a href=#dom-timedtrackcue-endtime title=dom-TimedTrackCue-endTime>endTime</a>;
   readonly attribute boolean <a href=#dom-timedtrackcue-pauseonexit title=dom-TimedTrackCue-pauseOnExit>pauseOnExit</a>;
+<!--TTSRT-->
   readonly attribute DOMString <a href=#dom-timedtrackcue-direction title=dom-TimedTrackCue-direction>direction</a>;
   readonly attribute boolean <a href=#dom-timedtrackcue-snaptolines title=dom-TimedTrackCue-snapToLines>snapToLines</a>;
   readonly attribute long <a href=#dom-timedtrackcue-lineposition title=dom-TimedTrackCue-linePosition>linePosition</a>;
   readonly attribute long <a href=#dom-timedtrackcue-textposition title=dom-TimedTrackCue-textPosition>textPosition</a>;
   readonly attribute long <a href=#dom-timedtrackcue-size title=dom-TimedTrackCue-size>size</a>;
   readonly attribute DOMString <a href=#dom-timedtrackcue-alignment title=dom-TimedTrackCue-alignment>alignment</a>;
+<!--TTSRT-->
-  readonly attribute DOMString <a href=#dom-timedtrackcue-voice title=dom-TimedTrackCue-voice>voice</a>;
   DOMString <a href=#dom-timedtrackcue-getcueassource() title=dom-TimedTrackCue-getCueAsSource()>getCueAsSource</a>();
   <a href=#documentfragment>DocumentFragment</a> <a href=#dom-timedtrackcue-getcueashtml() title=dom-TimedTrackCue-getCueAsHTML()>getCueAsHTML</a>();
@@ -28503,7 +28762,7 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   readonly attribute <a href=#function>Function</a> <a href=#handler-timedtrackcue-onexit title=handler-TimedTrackCue-onexit>onexit</a>;
 };</pre>
-  <dl class=domintro><dt><var title="">cue</var> = new <code title=dom-TimedTrackCue><a href=#dom-timedtrackcue>TimedTrackCue</a></code>( <var title="">id</var>, <var title="">startTime</var>, <var title="">endTime</var>, <var title="">text</var> [, <var title="">settings</var> [, <var title="">voice</var> [, <var title="">pauseOnExit</var> ] ] ] )</dt>
+  <dl class=domintro><!--TTSRT--><dt><var title="">cue</var> = new <code title=dom-TimedTrackCue><a href=#dom-timedtrackcue>TimedTrackCue</a></code>( <var title="">id</var>, <var title="">startTime</var>, <var title="">endTime</var>, <var title="">text</var> [, <var title="">settings</var> [, <var title="">pauseOnExit</var> ] ] )</dt>
    <dd>
     <p>Returns a new <code><a href=#timedtrackcue>TimedTrackCue</a></code> object, for use with the <code title=dom-MutableTimedTrack-addCue><a href=#dom-mutabletimedtrack-addcue>addCue()</a></code> method.</p>
     <p>The <var title="">id</var> argument sets the <a href=#timed-track-cue-identifier>timed track cue identifier</a>.</p>
@@ -28511,9 +28770,9 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
     <p>The <var title="">endTime</var> argument sets the <a href=#timed-track-cue-end-time>timed track cue end time</a>.</p>
     <p>The <var title="">text</var> argument sets the <a href=#timed-track-cue-text>timed track cue text</a>.</p>
     <p>The <var title="">settings</var> argument is a string in the format of <a href=#websrt-cue-settings>WebSRT cue settings</a>. If omitted, the empty string is assumed.</p>
-    <p>The <var title="">voice</var> argument sets the <a href=#timed-track-cue-voice-identifier>timed track cue voice identifier</a>. If omitted, the empty string is assumed.</p>
     <p>The <var title="">pauseOnExit</var> argument sets the <a href=#timed-track-cue-pause-on-exit-flag>timed track cue pause-on-exit flag</a>. If omitted, false is assumed.</p>
    </dd>
+<!--TTSRT-->
    <dt><var title="">cue</var> . <a href=#dom-timedtrackcue-track title=dom-TimedTrackCue-track>track</a></dt>
    <dd>
@@ -28542,6 +28801,7 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
     <p>Returns true if the <a href=#timed-track-cue-pause-on-exit-flag>timed track cue pause-on-exit flag</a> is set, false otherwise.</p>
    </dd>
+<!--TTSRT-->
    <dt><var title="">cue</var> . <a href=#dom-timedtrackcue-direction title=dom-TimedTrackCue-direction>direction</a></dt>
    <dd>
     <p>Returns a string representing the <a href=#timed-track-cue-writing-direction>timed track cue writing direction</a>, as follows:</p>
@@ -28585,11 +28845,7 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
      <dt>If it is <a href=#timed-track-cue-end-alignment title="timed track cue end alignment">end alignment</a></dt>
      <dd><p>The string "<code title="">end</code>".</dd>
     </dl></dd>
-   <dt><var title="">cue</var> . <a href=#dom-timedtrackcue-voice title=dom-TimedTrackCue-voice>voice</a></dt>
-   <dd>
-    <p>Returns the <a href=#timed-track-cue-voice-identifier>timed track cue voice identifier</a>.</p>
-   </dd>
+<!--TTSRT-->
    <dt><var title="">source</var> = <var title="">cue</var> . <span title=dom-TimedTrackCue-getCueAsSource>getCueAsSource</span>()</dt>
    <dd>
@@ -28603,7 +28859,8 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   </dl><div class=impl>
-  <p>The <dfn id=dom-timedtrackcue title=dom-TimedTrackCue><code>TimedTrackCue(<var title="">id</var>, <var title="">startTime</var>, <var title="">endTime</var>, <var title="">text</var>, <var title="">settings</var>, <var title="">voice</var>, <var title="">pauseOnExit</var>)</code></dfn> constructor, when invoked,
+<!--TTSRT-->
+  <p>The <dfn id=dom-timedtrackcue title=dom-TimedTrackCue><code>TimedTrackCue(<var title="">id</var>, <var title="">startTime</var>, <var title="">endTime</var>, <var title="">text</var>, <var title="">settings</var>, <var title="">pauseOnExit</var>)</code></dfn> constructor, when invoked,
   must run the following steps:</p>
   <ol><li><p>Create a new <a href=#timed-track-cue>timed track cue</a> that is not
@@ -28625,10 +28882,6 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    pause-on-exit flag</a> be true if the <var title="">pauseOnExit</var> is present and true. Otherwise, let it
    be false.</li>
-   <li><p>Let <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue voice
-   identifier</a> be the value of the <var title="">voice</var>
-   argument, if it is present, or the empty string otherwise.</li>
    <li><p>Let <var title="">cue</var>'s <a href=#timed-track-cue-text>timed track cue
    text</a> be the value of the <var title="">text</var> argument,
    and let the rules for its interpretation be the <a href=#websrt-cue-text-parsing-rules>WebSRT cue
@@ -28670,7 +28923,7 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    <li><p>Return the <code><a href=#timedtrackcue>TimedTrackCue</a></code> object representing
    <var title="">cue</var>.</li>
-  </ol><p>The <dfn id=dom-timedtrackcue-track title=dom-TimedTrackCue-track><code>track</code></dfn>
+  </ol><!--TTSRT--><p>The <dfn id=dom-timedtrackcue-track title=dom-TimedTrackCue-track><code>track</code></dfn>
   attribute must return the <code><a href=#timedtrack>TimedTrack</a></code> object of the
   <a href=#timed-track>timed track</a> with which the <a href=#timed-track-cue>timed track cue</a>
   that the <code><a href=#timedtrackcue>TimedTrackCue</a></code> object represents is associated,
@@ -28702,6 +28955,7 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   direction</a> of the <a href=#timed-track-cue>timed track cue</a> that the
   <code><a href=#timedtrackcue>TimedTrackCue</a></code> object represents.</p>
+<!--TTSRT-->
   <p>The <dfn id=dom-timedtrackcue-snaptolines title=dom-TimedTrackCue-snapToLines><code>snapToLines</code></dfn>
   attribute must return true if the <a href=#timed-track-cue-snap-to-lines-flag>timed track cue
   snap-to-lines flag</a> of the <a href=#timed-track-cue>timed track cue</a> that
@@ -28732,9 +28986,10 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    with.</li>
    <li><p>Let <var title="">n</var> be the number of <a href=#timed-track title="timed track">timed tracks</a> whose <a href=#timed-track-mode>timed track
-   mode</a> is <a href=#timed-track-showing title="timed track showing">showing</a> and
-   that are in the <a href=#media-element>media element</a>'s <a href=#list-of-timed-tracks>list of timed
-   tracks</a> before <var title="">track</var>.</li>
+   mode</a> is <a href=#timed-track-showing title="timed track showing">showing</a> or
+   <a href=#timed-track-showing-by-default title="timed track showing by default">showing by
+   default</a> and that are in the <a href=#media-element>media element</a>'s
+   <a href=#list-of-timed-tracks>list of timed tracks</a> before <var title="">track</var>.</li>
    <li><p>Return <var title="">n</var>.</li>
@@ -28752,11 +29007,7 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   attribute must return the <a href=#timed-track-cue-alignment>timed track cue alignment</a> of
   the <a href=#timed-track-cue>timed track cue</a> that the <code><a href=#timedtrackcue>TimedTrackCue</a></code>
   object represents.</p>
-  <p>The <dfn id=dom-timedtrackcue-voice title=dom-TimedTrackCue-voice><code>voice</code></dfn>
-  attribute must return the <a href=#timed-track-cue-voice-identifier>timed track cue voice
-  identifier</a> of the <a href=#timed-track-cue>timed track cue</a> that the
-  <code><a href=#timedtrackcue>TimedTrackCue</a></code> object represents.</p>
+<!--TTSRT-->
   <p>The <dfn id=dom-timedtrackcue-getcueassource() title=dom-TimedTrackCue-getCueAsSource()><code>getCueAsSource()</code></dfn>
   method must return the raw <a href=#timed-track-cue-text>timed track cue text</a>.</p>
@@ -28765,9 +29016,13 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   method must convert the <a href=#timed-track-cue-text>timed track cue text</a> to a
   <code><a href=#documentfragment>DocumentFragment</a></code> for the <a href=#media-element>media element</a>'s
   <code><a href=#document>Document</a></code>, using the appropriate rules for doing
-  so. (For example, for <a href=#websrt>WebSRT</a>, those rules are the
+  so.
+<!--TTSRT-->
+  For example, for <a href=#websrt>WebSRT</a>, those rules are the
   <a href=#websrt-cue-text-parsing-rules>WebSRT cue text parsing rules</a> and the <a href=#websrt-cue-text-dom-construction-rules>WebSRT cue
-  text DOM construction rules</a>.)</p>
+  text DOM construction rules</a>.
+<!--TTSRT-->
+  </p>
   </div>
@@ -28823,7 +29078,6 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    <li><a href=#websrt-cue-timings>WebSRT cue timings</a>.</li>
    <li>Optionally, one or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters followed by <a href=#websrt-cue-settings>WebSRT cue settings</a>.</li>
    <li>A <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
-   <li>Optionally, a <a href=#websrt-voice-declaration>WebSRT voice declaration</a> followed by zero or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters.</li>
    <li>The <dfn id=cue-payload>cue payload</dfn>: either <a href=#websrt-cue-text>WebSRT cue text</a> or <a href=#websrt-metadata-text>WebSRT metadata text</a>.</li>
   </ol><p><a href=#websrt-cue-text>WebSRT cue text</a> is syntactically a subset of
   <a href=#websrt-metadata-text>WebSRT metadata text</a>. Conformance checkers, when
@@ -28975,22 +29229,6 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   <ol><li>A U+0041 LATIN CAPITAL LETTER A character.</li>
    <li>A U+003A COLON character (:).</li>
    <li>One of the following strings: "<code title="">start</code>", "<code title="">middle</code>", "<code title="">end</code>"</li>
-  </ol><p>A <dfn id=websrt-voice-declaration>WebSRT voice declaration</dfn> consists of the following
-  components, in the order given:</p>
-  <ol><li>A U+003C LESS-THAN SIGN character (&lt;).</li>
-   <li>One of the following:
-    <ul class=brief><li>One character in the range U+0031 DIGIT ONE (1) to U+0039
-     DIGIT NINE (9), followed by zero or more characters in the range
-     U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9)
-     <li>The string "<dfn id=timed-track-cue-narrator-voice title="timed track cue narrator voice"><code>narrator</code></dfn>".</li>
-     <li>The string "<dfn id=timed-track-cue-music-voice title="timed track cue music voice"><code>music</code></dfn>".</li>
-     <li>The string "<dfn id=timed-track-cue-lyric-voice title="timed track cue lyric voice"><code>lyric</code></dfn>".</li>
-     <li>The string "<dfn id=timed-track-cue-sound-voice title="timed track cue sound voice"><code>sound</code></dfn>".</li> <!-- for audio fx descriptions -->
-     <li>The string "<dfn id=timed-track-cue-comment-voice title="timed track cue comment voice"><code>comment</code></dfn>".</li> <!-- for annotations -->
-     <li>The string "<dfn id=timed-track-cue-credit-voice title="timed track cue credit voice"><code>credit</code></dfn>".</li>
-    </ul></li>
-   <li>A U+003E GREATER-THAN SIGN character (&gt;).</li>
   </ol><p><dfn id=websrt-metadata-text>WebSRT metadata text</dfn> consists of any sequence of one
   or more characters other than U+000A LINE FEED (LF) characters and
   U+000D CARRIAGE RETURN (CR) characters, each optionally separated
@@ -28999,93 +29237,171 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   does not start or end with a <a href=#websrt-line-terminator>WebSRT line
   terminator</a>.)</p>
-  <p><dfn id=websrt-cue-text>WebSRT cue text</dfn> consists of one or more <a href=#websrt-cue-components>WebSRT
+  <p><dfn id=websrt-cue-text>WebSRT cue text</dfn> consists of zero or more <a href=#websrt-cue-components>WebSRT
   cue components</a>, in any order, each optionally separated from
   the next by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</p>
   <p>The <dfn id=websrt-cue-components>WebSRT cue components</dfn> are:</p>
-  <ul><li>A <a href=#websrt-cue-text-span>WebSRT cue text span</a>, representing the text of the cue.</li>
-   <li>A <a href=#websrt-cue-amp-escape>WebSRT cue amp escape</a>, representing a "&amp;" character in the text of the cue.</li>
-   <li>A <a href=#websrt-cue-lt-escape>WebSRT cue lt escape</a>, representing a "&lt;" character in the text of the cue.</li>
-   <li>A <a href=#websrt-cue-timestamp>WebSRT cue timestamp</a>.</li>
+  <ul><li>A <a href=#websrt-cue-class-span>WebSRT cue class span</a>.</li>
    <li>A <a href=#websrt-cue-italics-span>WebSRT cue italics span</a>.</li>
    <li>A <a href=#websrt-cue-bold-span>WebSRT cue bold span</a>.</li>
    <li>A <a href=#websrt-cue-ruby-span>WebSRT cue ruby span</a>.</li>
+   <li>A <a href=#websrt-cue-voice-span>WebSRT cue voice span</a>.</li>
+   <li>A <a href=#websrt-cue-timestamp>WebSRT cue timestamp</a>.</li>
+   <li>A <a href=#websrt-cue-text-span>WebSRT cue text span</a>, representing the text of the cue.</li>
+   <li>A <a href=#websrt-cue-amp-escape>WebSRT cue amp escape</a>, representing a "&amp;" character in the text of the cue.</li>
+   <li>A <a href=#websrt-cue-lt-escape>WebSRT cue lt escape</a>, representing a "&lt;" character in the text of the cue.</li>
+   <li>A <a href=#websrt-cue-gt-escape>WebSRT cue gt escape</a>, representing a "&gt;" character in the text of the cue.</li>
   </ul><p><dfn id=websrt-cue-internal-text>WebSRT cue internal text</dfn> consists of an optional
   <a href=#websrt-line-terminator>WebSRT line terminator</a>, followed by zero or more
   <a href=#websrt-cue-components>WebSRT cue components</a>, in any order, each optionally
   followed by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</p>
-  <p>A <dfn id=websrt-cue-text-span>WebSRT cue text span</dfn> consists of one or more
-  characters other than U+000A LINE FEED (LF) characters, U+000D
-  CARRIAGE RETURN (CR) characters, U+0026 AMPERSAND characters (&amp;),
-  and U+003C LESS-THAN SIGN characters (&lt;).</p>
-  <p>A <dfn id=websrt-cue-amp-escape>WebSRT cue amp escape</dfn> is the five character string
-  consisting of a U+0026 AMPERSAND character (&amp;), a U+0061 LATIN SMALL
-  LETTER A character, a U+006D LATIN SMALL LETTER M character, a
-  U+0070 LATIN SMALL LETTER P character, and a U+003B SEMICOLON
-  character (;).
-  <p>A <dfn id=websrt-cue-lt-escape>WebSRT cue lt escape</dfn> is the five character string
-  consisting of a U+0026 AMPERSAND character (&amp;), a U+006C LATIN SMALL
-  LETTER L character, a U+0074 LATIN SMALL LETTER T character, and a
-  U+003B SEMICOLON character (;).
+  <p>A <dfn id=websrt-cue-class-span>WebSRT cue class span</dfn> consists of a <a href=#websrt-cue-span-start-tag>WebSRT cue
+  span start tag</a> "<code title="">c</code>" that disallows an
+  annotation, <a href=#websrt-cue-internal-text>WebSRT cue internal text</a> representing cue
+  text, and a <a href=#websrt-cue-span-end-tag>WebSRT cue span end tag</a> "<code title="">c</code>".</p>
-  <p>A <dfn id=websrt-cue-timestamp>WebSRT cue timestamp</dfn> consists of a U+003C LESS-THAN
-  SIGN character (&lt;), followed by a <a href=#websrt-timestamp>WebSRT timestamp</a>
-  representing the time that the given point in the cue becomes
-  active, followed by a U+003E GREATER-THAN SIGN character (&gt;). The
-  time represented by the <a href=#websrt-timestamp>WebSRT timestamp</a> must be
-  greater than the times represented by any previous <a href=#websrt-cue-timestamp title="WebSRT cue timestamp">WebSRT cue timestamps</a> in the
-  cue, as well as greater than the cue's start time offset, and less
-  than the cue's end time offset.</p>
+  <p>A <dfn id=websrt-cue-italics-span>WebSRT cue italics span</dfn> consists of a <a href=#websrt-cue-span-start-tag>WebSRT
+  cue span start tag</a> "<code title="">i</code>" that disallows
+  an annotation, <a href=#websrt-cue-internal-text>WebSRT cue internal text</a> representing
+  the italicized text, and a <a href=#websrt-cue-span-end-tag>WebSRT cue span end tag</a>
+  "<code title="">i</code>".</p>
-  <p>A <dfn id=websrt-cue-italics-span>WebSRT cue italics span</dfn> consists of a U+003C
-  LESS-THAN SIGN character (&lt;), a U+0069 LATIN SMALL LETTER I
-  character, and a U+003E GREATER-THAN SIGN character (&gt;), then
-  <a href=#websrt-cue-internal-text>WebSRT cue internal text</a> representing the italicized
-  text, and finally a U+003C LESS-THAN SIGN character (&lt;), a U+002F
-  SOLIDUS character (/), a U+0069 LATIN SMALL LETTER I character, and
-  a U+003E GREATER-THAN SIGN character (&gt;).</p>
-  <p>A <dfn id=websrt-cue-bold-span>WebSRT cue bold span</dfn> consists of a U+003C LESS-THAN
-  SIGN character (&lt;), a U+0062 LATIN SMALL LETTER B character, and
-  a U+003E GREATER-THAN SIGN character (&gt;), then <a href=#websrt-cue-internal-text>WebSRT cue
-  internal text</a> representing the bolded text, and finally a
-  U+003C LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS character
-  (/), a U+0062 LATIN SMALL LETTER B character, and a U+003E
-  GREATER-THAN SIGN character (&gt;).</p>
+  <p>A <dfn id=websrt-cue-bold-span>WebSRT cue bold span</dfn> consists of a <a href=#websrt-cue-span-start-tag>WebSRT cue
+  span start tag</a> "<code title="">b</code>" that disallows an
+  annotation, <a href=#websrt-cue-internal-text>WebSRT cue internal text</a> representing the
+  boldened text, and a <a href=#websrt-cue-span-end-tag>WebSRT cue span end tag</a> "<code title="">b</code>".</p>
   <p>A <dfn id=websrt-cue-ruby-span>WebSRT cue ruby span</dfn> consists of the following
   components, in the order given:</p>
-  <ol><li>The string "<code title="">&lt;ruby&gt;</code>".</li>
+  <ol><li>A <a href=#websrt-cue-span-start-tag>WebSRT cue span start tag</a> "<code title="">i</code>" that disallows an annotation.</li>
    <li>One or more occurrences of the following group of components, in the order given:
     <ol><li><a href=#websrt-cue-internal-text>WebSRT cue internal text</a>, representing the ruby base.</li>
-     <li>The string "<code title="">&lt;rt&gt;</code>".</li>
-     <li><a href=#websrt-cue-internal-text>WebSRT cue internal text</a>, representing the ruby text component of th ruby annotation.</li>
-     <li>The string "<code title="">&lt;/rt&gt;</code>". If this is
-     the last occurance of this group of components in the
+     <li>A <a href=#websrt-cue-span-start-tag>WebSRT cue span start tag</a> "<code title="">rt</code>" that disallows an annotation.</li>
+     <li><a href=#websrt-cue-internal-text>WebSRT cue internal text</a>, representing the ruby text component of the ruby annotation.</li>
+     <li>A <a href=#websrt-cue-span-end-tag>WebSRT cue span end tag</a> "<code title="">rt</code>".
+     If this is the last occurance of this group of components in the
      <a href=#websrt-cue-ruby-span>WebSRT cue ruby span</a>, then this last end tag string
      may be omitted.</li>
     </ol></li>
    <li>If the last end tag string was not omitted: Optionally, a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
    <li>If the last end tag string was not omitted: Zero or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters, each optionally followed by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
-   <li>The string "<code title="">&lt;/ruby&gt;</code>".</li>
-  </ol><div class=impl>
+   <li>A <a href=#websrt-cue-span-end-tag>WebSRT cue span end tag</a> "<code title="">ruby</code>".</li>
+  </ol><p>A <dfn id=websrt-cue-voice-span>WebSRT cue voice span</dfn> consists of the following
+  components, in the order given:</p>
+  <ol><li>A <a href=#websrt-cue-span-start-tag>WebSRT cue span start tag</a> "<code title="">v</code>" that requires an annotation; the annotation represents the name of the voice.</li>
+   <li><a href=#websrt-cue-internal-text>WebSRT cue internal text</a>.</li>
+   <li>A <a href=#websrt-cue-span-end-tag>WebSRT cue span end tag</a> "<code title="">v</code>". If this <a href=#websrt-cue-voice-span>WebSRT cue voice span</a> is the only <a href=#websrt-cue-components title="WebSRT cue components">component</a> of its <a href=#websrt-cue-text>WebSRT cue text</a> sequence, then the end tag may be omitted for brevity.</li>
+  </ol><p>A <dfn id=websrt-cue-span-start-tag>WebSRT cue span start tag</dfn> has a <var title="">tag
+  name</var> and either allows, requires, and disallows an annotation,
+  and consists of the following components, in the order given:</p>
+  <ol><li>A U+003C LESS-THAN SIGN character (&lt;).</li>
+   <li>The <var title="">tag name</var>.</li>
+   <li>Zero or more occurrences of the following sequence:
+    <ol><li>U+002E FULL STOP character (.)</li>
+     <li>One or more characters other than U+0009 CHARACTER TABULATION
+     (tab) characters, U+000A LINE FEED (LF) characters, U+000D
+     CARRIAGE RETURN (CR) characters, U+0020 SPACE characters, U+0026
+     AMPERSAND characters (&amp;), U+003C LESS-THAN SIGN characters
+     (&lt;), U+003E GREATER-THAN SIGN characters (&gt;), and U+002E FULL
+     STOP characters (.), representing a class that describes the cue
+     span's significance.</li>
+    </ol></li>
+   <li>
+<!--
+    <dl class="switch">
+     <dt>If the start tag allows an annotation:</dt>
+     <dd>Optionally, a <span>WebSRT cue span start tag annotation</span>.</dd>
+     <dt>-->If the start tag requires an annotation:<!--</dt>
+     <dd>A <span>WebSRT cue span start tag annotation</span>.</dd>
+    </dl>
+    <p>A <dfn>WebSRT cue span start tag annotation</dfn> consists of-->
+    one or more of the following components, the concatenation of
+    their representations having a value that contains at least one
+    character other than U+0020 SPACE and U+0009 CHARACTER TABULATION
+    (tab) characters:<!--</p>-->
+    <ul><li><a href=#websrt-cue-span-start-tag-annotation-text>WebSRT cue span start tag annotation text</a>, representing the text of the annotation.</li>
+     <li>A <a href=#websrt-cue-amp-escape>WebSRT cue amp escape</a>, representing a "&amp;" character in the text of the annotation.</li>
+     <li>A <a href=#websrt-cue-lt-escape>WebSRT cue lt escape</a>, representing a "&lt;" character in the text of the annotation.</li>
+     <li>A <a href=#websrt-cue-gt-escape>WebSRT cue gt escape</a>, representing a "&gt;" character in the text of the annotation.</li>
+    </ul></li>
+   <li>A U+003E GREATER-THAN SIGN character (&gt;).</li>
+  </ol><p>A <dfn id=websrt-cue-span-end-tag>WebSRT cue span end tag</dfn> has a <var title="">tag
+  name</var> and consists of the following components, in the order
+  given:</p>
+  <ol><li>A U+003C LESS-THAN SIGN character (&lt;).</li>
+   <li>U+002F SOLIDUS character (/).</li>
+   <li>The <var title="">tag name</var>.</li>
+   <li>A U+003E GREATER-THAN SIGN character (&gt;).</li>
+  </ol><p>A <dfn id=websrt-cue-timestamp>WebSRT cue timestamp</dfn> consists of a U+003C LESS-THAN
+  SIGN character (&lt;), followed by a <a href=#websrt-timestamp>WebSRT timestamp</a>
+  representing the time that the given point in the cue becomes
+  active, followed by a U+003E GREATER-THAN SIGN character (&gt;). The
+  time represented by the <a href=#websrt-timestamp>WebSRT timestamp</a> must be
+  greater than the times represented by any previous <a href=#websrt-cue-timestamp title="WebSRT cue timestamp">WebSRT cue timestamps</a> in the
+  cue, as well as greater than the cue's start time offset, and less
+  than the cue's end time offset.</p>
+  <p>A <dfn id=websrt-cue-text-span>WebSRT cue text span</dfn> consists of one or more
+  characters other than U+000A LINE FEED (LF) characters, U+000D
+  CARRIAGE RETURN (CR) characters, U+0026 AMPERSAND characters (&amp;),
+  and U+003C LESS-THAN SIGN characters (&lt;).</p>
+  <p><dfn id=websrt-cue-span-start-tag-annotation-text>WebSRT cue span start tag annotation text</dfn> consists of
+  one or more characters other than U+000A LINE FEED (LF) characters,
+  U+000D CARRIAGE RETURN (CR) characters, U+0026 AMPERSAND characters
+  (&amp;), and U+003E GREATER-THAN SIGN characters (&gt;).</p>
+  <p>A <dfn id=websrt-cue-amp-escape>WebSRT cue amp escape</dfn> is the five character string
+  "<code title="">&amp;</code>".</p>
+  <p>A <dfn id=websrt-cue-lt-escape>WebSRT cue lt escape</dfn> is the five character string
+  "<code title="">&lt;</code>".</p>
+  <p>A <dfn id=websrt-cue-gt-escape>WebSRT cue gt escape</dfn> is the five character string
+  "<code title="">&gt;</code>".</p>
+  <div class=impl>
   <h6 id=parsing-0><span class=secno>4.8.10.11.2 </span>Parsing</h6>
-  <p>A <dfn id=websrt-parser>WebSRT parser</dfn>, given an input byte stream, a
+  <p>A <dfn id=websrt-parser>WebSRT parser</dfn>, given an input byte stream and a
   <a href=#timed-track-list-of-cues>timed track list of cues</a> <var title="">output</var>,
-  and optionally a character encoding override <var title="">encoding</var>, must convert the bytes into a string of
-  Unicode characters by interpreting them as the given <var title="">encoding</var>, or UTF-8 if <var title="">encoding</var> is
-  not provided, and then must parse the resulting string according to
-  the <a href=#websrt-parser-algorithm>WebSRT parser algorithm</a> below. This results in
-  <a href=#timed-track-cue title="timed track cue">timed track cues</a> being added to
-  <var title="">output</var>. <a href=#refsRFC3629>[RFC3629]</a></p>
+  must <a href=#decoded-as-utf-8,-with-error-handling title="decoded as UTF-8, with error handling">decode the
+  byte stream as UTF-8, with error handling</a>, and then must
+  parse the resulting string according to the <a href=#websrt-parser-algorithm>WebSRT parser
+  algorithm</a> below. This results in <a href=#timed-track-cue title="timed track
+  cue">timed track cues</a> being added to <var title="">output</var>. <a href=#refsRFC3629>[RFC3629]</a></p>
   <p>A <a href=#websrt-parser>WebSRT parser</a>, specifically its conversion and
   parsing steps, is typically run asynchronously, with the input byte
@@ -29157,9 +29473,6 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    alignment</a> be <a href=#timed-track-cue-middle-alignment title="timed track cue middle
    alignment">middle alignment</a>.</li>
-   <li><p>Let <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue
-   voice identifier</a> be the empty string.</li>
    <li><p>Let <var title="">cue</var>'s <a href=#timed-track-cue-text>timed track cue
    text</a> be the empty string.</li>
@@ -29208,10 +29521,23 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    <li><p>Let <var title="">cue text</var> be the empty
    string.</li>
-   <li><p><i>Cue text loop</i>: <a href=#collect-a-sequence-of-characters>Collect a sequence of
-   characters</a> that are <em>not</em> U+000D CARRIAGE RETURN (CR)
-   or U+000A LINE FEED (LF) characters. Let <var title="">line</var>
-   be those characters, if any.</li>
+   <li><p><i>Cue text loop</i>: If <var title="">position</var> is
+   past the end of <var title="">input</var>, then discard <var title="">cue</var> and jump to the step labeled <i>cue text
+   processing</i>.</li>
+   <li><p>If the character indicated by <var title="">position</var>
+   is a U+000D CARRIAGE RETURN (CR) character, advance <var title="">position</var> to the next character in <var title="">input</var>.</li>
+   <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, then discard <var title="">cue</var> and jump
+   to the step labeled <i>cue text processing</i>.</li>
+   <li><p>If the character indicated by <var title="">position</var>
+   is a U+000A LINE FEED (LF) character, advance <var title="">position</var> to the next character in <var title="">input</var>.</li>
+   <li><p><a href=#collect-a-sequence-of-characters>Collect a sequence of characters</a> that are
+   <em>not</em> U+000D CARRIAGE RETURN (CR) or U+000A LINE FEED (LF)
+   characters. Let <var title="">line</var> be those characters, if
+   any.</li>
    <li><p>If <var title="">line</var> is the empty string, then jump
    to the step labeled <i>cue text processing</i>.</li>
@@ -29225,9 +29551,12 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    <li><p>Return to the step labeled <i>cue text loop</i>.</li>
-   <li><p><i>Cue text processing</i>: <a href=#collect-websrt-cue-voice-and-text>Collect WebSRT cue voice
-   and text</a> from <var title="">cue text</var>, using <var title="">cue</var> for the results. If that fails, discard <var title="">cue</var> and jump to the step labeled <i>cue
-   loop</i>.</li>
+   <li><p><i>Cue text processing</i>: Let the <a href=#timed-track-cue-text>timed track cue
+   text</a> of <var title="">cue</var> be <var title="">cue
+   text</var>, and let the rules for its interpretation be the
+   <a href=#websrt-cue-text-parsing-rules>WebSRT cue text parsing rules</a>, the <a href=#websrt-cue-text-rendering-rules>WebSRT cue
+   text rendering rules</a>, and the <a href=#websrt-cue-text-dom-construction-rules>WebSRT cue text DOM
+   construction rules</a>.</li>
    <li><p>Add <var title="">cue</var> to the <a href=#timed-track-list-of-cues>timed track list of
    cues</a> <var title="">output</var>.</li>
@@ -29643,100 +29972,6 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    <li><p>Return <var title="">result</var>.</li>
-  </ol><p>When the steps above say that a user agent is to <dfn id=collect-websrt-cue-voice-and-text>collect
-  WebSRT cue voice and text</dfn> from a string <var title="">input</var> for a <a href=#timed-track-cue>timed track cue</a> <var title="">cue</var>, the user agent must run the following steps:</p>
-  <ol><li><p>Let <var title="">input</var> be the string being
-   parsed.</li>
-   <li><p>Let <var title="">position</var> be a pointer into <var title="">input</var>, initially pointing at the start of the
-   string.</li>
-   <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, return an error and abort these
-   steps.</li>
-   <li>
-    <p>Examine the first few characters of <var title="">input</var>
-    and process them as described by the match set of rules from the
-    following list:</p>
-    <dl class=switch><dt>If <var title="">input</var> starts with the string "<code title="">&lt;narrator&gt;</code>"</dt>
-     <dd>
-      <p>Let <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue voice
-      identifier</a> be the string "<code title="timed track cue narrator voice"><a href=#timed-track-cue-narrator-voice>narrator</a></code>"
-      and advance <var title="">position</var> past the matching substring.</p>
-     </dd>
-     <dt>If <var title="">input</var> starts with the string "<code title="">&lt;music&gt;</code>"</dt>
-     <dd>
-      <p>Let <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue voice
-      identifier</a> be the string "<code title="timed track cue music voice"><a href=#timed-track-cue-music-voice>music</a></code>"
-      and advance <var title="">position</var> past the matching substring.</p>
-     </dd>
-     <dt>If <var title="">input</var> starts with the string "<code title="">&lt;lyric&gt;</code>"</dt>
-     <dd>
-      <p>Let <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue voice
-      identifier</a> be the string "<code title="timed track cue lyric voice"><a href=#timed-track-cue-lyric-voice>lyric</a></code>"
-      and advance <var title="">position</var> past the matching substring.</p>
-     </dd>
-     <dt>If <var title="">input</var> starts with the string "<code title="">&lt;sound&gt;</code>"</dt>
-     <dd>
-      <p>Let <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue voice
-      identifier</a> be the string "<code title="timed track cue sound voice"><a href=#timed-track-cue-sound-voice>sound</a></code>"
-      and advance <var title="">position</var> past the matching substring.</p>
-     </dd>
-     <dt>If <var title="">input</var> starts with the string "<code title="">&lt;comment&gt;</code>"</dt>
-     <dd>
-      <p>Let <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue voice
-      identifier</a> be the string "<code title="timed track cue comment voice"><a href=#timed-track-cue-comment-voice>comment</a></code>"
-      and advance <var title="">position</var> past the matching substring.</p>
-     </dd>
-     <dt>If <var title="">input</var> starts with the string "<code title="">&lt;credit&gt;</code>"</dt>
-     <dd>
-      <p>Let <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue voice
-      identifier</a> be the string "<code title="timed track cue credit voice"><a href=#timed-track-cue-credit-voice>credit</a></code>"
-      and advance <var title="">position</var> past the matching substring.</p>
-     </dd>
-     <dt>If <var title="">input</var> starts with a U+003C LESS-THAN
-     SIGN character (&lt;), followed by a character in the range
-     U+0031 DIGIT ONE (1) to U+0039 DIGIT NINE (9), followed by zero
-     or more characters in the range U+0030 DIGIT ZERO (0) to U+0039
-     DIGIT NINE (9), followed by a U+003E GREATER-THAN SIGN character
-     (&gt;)</dt>
-     <dd>
-      <p>Let <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue voice
-      identifier</a> be the string of digits (characters in the
-      range U+0030 DIGIT ZERO to U+0039 DIGIT NINE) in the matching
-      substring, and advance <var title="">position</var> past the
-      matching substring.</p>
-     </dd>
-     <dt>Otherwise</dt>
-     <dd>
-      <p>Leave the <var title="">cue</var>'s <a href=#timed-track-cue-voice-identifier>timed track cue voice
-      identifier</a> set to the empty string.</p>
-     </dd>
-    </dl></li>
-   <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, return an error and abort these
-   steps.</li>
-   <li><p>Let the <a href=#timed-track-cue-text>timed track cue text</a> of <var title="">cue</var> be the substring of <var title="">input</var>
-   from the position indicated by <var title="">position</var> to the
-   end of the <var title="">input</var>, and let the rules for its
-   interpretation be the <a href=#websrt-cue-text-parsing-rules>WebSRT cue text parsing rules</a>,
-   the <a href=#websrt-cue-text-rendering-rules>WebSRT cue text rendering rules</a>, and the
-   <a href=#websrt-cue-text-dom-construction-rules>WebSRT cue text DOM construction rules</a>.</li>
   </ol><h6 id=websrt-cue-text-parsing-rules><span class=secno>4.8.10.11.3 </span><dfn>WebSRT cue text parsing rules</dfn></h6>
   <p>A <dfn id=websrt-node-object>WebSRT Node Object</dfn> is a conceptual construct used to
@@ -29754,9 +29989,10 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   similar to elements in HTML or the DOM. <a href=#websrt-internal-node-object title="WebSRT Internal
   Node Object">WebSRT Internal Node Objects</a> have an ordered
   list of child <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node
-  Objects</a>. The <a href=#websrt-internal-node-object>WebSRT Internal Node Object</a> is said
-  to be the <i>parent</i> of the children. Cycles do not occur; the
-  parent-child relationships so constructed form a tree structure.</p>
+  Objects</a>, and an ordered list of class names. The <a href=#websrt-internal-node-object>WebSRT
+  Internal Node Object</a> is said to be the <i>parent</i> of the
+  children. Cycles do not occur; the parent-child relationships so
+  constructed form a tree structure.</p>
   <p>There are five concrete classes of <a href=#websrt-internal-node-object title="WebSRT Internal
   Node Object">WebSRT Internal Node Objects</a>:</p>
@@ -29767,6 +30003,14 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
     Node Object">WebSRT Node Objects</a>.</p>
    </dd>
+   <dt><dfn id=websrt-class-object title="WebSRT Class Object">WebSRT Class Objects</dfn></dt>
+   <dd>
+    <p>These represent spans of text (a <a href=#websrt-cue-class-span>WebSRT cue class
+    span</a>) in <a href=#websrt-cue-text>WebSRT cue text</a>, and are used to
+    annotate parts of the cue with classes without implying further
+    meaning (such as italics or bold).</p>
+   </dd>
    <dt><dfn id=websrt-italic-object title="WebSRT Italic Object">WebSRT Italic Objects</dfn></dt>
    <dd>
     <p>These represent spans of italic text (a <a href=#websrt-cue-italics-span>WebSRT cue
@@ -29792,6 +30036,14 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
     text</a>.</p>
    </dd>
+   <dt><dfn id=websrt-voice-object title="WebSRT Voice Object">WebSRT Voice Objects</dfn></dt>
+   <dd>
+    <p>These represent spans of text associated with a specific voice
+    (a <a href=#websrt-cue-voice-span>WebSRT cue voice span</a>) in <a href=#websrt-cue-text>WebSRT cue
+    text</a>. A <a href=#websrt-voice-object>WebSRT Voice Object</a> has a value, which
+    is the name of the voice.</p>
+   </dd>
   </dl><p><dfn id=websrt-leaf-node-object title="WebSRT Leaf Node Object">WebSRT Leaf Node
   Objects</dfn> are those that contain data, such as text, and cannot
   contain child <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node
@@ -29863,61 +30115,57 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
         <p>Ignore the token.</p>
        </dd>
+       <dt>If the tag name is "<code title="">c</code>"</dt>
+       <dd>
+        <p><a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node
+        Object">Attach</a> a <a href=#websrt-class-object>WebSRT Class Object</a>.</p>
+       </dd>
        <dt>If the tag name is "<code title="">i</code>"</dt>
        <dd>
-        <p>Create a <a href=#websrt-italic-object>WebSRT Italic Object</a>, and <a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node Object">attach
-        it</a>.</p>
+        <p><a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node
+        Object">Attach</a> a <a href=#websrt-italic-object>WebSRT Italic Object</a>.</p>
        </dd>
        <dt>If the tag name is "<code title="">b</code>"</dt>
        <dd>
-        <p>Create a <a href=#websrt-bold-object>WebSRT Bold Object</a>, and <a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node Object">attach
-        it</a>.</p>
+        <p><a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node
+        Object">Attach</a> a <a href=#websrt-bold-object>WebSRT Bold Object</a>.</p>
        </dd>
        <dt>If the tag name is "<code title="">ruby</code>"</dt>
        <dd>
-        <p>Create a <a href=#websrt-ruby-object>WebSRT Ruby Object</a>, and <a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node Object">attach
-        it</a>.</p>
+        <p><a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node
+        Object">Attach</a> a <a href=#websrt-ruby-object>WebSRT Ruby Object</a>.</p>
        </dd>
        <dt>If the tag name is "<code title="">rt</code>"</dt>
        <dd>
         <p>If <var title="">current</var> is a <a href=#websrt-ruby-object>WebSRT Ruby
-        Object</a>, then create a <a href=#websrt-ruby-text-object>WebSRT Ruby Text
-        Object</a>, and <a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node
-        Object">attach it</a>.</p>
-        <p>Otherwise, ignore the token.</p>
+        Object</a>, then <a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node
+        Object">attach</a> a <a href=#websrt-ruby-text-object>WebSRT Ruby Text
+        Object</a>.</p>
        </dd>
-       <dt>Otherwise</dt>
+       <dt>If the tag name is "<code title="">v</code>"</dt>
        <dd>
+        <p><a href=#attach-a-websrt-internal-node-object title="attach a WebSRT Internal Node
+        Object">Attach</a> a <a href=#websrt-voice-object>WebSRT Voice Object</a>, and
+        set its value to the token's annotation string.</p>
+       </dd>
-        <ol><li><p>Let <var title="">input</var> be the tag name.</li>
-         <li><p>Let <var title="">position</var> be a pointer into
-         <var title="">input</var>, initially pointing at the start of
-         the string.</li>
-         <li><p><a href=#collect-a-websrt-timestamp>Collect a WebSRT timestamp</a>.</li>
-         <li>
-          <p>If that algorithm does not fail, and if <var title="">position</var> now points at the end of <var title="">input</var> (i.e. there are no trailing characters
-          after the timestamp), then create a <a href=#websrt-timestamp-object>WebSRT Timestamp
-          Object</a> whose value is the collected time, then append
-          it to <var title="">current</var>.</p>
-          <p>Otherwise, ignore the token.</p>
-         </li>
-        </ol></dd>
+       <dt>Otherwise</dt>
+       <dd>
+        <p>Ignore the token.</p>
+       </dd>
       </dl><p>When the steps above say to <dfn id=attach-a-websrt-internal-node-object>attach a WebSRT Internal
-      Node Object</dfn> <var title="">node object</var>, the user
-      agent must append <var title="">node object</var> to <var title="">current</var>, then let <var title="">current</var> be
-      <var title="">node object</var>.</p>
+      Node Object</dfn> of a particular class, the user agent must
+      first create an object of the specified class, then set its list
+      of classes to the list of classes in the token, append the newly
+      created node object to <var title="">current</var>, and finally
+      let <var title="">current</var> be the newly created node
+      object.</p>
      </dd>
@@ -29927,6 +30175,10 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
       <p>If any of the following conditions is true, then let <var title="">current</var> be the parent node of <var title="">current</var>.</p>
       <ul class=brief><li>The tag name of the end tag token <var title="">token</var>
+       is "<code title="">c</code>" and <var title="">current</var> is
+       a <a href=#websrt-class-object>WebSRT Class Object</a>.</li>
+       <li>The tag name of the end tag token <var title="">token</var>
        is "<code title="">i</code>" and <var title="">current</var> is
        a <a href=#websrt-italic-object>WebSRT Italic Object</a>.</li>
@@ -29942,6 +30194,10 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
        is "<code title="">rt</code>" and <var title="">current</var> is
        a <a href=#websrt-ruby-text-object>WebSRT Ruby Text Object</a>.</li>
+       <li>The tag name of the end tag token <var title="">token</var>
+       is "<code title="">v</code>" and <var title="">current</var> is
+       a <a href=#websrt-voice-object>WebSRT Voice Object</a>.</li>
       </ul><p>Otherwise, if the tag name of the end tag token <var title="">token</var> is "<code title="">ruby</code>" and <var title="">current</var> is a <a href=#websrt-ruby-text-object>WebSRT Ruby Text
       Object</a>, then let <var title="">current</var> be the
       parent node of <var title="">current</var> of the parent node of
@@ -29951,14 +30207,39 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
      </dd>
+     <dt>If <var title="">token</var> is a timestamp tag</dt>
+     <dd>
+      <ol><li><p>Let <var title="">input</var> be the tag value.</li>
+       <li><p>Let <var title="">position</var> be a pointer into
+       <var title="">input</var>, initially pointing at the start of
+       the string.</li>
+       <li><p><a href=#collect-a-websrt-timestamp>Collect a WebSRT timestamp</a>.</li>
+       <li>
+        <p>If that algorithm does not fail, and if <var title="">position</var> now points at the end of <var title="">input</var> (i.e. there are no trailing characters
+        after the timestamp), then create a <a href=#websrt-timestamp-object>WebSRT Timestamp
+        Object</a> whose value is the collected time, then append
+        it to <var title="">current</var>.</p>
+        <p>Otherwise, ignore the token.</p>
+       </li>
+      </ol></dd>
     </dl></li>
    <li><p>Jump to the step labeled <i>loop</i>.</li>
   </ol><p>The <dfn id=websrt-cue-text-tokeniser>WebSRT cue text tokeniser</dfn> is as follows. It emits
   a token, which is either a string (whose value is a sequence of
-  Unicode characters), a start tag (with a tag name), or an end tag
-  (with a tag name).</p>
+  Unicode characters), a start tag (with a tag name, a list of
+  classes, and optionally an annotation), an end tag (with a tag
+  name), or a timestamp tag (with a tag value).</p>
   <ol><li><p>Let <var title="">input</var> and <var title="">position</var> be the same variables as those of the same
    name in the algorithm that invoked these steps.</li>
@@ -29968,7 +30249,9 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    <li><p>Let <var title="">result</var> be the empty string.</li>
-   <li><p>Let <var title="">escape</var> be the empty string.</li>
+   <li><p>Let <var title="">buffer</var> be the empty string.</li>
+   <li><p>Let <var title="">classes</var> be an empty list.</li>
    <li><p><i>Loop</i>: If <var title="">position</var> is past the end of
    <var title="">input</var>, let <var title="">c</var> be an
@@ -29988,7 +30271,7 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
       <dl><dt>U+0026 AMPERSAND (&amp;)</dt>
        <dd>
-        <p>Set <var title="">escape</var> to <var title="">c</var>,
+        <p>Set <var title="">buffer</var> to <var title="">c</var>,
         set <var title="">tokeniser state</var> to the <a href=#websrt-escape-state>WebSRT
         escape state</a>, and jump to the step labeled
         <i>next</i>.</p>
@@ -30024,15 +30307,18 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
       <dl><dt>U+003B SEMICOLON character (;)</dt>
        <dd>
-        <p>First, examine the value of <var title="">escape</var>:</p>
+        <p>First, examine the value of <var title="">buffer</var>:</p>
-        <p>If <var title="">escape</var> is the string "<code title="">&amp;amp</code>", then append a U+0026 AMPERSAND
+        <p>If <var title="">buffer</var> is the string "<code title="">&amp;amp</code>", then append a U+0026 AMPERSAND
         character (&amp;) to <var title="">result</var>.</p>
-        <p>If <var title="">escape</var> is the string "<code title="">&amp;lt</code>", then append a U+003C LESS-THAN SIGN
+        <p>If <var title="">buffer</var> is the string "<code title="">&amp;lt</code>", then append a U+003C LESS-THAN SIGN
         character (&lt;) to <var title="">result</var>.</p>
-        <p>Otherwise, append <var title="">escape</var> followed by a
+        <p>If <var title="">buffer</var> is the string "<code title="">&amp;gt</code>", then append a U+003E GREATER-THAN SIGN
+        character (&gt;) to <var title="">result</var>.</p>
+        <p>Otherwise, append <var title="">buffer</var> followed by a
         U+003B SEMICOLON character (;) to <var title="">result</var>.</p>
         <p>Then, in any case, set <var title="">tokeniser state</var>
@@ -30041,23 +30327,23 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
        </dd>
-       <dt>Characters in the range U+0061 LATIN SMALL LETTER A to U+007A LATIN SMALL LETTER Z</dt>
-       <dt>Characters in the range U+0041 LATIN CAPITAL LETTER A to U+005A LATIN CAPITAL LETTER Z</dt>
        <dt>Characters in the range U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9)</dt>
+       <dt>Characters in the range U+0041 LATIN CAPITAL LETTER A to U+005A LATIN CAPITAL LETTER Z</dt>
+       <dt>Characters in the range U+0061 LATIN SMALL LETTER A to U+007A LATIN SMALL LETTER Z</dt>
        <dd>
-        <p>Append <var title="">c</var> to <var title="">escape</var>
+        <p>Append <var title="">c</var> to <var title="">buffer</var>
         and jump to the step labeled <i>next</i>.</p>
        </dd>
        <dt>End-of-file marker</dt>
        <dd>
-        <p>Append <var title="">escape</var> to <var title="">result</var>, return a string token whose value is
+        <p>Append <var title="">buffer</var> to <var title="">result</var>, return a string token whose value is
         <var title="">result</var>, and abort these steps.</p>
        </dd>
        <dt>Anything else</dt>
        <dd>
-        <p>Append <var title="">escape</var> to <var title="">result</var>, set <var title="">tokeniser state</var>
+        <p>Append <var title="">buffer</var> to <var title="">result</var>, set <var title="">tokeniser state</var>
         to the <a href=#websrt-data-state>WebSRT data state</a>, and jump to the step
         labeled <i>next</i>.</p>
        </dd>
@@ -30070,18 +30356,43 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
       <p>Jump to the entry that matches the value of <var title="">c</var>:</p>
-      <dl><dt>U+002F SOLIDUS character (/)</dt>
+      <dl><dt>U+0020 SPACE character</dt>
+       <dt>U+0009 CHARACTER TABULATION (tab) character</dt>
+       <dd>
+        <!-- assert: >result< is the empty string -->
+        <p>Set <var title="">tokeniser state</var> to the <a href=#websrt-start-tag-annotation-state>WebSRT
+        start tag annotation state</a>, and jump to the step labeled
+        <i>next</i>.</p>
+       </dd>
+       <dt>U+002E FULL STOP character (.)</dt>
+       <dd>
+        <!-- assert: >result< is the empty string -->
+        <p>Set <var title="">tokeniser state</var> to the <a href=#websrt-start-tag-class-state>WebSRT
+        start tag class state</a>, and jump to the step labeled
+        <i>next</i>.</p>
+       </dd>
+       <dt>U+002F SOLIDUS character (/)</dt>
        <dd>
         <p>Set <var title="">tokeniser state</var> to the <a href=#websrt-end-tag-state>WebSRT
         end tag state</a>, and jump to the step labeled
         <i>next</i>.</p>
        </dd>
+       <dt>Characters in the range U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9)</dt>
+       <dd>
+        <p>Set <var title="">result</var> to <var title="">c</var>,
+        set <var title="">tokeniser state</var> to the <a href=#websrt-timestamp-tag-state>WebSRT
+        timestamp tag state</a>, and jump to the step labeled
+        <i>next</i>.</p>
+       </dd>
        <dt>U+003E GREATER-THAN SIGN character (&gt;)</dt>
        <dt>End-of-file marker</dt>
        <dd>
-        <p>Return a start tag whose tag name is the empty string and
-        abort these steps.</p>
+        <p>Return a start tag whose tag name is the empty string, with
+        no classes and no annotation, and abort these steps.</p>
        </dd>
        <dt>Anything else</dt>
@@ -30100,10 +30411,26 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
       <p>Jump to the entry that matches the value of <var title="">c</var>:</p>
-      <dl><dt>U+003E GREATER-THAN SIGN character (&gt;)</dt>
+      <dl><dt>U+0020 SPACE character</dt>
+       <dt>U+0009 CHARACTER TABULATION (tab) character</dt>
+       <dd>
+        <p>Set <var title="">tokeniser state</var> to the <a href=#websrt-start-tag-annotation-state>WebSRT
+        start tag annotation state</a>, and jump to the step labeled
+        <i>next</i>.</p>
+       </dd>
+       <dt>U+002E FULL STOP character (.)</dt>
+       <dd>
+        <p>Set <var title="">tokeniser state</var> to the <a href=#websrt-start-tag-class-state>WebSRT
+        start tag class state</a>, and jump to the step labeled
+        <i>next</i>.</p>
+       </dd>
+       <dt>U+003E GREATER-THAN SIGN character (&gt;)</dt>
        <dt>End-of-file marker</dt>
        <dd>
-        <p>Return a start tag whose tag name is <var title="">result</var> and abort these steps.</p>
+        <p>Return a start tag whose tag name is <var title="">result</var>, with no classes and no annotation, and
+        abort these steps.</p>
        </dd>
        <dt>Anything else</dt>
@@ -30114,6 +30441,74 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
       </dl></dd>
+     <dt><dfn id=websrt-start-tag-class-state>WebSRT start tag class state</dfn></dt>
+     <dd>
+      <p>Jump to the entry that matches the value of <var title="">c</var>:</p>
+      <dl><dt>U+0020 SPACE character</dt>
+       <dt>U+0009 CHARACTER TABULATION (tab) character</dt>
+       <dd>
+        <p>Append to <var title="">classes</var> an entry whose value
+        is <var title="">buffer</var>, set <var title="">buffer</var>
+        to the empty string, set <var title="">tokeniser state</var>
+        to the <a href=#websrt-start-tag-annotation-state>WebSRT start tag annotation state</a>, and
+        jump to the step labeled <i>next</i>.</p>
+       </dd>
+       <dt>U+002E FULL STOP character (.)</dt>
+       <dd>
+        <p>Append to <var title="">classes</var> an entry whose value
+        is <var title="">buffer</var>, set <var title="">buffer</var>
+        to the empty string, and jump to the step labeled
+        <i>next</i>.</p>
+       </dd>
+       <dt>U+003E GREATER-THAN SIGN character (&gt;)</dt>
+       <dt>End-of-file marker</dt>
+       <dd>
+        <p>Append to <var title="">classes</var> an entry whose value
+        is <var title="">buffer</var>, then return a start tag whose
+        tag name is <var title="">result</var>, with the classes given
+        in <var title="">classes</var> but no annotation, and abort
+        these steps.</p>
+       </dd>
+       <dt>Anything else</dt>
+       <dd>
+        <p>Append <var title="">c</var> to <var title="">buffer</var>
+        and jump to the step labeled <i>next</i>.</p>
+       </dd>
+      </dl></dd>
+     <dt><dfn id=websrt-start-tag-annotation-state>WebSRT start tag annotation state</dfn></dt>
+     <dd>
+      <p>Jump to the entry that matches the value of <var title="">c</var>:</p>
+      <dl><dt>U+003E GREATER-THAN SIGN character (&gt;)</dt>
+       <dt>End-of-file marker</dt>
+       <dd>
+        <p>Remove any leading or trailing U+0020 SPACE or U+0009
+        CHARACTER TABULATION (tab) characters from <var title="">buffer</var>, and replace any sequence of one or
+        more consecutive U+0020 SPACE and U+0009 CHARACTER TABULATION
+        (tab) characters in <var title="">buffer</var> with a single
+        U+0020 SPACE character; then, return a start tag whose tag name is
+        <var title="">result</var>, with the classes given in <var title="">classes</var>, and with <var title="">buffer</var> as
+        the annotation, and abort these steps.</p>
+       </dd>
+       <dt>Anything else</dt>
+       <dd>
+        <p>Append <var title="">c</var> to <var title="">buffer</var>
+        and jump to the step labeled <i>next</i>.</p>
+       </dd>
+      </dl></dd>
      <dt><dfn id=websrt-end-tag-state>WebSRT end tag state</dfn></dt>
      <dd>
@@ -30134,6 +30529,26 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
       </dl></dd>
+     <dt><dfn id=websrt-timestamp-tag-state>WebSRT timestamp tag state</dfn></dt>
+     <dd>
+      <p>Jump to the entry that matches the value of <var title="">c</var>:</p>
+      <dl><dt>U+003E GREATER-THAN SIGN character (&gt;)</dt>
+       <dt>End-of-file marker</dt>
+       <dd>
+        <p>Return a timestamp tag whose tag name is <var title="">result</var> and abort these steps.</p>
+       </dd>
+       <dt>Anything else</dt>
+       <dd>
+        <p>Append <var title="">c</var> to <var title="">result</var>
+        and jump to the step labeled <i>next</i>.</p>
+       </dd>
+      </dl></dd>
     </dl></li>
    <li><p><i>Next</i>: Advance <var title="">position</var> to the next
@@ -30154,19 +30569,30 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
      <th>DOM node
    <tbody><tr><td><a href=#list-of-websrt-node-objects>List of WebSRT Node Objects</a>
      <td><code><a href=#documentfragment>DocumentFragment</a></code> node
+    <tr><td><a href=#websrt-class-object>WebSRT Class Object</a>
+     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-span-element>span</a></code>".
     <tr><td><a href=#websrt-italic-object>WebSRT Italic Object</a>
-     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-i-element>i</a></code>" and the <code title=dom-Node-namespaceURI><a href=#dom-node-namespaceuri>namespaceURI</a></code> set to the <a href=#html-namespace-0>HTML namespace</a>.
+     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-i-element>i</a></code>".
     <tr><td><a href=#websrt-bold-object>WebSRT Bold Object</a>
-     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-b-element>b</a></code>" and the <code title=dom-Node-namespaceURI><a href=#dom-node-namespaceuri>namespaceURI</a></code> set to the <a href=#html-namespace-0>HTML namespace</a>.
+     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-b-element>b</a></code>".
     <tr><td><a href=#websrt-ruby-object>WebSRT Ruby Object</a>
-     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-ruby-element>ruby</a></code>" and the <code title=dom-Node-namespaceURI><a href=#dom-node-namespaceuri>namespaceURI</a></code> set to the <a href=#html-namespace-0>HTML namespace</a>.
+     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-ruby-element>ruby</a></code>".
     <tr><td><a href=#websrt-ruby-text-object>WebSRT Ruby Text Object</a>
-     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-rt-element>rt</a></code>" and the <code title=dom-Node-namespaceURI><a href=#dom-node-namespaceuri>namespaceURI</a></code> set to the <a href=#html-namespace-0>HTML namespace</a>.
+     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-rt-element>rt</a></code>".
+    <tr><td><a href=#websrt-voice-object>WebSRT Voice Object</a>
+     <td><code><a href=#htmlelement>HTMLElement</a></code> element node with <code title=dom-Node-localName><a href=#dom-node-localname>localName</a></code> "<code><a href=#the-q-element>q</a></code>", a <code title=attr-title><a href=#the-title-attribute>title</a></code> attribute set to the <a href=#websrt-voice-object>WebSRT Voice Object</a>'s value.
     <tr><td><a href=#websrt-text-object>WebSRT Text Object</a>
      <td><code><a href=#text>Text</a></code> node whose character data is the value of the <a href=#websrt-text-object>WebSRT Text Object</a>.
     <tr><td><a href=#websrt-timestamp-object>WebSRT Timestamp Object</a>
      <td><code><a href=#processinginstruction>ProcessingInstruction</a></code> node whose <code title=dom-ProcessingInstruction-target>target</code> is "<code title="">timestamp</code>" and whose <code title=dom-ProcessingInstruction-data>data</code> is a <a href=#websrt-timestamp>WebSRT timestamp</a> representing the value of the <a href=#websrt-timestamp-object>WebSRT Timestamp Object</a>, with all optional components included and with the seconds separator being a U+002E FULL STOP character (.).
-  </table><p>The <code title=dom-Node-ownerDocument><a href=#dom-node-ownerdocument>ownerDocument</a></code>
+  </table><p><code><a href=#htmlelement>HTMLElement</a></code> nodes created as part of the mapping
+  described above must have their <code title=dom-Node-namespaceURI><a href=#dom-node-namespaceuri>namespaceURI</a></code> set to the
+  <a href=#html-namespace-0>HTML namespace</a>, and must have a <code title=attr-class><a href=#classes>class</a></code> attribute set to the string obtained
+  by concatenating all the classes that apply to the corresponding
+  <a href=#websrt-internal-node-object>WebSRT Internal Node Object</a>, each separated from the
+  next by a single U+0020 SPACE character.</p>
+  <p>The <code title=dom-Node-ownerDocument><a href=#dom-node-ownerdocument>ownerDocument</a></code>
   attribute of all nodes in the DOM tree must be set to the given
   document <var title="">owner</var>.</p>
@@ -30222,8 +30648,9 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   <p>For the purposes of listing chapters in the <a href=#media-resource>media
   resource</a>, only <a href=#timed-track title="timed track">timed tracks</a>
   in the <a href=#media-element>media element</a>'s <a href=#list-of-timed-tracks>list of timed
-  tracks</a> <a href=#timed-track-showing title="timed track showing">showing</a> and
-  whose <a href=#timed-track-kind>timed track kind</a> is <code title=dom-timedtrack-kind-chapters><a href=#dom-timedtrack-kind-chapters>chapters</a></code> should be used.
+  tracks</a> <a href=#timed-track-showing title="timed track showing">showing</a> or
+  <a href=#timed-track-showing-by-default title="timed track showing by default">showing by
+  default</a> and whose <a href=#timed-track-kind>timed track kind</a> is <code title=dom-timedtrack-kind-chapters><a href=#dom-timedtrack-kind-chapters>chapters</a></code> should be used.
   Each <a href=#timed-track-cue title="timed track cue">cue</a> in such a <a href=#timed-track>timed
   track</a> represents a chapter starting at the cue's <a href=#timed-track-cue-start-time title="timed track cue start time">start time</a>. The name of
   the chapter is the <a href=#timed-track-cue-text>timed track cue text</a>, interpreted
@@ -30823,8 +31250,7 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
    <dd>
-    <p>Returns a <code title="">data:</code> URL for the image in the
-    canvas.</p>
+    <p>Returns a <a href=#data-protocol title="data protocol"><code title="">data:</code> URL</a> for the image in the canvas.</p>
     <p>The first argument, if provided, controls the type of the image
     to be returned (e.g. PNG or JPEG). The default is <code title="">image/png</code>; that type is also used if the given
@@ -30837,17 +31263,20 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   </dl><div class=impl>
   <p>The <dfn id=dom-canvas-todataurl title=dom-canvas-toDataURL><code>toDataURL()</code></dfn> method
-  must, when called with no arguments, return a <code title="">data:</code> URL containing a representation of the image
-  as a PNG file. <a href=#refsPNG>[PNG]</a></p>
+  must, when called with no arguments, return a <a href=#data-protocol title="data
+  protocol"><code title="">data:</code> URL</a> containing a
+  representation of the image as a PNG file. <a href=#refsPNG>[PNG]</a> <a href=#refsRFC2397>[RFC2397]</a></p>
   <p>If the canvas has no pixels (i.e. either its horizontal dimension
   or its vertical dimension is zero) then the method must return the
-  string "<code title="">data:,</code>". (This is the shortest <code title="">data:</code> URL; it represents the empty string in a <code title="">text/plain</code> resource.)</p>
+  string "<code title="">data:,</code>". (This is the shortest <a href=#data-protocol title="data protocol"><code title="">data:</code> URL</a>; it
+  represents the empty string in a <code title="">text/plain</code>
+  resource.)</p>
   <p>When the <code title=dom-canvas-toDataURL><a href=#dom-canvas-todataurl>toDataURL(<var title="">type</var>)</a></code> method is called with one <em>or
-  more</em> arguments, it must return a <code title="">data:</code>
-  URL containing a representation of the image in the format given by
-  <var title="">type</var>. The possible values are <a href=#mime-type title="MIME
+  more</em> arguments, it must return a <a href=#data-protocol title="data
+  protocol"><code title="">data:</code> URL</a> containing a
+  representation of the image in the format given by <var title="">type</var>. The possible values are <a href=#mime-type title="MIME
   type">MIME types</a> with no parameters, for example
   <code>image/png</code>, <code>image/jpeg</code>, or even maybe
   <code>image/svg+xml</code> if the implementation actually keeps
@@ -30857,15 +31286,17 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   <p>For image types that do not support an alpha channel, the image
   must be composited onto a solid black background using the
   source-over operator, and the resulting image must be the one used
-  to create the <code title="">data:</code> URL.</p>
+  to create the <a href=#data-protocol title="data protocol"><code title="">data:</code> URL</a>.</p>
   <p>Only support for <code>image/png</code> is required. User agents
   may support other types. If the user agent does not support the
   requested type, it must return the image using the PNG format.</p>
-  <p>User agents must <a href=#converted-to-ascii-lowercase title="converted to ASCII lowercase">convert the
-  provided type to ASCII lowercase</a> before establishing if they
-  support that type and before creating the <code title="">data:</code> URL.</p>
+  <p>User agents must <a href=#converted-to-ascii-lowercase title="converted to ASCII
+  lowercase">convert the provided type to ASCII lowercase</a>
+  before establishing if they support that type and before creating
+  the <a href=#data-protocol title="data protocol"><code title="">data:</code>
+  URL</a>.</p>
   </div>
@@ -30907,6 +31338,10 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
   more carefully control compression settings, image metadata,
   etc.</p>
+  <!-- should we explicitly require the URL to be base64-encoded and
+  not have any parameters, to ensure the same exact URL is generated
+  in each browser? -->
   </div>
   <!--2DCONTEXT-->
@@ -31267,9 +31702,9 @@ idea from Mihai:
   the translation distance in the horizontal direction and the <var title="">y</var> argument represents the translation distance in the
   vertical direction. The arguments are in coordinate space units.</p>
-  <p>The <dfn id=dom-context-2d-transform title=dom-context-2d-transform><code>transform(<var title="">a</var>, <var title="">b</var>, <var title="">c</var>, <var title="">d</var>, <var title="">e</var>,
-  <var title="">f</var>)</code></dfn> method must multiply the
-  current transformation matrix with the matrix described by:</p>
+  <p>The <dfn id=dom-context-2d-transform title=dom-context-2d-transform><code>transform(<var title="">a</var>, <var title="">b</var>, <var title="">c</var>, <var title="">d</var>, <var title="">e</var>, <var title="">f</var>)</code></dfn> method must replace the current
+  transformation matrix with the result of multiplying the current
+  transformation matrix with the matrix described by:</p>
   </div>
@@ -31798,6 +32233,17 @@ idea from Mihai:
   stroking or filling effect requires that they be drawn, and are
   affected by the current transformation matrix.</p>
+  <p>If the original image data is a bitmap image, the value painted
+  at a point in the area of the repetitions is computed by filtering
+  the original image data. The user agent may use any filtering
+  algorithm (for example bilinear interpolation or nearest-neighbor).
+  When the filtering algorithm requires a pixel value from outside the
+  original image data, it must instead use the value from wrapping the
+  pixel's coordinates to the original image's dimensions. (That is,
+  the filter uses 'repeat' behavior, regardless of the value of
+  <var title="">repetition</var>.)
+  <!-- drawImage() has a similar paragraph with different rules -->
   <p>When the <code title=dom-context-2d-createPattern><a href=#dom-context-2d-createpattern>createPattern()</a></code> method
   is passed an animated image as its <var title="">image</var>
   argument, the user agent must use the poster frame of the animation,
@@ -33274,10 +33720,6 @@ v5DVT (also check for '- -' bits in the part above) --><p>The <dfn id=dom-contex
   arguments is zero, the implementation must raise an
   <code><a href=#index_size_err>INDEX_SIZE_ERR</a></code> exception.</p>
-  <p>Pixels of the source rectangle that are not entirely within the
-  source image must be treated as transparent black.</p> <!-- see
-  CORE-32111 http://krijnhoetmer.nl/irc-logs/whatwg/20100818#l-737 -->
   <p>The destination rectangle is the rectangle whose corners are the
   four points (<var title="">dx</var>, <var title="">dy</var>),
   (<span title=""><var title="">dx</var>+<var title="">dw</var></span>, <var title="">dy</var>), (<span title=""><var title="">dx</var>+<var title="">dw</var></span>, <span title=""><var title="">dy</var>+<var title="">dh</var></span>), (<var title="">dx</var>, <span title=""><var title="">dy</var>+<var title="">dh</var></span>).</p>
@@ -33304,6 +33746,19 @@ v5DVT (also check for '- -' bits in the part above) --><p>The <dfn id=dom-contex
   back onto the canvas, so it is possible to copy parts of a canvas
   onto overlapping parts of itself.</p>
+  <p>If the original image data is a bitmap image, the value painted
+  at a point in the destination rectangle is computed by filtering the
+  original image data. The user agent may use any filtering algorithm
+  (for example bilinear interpolation or nearest-neighbor). When the
+  filtering algorithm requires a pixel value from outside the original
+  image data, it must instead use the value from the nearest edge
+  pixel. (That is, the filter uses 'clamp-to-edge' behavior.)</p>
+  <!-- see CORE-32111 and:
+       http://krijnhoetmer.nl/irc-logs/whatwg/20100818#l-737
+       http://www.w3.org/Bugs/Public/show_bug.cgi?id=10799#c11
+  -->
+  <!-- createPattern() has a similar paragraph with different rules -->
   <p>When the <code title=dom-context-2d-drawImage><a href=#dom-context-2d-drawimage>drawImage()</a></code> method
   is passed an animated image as its <var title="">image</var>
   argument, the user agent must use the poster frame of the animation,
@@ -34724,11 +35179,12 @@ function AddCloud(data, x, y) { ... }</pre>
   </div>
-  <p>Tables have rows and columns given by their descendants. A table
-  must not have an empty row or column<span class=impl>, as
-  described in the description of the <a href=#table-model>table
-  model</a></span>. <!-- conformance criteria for detecting this
-  are in the table model section --></p>
+  <p>Tables have rows, columns, and cells given by their descendants.
+  The rows and columns form a grid; a table's cells must completely
+  cover that grid without overlap. <span class="impl note">Precise
+  rules for determining whether this conformance requirement is met
+  are described in the description of the <a href=#table-model>table
+  model</a>.</span></p>
   <p id=table-descriptions>For tables that consist of more than just
   a grid of cells with headers in the first row and headers in the
@@ -35876,7 +36332,7 @@ the cell that corresponds to the values of the two dice.
   <p>The <dfn id=dom-th-scope title=dom-th-scope><code>scope</code></dfn> IDL
   attribute must <a href=#reflect>reflect</a> the content attribute of the
-  same name.</p>
+  same name, <a href=#limited-to-only-known-values>limited to only known values</a>.</p>
   </div>
@@ -46326,6 +46782,14 @@ out of 233&thinsp;257&thinsp;824 bytes available&lt;/meter&gt;&lt;/p&gt;</pre>
   <ol><li><p>Let <var title="">target</var> be the element's
    <code><a href=#document>Document</a></code>.</li>
+   <li><p>Let <var title="">target</var> has no <a href=#browsing-context>browsing
+   context</a>, abort these steps.</li>
+   <li><p>Let <var title="">target</var>'s <a href=#browsing-context>browsing
+   context</a> has no <a href=#top-level-browsing-context>top-level browsing context</a> (e.g.
+   it is a <a href=#nested-browsing-context>nested browsing context</a> with no <a href=#parent-browsing-context>parent
+   browsing context</a>), abort these steps.</li>
    <li><p>If <var title="">target</var>'s <a href=#browsing-context>browsing
    context</a> had the <a href=#sandboxed-automatic-features-browsing-context-flag>sandboxed automatic features browsing
    context flag</a> set when <var title="">target</var> was
@@ -46489,11 +46953,11 @@ out of 233&thinsp;257&thinsp;824 bytes available&lt;/meter&gt;&lt;/p&gt;</pre>
   element is a <a href=#concept-submit-button title=concept-submit-button>submit
   button</a> and has such an attribute; or the value of its
   <a href=#form-owner>form owner</a>'s <code title=attr-fs-target><a href=#attr-fs-target>target</a></code>
-  attribute, if <em>it</em> has such an attribute; or, if one of the
-  child nodes of <a href=#the-head-element>the <code>head</code> element</a> is a
-  <code><a href=#the-base-element>base</a></code> element with a <code title=attr-base-target><a href=#attr-base-target>target</a></code> attribute, then the value of
-  the <code title=attr-base-target><a href=#attr-base-target>target</a></code> attribute of the
-  first such <code><a href=#the-base-element>base</a></code> element; or, if there is no such
+  attribute, if <em>it</em> has such an attribute; or, if the
+  <code><a href=#document>Document</a></code> contains a <code><a href=#the-base-element>base</a></code> element with a
+  <code title=attr-base-target><a href=#attr-base-target>target</a></code> attribute, then the
+  value of the <code title=attr-base-target><a href=#attr-base-target>target</a></code> attribute
+  of the first such <code><a href=#the-base-element>base</a></code> element; or, if there is no such
   element, the empty string.</p> <!-- c.f. hyperlink following -->
   <hr><p>The <dfn id=attr-fs-novalidate title=attr-fs-novalidate><code>novalidate</code></dfn>
@@ -47193,12 +47657,17 @@ fur
   <var title="">scripted-submit</var> flag set, the user agent must
   run the following steps:</p>
-  <ol><li id=sandboxSubmitBlocked><p>If <var title="">form</var> is in
-   a <code><a href=#document>Document</a></code> that has no associated <a href=#browsing-context>browsing
-   context</a> or whose <a href=#browsing-context>browsing context</a> had its
-   <a href=#sandboxed-forms-browsing-context-flag>sandboxed forms browsing context flag</a> set when the
-   <code><a href=#document>Document</a></code> was created, then abort these steps without
-   doing anything.</li>
+  <ol><li><p>Let <var title="">form document</var> be the <var title="">form</var>'s <code><a href=#document>Document</a></code>.</li>
+   <li id=sandboxSubmitBlocked><p>If <var title="">form
+   document</var> has no associated <a href=#browsing-context>browsing context</a> or
+   its <a href=#browsing-context>browsing context</a> had its <a href=#sandboxed-forms-browsing-context-flag>sandboxed forms
+   browsing context flag</a> set when the <code><a href=#document>Document</a></code> was
+   created, then abort these steps without doing anything.</li>
+   <li><p>Let <var title="">form browsing context</var> be the
+   <a href=#browsing-context>browsing context</a> of <var title="">form
+   document</var>.</li>
    <li><p>If <var title="">form</var> is already being submitted
    (i.e. the form was <a href=#concept-form-submit title=concept-form-submit>submitted</a> again while processing
@@ -47404,7 +47873,8 @@ fur
    <li>
-    <p>If <var title="">action</var> is the empty string, let <var title="">action</var> be <a href="#the-document's-address">the document's address</a>.</p>
+    <p>If <var title="">action</var> is the empty string, let <var title="">action</var> be <a href="#the-document's-address">the document's address</a> of
+    the <var title="">form document</var>.</p>
     <p class=note>This step is a <a href=#willful-violation>willful violation</a> of
     RFC 3986, which would require base URL processing here. This
@@ -47435,6 +47905,19 @@ fur
    <li><p>Let <var title="">target</var> be the <var title="">submitter</var> element's <a href=#concept-fs-target title=concept-fs-target>target</a>.</li>
+   <li><p>If the user indicated a specific <a href=#browsing-context>browsing
+   context</a> to use when submitting the form, then let <var title="">target browsing context</var> be that <a href=#browsing-context>browsing
+   context</a>. Otherwise, apply <a href=#the-rules-for-choosing-a-browsing-context-given-a-browsing-context-name>the rules for choosing a
+   browsing context given a browsing context name</a> using <var title="">target</var> as the name and <var title="">form browsing
+   context</var> as the context in which the algorithm is executed,
+   and let <var title="">target browsing context</var> be the
+   resulting <a href=#browsing-context>browsing context</a>.</li>
+   <li><p>If <var title="">target browsing context</var> was created
+   in the previous step, or if the <var title="">form document</var>
+   has not yet <a href=#completely-loaded>completely loaded</a>, then let <var title="">replace</var> be true. Otherwise, let it be
+   false.</li>
    <li>
     <p>Select the appropriate row in the table below based on the
@@ -47489,13 +47972,11 @@ fur
       replaced by <var title="">query</var> (adding a U+003F QUESTION
       MARK character (?) if appropriate).</p>
-      <p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
-      <p><a href=#navigate>Navigate</a> <var title="">target browsing
-      context</var> to <var title="">destination</var>. If <var title="">target browsing context</var> was newly created for
-      this purpose by the steps above, then it must be navigated with
-      <a href=#replacement-enabled>replacement enabled</a>.</p>
+      <p><a href=#navigate>Navigate</a><!--DONAV form--> <var title="">target
+      browsing context</var> to <var title="">destination</var>. If
+      <var title="">replace</var> is true, then <var title="">target
+      browsing context</var> must be navigated with <a href=#replacement-enabled>replacement
+      enabled</a>.</p>
      </dd>
@@ -47506,9 +47987,6 @@ fur
       the <var title="">form data set</var> using the
       <a href=#appropriate-form-encoding-algorithm>appropriate form encoding algorithm</a>.</p>
-      <p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
       <p>Let <var title="">MIME type</var> be determined as
       follows:</p>
@@ -47524,17 +48002,15 @@ fur
        <dd>Let <var title="">MIME type</var> be "<code title="">text/plain</code>".</dd>
-      </dl><p>If <var title="">method</var> is anything but <!--GET or-->
-      POST, and the <a href=#origin>origin</a> of <var title="">action</var>
-      is not the <a href=#same-origin>same origin</a> as that of the
-      <code><a href=#the-form-element>form</a></code> element's <code><a href=#document>Document</a></code>, then abort
-      these steps.</p> <!-- CORS, one day -->
-      <p>Otherwise, <a href=#navigate>navigate</a> <var title="">target
-      browsing context</var> to <var title="">action</var> using the
-      HTTP method given by <var title="">method</var> and with <var title="">entity body</var> as the entity body, of type <var title="">MIME type</var>. If <var title="">target browsing
-      context</var> was newly created for this purpose by the steps
-      above, then it must be navigated with <a href=#replacement-enabled>replacement
+      </dl><!--<p>If <var title="">method</var> is anything but (GET or)
+      POST, and the <span>origin</span> of <var title="">action</var>
+      is not the <span>same origin</span> as that of <var
+      title="">form document</var>, then abort these steps.</p> [or do
+      CORS] (this is commented out since only POST can trigger this
+      now, and that's historically unrestricted)--><p>Otherwise, <a href=#navigate>navigate</a><!--DONAV form--> <var title="">target browsing context</var> to <var title="">action</var> using the HTTP method given by <var title="">method</var> and with <var title="">entity body</var>
+      as the entity body, of type <var title="">MIME type</var>. If
+      <var title="">replace</var> is true, then <var title="">target
+      browsing context</var> must be navigated with <a href=#replacement-enabled>replacement
       enabled</a>.</p>
      </dd>
@@ -47542,13 +48018,10 @@ fur
      <dt><dfn id=submit-get-action title=submit-get-action>Get action</dfn>
      <dd>
-      <p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
-      <p><a href=#navigate>Navigate</a> <var title="">target browsing
-      context</var> to <var title="">action</var>. If <var title="">target browsing context</var> was newly created for
-      this purpose by the steps above, then it must be navigated with
-      <a href=#replacement-enabled>replacement enabled</a>.</p>
+      <p><a href=#navigate>Navigate</a><!--DONAV form--> <var title="">target
+      browsing context</var> to <var title="">action</var>. If <var title="">replace</var> is true, then <var title="">target
+      browsing context</var> must be navigated with <a href=#replacement-enabled>replacement
+      enabled</a>.</p>
      </dd>
@@ -47575,13 +48048,10 @@ fur
       string, replace the first occurrence of "<code title="">%%</code>" in <var title="">action</var> with the
       resulting escaped string. <a href=#refsRFC3986>[RFC3986]</a></p>
-      <p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
-      <p><a href=#navigate>Navigate</a> <var title="">target browsing
-      context</var> to the potentially modified <var title="">action</var>. If <var title="">target browsing
-      context</var> was newly created for this purpose by the steps
-      above, then it must be navigated with <a href=#replacement-enabled>replacement
+      <p><a href=#navigate>Navigate</a><!--DONAV form--> <var title="">target
+      browsing context</var> to the potentially modified <var title="">action</var> (which will be a <a href=#data-protocol title="data
+      protocol"><code title="">data:</code> URL</a>). If <var title="">replace</var> is true, then <var title="">target
+      browsing context</var> must be navigated with <a href=#replacement-enabled>replacement
       enabled</a>.</p>
      </dd>
@@ -47605,13 +48075,11 @@ fur
       <p>Append <var title="">headers</var> to <var title="">destination</var>.</p>
-      <p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
-      <p><a href=#navigate>Navigate</a> <var title="">target browsing
-      context</var> to <var title="">destination</var>. If <var title="">target browsing context</var> was newly created for
-      this purpose by the steps above, then it must be navigated with
-      <a href=#replacement-enabled>replacement enabled</a>.</p>
+      <p><a href=#navigate>Navigate</a><!--DONAV form--> <var title="">target
+      browsing context</var> to <var title="">destination</var>. If
+      <var title="">replace</var> is true, then <var title="">target
+      browsing context</var> must be navigated with <a href=#replacement-enabled>replacement
+      enabled</a>.</p>
      </dd>
@@ -47638,28 +48106,15 @@ fur
       <p>Append <var title="">body</var>, interpreted as a US-ASCII
       string, to <var title="">destination</var>.</p>
-      <p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
-      <p><a href=#navigate>Navigate</a> <var title="">target browsing
-      context</var> to <var title="">destination</var>. If <var title="">target browsing context</var> was newly created for
-      this purpose by the steps above, then it must be navigated with
-      <a href=#replacement-enabled>replacement enabled</a>.</p>
+      <p><a href=#navigate>Navigate</a><!--DONAV form--> <var title="">target
+      browsing context</var> to <var title="">destination</var>. If
+      <var title="">replace</var> is true, then <var title="">target
+      browsing context</var> must be navigated with <a href=#replacement-enabled>replacement
+      enabled</a>.</p>
      </dd>
-    </dl><p><dfn id=the-form-submission-target-browsing-context>The form submission target browsing context</dfn> is
-    obtained, when needed by the behaviors described above, as
-    follows: If the user indicated a specific <a href=#browsing-context>browsing
-    context</a> to use when submitting the form, then that is the
-    target browsing context. Otherwise, apply <a href=#the-rules-for-choosing-a-browsing-context-given-a-browsing-context-name>the rules for
-    choosing a browsing context given a browsing context name</a>
-    using <var title="">target</var> as the name and the
-    <a href=#browsing-context>browsing context</a> of <var title="">form</var> as the
-    context in which the algorithm is executed; the resulting
-    <a href=#browsing-context>browsing context</a> is the target browsing context.</p>
-    <p>The <dfn id=appropriate-form-encoding-algorithm>appropriate form encoding algorithm</dfn> is
+    </dl><p>The <dfn id=appropriate-form-encoding-algorithm>appropriate form encoding algorithm</dfn> is
     determined as follows:</p>
     <dl><dt>If <var title="">enctype</var> is <code title=attr-fs-enctype-urlencoded><a href=#attr-fs-enctype-urlencoded>application/x-www-form-urlencoded</a></code></dt>
@@ -49685,16 +50140,17 @@ local.onconnect = function (event) {
   the user agent must <a href=#resolve-a-url title="resolve a url">resolve</a> the
   <a href=#url>URL</a> given by the <code title=attr-hyperlink-href><a href=#attr-hyperlink-href>href</a></code> attribute of that element,
   relative to that element, and if that is successful, must
-  <a href=#navigate>navigate</a> a <a href=#browsing-context>browsing context</a> to the
-  resulting <a href=#absolute-url>absolute URL</a>. In the case of server-side
-  image maps, that <a href=#absolute-url>absolute URL</a> must have its
-  <var><a href=#hyperlink-suffix>hyperlink suffix</a></var> appended to it before the navigation is
-  started.</p>
+  <a href=#navigate>navigate</a><!--DONAV hyperlink--> a <a href=#browsing-context>browsing
+  context</a> to the resulting <a href=#absolute-url>absolute URL</a>. In the
+  case of server-side image maps, that <a href=#absolute-url>absolute URL</a> must
+  have its <var><a href=#hyperlink-suffix>hyperlink suffix</a></var> appended to it before the
+  navigation is started.</p>
   <p>If <a href=#resolve-a-url title="resolve a url">resolving</a> the
   <a href=#url>URL</a> fails, the user agent may report the error to the
-  user in a user-agent-specific manner, may navigate to an error page
-  to report the error, or may ignore the error and do nothing.</p>
+  user in a user-agent-specific manner, may
+  <a href=#navigate>navigate</a><!--DONAV hyperlink--> to an error page to
+  report the error, or may ignore the error and do nothing.</p>
   <p>If the user indicated a specific <a href=#browsing-context>browsing context</a>
   when following the hyperlink, or if the user agent is configured to
@@ -49717,15 +50173,16 @@ local.onconnect = function (event) {
   as the browsing context to be navigated.</p>
   <p>Otherwise, if the element is an <code><a href=#the-a-element>a</a></code> or
-  <code><a href=#the-area-element>area</a></code> element with no <code title=attr-hyperlink-target><a href=#attr-hyperlink-target>target</a></code> attribute, but one of
-  the child nodes of <a href=#the-head-element>the <code>head</code> element</a> is a
-  <code><a href=#the-base-element>base</a></code> element with a <code title=attr-base-target><a href=#attr-base-target>target</a></code> attribute, then the browsing
-  context that is navigated must be chosen by applying <a href=#the-rules-for-choosing-a-browsing-context-given-a-browsing-context-name>the rules
-  for choosing a browsing context given a browsing context
-  name</a>, using the value of the <code title=attr-base-target><a href=#attr-base-target>target</a></code> attribute of the first such
+  <code><a href=#the-area-element>area</a></code> element with no <code title=attr-hyperlink-target><a href=#attr-hyperlink-target>target</a></code> attribute, but the
+  <code><a href=#document>Document</a></code> contains a <code><a href=#the-base-element>base</a></code> element with a
+  <code title=attr-base-target><a href=#attr-base-target>target</a></code> attribute, then the
+  browsing context that is navigated must be chosen by applying
+  <a href=#the-rules-for-choosing-a-browsing-context-given-a-browsing-context-name>the rules for choosing a browsing context given a browsing
+  context name</a>, using the value of the <code title=attr-base-target><a href=#attr-base-target>target</a></code> attribute of the first such
   <code><a href=#the-base-element>base</a></code> element as the browsing context name. If these
   rules result in the creation of a new <a href=#browsing-context>browsing context</a>,
   it must be navigated with <a href=#replacement-enabled>replacement enabled</a>.</p>
+  <!-- c.f. concept-fs-target -->
   <p>Otherwise, the browsing context that must be navigated is the
   same browsing context as the one which the element itself is in.</p>
@@ -55866,7 +56323,7 @@ END:VCARD</pre>
  &lt;dt&gt;Title&lt;/dt&gt;
  &lt;dd&gt;&lt;cite itemprop="http://purl.org/dc/terms/title"&gt;Just a Geek&lt;/cite&gt;&lt;/dd&gt;
  &lt;dt&gt;By&lt;/dt&gt;
- &lt;dd&gt;&lt;span itemprop="http://purl.org/dc/terms/creator"&gt;Wil Wheaton&lt;/span&gt;&lt;/dd&gt;
+ &lt;dd&gt;&lt;span itemprop="http://purl.org/dc/elements/1.1/creator"&gt;Wil Wheaton&lt;/span&gt;&lt;/dd&gt;
  &lt;dt&gt;Format&lt;/dt&gt;
  &lt;dd itemprop="http://purl.org/vocab/frbr/core#realization"
      itemscope
@@ -55886,20 +56343,21 @@ END:VCARD</pre>
    <p>This is equivalent to the following Turtle:</p>
-  <pre class=turtle>@prefix dc: &lt;http://purl.org/dc/terms/&gt; .
+  <pre class=turtle>@prefix dct: &lt;http://purl.org/dc/terms/&gt; .
+ @prefix dce: &lt;http://purl.org/dc/elements/1.1/&gt; .
  @prefix frbr: &lt;http://purl.org/vocab/frbr/core#&gt; .
 &lt;http://purl.oreilly.com/works/45U8QJGZSQKDH8N&gt; a frbr:Work ;
-     dc:creator "Wil Wheaton"@en ;
-     dc:title "Just a Geek"@en ;
+     dce:creator "Wil Wheaton"@en ;
+     dct:title "Just a Geek"@en ;
      frbr:realization &lt;http://purl.oreilly.com/products/9780596007683.BOOK&gt;,
          &lt;http://purl.oreilly.com/products/9780596802189.EBOOK&gt; .
 &lt;http://purl.oreilly.com/products/9780596007683.BOOK&gt; a frbr:Expression ;
-     dc:type &lt;http://purl.oreilly.com/product-types/BOOK&gt; .
+     dct:type &lt;http://purl.oreilly.com/product-types/BOOK&gt; .
 &lt;http://purl.oreilly.com/products/9780596802189.EBOOK&gt; a frbr:Expression ;
-     dc:type &lt;http://purl.oreilly.com/product-types/EBOOK&gt; .</pre>
+     dct:type &lt;http://purl.oreilly.com/product-types/EBOOK&gt; .</pre>
   </div>
@@ -56612,36 +57070,43 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
   <p>Certain elements (for example, <code><a href=#the-iframe-element>iframe</a></code> elements) can
   instantiate further <a href=#browsing-context title="browsing context">browsing
   contexts</a>. These are called <dfn id=nested-browsing-context title="nested browsing
-  context">nested browsing contexts</dfn>. If a browsing context <var title="">P</var> has an element <var title="">E</var> in one of its
-  <code><a href=#document>Document</a></code>s <var title="">D</var> that nests another
-  browsing context <var title="">C</var> inside it, then <var title="">P</var> is said to be the <dfn id=parent-browsing-context>parent browsing
-  context</dfn> of <var title="">C</var>, <var title="">C</var> is
-  said to be a <dfn id=child-browsing-context>child browsing context</dfn> of <var title="">P</var>, <var title="">C</var> is said to be <dfn id=browsing-context-nested-through title="browsing context nested through">nested through</dfn> <var title="">D</var>, and <var title="">E</var> is said to be the
-  <dfn id=browsing-context-container>browsing context container</dfn> of <var title="">C</var>.</p>
-  <p>A browsing context <var title="">A</var> is said to be an
-  ancestor of a browsing context <var title="">B</var> if there exists
-  a browsing context <var title="">A'</var> that is a <a href=#child-browsing-context>child
-  browsing context</a> of <var title="">A</var> and that is itself
-  an ancestor of <var title="">B</var>, or if there is a browsing
-  context <var title="">P</var> that is a <a href=#child-browsing-context>child browsing
-  context</a> of <var title="">A</var> and that is the <a href=#parent-browsing-context>parent
-  browsing context</a> of <var title="">B</var>.</p>
-  <p>The browsing context with no <a href=#parent-browsing-context>parent browsing context</a>
-  is the <dfn id=top-level-browsing-context>top-level browsing context</dfn> of all the browsing
-  contexts <a href=#nested-browsing-context title="nested browsing context">nested</a> within
-  it (either directly or indirectly through other nested browsing
-  contexts).</p>
+  context">nested browsing contexts</dfn>. If a browsing context <var title="">P</var> has a <code><a href=#document>Document</a></code>s <var title="">D</var>
+  with an element <var title="">E</var> that nests another browsing
+  context <var title="">C</var> inside it, then <var title="">C</var>
+  is said to be <dfn id=browsing-context-nested-through title="browsing context nested through">nested
+  through</dfn> <var title="">D</var>, and <var title="">E</var> is
+  said to be the <dfn id=browsing-context-container>browsing context container</dfn> of <var title="">C</var>. If the <a href=#browsing-context-container>browsing context container</a>
+  element <var title="">E</var> is <a href=#in-a-document title="in a
+  Document">in</a> the <code><a href=#document>Document</a></code> <var title="">D</var>,
+  then <var title="">P</var> is said to be the <dfn id=parent-browsing-context>parent browsing
+  context</dfn> of <var title="">C</var> and <var title="">C</var> is
+  said to be a <dfn id=child-browsing-context>child browsing context</dfn> of <var title="">P</var>. Otherwise, the <a href=#nested-browsing-context>nested browsing
+  context</a> <var title="">C</var> has no <a href=#parent-browsing-context>parent browsing
+  context</a>.</p>
+  <p>A browsing context <var title="">A</var> is said to be an <dfn id=ancestor-browsing-context title="ancestor browsing context">ancestor</dfn> of a browsing
+  context <var title="">B</var> if there exists a browsing context
+  <var title="">A'</var> that is a <a href=#child-browsing-context>child browsing context</a>
+  of <var title="">A</var> and that is itself an <a href=#ancestor-browsing-context title="ancestor
+  browsing context">ancestor</a> of <var title="">B</var>, or if
+  there is a browsing context <var title="">P</var> that is a
+  <a href=#child-browsing-context>child browsing context</a> of <var title="">A</var> and
+  that is the <a href=#parent-browsing-context>parent browsing context</a> of <var title="">B</var>.</p>
+  <p>A browsing context that is not a <a href=#nested-browsing-context>nested browsing
+  context</a> has no <a href=#parent-browsing-context>parent browsing context</a>, and is
+  the <dfn id=top-level-browsing-context>top-level browsing context</dfn> of all the browsing
+  contexts for which it is an <a href=#ancestor-browsing-context>ancestor browsing
+  context</a>.</p>
   <p>The transitive closure of <a href=#parent-browsing-context title="parent browsing
   context">parent browsing contexts</a> for a <a href=#nested-browsing-context>nested browsing
-  context</a> gives the list of <dfn id=ancestor-browsing-context title="ancestor browsing
-  context">ancestor browsing contexts</dfn>.</p>
+  context</a> gives the list of <a href=#ancestor-browsing-context title="ancestor browsing
+  context">ancestor browsing contexts</a>.</p>
   <p>The <dfn id=list-of-the-descendant-browsing-contexts>list of the descendant browsing contexts</dfn> of a
-  <code><a href=#document>Document</a></code> <var title="">d</var> is the list returned by
-  the following algorithm:</p>
+  <code><a href=#document>Document</a></code> <var title="">d</var> is the (ordered) list
+  returned by the following algorithm:</p>
   <ol><li><p>Let <var title="">list</var> be an empty list.</li>
@@ -56656,12 +57121,13 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
    <li><p>Return the constructed <var title="">list</var>.</li>
-  </ol><hr><p>A <code><a href=#document>Document</a></code> is said to be <dfn id=fully-active>fully active</dfn>
+  </ol><p>A <code><a href=#document>Document</a></code> is said to be <dfn id=fully-active>fully active</dfn>
   when it is the <a href=#active-document>active document</a> of its <a href=#browsing-context>browsing
   context</a>, and either its browsing context is a <a href=#top-level-browsing-context>top-level
-  browsing context</a>, or the <code><a href=#document>Document</a></code> <a href=#browsing-context-nested-through title="browsing context nested through">through which</a> that
-  browsing context is <a href=#nested-browsing-context title="nested browsing
-  context">nested</a> is itself <a href=#fully-active>fully active</a>.</p>
+  browsing context</a>, or it has a <a href=#parent-browsing-context>parent browsing
+  context</a> and the <code><a href=#document>Document</a></code> <a href=#browsing-context-nested-through title="browsing
+  context nested through">through which</a> it is <a href=#nested-browsing-context title="nested browsing context">nested</a> is itself <a href=#fully-active>fully
+  active</a>.</p>
   <p>Because they are nested through an element, <a href=#child-browsing-context title="child
   browsing context">child browsing contexts</a> are always tied to
@@ -56675,6 +57141,22 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
   browsing context flag</a> set, if it is embedded through an
   <code><a href=#the-iframe-element>iframe</a></code> element with a <code title=attr-iframe-seamless><a href=#attr-iframe-seamless>seamless</a></code> attribute.</p>
+  <p class=note>A <a href=#nested-browsing-context>nested browsing context</a> can in some
+  cases be taken out of its <a href=#parent-browsing-context>parent browsing context</a> (e.g.
+  if an <code><a href=#the-iframe-element>iframe</a></code> element is removed from its
+  <code><a href=#document>Document</a></code>). In such a situation, the <a href=#nested-browsing-context>nested
+  browsing context</a> has no <a href=#parent-browsing-context>parent browsing context</a>,
+  but it still has the same <a href=#browsing-context-container>browsing context container</a>
+  and is still <a href=#browsing-context-nested-through title="browsing context nested through">nested
+  through</a> that element's <code><a href=#document>Document</a></code>. Such a
+  <a href=#nested-browsing-context>nested browsing context</a> is <em>not</em> a
+  <a href=#top-level-browsing-context>top-level browsing context</a>, and cannot contain
+  <code><a href=#document>Document</a></code>s that are <a href=#fully-active>fully active</a>.
+  Furthermore, if a <a href=#browsing-context-container>browsing context container</a> (such as
+  an <code><a href=#the-iframe-element>iframe</a></code>) is moved to another <code><a href=#document>Document</a></code>,
+  then the <a href=#parent-browsing-context>parent browsing context</a> of its <a href=#nested-browsing-context>nested
+  browsing context</a> will change.</p>
   <h5 id=navigating-nested-browsing-contexts-in-the-dom><span class=secno>6.1.1.1 </span>Navigating nested browsing contexts in the DOM</h5>
@@ -56713,8 +57195,10 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
   <a href=#browsing-context>browsing context</a> <var title="">b</var> must return the
   <code><a href=#windowproxy>WindowProxy</a></code> object of its <a href=#top-level-browsing-context>top-level browsing
   context</a> (which would be its own <code><a href=#windowproxy>WindowProxy</a></code>
-  object if it was a <a href=#top-level-browsing-context>top-level browsing context</a>
-  itself).</p>
+  object if it was a <a href=#top-level-browsing-context>top-level browsing context</a> itself),
+  if it has one, or its own <code><a href=#windowproxy>WindowProxy</a></code> object otherwise
+  (e.g. if it was a detached <a href=#nested-browsing-context>nested browsing
+  context</a>).</p>
   <p>The <dfn id=dom-parent title=dom-parent><code>parent</code></dfn> IDL
   attribute on the <code><a href=#window>Window</a></code> object of a
@@ -56723,7 +57207,8 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
   <var title="">b</var> is a <a href=#child-browsing-context>child browsing context</a>), or
   the <code><a href=#windowproxy>WindowProxy</a></code> object of the <a href=#browsing-context>browsing
   context</a> <var title="">b</var> itself, otherwise (i.e. if it
-  is a <a href=#top-level-browsing-context>top-level browsing context</a>).</p>
+  is a <a href=#top-level-browsing-context>top-level browsing context</a> or a detached
+  <a href=#nested-browsing-context>nested browsing context</a>).</p>
   <p>The <dfn id=dom-frameelement title=dom-frameElement><code>frameElement</code></dfn>
   IDL attribute on the <code><a href=#window>Window</a></code> object of a
@@ -56731,11 +57216,11 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
   the following algorithm:</p>
   <ol><li><p>If <var title="">d</var> is not a <code><a href=#document>Document</a></code> in a
-   <a href=#child-browsing-context>child browsing context</a>, return null and abort these
+   <a href=#nested-browsing-context>nested browsing context</a>, return null and abort these
    steps.</li>
-   <li><p>If the <a href=#parent-browsing-context>parent browsing context</a>'s <a href=#active-document>active
-   document</a> does not have the <a href=#same-origin title="same
+   <li><p>If the <a href=#browsing-context-container>browsing context container</a>'s
+   <code><a href=#document>Document</a></code> does not have the <a href=#same-origin title="same
    origin">same</a> <a href=#effective-script-origin>effective script origin</a> as the
    <a href=#entry-script>entry script</a>, then throw a <code><a href=#security_err>SECURITY_ERR</a></code>
    exception.</li>
@@ -56757,11 +57242,8 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
   <p>An <a href=#auxiliary-browsing-context>auxiliary browsing context</a> has an <dfn id=opener-browsing-context>opener
   browsing context</dfn>, which is the <a href=#browsing-context>browsing context</a>
-  from which the <a href=#auxiliary-browsing-context>auxiliary browsing context</a> was created,
-  and it has a <dfn id=furthest-ancestor-browsing-context>furthest ancestor browsing context</dfn>, which is
-  the <a href=#top-level-browsing-context>top-level browsing context</a> of the <a href=#opener-browsing-context>opener
-  browsing context</a> when the <a href=#auxiliary-browsing-context>auxiliary browsing
-  context</a> was created.</p>
+  from which the <a href=#auxiliary-browsing-context>auxiliary browsing context</a> was
+  created.</p>
   <h5 id=navigating-auxiliary-browsing-contexts-in-the-dom><span class=secno>6.1.2.1 </span>Navigating auxiliary browsing contexts in the DOM</h5>
@@ -56797,8 +57279,9 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
    document</a> of <var title="">B</var>, or</li>
    <li>The browsing context <var title="">A</var> is a <a href=#nested-browsing-context>nested
-   browsing context</a> and its <a href=#top-level-browsing-context>top-level browsing
-   context</a> is <var title="">B</var>, or</li>
+   browsing context</a> with a <a href=#top-level-browsing-context>top-level browsing
+   context</a>, and its <a href=#top-level-browsing-context>top-level browsing context</a> is
+   <var title="">B</var>, or</li>
    <li>The browsing context <var title="">B</var> is an
    <a href=#auxiliary-browsing-context>auxiliary browsing context</a> and <var title="">A</var>
@@ -56856,8 +57339,9 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
   <p>Each <a href=#unit-of-related-browsing-contexts>unit of related browsing contexts</a> is then
   further divided into the smallest number of groups such that every
-  member of each group has an <a href=#effective-script-origin>effective script origin</a>
-  that, through appropriate manipulation of the <code title=dom-document-domain><a href=#dom-document-domain>document.domain</a></code> attribute, could
+  member of each group has an <a href=#active-document>active document</a> with an
+  <a href=#effective-script-origin>effective script origin</a> that, through appropriate
+  manipulation of the <code title=dom-document-domain><a href=#dom-document-domain>document.domain</a></code> attribute, could
   be made to be the same as other members of the group, but could not
   be made the same as members of any other group. Each such group is a
   <dfn id=unit-of-related-similar-origin-browsing-contexts>unit of related similar-origin browsing contexts</dfn>.</p>
@@ -56910,8 +57394,8 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
    context must be the current browsing context.</li>
    <li><p>If the given browsing context name is <code title="">_top</code>, then the chosen browsing context must be the
-   most <a href=#top-level-browsing-context>top-level browsing context</a> of the current
-   one.</li>
+   <a href=#top-level-browsing-context>top-level browsing context</a> of the current one, if
+   there is one, or else the current browsing context.</li>
    <li>
@@ -56978,9 +57462,8 @@ _:n2  hcard:adr%20street-address "Avenue Q" ;
      no name). The chosen browsing context must be this new browsing
      context.</p>
-     <p>If it is immediately <a href=#navigate title=navigate>navigated</a>,
-     then the navigation will be done with <a href=#replacement-enabled>replacement
-     enabled</a>.</dd>
+     <p class=note>If it is immediately <a href=#navigate title=navigate>navigated</a>, then the navigation will be
+     done with <a href=#replacement-enabled>replacement enabled</a>.</dd>
      <dt>If the user agent has been configured such that in this
@@ -57333,15 +57816,14 @@ interface <dfn id=window>Window</dfn> {
   agent could override the selection of the target browsing context to
   instead target a new tab.</p>
-  <p>Then, the user agent must <a href=#navigate>navigate</a> the selected
-  <a href=#browsing-context>browsing context</a> to the <a href=#absolute-url>absolute URL</a> (or
-  error) obtained from <a href=#resolve-a-url title="resolve a url">resolving</a>
-  <var title="">url</var> earlier. If the <var title="">replace</var>
-  is true, then <a href=#replacement-enabled title="replacement enabled">replacement must be
-  enabled</a>; otherwise, it must not be enabled unless the
-  <a href=#browsing-context>browsing context</a> was just created as part of
-  <a href=#the-rules-for-choosing-a-browsing-context-given-a-browsing-context-name>the rules for choosing a browsing context given a browsing
-  context name</a>. The navigation must be done with the <a href="#script's-browsing-context" title="script's browsing context">browsing context</a> of the
+  <p>Then, the user agent must <a href=#navigate>navigate</a><!--DONAV
+  window.open()--> the selected <a href=#browsing-context>browsing context</a> to the
+  <a href=#absolute-url>absolute URL</a> (or error) obtained from <a href=#resolve-a-url title="resolve a url">resolving</a> <var title="">url</var>
+  earlier. If the <var title="">replace</var> is true or if the
+  <a href=#browsing-context>browsing context</a> was just created as part of <a href=#the-rules-for-choosing-a-browsing-context-given-a-browsing-context-name>the
+  rules for choosing a browsing context given a browsing context
+  name</a>, then <a href=#replacement-enabled title="replacement enabled">replacement must
+  be enabled</a>. The navigation must be done with the <a href="#script's-browsing-context" title="script's browsing context">browsing context</a> of the
   <a href=#entry-script>entry script</a> as the <a href=#source-browsing-context>source browsing
   context</a>.</p>
@@ -57847,6 +58329,7 @@ x === this; // true</pre>
    </dd>
    <dt>For scripts</dt>
    <dd>
@@ -57924,6 +58407,7 @@ x === this; // true</pre>
    </dd>
    <dt>For <code><a href=#document>Document</a></code> objects and images</dt>
    <dd>
@@ -57940,13 +58424,6 @@ x === this; // true</pre>
      assigned when the <code><a href=#document>Document</a></code> is created.</dd>
-     <dt>If a <code><a href=#document>Document</a></code> or image was returned by the
-     <code>XMLHttpRequest</code> API</dt>
-     <dd>The <a href=#origin>origin</a> is equal to the <span>XMLHttpRequest
-     origin</span> of the <code>XMLHttpRequest</code> object. <a href=#refsXHR>[XHR]</a></dd>
      <dt>If a <code><a href=#document>Document</a></code> or image was generated from a
      <a href=#javascript-protocol title="javascript protocol"><code>javascript:</code>
      URL</a></dt>
@@ -57967,17 +58444,20 @@ x === this; // true</pre>
      <dt>If a <code><a href=#document>Document</a></code> or image was generated from a
-     <code title="">data:</code> URL that was returned as the location
-     of an HTTP redirect (<a href=#concept-http-equivalent-codes title=concept-http-equivalent-codes>or equivalent</a> in
-     other protocols)</dt>
+     <a href=#data-protocol title="data protocol"><code title="">data:</code>
+     URL</a> that was returned as the location of an HTTP redirect
+     (<a href=#concept-http-equivalent-codes title=concept-http-equivalent-codes>or equivalent</a>
+     in other protocols)</dt>
      <dd>The <a href=#origin>origin</a> is the <a href=#origin>origin</a> of the
-     <a href=#url>URL</a> that redirected to the <code title="">data:</code> URL.</dd>
+     <a href=#url>URL</a> that redirected to the <a href=#data-protocol title="data
+     protocol"><code title="">data:</code> URL</a>.</dd>
      <dt>If a <code><a href=#document>Document</a></code> or image was generated from a
-     <code title="">data:</code> URL found in another
-     <code><a href=#document>Document</a></code> or in a script</dt>
+     <a href=#data-protocol title="data protocol"><code title="">data:</code>
+     URL</a> found in another <code><a href=#document>Document</a></code> or in a
+     script</dt>
      <dd>The <a href=#origin>origin</a> is the <a href=#origin>origin</a> of the
      <code><a href=#document>Document</a></code> or script that initiated the <a href=#navigate title=navigate>navigation</a> to that <a href=#url>URL</a>.</dd>
@@ -58000,8 +58480,8 @@ x === this; // true</pre>
      <dt>If a <code><a href=#document>Document</a></code> or image was obtained in some
-     other manner (e.g. a <code title="">data:</code> URL typed in by
-     the user, a <code><a href=#document>Document</a></code> created using the <code title=dom-DOMImplementation-createDocument><a href=#dom-domimplementation-createdocument>createDocument()</a></code>
+     other manner (e.g. a <a href=#data-protocol title="data protocol"><code title="">data:</code> URL</a> typed in by the user, a
+     <code><a href=#document>Document</a></code> created using the <code title=dom-DOMImplementation-createDocument><a href=#dom-domimplementation-createdocument>createDocument()</a></code>
      API, etc)</dt>
      <dd>The <a href=#origin>origin</a> is a globally unique identifier
@@ -58014,6 +58494,7 @@ x === this; // true</pre>
    </dd>
    <dt>For <code><a href=#audio>audio</a></code> and <code><a href=#video>video</a></code> elements</dt>
    <dd>
@@ -58029,7 +58510,20 @@ x === this; // true</pre>
    </dd>
-  </dl><p>The <dfn id=unicode-serialization-of-an-origin>Unicode serialization of an origin</dfn> is the string
+  </dl><p>Other specifications can override the above definitions by
+  themselves specifying the origin of a particular URL, script,
+  <code><a href=#document>Document</a></code>, or image.</p>
+  <!-- e.g.:
+    <p>The <span>origin</span> of a <code>Document</code> object
+    returned by the <code>XMLHttpRequest</code> API is equal to the
+    <span>XMLHttpRequest origin</span> of the
+    <code>XMLHttpRequest</code> object.</p>
+  -->
+  <hr><p>The <dfn id=unicode-serialization-of-an-origin>Unicode serialization of an origin</dfn> is the string
   obtained by applying the following algorithm to the given
   <a href=#origin>origin</a>:</p>
@@ -58530,7 +59024,7 @@ x === this; // true</pre>
    <a href=#refused-to-allow-the-document-to-be-unloaded>refused to allow the document to be unloaded</a>, then
    abort these steps.</li>
-   <li><p><a href=#unload-a-document title="unload a document">Unload</a> the the
+   <li><p><a href=#unload-a-document title="unload a document">Unload</a> the
    <a href=#active-document>active document</a> of the <var title="">specified
    browsing context</var> with the <var title="">recycle</var>
    parameter set to false.</li>
@@ -58647,6 +59141,21 @@ x === this; // true</pre>
    </li>
+   <li>
+     <p>If the <a href=#current-document-readiness>current document readiness</a> is not yet set
+     to the string "complete", let the <code><a href=#document>Document</a></code>'s
+     <a href=#pending-state-object>pending state object</a> be another <a href=#structured-clone>structured
+     clone</a> of the specified <var title="">data</var>. (If there
+     was already a <a href=#pending-state-object>pending state object</a>, the previous one
+     is discarded.)</p>
+     <p class=note>This ensures that the <code title=event-popstate><a href=#event-popstate>popstate</a></code> event that will be fired
+     when the document finally loads will accurately reflect the
+     pushed or replaced state object.</p>
+   </li>
   </ol><p class=note>The <var title="">title</var> is purely
   advisory. User agents might use the title in the user interface.</p>
@@ -58862,41 +59371,34 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
   address">the current address</a> of the associated
   <code><a href=#document>Document</a></code> object, as an <a href=#absolute-url>absolute URL</a>.</p>
-  <p>On setting, <!-- READ ME WHEN EDITING THIS: Mozilla does this,
-  but IE doesn't. What should we do?: the behavior depends on the
-  context in which the script that set the attribute is running. If
-  the script ran as the direct result of the execution of a
-  <code>script</code> element in the document represented by the
-  <code>Location</code> object's associated <code>Document</code>
-  object, then the user agent must act as if the <code
-  title="dom-location-replace">replace()</code> method had been called
-  with the new value as its argument. Otherwise,--> the user agent
-  must act as if the <code title=dom-location-assign><a href=#dom-location-assign>assign()</a></code>
-  method had been called with the new value as its argument.</p><!--
-  v2: may wish to allow replace instead as a UI improvement -->
-  <!-- we could change the magic .location setter to simply refer
-  straight to assign(), so we don't have two levels of indirection -->
+  <p>On setting, if the <code><a href=#location>Location</a></code> object's associated
+  <code><a href=#document>Document</a></code> object has <a href=#completely-loaded>completely loaded</a>,
+  then the user agent must act as if the <code title=dom-location-assign><a href=#dom-location-assign>assign()</a></code> method had been called
+  with the new value as its argument. Otherwise, the user agent must
+  act as if the <code title=dom-location-replace><a href=#dom-location-replace>replace()</a></code>
+  method had been called with the new value as its argument.</p>
+  <!--DONAV location.href, defined in terms of the paragraphs below-->
   <p>When the <dfn id=dom-location-assign title=dom-location-assign><code>assign(<var title="">url</var>)</code></dfn> method is invoked, the UA must
   <a href=#resolve-a-url title="resolve a url">resolve</a> the argument, relative to
   the <a href=#entry-script>entry script</a>'s <a href="#script's-base-url" title="script's base URL">base
-  URL</a>, and if that is successful, must <a href=#navigate>navigate</a>
-  the <a href=#browsing-context>browsing context</a> to the specified <var title="">url</var>. If the <a href=#browsing-context>browsing context</a>'s
+  URL</a>, and if that is successful, must
+  <a href=#navigate>navigate</a><!--DONAV location.href/assign--> the
+  <a href=#browsing-context>browsing context</a> to the specified <var title="">url</var>. If the <a href=#browsing-context>browsing context</a>'s
   <a href=#session-history>session history</a> contains only one
   <code><a href=#document>Document</a></code>, and that was the <code><a href=#about:blank>about:blank</a></code>
   <code><a href=#document>Document</a></code> created when the <a href=#browsing-context>browsing context</a>
-  was created, then the navigation must be done with
-  <a href=#replacement-enabled>replacement enabled</a>.</p> <!-- READ ME WHEN EDITING
-  THIS: IE and Firefox only seem to treat it that way if the DOM is
-  still a virgin DOM; Safari doesn't check that. Thus this might need
-  changing if testing shows the IE/Firefox behaviour is required
-  here. -->
+  was created, then the navigation must be done with <a href=#replacement-enabled>replacement
+  enabled</a>.</p> <!-- READ ME WHEN EDITING THIS: IE and Firefox
+  only seem to treat it that way if the DOM is still a virgin DOM;
+  Safari doesn't check that. Thus this might need changing if testing
+  shows the IE/Firefox behaviour is required here. -->
   <p>When the <dfn id=dom-location-replace title=dom-location-replace><code>replace(<var title="">url</var>)</code></dfn> method is invoked, the UA must
   <a href=#resolve-a-url title="resolve a url">resolve</a> the argument, relative to
   the <a href=#entry-script>entry script</a>'s <a href="#script's-base-url" title="script's base URL">base
-  URL</a>, and if that is successful, <a href=#navigate>navigate</a> the
+  URL</a>, and if that is successful,
+  <a href=#navigate>navigate</a><!--DONAV location.href/replace--> the
   <a href=#browsing-context>browsing context</a> to the specified <var title="">url</var> with <a href=#replacement-enabled>replacement enabled</a>.</p>
   <p>Navigation for the <code title=dom-location-assign><a href=#dom-location-assign>assign()</a></code> and <code title=dom-location-replace><a href=#dom-location-replace>replace()</a></code> methods must be done
@@ -58920,26 +59422,44 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
    steps.</dd> <!-- this theoretically would have no effect but in
    practice can be useful to work around rendering bugs. -->
+   <dt>If the <a href=#browsing-context>browsing context</a>'s <a href=#active-document>active
+   document</a> is <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a></dt>
+   <dd><p><a href=#process-the-iframe-attributes title="process the iframe attributes">Reprocess the
+   <code>iframe</code> attributes</a> of the <a href=#browsing-context>browsing
+   context</a>'s <a href=#browsing-context-container>browsing context container</a>.</dd>
+   <dt>If the <a href=#browsing-context>browsing context</a>'s <a href=#active-document>active
+   document</a> has its <a href=#reload-override-flag>reload override
+   flag</a> set</dt>
+   <dd><p>Perform <a href=#an-overridden-reload>an overridden reload</a>.</dd>
    <dt>Otherwise</dt>
-   <dd><p><a href=#navigate>Navigate</a> the <a href=#browsing-context>browsing context</a> to
-   <a href="#the-document's-current-address">the document's current address</a> with
-   <a href=#replacement-enabled>replacement enabled</a>. The <a href=#source-browsing-context>source browsing
-   context</a> must be the <a href=#browsing-context>browsing context</a> being
-   navigated.</dd> <!-- it appears that document.reload() always
-   uses GET and does not, e.g., re-POST. -->
+   <dd><p><a href=#navigate>Navigate</a><!--DONAV location.reload()--> the
+   <a href=#browsing-context>browsing context</a> to <a href="#the-document's-current-address">the document's current
+   address</a> with <a href=#replacement-enabled>replacement enabled</a>. The
+   <a href=#source-browsing-context>source browsing context</a> must be the <a href=#browsing-context>browsing
+   context</a> being navigated.</dd> <!-- it appears that
+   document.reload() always uses GET and does not, e.g., re-POST. -->
    <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/141 -->
-  </dl><p>When a user requests that the current page be reloaded through a
-  user interface element, the user agent should <a href=#navigate>navigate</a>
-  the <a href=#browsing-context>browsing context</a> to the same resource as
+  </dl><p>When a user requests that the current page of a <a href=#browsing-context>browsing
+  context</a> be reloaded through a user interface element, the
+  user agent should <a href=#navigate>navigate</a><!--DONAV user reload--> the
+  <a href=#browsing-context>browsing context</a> to the same resource as
   <code><a href=#document>Document</a></code>, with <a href=#replacement-enabled>replacement enabled</a>. In the
   case of non-idempotent methods (e.g. HTTP POST), the user agent
   should prompt the user to confirm the operation first, since
   otherwise transactions (e.g. purchases or database modifications)
   could be repeated. User agents may allow the user to explicitly
-  override any caches when reloading.</p>
+  override any caches when reloading. If <a href=#browsing-context>browsing
+  context</a>'s <a href=#active-document>active document</a>'s <a href=#reload-override-flag>reload
+  override flag</a> is set, then the user agent may instead perform
+  <a href=#an-overridden-reload>an overridden reload</a> rather than the navigation
+  described in this paragraph.</p>
   </div>
@@ -59051,6 +59571,8 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
   in this specification.</p>
   <!-- NAVIGATE <dfn>navigate</dfn> -->
+  <!-- For places that _call_ this, as opposed to just referring to
+  it, search for "DONAV" -->
   <p>When a browsing context is <dfn id=navigate title=navigate>navigated</dfn>
   to a new resource, the user agent must run the following steps:</p>
@@ -59083,9 +59605,10 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
     the new resource in a new <a href=#top-level-browsing-context>top-level browsing context</a>
     or in the <a href=#top-level-browsing-context>top-level browsing context</a> of the
     <a href=#source-browsing-context>source browsing context</a>, at the user's option, in
-    which case the user agent must <a href=#navigate>navigate</a> that
-    designated <a href=#top-level-browsing-context>top-level browsing context</a> to the new
-    resource as if the user had requested it independently.</p>
+    which case the user agent must <a href=#navigate>navigate</a><!--DONAV
+    sandbox manual load--> that designated <a href=#top-level-browsing-context>top-level browsing
+    context</a> to the new resource as if the user had requested it
+    independently.</p>
    </li>
@@ -59893,8 +60416,9 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
   page</a>.</p>
   <ol><li><p>If there is no longer a <code><a href=#document>Document</a></code> object for the
-   entry in question, the user agent must <a href=#navigate>navigate</a> the
-   browsing context to the location for that entry to perform an
+   entry in question, the user agent must
+   <a href=#navigate>navigate</a><!--DONAV history traversal after eviction-->
+   the browsing context to the location for that entry to perform an
    <a href=#entry-update>entry update</a> of that entry, and abort these steps. The
    "<a href=#navigate>navigate</a>" algorithm reinvokes this "traverse"
    algorithm to complete the traversal, at which point there
@@ -59974,6 +60498,12 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
      attribute set to true. This event must not bubble, must not be
      cancelable, and has no default action.</li>
+     <!-- an interesting thing to test would be to traverse back
+     during onload, before the first pageshow has fired, and then to
+     traverse forward again, and see if we get _two_ pageshows. If so,
+     it indicates that the history traversal task source has a higher
+     priority than the DOM manipulation task source. -->
     </ol></li>
    <li><p>Set <a href="#the-document's-current-address">the document's current address</a> to the URL
@@ -60019,8 +60549,8 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
      <dt>Otherwise</dt>
-     <dd><p>Let the <code><a href=#document>Document</a></code>'s <dfn id=pending-state-object>pending state
-     object</dfn> be <var title="">state</var>. (If there was already
+     <dd><p>Let the <code><a href=#document>Document</a></code>'s <a href=#pending-state-object>pending state
+     object</a> be <var title="">state</var>. (If there was already
      a <a href=#pending-state-object>pending state object</a>, the previous one is
      discarded.)</p>
@@ -60039,7 +60569,10 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
    <li><p>The <a href=#current-entry>current entry</a> is now the <i>specified
    entry</i>.</li>
-  </ol><p>The <a href=#pending-state-object>pending state object</a> must be initially null.</p>
+  </ol><p>The <dfn id=pending-state-object>pending state object</dfn> is used to keep track of what
+  state object to use in the inital <code title=event-popstate><a href=#event-popstate>popstate</a></code> event fired by the parser
+  once it <a href=#stop-parsing title="stop parsing">stops parsing</a>. The
+  <a href=#pending-state-object>pending state object</a> must be initially null.</p>
   <p>The <a href=#task-source>task source</a> for the tasks mentioned above is the
   <a href=#dom-manipulation-task-source>DOM manipulation task source</a>.</p>
@@ -62013,8 +62546,8 @@ NETWORK:
   target <code><a href=#applicationcache>ApplicationCache</a></code> object <var title="">target</var>, the user agent must run the appropriate steps
   from the following list:</p>
-  <dl><dt>If <var title="">target</var>'s <code><a href=#document>Document</a></code> has
-   <a href=#completely-loaded>completely loaded</a></dt>
+  <dl><dt>If <var title="">target</var>'s <code><a href=#document>Document</a></code> is
+   <a href=#ready-for-post-load-tasks>ready for post-load tasks</a></dt>
    <dd><p><a href=#queue-a-task title="queue a task">Queue</a> the task <var title="">task</var>.</dd>
@@ -62851,6 +63384,13 @@ NETWORK:
   agent, and at most one <a href=#event-loop>event loop</a> per <a href=#unit-of-related-similar-origin-browsing-contexts>unit of
   related similar-origin browsing contexts</a>.</p>
+  <p class=note>When there is more than one <a href=#event-loop>event loop</a>
+  for a <a href=#unit-of-related-browsing-contexts>unit of related browsing contexts</a>, complications
+  arise when a <a href=#browsing-context>browsing context</a> in that group is <a href=#navigate title=navigate>navigated</a> such that it switches from one
+  <a href=#unit-of-related-similar-origin-browsing-contexts>unit of related similar-origin browsing contexts</a> to
+  another. This specification does not currently describe how to
+  handle these complications.</p>
   <p>An <a href=#event-loop>event loop</a> always has at least one <a href=#browsing-context>browsing
   context</a>. If an <a href=#event-loop>event loop</a>'s <a href=#browsing-context title="browsing context">browsing contexts</a> all go away, then
   the <a href=#event-loop>event loop</a> goes away as well. A <a href=#browsing-context>browsing
@@ -62958,9 +63498,12 @@ NETWORK:
    <code><a href=#document>Document</a></code>s are not <a href=#fully-active>fully active</a>. The user
    agent may pick any <a href=#task-queue>task queue</a>.</li>
+   <!-- warning! if you renumber these steps, make sure to update the
+   "spin the event loop" algorith below! -->
    <li><p>If the <a href=#storage-mutex>storage mutex</a> is now owned by the
    <a href=#event-loop>event loop</a>, release it so that it is once again
-   free.</p>
+   free.</li>
    <li><p>Remove that task from its <a href=#task-queue>task queue</a>.</li>
@@ -62989,9 +63532,16 @@ NETWORK:
   <ol><li><p>Let <var title="">task source</var> be the <a href=#task-source>task
    source</a> of the currently running <a href=#concept-task title=concept-task>task</a>.</li>
-   <li><p>Stop the currently running <a href=#concept-task title=concept-task>task</a>, allowing the <a href=#event-loop>event
-   loop</a> to resume, but continue these steps
-   asynchronously.</li>
+   <li>
+    <p>Stop the currently running <a href=#concept-task title=concept-task>task</a>, allowing the <a href=#event-loop>event
+    loop</a> to resume, but continue these steps
+    asynchronously.</p>
+    <p class=note>This causes the <a href=#event-loop>event loop</a> to move on
+    to the second step of its processing model (defined above).</p>
+   </li>
    <li><p>Wait until the condition <var title="">goal</var> is
    met.</li>
@@ -63005,15 +63555,27 @@ NETWORK:
   </ol><hr><p>Some of the algorithms in this specification, for historical
   reasons, require the user agent to <dfn id=pause>pause</dfn> while running a
-  <a href=#concept-task title=concept-task>task</a> until some condition has been
-  met. While a user agent has a paused <a href=#concept-task title=concept-task>task</a>, the corresponding <a href=#event-loop>event
-  loop</a> must not run further <a href=#concept-task title=concept-task>tasks</a>, and any script in the currently
-  running <a href=#concept-task title=concept-task>task</a> must block. User
-  agents should remain responsive to user input while paused, however,
-  albeit in a reduced capacity since the <a href=#event-loop>event loop</a> will
-  not be doing anything.</p>
-  <hr><p>When a user agent is to <dfn id=obtain-the-storage-mutex>obtain the storage mutex</dfn> as
+  <a href=#concept-task title=concept-task>task</a> until a condition <var title="">goal</var> is met. This means running the following
+  steps:</p>
+  <ol><li><p>If any asynchronously-running algorithms are <a href=#await-a-stable-state title="await a stable state">awaiting a stable state</a>, then
+   run their <a href=#synchronous-section>synchronous section</a> and then resume running
+   their asynchronous algorithm. (See the <a href=#event-loop>event loop</a>
+   processing model definition above for details.)</p>
+   <li><p>If necessary, update the rendering or user interface of any
+   <code><a href=#document>Document</a></code> or <a href=#browsing-context>browsing context</a> to reflect
+   the current state.</li>
+   <li><p>Wait until the condition <var title="">goal</var> is met.
+   While a user agent has a paused <a href=#concept-task title=concept-task>task</a>, the corresponding <a href=#event-loop>event
+   loop</a> must not run further <a href=#concept-task title=concept-task>tasks</a>, and any script in the currently
+   running <a href=#concept-task title=concept-task>task</a> must block. User
+   agents should remain responsive to user input while paused,
+   however, albeit in a reduced capacity since the <a href=#event-loop>event
+   loop</a> will not be doing anything.</li>
+  </ol><hr><p>When a user agent is to <dfn id=obtain-the-storage-mutex>obtain the storage mutex</dfn> as
   part of running a <a href=#concept-task title=concept-task>task</a>, it must
   run through the following steps:</p>
@@ -64314,11 +64876,13 @@ interface <dfn id=windowtimers>WindowTimers</dfn> {
    <li>
-    <p><a href=#navigate>Navigate</a> the new <a href=#browsing-context>browsing context</a> to
-    the <a href=#absolute-url>absolute URL</a> that resulted from <a href=#resolve-a-url title="resolve a url">resolving</a> <var title="">url</var>
-    earlier, with <a href=#replacement-enabled>replacement enabled</a>, and with the <a href="#script's-browsing-context" title="script's browsing context">browsing context</a> of the
-    <a href=#concept-script title=concept-script>script</a> that invoked the method
-    as the <a href=#source-browsing-context>source browsing context</a>.</p>
+    <p><a href=#navigate>Navigate</a><!--DONAV showModalDialog--> the new
+    <a href=#browsing-context>browsing context</a> to the <a href=#absolute-url>absolute URL</a>
+    that resulted from <a href=#resolve-a-url title="resolve a url">resolving</a>
+    <var title="">url</var> earlier, with <a href=#replacement-enabled>replacement
+    enabled</a>, and with the <a href="#script's-browsing-context" title="script's browsing
+    context">browsing context</a> of the <a href=#concept-script title=concept-script>script</a> that invoked the method as
+    the <a href=#source-browsing-context>source browsing context</a>.</p>
    </li>
@@ -64669,10 +65233,10 @@ interface <dfn id=navigatorabilities>NavigatorAbilities</dfn> {
     a url">resolve</a> the resulting URL, relative to the <a href="#script's-base-url" title="script's base URL">base URL</a> of the <a href=#entry-script>entry
     script</a> at the time the <code title=dom-navigator-registerContentHandler><a href=#dom-navigator-registercontenthandler>registerContentHandler()</a></code>
     or <code title=dom-navigator-registerProtocolHandler><a href=#dom-navigator-registerprotocolhandler>registerProtocolHandler()</a></code>
-    methods were invoked, and then <a href=#navigate>navigate</a> an
-    appropriate <a href=#browsing-context>browsing context</a> to the resulting URL
-    using the GET method (<a href=#concept-http-equivalent-get title=concept-http-equivalent-get>or
-    equivalent</a> for non-HTTP URLs).</p>
+    methods were invoked, and then <a href=#navigate>navigate</a><!--DONAV
+    user--> an appropriate <a href=#browsing-context>browsing context</a> to the
+    resulting URL using the GET method (<a href=#concept-http-equivalent-get title=concept-http-equivalent-get>or equivalent</a> for
+    non-HTTP URLs).</p>
     <p>To get the escaped version of the <a href=#absolute-url>absolute URL</a> of
     the content in question, the user agent must replace every
@@ -65251,7 +65815,14 @@ interface <dfn id=navigatorabilities>NavigatorAbilities</dfn> {
   <hr><p>The <dfn id=focusing-steps>focusing steps</dfn> are as follows:</p>
-  <ol><li><p>If focusing the element will remove the focus from another
+  <ol><li><p>If the element is not <a href=#in-a-document title="in a Document">in a
+   <code>Document</code></a>, or if the element's
+   <code><a href=#document>Document</a></code> has no <a href=#browsing-context>browsing context</a>, or if
+   the element's <code><a href=#document>Document</a></code>' <a href=#browsing-context>browsing context</a>
+   has no <a href=#top-level-browsing-context>top-level browsing context</a>, then abort these
+   steps.</p>
+   <li><p>If focusing the element will remove the focus from another
    element, then run the <a href=#unfocusing-steps>unfocusing steps</a> for that
    element.</li>
@@ -65269,6 +65840,7 @@ interface <dfn id=navigatorabilities>NavigatorAbilities</dfn> {
    </li>
    <li><p><a href=#fire-a-simple-event>Fire a simple event</a> named <code title=event-focus>focus</code> at the element.</li>
+   <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/723 -->
   </ol><p>User agents must synchronously run the <a href=#focusing-steps>focusing
   steps</a> for an element whenever the user moves the focus to a
@@ -65288,6 +65860,7 @@ interface <dfn id=navigatorabilities>NavigatorAbilities</dfn> {
    <li><p>Unfocus the element.</li>
    <li><p><a href=#fire-a-simple-event>Fire a simple event</a> named <code title=event-blur>blur</code> at the element.</li>
+   <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/723 -->
   </ol><p>When an element that is focused stops being a
   <a href=#focusable>focusable</a> element, or stops being focused without
@@ -65348,10 +65921,13 @@ interface <dfn id=navigatorabilities>NavigatorAbilities</dfn> {
   <p>The <dfn id=dom-document-hasfocus title=dom-document-hasFocus><code>hasFocus()</code></dfn> method
   on <code><a href=#htmldocument>HTMLDocument</a></code> objects must return true if the
-  document's <a href=#browsing-context>browsing context</a> is focused, and all its
-  <a href=#ancestor-browsing-context title="ancestor browsing context">ancestor browsing
-  contexts</a> are also focused, and the <a href=#top-level-browsing-context>top-level browsing
-  context</a> has the <i>system focus</i>.</p>
+  <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a> is focused,
+  and all its <a href=#ancestor-browsing-context title="ancestor browsing context">ancestor
+  browsing contexts</a> are also focused, and the <a href=#top-level-browsing-context>top-level
+  browsing context</a> has the <i>system focus</i>. If the
+  <code><a href=#document>Document</a></code> has no <a href=#browsing-context>browsing context</a> or if its
+  <a href=#browsing-context>browsing context</a> has no <a href=#top-level-browsing-context>top-level browsing
+  context</a>, then the method will always return false.</p>
   <p>The <dfn id=dom-window-focus title=dom-window-focus><code>focus()</code></dfn>
   method on the <code><a href=#window>Window</a></code> object, when invoked, provides a
@@ -68542,7 +69118,7 @@ interface <dfn>FunctionObjectCallback</dfn> {
   <h4 id=definitions-2><span class=secno>8.8.1 </span>Definitions</h4>
   <p>The user agent must associate an <dfn id=undo-transaction-history>undo transaction
-  history</dfn> with each <code><a href=#htmldocument>HTMLDocument</a></code> object.</p>
+  history</dfn> with each <code><a href=#document>Document</a></code> object.</p>
   <p>The <a href=#undo-transaction-history>undo transaction history</a> is a list of
   entries. The entries are of two types: <a href=#dom-changes>DOM changes</a> and
@@ -68556,7 +69132,7 @@ interface <dfn>FunctionObjectCallback</dfn> {
    node.</li>
    <li>Changes to the DOM hierarchy of nodes that are descendants of
-   the <code><a href=#htmldocument>HTMLDocument</a></code> object (<code title=dom-Node-parentNode><a href=#dom-node-parentnode>parentNode</a></code>, <code title=dom-Node-childNodes><a href=#dom-node-childnodes>childNodes</a></code>).</li>
+   the <code><a href=#document>Document</a></code> object (<code title=dom-Node-parentNode><a href=#dom-node-parentnode>parentNode</a></code>, <code title=dom-Node-childNodes><a href=#dom-node-childnodes>childNodes</a></code>).</li>
    <li>Changes to internal state, such as a form control's <a href=#concept-fe-value title=concept-fe-value>value</a> or <a href=#concept-input-checked-dirty-flag title=concept-input-checked-dirty-flag>dirty checkedness
    flag</a>.</li>
@@ -68660,8 +69236,8 @@ interface <dfn>FunctionObjectCallback</dfn> {
   <p>The <dfn id=dom-undomanager title=dom-undoManager><code>undoManager</code></dfn>
   attribute of the <code><a href=#window>Window</a></code> interface must return the
   object implementing the <code><a href=#undomanager>UndoManager</a></code> interface for that
-  <code><a href=#window>Window</a></code> object's associated
-  <code><a href=#htmldocument>HTMLDocument</a></code> object.</p>
+  <code><a href=#window>Window</a></code> object's associated <code><a href=#document>Document</a></code>
+  object.</p>
   <p><code><a href=#undomanager>UndoManager</a></code> objects represent their document's
   <a href=#undo-transaction-history>undo transaction history</a>. Only <a href=#undo-object>undo object</a>
@@ -69578,7 +70154,7 @@ function receiver(e) {
     send the message to the target regardless of origin, set the
     target origin to "<code title="">*</code>". To restrict the
     message to same-origin targets only, without needing to explicitly
-    state the origin, pass the <code title=dom-location><a href=#dom-location>window.location</a></code> object.</p>
+    state the origin, set the target origin to "<code title="">/</code>".</p>
     <p>Throws an <code><a href=#invalid_state_err>INVALID_STATE_ERR</a></code> if the <var title="">ports</var> array is not null and it contains either null
     entries or duplicate ports.</p>
@@ -69606,9 +70182,10 @@ function receiver(e) {
   <ol><li>
     <p>If the value of the <var title="">targetOrigin</var> argument
-    is neither a single U+002A ASTERISK character (*) nor an
-    <a href=#absolute-url>absolute URL</a>, then throw a <code><a href=#syntax_err>SYNTAX_ERR</a></code>
-    exception and abort the overall set of steps.</p>
+    is neither a single U+002A ASTERISK character (*), a single U+002F
+    SOLIDUS character (/), nor an <a href=#absolute-url>absolute URL</a>, then
+    throw a <code><a href=#syntax_err>SYNTAX_ERR</a></code> exception and abort the overall
+    set of steps.</p>
    </li>
@@ -69657,6 +70234,13 @@ function receiver(e) {
    <li>
+    <p>If the <var title="">targetOrigin</var> argument is a single
+    literal U+002F SOLIDUS character (/), and the
+    <code><a href=#document>Document</a></code> of the <code><a href=#window>Window</a></code> object on which
+    the method was invoked does not have the <a href=#same-origin>same origin</a>
+    as the <a href=#entry-script>entry script</a>'s <a href="#script's-document" title="script's
+    document">document</a>, then abort these steps silently.</p>
     <p>Otherwise, if the <var title="">targetOrigin</var> argument is
     an <a href=#absolute-url>absolute URL</a>, and the <code><a href=#document>Document</a></code> of the
     <code><a href=#window>Window</a></code> object on which the method was invoked does
@@ -70312,6 +70896,7 @@ interface <dfn id=messageport>MessagePort</dfn> {
    <code><a href=#the-keygen-element>keygen</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#meta>meta</a></code>,
    <code><a href=#the-param-element>param</a></code>, <code><a href=#the-source-element>source</a></code>, <code><a href=#the-track-element>track</a></code>,
    <code><a href=#the-wbr-element>wbr</a></code></dd>
+   <!-- see also other places that say VOIDLIST -->
    <dt><dfn id=raw-text-elements>Raw text elements</dfn></dt>
@@ -71907,11 +72492,11 @@ interface <dfn id=messageport>MessagePort</dfn> {
    convert the input stream to the new encoding, set the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> to
    <i>certain</i>, and abort these steps.</li>
-   <li>Otherwise, <a href=#navigate>navigate</a> to the document again, with
-   <a href=#replacement-enabled>replacement enabled</a>, and using the same <a href=#source-browsing-context>source
-   browsing context</a>, but this time skip the <a href=#encoding-sniffing-algorithm>encoding
-   sniffing algorithm</a> and instead just set the encoding to the
-   new encoding and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> to
+   <li>Otherwise, <a href=#navigate>navigate</a><!--DONAV reparse--> to the
+   document again, with <a href=#replacement-enabled>replacement enabled</a>, and using
+   the same <a href=#source-browsing-context>source browsing context</a>, but this time skip
+   the <a href=#encoding-sniffing-algorithm>encoding sniffing algorithm</a> and instead just set
+   the encoding to the new encoding and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> to
    <i>certain</i>. Whenever possible, this should be done without
    actually contacting the network layer (the bytes should be
    re-parsed from memory), even if, e.g., the document is marked as
@@ -76876,7 +77461,10 @@ document.body.appendChild(text);
        for this instance of the <a href=#html-parser>HTML parser</a>, such that
        the <a href=#event-loop>event loop</a> will not run <a href=#concept-task title=concept-task>tasks</a> that invoke the <a href=#tokenization title=tokenization>tokenizer</a>.</li>
-       <li><p><a href=#spin-the-event-loop>Spin the event loop</a> until the parser's
+       <li><p>If the parser's <code><a href=#document>Document</a></code> <a href=#has-a-style-sheet-that-is-blocking-scripts>has a style
+       sheet that is blocking scripts</a> or <var title="">the
+       script</var>'s <a href=#ready-to-be-parser-executed>"ready to be parser-executed"</a> flag
+       is not set: <a href=#spin-the-event-loop>spin the event loop</a> until the parser's
        <code><a href=#document>Document</a></code> <a href=#has-no-style-sheet-that-is-blocking-scripts>has no style sheet that is blocking
        scripts</a> and <var title="">the script</var>'s
        <a href=#ready-to-be-parser-executed>"ready to be parser-executed"</a> flag is
@@ -78386,8 +78974,8 @@ document.body.appendChild(text);
    attribute set to false. This event must not bubble, must not be
    cancelable, and has no default action.</li>
-   <li><p>If the <code><a href=#document>Document</a></code> has a <a href=#pending-state-object>pending state
-   object</a>, then <a href=#queue-a-task>queue a task</a> to fire a <code title=event-popstate><a href=#event-popstate>popstate</a></code> event at the
+   <li><p>If the <code><a href=#document>Document</a></code> is in a <a href=#browsing-context>browsing
+   context</a>, then <a href=#queue-a-task>queue a task</a> to fire a <code title=event-popstate><a href=#event-popstate>popstate</a></code> event at the
    <code><a href=#document>Document</a></code>'s <code><a href=#window>Window</a></code> object using the
    <code><a href=#popstateevent>PopStateEvent</a></code> interface, with the <code title=dom-PopStateEvent-state><a href=#dom-popstateevent-state>state</a></code> attribute set to the
    current value of the <a href=#pending-state-object>pending state object</a>. This event
@@ -78402,8 +78990,11 @@ document.body.appendChild(text);
    for these <a href=#concept-task title=concept-task>tasks</a> is the
    <a href=#networking-task-source>networking task source</a>.</li>
-   <li><p>The <code><a href=#document>Document</a></code> is now <dfn id=completely-loaded>completely
-   loaded</dfn>.</li>
+   <li><p>The <code><a href=#document>Document</a></code> is now <dfn id=ready-for-post-load-tasks>ready for post-load
+   tasks</dfn>.</li>
+   <li><p><a href=#queue-a-task>Queue a task</a> to mark the <code><a href=#document>Document</a></code>
+   as <dfn id=completely-loaded>completely loaded</dfn>.</li>
   </ol><p>When the user agent is to <dfn id=abort-a-parser>abort a parser</dfn>, it must run
   the following steps:</p>
@@ -78854,14 +79445,15 @@ document.body.appendChild(text);
         <p>If <var title="">current node</var> is an
         <code><a href=#the-area-element>area</a></code>, <code><a href=#the-base-element>base</a></code>, <code><a href=#basefont>basefont</a></code>,
         <code><a href=#bgsound>bgsound</a></code>, <code><a href=#the-br-element>br</a></code>, <code><a href=#the-col-element>col</a></code>,
-        <code><a href=#the-embed-element>embed</a></code>, <code><a href=#frame>frame</a></code>, <code><a href=#the-hr-element>hr</a></code>,
-        <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>, <code><a href=#the-keygen-element>keygen</a></code>,
-        <code><a href=#the-link-element>link</a></code>, <code><a href=#meta>meta</a></code>, <code><a href=#the-param-element>param</a></code>, or
+        <code><a href=#the-command>command</a></code>, <code><a href=#the-embed-element>embed</a></code>, <code><a href=#frame>frame</a></code>,
+        <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>,
+        <code><a href=#the-keygen-element>keygen</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#meta>meta</a></code>,
+        <code><a href=#the-param-element>param</a></code>, <code><a href=#the-source-element>source</a></code>, <code><a href=#the-track-element>track</a></code> or
         <code><a href=#the-wbr-element>wbr</a></code> element, then continue on to the next child
-        node at this point.</p> <!-- also, i guess: image and isindex,
-        but we don't list those because we don't consider those
-        "elements", more "macros", and thus we should never serialize
-        them -->
+        node at this point.</p> <!-- VOIDLIST superset -->
+        <!-- also, i guess: image and isindex, but we don't list those
+        because we don't consider those "elements", more "macros", and
+        thus we should never serialize them -->
         <p>If <var title="">current node</var> is a <code><a href=#the-pre-element>pre</a></code>,
         <code><a href=#the-textarea-element>textarea</a></code>, or <code><a href=#listing>listing</a></code> element, append
@@ -79539,7 +80131,7 @@ document.body.appendChild(text);
   </ul><p class=note>Just being off-screen does not mean the element is
   not <a href=#being-rendered>being rendered</a>. The presence of the <code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> attribute normally means the
   element is not <a href=#being-rendered>being rendered</a>, though this might be
-  overriden by the style sheets.</p>
+  overridden by the style sheets.</p>
   </div>
@@ -80597,7 +81189,8 @@ fieldset {
   to the user">exposing a user interface</a> for a
   <code><a href=#video>video</a></code> element, user agents should run the <a href=#rules-for-updating-the-timed-track-rendering>rules
   for updating the timed track rendering</a> of each of the <a href=#timed-track title="timed track">timed tracks</a> in the <code><a href=#video>video</a></code>
-  element's <a href=#list-of-timed-tracks>list of timed tracks</a> that are <a href=#timed-track-showing title="timed track showing">showing</a> (e.g., for <a href=#timed-track title="timed track">timed tracks</a> based on
+  element's <a href=#list-of-timed-tracks>list of timed tracks</a> that are <a href=#timed-track-showing title="timed track showing">showing</a> or <a href=#timed-track-showing-by-default title="timed
+  track showing by default">showing by default</a> (e.g., for <a href=#timed-track title="timed track">timed tracks</a> based on
   <a href=#websrt>WebSRT</a>, the <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules for updating the display of
   WebSRT timed tracks</a>).</p>
 <!--KEEP-START w3c-html--><!--TT-->
@@ -80618,7 +81211,7 @@ iframe:not([seamless]) { border: 2px inset; }</pre>
 <!--<div data-component="other Hixie drafts (editor: Ian Hickson)">-->
   <div class=impl>
-  <h4 id=timed-tracks-0><span class=secno>12.3.2 </span>Timed tracks</h4>
+  <h4 id=timed-tracks><span class=secno>12.3.2 </span>Timed tracks</h4>
   <p class=note>This section is intended to be moved to its own CSS
   module once an editor is found to run with it.</p>
@@ -80662,12 +81255,11 @@ iframe:not([seamless]) { border: 2px inset; }</pre>
    user interface</a> for <var title="">video</var>, but now it is,
    let <var title="">reset</var> be true. Otherwise, let <var title="">reset</var> be false.</p>
-   <li><p>Let <var title="">tracks</var> be the subset of
-   <var title="">video</var>'s <a href=#list-of-timed-tracks>list of timed tracks</a> that
-   have as their <a href=#rules-for-updating-the-timed-track-rendering>rules for updating the timed track
-   rendering</a> these <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules for updating the display of
-   WebSRT timed tracks</a>, and whose <a href=#timed-track-mode>timed track mode</a>
-   is <a href=#timed-track-showing title="timed track showing">showing</a>.</li>
+   <li><p>Let <var title="">tracks</var> be the subset of <var title="">video</var>'s <a href=#list-of-timed-tracks>list of timed tracks</a> that have
+   as their <a href=#rules-for-updating-the-timed-track-rendering>rules for updating the timed track rendering</a>
+   these <a href=#rules-for-updating-the-display-of-websrt-timed-tracks>rules for updating the display of WebSRT timed
+   tracks</a>, and whose <a href=#timed-track-mode>timed track mode</a> is <a href=#timed-track-showing title="timed track showing">showing</a> or <a href=#timed-track-showing-by-default title="timed
+   track showing by default">showing by default</a>.</li>
    <li><p>Let <var title="">cues</var> be an empty list of <a href=#timed-track-cue title="timed track cue">timed track cues</a>.</li>
@@ -81318,10 +81910,7 @@ iframe:not([seamless]) { border: 2px inset; }</pre>
   element</i> that matches the given <var title="">argument</var>.</p>
   <p>The <var title="">argument</var> must match the syntax
-  "&lt;voice&gt;&nbsp;||&nbsp;&lt;part&gt;&nbsp;||&nbsp;&lt;position&gt;&nbsp;||&nbsp;&lt;future-compatibility&gt;". <a href=#refsCSS>[CSS]</a></p>
-  <p>The "&lt;voice&gt;" component must be either a non-negative
-  &lt;integer&gt; or one of the keywords "<code title=pseudo-cue-part-narrator><a href=#pseudo-cue-part-narrator>narrator</a></code>", "<code title=pseudo-cue-part-music><a href=#pseudo-cue-part-music>music</a></code>", "<code title=pseudo-cue-part-lyric><a href=#pseudo-cue-part-lyric>lyric</a></code>", "<code title=pseudo-cue-part-sound><a href=#pseudo-cue-part-sound>sound</a></code>", "<code title=pseudo-cue-part-comment><a href=#pseudo-cue-part-comment>comment</a></code>", or "<code title=pseudo-cue-part-credit><a href=#pseudo-cue-part-credit>credit</a></code>".</p>
+  "&lt;part&gt;&nbsp;||&nbsp;&lt;position&gt;&nbsp;||&nbsp;&lt;future-compatibility&gt;". <a href=#refsCSS>[CSS]</a></p>
   <p>The "&lt;part&gt;" component must be one of the keywords "<code title=pseudo-cue-part-i><a href=#pseudo-cue-part-i>i</a></code>", "<code title=pseudo-cue-part-b><a href=#pseudo-cue-part-b>b</a></code>", "<code title=pseudo-cue-part-ruby><a href=#pseudo-cue-part-ruby>ruby</a></code>", or "<code title=pseudo-cue-part-rt><a href=#pseudo-cue-part-rt>rt</a></code>".</p>
@@ -81334,57 +81923,7 @@ iframe:not([seamless]) { border: 2px inset; }</pre>
   <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node Objects</a> are
   matched by the pseudo-element, as follows:</p>
-  <dl><dt>An integer greater than or equal to zero</dt>
-   <dd>
-    <p>Restricts the pseudo-element to only matching <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node Objects</a> from <a href=#timed-track-cue title="timed track cue">timed track cues</a> whose <a href=#timed-track-cue-voice-identifier>timed
-    track cue voice identifier</a> is the given number expressed in
-    base ten with digits in the range U+0030 DIGIT ZERO (0) to U+0039
-    DIGIT NINE (9).</p>
-   </dd>
-   <dt><dfn id=pseudo-cue-part-narrator title=pseudo-cue-part-narrator><code>narrator</code></dfn></dt>
-   <dd>
-    <p>Restricts the pseudo-element to only matching <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node Objects</a> from <a href=#timed-track-cue title="timed track cue">timed track cues</a> whose <a href=#timed-track-cue-voice-identifier>timed
-    track cue voice identifier</a> is "<code title="timed track cue
-    narrator voice"><a href=#timed-track-cue-narrator-voice>narrator</a></code>".</p>
-   </dd>
-   <dt><dfn id=pseudo-cue-part-music title=pseudo-cue-part-music><code>music</code></dfn></dt>
-   <dd>
-    <p>Restricts the pseudo-element to only matching <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node Objects</a> from <a href=#timed-track-cue title="timed track cue">timed track cues</a> whose <a href=#timed-track-cue-voice-identifier>timed
-    track cue voice identifier</a> is "<code title="timed track cue
-    music voice"><a href=#timed-track-cue-music-voice>music</a></code>".</p>
-   </dd>
-   <dt><dfn id=pseudo-cue-part-lyric title=pseudo-cue-part-lyric><code>lyric</code></dfn></dt>
-   <dd>
-    <p>Restricts the pseudo-element to only matching <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node Objects</a> from <a href=#timed-track-cue title="timed track cue">timed track cues</a> whose <a href=#timed-track-cue-voice-identifier>timed
-    track cue voice identifier</a> is "<code title="timed track cue
-    lyric voice"><a href=#timed-track-cue-lyric-voice>lyric</a></code>".</p>
-   </dd>
-   <dt><dfn id=pseudo-cue-part-sound title=pseudo-cue-part-sound><code>sound</code></dfn></dt>
-   <dd>
-    <p>Restricts the pseudo-element to only matching <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node Objects</a> from <a href=#timed-track-cue title="timed track cue">timed track cues</a> whose <a href=#timed-track-cue-voice-identifier>timed
-    track cue voice identifier</a> is "<code title="timed track cue
-    sound voice"><a href=#timed-track-cue-sound-voice>sound</a></code>".</p>
-   </dd>
-   <dt><dfn id=pseudo-cue-part-comment title=pseudo-cue-part-comment><code>comment</code></dfn></dt>
-   <dd>
-    <p>Restricts the pseudo-element to only matching <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node Objects</a> from <a href=#timed-track-cue title="timed track cue">timed track cues</a> whose <a href=#timed-track-cue-voice-identifier>timed
-    track cue voice identifier</a> is "<code title="timed track cue
-    comment voice"><a href=#timed-track-cue-comment-voice>comment</a></code>".</p>
-   </dd>
-   <dt><dfn id=pseudo-cue-part-credit title=pseudo-cue-part-credit><code>credit</code></dfn></dt>
-   <dd>
-    <p>Restricts the pseudo-element to only matching <a href=#websrt-node-object title="WebSRT Node Object">WebSRT Node Objects</a> from <a href=#timed-track-cue title="timed track cue">timed track cues</a> whose <a href=#timed-track-cue-voice-identifier>timed
-    track cue voice identifier</a> is "<code title="timed track cue
-    credit voice"><a href=#timed-track-cue-credit-voice>credit</a></code>".</p>
-   </dd>
-   <dt><dfn id=pseudo-cue-part-i title=pseudo-cue-part-i><code>i</code></dfn></dt>
+  <dl><dt><dfn id=pseudo-cue-part-i title=pseudo-cue-part-i><code>i</code></dfn></dt>
    <dd>
     <p>Restricts the pseudo-element to only matching <a href=#websrt-italic-object title="WebSRT Italic Object">WebSRT Italic Objects</a>.</p>
    </dd>
@@ -82689,9 +83228,9 @@ time[datetime] { binding: <i title="">time</i>; }</pre>
   part of such auditing.</p>
 <!--PING-->
-  <p>User agents are expected to allow users to <a href=#navigate>navigate</a>
-  <a href=#browsing-context title="browsing context">browsing contexts</a> to the
-  resources <a href=#resolve-a-url title="resolve a url">indicated</a> by the <code title="">cite</code> attributes on <code><a href=#the-q-element>q</a></code>,
+  <p>User agents are expected to allow users to
+  <a href=#navigate>navigate</a><!--DONAV cite=""--> <a href=#browsing-context title="browsing
+  context">browsing contexts</a> to the resources <a href=#resolve-a-url title="resolve a url">indicated</a> by the <code title="">cite</code> attributes on <code><a href=#the-q-element>q</a></code>,
   <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#the-section-element>section</a></code>, <code><a href=#the-article-element>article</a></code>,
   <code><a href=#the-ins-element>ins</a></code>, and <code><a href=#the-del-element>del</a></code> elements.</p>
@@ -82798,27 +83337,54 @@ time[datetime] { binding: <i title="">time</i>; }</pre>
   as an independent set of one or more bidirectional algorithm
   paragraphs when displayed, as defined by the bidirectional
   algorithm, including, for instance, supporting the
-  paragraph-breaking behaviour of U+000A LINE FEED (LF) characters. <a href=#refsBIDI>[BIDI]</a></p>
+  paragraph-breaking behaviour of U+000A LINE FEED (LF) characters.
+  For the purposes of determining the paragraph level of such text in
+  the bidirectional algorithm, this specification does <em>not</em>
+  provide a higher-level override of rules P2 and P3. <a href=#refsBIDI>[BIDI]</a></p>
+  <p>When necessary, authors can enforce a particular direction for a
+  given paragraph by starting it with the Unicode U+200E LEFT-TO-RIGHT
+  MARK or U+200F RIGHT-TO-LEFT MARK characters.</p>
+  <div class=example>
+   <p>Thus, the following script:</p>
+   <pre>alert('\u05DC\u05DE\u05D3 HTML \u05D4\u05D9\u05D5\u05DD!')</pre>
+   <p>...would always result in a message reading
+        "<bdo dir=rtl lang="" title="">&#1500;&#1502;&#1491;&nbsp;LMTH&nbsp;&#1492;&#1497;&#1493;&#1501;!</bdo>"
+   (not "<bdo dir=ltr lang="" title="">&#1491;&#1502;&#1500;&nbsp;HTML&nbsp;&#1501;&#1493;&#1497;&#1492;!</bdo>"),
+   regardless of the language of the user agent interface or the
+   direction of the page or any of its elements.</p>
+  </div>
   <div class=example>
-    <p>For example, consider the following script:</p>
+   <p>For a more complex example, consider the following script:</p>
-    <pre>var s;
+   <pre class=bad>/* Warning: this script does not handle right-to-left scripts correctly */
+var s;
 if (s = prompt('What is your name?')) {
   alert(s + '! Ok, Fred, ' + s + ', and Wilma will get the car.');
 }</pre>
-    <p>When the user enters "<kbd>Kitty</kbd>", the user agent would
-    alert "<samp>Kitty! Ok, Fred, Kitty, and Wilma will get the
-    car.</samp>". However, if the user enters "<kbd dir=rtl lang=ar>&#1604;&#1575;&nbsp;&#1571;&#1601;&#1607;&#1605;</kbd>",
-    then the bidirectional algorithm will determine that the direction
-    of the paragraph is right-to-left, and so the output will be
-    "<samp lang=""><bdo dir=rtl>&#1604;&#1575;&nbsp;&#1571;&#1601;&#1607;&#1605;!&nbsp;derF&nbsp;,kO,&nbsp;&#1604;&#1575;&nbsp;&#1571;&#1601;&#1607;&#1605;,&nbsp;rac&nbsp;eht&nbsp;teg&nbsp;lliw&nbsp;amliW&nbsp;dna.</bdo></samp>"!</p>
+   <p>When the user enters "<kbd>Kitty</kbd>", the user agent would
+   alert "<samp>Kitty! Ok, Fred, Kitty, and Wilma will get the
+   car.</samp>". However, if the user enters "<kbd dir=rtl lang=ar>&#1604;&#1575;&nbsp;&#1571;&#1601;&#1607;&#1605;</kbd>",
+   then the bidirectional algorithm will determine that the direction
+   of the paragraph is right-to-left, and so the output will be the
+   following unintended mess: "<samp lang=""><bdo dir=rtl>&#1604;&#1575;&nbsp;&#1571;&#1601;&#1607;&#1605;!&nbsp;derF&nbsp;,kO,&nbsp;&#1604;&#1575;&nbsp;&#1571;&#1601;&#1607;&#1605;,&nbsp;rac&nbsp;eht&nbsp;teg&nbsp;lliw&nbsp;amliW&nbsp;dna.</bdo></samp>"</p>
-    <p>Authors can enforce a particular interpretation by using the
-    Unicode U+200E LEFT-TO-RIGHT MARK and U+200F RIGHT-TO-LEFT MARK
-    characters.</p>
+   <p>To force an alert that starts with user-provided text (or other
+   text of unknown directionality) to render left-to-right, the string
+   can be prefixed with a U+200E LEFT-TO-RIGHT MARK character:</p>
+   <pre>var s;
+if (s = prompt('What is your name?')) {
+  alert('<strong>\u200E</strong>' + s + '! Ok, Fred, ' + s + ', and Wilma will get the car.');
+}</pre>
   </div>
@@ -83547,21 +84113,20 @@ if (s = prompt('What is your name?')) {
   <p>When the browsing context is created, if a <code title=attr-frame-src>src</code> attribute is present, the user
   agent must <a href=#resolve-a-url title="resolve a url">resolve</a> the value of
   that attribute, relative to the element, and if that is successful,
-  must then <a href=#navigate>navigate</a> the element's browsing context to
-  the resulting <a href=#absolute-url>absolute URL</a>, with <a href=#replacement-enabled>replacement
-  enabled</a>, and with the <code><a href=#frame>frame</a></code> element's
+  must then <a href=#navigate>navigate</a><!--DONAV frame--> the element's
+  browsing context to the resulting <a href=#absolute-url>absolute URL</a>, with
+  <a href=#replacement-enabled>replacement enabled</a>, and with the <code><a href=#frame>frame</a></code>
+  element's document's <a href=#browsing-context>browsing context</a> as the
+  <a href=#source-browsing-context>source browsing context</a>.</p>
+  <p>Whenever the <code title=attr-frame-src>src</code> attribute is
+  set, the user agent must <a href=#resolve-a-url title="resolve a url">resolve</a>
+  the value of that attribute, relative to the element, and if that is
+  successful, the nested <a href=#browsing-context>browsing context</a> must be <a href=#navigate title=navigate>navigated</a><!--DONAV frame--> to the resulting
+  <a href=#absolute-url>absolute URL</a>, with the <code><a href=#frame>frame</a></code> element's
   document's <a href=#browsing-context>browsing context</a> as the <a href=#source-browsing-context>source
   browsing context</a>.</p>
-  <p>Whenever the <code title=attr-frame-src>src</code> attribute
-  is set, the user agent must <a href=#resolve-a-url title="resolve a
-  url">resolve</a> the value of that attribute, relative to the
-  element, and if that is successful, the nested <a href=#browsing-context>browsing
-  context</a> must be <a href=#navigate title=navigate>navigated</a> to
-  the resulting <a href=#absolute-url>absolute URL</a>, with the
-  <code><a href=#frame>frame</a></code> element's document's <a href=#browsing-context>browsing
-  context</a> as the <a href=#source-browsing-context>source browsing context</a>.</p>
   <p>When the browsing context is created, if a <code title=attr-frame-name>name</code> attribute is present, the
   <a href=#browsing-context-name>browsing context name</a> must be set to the value of this
   attribute; otherwise, the <a href=#browsing-context-name>browsing context name</a> must be
@@ -84529,6 +85094,15 @@ interface <a href=#htmldocument>HTMLDocument</a> {
     as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> as regular
     <code><a href=#text/html>text/html</a></code> files, authors should avoid using the <code title="">.html</code> or <code title="">.htm</code> extensions for
     resources labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>.</p>
+    <p>Furthermore, since the <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code> MIME
+    type impacts the origin security model, authors should be careful
+    to prevent tampering with the MIME type labeling mechanism itself
+    when documents are labeled as <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>. If
+    an attacker can cause a file to be served as
+    <code><a href=#text/html>text/html</a></code> instead of
+    <code><a href=#text/html-sandboxed>text/html-sandboxed</a></code>, then the sandboxing will not
+    take effect and a cross-site scripting attack will become
+    possible.</p>
     <p>Beyond this, the type is identical to <code><a href=#text/html>text/html</a></code>,
     and the same considerations apply.</p>
    </dd>
@@ -86050,6 +86624,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
          <code><a href=#video>video</a></code></td>
      <td>empty</td>
      <td><a href=#global-attributes title="global attributes">globals</a>;
+         <code title=attr-track-default><a href=#attr-track-default>default</a></code>;
          <code title=attr-track-kind><a href=#attr-track-kind>kind</a></code>;
          <code title=attr-track-label><a href=#attr-track-label>label</a></code>;
          <code title=attr-track-src><a href=#attr-track-src>src</a></code>;
@@ -86552,6 +87127,10 @@ interface <a href=#htmldocument>HTMLDocument</a> {
      <td> <code title=attr-time-datetime><a href=#attr-time-datetime>time</a></code>
      <td> Value of the element
      <td> <a href=#valid-date-or-time-string>Valid date or time string</a>*
+    <tr><th> <code title="">default</code>
+     <td> <code title=attr-track-default><a href=#attr-track-default>track</a></code>
+     <td> Enable the track if no other <a href=#timed-track>timed track</a> is more suitable.
+     <td> <a href=#boolean-attribute>Boolean attribute</a>
     <tr><th> <code title="">defer</code>
      <td> <code title=attr-script-defer><a href=#attr-script-defer>script</a></code>
      <td> Defer script execution
@@ -88104,6 +88683,11 @@ interface <a href=#htmldocument>HTMLDocument</a> {
    <dd><cite><a href=http://www.w3.org/TR/css3-fonts/>CSS Fonts
    Module Level 3</a></cite>, J. Daggett. W3C.</dd>
+   <dt id=refsCSSIMAGES>[CSSIMAGES]</dt>
+   <dd><cite><a href=http://dev.w3.org/csswg/css3-images/>CSS Image
+   Values and Replaced Content Module Level 3</a></cite>, E. Etemad,
+   T. Atkins. W3C.</dd>
    <dt id=refsCSSOM>[CSSOM]</dt>
    <dd><cite><a href=http://dev.w3.org/csswg/cssom/>Cascading Style Sheets
    Object Model (CSSOM)</a></cite>, A. van Kesteren. W3C.</dd>
@@ -88121,7 +88705,8 @@ interface <a href=#htmldocument>HTMLDocument</a> {
    Interface Module</a></cite>, T. &Ccedil;elik. W3C.</dd>
    <dt id=refsCSSVALUES>[CSSVALUES]</dt>
-   <dd><cite><a href=http://dev.w3.org/csswg/css3-values/>CSS3 Values and Units</a></cite>, H. Lie, C. Lilley. W3C.</dd>
+   <dd><cite><a href=http://dev.w3.org/csswg/css3-values/>CSS3
+   Values and Units</a></cite>, H. Lie, C. Lilley. W3C.</dd>
    <dt id=refsDOMCORE>[DOMCORE]</dt>
    <dd><cite><a href=http://www.w3.org/TR/DOM-Level-3-Core/>Document
@@ -88383,6 +88968,10 @@ interface <a href=#htmldocument>HTMLDocument</a> {
    <dd><cite><a href=http://tools.ietf.org/html/rfc2388>Returning Values from
    Forms: multipart/form-data</a></cite>, L. Masinter. IETF.</dd>
+   <dt id=refsRFC2397>[RFC2397]</dt>
+   <dd><cite><a href=http://tools.ietf.org/html/rfc2397>The "data"
+   URL scheme</a></cite>, L. Masinter. IETF.</dd>
    <dt id=refsRFC2425>[RFC2425]</dt>
    <dd><cite><a href=http://tools.ietf.org/html/rfc2425>A MIME
    Content-Type for Directory Information</a></cite>, T. Howes,
@@ -88951,6 +89540,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
   Julian Reschke,
   J&uuml;rgen Jeka,
   Justin Lebar,
+  Justin Schuh,
   Justin Sinclair,
   Kai Hendry,
   Kartikaya Gupta,
@@ -88997,6 +89587,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
   Martin Atkins,
   Martin D&uuml;rst,
   Martin Honnen,
+  Martin Janecke,
   Martin Kutschker,
   Martin Nilsson,
   Martin Thomson,
@@ -89064,6 +89655,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
   Paul Norman,
   Per-Erik Brodin,
   Perry Smith,
+  Peter Beverloo,
   Peter Karlsson,
   Peter Kasting,
   Peter Stark,
@@ -89101,7 +89693,9 @@ interface <a href=#htmldocument>HTMLDocument</a> {
   Roland Steiner,
   Roman Ivanov,
   Roy Fielding,
+  Ruud Steltenpool,
   Ryan King,
+  Ryosuke Niwa,
   S. Mike Dierken,
   Salvatore Loreto,
   Sam Dutton,
@@ -89160,6 +89754,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
   Tim Johansson,
   Toby Inkster,
   Todd Moody,
+  Tom Baker,
   Tom Pike,
   Tommy Thorsen,
   Travis Leithead,