[html5] r2192 - [] (0) WF2: <input type=''>. Also, some minor fixes relating to <label>.

whatwg at whatwg.org whatwg at whatwg.org
Tue Sep 16 13:48:11 PDT 2008


Author: ianh
Date: 2008-09-16 13:48:10 -0700 (Tue, 16 Sep 2008)
New Revision: 2192

Modified:
   index
   source
Log:
[] (0) WF2: <input type=''>. Also, some minor fixes relating to <label>.

Modified: index
===================================================================
--- index	2008-09-16 08:05:15 UTC (rev 2191)
+++ index	2008-09-16 20:48:10 UTC (rev 2192)
@@ -7562,7 +7562,7 @@
    title="">name</var>, and must return a live <code>NodeList</code>
    containing all the <code><a href="#a">a</a></code>, <code><a
    href="#applet">applet</a></code>, <code><a
-   href="#button">button</a></code>, <code><a href="#form">form</a></code>,
+   href="#button0">button</a></code>, <code><a href="#form">form</a></code>,
    <!-- frame? frameset?
   XXX--><code><a href="#iframe">iframe</a></code>,
    <code><a href="#img">img</a></code>, <code><a
@@ -7770,7 +7770,7 @@
   readonly attribute <a href="#domstringmap0">DOMStringMap</a> <a href="#dataset" title=dom-dataset>dataset</a>;
 
   // <a href="#user-interaction">user interaction</a>
-           attribute boolean <a href="#hidden2" title=dom-hidden>hidden</a>;
+           attribute boolean <a href="#hidden3" title=dom-hidden>hidden</a>;
   void <a href="#click1" title=dom-click>click</a>();
   void <a href="#scrollintoview" title=dom-scrollIntoView>scrollIntoView</a>();
   void <a href="#scrollintoview" title=dom-scrollIntoView>scrollIntoView</a>(in boolean top);
@@ -7859,7 +7859,7 @@
 
    <dd><code title=attr-id><a href="#id">id</a></code>
 
-   <dd><code title=attr-hidden><a href="#hidden1">hidden</a></code>
+   <dd><code title=attr-hidden><a href="#hidden2">hidden</a></code>
 
    <dd><code title=attr-lang><a href="#lang">lang</a></code>
 
@@ -8624,12 +8624,13 @@
    specifically intended for user interaction.
 
   <p>Certain elements in HTML can be activated, for instance <code><a
-   href="#a">a</a></code> elements, <code><a href="#button">button</a></code>
-   elements, or <code><a href="#input0">input</a></code> elements when their
-   <code title=attr-input-type>type</code> attribute is in the <span
-   title=attr-input-type-radio>Radio Button</span> state. Activation of those
-   elements can happen in various (UA-defined) ways, for instance via the
-   mouse or keyboard.
+   href="#a">a</a></code> elements, <code><a
+   href="#button0">button</a></code> elements, or <code><a
+   href="#input0">input</a></code> elements when their <code
+   title=attr-input-type><a href="#type12">type</a></code> attribute is in
+   the <span title=attr-input-type-radio>Radio Button</span> state.
+   Activation of those elements can happen in various (UA-defined) ways, for
+   instance via the mouse or keyboard.
 
   <p>When activation is performed via some method other than clicking the
    pointing device, the default action of the event that triggers the
@@ -13120,7 +13121,7 @@
    <dd><code title=attr-hyperlink-hreflang><a
     href="#hreflang3">hreflang</a></code>
 
-   <dd><code title=attr-hyperlink-type><a href="#type21">type</a></code>
+   <dd><code title=attr-hyperlink-type><a href="#type22">type</a></code>
 
    <dt>DOM interface:
 
@@ -13156,7 +13157,7 @@
    href="#rel3">rel</a></code>, <code title=attr-hyperlink-media><a
    href="#media14">media</a></code>, <code title=attr-hyperlink-hreflang><a
    href="#hreflang3">hreflang</a></code>, and <code
-   title=attr-hyperlink-type><a href="#type21">type</a></code> attributes
+   title=attr-hyperlink-type><a href="#type22">type</a></code> attributes
    must be omitted if the <code title=attr-hyperlink-href><a
    href="#href6">href</a></code> attribute is not present.
 
@@ -13185,7 +13186,7 @@
    href="#rel3">rel</a></code>, <code title=attr-hyperlink-media><a
    href="#media14">media</a></code>, <code title=attr-hyperlink-hreflang><a
    href="#hreflang3">hreflang</a></code>, and <code
-   title=attr-hyperlink-type><a href="#type21">type</a></code> attributes may
+   title=attr-hyperlink-type><a href="#type22">type</a></code> attributes may
    be used to indicate to the user the likely nature of the target resource
    before the user follows the link.
 
@@ -16479,7 +16480,7 @@
 
   <p>When an <a href="#a">a</a> element that is a <a
    href="#hyperlinks">hyperlink</a>, or a <code><a
-   href="#button">button</a></code> element, has no textual content but
+   href="#button0">button</a></code> element, has no textual content but
    contains one or more images, the <code title=attr-img-alt><a
    href="#alt0">alt</a></code> attributes must contain text that together
    convey the purpose of the link or button.
@@ -24054,7 +24055,7 @@
    <dd><code title=attr-hyperlink-hreflang><a
     href="#hreflang3">hreflang</a></code>
 
-   <dd><code title=attr-hyperlink-type><a href="#type21">type</a></code>
+   <dd><code title=attr-hyperlink-type><a href="#type22">type</a></code>
 
    <dt>DOM interface:
 
@@ -24230,7 +24231,7 @@
    href="#rel3">rel</a></code>, <code title=attr-hyperlink-media><a
    href="#media14">media</a></code>, <code title=attr-hyperlink-hreflang><a
    href="#hreflang3">hreflang</a></code>, and <code
-   title=attr-hyperlink-type><a href="#type21">type</a></code> attributes may
+   title=attr-hyperlink-type><a href="#type22">type</a></code> attributes may
    be used to indicate to the user the likely nature of the target resource
    before the user follows the link.
 
@@ -24240,7 +24241,7 @@
    href="#rel3">rel</a></code>, <code title=attr-hyperlink-media><a
    href="#media14">media</a></code>, <code title=attr-hyperlink-hreflang><a
    href="#hreflang3">hreflang</a></code>, and <code
-   title=attr-hyperlink-type><a href="#type21">type</a></code> attributes
+   title=attr-hyperlink-type><a href="#type22">type</a></code> attributes
    must be omitted if the <code title=attr-hyperlink-href><a
    href="#href6">href</a></code> attribute is not present.
 
@@ -26572,7 +26573,7 @@
    <dt><dfn id=resettable title=category-reset>Resettable elements</dfn>
 
    <dd>Denotes elements that can be affected when a <code><a
-    href="#form">form</a></code> element is <a href="#reset1"
+    href="#form">form</a></code> element is <a href="#reset2"
     title=concept-form-reset>reset</a>.
 
    <dt><dfn id=listed title=category-listed>Listed</dfn>
@@ -26692,9 +26693,10 @@
    href="#form-owner">form owner</a> is the <code><a
    href="#form">form</a></code> element, with the exception of <code><a
    href="#input0">input</a></code> elements whose <code
-   title=attr-input-type>type</code> attribute is in the <span
-   title=attr-input-type-image-state>Image Button</span> state, which must,
-   for historical reasons, be excluded from this particular collection.
+   title=attr-input-type><a href="#type12">type</a></code> attribute is in
+   the <span title=attr-input-type-image-state>Image Button</span> state,
+   which must, for historical reasons, be excluded from this particular
+   collection.
 
   <p>The <dfn id=length6 title=dom-form-length><code>length</code></dfn> DOM
    attribute must return the number of nodes <a href="#represents"
@@ -26726,7 +26728,7 @@
    href="#form">form</a></code> element itself.
 
   <p>The <dfn id=reset title=dom-form-reset><code>reset()</code></dfn>
-   method, when invoked, must <a href="#reset1"
+   method, when invoked, must <a href="#reset2"
    title=concept-form-reset>reset</a> the <code><a
    href="#form">form</a></code> element.
 
@@ -27022,7 +27024,7 @@
 
    <dd><code title=attr-fs-target><a href="#target3">target</a></code>
 
-   <dd><code title=attr-input-type>type</code>
+   <dd><code title=attr-input-type><a href="#type12">type</a></code>
 
    <dd><code title=attr-input-value>value</code>
 
@@ -27062,7 +27064,7 @@
            attribute float <span title=dom-input-valueAsNumber>valueAsNumber</span>;
   readonly attribute <a href="#htmloptionelement">HTMLOptionElement</a> <span title=dom-input-selectedOption>selectedOption</span>;
 
-  readonly attribute <a href="#htmlcollection0">HTMLCollection</a> <a href="#labels" title=dom-lfe-labels>labels</a>;
+  readonly attribute <span>NodeList</span> <a href="#labels" title=dom-lfe-labels>labels</a>;
 
   void <span title=dom-input-stepUp>stepUp</span>(in int n);
   void <span title=dom-input-stepDown>stepDown</span>(in int n);
@@ -27076,6 +27078,240 @@
   </dl>
   <!-- XXX add selectionStart and company -->
 
