Update content model for customizable select

source

@@ -12975,6 +12975,74 @@ https://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%
   </ul>
 
 
+  <h6>Select element inner content elements</h6>
+
+  <p><dfn>Select element inner content elements</dfn> are the elements which are allowed as
+  descendants of <code>select</code> elements.</p>
+
+  <p>The following are <span>select element inner content elements</span>:</p>
+
+  <ul class="brief category-list">
+   <li><code>option</code></li>
+
+   <li><code>optgroup</code></li>
+
+   <li><code>hr</code></li>
+
+   <li><span>script-supporting elements</span></li>
+
+   <li><code>noscript</code></li>
+
+   <li><code>div</code></li>
+
+   <li><code>span</code></li>
+  </ul>
+
+  <h6>Optgroup element inner content elements</h6>
+
+  <p><dfn>Optgroup element inner content elements</dfn> are the elements which are allowed as
+  descendants of <code>optgroup</code> elements.</p>
+
+  <p>The following are <span>optgroup element inner content elements</span>:</p>
+
+  <ul class="brief category-list">
+   <li><code>option</code></li>
+
+   <li><span>script-supporting elements</span></li>
+
+   <li><code>noscript</code></li>
+
+   <li><code>div</code></li>
+
+   <li><code>span</code></li>
+  </ul>
+
+  <h6>Option element inner content elements</h6>
+
+  <p><dfn>Option element inner content elements</dfn> are the elements which are allowed as
+  descendants of <code>option</code> elements.</p>
+
+  <p>The following are <span>option element inner content elements</span>:</p>
+
+  <ul class="brief category-list">
+   <li><span>text content</span></li>
+
+   <li><span>phrasing content</span> except for <span>interactive content</span></li>
+
+   <li><span>script-supporting elements</span></li>
+
+   <li><code>noscript</code></li>
+
+   <li><code>div</code></li>
+
+   <li><code>span</code></li>
+
+   <li><code>img</code></li>
+
+   <li><span>SVG <code>svg</code></span></li>
+  </ul>
+
+
 
   <h5>Transparent content models</h5>
 
@@ -19978,6 +20046,7 @@ and is further discussed below.&lt;/div></code></pre>
   <dl class="element">
    <dt><span data-x="concept-element-categories">Categories</span>:</dt>
    <dd><span>Flow content</span>.</dd>
+   <dd><span>Select element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>flow content</span> is expected.</dd>
    <dd>As a child of a <code>select</code> element.</dd>
@@ -21712,12 +21781,18 @@ included with Exhibit B.
    <dt><span data-x="concept-element-categories">Categories</span>:</dt>
    <dd><span>Flow content</span>.</dd>
    <dd><span>Palpable content</span>.</dd>
+   <dd><span>Select element inner content elements</span>.</dd>
+   <dd><span>Optgroup element inner content elements</span>.</dd>
+   <dd><span>Option element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>flow content</span> is expected.</dd>
    <dd>As a child of a <code>dl</code> element.</dd>
    <dt><span data-x="concept-element-content-model">Content model</span>:</dt>
    <dd>If the element is a child of a <code>dl</code> element: one or more <code>dt</code> elements followed by one or more <code>dd</code> elements, optionally intermixed with <span>script-supporting elements</span>.</dd>
-   <dd>If the element is not a child of a <code>dl</code> element: <span>flow content</span>.</dd>
+   <dd>Otherwise, if the element is a descendant of a <code>select</code> element: Zero or more <span>select element inner content elements</span>.</dd>
+   <dd>Otherwise, if the element is a descendant of an <code>optgroup</code> element: Zero or more <span>optgroup element inner content elements</span>.</dd>
+   <dd>Otherwise, if the element is a descendant of an <code>option</code> element: Zero or more <span>option element inner content elements</span>.</dd>
+   <dd>Otherwise: <span>flow content</span>.</dd>
    <dt><span data-x="concept-element-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dt><span
