From 115afbd030599cb0f7412c87ba256ff9c3b69130 Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Fri, 15 Jul 2022 10:47:01 -0700
Subject: [PATCH 01/18] Enhance Gamepad interface description for Touch

---
 extensions.html | 182 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 175 insertions(+), 7 deletions(-)

diff --git a/extensions.html b/extensions.html
index c3775ea..72bacce 100644
--- a/extensions.html
+++ b/extensions.html
@@ -95,8 +95,7 @@
           // document unless you know what you're doing. If in doubt ask your friendly neighbourhood
           // Team Contact.
           wgPatentURI:  "https://www.w3.org/2004/01/pp-impl/83482/status",
-
-          xref: ["DOM", "HTML", "INFRA", "gamepad"],
+          xref: ["HTML", "DOM", "PERMISSIONS-POLICY", "HR-TIME", "INFRA", "gamepad"],
       };
     </script>
     <style>
@@ -879,13 +878,74 @@ <h2>
           [SameObject] readonly attribute GamepadHapticActuator? vibrationActuator;
         };
       </pre>
+      <p>
+        Instances of {{Gamepad}} are created with the internal slots described
+        in the following table:
+      </p>
+      <table class="simple">
+        <tr>
+          <th>
+            Internal slot
+          </th>
+          <th>
+            Initial value
+          </th>
+          <th>
+            Description (non-normative)
+          </th>
+        </tr>
+        <tr>
+          <td>
+            <dfn data-dfn-for="Gamepad">[[\hand]]</dfn>
+          </td>
+          <td>
+            `undefined`
+          </td>
+          <td>
+            Indicates the hand the controller is held in.
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <dfn data-dfn-for="Gamepad">[[\hapticActuators]]</dfn>
+          </td>
+          <td>
+            `undefined`
+          </td>
+          <td>
+            List of all the haptic actuators in the gamepad.
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <dfn data-dfn-for="Gamepad">[[\pose]]</dfn>
+          </td>
+          <td>
+            `null`
+          </td>
+          <td>
+            The current pose of the gamepad.
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <dfn data-dfn-for="Gamepad">[[\touchEvents]]</dfn>
+          </td>
+          <td>
+            <code>null</code>
+          </td>
+          <td>
+            List of generated touch events.
+          </td>
+        </tr>
+      </table>
       <dl data-dfn-for="Gamepad">
         <dt>
           <dfn>hand</dfn>
         </dt>
         <dd>
-          Describes the hand the controller is held in or is most likely to be
-          held in.
+          An enumeration that indicates which hand the controller is being held in 
+          or is most likely to be held in. `"left"`, `"right"`, or `""`.
         </dd>
         <dt>
           <dfn>hapticActuators</dfn>
@@ -902,14 +962,14 @@ <h2>
           The current pose of the gamepad, if supported by the hardware.
           Includes position, orientation, velocity, and acceleration. If the
           hardware cannot supply any pose values, MUST be set to
-          <code>null</code>.
+          `null`.
         </dd>
         <dt>
           <dfn>touchEvents</dfn>
         </dt>
         <dd>
           A list of touch events generated from all touch surfaces.
-          <code>null</code> if the device does not support touch events.
+          If the device does not support touch events, MUST be set to `null`.
         </dd>
         <dt>
           <dfn>vibrationActuator</dfn>
@@ -919,6 +979,114 @@ <h2>
           that vibrates the entire gamepad.
         </dd>
       </dl>
+        </dd>
+      </dl>
+      <section>
+        <h3>
+          Receiving inputs
+        </h3>
+        <p>
+          This section supplements the <a href="https://w3c.github.io/gamepad/#receiving-inputs">
+          Receiving inputs</a> section of the main 
+          <a href="https://w3c.github.io/gamepad/">Gamepad specification</a>.
+        </p>
+        <p>
+          In addtion to the steps defined in the main 
+          <a href="https://w3c.github.io/gamepad/">Gamepad specification</a>.
+          When the system receives new touch input values,
+          <dfn data-lt="updating touchEvents">update touchEvents</dfn>
+          by running the following steps:
+        </p>
+        <ol>
+          <li>Let |surfaceDimensionX:unsigned long| be an {{unsigned long}} value
+            representing the maximum x dimention of the touch surface on the |gamepad|.
+          </li>
+          <li>Let |surfaceDimensionY:unsigned long| be an {{unsigned long}} value
+            representing the maximum y dimention of the touch surface on the |gamepad|.
+          </li>
+          <li>Let |touchInputs:list| be a [=list=] of objects representing
+            the most recent logical touch input values reported by the |gamepad|.
+          </li>
+          <li>[=list/For each=] |touchData| in |touchInputs:list|:
+            <ol>
+              <li>
+                <p>Let |normalizedX:float| be a value calculated from the current
+                  touch input x coordinate in relationship to the surfaceDimensionX
+                  and normalized to the range [-1.0, 1.0] where -1.0 is the leftmost
+                  coordinate and 1.0 is the rightmost coordinate.</p>
+                <p>
+                <p>Possible implementation:</p>
+                <ul>
+                  <li>`normalizedX = (2.0 * touchData.x / surfaceDimensionX) - 1`</li>
+                </ul>
+                </p>
+              </li>
+              <li>
+                <p>Let |normalizedY:float| be a value calculated from the current
+                  touch input y coordinate in relationship to the surfaceDimensionY
+                  and normalized to the range [-1.0, 1.0] where -1.0 is the topmost
+                  coordinate and 1.0 is the bottommost coordinate.
+                </p>
+                <p>
+                <p>Possible implementation:</p>
+                <ul>
+                  <li>`normalizedY = (2.0 * touchData.y / surfaceDimensionY) - 1`</li>
+                </ul>
+                </p>
+              </li>
+              <li>Let |touchEvent:GamepadTouch| be a {{GamepadTouch}}.
+              </li>
+              <li>Set |touchEvent|.{{GamepadTouch/touchId}} to be
+              `touchData.touchID`.
+              </li>
+              <li>Set |touchEvent|.{{GamepadTouch/surfaceId}} to be
+              device surfaceId.
+              </li>
+              <li>Set |touchEvent|.{{GamepadTouch/position}}[0] to be
+              |normalizedX:float|.
+              </li>
+              <li>Set |touchEvent|.{{GamepadTouch/position}}[1] to be
+              |normalizedY:float|.
+              </li>
+              <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[0] to be
+              device max x-axis coordinate.
+              </li>
+              <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[1] to be
+              device max y-axis coordinate.<p>(<i>note: surfaceDimensions can be set to `null`</i>)</p>
+              </li>
+              <li>Add |touchEvent| to |gamepad|.{{Gamepad/[[touchEvents]]}}.
+              </li>
+            </ol>
+          </li>
+        </ol>
+      </section>
+      <section>
+        <h3>
+          Constructing a `Gamepad`
+        </h3>
+        <p>
+          This section supplements the <a href="https://w3c.github.io/gamepad/#constructing-a-gamepad">
+            Constructing a `Gamepad`</a> section of the main 
+          <a href="https://w3c.github.io/gamepad/">Gamepad specification</a>.
+        </p>
+        <p>
+          In addtion to the steps defined in the main 
+          <a href="https://w3c.github.io/gamepad/">Gamepad specification</a>.
+          When constructing <dfn>a new `Gamepad`</dfn> representing a connected gamepad device
+          perform the following steps:
+        </p>
+        <ol>
+          <li>Let |gamepad:Gamepad| be a newly created {{Gamepad}} instance:
+            <ol>
+              <li>Initialize |gamepad|'s {{Gamepad/touchEvents}} to the result of
+                [=updating touchEvents=] for |gamepad|.
+              </li>
+            </ol>
+          </li>
+          <li>Return |gamepad|.
+          </li>
+        </ol>
+      </section>  
     </section>