+  <p>The <code><a href="#input0">input</a></code> element represents a typed
+   data field, usually with a form control to allow the user to edit the
+   data.
+
+  <p>The <dfn id=type12 title=attr-input-type><code>type</code></dfn>
+   attribute controls the data type (and associated control) of the element.
+   It is an <a href="#enumerated">enumerated attribute</a>. The following
+   table lists the keywords and states for the attribute — the keywords
+   in the left column map to the states in the cell in the second column on
+   the same row as the keyword.
+
+  <table>
+   <thead>
+    <tr>
+     <th> Keyword
+
+     <th> State
+
+     <th> Data type
+
+     <th> Control type
+
+   <tbody>
+    <tr>
+     <td> <dfn id=text1
+      title=attr-input-type-text-keyword><code>text</code></dfn>
+
+     <td> <span title=attr-input-type-text>Text</span> state
+
+     <td> Text with no line breaks
+
+     <td> Text field
+
+    <tr>
+     <td> <dfn id=password
+      title=attr-input-type-password-keyword><code>password</code></dfn>
+
+     <td> <span title=attr-input-type-password>Password</span> state
+
+     <td> Text with no line breaks (sensitive information)
+
+     <td> Text field that obscures data entry
+
+    <tr>
+     <td> <dfn id=image3
+      title=attr-input-type-image-keyword><code>image</code></dfn>
+
+     <td> <span title=attr-input-type-image>Image Button</span> state
+
+     <td> A coordinate, relative to a particular image's size, with the extra
+      semantic that it must be the last value selected and initiates form
+      submission
+
+     <td> Either a clickable image, or a button
+
+    <tr>
+     <td> <dfn id=datetime3
+      title=attr-input-type-datetime-keyword><code>datetime</code></dfn>
+
+     <td> <span title=attr-input-type-datetime>Date and Time</span> state
+
+     <td> A date and time (year, month, day, hour, minute, second, fractions
+      of a second) with the time zone set to UTC
+
+     <td> A date and time control
+
+    <tr>
+     <td> <dfn id=datetime-local
+      title=attr-input-type-datetime-local-keyword><code>datetime-local</code></dfn>
+      
+
+     <td> <span title=attr-input-type-datetime-local>Local Date and
+      Time</span> state
+
+     <td> A date and time (year, month, day, hour, minute, second, fractions
+      of a second) with no time zone
+
+     <td> A date and time control
+
+    <tr>
+     <td> <dfn id=date1
+      title=attr-input-type-date-keyword><code>date</code></dfn>
+
+     <td> <span title=attr-input-type-date>Date</span> state
+
+     <td> A date (year, month, day) with no time zone
+
+     <td> A date control
+
+    <tr>
+     <td> <dfn id=month
+      title=attr-input-type-month-keyword><code>month</code></dfn>
+
+     <td> <span title=attr-input-type-month>Month</span> state
+
+     <td> A date consisting of a year and a month with no time zone
+
+     <td> A month control
+
+    <tr>
+     <td> <dfn id=week
+      title=attr-input-type-week-keyword><code>week</code></dfn>
+
+     <td> <span title=attr-input-type-week>Week</span> state
+
+     <td> A date consisting of a year and a week number with no time zone
+
+     <td> A week control
+
+    <tr>
+     <td> <dfn id=time2
+      title=attr-input-type-time-keyword><code>time</code></dfn>
+
+     <td> <span title=attr-input-type-time>Time</span> state
+
+     <td> A time (hour, minute, seconds, fractional seconds) with no time
+      zone
+
+     <td> A time control
+
+    <tr>
+     <td> <dfn id=number0
+      title=attr-input-type-number-keyword><code>number</code></dfn>
+
+     <td> <span title=attr-input-type-number>Number</span> state
+
+     <td> A numerical value
+
+     <td> A text field or spinner control
+
+    <tr>
+     <td> <dfn id=range
+      title=attr-input-type-range-keyword><code>range</code></dfn>
+
+     <td> <span title=attr-input-type-range>Range</span> state
+
+     <td> A numerical value, with the extra semantic that the exact value is
+      not important
+
+     <td> A slider control or similar
+
+    <tr>
+     <td> <dfn id=email
+      title=attr-input-type-email-keyword><code>email</code></dfn>
+
+     <td> <span title=attr-input-type-email>E-mail</span> state
+
+     <td> An e-mail address
+
+     <td> A text field
+
+    <tr>
+     <td> <dfn id=url1
+      title=attr-input-type-url-keyword><code>url</code></dfn>
+
+     <td> <span title=attr-input-type-url>URL</span> state
+
+     <td> An IRI
+
+     <td> A text field
+
+    <tr>
+     <td> <dfn id=checkbox
+      title=attr-input-type-checkbox-keyword><code>checkbox</code></dfn>
+
+     <td> <span title=attr-input-type-checkbox>Checkbox</span> state
+
+     <td> A set of zero or more values from a predefined list
+
+     <td> A checkbox
+
+    <tr>
+     <td> <dfn id=radio
+      title=attr-input-type-radio-keyword><code>radio</code></dfn>
+
+     <td> <span title=attr-input-type-radio>Radio Button</span> state
+
+     <td> An enumerated value
+
+     <td> A radio button
+
+    <tr>
+     <td> <dfn id=file
+      title=attr-input-type-file-keyword><code>file</code></dfn>
+
+     <td> <span title=attr-input-type-file>File</span> state
+
+     <td> Zero or more files each with a MIME type and optionally a file name
+      
+
+     <td> A label and a button
+
+    <tr>
+     <td> <dfn id=hidden
+      title=attr-input-type-hidden-keyword><code>hidden</code></dfn>
+
+     <td> <span title=attr-input-type-hidden>Hidden</span> state
+
+     <td> An arbitrary string
+
+     <td> n/a
+
+    <tr>
+     <td> <dfn id=submit0
+      title=attr-input-type-submit-keyword><code>submit</code></dfn>
+
+     <td> <span title=attr-input-type-submit>Submit Button</span> state
+
+     <td> An enumerated value, with the extra semantic that it must be the
+      last value selected and initiates form submission
+
+     <td> A button
+
+    <tr>
+     <td> <dfn id=reset0
+      title=attr-input-type-reset-keyword><code>reset</code></dfn>
+
+     <td> <span title=attr-input-type-reset>Reset Button</span> state
+
+     <td> n/a
+
+     <td> A button
+
+    <tr>
+     <td> <dfn id=button
+      title=attr-input-type-button-keyword><code>button</code></dfn>
+
+     <td> <span title=attr-input-type-button>Button</span> state
+
+     <td> n/a
+
+     <td> A button
+  </table>
+
   <p class=big-issue>...
 
   <p>The <code title=attr-fae-form><a href="#form0">form</a></code> attribute
@@ -27108,7 +27344,7 @@
    of the <a href="#constraint0">constraint validation API</a>.
 
   <h4 id=the-button><span class=secno>4.9.5 </span>The <dfn
-   id=button><code>button</code></dfn> element</h4>
+   id=button0><code>button</code></dfn> element</h4>
 
   <dl class=element>
    <dt>Categories
@@ -27168,7 +27404,7 @@
            attribute DOMString <span title=dom-button-type>type</span>;
            attribute DOMString <span title=dom-button-value>value</span>;
 
-  readonly attribute <a href="#htmlcollection0">HTMLCollection</a> <a href="#labels" title=dom-lfe-labels>labels</a>;
+  readonly attribute <span>NodeList</span> <a href="#labels" title=dom-lfe-labels>labels</a>;
 
   readonly attribute boolean <a href="#willvalidate" title=dom-cva-willValidate>willValidate</a>;
   readonly attribute <span>ValidityState</span> <a href="#validity" title=dom-cva-validity>validity</a>;
@@ -27182,7 +27418,7 @@
 
   <p>The <code title=attr-fae-form><a href="#form0">form</a></code> attribute
    is used to explicitly associate the <code><a
-   href="#button">button</a></code> element with its <a
+   href="#button0">button</a></code> element with its <a
    href="#form-owner">form owner</a>. The <code title=attr-fe-name><a
    href="#name11">name</a></code> attribute represents the element's name.
 
@@ -27258,7 +27494,7 @@
            attribute long <span title=dom-select-selectedIndex>selectedIndex</span>;
            attribute DOMString <span title=dom-select-value>value</span>;
 
-  readonly attribute <a href="#htmlcollection0">HTMLCollection</a> <a href="#labels" title=dom-lfe-labels>labels</a>;
+  readonly attribute <span>NodeList</span> <a href="#labels" title=dom-lfe-labels>labels</a>;
 
   void <span title=dom-select-add>add</span>(in <a href="#htmlelement">HTMLElement</a> element, in <a href="#htmlelement">HTMLElement</a> before);
   void <span title=dom-select-remove>remove</span>(in long index);
@@ -27499,7 +27735,7 @@
            attribute DOMString <span title=dom-textarea-defaultValue>defaultValue</span>;
            attribute DOMString <span title=dom-textarea-value>value</span>;
 
-  readonly attribute <a href="#htmlcollection0">HTMLCollection</a> <a href="#labels" title=dom-lfe-labels>labels</a>;
+  readonly attribute <span>NodeList</span> <a href="#labels" title=dom-lfe-labels>labels</a>;
 
   readonly attribute boolean <a href="#willvalidate" title=dom-cva-willValidate>willValidate</a>;
   readonly attribute <span>ValidityState</span> <a href="#validity" title=dom-cva-validity>validity</a>;
@@ -27630,21 +27866,21 @@
   <p>When a <a href="#form-associated">form-associated element</a>'s ancestor
    chain changes, e.g. because it or one of its ancestors was inserted or
    removed from a <code>Document</code>, then the user agent must <a
-   href="#reset0">reset the form owner</a> of that element.
+   href="#reset1">reset the form owner</a> of that element.
 
   <p>When a <a href="#form-associated">form-associated element</a>'s <code
    title=attr-fae-form><a href="#form0">form</a></code> attribute is added,
    removed, or has its value changed, then the user agent must <a
-   href="#reset0">reset the form owner</a> of that element.
+   href="#reset1">reset the form owner</a> of that element.
 
   <p>When a <a href="#form-associated">form-associated element</a> has a
    <code title=attr-fae-form><a href="#form0">form</a></code> attribute and
    the ID of any of the <code><a href="#form">form</a></code> elements in the
    <code>Document</code> changes, then the user agent must <a
-   href="#reset0">reset the form owner</a> of that <a
+   href="#reset1">reset the form owner</a> of that <a
    href="#form-associated">form-associated element</a>.
 
-  <p>When the user agent is to <dfn id=reset0>reset the form owner</dfn> of a
+  <p>When the user agent is to <dfn id=reset1>reset the form owner</dfn> of a
    <a href="#form-associated">form-associated element</a>, it must run the
    following steps:
 
@@ -27765,10 +28001,10 @@
    href="#form">form</a></code> elements and on elements that represent
    buttons that submit forms, e.g. an <code><a
    href="#input0">input</a></code> element whose <code
-   title=attr-input-type>type</code> attribute is in the <span
-   title=attr-input-type-submit-state>Submit Button</span> state. The
-   attributes on the buttons, when omitted, default to the values given on
-   the corresponding the <code><a href="#form">form</a></code> element.
+   title=attr-input-type><a href="#type12">type</a></code> attribute is in
+   the <span title=attr-input-type-submit-state>Submit Button</span> state.
+   The attributes on the buttons, when omitted, default to the values given
+   on the corresponding the <code><a href="#form">form</a></code> element.
 
   <h4 id=constraints><span class=secno>4.9.15 </span>Constraints</h4>
 
@@ -27877,7 +28113,7 @@
      multiple radio buttons in a set are marked as required, only one error
      need be reported). If one of the controls is not visible to the user
      (e.g. it has the <code title=attr-hidden><a
-     href="#hidden1">hidden</a></code> attribute set) then user agents may
+     href="#hidden2">hidden</a></code> attribute set) then user agents may
      report a script error.
 
    <li>
@@ -27967,23 +28203,23 @@
 
        <li>The <var title="">field</var> element is an <code><a
         href="#input0">input</a></code> element whose <code
-        title=attr-input-type>type</code> attribute is in the <span
-        title=attr-input-type-checkbox-state>Checkbox</span> state and the
-        control is not <a href="#checked"
+        title=attr-input-type><a href="#type12">type</a></code> attribute is
+        in the <span title=attr-input-type-checkbox-state>Checkbox</span>
+        state and the control is not <a href="#checked"
         title=concept-input-checked>checked</a>.
 
        <li>The <var title="">field</var> element is an <code><a
         href="#input0">input</a></code> element whose <code
-        title=attr-input-type>type</code> attribute is in the <span
-        title=attr-input-type-radio-state>Radio Button</span> state and the
-        control is not <a href="#checked"
+        title=attr-input-type><a href="#type12">type</a></code> attribute is
+        in the <span title=attr-input-type-radio-state>Radio Button</span>
+        state and the control is not <a href="#checked"
         title=concept-input-checked>checked</a>.
 
        <li>The <var title="">field</var> element is an <code><a
         href="#input0">input</a></code> element whose <code
-        title=attr-input-type>type</code> attribute is in the <span
-        title=attr-input-type-file-state>File Upload</span> state but the
-        control does not have any files selected.
+        title=attr-input-type><a href="#type12">type</a></code> attribute is
+        in the <span title=attr-input-type-file-state>File Upload</span>
+        state but the control does not have any files selected.
       </ul>
 
       <p>Otherwise, process <var title="">field</var> as follows:</p>
@@ -27991,9 +28227,9 @@
      <li>
       <p>If the <var title="">field</var> element is an <code><a
        href="#input0">input</a></code> element whose <code
-       title=attr-input-type>type</code> attribute is in the <span
-       title=attr-input-type-image-state>Image Button</span> state, then run
-       these further nested substeps:</p>
+       title=attr-input-type><a href="#type12">type</a></code> attribute is
+       in the <span title=attr-input-type-image-state>Image Button</span>
+       state, then run these further nested substeps:</p>
 
       <ol>
        <li>
@@ -28071,9 +28307,9 @@
      <li>
       <p>Otherwise, if the <var title="">field</var> element is an <code><a
        href="#input0">input</a></code> element whose <code