@@ -24529,10 +24604,16 @@ wormhole connection.&lt;/mark>&lt;/p></code></pre>
    <dd><span>Flow content</span>.</dd>
    <dd><span>Phrasing content</span>.</dd>
    <dd><span>Palpable content</span>.</dd>
+   <dd><span>Select element inner content elements</span>.</dd>
+   <dd><span>Optgroup element inner content elements</span>.</dd>
+   <dd><span>Option element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt><span data-x="concept-element-content-model">Content model</span>:</dt>
-   <dd><span>Phrasing content</span>.</dd>
+   <dd>If the element is a descendant of a <code>select</code> element: Zero or more <span>select element inner content elements</span>.</dd>
+   <dd>Otherwise, if the element is a descendant of an <code>optgroup</code> element: Zero or more <span>optgroup element inner content elements</span>.</dd>
+   <dd>Otherwise, if the element is a descendant of an <code>option</code> element: Zero or more <span>option element inner content elements</span>.</dd>
+   <dd>Otherwise: <span>Phrasing content</span>.</dd>
    <dt><span data-x="concept-element-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dt><span
@@ -29257,6 +29338,7 @@ interface <dfn interface>HTMLSourceElement</dfn> : <span>HTMLElement</span> {
    <dd><span>Form-associated element</span>.</dd>
    <dd>If the element has a <code data-x="attr-hyperlink-usemap">usemap</code> attribute: <span>Interactive content</span>.</dd>
    <dd><span>Palpable content</span>.</dd>
+   <dd><span>Option element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>embedded content</span> is expected.</dd>
    <dd>As a child of a <code>picture</code> element, after all <code>source</code> elements.</dd>
@@ -42520,8 +42602,9 @@ interface <dfn interface>HTMLAreaElement</dfn> : <span>HTMLElement</span> {
   <h4 id="svg-0">SVG</h4>
 
   <p>The <span>SVG <code>svg</code></span> element falls into the <span>embedded content</span>,
-  <span>phrasing content</span>, <span>flow content</span>, and <span>palpable content</span>
-  categories for the purposes of the content models in this specification.</p>
+  <span>phrasing content</span>, <span>flow content</span>, <span>palpable content</span>, and
+  <span>option element inner content elements</span> categories for the purposes of the content
+  models in this specification.</p>
 
   <p>When the <span>SVG <code>foreignObject</code></span> element contains elements from the
   <span>HTML namespace</span>, such elements must all be <span>flow content</span>.</p>
@@ -53194,6 +53277,7 @@ You cannot submit this form when the field is incorrect.</samp></pre>
    <dd><span>Palpable content</span>.</dd>
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
+   <dd>As the first child of a <code>select</code> element.</dd>
    <dt><span data-x="concept-element-content-model">Content model</span>:</dt>
    <dd><span>Phrasing content</span>, but there must be no <span>interactive content</span>
    descendant and no descendant with the <code data-x="attr-tabindex">tabindex</code> attribute
@@ -53410,7 +53494,7 @@ interface <dfn interface>HTMLButtonElement</dfn> : <span>HTMLElement</span> {
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt><span data-x="concept-element-content-model">Content model</span>:</dt>
-   <dd>Zero or more <code>option</code>, <code>optgroup</code>, <code>hr</code>, and <span data-x="script-supporting elements">script-supporting</span> elements.</dd>
+   <dd>Zero or one <code>button</code> element if the <code>select</code> is a <span>drop-down box</span> followed by zero or more <span>select element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code data-x="attr-fe-autocomplete">autocomplete</code></dd>
@@ -54137,11 +54221,11 @@ interface <dfn interface>HTMLDataListElement</dfn> : <span>HTMLElement</span> {
 
   <dl class="element">
    <dt><span data-x="concept-element-categories">Categories</span>:</dt>
-   <dd>None.</dd>
+   <dd><span>Select element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
-   <dd>As a child of a <code>select</code> element.</dd>
+   <dd>As a descendant of a <code>select</code> element.</dd>
    <dt><span data-x="concept-element-content-model">Content model</span>:</dt>
-   <dd>Zero or more <code>option</code> and <span data-x="script-supporting elements">script-supporting</span> elements.</dd>
+   <dd>Zero or one <code>legend</code> element followed by zero or more <span>optgroup element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code data-x="attr-optgroup-disabled">disabled</code></dd>
@@ -54234,19 +54318,16 @@ interface <dfn interface>HTMLOptGroupElement</dfn> : <span>HTMLElement</span> {
 
   <dl class="element">
    <dt><span data-x="concept-element-categories">Categories</span>:</dt>
-   <dd>None.</dd>
+   <dd><span>Select element inner content elements</span>.</dd>
+   <dd><span>Optgroup element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
-   <dd>As a child of a <code>select</code> element.</dd>
+   <dd>As a descendant of a <code>select</code> element.</dd>
    <dd>As a child of a <code>datalist</code> element.</dd>
-   <dd>As a child of an <code>optgroup</code> element.</dd>
+   <dd>As a descendant of an <code>optgroup</code> element.</dd>
    <dt><span data-x="concept-element-content-model">Content model</span>:</dt>
    <dd>If the element has a <code data-x="attr-option-label">label</code> attribute and a <code data-x="attr-option-value">value</code> attribute: <span data-x="concept-content-nothing">Nothing</span>.</dd>
    <dd>If the element has a <code data-x="attr-option-label">label</code> attribute but no <code data-x="attr-option-value">value</code> attribute: <span data-x="text content">Text</span>.</dd>
-   <dd>If the element has no <code data-x="attr-option-label">label</code> attribute and is not a
-   child of a <code>datalist</code> element: <span data-x="text content">Text</span> that is not
-   <span>inter-element whitespace</span>.</dd>
-   <dd>If the element has no <code data-x="attr-option-label">label</code> attribute and is a child
-   of a <code>datalist</code> element: <span data-x="text content">Text</span>.</dd>
+   <dd>If the element has no <code data-x="attr-option-label">label</code> attribute: Zero or more <span>option element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code data-x="attr-option-disabled">disabled</code></dd>
@@ -55980,8 +56061,9 @@ interface <dfn interface>HTMLFieldSetElement</dfn> : <span>HTMLElement</span> {
    <dd>None.</dd>
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>As the <span>first child</span> of a <code>fieldset</code> element.</dd>
+   <dd>As the <span>first child</span> of an <code>optgroup</code> element.</dd>
    <dt><span data-x="concept-element-content-model">Content model</span>:</dt>
-   <dd><span>Phrasing content</span>, optionally intermixed with <span>heading content</span>.</dd>
+   <dd><span>Phrasing content</span>, optionally intermixed with <span>heading content</span> if this is not the <span>first child</span> of an <code>optgroup</code> element.</dd>
    <dt><span data-x="concept-element-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dt><span
@@ -63571,6 +63653,9 @@ not-slash     = %x0000-002E / %x0030-10FFFF
    <dd><span>Metadata content</span>.</dd>
    <dd><span>Flow content</span>.</dd>
    <dd><span>Phrasing content</span>.</dd>
+   <dd><span>Select element inner content elements</span>.</dd>
+   <dd><span>Option element inner content elements</span>.</dd>
+   <dd><span>Optgroup element inner content elements</span>.</dd>
    <dt><span data-x="concept-element-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>In a <code>head</code> element of an <span data-x="HTML documents">HTML document</span>, if there are no ancestor <code>noscript</code> elements.</dd>
    <dd>Where <span>phrasing content</span> is expected in <span>HTML documents</span>, if there are no ancestor <code>noscript</code> elements.</dd>
@@ -140460,6 +140545,8 @@ interface <dfn interface>External</dfn> {
      <td><code>HTMLElement</code></td>
     </tr>
 
+    <!-- TODO update this and other part of this table after the duplicate parts earlier in the spec
+         are finalized. -->
     <tr>
      <th><code>select</code></th>
      <td>List box control</td>