-  </body>
+</body>
 </html>

From 41f86b355565244e2434498c4374ef24bb09f877 Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Mon, 25 Jul 2022 11:09:34 -0700
Subject: [PATCH 02/18] Add branch where surfaceDimensions is set to null.

---
 extensions.html | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/extensions.html b/extensions.html
index 72bacce..2e5a856 100644
--- a/extensions.html
+++ b/extensions.html
@@ -1048,11 +1048,21 @@ <h3>
               <li>Set |touchEvent|.{{GamepadTouch/position}}[1] to be
               |normalizedY:float|.
               </li>
-              <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[0] to be
-              device max x-axis coordinate.
+              <li>If the touch surface exposes maximum surface dimensions in device units:
+                <ol>
+                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[0] to be
+                    device max x-axis coordinate.
+                  </li>
+                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[1] to be
+                    device max y-axis coordinate.
+                  </li>
+                </ol>
               </li>
-              <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[1] to be
-              device max y-axis coordinate.<p>(<i>note: surfaceDimensions can be set to `null`</i>)</p>
+              <li>Otherwise:
+                <ol>
+                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}} to null.
+                  </li>
+                </ol>
               </li>
               <li>Add |touchEvent| to |gamepad|.{{Gamepad/[[touchEvents]]}}.
               </li>

From ceb63de391281d7472fe421b462bd0a3dbcfa07a Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Mon, 25 Jul 2022 11:27:41 -0700
Subject: [PATCH 03/18] Add step to remove events from gamepad.touchEvents

---
 extensions.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extensions.html b/extensions.html
index 2e5a856..46001b5 100644
--- a/extensions.html
+++ b/extensions.html
@@ -1007,6 +1007,8 @@ <h3>
           <li>Let |touchInputs:list| be a [=list=] of objects representing
             the most recent logical touch input values reported by the |gamepad|.
           </li>
+          <li>Remove any existing events from |gamepad|.{{Gamepad/[[touchEvents]]}}.
+          </li>
           <li>[=list/For each=] |touchData| in |touchInputs:list|:
             <ol>
               <li>

From 9a8dc18e8dff9f9e18573fb1a9afd9d88ba82bab Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Mon, 25 Jul 2022 12:21:59 -0700
Subject: [PATCH 04/18] Add outer loop for multiple surfaces

---
 extensions.html | 125 ++++++++++++++++++++++++++----------------------
 1 file changed, 68 insertions(+), 57 deletions(-)

diff --git a/extensions.html b/extensions.html
index 46001b5..a154193 100644
--- a/extensions.html
+++ b/extensions.html
@@ -998,76 +998,87 @@ <h3>
           by running the following steps:
         </p>
         <ol>
-          <li>Let |surfaceDimensionX:unsigned long| be an {{unsigned long}} value
-            representing the maximum x dimention of the touch surface on the |gamepad|.
+          <li>Let |surfaceId:unsigned long| be 0.
           </li>
-          <li>Let |surfaceDimensionY:unsigned long| be an {{unsigned long}} value
-            representing the maximum y dimention of the touch surface on the |gamepad|.
+          <li>Let |touchSurfaces:list| be an [=ordered set=] of touch surfaces
+            reported by the |gamepad|.
           </li>
-          <li>Let |touchInputs:list| be a [=list=] of objects representing
-            the most recent logical touch input values reported by the |gamepad|.
+          <li>Remove any existing events from {{Gamepad}}.{{Gamepad/[[touchEvents]]}}.
           </li>
-          <li>Remove any existing events from |gamepad|.{{Gamepad/[[touchEvents]]}}.
-          </li>
-          <li>[=list/For each=] |touchData| in |touchInputs:list|:
+          <li>[=list/For each=] |surface| in |touchSurfaces:list|:
             <ol>
-              <li>
-                <p>Let |normalizedX:float| be a value calculated from the current
-                  touch input x coordinate in relationship to the surfaceDimensionX
-                  and normalized to the range [-1.0, 1.0] where -1.0 is the leftmost
-                  coordinate and 1.0 is the rightmost coordinate.</p>
-                <p>
-                <p>Possible implementation:</p>
-                <ul>
-                  <li>`normalizedX = (2.0 * touchData.x / surfaceDimensionX) - 1`</li>
-                </ul>
-                </p>
-              </li>
-              <li>
-                <p>Let |normalizedY:float| be a value calculated from the current
-                  touch input y coordinate in relationship to the surfaceDimensionY
-                  and normalized to the range [-1.0, 1.0] where -1.0 is the topmost
-                  coordinate and 1.0 is the bottommost coordinate.
-                </p>
-                <p>
-                <p>Possible implementation:</p>
-                <ul>
-                  <li>`normalizedY = (2.0 * touchData.y / surfaceDimensionY) - 1`</li>
-                </ul>
-                </p>
-              </li>
-              <li>Let |touchEvent:GamepadTouch| be a {{GamepadTouch}}.
-              </li>
-              <li>Set |touchEvent|.{{GamepadTouch/touchId}} to be
-              `touchData.touchID`.
+              <li>Let |surfaceDimensionX:unsigned long| be an {{unsigned long}} value
+                representing the maximum x dimention of the current surface on the |gamepad|.
               </li>
-              <li>Set |touchEvent|.{{GamepadTouch/surfaceId}} to be
-              device surfaceId.
+              <li>Let |surfaceDimensionY:unsigned long| be an {{unsigned long}} value
+                representing the maximum y dimention of the current surface on the |gamepad|.
               </li>
-              <li>Set |touchEvent|.{{GamepadTouch/position}}[0] to be
-              |normalizedX:float|.
+              <li>Let |touchInputs:list| be a [=list=] of objects representing
+                the most recent logical touch input values reported by the |gamepad|
+                for the current surface.
               </li>
-              <li>Set |touchEvent|.{{GamepadTouch/position}}[1] to be
-              |normalizedY:float|.
-              </li>
-              <li>If the touch surface exposes maximum surface dimensions in device units:
+              <li>[=list/For each=] |touchData| in |touchInputs:list|:
                 <ol>