-       title=attr-input-type>type</code> attribute is in the <span
-       title=attr-input-type-file-state>File Upload</span> state, then for
-       each file <a href="#selected0"
+       title=attr-input-type><a href="#type12">type</a></code> attribute is
+       in the <span title=attr-input-type-file-state>File Upload</span>
+       state, then for each file <a href="#selected0"
        title=concept-input-type-file-selected>selected</a> in the <code><a
        href="#input0">input</a></code> element, append an entry in the <var
        title="">form data set</var> with the <var title="">name</var> as the
@@ -28138,9 +28374,9 @@
 
        <td> <a href="#mutate" title=submit-mutate-action>Mutate action</a>
 
-       <td> <a href="#submit0" title=submit-body>Submit as entity body</a>
+       <td> <a href="#submit1" title=submit-body>Submit as entity body</a>
 
-       <td> <a href="#submit0" title=submit-body>Submit as entity body</a>
+       <td> <a href="#submit1" title=submit-body>Submit as entity body</a>
 
        <td> <a href="#delete" title=submit-delete-action>Delete action</a>
 
@@ -28149,9 +28385,9 @@
 
        <td> <a href="#mutate" title=submit-mutate-action>Mutate action</a>
 
-       <td> <a href="#submit0" title=submit-body>Submit as entity body</a>
+       <td> <a href="#submit1" title=submit-body>Submit as entity body</a>
 
-       <td> <a href="#submit0" title=submit-body>Submit as entity body</a>
+       <td> <a href="#submit1" title=submit-body>Submit as entity body</a>
 
        <td> <a href="#delete" title=submit-delete-action>Delete action</a>
 
@@ -28236,7 +28472,7 @@
        purpose by the steps above, then it must be navigated with <a
        href="#replacement">replacement enabled</a>.</p>
 
-     <dt><dfn id=submit0 title=submit-body>Submit as entity body</dfn>
+     <dt><dfn id=submit1 title=submit-body>Submit as entity body</dfn>
 
      <dd>
       <p>Let <var title="">entity body</var> be the result of encoding the
@@ -28510,9 +28746,9 @@
 
   <h4 id=resetting><span class=secno>4.9.17 </span>Resetting a form</h4>
 
-  <p>When a form <var title="">form</var> is <dfn id=reset1
+  <p>When a form <var title="">form</var> is <dfn id=reset2
    title=concept-form-reset>reset</dfn>, the user agent must invoke the <a
-   href="#reset2" title=concept-form-reset-control>reset algorithm</a> of
+   href="#reset3" title=concept-form-reset-control>reset algorithm</a> of
    each <a href="#resettable" title=category-reset>resettable</a> elements
    whose <a href="#form-owner">form owner</a> is <var title="">form</var>,
    and must then <a href="#broadcast0">broadcast <code
@@ -28520,7 +28756,7 @@
    title="">form</var>.
 
   <p>Each <a href="#resettable" title=category-reset>resettable</a> element
-   defines its own <dfn id=reset2 title=concept-form-reset-control>reset
+   defines its own <dfn id=reset3 title=concept-form-reset-control>reset
    algorithm</dfn>.
 
   <h4 id=event><span class=secno>4.9.18 </span>Event dispatch</h4>
@@ -28595,7 +28831,7 @@
 
    <dd>If there is no <code title=attr-script-src><a
     href="#src9">src</a></code> attribute, depends on the value of the <code
-    title=attr-script-type><a href="#type12">type</a></code> attribute.
+    title=attr-script-type><a href="#type13">type</a></code> attribute.
 
    <dd>If there <em>is</em> a <code title=attr-script-src><a
     href="#src9">src</a></code> attribute, the element must be empty.
@@ -28608,7 +28844,7 @@
 
    <dd><code title=attr-script-defer><a href="#defer">defer</a></code>
 
-   <dd><code title=attr-script-type><a href="#type12">type</a></code>
+   <dd><code title=attr-script-type><a href="#type13">type</a></code>
 
    <dd><code title=attr-script-charset><a href="#charset2">charset</a></code>
 
@@ -28620,9 +28856,9 @@
            attribute DOMString <code title=dom-script-src><a href="#src10">src</a></code>;
            attribute boolean <code title=dom-script-async><a href="#async0">async</a></code>;
            attribute boolean <code title=dom-script-defer><a href="#defer0">defer</a></code>;
-           attribute DOMString <code title=dom-script-type><a href="#type13">type</a></code>;
+           attribute DOMString <code title=dom-script-type><a href="#type14">type</a></code>;
            attribute DOMString <code title=dom-script-charset><a href="#charset3">charset</a></code>;
-           attribute DOMString <code title=dom-script-text><a href="#text1">text</a></code>;
+           attribute DOMString <code title=dom-script-text><a href="#text2">text</a></code>;
 };</pre>
   </dl>
 
@@ -28633,18 +28869,18 @@
    inline or may be imported from an external file using the <code
    title=attr-script-src><a href="#src9">src</a></code> attribute. If the
    language is not that described by "<code title="">text/javascript</code>",
-   then the <code title=attr-script-type><a href="#type12">type</a></code>
+   then the <code title=attr-script-type><a href="#type13">type</a></code>
    attribute must be present. If the <code title=attr-script-type><a
-   href="#type12">type</a></code> attribute is present, its value must be the
+   href="#type13">type</a></code> attribute is present, its value must be the
    type of the script's language.
 
   <p>When used to include data blocks, the data must be embedded inline, the
    format of the data must be given using the <code title=attr-script-type><a
-   href="#type12">type</a></code> attribute, and the <code
+   href="#type13">type</a></code> attribute, and the <code
    title=attr-script-src><a href="#src9">src</a></code> attribute must not be
    specified.
 
-  <p>The <dfn id=type12 title=attr-script-type><code>type</code></dfn>
+  <p>The <dfn id=type13 title=attr-script-type><code>type</code></dfn>
    attribute gives the language of the script or format of the data. If the
    attribute is present, its value must be a valid MIME type, optionally with
    parameters. The <code title="">charset</code> parameter must not be
@@ -28656,7 +28892,7 @@
    if specified, gives the address of the external script resource to use.
    The value of the attribute must be a <a href="#valid8">valid URL</a>
    identifying a script resource of the type given by the <code
-   title=attr-script-type><a href="#type12">type</a></code> attribute, if the
+   title=attr-script-type><a href="#type13">type</a></code> attribute, if the
    attribute is present, or of the type "<code
    title="">text/javascript</code>", if the attribute is absent.
 
@@ -28703,7 +28939,7 @@
    of the synchronous blocking behavior that is the default.
 
   <p>Changing the <code title=attr-script-src><a href="#src9">src</a></code>,
-   <code title=attr-script-type><a href="#type12">type</a></code>, <code
+   <code title=attr-script-type><a href="#type13">type</a></code>, <code
    title=attr-script-charset><a href="#charset2">charset</a></code>, <code
    title=attr-script-async><a href="#async">async</a></code>, and <code
    title=attr-script-defer><a href="#defer">defer</a></code> attributes
@@ -28756,16 +28992,16 @@
 
     <ul class=brief>
      <li>the <code><a href="#script1">script</a></code> element has a <code
-      title=attr-script-type><a href="#type12">type</a></code> attribute and
+      title=attr-script-type><a href="#type13">type</a></code> attribute and
       its value is the empty string, or
 
      <li>the <code><a href="#script1">script</a></code> element has no <code
-      title=attr-script-type><a href="#type12">type</a></code> attribute but
+      title=attr-script-type><a href="#type13">type</a></code> attribute but
       it has a <code title=attr-script-language>language</code> attribute and
       <em>that</em> attribute's value is the empty string, or
 
      <li>the <code><a href="#script1">script</a></code> element has neither a
-      <code title=attr-script-type><a href="#type12">type</a></code>
+      <code title=attr-script-type><a href="#type13">type</a></code>
       attribute nor a <code title=attr-script-language>language</code>
       attribute, then
     </ul>
@@ -28775,7 +29011,7 @@
      title="">text/javascript</code>".</p>
 
     <p>Otherwise, if the <code><a href="#script1">script</a></code> element
-     has a <code title=attr-script-type><a href="#type12">type</a></code>
+     has a <code title=attr-script-type><a href="#type13">type</a></code>
      attribute, let <var><a href="#the-scripts">the script's type</a></var>
      for this <code><a href="#script1">script</a></code> element be the value
      of that attribute.</p>
@@ -29030,7 +29266,7 @@
        <dd>
         <p>For scripting languages that consist of pure text, user agents
          must use the value of the DOM <code title=dom-script-text><a
-         href="#text1">text</a></code> attribute (defined below) as the
+         href="#text2">text</a></code> attribute (defined below) as the
          script to execute, and for XML-based scripting languages, user
          agents must use all the child nodes of the <code><a
          href="#script1">script</a></code> element as the script to execute.</p>
@@ -29066,7 +29302,7 @@
   </dl>
 
   <p>The DOM attributes <dfn id=src10
-   title=dom-script-src><code>src</code></dfn>, <dfn id=type13
+   title=dom-script-src><code>src</code></dfn>, <dfn id=type14
    title=dom-script-type><code>type</code></dfn>, <dfn id=charset3
    title=dom-script-charset><code>charset</code></dfn>, <dfn id=async0
    title=dom-script-async><code>async</code></dfn>, and <dfn id=defer0
@@ -29074,7 +29310,7 @@
    href="#reflect">reflect</a> the respective content attributes of the same
    name.
 
-  <p>The DOM attribute <dfn id=text1
+  <p>The DOM attribute <dfn id=text2
    title=dom-script-text><code>text</code></dfn> must return a concatenation
    of the contents of all the <a href="#text-node" title="text node">text
    nodes</a> that are direct children of the <code><a
@@ -30754,8 +30990,9 @@
    <dd>
     <p>If the first element child of a cell's element is an <code><a
      href="#input0">input</a></code> element that has a <code
-     title=attr-input-type>type</code> attribute with the value <code
-     title="">checkbox</code>, then the cell acts as a check box cell.</p>
+     title=attr-input-type><a href="#type12">type</a></code> attribute with
+     the value <code title="">checkbox</code>, then the cell acts as a check
+     box cell.</p>
 
     <p>The <code title=dom-provider-getCellData><a
      href="#getcelldata">getCellData()</a></code> method must return the
@@ -30786,10 +31023,10 @@
    <dd>
     <p>If the first element child of a cell's element is an <code><a
      href="#input0">input</a></code> element that has a <code
-     title=attr-input-type>type</code> attribute with the value <code
-     title="">text</code> or that has no <code
-     title=attr-input-type>type</code> attribute at all, then the cell acts
-     as an editable cell.</p>
+     title=attr-input-type><a href="#type12">type</a></code> attribute with
+     the value <code title="">text</code> or that has no <code
+     title=attr-input-type><a href="#type12">type</a></code> attribute at
+     all, then the cell acts as an editable cell.</p>
 
     <p>The <code title=dom-provider-getCellData><a
      href="#getcelldata">getCellData()</a></code> method must return the
@@ -31610,7 +31847,7 @@
 
    <dt>Element-specific attributes:
 
-   <dd><code title=attr-command-type><a href="#type14">type</a></code>
+   <dd><code title=attr-command-type><a href="#type15">type</a></code>
 
    <dd><code title=attr-command-label><a href="#label0">label</a></code>
 
