From 07fa950607384a7661356df77e845a0ecbf98e71 Mon Sep 17 00:00:00 2001
From: Scott O'Hara <scottaohara@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:09:58 -0500
Subject: [PATCH] combining things

pull comments into role table cell
combine custom elements and form associated custom elements into a single mapping table
---
 html-aam/index.html | 94 +++++++++------------------------------------
 1 file changed, 18 insertions(+), 76 deletions(-)

diff --git a/html-aam/index.html b/html-aam/index.html
index e192e9a55..3aaf0714b 100644
--- a/html-aam/index.html
+++ b/html-aam/index.html
@@ -805,29 +805,33 @@ <h4 id="el-audio">`audio`</h4>
             </tr>
           </tbody>
         </table>
-        <h4 id="el-autonomous-custom-element">autonomous custom element</h4>
+        <h4 id="el-autonomous-custom-element">
+          autonomous custom elements
+          and
+          <span id="el-form-associated-custom-element">form-associated custom elements</span>
+        </h4>
         <table aria-labelledby="el-autonomous-custom-element">
           <tbody>
             <tr>
               <th>HTML Specification</th>
               <td>
                 <a data-cite="HTML">autonomous custom element</a>
+                and
+                <a data-cite="html/custom-elements.html#custom-elements-face-example">form-associated custom element</a>
               </td>
             </tr>
             <tr>
               <th>[[wai-aria-1.2]]</th>
               <td>
-                <p>
-                  If the author assigned a conforming ARIA role using the `role` attribute, 
-                  or by the custom element's internals, map to the specified role.
-                </p>
-                <p>
-                  If the author assigned attributes that result in a <a>minimum role</a>, then map
-                  to the minimum role (see <a href="#custom-element-comments">comments</a>).
-                </p>
-                <p>
-                  Otherwise, the element maps to the <a class="core-mapping" href="#role-map-none">`none`</a> role.
-                </p>
+                <ul>
+                  <li>If the author assigned a conforming ARIA role using the `role` attribute, or by the custom element's internals, map to the specified role.</li>
+                  <li>else if the author assigned HTML attributes that result in a <a>minimum role</a>, then map to the minimum role.</li>
+                  <li>else if the custom element is focusable: expose the <a class="core-mapping" href="#role-map-generic">`group`</a> role</li>
+                  <li>else if an author specifies an ARIA attribute on the custom element that creates a relation with another element: expose the <a class="core-mapping" href="#role-map-generic">`group`</a> role</li>
+                  <li>else if the custom element has an `aria-live` attribute: expose the <a class="core-mapping" href="#role-map-generic">`generic`</a> role</li>
+                  <li>else if element internals are used to set a global ARIA property: expose the <a class="core-mapping" href="#role-map-generic">`generic`</a> role.</li>
+                  <li>Otherwise, the element maps to the <a class="core-mapping" href="#role-map-none">`none`</a> role.</li>
+                </ul>
               </td>
             </tr>
             <tr>
@@ -862,20 +866,8 @@ <h4 id="el-autonomous-custom-element">autonomous custom element</h4>
             </tr>
             <!-- <th><a href="#accessible-name-and-description-computation">Naming Algorithm</a></th> -->
             <tr>
-              <th id=custom-element-comments>Comments</th>
-              <td>
-                <p>
-                  Along with the attributes defined in this specification that participate in modifying an element's <a>minimum role</a>,
-                  the following conditions will also alter a custom element's computed role, if an author has not otherwise specified an
-                  explicit role for the element:
-                </p>
-                <ul>
-                  <li>if the custom element is focusable: expose the <a class="core-mapping" href="#role-map-generic">`group`</a> role</li>
-                  <li>else if an author specifies an ARIA attribute on the custom element that creates a relation with another element: expose the <a class="core-mapping" href="#role-map-generic">`group`</a> role</li>
-                  <li>else if the custom element has an `aria-live` attribute: expose the <a class="core-mapping" href="#role-map-generic">`generic`</a> role</li>
-                  <li>else if element internals are used to set a global ARIA property: expose the <a class="core-mapping" href="#role-map-generic">`generic`</a> role</li>
-                </ul>
-              </td>
+              <th>Comments</th>
+              <td></td>
             </tr>
           </tbody>
         </table>
@@ -2549,56 +2541,6 @@ <h4 id="el-form">`form`</h4>
             </tr>
           </tbody>
         </table>
-        <h4 id="el-form-associated-custom-element">form-associated custom element</h4>
-        <table aria-labelledby="el-form-associated-custom-element">
-          <tbody>
-            <tr>
-              <th>HTML Specification</th>
-              <td>
-                <a data-cite="html/custom-elements.html#custom-elements-face-example">form-associated custom element</a>
-              </td>
-            </tr>
-            <tr>
-              <th>[[wai-aria-1.2]]</th>
-              <td>If the author assigned a conforming ARIA role using the `role` attribute, map to that role. Otherwise, the <a class="core-mapping" href="#role-map-generic">`generic`</a> role.</td>
-            </tr>
-            <tr>
-              <th><a data-cite="core-aam-1.2/#roleMappingComputedRole">Computed Role</a></th>
-              <td class="role-computed"><div class="general">Use WAI-ARIA mapping</div></td>
-            </tr>
-            <tr>
-              <th>
-                <a href="https://msdn.microsoft.com/en-us/library/dd373608%28v=VS.85%29.aspx">MSAA</a> + <a href="http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/">IAccessible2</a>
-              </th>
-              <td>
-                <div class="general">Use WAI-ARIA mapping</div>
-              </td>
-            </tr>
-            <tr>
-              <th><a href="https://msdn.microsoft.com/en-us/library/ms726297%28v=VS.85%29.aspx">UIA</a></th>
-              <td>
-                <div class="general">Use WAI-ARIA mapping</div>
-              </td>
-            </tr>
-            <tr>
-              <th><a href="https://gnome.pages.gitlab.gnome.org/atk/">ATK</a></th>
-              <td>
-                <div class="general">Use WAI-ARIA mapping</div>
-              </td>
-            </tr>
-            <tr>
-              <th><a href="https://developer.apple.com/reference/appkit/nsaccessibility">AX</a></th>
-              <td>
-                <div class="general">Use WAI-ARIA mapping</div>
-              </td>
-            </tr>
-            <!-- <th><a href="#accessible-name-and-description-computation">Naming Algorithm</a></th> -->
-            <tr>
-              <th>Comments</th>
-              <td></td>
-            </tr>
-          </tbody>
-        </table>
         <h4 id="el-h1-h6">`h1`, `h2`, `h3`, `h4`, `h5`, and `h6`</h4>
         <table aria-labelledby="el-h1-h6">
           <tbody>