-                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[0] to be
-                    device max x-axis coordinate.
+                  <li>
+                    <p>Let |normalizedX:float| be a value calculated from the current
+                      touch input x coordinate in relationship to the surfaceDimensionX
+                      and normalized to the range [-1.0, 1.0] where -1.0 is the leftmost
+                      coordinate and 1.0 is the rightmost coordinate.</p>
+                    <p>
+                    <p>Possible implementation:</p>
+                    <ul>
+                      <li>`normalizedX = (2.0 * touchData.x / surfaceDimensionX) - 1`</li>
+                    </ul>
+                    </p>
                   </li>
-                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[1] to be
-                    device max y-axis coordinate.
+                  <li>
+                    <p>Let |normalizedY:float| be a value calculated from the current
+                      touch input y coordinate in relationship to the surfaceDimensionY
+                      and normalized to the range [-1.0, 1.0] where -1.0 is the topmost
+                      coordinate and 1.0 is the bottommost coordinate.
+                    </p>
+                    <p>
+                    <p>Possible implementation:</p>
+                    <ul>
+                      <li>`normalizedY = (2.0 * touchData.y / surfaceDimensionY) - 1`</li>
+                    </ul>
+                    </p>
                   </li>
-                </ol>
-              </li>
-              <li>Otherwise:
-                <ol>
-                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}} to null.
+                  <li>Let |touchEvent:GamepadTouch| be a {{GamepadTouch}}.
+                  </li>
+                  <li>Set |touchEvent|.{{GamepadTouch/touchId}} to be
+                    `touchData.touchID`.
+                  </li>
+                  <li>Set |touchEvent|.{{GamepadTouch/surfaceId}} to be
+                    |surfaceId|.
+                  </li>
+                  <li>Set |touchEvent|.{{GamepadTouch/position}}[0] to be
+                    |normalizedX:float|.
+                  </li>
+                  <li>Set |touchEvent|.{{GamepadTouch/position}}[1] to be
+                    |normalizedY:float|.
+                  </li>
+                  <li>If the touch surface exposes maximum surface dimensions in device units:
+                    <ol>
+                      <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[0] to be
+                        device max x-axis coordinate.
+                      </li>
+                      <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[1] to be
+                        device max y-axis coordinate.
+                      </li>
+                    </ol>
+                  </li>
+                  <li>Otherwise:
+                    <ol>
+                      <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}} to null.
+                      </li>
+                    </ol>
+                  </li>
+                  <li>Add |touchEvent| to {{Gamepad}}.{{Gamepad/[[touchEvents]]}}.
                   </li>
                 </ol>
               </li>
-              <li>Add |touchEvent| to |gamepad|.{{Gamepad/[[touchEvents]]}}.
-              </li>
+              <li>Increment |surfaceId|</li>
             </ol>
           </li>
         </ol>

From c9d33026d5f73294d1e6c99825959a25f3948831 Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Mon, 25 Jul 2022 12:38:10 -0700
Subject: [PATCH 05/18] Reword when "update touchEvents" should occur.

---
 extensions.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions.html b/extensions.html
index a154193..f1c8b8e 100644
--- a/extensions.html
+++ b/extensions.html
@@ -993,7 +993,9 @@ <h3>
         <p>
           In addtion to the steps defined in the main 
           <a href="https://w3c.github.io/gamepad/">Gamepad specification</a>.
-          When the system receives new touch input values,
+          When the user agent modifies the list of |active touch points| for a 
+          touch surface by adding touch points, removing touch points, 
+          or updating the values of existing touch points,
           <dfn data-lt="updating touchEvents">update touchEvents</dfn>
           by running the following steps:
         </p>

From 8fe5ed0b5cad96c593719ca949302fd00c4c0c02 Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Mon, 25 Jul 2022 13:31:35 -0700
Subject: [PATCH 06/18] Add getter algorithm

---
 extensions.html | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/extensions.html b/extensions.html
index f1c8b8e..bf2d36f 100644
--- a/extensions.html
+++ b/extensions.html
@@ -968,8 +968,19 @@ <h2>
           <dfn>touchEvents</dfn>
         </dt>
         <dd>
-          A list of touch events generated from all touch surfaces.
-          If the device does not support touch events, MUST be set to `null`.
+          <p>A list of touch events generated from all touch surfaces.
+          If the device does not support touch events, MUST be set to `null`.</p>
+          <p>
+            The {{Gamepad/touchEvents}} getter steps are:
+          </p>
+          <ol>
+            <li>If [=this=].{{Gamepad/[[touchEvents]]}} not `null` and not empty,
+              return [=this=].{{Gamepad/[[touchEvents]]}}.
+            </li>
+            <li>Otherwise return `null`.
+            </li>
+          </ol>
+
         </dd>
         <dt>
           <dfn>vibrationActuator</dfn>

From 218799f3bf2ef6e46928fbff7ecfa9020b753248 Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Mon, 1 Aug 2022 13:26:57 -0700
Subject: [PATCH 07/18] Update initialization of touchEvents.

---
 extensions.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions.html b/extensions.html
index bf2d36f..0eae291 100644
--- a/extensions.html
+++ b/extensions.html
@@ -1114,13 +1114,13 @@ <h3>
         <ol>
           <li>Let |gamepad:Gamepad| be a newly created {{Gamepad}} instance:
             <ol>
-              <li>Initialize |gamepad|'s {{Gamepad/touchEvents}} to the result of
-                [=updating touchEvents=] for |gamepad|.
+              <li>If the |gamepad| has touch surfaces, initialize |gamepad|'s {{Gamepad/touchEvents}} 
+                to an empty [=list=].
+              </li>
+              <li>Otherwise, initialize |gamepad|'s {{Gamepad/touchEvents}} <code>null</code>.
               </li>
             </ol>
           </li>
-          <li>Return |gamepad|.
-          </li>
         </ol>
       </section>  
     </section>

From 69a415e38c2d51bcda26906cc7f94a7844dd4a81 Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Mon, 8 Aug 2022 10:53:29 -0700
Subject: [PATCH 08/18] Included [active touch point] to set touchId

---
 extensions.html | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/extensions.html b/extensions.html
index 0eae291..de6fc6f 100644
--- a/extensions.html
+++ b/extensions.html
@@ -50,7 +50,7 @@
                 company: "Google", companyURL: "http://www.google.com/",
                 w3cid: 87824 },
           ],