@@ -31637,7 +31874,7 @@
    <dd>
     <pre
      class=idl>interface <dfn id=htmlcommandelement>HTMLCommandElement</dfn> : <a href="#htmlelement">HTMLElement</a> {
-           attribute DOMString <a href="#type15" title=dom-command-type>type</a>;
+           attribute DOMString <a href="#type16" title=dom-command-type>type</a>;
            attribute DOMString <a href="#label1" title=dom-command-label>label</a>;
            attribute DOMString <a href="#icon0" title=dom-command-icon>icon</a>;
            attribute boolean <a href="#disabled10" title=dom-command-disabled>disabled</a>;
@@ -31654,7 +31891,7 @@
   <p>The <code><a href="#command0">command</a></code> element represents a
    command that the user can invoke.
 
-  <p>The <dfn id=type14 title=attr-command-type><code>type</code></dfn>
+  <p>The <dfn id=type15 title=attr-command-type><code>type</code></dfn>
    attribute indicates the kind of command: either a normal command with an
    associated action, or a state or option that can be toggled, or a
    selection of one item from a list of items.</p>
@@ -31685,7 +31922,7 @@
 
   <p class=note>The distinction between <code title=attr-command-disabled><a
    href="#disabled9">disabled</a></code> and <code title=attr-hidden><a
-   href="#hidden1">hidden</a></code> is subtle. A command should be disabled
+   href="#hidden2">hidden</a></code> is subtle. A command should be disabled
    if, in the same context, it could be enabled if only certain aspects of
    the situation were changed. A command should be marked as hidden if, in
    that situation, the command will never be enabled. For example, in the
@@ -31702,7 +31939,7 @@
    title=attr-command-radiogroup><code>radiogroup</code></dfn> attribute
    gives the name of the group of commands that will be toggled when the
    command itself is toggled, for commands whose <code
-   title=attr-command-type><a href="#type14">type</a></code> attribute has
+   title=attr-command-type><a href="#type15">type</a></code> attribute has
    the value "<code title="">radio</code>". The scope of the name is the
    child list of the parent element.
 
@@ -31723,7 +31960,7 @@
     attributes off, and that has a default command.</p>
   </div>
 
-  <p>The <dfn id=type15 title=dom-command-type><code>type</code></dfn>, <dfn
+  <p>The <dfn id=type16 title=dom-command-type><code>type</code></dfn>, <dfn
    id=label1 title=dom-command-label><code>label</code></dfn>, <dfn id=icon0
    title=dom-command-icon><code>icon</code></dfn>, <dfn id=disabled10
    title=dom-command-disabled><code>disabled</code></dfn>, <dfn id=checked2
@@ -31735,11 +31972,11 @@
 
   <p>The <dfn id=click title=dom-command-click><code>click()</code></dfn>
    method's behavior depends on the value of the <code
-   title=attr-command-type><a href="#type14">type</a></code> attribute of the
+   title=attr-command-type><a href="#type15">type</a></code> attribute of the
    element, as follows:
 
   <dl class=switch>
-   <dt>If the <code title=attr-command-type><a href="#type14">type</a></code>
+   <dt>If the <code title=attr-command-type><a href="#type15">type</a></code>
     attribute has the value <code title="">checkbox</code>
 
    <dd>
@@ -31751,7 +31988,7 @@
      must then <a href="#firing">fire a <code title="">click</code> event</a>
      at the element.
 
-   <dt>If the <code title=attr-command-type><a href="#type14">type</a></code>
+   <dt>If the <code title=attr-command-type><a href="#type15">type</a></code>
     attribute has the value <code title="">radio</code>
 
    <dd>
@@ -31815,14 +32052,14 @@
 
    <dt>Element-specific attributes:
 
-   <dd><code title=attr-command-type><a href="#type14">type</a></code>
+   <dd><code title=attr-command-type><a href="#type15">type</a></code>
 
    <dt>DOM interface:
 
    <dd>
     <pre
      class=idl>interface <dfn id=htmlbrowserbuttonelement>HTMLBrowserButtonElement</dfn> : <a href="#htmlelement">HTMLElement</a> {
-           attribute DOMString <a href="#type17" title=dom-bb-type>type</a>;
+           attribute DOMString <a href="#type18" title=dom-bb-type>type</a>;
   readonly attribute boolean <a href="#supported" title=dom-bb-supported>supported</a>;
   readonly attribute boolean <a href="#disabled11" title=dom-bb-disabled>disabled</a>;
 };</pre>
@@ -31834,9 +32071,9 @@
   <p>The <code><a href="#bb">bb</a></code> element represents a user agent
    command that the user can invoke.
 
-  <p>The <dfn id=type16 title=attr-bb-type><code>type</code></dfn> attribute
+  <p>The <dfn id=type17 title=attr-bb-type><code>type</code></dfn> attribute
    indicates the kind of command. The <code title=attr-bb-type><a
-   href="#type16">type</a></code> attribute is an <a
+   href="#type17">type</a></code> attribute is an <a
    href="#enumerated">enumerated attribute</a>. The following table lists the
    keywords and states for the attribute — the keywords in the left
    column map to the states listed in the cell in the second column on the
@@ -31869,10 +32106,10 @@
    is to not do anything, and the <i>relevance</i> is unconditionally false.
 
   <p>A <code><a href="#bb">bb</a></code> element whose <code
-   title=attr-bb-type><a href="#type16">type</a></code> attribute is in a
+   title=attr-bb-type><a href="#type17">type</a></code> attribute is in a
    state whose <i>relevance</i> is true must be enabled. Conversely, a
    <code><a href="#bb">bb</a></code> element whose <code
-   title=attr-bb-type><a href="#type16">type</a></code> attribute is in a
+   title=attr-bb-type><a href="#type17">type</a></code> attribute is in a
    state whose <i>relevance</i> is false must be disabled.
 
   <p>If a <code><a href="#bb">bb</a></code> element is enabled, it must match
@@ -31882,24 +32119,24 @@
   <p>User agents should allow users to invoke <code><a
    href="#bb">bb</a></code> elements when they are enabled. When a user
    invokes a <code><a href="#bb">bb</a></code> element, its <code
-   title=attr-bb-type><a href="#type16">type</a></code> attribute's state's
+   title=attr-bb-type><a href="#type17">type</a></code> attribute's state's
    <i>action</i> must be invoked.
 
   <p>When the element has no descendant element children and has no
    descendant text node children of non-zero length, the element represents a
    browser button with a user-agent-defined icon or text representing the
-   <code title=attr-bb-type><a href="#type16">type</a></code> attribute's
+   <code title=attr-bb-type><a href="#type17">type</a></code> attribute's
    state's <i>action</i> and <i>relevance</i> (enabled vs disabled).
    Otherwise, the element represents its descendants.
 
-  <p>The <dfn id=type17 title=dom-bb-type><code>type</code></dfn> DOM
+  <p>The <dfn id=type18 title=dom-bb-type><code>type</code></dfn> DOM
    attribute must <a href="#reflect">reflect</a> the content attribute of the
    same name.
 
   <p>The <dfn id=supported
    title=dom-bb-supported><code>supported</code></dfn> DOM attribute must
    return true if the <code title=attr-bb-type><a
-   href="#type16">type</a></code> attribute is in a state other than the <i
+   href="#type17">type</a></code> attribute is in a state other than the <i
    title=attr-bb-type-null-state><a href="#null">null</a></i> state and the
    user agent supports that state's <i>action</i> (i.e. when the attribute's
    value is one that the user agent recognises and supports), and false
@@ -31908,7 +32145,7 @@
   <p>The <dfn id=disabled11 title=dom-bb-disabled><code>disabled</code></dfn>
    DOM attribute must return true if the element is disabled, and false
    otherwise (i.e. it returns the opposite of the <code title=attr-bb-type><a
-   href="#type16">type</a></code> attribute's state's <i>relevance</i>).
+   href="#type17">type</a></code> attribute's state's <i>relevance</i>).
 
   <h5 id=browser><span class=secno>4.11.4.1. </span>Browser button types</h5>
 
@@ -31999,7 +32236,7 @@
    <dd><a href="#flow-content0">Flow content</a>.
 
    <dd>If the element's <code title=attr-menu-type><a
-    href="#type18">type</a></code> attribute is in the <a href="#tool-bar"
+    href="#type19">type</a></code> attribute is in the <a href="#tool-bar"
     title="tool bar state">tool bar</a> state: <a
     href="#interactive1">Interactive content</a>.
 
@@ -32021,7 +32258,7 @@
 
    <dt>Element-specific attributes:
 
-   <dd><code title=attr-menu-type><a href="#type18">type</a></code>
+   <dd><code title=attr-menu-type><a href="#type19">type</a></code>
 
    <dd><code title=attr-menu-label><a href="#label2">label</a></code>
 
@@ -32030,7 +32267,7 @@
    <dd>
     <pre
      class=idl>interface <dfn id=htmlmenuelement>HTMLMenuElement</dfn> : <a href="#htmlelement">HTMLElement</a> {
-           attribute DOMString <a href="#type19" title=dom-menu-type>type</a>;
+           attribute DOMString <a href="#type20" title=dom-menu-type>type</a>;
            attribute DOMString <a href="#label3" title=dom-menu-label>label</a>;
 };</pre>
   </dl>
@@ -32038,7 +32275,7 @@
   <p>The <code><a href="#menu">menu</a></code> element represents a list of
    commands.
 
-  <p>The <dfn id=type18 title=attr-menu-type><code>type</code></dfn>
+  <p>The <dfn id=type19 title=attr-menu-type><code>type</code></dfn>
    attribute is an <a href="#enumerated">enumerated attribute</a> indicating
    the kind of menu being declared. The attribute has three states. The <code
    title=attr-menu-type-context>context</code> keyword maps to the <dfn
@@ -32053,19 +32290,19 @@
    bar.
 
   <p>If a <code><a href="#menu">menu</a></code> element's <code
-   title=attr-menu-type><a href="#type18">type</a></code> attribute is in the
+   title=attr-menu-type><a href="#type19">type</a></code> attribute is in the
    <a href="#context1" title="context menu state">context menu</a> state,
    then the element represents the commands of a context menu, and the user
    can only interact with the commands if that context menu is activated.
 
   <p>If a <code><a href="#menu">menu</a></code> element's <code
-   title=attr-menu-type><a href="#type18">type</a></code> attribute is in the
+   title=attr-menu-type><a href="#type19">type</a></code> attribute is in the
    <a href="#tool-bar" title="tool bar state">tool bar</a> state, then the
    element represents a list of active commands that the user can immediately
    interact with.
 
   <p>If a <code><a href="#menu">menu</a></code> element's <code
-   title=attr-menu-type><a href="#type18">type</a></code> attribute is in the
+   title=attr-menu-type><a href="#type19">type</a></code> attribute is in the
    <a href="#list" title="list state">list</a> state, then the element either
    represents an unordered list of items (each represented by an <code><a
    href="#li">li</a></code> element), each of which represents a command that
@@ -32079,7 +32316,7 @@
    another menu would use the nested menu's <code title=attr-menu-label><a
    href="#label2">label</a></code> attribute for the submenu's menu label.
 
-  <p>The <dfn id=type19 title=dom-menu-type><code>type</code></dfn> and <dfn
+  <p>The <dfn id=type20 title=dom-menu-type><code>type</code></dfn> and <dfn
    id=label3 title=dom-menu-label><code>label</code></dfn> DOM attributes
    must <a href="#reflect">reflect</a> the content attributes of the same
    name.
@@ -32360,7 +32597,7 @@
    visible.
 
   <p>When a <code><a href="#menu">menu</a></code> element has a <code
-   title=attr-menu-type><a href="#type18">type</a></code> attribute with the
+   title=attr-menu-type><a href="#type19">type</a></code> attribute with the
    value <code title="">toolbar</code>, then the user agent must <a
    href="#building0" title="building menus and tool bars">build</a> the menu
    for that <code><a href="#menu">menu</a></code> element and <span
@@ -32383,7 +32620,7 @@
    title=concept-facet>facets</dfn>:
 
   <dl>
-   <dt><dfn id=type20 title=command-facet-Type>Type</dfn>
+   <dt><dfn id=type21 title=command-facet-Type>Type</dfn>
 
    <dd>The kind of command: "command", meaning it is a normal command;
     "radio", meaning that triggering the command will, amongst other things,