-
+          xref: true,
           otherLinks: [{
             key: 'Repository and Participation',
             data: [
@@ -1059,8 +1059,18 @@ <h3>
                   </li>
                   <li>Let |touchEvent:GamepadTouch| be a {{GamepadTouch}}.
                   </li>
-                  <li>Set |touchEvent|.{{GamepadTouch/touchId}} to be
-                    `touchData.touchID`.
+                  <li>If the touch data is part of an existing 
+                    <a href="https://w3c.github.io/touch-events/#dfn-active-touch-point">active touch point</a> 
+                    tracked by the user agent:
+                    <ol>
+                    <li>Set touchId to the touchId of the active touch point.
+                    </li>
+                    <li>Otherwise, set touchId to nextTouchId and increment nextTouchId.
+                      <p class="note" title="Touch ids are relative to the Gamepad">
+                        If the Gamepad has multiple touch surfaces the touch id will be unique across surfaces.
+                      </p>
+                    </li>
+                    </ol>
                   </li>
                   <li>Set |touchEvent|.{{GamepadTouch/surfaceId}} to be
                     |surfaceId|.

From 3a9b4de3b0db358e09666a7e54ea6c0a926ba2ac Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Fri, 12 Aug 2022 15:55:35 -0700
Subject: [PATCH 09/18] Restructure of Receiving inputs section.

---
 extensions.html | 114 ++++++++++++++++++++++++------------------------
 1 file changed, 56 insertions(+), 58 deletions(-)

diff --git a/extensions.html b/extensions.html
index de6fc6f..f58be77 100644
--- a/extensions.html
+++ b/extensions.html
@@ -1013,57 +1013,40 @@ <h3>
         <ol>
           <li>Let |surfaceId:unsigned long| be 0.
           </li>
-          <li>Let |touchSurfaces:list| be an [=ordered set=] of touch surfaces
-            reported by the |gamepad|.
-          </li>
           <li>Remove any existing events from {{Gamepad}}.{{Gamepad/[[touchEvents]]}}.
           </li>
-          <li>[=list/For each=] |surface| in |touchSurfaces:list|:
+          <li>Repeat the following steps for each [=touch surface=] on |gamepad| in 
+            [=touch surface enumeration order=]:
             <ol>
-              <li>Let |surfaceDimensionX:unsigned long| be an {{unsigned long}} value
-                representing the maximum x dimention of the current surface on the |gamepad|.
-              </li>
-              <li>Let |surfaceDimensionY:unsigned long| be an {{unsigned long}} value
-                representing the maximum y dimention of the current surface on the |gamepad|.
-              </li>
-              <li>Let |touchInputs:list| be a [=list=] of objects representing
-                the most recent logical touch input values reported by the |gamepad|
-                for the current surface.
+              <li>Let |surfaceDimensions| be an `null`.
               </li>
-              <li>[=list/For each=] |touchData| in |touchInputs:list|:
+              <li>If the touch surface exposes maximum surface dimensions in device units:
                 <ol>
-                  <li>
-                    <p>Let |normalizedX:float| be a value calculated from the current
-                      touch input x coordinate in relationship to the surfaceDimensionX
-                      and normalized to the range [-1.0, 1.0] where -1.0 is the leftmost
-                      coordinate and 1.0 is the rightmost coordinate.</p>
-                    <p>
-                    <p>Possible implementation:</p>
-                    <ul>
-                      <li>`normalizedX = (2.0 * touchData.x / surfaceDimensionX) - 1`</li>
-                    </ul>
-                    </p>
+                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[0] to the maximum
+                    X dimension on the [=touch surface=] in device units.
                   </li>
+                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[1] to the maximum
+                    Y dimension on the [=touch surface=] in device units.
+                  </li>
+                </ol>
+              </li>
+              <li>Repeat the following steps for each 
+                [=active touch point=]
+                reported by the |gamepad| for the current [=touch surface=].
+                <ol>
                   <li>
-                    <p>Let |normalizedY:float| be a value calculated from the current
-                      touch input y coordinate in relationship to the surfaceDimensionY
-                      and normalized to the range [-1.0, 1.0] where -1.0 is the topmost
-                      coordinate and 1.0 is the bottommost coordinate.
-                    </p>
-                    <p>
-                    <p>Possible implementation:</p>
-                    <ul>
-                      <li>`normalizedY = (2.0 * touchData.y / surfaceDimensionY) - 1`</li>
-                    </ul>
-                    </p>
+                    Let |nextTouchId:unsigned long| be the next available touchId for the |gamepad|.
                   </li>
                   <li>Let |touchEvent:GamepadTouch| be a {{GamepadTouch}}.
                   </li>
+                  <li>Set |touchEvent|.{{GamepadTouch/surfaceId}} to be
+                    |surfaceId|.
+                  </li>
                   <li>If the touch data is part of an existing 
-                    <a href="https://w3c.github.io/touch-events/#dfn-active-touch-point">active touch point</a> 
+                    [=active touch point=]
                     tracked by the user agent:
                     <ol>
-                    <li>Set touchId to the touchId of the active touch point.
+                    <li>Set |touchEvent|.{{GamepadTouch/touchId}} to the touchId of the [=active touch point=].
                     </li>
                     <li>Otherwise, set touchId to nextTouchId and increment nextTouchId.
                       <p class="note" title="Touch ids are relative to the Gamepad">
@@ -1072,30 +1055,28 @@ <h3>
                     </li>
                     </ol>
                   </li>
-                  <li>Set |touchEvent|.{{GamepadTouch/surfaceId}} to be
-                    |surfaceId|.
+                  <li>
+                    Let |position| be a [=new=] {{Float32Array}} with length 2.
                   </li>
-                  <li>Set |touchEvent|.{{GamepadTouch/position}}[0] to be
-                    |normalizedX:float|.
+                  <li>
+                    <p>|position|[0] should be set to the device X coordinate relative to the device [=touch surface=] and normalized to [-1.0,1.0]
+                      where -1.0 is the leftmost coordinate and 1.0 is the rightmost coordinate.
+                    </p>
+                    <p class="note" title="Possible implementation (if surfaceDimensions are available)">
+                      `position[0] = (2.0 * touchData.x / surfaceDimensions[0]) - 1`
+                    </p>
                   </li>
-                  <li>Set |touchEvent|.{{GamepadTouch/position}}[1] to be
-                    |normalizedY:float|.
+                  <li>
+                    <p>|position|[1] should be set to the device Y coordinate relative to the device [=touch surface=] and normalized to [-1.0,1.0]
+                      where -1.0 is the topmost coordinate and 1.0 is the bottommost coordinate.
+                    </p>
+                    <p class="note" title="Possible implementation (if surfaceDimensions are available)">
+                      `position[1] = (2.0 * touchData.y / surfaceDimensions[1]) - 1`
+                    </p>
                   </li>
-                  <li>If the touch surface exposes maximum surface dimensions in device units:
-                    <ol>
-                      <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[0] to be
-                        device max x-axis coordinate.
-                      </li>
-                      <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[1] to be
-                        device max y-axis coordinate.
-                      </li>
-                    </ol>
                   </li>
-                  <li>Otherwise:
-                    <ol>
-                      <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}} to null.
-                      </li>
-                    </ol>
+                  <li>Set |touchEvent|.{{GamepadTouch/position}} to be
+                    |position:Float32Array|.
                   </li>
                   <li>Add |touchEvent| to {{Gamepad}}.{{Gamepad/[[touchEvents]]}}.
                   </li>
@@ -1134,5 +1115,22 @@ <h3>
         </ol>
       </section>  
     </section>
+    <section>
+      <h3>
+        Glossary
+      </h3>
+      <p>
+        <dfn>touch surface</dfn> is a surface that can detect contact from a users fingers 
+        and report where on the surface the contact is made.
+      </p>
+      <p>
+        <dfn>touch surface enumeration order</dfn> is an ordered listing of all the surfaces in a |gamepad|.
+      </p>
+      <p>
+        <dfn>active touch point</dfn> is defined in the 
+        <a href="https://w3c.github.io/touch-events/#dfn-active-touch-point">Touch Events - Level 2</a>
+        specification.
+      </p>
+    </section>
 </body>
 </html>

From f451bfbb4979ff2598bbc92c5e9ecdca4c646bcf Mon Sep 17 00:00:00 2001
From: Bradley Needham <109366827+bradleyneedham@users.noreply.github.com>
Date: Mon, 12 Dec 2022 13:36:41 -0800
Subject: [PATCH 10/18] Create multitouch_explainer.md

---
 multitouch_explainer.md | 42 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 multitouch_explainer.md

diff --git a/multitouch_explainer.md b/multitouch_explainer.md
new file mode 100644
index 0000000..2d039f7
--- /dev/null
+++ b/multitouch_explainer.md
@@ -0,0 +1,42 @@
+#Gamepad Touch Extension
+Last modified: 2022-12-09
+#Overview
+Modern gamepads support touch functionality, the most common being the touchpad on the Sony DualShock®4 controller and the trackpads on the Steam Controller. The Standard Gamepad specification should be updated to include touchpad functionality, and the Gamepad API should be extended to allow developers to get touchpad values in their apps.
+Standard Gamepad
+The Standard Gamepad specification describes the positions of up to 17 buttons and 4 axes that are found on a typical gamepad. To support getting touchpad values, the standard gamepad will be extended to specify multiple touches found on a modern gamepad.
+ 
+The touchpad, if present, will be assumed to be capable of capturing multiple touches. This configuration is found on many popular gamepads including the DualShock®4. When this configuration is present, it should be exposed as the touchEvents on the corresponding gamepad.
+
+The Gamepad Extensions draft defines a GamepadTouch which represents a single touch event on a gamepad device that supports touch input and adds an optional touchEvents attribute to the Gamepad interface.
+Examples
+Below is an example of how this API could be used to get touches from the gamepad at index 0.
+```
+var gamepads = navigator.getGamepads();
+if (gamepads.length > 0) {
+    var gamepad = gamepads[0];
+    if (gamepad.touchEvents) {
+        for (var i = 0; i < gamepad.touches.length; i++) {
+            var touchEvent = gamepad.touchEvents[i];
+            console.log("----touch #" + i + ":touchId = " + 
+                        touchEvent.touchId);
+            console.log("----touch #" + i + ":surfaceId = " +
+                        touchEvent.surfaceId);
+            console.log("----touch #" + i + ":position[0] = " +
+                        touchEvent.position[0]);
+            console.log("----touch #" + i + ":position[1] = " +
+                        touchEvent.position[1]);
+            console.log("----touch #" + i + ":surfaceDimension[0] = " +
+                        touchEvent.surfaceDimension[0]);
+            console.log("----touch #" + i + ":surfaceDimension[1] = " +
+                        touchEvent.surfaceDimension[1]);
+        }
+    }
+}
+```
+
+
+
+Links
+W3C Vibration API spec
+W3C Gamepad API spec
+W3C Gamepad Extensions draft

From 96aec0afeaa3997cb4fa86fdd292fbe22172e125 Mon Sep 17 00:00:00 2001
From: Bradley Needham <109366827+bradleyneedham@users.noreply.github.com>
Date: Mon, 12 Dec 2022 13:43:14 -0800
Subject: [PATCH 11/18] Update multitouch_explainer.md

---
 multitouch_explainer.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/multitouch_explainer.md b/multitouch_explainer.md
index 2d039f7..096fe60 100644
--- a/multitouch_explainer.md
+++ b/multitouch_explainer.md
@@ -1,8 +1,8 @@
-#Gamepad Touch Extension
-Last modified: 2022-12-09
-#Overview
-Modern gamepads support touch functionality, the most common being the touchpad on the Sony DualShock®4 controller and the trackpads on the Steam Controller. The Standard Gamepad specification should be updated to include touchpad functionality, and the Gamepad API should be extended to allow developers to get touchpad values in their apps.
-Standard Gamepad
+## Gamepad Touch Extension
+### Overview
+Modern gamepads support touch functionality, e.g the touchpad on the Sony DualShock®4 controller and the trackpads on the Steam Controller. The Standard Gamepad specification should be updated to include touchpad functionality, and the Gamepad API should be extended to allow developers to get touchpad values in their apps.
+
+#### Standard Gamepad
 The Standard Gamepad specification describes the positions of up to 17 buttons and 4 axes that are found on a typical gamepad. To support getting touchpad values, the standard gamepad will be extended to specify multiple touches found on a modern gamepad.
  
 The touchpad, if present, will be assumed to be capable of capturing multiple touches. This configuration is found on many popular gamepads including the DualShock®4. When this configuration is present, it should be exposed as the touchEvents on the corresponding gamepad.
@@ -36,7 +36,5 @@ if (gamepads.length > 0) {
 
 
 
-Links
-W3C Vibration API spec
-W3C Gamepad API spec
-W3C Gamepad Extensions draft
+### Links
+PR for Gamepad Extensions draft: [Enhance Gamepad interface description for Touch #168](https://github.com/w3c/gamepad/pull/168)

From 5188615f9ab63700050dbca26545d7a542ab9821 Mon Sep 17 00:00:00 2001
From: Bradley Needham <109366827+bradleyneedham@users.noreply.github.com>
Date: Mon, 12 Dec 2022 13:58:14 -0800
Subject: [PATCH 12/18] Delete multitouch_explainer.md

Move to a different branch
---
 multitouch_explainer.md | 40 ----------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 multitouch_explainer.md

diff --git a/multitouch_explainer.md b/multitouch_explainer.md
deleted file mode 100644
index 096fe60..0000000
--- a/multitouch_explainer.md
+++ /dev/null
@@ -1,40 +0,0 @@
-## Gamepad Touch Extension
-### Overview
-Modern gamepads support touch functionality, e.g the touchpad on the Sony DualShock®4 controller and the trackpads on the Steam Controller. The Standard Gamepad specification should be updated to include touchpad functionality, and the Gamepad API should be extended to allow developers to get touchpad values in their apps.
-
-#### Standard Gamepad
-The Standard Gamepad specification describes the positions of up to 17 buttons and 4 axes that are found on a typical gamepad. To support getting touchpad values, the standard gamepad will be extended to specify multiple touches found on a modern gamepad.
- 
-The touchpad, if present, will be assumed to be capable of capturing multiple touches. This configuration is found on many popular gamepads including the DualShock®4. When this configuration is present, it should be exposed as the touchEvents on the corresponding gamepad.
-
-The Gamepad Extensions draft defines a GamepadTouch which represents a single touch event on a gamepad device that supports touch input and adds an optional touchEvents attribute to the Gamepad interface.
-Examples
-Below is an example of how this API could be used to get touches from the gamepad at index 0.
-```
-var gamepads = navigator.getGamepads();
-if (gamepads.length > 0) {
-    var gamepad = gamepads[0];
-    if (gamepad.touchEvents) {
-        for (var i = 0; i < gamepad.touches.length; i++) {
-            var touchEvent = gamepad.touchEvents[i];
-            console.log("----touch #" + i + ":touchId = " + 
-                        touchEvent.touchId);
-            console.log("----touch #" + i + ":surfaceId = " +
-                        touchEvent.surfaceId);
-            console.log("----touch #" + i + ":position[0] = " +
-                        touchEvent.position[0]);
-            console.log("----touch #" + i + ":position[1] = " +
-                        touchEvent.position[1]);
-            console.log("----touch #" + i + ":surfaceDimension[0] = " +
-                        touchEvent.surfaceDimension[0]);
-            console.log("----touch #" + i + ":surfaceDimension[1] = " +
-                        touchEvent.surfaceDimension[1]);
-        }
-    }
-}
-```
-
-
-
-### Links
-PR for Gamepad Extensions draft: [Enhance Gamepad interface description for Touch #168](https://github.com/w3c/gamepad/pull/168)

From 464c237cc097e6759ce6fd1e6239b62bb4a24f29 Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Mon, 12 Dec 2022 15:20:15 -0800
Subject: [PATCH 13/18] Apply tidy to clean up HTML format

---
 extensions.html | 177 +++++++++++++++++++++++++++---------------------
 1 file changed, 100 insertions(+), 77 deletions(-)

diff --git a/extensions.html b/extensions.html
index f58be77..b4abaa7 100644
--- a/extensions.html
+++ b/extensions.html
@@ -944,8 +944,8 @@ <h2>
           <dfn>hand</dfn>
         </dt>
         <dd>
-          An enumeration that indicates which hand the controller is being held in 
-          or is most likely to be held in. `"left"`, `"right"`, or `""`.
+          An enumeration that indicates which hand the controller is being held
+          in or is most likely to be held in. `"left"`, `"right"`, or `""`.
         </dd>
         <dt>
           <dfn>hapticActuators</dfn>
@@ -961,21 +961,22 @@ <h2>
         <dd>
           The current pose of the gamepad, if supported by the hardware.
           Includes position, orientation, velocity, and acceleration. If the
-          hardware cannot supply any pose values, MUST be set to
-          `null`.
+          hardware cannot supply any pose values, MUST be set to `null`.
         </dd>
         <dt>
           <dfn>touchEvents</dfn>
         </dt>
         <dd>
-          <p>A list of touch events generated from all touch surfaces.
-          If the device does not support touch events, MUST be set to `null`.</p>
+          <p>
+            A list of touch events generated from all touch surfaces. If the
+            device does not support touch events, MUST be set to `null`.
+          </p>
           <p>
             The {{Gamepad/touchEvents}} getter steps are:
           </p>
           <ol>
-            <li>If [=this=].{{Gamepad/[[touchEvents]]}} not `null` and not empty,
-              return [=this=].{{Gamepad/[[touchEvents]]}}.
+            <li>If [=this=].{{Gamepad/[[touchEvents]]}} not `null` and not
+            empty, return [=this=].{{Gamepad/[[touchEvents]]}}.
             </li>
             <li>Otherwise return `null`.
             </li>
@@ -997,94 +998,113 @@ <h3>
           Receiving inputs
         </h3>
         <p>
-          This section supplements the <a href="https://w3c.github.io/gamepad/#receiving-inputs">
-          Receiving inputs</a> section of the main 
-          <a href="https://w3c.github.io/gamepad/">Gamepad specification</a>.
+          This section supplements the <a href=
+          "https://w3c.github.io/gamepad/#receiving-inputs">Receiving
+          inputs</a> section of the main <a href=
+          "https://w3c.github.io/gamepad/">Gamepad specification</a>.
         </p>
         <p>
-          In addtion to the steps defined in the main 
-          <a href="https://w3c.github.io/gamepad/">Gamepad specification</a>.
-          When the user agent modifies the list of |active touch points| for a 
-          touch surface by adding touch points, removing touch points, 
-          or updating the values of existing touch points,
-          <dfn data-lt="updating touchEvents">update touchEvents</dfn>
-          by running the following steps:
+          In addtion to the steps defined in the main <a href=
+          "https://w3c.github.io/gamepad/">Gamepad specification</a>. When the
+          user agent modifies the list of |active touch points| for a touch
+          surface by adding touch points, removing touch points, or updating
+          the values of existing touch points, <dfn data-lt=
+          "updating touchEvents">update touchEvents</dfn> by running the
+          following steps:
         </p>
         <ol>
           <li>Let |surfaceId:unsigned long| be 0.
           </li>
-          <li>Remove any existing events from {{Gamepad}}.{{Gamepad/[[touchEvents]]}}.
+          <li>Remove any existing events from
+          {{Gamepad}}.{{Gamepad/[[touchEvents]]}}.
           </li>
-          <li>Repeat the following steps for each [=touch surface=] on |gamepad| in 
-            [=touch surface enumeration order=]:
+          <li>Repeat the following steps for each [=touch surface=] on
+          |gamepad| in [=touch surface enumeration order=]:
             <ol>
               <li>Let |surfaceDimensions| be an `null`.
               </li>
-              <li>If the touch surface exposes maximum surface dimensions in device units:
+              <li>If the touch surface exposes maximum surface dimensions in
+              device units:
                 <ol>
-                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[0] to the maximum
-                    X dimension on the [=touch surface=] in device units.
+                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[0] to
+                  the maximum X dimension on the [=touch surface=] in device
+                  units.
                   </li>
-                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[1] to the maximum
-                    Y dimension on the [=touch surface=] in device units.
+                  <li>Set |touchEvent|.{{GamepadTouch/surfaceDimensions}}[1] to
+                  the maximum Y dimension on the [=touch surface=] in device
+                  units.
                   </li>
                 </ol>
               </li>
-              <li>Repeat the following steps for each 
-                [=active touch point=]
-                reported by the |gamepad| for the current [=touch surface=].
+              <li>Repeat the following steps for each [=active touch point=]
+              reported by the |gamepad| for the current [=touch surface=].
                 <ol>
-                  <li>
-                    Let |nextTouchId:unsigned long| be the next available touchId for the |gamepad|.
+                  <li>Let |nextTouchId:unsigned long| be the next available
+                  touchId for the |gamepad|.
                   </li>
                   <li>Let |touchEvent:GamepadTouch| be a {{GamepadTouch}}.
                   </li>
                   <li>Set |touchEvent|.{{GamepadTouch/surfaceId}} to be
-                    |surfaceId|.
+                  |surfaceId|.
                   </li>
-                  <li>If the touch data is part of an existing 
-                    [=active touch point=]
-                    tracked by the user agent:
+                  <li>If the touch data is part of an existing [=active touch
+                  point=] tracked by the user agent:
                     <ol>
-                    <li>Set |touchEvent|.{{GamepadTouch/touchId}} to the touchId of the [=active touch point=].
-                    </li>
-                    <li>Otherwise, set touchId to nextTouchId and increment nextTouchId.
-                      <p class="note" title="Touch ids are relative to the Gamepad">
-                        If the Gamepad has multiple touch surfaces the touch id will be unique across surfaces.
-                      </p>
-                    </li>
+                      <li>Set |touchEvent|.{{GamepadTouch/touchId}} to the
+                      touchId of the [=active touch point=].
+                      </li>
+                      <li>Otherwise, set touchId to nextTouchId and increment
+                      nextTouchId.
+                        <p class="note" title=
+                        "Touch ids are relative to the Gamepad">
+                          If the Gamepad has multiple touch surfaces the touch
+                          id will be unique across surfaces.
+                        </p>
+                      </li>
                     </ol>
                   </li>
-                  <li>
-                    Let |position| be a [=new=] {{Float32Array}} with length 2.
+                  <li>Let |position| be a [=new=] {{Float32Array}} with length
+                  2.
                   </li>
                   <li>
-                    <p>|position|[0] should be set to the device X coordinate relative to the device [=touch surface=] and normalized to [-1.0,1.0]
-                      where -1.0 is the leftmost coordinate and 1.0 is the rightmost coordinate.
+                    <p>
+                      |position|[0] should be set to the device X coordinate
+                      relative to the device [=touch surface=] and normalized
+                      to [-1.0,1.0] where -1.0 is the leftmost coordinate and
+                      1.0 is the rightmost coordinate.
                     </p>
-                    <p class="note" title="Possible implementation (if surfaceDimensions are available)">
-                      `position[0] = (2.0 * touchData.x / surfaceDimensions[0]) - 1`
+                    <p class="note" title=
+                    "Possible implementation (if surfaceDimensions are available)">
+                      `position[0] = (2.0 * touchData.x / surfaceDimensions[0])
+                      - 1`
                     </p>
                   </li>
                   <li>
-                    <p>|position|[1] should be set to the device Y coordinate relative to the device [=touch surface=] and normalized to [-1.0,1.0]
-                      where -1.0 is the topmost coordinate and 1.0 is the bottommost coordinate.
+                    <p>
+                      |position|[1] should be set to the device Y coordinate
+                      relative to the device [=touch surface=] and normalized
+                      to [-1.0,1.0] where -1.0 is the topmost coordinate and
+                      1.0 is the bottommost coordinate.
                     </p>
-                    <p class="note" title="Possible implementation (if surfaceDimensions are available)">
-                      `position[1] = (2.0 * touchData.y / surfaceDimensions[1]) - 1`
+                    <p class="note" title=
+                    "Possible implementation (if surfaceDimensions are available)">
+                      `position[1] = (2.0 * touchData.y / surfaceDimensions[1])
+                      - 1`
                     </p>
                   </li>
-                  </li>
-                  <li>Set |touchEvent|.{{GamepadTouch/position}} to be
-                    |position:Float32Array|.
-                  </li>
-                  <li>Add |touchEvent| to {{Gamepad}}.{{Gamepad/[[touchEvents]]}}.
-                  </li>
                 </ol>
               </li>
-              <li>Increment |surfaceId|</li>
+              <li>Set |touchEvent|.{{GamepadTouch/position}} to be
+              |position:Float32Array|.
+              </li>
+              <li>Add |touchEvent| to {{Gamepad}}.{{Gamepad/[[touchEvents]]}}.
+              </li>
             </ol>
           </li>
+          <li>Increment |surfaceId|
+          </li>
+          <li>Increment |surfaceId|
+          </li>
         </ol>
       </section>
       <section>
@@ -1092,45 +1112,48 @@ <h3>
           Constructing a `Gamepad`
         </h3>
         <p>
-          This section supplements the <a href="https://w3c.github.io/gamepad/#constructing-a-gamepad">
-            Constructing a `Gamepad`</a> section of the main 
-          <a href="https://w3c.github.io/gamepad/">Gamepad specification</a>.
+          This section supplements the <a href=
+          "https://w3c.github.io/gamepad/#constructing-a-gamepad">Constructing
+          a `Gamepad`</a> section of the main <a href=
+          "https://w3c.github.io/gamepad/">Gamepad specification</a>.
         </p>
         <p>
-          In addtion to the steps defined in the main 
-          <a href="https://w3c.github.io/gamepad/">Gamepad specification</a>.
-          When constructing <dfn>a new `Gamepad`</dfn> representing a connected gamepad device
-          perform the following steps:
+          In addtion to the steps defined in the main <a href=
+          "https://w3c.github.io/gamepad/">Gamepad specification</a>. When
+          constructing <dfn>a new `Gamepad`</dfn> representing a connected
+          gamepad device perform the following steps:
         </p>
         <ol>
           <li>Let |gamepad:Gamepad| be a newly created {{Gamepad}} instance:
             <ol>
-              <li>If the |gamepad| has touch surfaces, initialize |gamepad|'s {{Gamepad/touchEvents}} 
-                to an empty [=list=].
+              <li>If the |gamepad| has touch surfaces, initialize |gamepad|'s
+              {{Gamepad/touchEvents}} to an empty [=list=].
               </li>
-              <li>Otherwise, initialize |gamepad|'s {{Gamepad/touchEvents}} <code>null</code>.
+              <li>Otherwise, initialize |gamepad|'s {{Gamepad/touchEvents}}
+              <code>null</code>.
               </li>
             </ol>
           </li>
         </ol>
-      </section>  
+      </section>
     </section>
     <section>
       <h3>
         Glossary
       </h3>
       <p>
-        <dfn>touch surface</dfn> is a surface that can detect contact from a users fingers 
-        and report where on the surface the contact is made.
+        <dfn>touch surface</dfn> is a surface that can detect contact from a
+        users fingers and report where on the surface the contact is made.
       </p>
       <p>
-        <dfn>touch surface enumeration order</dfn> is an ordered listing of all the surfaces in a |gamepad|.
+        <dfn>touch surface enumeration order</dfn> is an ordered listing of all
+        the surfaces in a |gamepad|.
       </p>
       <p>
-        <dfn>active touch point</dfn> is defined in the 
-        <a href="https://w3c.github.io/touch-events/#dfn-active-touch-point">Touch Events - Level 2</a>
-        specification.
+        <dfn>active touch point</dfn> is defined in the <a href=
+        "https://w3c.github.io/touch-events/#dfn-active-touch-point">Touch
+        Events - Level 2</a> specification.
       </p>
     </section>
-</body>
+  </body>
 </html>

From 8c2e295b280308fbe05be96579c01552510c4bba Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Mon, 12 Dec 2022 15:30:46 -0800
Subject: [PATCH 14/18] Remove "xref: true"

---
 extensions.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions.html b/extensions.html
index b4abaa7..48ad9c8 100644
--- a/extensions.html
+++ b/extensions.html
@@ -50,7 +50,7 @@
                 company: "Google", companyURL: "http://www.google.com/",
                 w3cid: 87824 },
           ],
-          xref: true,
+
           otherLinks: [{
             key: 'Repository and Participation',
             data: [

From 3947b1ee2ac777837f0ceee3925616918834683c Mon Sep 17 00:00:00 2001
From: Bradley Needham <bradley.needham@sony.com>
Date: Tue, 21 Feb 2023 13:31:33 -0800
Subject: [PATCH 15/18] Specify touchId requires unique ids per origin

Other small formatting updates
---
 extensions.html | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/extensions.html b/extensions.html
index 48ad9c8..796be74 100644
--- a/extensions.html
+++ b/extensions.html
@@ -607,6 +607,12 @@ <h3>
               {{GamepadEffectParameters/weakMagnitude}}, none of which are
               required.
             </p>
+            <p>
+              {{GamepadEffectParameters/startDelay}} and
+              {{GamepadEffectParameters/duration}} set the duration of the
+              initial delay before after initiating the effect before the
+              effect will be started
+            </p>
             <p>
               {{GamepadEffectParameters/startDelay}} sets the duration of the
               delay after {{GamepadHapticActuator/playEffect()}} is called
@@ -830,9 +836,14 @@ <h2>
           <dfn>touchId</dfn> attribute
         </dt>
         <dd>
-          Unique id of the touch event. Range is [0, 4294967295]. The user
-          agent is responsible for incrementing the touchId for each subsequent
-          touch event based on information provided by the device API.
+          Unique id of the touch event. Range is [0, 4294967295].
+          <p>The user agent is responsible for:</p>
+          <ul>
+            <li>Incrementing the id for each subsequent touch event based
+              on information provided by the device API.</li>
+            <li>Maintaining the uniqueness of the id per origin to 
+              prevent fingerprinting.</li>
+          </ul>
           {{GamepadTouch/touchId}} SHOULD be set to a default value of 0 when a
           new {{Gamepad}} object is created.
         </dd>
@@ -932,7 +943,7 @@ <h2>
             <dfn data-dfn-for="Gamepad">[[\touchEvents]]</dfn>
           </td>
           <td>
-            <code>null</code>
+            `null`
           </td>
           <td>
             List of generated touch events.
@@ -944,14 +955,14 @@ <h2>
           <dfn>hand</dfn>
         </dt>
         <dd>
-          An enumeration that indicates which hand the controller is being held
-          in or is most likely to be held in. `"left"`, `"right"`, or `""`.
+          An enumeration, {{GamepadHand}}, that indicates which hand the controller is being held
+          in or is most likely to be held in.
         </dd>
         <dt>
           <dfn>hapticActuators</dfn>
         </dt>
         <dd>
-          A list of all the haptic actuators in the gamepad. The same object
+          A list of all the {{GamepadHapticActuator}}s in the gamepad. The same object
           MUST be returned until the user agent needs to return different
           values (or values in a different order).
         </dd>
@@ -959,7 +970,7 @@ <h2>
           <dfn>pose</dfn>
         </dt>
         <dd>
-          The current pose of the gamepad, if supported by the hardware.
+          The current {{GamepadPose}} of the gamepad, if supported by the hardware.
           Includes position, orientation, velocity, and acceleration. If the
           hardware cannot supply any pose values, MUST be set to `null`.
         </dd>
@@ -968,7 +979,7 @@ <h2>
         </dt>
         <dd>
           <p>
-            A list of touch events generated from all touch surfaces. If the
+            A list of {{GamepadTouch}} events generated from all touch surfaces. If the
             device does not support touch events, MUST be set to `null`.
           </p>
           <p>
@@ -981,7 +992,6 @@ <h2>
             <li>Otherwise return `null`.
             </li>
           </ol>
-
         </dd>
         <dt>
           <dfn>vibrationActuator</dfn>
@@ -990,8 +1000,6 @@ <h2>
           A {{GamepadHapticActuator}} capable of generating a haptic effect
           that vibrates the entire gamepad.
         </dd>
-      </dl>
-        </dd>
       </dl>
       <section>
         <h3>
@@ -1012,7 +1020,7 @@ <h3>
           "updating touchEvents">update touchEvents</dfn> by running the
           following steps:
         </p>
-        <ol>
+        <ol class="algorithm">
           <li>Let |surfaceId:unsigned long| be 0.
           </li>
           <li>Remove any existing events from

From 427ff976a07430bd61d782cc47ec22fe1e630c4c Mon Sep 17 00:00:00 2001
From: Matt Reynolds <mattreynolds@google.com>
Date: Tue, 12 Sep 2023 16:36:53 +0200
Subject: [PATCH 16/18] Update extensions.html

---
 extensions.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.html b/extensions.html
index 796be74..5b1a17f 100644
--- a/extensions.html
+++ b/extensions.html
@@ -955,8 +955,8 @@ <h2>
           <dfn>hand</dfn>
         </dt>
         <dd>
-          An enumeration, {{GamepadHand}}, that indicates which hand the controller is being held
-          in or is most likely to be held in.
+          An enumeration, {{GamepadHand}}, that indicates which hand the controller is being
+          held in or is most likely to be held in.
         </dd>
         <dt>
           <dfn>hapticActuators</dfn>

From 75761be11a78fa14760a3423c602b3d4d8c1261b Mon Sep 17 00:00:00 2001
From: Matt Reynolds <mattreynolds@google.com>
Date: Wed, 13 Sep 2023 09:40:11 +0200
Subject: [PATCH 17/18] Update extensions.html

---
 extensions.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.html b/extensions.html
index 5b1a17f..8b5150f 100644
--- a/extensions.html
+++ b/extensions.html
@@ -955,8 +955,8 @@ <h2>
           <dfn>hand</dfn>
         </dt>
         <dd>
-          An enumeration, {{GamepadHand}}, that indicates which hand the controller is being
-          held in or is most likely to be held in.
+          An enumeration, {{GamepadHand}}, that indicates which hand the controller is
+          being held in or is most likely to be held in.
         </dd>
         <dt>
           <dfn>hapticActuators</dfn>

From ce87f1af3d5c47eca91e7e1d67f15c55a46d4dbd Mon Sep 17 00:00:00 2001
From: Matt Reynolds <mattreynolds@google.com>
Date: Wed, 13 Sep 2023 11:38:25 +0200
Subject: [PATCH 18/18] Update extensions.html

---
 extensions.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.html b/extensions.html
index 8b5150f..4838ca6 100644
--- a/extensions.html
+++ b/extensions.html
@@ -955,8 +955,8 @@ <h2>
           <dfn>hand</dfn>
         </dt>
         <dd>
-          An enumeration, {{GamepadHand}}, that indicates which hand the controller is
-          being held in or is most likely to be held in.
+          An enumeration, {{GamepadHand}}, that indicates which hand the controller
+          is being held in or is most likely to be held in.
         </dd>
         <dt>
           <dfn>hapticActuators</dfn>