@@ -32414,7 +32651,7 @@
    <!--
    changing base URLs might change the icon -->
 
-   <dt><dfn id=hidden title=command-facet-HiddenState>Hidden State</dfn>
+   <dt><dfn id=hidden0 title=command-facet-HiddenState>Hidden State</dfn>
 
    <dd>Whether the command is hidden or not (basically, whether it should be
     shown in menus).
@@ -32460,7 +32697,7 @@
   readonly attribute DOMString <a href="#label5" title=dom-command-ro-label>label</a>;
   readonly attribute DOMString <a href="#title7" title=dom-command-ro-title>title</a>;
   readonly attribute DOMString <a href="#icon2" title=dom-command-ro-icon>icon</a>;
-  readonly attribute boolean <a href="#hidden0" title=dom-command-ro-hidden>hidden</a>;
+  readonly attribute boolean <a href="#hidden1" title=dom-command-ro-hidden>hidden</a>;
   readonly attribute boolean <a href="#disabled13" title=dom-command-ro-disabled>disabled</a>;              
   readonly attribute boolean <a href="#checked4" title=dom-command-ro-checked>checked</a>;              
   void <a href="#click0" title=dom-command-ro-click>click</a>();
@@ -32483,7 +32720,7 @@
    title=dom-command-ro-commandType><code>commandType</code></dfn> attribute
    must return a string whose value is either "<code
    title="">command</code>", "<code title="">radio</code>", or "<code
-   title="">checked</code>", depending on whether the <a href="#type20"
+   title="">checked</code>", depending on whether the <a href="#type21"
    title=command-facet-Type>Type</a> of the command defined by the element is
    "command", "radio", or "checked" respectively. If the element does not
    define a command, it must return null.
@@ -32521,14 +32758,14 @@
    href="#icon0">icon</a></code> DOM attribute on <code><a
    href="#command0">command</a></code> elements.
 
-  <p>The <dfn id=hidden0
+  <p>The <dfn id=hidden1
    title=dom-command-ro-hidden><code>hidden</code></dfn> attribute must
-   return true if the command's <a href="#hidden"
+   return true if the command's <a href="#hidden0"
    title=command-facet-HiddenState>Hidden State</a> is that the command is
    hidden, and false if it is that the command is not hidden. If the element
    does not define a command, the attribute must return false. This attribute
    will be shadowed by the <code title=dom-hidden><a
-   href="#hidden2">hidden</a></code> DOM attribute on the <code><a
+   href="#hidden3">hidden</a></code> DOM attribute on the <code><a
    href="#htmlelement">HTMLElement</a></code> interface.
 
   <p>The <dfn id=disabled13
@@ -32536,11 +32773,11 @@
    return true if the command's <a href="#disabled12"
    title=command-facet-DisabledState>Disabled State</a> is that the command
    is disabled, and false if the command is not disabled. This attribute is
-   not affected by the command's <a href="#hidden"
+   not affected by the command's <a href="#hidden0"
    title=command-facet-HiddenState>Hidden State</a>. If the element does not
    define a command, the attribute must return false. This attribute will be
    shadowed by the <code title="">disabled</code> attribute on <code><a
-   href="#button">button</a></code>, <code><a
+   href="#button0">button</a></code>, <code><a
    href="#input0">input</a></code>, <code><a
    href="#option">option</a></code>, and <code><a
    href="#command0">command</a></code> elements.
@@ -32592,7 +32829,7 @@
    title=attr-hyperlink-href><a href="#href6">href</a></code> attribute <a
    href="#command1" title=concept-command>defines a command</a>.
 
-  <p>The <a href="#type20" title=command-facet-Type>Type</a> of the command
+  <p>The <a href="#type21" title=command-facet-Type>Type</a> of the command
    is "command".
 
   <p>The <a href="#id1" title=command-facet-ID>ID</a> of the command is the
@@ -32618,9 +32855,9 @@
    Otherwise, there is no <a href="#icon1" title=command-facet-Icon>Icon</a>
    for the command.
 
-  <p>The <a href="#hidden" title=command-facet-HiddenState>Hidden State</a>
+  <p>The <a href="#hidden0" title=command-facet-HiddenState>Hidden State</a>
    of the command is true (hidden) if the element has a <code
-   title=attr-hidden><a href="#hidden1">hidden</a></code> attribute, and
+   title=attr-hidden><a href="#hidden2">hidden</a></code> attribute, and
    false otherwise.
 
   <p>The <a href="#disabled12" title=command-facet-DisabledState>Disabled
@@ -32638,14 +32875,14 @@
    title=button-command>Using the <code>button</code> element to define a
    command</dfn></h5>
 
-  <p>A <code><a href="#button">button</a></code> element always <a
+  <p>A <code><a href="#button0">button</a></code> element always <a
    href="#command1" title=concept-command>defines a command</a>.
 
-  <p>The <a href="#type20" title=command-facet-Type>Type</a>, <a href="#id1"
+  <p>The <a href="#type21" title=command-facet-Type>Type</a>, <a href="#id1"
    title=command-facet-ID>ID</a>, <a href="#label4"
    title=command-facet-Label>Label</a>, <a href="#hint"
    title=command-facet-Hint>Hint</a>, <a href="#icon1"
-   title=command-facet-Icon>Icon</a>, <a href="#hidden"
+   title=command-facet-Icon>Icon</a>, <a href="#hidden0"
    title=command-facet-HiddenState>Hidden State</a>, <a href="#checked3"
    title=command-facet-CheckedState>Checked State</a>, and <a href="#action2"
    title=command-facet-Action>Action</a> facets of the command are determined
@@ -32661,19 +32898,20 @@
    command</dfn></h5>
 
   <p>An <code><a href="#input0">input</a></code> element whose <code
-   title=attr-input-type>type</code> attribute is in one of the <span
-   title=attr-input-type-submit>Submit Button</span>, <span
+   title=attr-input-type><a href="#type12">type</a></code> attribute is in
+   one of the <span title=attr-input-type-submit>Submit Button</span>, <span
    title=attr-input-type-reset>Reset Button</span>, <span
    title=attr-input-type-button>Button</span>, <span
    title=attr-input-type-radio>Radio Button</span>, or <span
    title=attr-input-type-checkbox>Checkbox</span> states <a href="#command1"
    title=concept-command>defines a command</a>.
 
-  <p>The <a href="#type20" title=command-facet-Type>Type</a> of the command
-   is "radio" if the <code title=attr-input-type>type</code> attribute is in
-   the <code title=attr-input-type-radio>Radio Button</code> state,
-   "checkbox" if the <code title=attr-input-type>type</code> attribute is in
-   the <code title=attr-input-type-checkbox>Checkbox</code> state, and
+  <p>The <a href="#type21" title=command-facet-Type>Type</a> of the command
+   is "radio" if the <code title=attr-input-type><a
+   href="#type12">type</a></code> attribute is in the <code
+   title=attr-input-type-radio>Radio Button</code> state, "checkbox" if the
+   <code title=attr-input-type><a href="#type12">type</a></code> attribute is
+   in the <code title=attr-input-type-checkbox>Checkbox</code> state, and
    "command" otherwise.
 
   <p>The <a href="#id1" title=command-facet-ID>ID</a> of the command is the
@@ -32684,22 +32922,23 @@
   <p>The <a href="#label4" title=command-facet-Label>Label</a> of the command
    depends on the Type of the command:
 
-  <p>If the <a href="#type20" title=command-facet-Type>Type</a> is "command",
+  <p>If the <a href="#type21" title=command-facet-Type>Type</a> is "command",
    then it is the string given by the <code
    title=attr-input-value>value</code> attribute, if any, and a
    <span>UA-dependent value</span><!-- XXX xref--> that the UA uses to label
    the button itself if the attribute is absent.
 
-  <p>Otherwise, the <a href="#type20" title=command-facet-Type>Type</a> is
-   "radio" or "checkbox". If the element has a <code><a
-   href="#label">label</a></code> element associated with it, the <code><a
-   href="#textcontent">textContent</a></code> of the first such element is
-   the <a href="#label4" title=command-facet-Label>Label</a> (in DOM terms,
-   this the string given by <code><var
+  <p>Otherwise, the <a href="#type21" title=command-facet-Type>Type</a> is
+   "radio" or "checkbox". If the element is a <a href="#labeled">labeled
+   control</a>, the <code title="">textContent</code> of the first <code><a
+   href="#label">label</a></code> element in <a href="#tree-order">tree
+   order</a> whose <a href="#labeled">labeled control</a> is the element in
+   question is the <a href="#label4" title=command-facet-Label>Label</a> (in
+   DOM terms, this the string given by <code><var
    title="">element</var>.labels[0].textContent</code>). Otherwise, the value
-   of the <code>value</code> attribute, if present, is the <a href="#label4"
-   title=command-facet-Label>Label</a>. Otherwise, the <a href="#label4"
-   title=command-facet-Label>Label</a> is the empty string.
+   of the <code title=attr-input-value>value</code> attribute, if present, is
+   the <a href="#label4" title=command-facet-Label>Label</a>. Otherwise, the
+   <a href="#label4" title=command-facet-Label>Label</a> is the empty string.
 
   <p>The <a href="#hint" title=command-facet-Hint>Hint</a> of the command is
    the value of the <code title=attr-title><a href="#title">title</a></code>
@@ -32710,9 +32949,9 @@
   <p>There is no <a href="#icon1" title=command-facet-Icon>Icon</a> for the
    command.
 
-  <p>The <a href="#hidden" title=command-facet-HiddenState>Hidden State</a>
+  <p>The <a href="#hidden0" title=command-facet-HiddenState>Hidden State</a>
    of the command is true (hidden) if the element has a <code
-   title=attr-hidden><a href="#hidden1">hidden</a></code> attribute, and
+   title=attr-hidden><a href="#hidden2">hidden</a></code> attribute, and
    false otherwise.
 
   <p>The <a href="#disabled12" title=command-facet-DisabledState>Disabled
@@ -32720,7 +32959,7 @@
    title=concept-fe-disabled>disabled</a> state of the control.
 
   <p>The <a href="#checked3" title=command-facet-CheckedState>Checked
-   State</a> of the command is true if the command is of <a href="#type20"
+   State</a> of the command is true if the command is of <a href="#type21"
    title=command-facet-Type>Type</a> "radio" or "checkbox" and the element
    has a <code title=attr-input-checked>checked</code> attribute, and false
    otherwise.
@@ -32742,7 +32981,7 @@
    title=attr-option-value>value</code> attribute that is not the empty
    string <a href="#command1" title=concept-command>defines a command</a>.
 
-  <p>The <a href="#type20" title=command-facet-Type>Type</a> of the command
+  <p>The <a href="#type21" title=command-facet-Type>Type</a> of the command
    is "radio" if the <code><a href="#option">option</a></code>'s nearest
    ancestor <code><a href="#select">select</a></code> element has no <code
    title=attr-select-multiple>multiple</code> attribute, and "checkbox" if it
@@ -32768,9 +33007,9 @@
   <p>There is no <a href="#icon1" title=command-facet-Icon>Icon</a> for the
    command.
 
-  <p>The <a href="#hidden" title=command-facet-HiddenState>Hidden State</a>
+  <p>The <a href="#hidden0" title=command-facet-HiddenState>Hidden State</a>
    of the command is true (hidden) if the element has a <code
-   title=attr-hidden><a href="#hidden1">hidden</a></code> attribute, and
+   title=attr-hidden><a href="#hidden2">hidden</a></code> attribute, and
    false otherwise.
 
   <p>The <a href="#disabled12" title=command-facet-DisabledState>Disabled
@@ -32783,8 +33022,8 @@
    otherwise.
 
   <p>The <a href="#action2" title=command-facet-Action>Action</a> of the
-   command depends on its <a href="#type20"
-   title=command-facet-Type>Type</a>. If the command is of <a href="#type20"
+   command depends on its <a href="#type21"
+   title=command-facet-Type>Type</a>. If the command is of <a href="#type21"
    title=command-facet-Type>Type</a> "radio" then this must set the <code
    title=dom-option-selected>selected</code> DOM attribute of the <code><a
    href="#option">option</a></code> element to true, otherwise it must toggle
@@ -32802,9 +33041,9 @@
   <p>A <code><a href="#command0">command</a></code> element <a
    href="#command1" title=concept-command>defines a command</a>.
 
-  <p>The <a href="#type20" title=command-facet-Type>Type</a> of the command
+  <p>The <a href="#type21" title=command-facet-Type>Type</a> of the command
    is "radio" if the <code><a href="#command0">command</a></code>'s <code
-   title=attr-command-type><a href="#type14">type</a></code> attribute is
+   title=attr-command-type><a href="#type15">type</a></code> attribute is
    "<code>radio</code>", "checkbox" if the attribute's value is
    "<code>checkbox</code>", and "command" otherwise.
 
@@ -32831,9 +33070,9 @@
    Otherwise, there is no <a href="#icon1" title=command-facet-Icon>Icon</a>
    for the command.
 
-  <p>The <a href="#hidden" title=command-facet-HiddenState>Hidden State</a>
+  <p>The <a href="#hidden0" title=command-facet-HiddenState>Hidden State</a>
    of the command is true (hidden) if the element has a <code
-   title=attr-hidden><a href="#hidden1">hidden</a></code> attribute, and
+   title=attr-hidden><a href="#hidden2">hidden</a></code> attribute, and
    false otherwise.
 
   <p>The <a href="#disabled12" title=command-facet-DisabledState>Disabled
@@ -32861,7 +33100,7 @@
   <p>A <code><a href="#bb">bb</a></code> element always <a href="#command1"
    title=concept-command>defines a command</a>.
 
-  <p>The <a href="#type20" title=command-facet-Type>Type</a> of the command
+  <p>The <a href="#type21" title=command-facet-Type>Type</a> of the command
    is "command".
 
   <p>The <a href="#id1" title=command-facet-ID>ID</a> of the command is the
@@ -32874,14 +33113,14 @@
    href="#textcontent">textContent</a></code> DOM attribute, if that is not
    the empty string, or a user-agent-defined string appropriate for the
    <code><a href="#bb">bb</a></code> element's <code title=attr-bb-type><a
-   href="#type16">type</a></code> attribute's state.
+   href="#type17">type</a></code> attribute's state.
 
   <p>The <a href="#hint" title=command-facet-Hint>Hint</a> of the command is
    the value of the <code title=attr-title><a href="#title">title</a></code>
    attribute of the element. If the attribute is not present, the <a
    href="#hint" title=command-facet-Hint>Hint</a> is a user-agent-defined
    string appropriate for the <code><a href="#bb">bb</a></code> element's
-   <code title=attr-bb-type><a href="#type16">type</a></code> attribute's
+   <code title=attr-bb-type><a href="#type17">type</a></code> attribute's
    state.
 
   <p>The <a href="#icon1" title=command-facet-Icon>Icon</a> of the command is
@@ -32893,20 +33132,20 @@
    Otherwise, the <a href="#icon1" title=command-facet-Icon>Icon</a> is a
    user-agent-defined image appropriate for the <code><a
    href="#bb">bb</a></code> element's <code title=attr-bb-type><a
-   href="#type16">type</a></code> attribute's state.
+   href="#type17">type</a></code> attribute's state.
 
-  <p>The <a href="#hidden" title=command-facet-HiddenState>Hidden State</a>
+  <p>The <a href="#hidden0" title=command-facet-HiddenState>Hidden State</a>
    facet of the command is true (hidden) if the <code><a
    href="#bb">bb</a></code> element's <code title=attr-bb-type><a
-   href="#type16">type</a></code> attribute's state is <i
+   href="#type17">type</a></code> attribute's state is <i
    title=attr-bb-type-null-state><a href="#null">null</a></i> or if the
-   element has a <code title=attr-hidden><a href="#hidden1">hidden</a></code>
+   element has a <code title=attr-hidden><a href="#hidden2">hidden</a></code>
    attribute, and false otherwise.
 
   <p>The <a href="#disabled12" title=command-facet-DisabledState>Disabled
    State</a> facet of the command is true if the <code><a
    href="#bb">bb</a></code> element's <code title=attr-bb-type><a
-   href="#type16">type</a></code> attribute's state's <i>relevance</i> is
+   href="#type17">type</a></code> attribute's state's <i>relevance</i> is
    false, and true otherwise.
 
   <p>The <a href="#checked3" title=command-facet-CheckedState>Checked
@@ -32915,7 +33154,7 @@
   <p>The <a href="#action2" title=command-facet-Action>Action</a> of the
    command is to perform the <i>action</i> of the <code><a
    href="#bb">bb</a></code> element's <code title=attr-bb-type><a
-   href="#type16">type</a></code> attribute's state.
+   href="#type17">type</a></code> attribute's state.
 
   <h3 id=datatemplate><span class=secno>4.12 </span>Data Templates</h3>
 
@@ -39915,7 +40154,7 @@
    title=dom-StorageEvent-newValue>newValue</code> attributes set to null.
 
   <p>In addition, the event must have its <code title=dom-StorageEvent-url><a
-   href="#url1">url</a></code> attribute set to the address of the page whose
+   href="#url2">url</a></code> attribute set to the address of the page whose
    <code><a href="#storage0">Storage</a></code> object was affected, and its
    <code title=dom-StorageEvent-source><a href="#source1">source</a></code>
    attribute set to the <code><a href="#window">Window</a></code> object of
@@ -39929,7 +40168,7 @@
   readonly attribute DOMString <a href="#key" title=dom-StorageEvent-key>key</a>;
   readonly attribute DOMString <a href="#oldvalue" title=dom-StorageEvent-oldValue>oldValue</a>;
   readonly attribute DOMString <span title=dom-StorageEvent-newValue>newValue</span>;
-  readonly attribute DOMString <a href="#url1" title=dom-StorageEvent-url>url</a>;
+  readonly attribute DOMString <a href="#url2" title=dom-StorageEvent-url>url</a>;
   readonly attribute <a href="#window">Window</a> <a href="#source1" title=dom-StorageEvent-source>source</a>;
   void <a href="#initstorageevent" title=dom-StorageEvent-initStorageEvent>initStorageEvent</a>(in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString keyArg, in DOMString oldValueArg, in DOMString newValueArg, in DOMString urlArg, in Window sourceArg);
   void <a href="#initstorageeventns" title=dom-StorageEvent-initStorageEventNS>initStorageEventNS</a>(in DOMString namespaceURI, in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString keyArg, in DOMString oldValueArg, in DOMString newValueArg, in DOMString urlArg, in Window sourceArg);
@@ -39954,7 +40193,7 @@
    title=dom-StorageEvent-vnewValue><code>newValue</code></dfn> attribute
    represents the new value of the key being changed.
 
-  <p>The <dfn id=url1 title=dom-StorageEvent-url><code>url</code></dfn>
+  <p>The <dfn id=url2 title=dom-StorageEvent-url><code>url</code></dfn>
    attribute represents the address of the document that changed the key.
 
   <p>The <dfn id=source1
@@ -40803,12 +41042,12 @@
    must use only language information associated with the resource to
    determine its language, not metadata included in the link to the resource.
 
-  <p>The <dfn id=type21 title=attr-hyperlink-type><code>type</code></dfn>
+  <p>The <dfn id=type22 title=attr-hyperlink-type><code>type</code></dfn>
    attribute, if present, gives the MIME type of the linked resource. It is
    purely advisory. The value must be a valid MIME type, optionally with
    parameters. <a href="#refsRFC2046">[RFC2046]</a> User agents must not
    consider the <code title=attr-hyperlink-type><a
-   href="#type21">type</a></code> attribute authoritative — upon
+   href="#type22">type</a></code> attribute authoritative — upon
    fetching the resource, user agents must not use metadata included in the
    link to the resource to determine its type.
 
@@ -41332,7 +41571,7 @@
   <p>The nature of the referenced document is given by the <code
    title=attr-hyperlink-media><a href="#media14">media</a></code>, <code
    title=attr-hyperlink-hreflang><a href="#hreflang3">hreflang</a></code>,
-   and <code title=attr-hyperlink-type><a href="#type21">type</a></code>
+   and <code title=attr-hyperlink-type><a href="#type22">type</a></code>
    attributes.
 
   <p>If the <code title=rel-alternate><a
@@ -41350,14 +41589,14 @@
 
   <p>If the <code title=rel-alternate><a
    href="#alternate">alternate</a></code> keyword is used with the <code
-   title=attr-hyperlink-type><a href="#type21">type</a></code> attribute, it
+   title=attr-hyperlink-type><a href="#type22">type</a></code> attribute, it
    indicates that the referenced document is a reformulation of the current
    document in the specified format.
 
   <p>The <code title=attr-hyperlink-media><a
    href="#media14">media</a></code>, <code title=attr-hyperlink-hreflang><a
    href="#hreflang3">hreflang</a></code>, and <code
-   title=attr-hyperlink-type><a href="#type21">type</a></code> attributes can
+   title=attr-hyperlink-type><a href="#type22">type</a></code> attributes can
    be combined when specified with the <code title=rel-alternate><a
    href="#alternate">alternate</a></code> keyword.
 
@@ -41370,7 +41609,7 @@
 
   <p>If the <code title=rel-alternate><a
    href="#alternate">alternate</a></code> keyword is used with the <code
-   title=attr-hyperlink-type><a href="#type21">type</a></code> attribute set
+   title=attr-hyperlink-type><a href="#type22">type</a></code> attribute set
    to the value <code title="">application/rss+xml</code> or the value <code
    title="">application/atom+xml</code>, then the user agent must treat the
    link as it would if it had the <code title=rel-feed><a
@@ -42183,16 +42422,16 @@
   <p class=big-issue>Would be nice to explain how these features work
    together.
 
-  <h3 id=the-hidden><span class=secno>6.2 </span>The <dfn id=hidden1
+  <h3 id=the-hidden><span class=secno>6.2 </span>The <dfn id=hidden2
    title=attr-hidden><code>hidden</code></dfn> attribute</h3>
 
   <p>All elements may have the <code title=attr-hidden><a
-   href="#hidden1">hidden</a></code> content attribute set. The <code
-   title=attr-hidden><a href="#hidden1">hidden</a></code> attribute is a <a
+   href="#hidden2">hidden</a></code> content attribute set. The <code
+   title=attr-hidden><a href="#hidden2">hidden</a></code> attribute is a <a
    href="#boolean0">boolean attribute</a>. When specified on an element, it
    indicates that the element is not yet, or is no longer, relevant. User
    agents should not render elements that have the <code title=attr-hidden><a
-   href="#hidden1">hidden</a></code> attribute specified.
+   href="#hidden2">hidden</a></code> attribute specified.
 
   <div class=example>
    <p>In the following skeletal example, the attribute is used to hide the
@@ -42218,23 +42457,23 @@
   </section></pre>
   </div>
 
-  <p>The <code title=attr-hidden><a href="#hidden1">hidden</a></code>
+  <p>The <code title=attr-hidden><a href="#hidden2">hidden</a></code>
    attribute must not be used to hide content that could legitimately be
    shown in another presentation. For example, it is incorrect to use <code
-   title=attr-hidden><a href="#hidden1">hidden</a></code> to hide panels in a
+   title=attr-hidden><a href="#hidden2">hidden</a></code> to hide panels in a
    tabbed dialog, because the tabbed interface is merely a kind of overflow
    presentation — showing all the form controls in one big page with a
    scrollbar would be equivalent, and no less correct.
 
   <p>Elements in a section hidden by the <code title=attr-hidden><a
-   href="#hidden1">hidden</a></code> attribute are still active, e.g. scripts
+   href="#hidden2">hidden</a></code> attribute are still active, e.g. scripts
    and form controls in such sections still render execute and submit
    respectively. Only their presentation to the user changes.</p>
   <!-- XXX might be worth disabling user interaction event submission
   in hidden areas? e.g. make onmousemove and onclick and form controls
   not respond to input? -->
 
-  <p>The <dfn id=hidden2 title=dom-hidden><code>hidden</code></dfn> DOM
+  <p>The <dfn id=hidden3 title=dom-hidden><code>hidden</code></dfn> DOM
    attribute must <a href="#reflect">reflect</a> the content attribute of the
    same name.
 
@@ -45763,7 +46002,7 @@
   <pre class=idl>
 [<a href="#websocket1" title=dom-WebSocket>Constructor</a>(in DOMString url)]
 interface <dfn id=websocket0>WebSocket</dfn> {
-  readonly attribute DOMString <a href="#url2" title=dom-WebSocket-URL>URL</a>;
+  readonly attribute DOMString <a href="#url3" title=dom-WebSocket-URL>URL</a>;
 
   // ready state
   const unsigned short <a href="#connecting0" title=dom-WebSocket-CONNECTING>CONNECTING</a> = 0;
@@ -45797,7 +46036,7 @@
    title="">url</var>. Otherwise, the constructor must raise a
    <code>SYNTAX_ERR</code> exception.
 
-  <p>The <dfn id=url2 title=dom-WebSocket-URL><code>URL</code></dfn>
+  <p>The <dfn id=url3 title=dom-WebSocket-URL><code>URL</code></dfn>
    attribute must return the value that was passed to the constructor.
 
   <p>The <dfn id=readystate1
@@ -47550,11 +47789,11 @@
    (since there's no end tag, no content can be put between the start tag and
    the end tag).
 
-  <p>CDATA elements can have <a href="#text2" title=syntax-text>text</a>,
+  <p>CDATA elements can have <a href="#text3" title=syntax-text>text</a>,
    though it has <a href="#cdata-rcdata-restrictions">restrictions</a>
    described below.
 
-  <p>RCDATA elements can have <a href="#text2" title=syntax-text>text</a> and
+  <p>RCDATA elements can have <a href="#text3" title=syntax-text>text</a> and
    <a href="#character6" title=syntax-charref>character references</a>, but
    the text must not contain an <a href="#ambiguous"
    title=syntax-ambiguous-ampersand>ambiguous ampersand</a>. There are also
@@ -47564,7 +47803,7 @@
   <p>Foreign elements whose start tag is marked as self-closing can't have
    any contents (since, again, as there's no end tag, no content can be put
    between the start tag and the end tag). Foreign elements whose start tag
-   is <em>not</em> marked as self-closing can have <a href="#text2"
+   is <em>not</em> marked as self-closing can have <a href="#text3"
    title=syntax-text>text</a>, <a href="#character6"
    title=syntax-charref>character references</a>, <a href="#cdata1"
    title=syntax-cdata>CDATA sections</a>, other <a href="#elements5"
@@ -47574,7 +47813,7 @@
    href="#ambiguous" title=syntax-ambiguous-ampersand>ambiguous
    ampersand</a>.
 
-  <p>Normal elements can have <a href="#text2" title=syntax-text>text</a>, <a
+  <p>Normal elements can have <a href="#text3" title=syntax-text>text</a>, <a
    href="#character6" title=syntax-charref>character references</a>, other <a
    href="#elements5" title=syntax-elements>elements</a>, and <a
    href="#comments0" title=syntax-comments>comments</a>, but the text must
@@ -47670,7 +47909,7 @@
    match for the attribute's name.
 
   <p><dfn id=attribute4 title=syntax-attribute-value>Attribute values</dfn>
-   are a mixture of <a href="#text2" title=syntax-text>text</a> and <a
+   are a mixture of <a href="#text3" title=syntax-text>text</a> and <a
    href="#character6" title=syntax-charref>character references</a>, except
    with the additional restriction that the text cannot contain an <a
    href="#ambiguous" title=syntax-ambiguous-ampersand>ambiguous
@@ -47743,8 +47982,9 @@
      character.</p>
 
     <div class=example>
-     <p>In the following example, the <code title=attr-input-type>type</code>
-      attribute is given with the single-quoted attribute value syntax:</p>
+     <p>In the following example, the <code title=attr-input-type><a
+      href="#type12">type</a></code> attribute is given with the
+      single-quoted attribute value syntax:</p>
 
      <pre><input <em>type='checkbox'</em>></pre>
     </div>
@@ -48057,7 +48297,7 @@
    href="#escaping" title=syntax-escape>escaping text span</a>.
 
   <p>An <dfn id=escaping title=syntax-escape>escaping text span</dfn> is a
-   span of <a href="#text2" title=syntax-text>text</a> that starts with an <a
+   span of <a href="#text3" title=syntax-text>text</a> that starts with an <a
    href="#escaping0" title=syntax-escape-start>escaping text span start</a>
    that is not itself in an <a href="#escaping" title=syntax-escape>escaping
    text span</a>, and ends at the next <a href="#escaping1"
@@ -48066,13 +48306,13 @@
    <a href="#escaping" title=syntax-escape>escaping text span</a>.
 
   <p>An <dfn id=escaping0 title=syntax-escape-start>escaping text span
-   start</dfn> is a part of <a href="#text2" title=syntax-text>text</a> that
+   start</dfn> is a part of <a href="#text3" title=syntax-text>text</a> that
    consists of the four character sequence "<code title=""><!--</code>"
    (U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
    U+002D HYPHEN-MINUS).
 
   <p>An <dfn id=escaping1 title=syntax-escape-end>escaping text span
-   end</dfn> is a part of <a href="#text2" title=syntax-text>text</a> that
+   end</dfn> is a part of <a href="#text3" title=syntax-text>text</a> that
    consists of the three character sequence "<code title="">--></code>"
    (U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN) whose
    U+003E GREATER-THAN SIGN (>).
@@ -48089,7 +48329,7 @@
 
   <h4 id=text0><span class=secno>8.1.3 </span>Text</h4>
 
-  <p><dfn id=text2 title=syntax-text>Text</dfn> is allowed inside elements,
+  <p><dfn id=text3 title=syntax-text>Text</dfn> is allowed inside elements,
    attributes, and comments. Text must consist of Unicode characters. Text
    must not contain U+0000 characters. Text must not contain permanently
    undefined Unicode characters. Text must not contain control characters
@@ -48106,11 +48346,11 @@
 
   <h4 id=character0><span class=secno>8.1.4 </span>Character references</h4>
 
-  <p>In certain cases described in other sections, <a href="#text2"
+  <p>In certain cases described in other sections, <a href="#text3"
    title=syntax-text>text</a> may be mixed with <dfn id=character6
    title=syntax-charref>character references</dfn>. These can be used to
    escape characters that couldn't otherwise legally be included in <a
-   href="#text2" title=syntax-text>text</a>.
+   href="#text3" title=syntax-text>text</a>.
 
   <p>Character references must start with a U+0026 AMPERSAND
    (<code>&</code>). Following this, there are three possible kinds of
@@ -48150,7 +48390,7 @@
 
   <p>An <dfn id=ambiguous title=syntax-ambiguous-ampersand>ambiguous
    ampersand</dfn> is a U+0026 AMPERSAND (<code>&</code>) character that
-   is followed by some <a href="#text2" title=syntax-text>text</a> other than
+   is followed by some <a href="#text3" title=syntax-text>text</a> other than
    a <a href="#space">space character</a>, a U+003C LESS-THAN SIGN character
    ('<'), or another U+0026 AMPERSAND (<code>&</code>) character.
 
@@ -48162,7 +48402,7 @@
    CAPITAL LETTER D, U+0041 LATIN CAPITAL LETTER A, U+0054 LATIN CAPITAL
    LETTER T, U+0041 LATIN CAPITAL LETTER A, U+005B LEFT SQUARE BRACKET (<code
    title=""><![CDATA[</code>). Following this sequence, the CDATA section
-   may have <a href="#text2" title=syntax-text>text</a>, with the additional
+   may have <a href="#text3" title=syntax-text>text</a>, with the additional
    restriction that the text must not contain the three character sequence
    U+005D RIGHT SQUARE BRACKET, U+005D RIGHT SQUARE BRACKET, U+003E
    GREATER-THAN SIGN (<code title="">]]></code>). Finally, the CDATA section
@@ -48176,7 +48416,7 @@
    the four character sequence U+003C LESS-THAN SIGN, U+0021 EXCLAMATION
    MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS (<code
    title=""><!--</code>). Following this sequence, the comment may have <a
-   href="#text2" title=syntax-text>text</a>, with the additional restriction
+   href="#text3" title=syntax-text>text</a>, with the additional restriction
    that the text must not start with a single U+003E GREATER-THAN SIGN
    ('>') character, nor start with a U+002D HYPHEN-MINUS (<code
    title="">-</code>) character followed by a U+003E GREATER-THAN SIGN
@@ -49074,7 +49314,7 @@
 
   <hr>
 
-  <p>When the steps below require the UA to <dfn id=reset3>reset the
+  <p>When the steps below require the UA to <dfn id=reset4>reset the
    insertion mode appropriately</dfn>, it means the UA must follow these
    steps:
 
@@ -49287,7 +49527,7 @@
     <p>The following HTML elements introduce new <a href="#have-an"
      title="has an element in scope">scopes</a> for various parts of the
      parsing: <code><a href="#applet">applet</a></code>, <code><a
-     href="#button">button</a></code>, <code><a
+     href="#button0">button</a></code>, <code><a
      href="#caption0">caption</a></code>, <code><a
      href="#html">html</a></code>, <code>marquee</code>, <code><a
      href="#object">object</a></code>, <code><a
@@ -49343,7 +49583,7 @@
 
      <li><code><a href="#th">th</a></code> in the HTML namespace
 
-     <li><code><a href="#button">button</a></code> in the HTML namespace
+     <li><code><a href="#button0">button</a></code> in the HTML namespace
 
      <li><code>marquee</code> in the HTML namespace
 
@@ -53209,7 +53449,7 @@
      pointer</a> is not null and the newly created element doesn't have a
      <code title=attr-fae-form><a href="#form0">form</a></code> attribute,
      then <a href="#associated" title=concept-form-association>associate</a>
-     the <code><a href="#button">button</a></code> element with the <code><a
+     the <code><a href="#button0">button</a></code> element with the <code><a
      href="#form">form</a></code> element pointed to by the <a
      href="#form-element"><code title="">form</code> element pointer</a>.</p>
 
@@ -53355,7 +53595,7 @@
 
    <dt>A start tag whose tag name is "label"
 
-   <dd>
+   <dd> <!-- XXX should this close open <label> elements? -->
     <p><a href="#reconstruct">Reconstruct the active formatting elements</a>,
      if any.</p>
 
@@ -53920,7 +54160,7 @@
     <p>Pop elements from this stack until a <code><a
      href="#table">table</a></code> element has been popped from the stack.</p>
 
-    <p><a href="#reset3">Reset the insertion mode appropriately</a>.</p>
+    <p><a href="#reset4">Reset the insertion mode appropriately</a>.</p>
 
    <dt>An end tag whose tag name is one of: "body", "caption", "col",
     "colgroup", "html", "tbody", "td", "tfoot", "th", "thead", "tr"
@@ -54524,7 +54764,7 @@
      until a <code><a href="#select">select</a></code> element has been
      popped from the stack.</p>
 
-    <p><a href="#reset3">Reset the insertion mode appropriately</a>.</p>
+    <p><a href="#reset4">Reset the insertion mode appropriately</a>.</p>
 
    <dt>A start tag whose tag name is "select"
 
@@ -55581,7 +55821,7 @@
      that it contains just the single element <var title="">root</var>.</p>
 
    <li>
-    <p><a href="#reset3" title="reset the insertion mode appropriately">Reset
+    <p><a href="#reset4" title="reset the insertion mode appropriately">Reset
      the parser's insertion mode appropriately</a>.</p>
 
     <p class=note>The parser will reference the <var title="">context</var>
@@ -58022,7 +58262,7 @@
 
   <pre
    class=idl>[XXX] interface <a href="#htmlbodyelement">HTMLBodyElement</a> {
-           attribute DOMString <a href="#text3" title=dom-body-text>text</a>;
+           attribute DOMString <a href="#text4" title=dom-body-text>text</a>;
            attribute DOMString <a href="#bgcolor0" title=dom-body-bgColor>bgColor</a>;
            attribute DOMString <a href="#background0" title=dom-body-background>background</a>;
            attribute DOMString <a href="#link0" title=dom-body-link>link</a>;
@@ -58030,7 +58270,7 @@
            attribute DOMString <a href="#alink" title=dom-body-aLink>aLink</a>;
 };</pre>
 
-  <p>The <dfn id=text3 title=dom-body-text><code>text</code></dfn> DOM
+  <p>The <dfn id=text4 title=dom-body-text><code>text</code></dfn> DOM
    attribute of the <code><a href="#body0">body</a></code> element must <a
    href="#reflect">reflect</a> the element's <code
    title=attr-body-text>text</code> content attribute.

Modified: source
===================================================================
--- source	2008-09-16 08:05:15 UTC (rev 2191)
+++ source	2008-09-16 20:48:10 UTC (rev 2192)
@@ -24317,7 +24317,7 @@
            attribute float <span title="dom-input-valueAsNumber">valueAsNumber</span>;
   readonly attribute <span>HTMLOptionElement</span> <span title="dom-input-selectedOption">selectedOption</span>;
 
-  readonly attribute <span>HTMLCollection</span> <span title="dom-lfe-labels">labels</span>;
+  readonly attribute <span>NodeList</span> <span title="dom-lfe-labels">labels</span>;
 
   void <span title="dom-input-stepUp">stepUp</span>(in int n);
   void <span title="dom-input-stepDown">stepDown</span>(in int n);
@@ -24333,6 +24333,126 @@
 
   <!-- XXX add selectionStart and company -->
 
+  <p>The <code>input</code> element represents a typed data field,
+  usually with a form control to allow the user to edit the data.</p>
+
+  <p>The <dfn title="attr-input-type"><code>type</code></dfn>
+  attribute controls the data type (and associated control) of the
+  element. It is an <span>enumerated attribute</span>. The following
+  table lists the keywords and states for the attribute — the
+  keywords in the left column map to the states in the cell in the
+  second column on the same row as the keyword.</p>
+
+  <table>
+   <thead>
+    <tr>
+     <th> Keyword
+     <th> State
+     <th> Data type
+     <th> Control type
+   <tbody>
+    <tr>
+     <td> <dfn title="attr-input-type-text-keyword"><code>text</code></dfn>
+     <td> <span title="attr-input-type-text">Text</span> state
+     <td> Text with no line breaks
+     <td> Text field
+    <tr>
+     <td> <dfn title="attr-input-type-password-keyword"><code>password</code></dfn>
+     <td> <span title="attr-input-type-password">Password</span> state
+     <td> Text with no line breaks (sensitive information)
+     <td> Text field that obscures data entry
+    <tr>
+     <td> <dfn title="attr-input-type-image-keyword"><code>image</code></dfn>
+     <td> <span title="attr-input-type-image">Image Button</span> state
+     <td> A coordinate, relative to a particular image's size, with the extra semantic that it must be the last value selected and initiates form submission
+     <td> Either a clickable image, or a button
+    <tr>
+     <td> <dfn title="attr-input-type-datetime-keyword"><code>datetime</code></dfn>
+     <td> <span title="attr-input-type-datetime">Date and Time</span> state
+     <td> A date and time (year, month, day, hour, minute, second, fractions of a second) with the time zone set to UTC
+     <td> A date and time control
+    <tr>
+     <td> <dfn title="attr-input-type-datetime-local-keyword"><code>datetime-local</code></dfn>
+     <td> <span title="attr-input-type-datetime-local">Local Date and Time</span> state
+     <td> A date and time (year, month, day, hour, minute, second, fractions of a second) with no time zone
+     <td> A date and time control
+    <tr>
+     <td> <dfn title="attr-input-type-date-keyword"><code>date</code></dfn>
+     <td> <span title="attr-input-type-date">Date</span> state
+     <td> A date (year, month, day) with no time zone
+     <td> A date control
+    <tr>
+     <td> <dfn title="attr-input-type-month-keyword"><code>month</code></dfn>
+     <td> <span title="attr-input-type-month">Month</span> state
+     <td> A date consisting of a year and a month with no time zone
+     <td> A month control
+    <tr>
+     <td> <dfn title="attr-input-type-week-keyword"><code>week</code></dfn>
+     <td> <span title="attr-input-type-week">Week</span> state
+     <td> A date consisting of a year and a week number with no time zone
+     <td> A week control
+    <tr>
+     <td> <dfn title="attr-input-type-time-keyword"><code>time</code></dfn>
+     <td> <span title="attr-input-type-time">Time</span> state
+     <td> A time (hour, minute, seconds, fractional seconds) with no time zone
+     <td> A time control
+    <tr>
+     <td> <dfn title="attr-input-type-number-keyword"><code>number</code></dfn>
+     <td> <span title="attr-input-type-number">Number</span> state
+     <td> A numerical value
+     <td> A text field or spinner control
+    <tr>
+     <td> <dfn title="attr-input-type-range-keyword"><code>range</code></dfn>
+     <td> <span title="attr-input-type-range">Range</span> state
+     <td> A numerical value, with the extra semantic that the exact value is not important
+     <td> A slider control or similar
+    <tr>
+     <td> <dfn title="attr-input-type-email-keyword"><code>email</code></dfn>
+     <td> <span title="attr-input-type-email">E-mail</span> state
+     <td> An e-mail address
+     <td> A text field
+    <tr>
+     <td> <dfn title="attr-input-type-url-keyword"><code>url</code></dfn>
+     <td> <span title="attr-input-type-url">URL</span> state
+     <td> An IRI
+     <td> A text field
+    <tr>
+     <td> <dfn title="attr-input-type-checkbox-keyword"><code>checkbox</code></dfn>
+     <td> <span title="attr-input-type-checkbox">Checkbox</span> state
+     <td> A set of zero or more values from a predefined list
+     <td> A checkbox
+    <tr>
+     <td> <dfn title="attr-input-type-radio-keyword"><code>radio</code></dfn>
+     <td> <span title="attr-input-type-radio">Radio Button</span> state
+     <td> An enumerated value
+     <td> A radio button
+    <tr>
+     <td> <dfn title="attr-input-type-file-keyword"><code>file</code></dfn>
+     <td> <span title="attr-input-type-file">File</span> state
+     <td> Zero or more files each with a MIME type and optionally a file name
+     <td> A label and a button
+    <tr>
+     <td> <dfn title="attr-input-type-hidden-keyword"><code>hidden</code></dfn>
+     <td> <span title="attr-input-type-hidden">Hidden</span> state
+     <td> An arbitrary string
+     <td> n/a
+    <tr>
+     <td> <dfn title="attr-input-type-submit-keyword"><code>submit</code></dfn>
+     <td> <span title="attr-input-type-submit">Submit Button</span> state
+     <td> An enumerated value, with the extra semantic that it must be the last value selected and initiates form submission
+     <td> A button
+    <tr>
+     <td> <dfn title="attr-input-type-reset-keyword"><code>reset</code></dfn>
+     <td> <span title="attr-input-type-reset">Reset Button</span> state
+     <td> n/a
+     <td> A button
+    <tr>
+     <td> <dfn title="attr-input-type-button-keyword"><code>button</code></dfn>
+     <td> <span title="attr-input-type-button">Button</span> state
+     <td> n/a
+     <td> A button
+  </table>
+
   <p class="big-issue">...</p>
 
   <p>The <code title="attr-fae-form">form</code> attribute is used to
@@ -24397,7 +24517,7 @@
            attribute DOMString <span title="dom-button-type">type</span>;
            attribute DOMString <span title="dom-button-value">value</span>;
 
-  readonly attribute <span>HTMLCollection</span> <span title="dom-lfe-labels">labels</span>;
+  readonly attribute <span>NodeList</span> <span title="dom-lfe-labels">labels</span>;
 
   readonly attribute boolean <span title="dom-cva-willValidate">willValidate</span>;
   readonly attribute <span>ValidityState</span> <span title="dom-cva-validity">validity</span>;
@@ -24464,7 +24584,7 @@
            attribute long <span title="dom-select-selectedIndex">selectedIndex</span>;
            attribute DOMString <span title="dom-select-value">value</span>;
 
-  readonly attribute <span>HTMLCollection</span> <span title="dom-lfe-labels">labels</span>;
+  readonly attribute <span>NodeList</span> <span title="dom-lfe-labels">labels</span>;
 
   void <span title="dom-select-add">add</span>(in <span>HTMLElement</span> element, in <span>HTMLElement</span> before);
   void <span title="dom-select-remove">remove</span>(in long index);
@@ -24639,7 +24759,7 @@
            attribute DOMString <span title="dom-textarea-defaultValue">defaultValue</span>;
            attribute DOMString <span title="dom-textarea-value">value</span>;
 
-  readonly attribute <span>HTMLCollection</span> <span title="dom-lfe-labels">labels</span>;
+  readonly attribute <span>NodeList</span> <span title="dom-lfe-labels">labels</span>;
 
   readonly attribute boolean <span title="dom-cva-willValidate">willValidate</span>;
   readonly attribute <span>ValidityState</span> <span title="dom-cva-validity">validity</span>;
@@ -29653,14 +29773,16 @@
   label the button itself if the attribute is absent.</p>
 
   <p>Otherwise, the <span title="command-facet-Type">Type</span> is
-  "radio" or "checkbox". If the element has a <code>label</code>
-  element associated with it, the <code>textContent</code> of the
-  first such element is the <span
+  "radio" or "checkbox". If the element is a <span>labeled
+  control</span>, the <code title="">textContent</code> of the first
+  <code>label</code> element in <span>tree order</span> whose
+  <span>labeled control</span> is the element in question is the <span
   title="command-facet-Label">Label</span> (in DOM terms, this the
-  string given by
-  <code><var title="">element</var>.labels[0].textContent</code>).  Otherwise,
-  the value of the <code>value</code> attribute, if present, is the
-  <span title="command-facet-Label">Label</span>. Otherwise, the <span
+  string given by <code><var
+  title="">element</var>.labels[0].textContent</code>).  Otherwise,
+  the value of the <code title="attr-input-value">value</code>
+  attribute, if present, is the <span
+  title="command-facet-Label">Label</span>. Otherwise, the <span
   title="command-facet-Label">Label</span> is the empty string.</p>
 
   <p>The <span title="command-facet-Hint">Hint</span> of the command
@@ -49913,6 +50035,8 @@
    <dt>A start tag whose tag name is "label"</dt>
    <dd>
 
+    <!-- XXX should this close open <label> elements? -->
+
     <p><span>Reconstruct the active formatting elements</span>, if
     any.</p>
 




More information about the Commit-Watchers mailing list